ibiz4j 发布系统代码 [ibiz-uaa，UAA鉴权]

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibzuaa/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzuaa/
-      mvn clean package -Papi
-      cd ibzuaa-provider/ibzuaa-provider-api
-      mvn -Papi docker:build
-      mvn -Papi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-api.yaml ibzlab-rt --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysApp.java

@@ -24,6 +24,8 @@ import java.io.Serializable;
 import lombok.*;
 import org.springframework.data.annotation.Transient;
 import cn.ibizlab.util.annotation.Audit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 
 /**
@@ -34,6 +36,7 @@ import cn.ibizlab.util.annotation.Audit;
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
+@ApiModel("应用")
 public class SysApp extends EntityBase implements Serializable {
 
     /**
@@ -42,6 +45,7 @@ public class SysApp extends EntityBase implements Serializable {
     @DEField(name = "appid", isKeyField = true)
     @JSONField(name = "id")
     @JsonProperty("id")
+    @ApiModelProperty("应用标识")
     private String id;
 
     /**
@@ -50,6 +54,7 @@ public class SysApp extends EntityBase implements Serializable {
     @DEField(name = "appname")
     @JSONField(name = "label")
     @JsonProperty("label")
+    @ApiModelProperty("应用名")
     private String label;
 
     /**
@@ -58,6 +63,7 @@ public class SysApp extends EntityBase implements Serializable {
     @DEField(name = "pssystemid")
     @JSONField(name = "systemId")
     @JsonProperty("systemId")
+    @ApiModelProperty("系统标识")
     private String systemid;
 
     /**
@@ -65,6 +71,7 @@ public class SysApp extends EntityBase implements Serializable {
      */
     @JSONField(name = "fullName")
     @JsonProperty("fullName")
+    @ApiModelProperty("全称")
     private String fullname;
 
     /**
@@ -73,6 +80,7 @@ public class SysApp extends EntityBase implements Serializable {
     @DEField(name = "apptype")
     @JSONField(name = "type")
     @JsonProperty("type")
+    @ApiModelProperty("类型")
     private String type;
 
     /**
@@ -81,6 +89,7 @@ public class SysApp extends EntityBase implements Serializable {
     @DEField(name = "appgroup")
     @JSONField(name = "group")
     @JsonProperty("group")
+    @ApiModelProperty("分组")
     private String group;
 
     /**
@@ -88,6 +97,7 @@ public class SysApp extends EntityBase implements Serializable {
      */
     @JSONField(name = "icon")
     @JsonProperty("icon")
+    @ApiModelProperty("图标")
     private String icon;
 
     /**
@@ -95,6 +105,7 @@ public class SysApp extends EntityBase implements Serializable {
      */
     @JSONField(name = "visabled")
     @JsonProperty("visabled")
+    @ApiModelProperty("可见")
     private Integer visabled;
 
     /**
@@ -102,6 +113,7 @@ public class SysApp extends EntityBase implements Serializable {
      */
     @JSONField(name = "addr")
     @JsonProperty("addr")
+    @ApiModelProperty("地址")
     private String addr;
 
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysAuthLog.java

@@ -24,6 +24,8 @@ import java.io.Serializable;
 import lombok.*;
 import org.springframework.data.annotation.Transient;
 import cn.ibizlab.util.annotation.Audit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 @NoArgsConstructor
 @JsonIgnoreProperties(value = "handler")
 @TableName(value = "IBZAUTHLOG", resultMap = "SysAuthLogResultMap")
+@ApiModel("认证日志")
 public class SysAuthLog extends EntityMP implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -50,6 +53,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
     @TableId(value = "logid", type = IdType.ASSIGN_UUID)
     @JSONField(name = "logid")
     @JsonProperty("logid")
+    @ApiModelProperty("标识")
     private String logid;
     /**
      * 用户全局名
@@ -57,6 +61,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
     @TableField(value = "username")
     @JSONField(name = "username")
     @JsonProperty("username")
+    @ApiModelProperty("用户全局名")
     private String username;
     /**
      * 用户名称
@@ -64,6 +69,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
     @TableField(value = "personname")
     @JSONField(name = "personname")
     @JsonProperty("personname")
+    @ApiModelProperty("用户名称")
     private String personname;
     /**
      * 域
@@ -71,6 +77,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
     @TableField(value = "domain")
     @JSONField(name = "domain")
     @JsonProperty("domain")
+    @ApiModelProperty("域")
     private String domain;
     /**
      * 认证时间
@@ -80,6 +87,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
     @JSONField(name = "authtime", format = "yyyy-MM-dd HH:mm:ss")
     @JsonProperty("authtime")
+    @ApiModelProperty("认证时间")
     private Timestamp authtime;
     /**
      * IP地址
@@ -87,6 +95,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
     @TableField(value = "ipaddr")
     @JSONField(name = "ipaddr")
     @JsonProperty("ipaddr")
+    @ApiModelProperty("IP地址")
     private String ipaddr;
     /**
      * MAC地址
@@ -94,6 +103,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
     @TableField(value = "macaddr")
     @JSONField(name = "macaddr")
     @JsonProperty("macaddr")
+    @ApiModelProperty("MAC地址")
     private String macaddr;
     /**
      * 客户端
@@ -101,6 +111,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
     @TableField(value = "useragent")
     @JSONField(name = "useragent")
     @JsonProperty("useragent")
+    @ApiModelProperty("客户端")
     private String useragent;
     /**
      * 认证结果
@@ -108,6 +119,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
     @TableField(value = "authcode")
     @JSONField(name = "authcode")
     @JsonProperty("authcode")
+    @ApiModelProperty("认证结果")
     private String authcode;
 
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysOpenAccess.java

@@ -24,6 +24,8 @@ import java.io.Serializable;
 import lombok.*;
 import org.springframework.data.annotation.Transient;
 import cn.ibizlab.util.annotation.Audit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 @NoArgsConstructor
 @JsonIgnoreProperties(value = "handler")
 @TableName(value = "IBZOPENACCESS", resultMap = "SysOpenAccessResultMap")
+@ApiModel("第三方认证平台")
 public class SysOpenAccess extends EntityMP implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -50,6 +53,7 @@ public class SysOpenAccess extends EntityMP implements Serializable {
     @TableId(value = "accessid", type = IdType.ASSIGN_UUID)
     @JSONField(name = "id")
     @JsonProperty("id")
+    @ApiModelProperty("开放平台接入标识")
     private String id;
     /**
      * 开放平台
@@ -58,6 +62,7 @@ public class SysOpenAccess extends EntityMP implements Serializable {
     @TableField(value = "accessname")
     @JSONField(name = "name")
     @JsonProperty("name")
+    @ApiModelProperty("开放平台")
     private String name;
     /**
      * 开放平台类型
@@ -66,6 +71,7 @@ public class SysOpenAccess extends EntityMP implements Serializable {
     @TableField(value = "open_type")
     @JSONField(name = "open_type")
     @JsonProperty("open_type")
+    @ApiModelProperty("开放平台类型")
     private String openType;
     /**
      * AccessKey(AppId)
@@ -74,6 +80,7 @@ public class SysOpenAccess extends EntityMP implements Serializable {
     @TableField(value = "access_key")
     @JSONField(name = "access_key")
     @JsonProperty("access_key")
+    @ApiModelProperty("AccessKey(AppId)")
     private String accessKey;
     /**
      * SecretKey(AppSecret)
@@ -82,6 +89,7 @@ public class SysOpenAccess extends EntityMP implements Serializable {
     @TableField(value = "secret_key")
     @JSONField(name = "secret_key")
     @JsonProperty("secret_key")
+    @ApiModelProperty("SecretKey(AppSecret)")
     private String secretKey;
     /**
      * RegionId
@@ -90,6 +98,7 @@ public class SysOpenAccess extends EntityMP implements Serializable {
     @TableField(value = "region_id")
     @JSONField(name = "region_id")
     @JsonProperty("region_id")
+    @ApiModelProperty("RegionId")
     private String regionId;
     /**
      * 管理账号token
@@ -98,6 +107,7 @@ public class SysOpenAccess extends EntityMP implements Serializable {
     @TableField(value = "access_token")
     @JSONField(name = "access_token")
     @JsonProperty("access_token")
+    @ApiModelProperty("管理账号token")
     private String accessToken;
     /**
      * 管理账号token过期时间
@@ -107,6 +117,7 @@ public class SysOpenAccess extends EntityMP implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
     @JSONField(name = "expires_time", format = "yyyy-MM-dd HH:mm:ss")
     @JsonProperty("expires_time")
+    @ApiModelProperty("管理账号token过期时间")
     private Timestamp expiresTime;
     /**
      * 是否禁用
@@ -115,6 +126,7 @@ public class SysOpenAccess extends EntityMP implements Serializable {
     @TableField(value = "disabled")
     @JSONField(name = "disabled")
     @JsonProperty("disabled")
+    @ApiModelProperty("是否禁用")
     private Integer disabled;
     /**
      * RedirectURI
@@ -123,6 +135,7 @@ public class SysOpenAccess extends EntityMP implements Serializable {
     @TableField(value = "redirect_uri")
     @JSONField(name = "redirect_uri")
     @JsonProperty("redirect_uri")
+    @ApiModelProperty("RedirectURI")
     private String redirectUri;
     /**
      * NotifyUrl
@@ -131,6 +144,7 @@ public class SysOpenAccess extends EntityMP implements Serializable {
     @TableField(value = "notify_url")
     @JSONField(name = "notify_url")
     @JsonProperty("notify_url")
+    @ApiModelProperty("NotifyUrl")
     private String notifyUrl;
     /**
      * AGENT_ID
@@ -139,6 +153,7 @@ public class SysOpenAccess extends EntityMP implements Serializable {
     @TableField(value = "agent_id")
     @JSONField(name = "agent_id")
     @JsonProperty("agent_id")
+    @ApiModelProperty("AGENT_ID")
     private Long agentId;
 
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysPermission.java

@@ -24,6 +24,8 @@ import java.io.Serializable;
 import lombok.*;
 import org.springframework.data.annotation.Transient;
 import cn.ibizlab.util.annotation.Audit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 @NoArgsConstructor
 @JsonIgnoreProperties(value = "handler")
 @TableName(value = "IBZPERMISSION", resultMap = "SysPermissionResultMap")
+@ApiModel("权限/资源")
 public class SysPermission extends EntityMP implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -50,6 +53,7 @@ public class SysPermission extends EntityMP implements Serializable {
     @TableId(value = "sys_permissionid", type = IdType.ASSIGN_UUID)
     @JSONField(name = "permissionid")
     @JsonProperty("permissionid")
+    @ApiModelProperty("资源标识")
     private String permissionid;
     /**
      * 资源名称
@@ -58,6 +62,7 @@ public class SysPermission extends EntityMP implements Serializable {
     @TableField(value = "sys_permissionname")
     @JSONField(name = "permissionname")
     @JsonProperty("permissionname")
+    @ApiModelProperty("资源名称")
     private String permissionname;
     /**
      * 资源类别
@@ -65,6 +70,7 @@ public class SysPermission extends EntityMP implements Serializable {
     @TableField(value = "permissiontype")
     @JSONField(name = "permissiontype")
     @JsonProperty("permissiontype")
+    @ApiModelProperty("资源类别")
     private String permissiontype;
     /**
      * 系统
@@ -72,6 +78,7 @@ public class SysPermission extends EntityMP implements Serializable {
     @TableField(value = "pssystemid")
     @JSONField(name = "pssystemid")
     @JsonProperty("pssystemid")
+    @ApiModelProperty("系统")
     private String pssystemid;
     /**
      * 逻辑有效
@@ -81,6 +88,7 @@ public class SysPermission extends EntityMP implements Serializable {
     @TableField(value = "enable")
     @JSONField(name = "enable")
     @JsonProperty("enable")
+    @ApiModelProperty("逻辑有效")
     private Integer enable;
     /**
      * 建立时间
@@ -90,6 +98,7 @@ public class SysPermission extends EntityMP implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
     @JSONField(name = "createdate", format = "yyyy-MM-dd HH:mm:ss")
     @JsonProperty("createdate")
+    @ApiModelProperty("建立时间")
     private Timestamp createdate;
     /**
      * 更新时间
@@ -99,6 +108,7 @@ public class SysPermission extends EntityMP implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
     @JSONField(name = "updatedate", format = "yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
+    @ApiModelProperty("更新时间")
     private Timestamp updatedate;
 
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRole.java

@@ -24,6 +24,8 @@ import java.io.Serializable;
 import lombok.*;
 import org.springframework.data.annotation.Transient;
 import cn.ibizlab.util.annotation.Audit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 @NoArgsConstructor
 @JsonIgnoreProperties(value = "handler")
 @TableName(value = "IBZROLE", resultMap = "SysRoleResultMap")
+@ApiModel("系统角色")
 public class SysRole extends EntityMP implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -50,6 +53,7 @@ public class SysRole extends EntityMP implements Serializable {
     @TableId(value = "sys_roleid", type = IdType.ASSIGN_UUID)
     @JSONField(name = "roleid")
     @JsonProperty("roleid")
+    @ApiModelProperty("角色标识")
     private String roleid;
     /**
      * 角色名称
@@ -58,6 +62,7 @@ public class SysRole extends EntityMP implements Serializable {
     @TableField(value = "sys_rolename")
     @JSONField(name = "rolename")
     @JsonProperty("rolename")
+    @ApiModelProperty("角色名称")
     private String rolename;
     /**
      * 备注
@@ -65,6 +70,7 @@ public class SysRole extends EntityMP implements Serializable {
     @TableField(value = "memo")
     @JSONField(name = "memo")
     @JsonProperty("memo")
+    @ApiModelProperty("备注")
     private String memo;
     /**
      * 父角色标识
@@ -72,6 +78,7 @@ public class SysRole extends EntityMP implements Serializable {
     @TableField(value = "proleid")
     @JSONField(name = "proleid")
     @JsonProperty("proleid")
+    @ApiModelProperty("父角色标识")
     private String proleid;
     /**
      * 父角色名称
@@ -79,6 +86,7 @@ public class SysRole extends EntityMP implements Serializable {
     @TableField(exist = false)
     @JSONField(name = "prolename")
     @JsonProperty("prolename")
+    @ApiModelProperty("父角色名称")
     private String prolename;
     /**
      * 建立时间
@@ -88,6 +96,7 @@ public class SysRole extends EntityMP implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
     @JSONField(name = "createdate", format = "yyyy-MM-dd HH:mm:ss")
     @JsonProperty("createdate")
+    @ApiModelProperty("建立时间")
     private Timestamp createdate;
     /**
      * 更新时间
@@ -97,6 +106,7 @@ public class SysRole extends EntityMP implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
     @JSONField(name = "updatedate", format = "yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
+    @ApiModelProperty("更新时间")
     private Timestamp updatedate;
     /**
      * 建立人
@@ -105,6 +115,7 @@ public class SysRole extends EntityMP implements Serializable {
     @TableField(value = "createman", fill = FieldFill.INSERT)
     @JSONField(name = "createman")
     @JsonProperty("createman")
+    @ApiModelProperty("建立人")
     private String createman;
     /**
      * 更新人
@@ -113,6 +124,7 @@ public class SysRole extends EntityMP implements Serializable {
     @TableField(value = "updateman")
     @JSONField(name = "updateman")
     @JsonProperty("updateman")
+    @ApiModelProperty("更新人")
     private String updateman;
 
     /**

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRolePermission.java

@@ -24,6 +24,8 @@ import java.io.Serializable;
 import lombok.*;
 import org.springframework.data.annotation.Transient;
 import cn.ibizlab.util.annotation.Audit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 @NoArgsConstructor
 @JsonIgnoreProperties(value = "handler")
 @TableName(value = "IBZROLE_PERMISSION", resultMap = "SysRolePermissionResultMap")
+@ApiModel("角色权限关系")
 public class SysRolePermission extends EntityMP implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -50,6 +53,7 @@ public class SysRolePermission extends EntityMP implements Serializable {
     @TableId(value = "sys_role_permissionid", type = IdType.ASSIGN_UUID)
     @JSONField(name = "rolepermissionid")
     @JsonProperty("rolepermissionid")
+    @ApiModelProperty("角色权限关系表标识")
     private String rolepermissionid;
     /**
      * 角色表标识
@@ -58,6 +62,7 @@ public class SysRolePermission extends EntityMP implements Serializable {
     @TableField(value = "sys_roleid")
     @JSONField(name = "roleid")
     @JsonProperty("roleid")
+    @ApiModelProperty("角色表标识")
     private String roleid;
     /**
      * 角色名称
@@ -65,6 +70,7 @@ public class SysRolePermission extends EntityMP implements Serializable {
     @TableField(exist = false)
     @JSONField(name = "rolename")
     @JsonProperty("rolename")
+    @ApiModelProperty("角色名称")
     private String rolename;
     /**
      * 权限表标识
@@ -73,6 +79,7 @@ public class SysRolePermission extends EntityMP implements Serializable {
     @TableField(value = "sys_permissionid")
     @JSONField(name = "permissionid")
     @JsonProperty("permissionid")
+    @ApiModelProperty("权限表标识")
     private String permissionid;
     /**
      * 权限名称
@@ -80,6 +87,7 @@ public class SysRolePermission extends EntityMP implements Serializable {
     @TableField(exist = false)
     @JSONField(name = "permissionname")
     @JsonProperty("permissionname")
+    @ApiModelProperty("权限名称")
     private String permissionname;
     /**
      * 权限类型
@@ -87,6 +95,7 @@ public class SysRolePermission extends EntityMP implements Serializable {
     @TableField(exist = false)
     @JSONField(name = "permissiontype")
     @JsonProperty("permissiontype")
+    @ApiModelProperty("权限类型")
     private String permissiontype;
     /**
      * 权限类型
@@ -94,6 +103,7 @@ public class SysRolePermission extends EntityMP implements Serializable {
     @TableField(exist = false)
     @JSONField(name = "permissionenable")
     @JsonProperty("permissionenable")
+    @ApiModelProperty("权限类型")
     private Integer permissionenable;
     /**
      * 建立时间
@@ -103,6 +113,7 @@ public class SysRolePermission extends EntityMP implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
     @JSONField(name = "createdate", format = "yyyy-MM-dd HH:mm:ss")
     @JsonProperty("createdate")
+    @ApiModelProperty("建立时间")
     private Timestamp createdate;
     /**
      * 更新时间
@@ -112,6 +123,7 @@ public class SysRolePermission extends EntityMP implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
     @JSONField(name = "updatedate", format = "yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
+    @ApiModelProperty("更新时间")
     private Timestamp updatedate;
 
     /**

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUser.java

@@ -24,6 +24,8 @@ import java.io.Serializable;
 import lombok.*;
 import org.springframework.data.annotation.Transient;
 import cn.ibizlab.util.annotation.Audit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 @NoArgsConstructor
 @JsonIgnoreProperties(value = "handler")
 @TableName(value = "IBZUSER", resultMap = "SysUserResultMap")
+@ApiModel("系统用户")
 public class SysUser extends EntityMP implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -50,6 +53,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableId(value = "userid", type = IdType.ASSIGN_UUID)
     @JSONField(name = "userid")
     @JsonProperty("userid")
+    @ApiModelProperty("用户标识")
     private String userid;
     /**
      * 用户全局名
@@ -57,6 +61,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "username")
     @JSONField(name = "username")
     @JsonProperty("username")
+    @ApiModelProperty("用户全局名")
     private String username;
     /**
      * 用户姓名
@@ -64,6 +69,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "personname")
     @JSONField(name = "personname")
     @JsonProperty("personname")
+    @ApiModelProperty("用户姓名")
     private String personname;
     /**
      * 用户工号
@@ -71,6 +77,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "usercode")
     @JSONField(name = "usercode")
     @JsonProperty("usercode")
+    @ApiModelProperty("用户工号")
     private String usercode;
     /**
      * 密码
@@ -78,6 +85,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "password")
     @JSONField(name = "password")
     @JsonProperty("password")
+    @ApiModelProperty("密码")
     private String password;
     /**
      * 登录名
@@ -85,6 +93,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "loginname")
     @JSONField(name = "loginname")
     @JsonProperty("loginname")
+    @ApiModelProperty("登录名")
     private String loginname;
     /**
      * 区属
@@ -92,6 +101,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "domains")
     @JSONField(name = "domains")
     @JsonProperty("domains")
+    @ApiModelProperty("区属")
     private String domains;
     /**
      * 主部门
@@ -99,6 +109,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "mdeptid")
     @JSONField(name = "mdeptid")
     @JsonProperty("mdeptid")
+    @ApiModelProperty("主部门")
     private String mdeptid;
     /**
      * 主部门代码
@@ -106,6 +117,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "mdeptcode")
     @JSONField(name = "mdeptcode")
     @JsonProperty("mdeptcode")
+    @ApiModelProperty("主部门代码")
     private String mdeptcode;
     /**
      * 主部门名称
@@ -113,6 +125,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "mdeptname")
     @JSONField(name = "mdeptname")
     @JsonProperty("mdeptname")
+    @ApiModelProperty("主部门名称")
     private String mdeptname;
     /**
      * 业务编码
@@ -120,6 +133,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "bcode")
     @JSONField(name = "bcode")
     @JsonProperty("bcode")
+    @ApiModelProperty("业务编码")
     private String bcode;
     /**
      * 岗位标识
@@ -127,6 +141,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "postid")
     @JSONField(name = "postid")
     @JsonProperty("postid")
+    @ApiModelProperty("岗位标识")
     private String postid;
     /**
      * 岗位代码
@@ -134,6 +149,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "postcode")
     @JSONField(name = "postcode")
     @JsonProperty("postcode")
+    @ApiModelProperty("岗位代码")
     private String postcode;
     /**
      * 岗位名称
@@ -141,6 +157,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "postname")
     @JSONField(name = "postname")
     @JsonProperty("postname")
+    @ApiModelProperty("岗位名称")
     private String postname;
     /**
      * 单位
@@ -149,6 +166,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "orgid")
     @JSONField(name = "orgid")
     @JsonProperty("orgid")
+    @ApiModelProperty("单位")
     private String orgid;
     /**
      * 单位代码
@@ -156,6 +174,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "orgcode")
     @JSONField(name = "orgcode")
     @JsonProperty("orgcode")
+    @ApiModelProperty("单位代码")
     private String orgcode;
     /**
      * 单位名称
@@ -164,6 +183,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "orgname")
     @JSONField(name = "orgname")
     @JsonProperty("orgname")
+    @ApiModelProperty("单位名称")
     private String orgname;
     /**
      * 昵称别名
@@ -171,6 +191,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "nickname")
     @JSONField(name = "nickname")
     @JsonProperty("nickname")
+    @ApiModelProperty("昵称别名")
     private String nickname;
     /**
      * 性别
@@ -178,6 +199,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "sex")
     @JSONField(name = "sex")
     @JsonProperty("sex")
+    @ApiModelProperty("性别")
     private String sex;
     /**
      * 出生日期
@@ -186,6 +208,7 @@ public class SysUser extends EntityMP implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd", locale = "zh", timezone = "GMT+8")
     @JSONField(name = "birthday", format = "yyyy-MM-dd")
     @JsonProperty("birthday")
+    @ApiModelProperty("出生日期")
     private Timestamp birthday;
     /**
      * 证件号码
@@ -193,6 +216,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "certcode")
     @JSONField(name = "certcode")
     @JsonProperty("certcode")
+    @ApiModelProperty("证件号码")
     private String certcode;
     /**
      * 联系方式
@@ -200,6 +224,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "phone")
     @JSONField(name = "phone")
     @JsonProperty("phone")
+    @ApiModelProperty("联系方式")
     private String phone;
     /**
      * 邮件
@@ -207,6 +232,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "email")
     @JSONField(name = "email")
     @JsonProperty("email")
+    @ApiModelProperty("邮件")
     private String email;
     /**
      * 社交账号
@@ -214,6 +240,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "avatar")
     @JSONField(name = "avatar")
     @JsonProperty("avatar")
+    @ApiModelProperty("社交账号")
     private String avatar;
     /**
      * 地址
@@ -221,6 +248,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "addr")
     @JSONField(name = "addr")
     @JsonProperty("addr")
+    @ApiModelProperty("地址")
     private String addr;
     /**
      * 照片
@@ -228,6 +256,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "usericon")
     @JSONField(name = "usericon")
     @JsonProperty("usericon")
+    @ApiModelProperty("照片")
     private String usericon;
     /**
      * 样式
@@ -235,6 +264,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "theme")
     @JSONField(name = "theme")
     @JsonProperty("theme")
+    @ApiModelProperty("样式")
     private String theme;
     /**
      * 语言
@@ -242,6 +272,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "lang")
     @JSONField(name = "lang")
     @JsonProperty("lang")
+    @ApiModelProperty("语言")
     private String lang;
     /**
      * 字号
@@ -249,6 +280,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "fontsize")
     @JSONField(name = "fontsize")
     @JsonProperty("fontsize")
+    @ApiModelProperty("字号")
     private String fontsize;
     /**
      * 备注
@@ -256,6 +288,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "memo")
     @JSONField(name = "memo")
     @JsonProperty("memo")
+    @ApiModelProperty("备注")
     private String memo;
     /**
      * 保留
@@ -263,6 +296,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "reserver")
     @JSONField(name = "reserver")
     @JsonProperty("reserver")
+    @ApiModelProperty("保留")
     private String reserver;
     /**
      * 超级管理员
@@ -271,6 +305,7 @@ public class SysUser extends EntityMP implements Serializable {
     @TableField(value = "superuser")
     @JSONField(name = "superuser")
     @JsonProperty("superuser")
+    @ApiModelProperty("超级管理员")
     private Integer superuser;
 
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUserAuth.java

@@ -24,6 +24,8 @@ import java.io.Serializable;
 import lombok.*;
 import org.springframework.data.annotation.Transient;
 import cn.ibizlab.util.annotation.Audit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 @NoArgsConstructor
 @JsonIgnoreProperties(value = "handler")
 @TableName(value = "IBZUSERAUTH", resultMap = "SysUserAuthResultMap")
+@ApiModel("账号绑定")
 public class SysUserAuth extends EntityMP implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -50,6 +53,7 @@ public class SysUserAuth extends EntityMP implements Serializable {
     @TableId(value = "authid", type = IdType.ASSIGN_UUID)
     @JSONField(name = "id")
     @JsonProperty("id")
+    @ApiModelProperty("标识")
     private String id;
     /**
      * 用户标识
@@ -57,6 +61,7 @@ public class SysUserAuth extends EntityMP implements Serializable {
     @TableField(value = "userid")
     @JSONField(name = "userid")
     @JsonProperty("userid")
+    @ApiModelProperty("用户标识")
     private String userid;
     /**
      * 认证类型
@@ -65,6 +70,7 @@ public class SysUserAuth extends EntityMP implements Serializable {
     @TableField(value = "identity_type")
     @JSONField(name = "identity_type")
     @JsonProperty("identity_type")
+    @ApiModelProperty("认证类型")
     private String identityType;
     /**
      * 认证标识
@@ -72,6 +78,7 @@ public class SysUserAuth extends EntityMP implements Serializable {
     @TableField(value = "identifier")
     @JSONField(name = "identifier")
     @JsonProperty("identifier")
+    @ApiModelProperty("认证标识")
     private String identifier;
     /**
      * 凭据
@@ -79,6 +86,7 @@ public class SysUserAuth extends EntityMP implements Serializable {
     @TableField(value = "credential")
     @JSONField(name = "credential")
     @JsonProperty("credential")
+    @ApiModelProperty("凭据")
     private String credential;
     /**
      * 人员
@@ -86,6 +94,7 @@ public class SysUserAuth extends EntityMP implements Serializable {
     @TableField(exist = false)
     @JSONField(name = "username")
     @JsonProperty("username")
+    @ApiModelProperty("人员")
     private String username;
 
     /**

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUserRole.java

@@ -24,6 +24,8 @@ import java.io.Serializable;
 import lombok.*;
 import org.springframework.data.annotation.Transient;
 import cn.ibizlab.util.annotation.Audit;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 @NoArgsConstructor
 @JsonIgnoreProperties(value = "handler")
 @TableName(value = "IBZUSER_ROLE", resultMap = "SysUserRoleResultMap")
+@ApiModel("用户角色关系")
 public class SysUserRole extends EntityMP implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -50,6 +53,7 @@ public class SysUserRole extends EntityMP implements Serializable {
     @TableId(value = "sys_user_roleid", type = IdType.ASSIGN_UUID)
     @JSONField(name = "userroleid")
     @JsonProperty("userroleid")
+    @ApiModelProperty("用户角色关系标识")
     private String userroleid;
     /**
      * 角色标识
@@ -58,6 +62,7 @@ public class SysUserRole extends EntityMP implements Serializable {
     @TableField(value = "sys_roleid")
     @JSONField(name = "roleid")
     @JsonProperty("roleid")
+    @ApiModelProperty("角色标识")
     private String roleid;
     /**
      * 角色名称
@@ -65,6 +70,7 @@ public class SysUserRole extends EntityMP implements Serializable {
     @TableField(exist = false)
     @JSONField(name = "rolename")
     @JsonProperty("rolename")
+    @ApiModelProperty("角色名称")
     private String rolename;
     /**
      * 用户标识
@@ -73,6 +79,7 @@ public class SysUserRole extends EntityMP implements Serializable {
     @TableField(value = "sys_userid")
     @JSONField(name = "userid")
     @JsonProperty("userid")
+    @ApiModelProperty("用户标识")
     private String userid;
     /**
      * 用户名称
@@ -80,6 +87,7 @@ public class SysUserRole extends EntityMP implements Serializable {
     @TableField(exist = false)
     @JSONField(name = "personname")
     @JsonProperty("personname")
+    @ApiModelProperty("用户名称")
     private String personname;
     /**
      * 登录名
@@ -87,6 +95,7 @@ public class SysUserRole extends EntityMP implements Serializable {
     @TableField(exist = false)
     @JSONField(name = "loginname")
     @JsonProperty("loginname")
+    @ApiModelProperty("登录名")
     private String loginname;
     /**
      * 单位
@@ -94,6 +103,7 @@ public class SysUserRole extends EntityMP implements Serializable {
     @TableField(exist = false)
     @JSONField(name = "orgname")
     @JsonProperty("orgname")
+    @ApiModelProperty("单位")
     private String orgname;
     /**
      * 主部门
@@ -101,6 +111,7 @@ public class SysUserRole extends EntityMP implements Serializable {
     @TableField(exist = false)
     @JSONField(name = "mdeptname")
     @JsonProperty("mdeptname")
+    @ApiModelProperty("主部门")
     private String mdeptname;
     /**
      * 建立时间
@@ -110,6 +121,7 @@ public class SysUserRole extends EntityMP implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
     @JSONField(name = "createdate", format = "yyyy-MM-dd HH:mm:ss")
     @JsonProperty("createdate")
+    @ApiModelProperty("建立时间")
     private Timestamp createdate;
     /**
      * 更新时间
@@ -119,6 +131,7 @@ public class SysUserRole extends EntityMP implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
     @JSONField(name = "updatedate", format = "yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
+    @ApiModelProperty("更新时间")
     private Timestamp updatedate;
 
     /**

ibzuaa-core/src/main/java/cn/ibizlab/core/util/config/RocketMQListenerProcessor.java

 package cn.ibizlab.core.util.config;
 
-import lombok.extern.slf4j.Slf4j;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.client.consumer.listener.ConsumeOrderlyContext;
 import org.apache.rocketmq.client.consumer.listener.ConsumeOrderlyStatus;
 import org.apache.rocketmq.client.consumer.listener.MessageListenerOrderly;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
+
 import java.util.List;
+import java.util.Map;
 
 /**
  * MQ订阅消息处理
@@ -36,14 +39,22 @@ public class RocketMQListenerProcessor implements MessageListenerOrderly {
             try {
                 String topic = messageExt.getTopic();
                 String tags = messageExt.getTags();
-                String body = new String(messageExt.getBody(), "utf-8");
+                String body = new String(messageExt.getBody(),"utf-8");
                 log.info("MQ消息topic={}, tags={}, 消息内容={}", topic, tags, body);
                 if ("deletesysuser".equalsIgnoreCase(tags)) {
-                    cn.ibizlab.core.uaa.domain.SysUser domain = JSON.parseObject(new String(body),cn.ibizlab.core.uaa.domain.SysUser.class);
+                    JSONObject obj = JSONObject.parseObject(body);
+                    cn.ibizlab.core.uaa.domain.SysUser domain = new cn.ibizlab.core.uaa.domain.SysUser();
+                    for(Map.Entry<String, Object> entry :  obj.entrySet()){
+                        domain.set(entry.getKey(),entry.getValue());
+                    }
                     SysUserService.deleteSysUser(domain);
                 }
                 if ("savesysuser".equalsIgnoreCase(tags)) {
-                    cn.ibizlab.core.uaa.domain.SysUser domain = JSON.parseObject(new String(body),cn.ibizlab.core.uaa.domain.SysUser.class);
+                    JSONObject obj = JSONObject.parseObject(body);
+                    cn.ibizlab.core.uaa.domain.SysUser domain = new cn.ibizlab.core.uaa.domain.SysUser();
+                    for(Map.Entry<String, Object> entry :  obj.entrySet()){
+                        domain.set(entry.getKey(),entry.getValue());
+                    }
                     SysUserService.saveSysUser(domain);
                 }
             } catch (Exception e) {

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
 
-EXPOSE 40002
+EXPOSE 8081
 
 ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api-k8s.yaml

@@ -22,36 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 40002
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.180.237"      
-        - name: SERVER_PORT
-          value: "40002"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.100.243:8848"
-        - name: SPRING_REDIS_HOST
-          value: "172.16.100.243"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_A_5d9d78509"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "@6dEfb3@"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_A_5d9d78509"
-        - name: IBIZ_OAUTH2_ENABLE
-          value: "true"      
-        - name: NACOS
-          value: "172.16.100.243:8848"      
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
-          value: "ibizdev"      
+        - containerPort: 8081
         volumeMounts:
         - name: data
           mountPath: /app/file
@@ -71,9 +42,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 40002
-    targetPort: 40002
-    nodePort: 40002
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: ibzuaa-provider-api

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml

@@ -3,24 +3,9 @@ services:
   ibzuaa-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
     ports:
-      - "40002:40002"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=40002
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - IBIZ_OAUTH2_ENABLE=true
-      - NACOS=172.16.100.243:8848
-      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
     deploy:
       resources:
            limits:

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysAppDTO.java

@@ -20,11 +20,14 @@ import javax.validation.constraints.Size;
 import cn.ibizlab.util.domain.DTOBase;
 import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 服务DTO对象[SysAppDTO]
  */
 @Data
+@ApiModel("应用")
 public class SysAppDTO extends DTOBase implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -36,6 +39,7 @@ public class SysAppDTO extends DTOBase implements Serializable {
     @JSONField(name = "id")
     @JsonProperty("id")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("应用标识")
     private String id;
 
     /**
@@ -45,6 +49,7 @@ public class SysAppDTO extends DTOBase implements Serializable {
     @JSONField(name = "label")
     @JsonProperty("label")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("应用名")
     private String label;
 
     /**
@@ -54,6 +59,7 @@ public class SysAppDTO extends DTOBase implements Serializable {
     @JSONField(name = "systemid")
     @JsonProperty("systemid")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("系统标识")
     private String systemid;
 
     /**
@@ -63,6 +69,7 @@ public class SysAppDTO extends DTOBase implements Serializable {
     @JSONField(name = "fullname")
     @JsonProperty("fullname")
     @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
+    @ApiModelProperty("全称")
     private String fullname;
 
     /**
@@ -72,6 +79,7 @@ public class SysAppDTO extends DTOBase implements Serializable {
     @JSONField(name = "type")
     @JsonProperty("type")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("类型")
     private String type;
 
     /**
@@ -81,6 +89,7 @@ public class SysAppDTO extends DTOBase implements Serializable {
     @JSONField(name = "group")
     @JsonProperty("group")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("分组")
     private String group;
 
     /**
@@ -90,6 +99,7 @@ public class SysAppDTO extends DTOBase implements Serializable {
     @JSONField(name = "icon")
     @JsonProperty("icon")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("图标")
     private String icon;
 
     /**
@@ -98,6 +108,7 @@ public class SysAppDTO extends DTOBase implements Serializable {
      */
     @JSONField(name = "visabled")
     @JsonProperty("visabled")
+    @ApiModelProperty("可见")
     private Integer visabled;
 
     /**
@@ -107,6 +118,7 @@ public class SysAppDTO extends DTOBase implements Serializable {
     @JSONField(name = "addr")
     @JsonProperty("addr")
     @Size(min = 0, max = 300, message = "内容长度必须小于等于[300]")
+    @ApiModelProperty("地址")
     private String addr;
 
 

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysAuthLogDTO.java

@@ -20,11 +20,14 @@ import javax.validation.constraints.Size;
 import cn.ibizlab.util.domain.DTOBase;
 import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 服务DTO对象[SysAuthLogDTO]
  */
 @Data
+@ApiModel("认证日志")
 public class SysAuthLogDTO extends DTOBase implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -36,6 +39,7 @@ public class SysAuthLogDTO extends DTOBase implements Serializable {
     @JSONField(name = "logid")
     @JsonProperty("logid")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("标识")
     private String logid;
 
     /**
@@ -45,6 +49,7 @@ public class SysAuthLogDTO extends DTOBase implements Serializable {
     @JSONField(name = "username")
     @JsonProperty("username")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("用户全局名")
     private String username;
 
     /**
@@ -54,6 +59,7 @@ public class SysAuthLogDTO extends DTOBase implements Serializable {
     @JSONField(name = "personname")
     @JsonProperty("personname")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("用户名称")
     private String personname;
 
     /**
@@ -63,6 +69,7 @@ public class SysAuthLogDTO extends DTOBase implements Serializable {
     @JSONField(name = "domain")
     @JsonProperty("domain")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("域")
     private String domain;
 
     /**
@@ -72,6 +79,7 @@ public class SysAuthLogDTO extends DTOBase implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "authtime" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("authtime")
+    @ApiModelProperty("认证时间")
     private Timestamp authtime;
 
     /**
@@ -81,6 +89,7 @@ public class SysAuthLogDTO extends DTOBase implements Serializable {
     @JSONField(name = "ipaddr")
     @JsonProperty("ipaddr")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("IP地址")
     private String ipaddr;
 
     /**
@@ -90,6 +99,7 @@ public class SysAuthLogDTO extends DTOBase implements Serializable {
     @JSONField(name = "macaddr")
     @JsonProperty("macaddr")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("MAC地址")
     private String macaddr;
 
     /**
@@ -99,6 +109,7 @@ public class SysAuthLogDTO extends DTOBase implements Serializable {
     @JSONField(name = "useragent")
     @JsonProperty("useragent")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("客户端")
     private String useragent;
 
     /**
@@ -108,6 +119,7 @@ public class SysAuthLogDTO extends DTOBase implements Serializable {
     @JSONField(name = "authcode")
     @JsonProperty("authcode")
     @Size(min = 0, max = 15, message = "内容长度必须小于等于[15]")
+    @ApiModelProperty("认证结果")
     private String authcode;
 
 

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysOpenAccessDTO.java

@@ -20,11 +20,14 @@ import javax.validation.constraints.Size;
 import cn.ibizlab.util.domain.DTOBase;
 import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 服务DTO对象[SysOpenAccessDTO]
  */
 @Data
+@ApiModel("第三方认证平台")
 public class SysOpenAccessDTO extends DTOBase implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -36,6 +39,7 @@ public class SysOpenAccessDTO extends DTOBase implements Serializable {
     @JSONField(name = "id")
     @JsonProperty("id")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("开放平台接入标识")
     private String id;
 
     /**
@@ -45,6 +49,7 @@ public class SysOpenAccessDTO extends DTOBase implements Serializable {
     @JSONField(name = "name")
     @JsonProperty("name")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("开放平台")
     private String name;
 
     /**
@@ -54,6 +59,7 @@ public class SysOpenAccessDTO extends DTOBase implements Serializable {
     @JSONField(name = "open_type")
     @JsonProperty("open_type")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("开放平台类型")
     private String openType;
 
     /**
@@ -63,6 +69,7 @@ public class SysOpenAccessDTO extends DTOBase implements Serializable {
     @JSONField(name = "access_key")
     @JsonProperty("access_key")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("AccessKey(AppId)")
     private String accessKey;
 
     /**
@@ -72,6 +79,7 @@ public class SysOpenAccessDTO extends DTOBase implements Serializable {
     @JSONField(name = "secret_key")
     @JsonProperty("secret_key")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("SecretKey(AppSecret)")
     private String secretKey;
 
     /**
@@ -81,6 +89,7 @@ public class SysOpenAccessDTO extends DTOBase implements Serializable {
     @JSONField(name = "region_id")
     @JsonProperty("region_id")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("RegionId")
     private String regionId;
 
     /**
@@ -90,6 +99,7 @@ public class SysOpenAccessDTO extends DTOBase implements Serializable {
     @JSONField(name = "access_token")
     @JsonProperty("access_token")
     @Size(min = 0, max = 1000, message = "内容长度必须小于等于[1000]")
+    @ApiModelProperty("管理账号token")
     private String accessToken;
 
     /**
@@ -99,6 +109,7 @@ public class SysOpenAccessDTO extends DTOBase implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "expires_time" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("expires_time")
+    @ApiModelProperty("管理账号token过期时间")
     private Timestamp expiresTime;
 
     /**
@@ -107,6 +118,7 @@ public class SysOpenAccessDTO extends DTOBase implements Serializable {
      */
     @JSONField(name = "disabled")
     @JsonProperty("disabled")
+    @ApiModelProperty("是否禁用")
     private Integer disabled;
 
     /**
@@ -116,6 +128,7 @@ public class SysOpenAccessDTO extends DTOBase implements Serializable {
     @JSONField(name = "redirect_uri")
     @JsonProperty("redirect_uri")
     @Size(min = 0, max = 500, message = "内容长度必须小于等于[500]")
+    @ApiModelProperty("RedirectURI")
     private String redirectUri;
 
     /**
@@ -125,6 +138,7 @@ public class SysOpenAccessDTO extends DTOBase implements Serializable {
     @JSONField(name = "notify_url")
     @JsonProperty("notify_url")
     @Size(min = 0, max = 500, message = "内容长度必须小于等于[500]")
+    @ApiModelProperty("NotifyUrl")
     private String notifyUrl;
 
     /**
@@ -134,6 +148,7 @@ public class SysOpenAccessDTO extends DTOBase implements Serializable {
     @JSONField(name = "agent_id")
     @JsonProperty("agent_id")
     @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty("AGENT_ID")
     private Long agentId;
 
 

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysPermissionDTO.java

@@ -20,11 +20,14 @@ import javax.validation.constraints.Size;
 import cn.ibizlab.util.domain.DTOBase;
 import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 服务DTO对象[SysPermissionDTO]
  */
 @Data
+@ApiModel("权限/资源")
 public class SysPermissionDTO extends DTOBase implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -36,6 +39,7 @@ public class SysPermissionDTO extends DTOBase implements Serializable {
     @JSONField(name = "permissionid")
     @JsonProperty("permissionid")
     @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
+    @ApiModelProperty("资源标识")
     private String permissionid;
 
     /**
@@ -45,6 +49,7 @@ public class SysPermissionDTO extends DTOBase implements Serializable {
     @JSONField(name = "permissionname")
     @JsonProperty("permissionname")
     @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
+    @ApiModelProperty("资源名称")
     private String permissionname;
 
     /**
@@ -54,6 +59,7 @@ public class SysPermissionDTO extends DTOBase implements Serializable {
     @JSONField(name = "permissiontype")
     @JsonProperty("permissiontype")
     @Size(min = 0, max = 60, message = "内容长度必须小于等于[60]")
+    @ApiModelProperty("资源类别")
     private String permissiontype;
 
     /**
@@ -63,6 +69,7 @@ public class SysPermissionDTO extends DTOBase implements Serializable {
     @JSONField(name = "pssystemid")
     @JsonProperty("pssystemid")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("系统")
     private String pssystemid;
 
     /**
@@ -71,6 +78,7 @@ public class SysPermissionDTO extends DTOBase implements Serializable {
      */
     @JSONField(name = "enable")
     @JsonProperty("enable")
+    @ApiModelProperty("逻辑有效")
     private Integer enable;
 
     /**
@@ -80,6 +88,7 @@ public class SysPermissionDTO extends DTOBase implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("createdate")
+    @ApiModelProperty("建立时间")
     private Timestamp createdate;
 
     /**
@@ -89,6 +98,7 @@ public class SysPermissionDTO extends DTOBase implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
+    @ApiModelProperty("更新时间")
     private Timestamp updatedate;
 
 

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysRoleDTO.java

@@ -20,11 +20,14 @@ import javax.validation.constraints.Size;
 import cn.ibizlab.util.domain.DTOBase;
 import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 服务DTO对象[SysRoleDTO]
  */
 @Data
+@ApiModel("系统角色")
 public class SysRoleDTO extends DTOBase implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -36,6 +39,7 @@ public class SysRoleDTO extends DTOBase implements Serializable {
     @JSONField(name = "roleid")
     @JsonProperty("roleid")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("角色标识")
     private String roleid;
 
     /**
@@ -45,6 +49,7 @@ public class SysRoleDTO extends DTOBase implements Serializable {
     @JSONField(name = "rolename")
     @JsonProperty("rolename")
     @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
+    @ApiModelProperty("角色名称")
     private String rolename;
 
     /**
@@ -54,6 +59,7 @@ public class SysRoleDTO extends DTOBase implements Serializable {
     @JSONField(name = "memo")
     @JsonProperty("memo")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("备注")
     private String memo;
 
     /**
@@ -63,6 +69,7 @@ public class SysRoleDTO extends DTOBase implements Serializable {
     @JSONField(name = "proleid")
     @JsonProperty("proleid")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("父角色标识")
     private String proleid;
 
     /**
@@ -72,6 +79,7 @@ public class SysRoleDTO extends DTOBase implements Serializable {
     @JSONField(name = "prolename")
     @JsonProperty("prolename")
     @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
+    @ApiModelProperty("父角色名称")
     private String prolename;
 
     /**
@@ -81,6 +89,7 @@ public class SysRoleDTO extends DTOBase implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("createdate")
+    @ApiModelProperty("建立时间")
     private Timestamp createdate;
 
     /**
@@ -90,6 +99,7 @@ public class SysRoleDTO extends DTOBase implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
+    @ApiModelProperty("更新时间")
     private Timestamp updatedate;
 
     /**
@@ -99,6 +109,7 @@ public class SysRoleDTO extends DTOBase implements Serializable {
     @JSONField(name = "createman")
     @JsonProperty("createman")
     @Size(min = 0, max = 60, message = "内容长度必须小于等于[60]")
+    @ApiModelProperty("建立人")
     private String createman;
 
     /**
@@ -108,6 +119,7 @@ public class SysRoleDTO extends DTOBase implements Serializable {
     @JSONField(name = "updateman")
     @JsonProperty("updateman")
     @Size(min = 0, max = 60, message = "内容长度必须小于等于[60]")
+    @ApiModelProperty("更新人")
     private String updateman;
 
 

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysRolePermissionDTO.java

@@ -20,11 +20,14 @@ import javax.validation.constraints.Size;
 import cn.ibizlab.util.domain.DTOBase;
 import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 服务DTO对象[SysRolePermissionDTO]
  */
 @Data
+@ApiModel("角色权限关系")
 public class SysRolePermissionDTO extends DTOBase implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -36,6 +39,7 @@ public class SysRolePermissionDTO extends DTOBase implements Serializable {
     @JSONField(name = "rolepermissionid")
     @JsonProperty("rolepermissionid")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("角色权限关系表标识")
     private String rolepermissionid;
 
     /**
@@ -45,6 +49,7 @@ public class SysRolePermissionDTO extends DTOBase implements Serializable {
     @JSONField(name = "roleid")
     @JsonProperty("roleid")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("角色表标识")
     private String roleid;
 
     /**
@@ -54,6 +59,7 @@ public class SysRolePermissionDTO extends DTOBase implements Serializable {
     @JSONField(name = "rolename")
     @JsonProperty("rolename")
     @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
+    @ApiModelProperty("角色名称")
     private String rolename;
 
     /**
@@ -63,6 +69,7 @@ public class SysRolePermissionDTO extends DTOBase implements Serializable {
     @JSONField(name = "permissionid")
     @JsonProperty("permissionid")
     @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
+    @ApiModelProperty("权限表标识")
     private String permissionid;
 
     /**
@@ -72,6 +79,7 @@ public class SysRolePermissionDTO extends DTOBase implements Serializable {
     @JSONField(name = "permissionname")
     @JsonProperty("permissionname")
     @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
+    @ApiModelProperty("权限名称")
     private String permissionname;
 
     /**
@@ -81,6 +89,7 @@ public class SysRolePermissionDTO extends DTOBase implements Serializable {
     @JSONField(name = "permissiontype")
     @JsonProperty("permissiontype")
     @Size(min = 0, max = 60, message = "内容长度必须小于等于[60]")
+    @ApiModelProperty("权限类型")
     private String permissiontype;
 
     /**
@@ -89,6 +98,7 @@ public class SysRolePermissionDTO extends DTOBase implements Serializable {
      */
     @JSONField(name = "permissionenable")
     @JsonProperty("permissionenable")
+    @ApiModelProperty("权限类型")
     private Integer permissionenable;
 
     /**
@@ -98,6 +108,7 @@ public class SysRolePermissionDTO extends DTOBase implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("createdate")
+    @ApiModelProperty("建立时间")
     private Timestamp createdate;
 
     /**
@@ -107,6 +118,7 @@ public class SysRolePermissionDTO extends DTOBase implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
+    @ApiModelProperty("更新时间")
     private Timestamp updatedate;
 
 

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysUserAuthDTO.java

@@ -20,11 +20,14 @@ import javax.validation.constraints.Size;
 import cn.ibizlab.util.domain.DTOBase;
 import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 服务DTO对象[SysUserAuthDTO]
  */
 @Data
+@ApiModel("账号绑定")
 public class SysUserAuthDTO extends DTOBase implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -36,6 +39,7 @@ public class SysUserAuthDTO extends DTOBase implements Serializable {
     @JSONField(name = "id")
     @JsonProperty("id")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("标识")
     private String id;
 
     /**
@@ -45,6 +49,7 @@ public class SysUserAuthDTO extends DTOBase implements Serializable {
     @JSONField(name = "userid")
     @JsonProperty("userid")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("用户标识")
     private String userid;
 
     /**
@@ -54,6 +59,7 @@ public class SysUserAuthDTO extends DTOBase implements Serializable {
     @JSONField(name = "identity_type")
     @JsonProperty("identity_type")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("认证类型")
     private String identityType;
 
     /**
@@ -63,6 +69,7 @@ public class SysUserAuthDTO extends DTOBase implements Serializable {
     @JSONField(name = "identifier")
     @JsonProperty("identifier")
     @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
+    @ApiModelProperty("认证标识")
     private String identifier;
 
     /**
@@ -72,6 +79,7 @@ public class SysUserAuthDTO extends DTOBase implements Serializable {
     @JSONField(name = "credential")
     @JsonProperty("credential")
     @Size(min = 0, max = 500, message = "内容长度必须小于等于[500]")
+    @ApiModelProperty("凭据")
     private String credential;
 
     /**
@@ -81,6 +89,7 @@ public class SysUserAuthDTO extends DTOBase implements Serializable {
     @JSONField(name = "username")
     @JsonProperty("username")
     @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
+    @ApiModelProperty("人员")
     private String username;
 
 

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysUserDTO.java

@@ -20,11 +20,14 @@ import javax.validation.constraints.Size;
 import cn.ibizlab.util.domain.DTOBase;
 import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 服务DTO对象[SysUserDTO]
  */
 @Data
+@ApiModel("系统用户")
 public class SysUserDTO extends DTOBase implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -36,6 +39,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "userid")
     @JsonProperty("userid")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("用户标识")
     private String userid;
 
     /**
@@ -45,6 +49,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "username")
     @JsonProperty("username")
     @Size(min = 0, max = 200, message = "内容长度必须小于等于[200]")
+    @ApiModelProperty("用户全局名")
     private String username;
 
     /**
@@ -54,6 +59,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "personname")
     @JsonProperty("personname")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("用户姓名")
     private String personname;
 
     /**
@@ -64,6 +70,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JsonProperty("usercode")
     @NotBlank(message = "[用户工号]不允许为空!")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("用户工号")
     private String usercode;
 
     /**
@@ -73,6 +80,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "password")
     @JsonProperty("password")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("密码")
     private String password;
 
     /**
@@ -83,6 +91,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JsonProperty("loginname")
     @NotBlank(message = "[登录名]不允许为空!")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("登录名")
     private String loginname;
 
     /**
@@ -92,6 +101,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "domains")
     @JsonProperty("domains")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("区属")
     private String domains;
 
     /**
@@ -101,6 +111,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "mdeptid")
     @JsonProperty("mdeptid")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("主部门")
     private String mdeptid;
 
     /**
@@ -110,6 +121,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "mdeptcode")
     @JsonProperty("mdeptcode")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("主部门代码")
     private String mdeptcode;
 
     /**
@@ -119,6 +131,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "mdeptname")
     @JsonProperty("mdeptname")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("主部门名称")
     private String mdeptname;
 
     /**
@@ -128,6 +141,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "bcode")
     @JsonProperty("bcode")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("业务编码")
     private String bcode;
 
     /**
@@ -137,6 +151,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "postid")
     @JsonProperty("postid")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("岗位标识")
     private String postid;
 
     /**
@@ -146,6 +161,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "postcode")
     @JsonProperty("postcode")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("岗位代码")
     private String postcode;
 
     /**
@@ -155,6 +171,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "postname")
     @JsonProperty("postname")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("岗位名称")
     private String postname;
 
     /**
@@ -164,6 +181,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "orgid")
     @JsonProperty("orgid")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("单位")
     private String orgid;
 
     /**
@@ -173,6 +191,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "orgcode")
     @JsonProperty("orgcode")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("单位代码")
     private String orgcode;
 
     /**
@@ -182,6 +201,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "orgname")
     @JsonProperty("orgname")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("单位名称")
     private String orgname;
 
     /**
@@ -191,6 +211,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "nickname")
     @JsonProperty("nickname")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("昵称别名")
     private String nickname;
 
     /**
@@ -200,6 +221,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "sex")
     @JsonProperty("sex")
     @Size(min = 0, max = 20, message = "内容长度必须小于等于[20]")
+    @ApiModelProperty("性别")
     private String sex;
 
     /**
@@ -209,6 +231,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "birthday" , format="yyyy-MM-dd")
     @JsonProperty("birthday")
+    @ApiModelProperty("出生日期")
     private Timestamp birthday;
 
     /**
@@ -218,6 +241,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "certcode")
     @JsonProperty("certcode")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("证件号码")
     private String certcode;
 
     /**
@@ -227,6 +251,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "phone")
     @JsonProperty("phone")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("联系方式")
     private String phone;
 
     /**
@@ -236,6 +261,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "email")
     @JsonProperty("email")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("邮件")
     private String email;
 
     /**
@@ -245,6 +271,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "avatar")
     @JsonProperty("avatar")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("社交账号")
     private String avatar;
 
     /**
@@ -254,6 +281,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "addr")
     @JsonProperty("addr")
     @Size(min = 0, max = 255, message = "内容长度必须小于等于[255]")
+    @ApiModelProperty("地址")
     private String addr;
 
     /**
@@ -263,6 +291,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "usericon")
     @JsonProperty("usericon")
     @Size(min = 0, max = 255, message = "内容长度必须小于等于[255]")
+    @ApiModelProperty("照片")
     private String usericon;
 
     /**
@@ -272,6 +301,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "theme")
     @JsonProperty("theme")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("样式")
     private String theme;
 
     /**
@@ -281,6 +311,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "lang")
     @JsonProperty("lang")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("语言")
     private String lang;
 
     /**
@@ -290,6 +321,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "fontsize")
     @JsonProperty("fontsize")
     @Size(min = 0, max = 10, message = "内容长度必须小于等于[10]")
+    @ApiModelProperty("字号")
     private String fontsize;
 
     /**
@@ -299,6 +331,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "memo")
     @JsonProperty("memo")
     @Size(min = 0, max = 255, message = "内容长度必须小于等于[255]")
+    @ApiModelProperty("备注")
     private String memo;
 
     /**
@@ -308,6 +341,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
     @JSONField(name = "reserver")
     @JsonProperty("reserver")
     @Size(min = 0, max = 255, message = "内容长度必须小于等于[255]")
+    @ApiModelProperty("保留")
     private String reserver;
 
     /**
@@ -316,6 +350,7 @@ public class SysUserDTO extends DTOBase implements Serializable {
      */
     @JSONField(name = "superuser")
     @JsonProperty("superuser")
+    @ApiModelProperty("超级管理员")
     private Integer superuser;
 
 

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SysUserRoleDTO.java

@@ -20,11 +20,14 @@ import javax.validation.constraints.Size;
 import cn.ibizlab.util.domain.DTOBase;
 import cn.ibizlab.util.domain.DTOClient;
 import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 服务DTO对象[SysUserRoleDTO]
  */
 @Data
+@ApiModel("用户角色关系")
 public class SysUserRoleDTO extends DTOBase implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -36,6 +39,7 @@ public class SysUserRoleDTO extends DTOBase implements Serializable {
     @JSONField(name = "userroleid")
     @JsonProperty("userroleid")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("用户角色关系标识")
     private String userroleid;
 
     /**
@@ -45,6 +49,7 @@ public class SysUserRoleDTO extends DTOBase implements Serializable {
     @JSONField(name = "roleid")
     @JsonProperty("roleid")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("角色标识")
     private String roleid;
 
     /**
@@ -54,6 +59,7 @@ public class SysUserRoleDTO extends DTOBase implements Serializable {
     @JSONField(name = "rolename")
     @JsonProperty("rolename")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("角色名称")
     private String rolename;
 
     /**
@@ -63,6 +69,7 @@ public class SysUserRoleDTO extends DTOBase implements Serializable {
     @JSONField(name = "userid")
     @JsonProperty("userid")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("用户标识")
     private String userid;
 
     /**
@@ -72,6 +79,7 @@ public class SysUserRoleDTO extends DTOBase implements Serializable {
     @JSONField(name = "personname")
     @JsonProperty("personname")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("用户名称")
     private String personname;
 
     /**
@@ -81,6 +89,7 @@ public class SysUserRoleDTO extends DTOBase implements Serializable {
     @JSONField(name = "loginname")
     @JsonProperty("loginname")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("登录名")
     private String loginname;
 
     /**
@@ -90,6 +99,7 @@ public class SysUserRoleDTO extends DTOBase implements Serializable {
     @JSONField(name = "orgname")
     @JsonProperty("orgname")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("单位")
     private String orgname;
 
     /**
@@ -99,6 +109,7 @@ public class SysUserRoleDTO extends DTOBase implements Serializable {
     @JSONField(name = "mdeptname")
     @JsonProperty("mdeptname")
     @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
+    @ApiModelProperty("主部门")
     private String mdeptname;
 
     /**
@@ -108,6 +119,7 @@ public class SysUserRoleDTO extends DTOBase implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("createdate")
+    @ApiModelProperty("建立时间")
     private Timestamp createdate;
 
     /**
@@ -117,6 +129,7 @@ public class SysUserRoleDTO extends DTOBase implements Serializable {
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
     @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
     @JsonProperty("updatedate")
+    @ApiModelProperty("更新时间")
     private Timestamp updatedate;
 
 

ibzuaa-util/src/main/java/cn/ibizlab/util/client/IBZUAAFallback.java

@@ -2,6 +2,7 @@ package cn.ibizlab.util.client;
 
 import cn.ibizlab.util.security.AuthenticationUser;
 import cn.ibizlab.util.security.AuthorizationLogin;
+import org.springframework.util.MultiValueMap;
 import org.springframework.stereotype.Component;
 import com.alibaba.fastjson.JSONObject;
 

ibzuaa-util/src/main/java/cn/ibizlab/util/client/IBZUAAFeignClient.java

@@ -5,6 +5,7 @@ import cn.ibizlab.util.security.AuthorizationLogin;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.util.MultiValueMap;
 import com.alibaba.fastjson.JSONObject;
 
 @FeignClient(value = "${ibiz.ref.service.uaa:ibzuaa-api}",contextId = "uaa",fallback = IBZUAAFallback.class)