若依 2.0

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysClientDetails.java

@@ -0,0 +1,197 @@
+package com.ruoyi.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+
+/**
+ * 终端配置表 sys_oauth_client_details
+ *
+ * @author ruoyi
+ */
+public class SysClientDetails extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 终端编号
+     */
+    private String clientId;
+
+    /**
+     * 资源ID标识
+     */
+    private String resourceIds;
+
+    /**
+     * 终端安全码
+     */
+    private String clientSecret;
+
+    /**
+     * 终端授权范围
+     */
+    private String scope;
+
+    /**
+     * 终端授权类型
+     */
+    private String authorizedGrantTypes;
+
+    /**
+     * 服务器回调地址
+     */
+    private String webServerRedirectUri;
+
+    /**
+     * 访问资源所需权限
+     */
+    private String authorities;
+
+    /**
+     * 设定终端的access_token的有效时间值（秒）
+     */
+    private Integer accessTokenValidity;
+
+    /**
+     * 设定终端的refresh_token的有效时间值（秒）
+     */
+    private Integer refreshTokenValidity;
+
+    /**
+     * 附加信息
+     */
+    private String additionalInformation;
+
+    /**
+     * 是否登录时跳过授权
+     */
+    private String autoapprove;
+
+    public String getClientId()
+    {
+        return clientId;
+    }
+
+    public void setClientId(String clientId)
+    {
+        this.clientId = clientId;
+    }
+
+    public String getResourceIds()
+    {
+        return resourceIds;
+    }
+
+    public void setResourceIds(String resourceIds)
+    {
+        this.resourceIds = resourceIds;
+    }
+
+    public String getClientSecret()
+    {
+        return clientSecret;
+    }
+
+    public void setClientSecret(String clientSecret)
+    {
+        this.clientSecret = clientSecret;
+    }
+
+    public String getScope()
+    {
+        return scope;
+    }
+
+    public void setScope(String scope)
+    {
+        this.scope = scope;
+    }
+
+    public String getAuthorizedGrantTypes()
+    {
+        return authorizedGrantTypes;
+    }
+
+    public void setAuthorizedGrantTypes(String authorizedGrantTypes)
+    {
+        this.authorizedGrantTypes = authorizedGrantTypes;
+    }
+
+    public String getWebServerRedirectUri()
+    {
+        return webServerRedirectUri;
+    }
+
+    public void setWebServerRedirectUri(String webServerRedirectUri)
+    {
+        this.webServerRedirectUri = webServerRedirectUri;
+    }
+
+    public String getAuthorities()
+    {
+        return authorities;
+    }
+
+    public void setAuthorities(String authorities)
+    {
+        this.authorities = authorities;
+    }
+
+    public Integer getAccessTokenValidity()
+    {
+        return accessTokenValidity;
+    }
+
+    public void setAccessTokenValidity(Integer accessTokenValidity)
+    {
+        this.accessTokenValidity = accessTokenValidity;
+    }
+
+    public Integer getRefreshTokenValidity()
+    {
+        return refreshTokenValidity;
+    }
+
+    public void setRefreshTokenValidity(Integer refreshTokenValidity)
+    {
+        this.refreshTokenValidity = refreshTokenValidity;
+    }
+
+    public String getAdditionalInformation()
+    {
+        return additionalInformation;
+    }
+
+    public void setAdditionalInformation(String additionalInformation)
+    {
+        this.additionalInformation = additionalInformation;
+    }
+
+    public String getAutoapprove()
+    {
+        return autoapprove;
+    }
+
+    public void setAutoapprove(String autoapprove)
+    {
+        this.autoapprove = autoapprove;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("clientId", getClientId())
+            .append("resourceIds", getResourceIds())
+            .append("clientSecret", getClientSecret())
+            .append("scope", getScope())
+            .append("authorizedGrantTypes", getAuthorizedGrantTypes())
+            .append("webServerRedirectUri", getWebServerRedirectUri())
+            .append("authorities", getAuthorities())
+            .append("accessTokenValidity", getAccessTokenValidity())
+            .append("refreshTokenValidity", getRefreshTokenValidity())
+            .append("additionalInformation", getAdditionalInformation())
+            .append("autoapprove", getAutoapprove())
+            .toString();
+    }
+}

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java

@@ -23,34 +23,22 @@ public class SysLogininfor extends BaseEntity
     @Excel(name = "用户账号")
     private String userName;
 
-    /** 登录状态 0成功 1失败 */
-    @Excel(name = "登录状态", readConverterExp = "0=成功,1=失败")
+    /** 状态 0成功 1失败 */
+    @Excel(name = "状态", readConverterExp = "0=成功,1=失败")
     private String status;
 
-    /** 登录IP地址 */
-    @Excel(name = "登录地址")
+    /** 地址 */
+    @Excel(name = "地址")
     private String ipaddr;
 
-    /** 登录地点 */
-    @Excel(name = "登录地点")
-    private String loginLocation;
-
-    /** 浏览器类型 */
-    @Excel(name = "浏览器")
-    private String browser;
-
-    /** 操作系统 */
-    @Excel(name = "操作系统")
-    private String os;
-
-    /** 提示消息 */
-    @Excel(name = "提示消息")
+    /** 描述 */
+    @Excel(name = "描述")
     private String msg;
 
     /** 访问时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date loginTime;
+    private Date accessTime;
 
     public Long getInfoId()
     {
@@ -92,36 +80,6 @@ public class SysLogininfor extends BaseEntity
         this.ipaddr = ipaddr;
     }
 
-    public String getLoginLocation()
-    {
-        return loginLocation;
-    }
-
-    public void setLoginLocation(String loginLocation)
-    {
-        this.loginLocation = loginLocation;
-    }
-
-    public String getBrowser()
-    {
-        return browser;
-    }
-
-    public void setBrowser(String browser)
-    {
-        this.browser = browser;
-    }
-
-    public String getOs()
-    {
-        return os;
-    }
-
-    public void setOs(String os)
-    {
-        this.os = os;
-    }
-
     public String getMsg()
     {
         return msg;
@@ -132,13 +90,13 @@ public class SysLogininfor extends BaseEntity
         this.msg = msg;
     }
 
-    public Date getLoginTime()
+    public Date getAccessTime()
     {
-        return loginTime;
+        return accessTime;
     }
 
-    public void setLoginTime(Date loginTime)
+    public void setAccessTime(Date accessTime)
     {
-        this.loginTime = loginTime;
+        this.accessTime = accessTime;
     }
 }