🎨 Improving structure / format of the code.修正部分实体属性错误注释,移除菜单树实体上部分无用属性,添加swagger实体属性说明

pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java

@@ -37,7 +37,7 @@ import java.io.Serializable;
 @NoArgsConstructor
 @AllArgsConstructor
 @Accessors(chain = true)
-@ApiModel(description = "响应信息主体")
+@ApiModel(value = "响应信息主体")
 public class R<T> implements Serializable {
 	private static final long serialVersionUID = 1L;
 

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/DeptTree.java

@@ -19,6 +19,8 @@
 
 package com.pig4cloud.pigx.admin.api.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,7 +30,9 @@ import lombok.EqualsAndHashCode;
  * 部门树
  */
 @Data
+@ApiModel(value = "部门树")
 @EqualsAndHashCode(callSuper = true)
 public class DeptTree extends TreeNode {
+	@ApiModelProperty(value = "部门名称")
 	private String name;
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java

@@ -20,6 +20,8 @@
 package com.pig4cloud.pigx.admin.api.dto;
 
 import com.pig4cloud.pigx.admin.api.vo.MenuVO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,18 +30,49 @@ import lombok.EqualsAndHashCode;
  * @date 2017年11月9日23:33:27
  */
 @Data
+@ApiModel(value = "菜单树")
 @EqualsAndHashCode(callSuper = true)
 public class MenuTree extends TreeNode {
+	/**
+	 * 菜单图标
+	 */
+	@ApiModelProperty(value = "菜单图标")
 	private String icon;
+	/**
+	 *  菜单名称
+	 */
+	@ApiModelProperty(value = "菜单名称")
 	private String name;
 	private boolean spread = false;
+	/**
+	 * 前端路由标识路径
+	 */
+	@ApiModelProperty(value = "前端路由标识路径")
 	private String path;
-	private String authority;
-	private String redirect;
+	/**
+	 * 路由缓冲
+	 */
+	@ApiModelProperty(value = "路由缓冲")
 	private String keepAlive;
+	/**
+	 * 权限编码
+	 */
+	@ApiModelProperty(value = "权限编码")
 	private String code;
+	/**
+	 * 菜单类型 （0菜单 1按钮）
+	 */
+	@ApiModelProperty(value = "菜单类型,0:菜单 1:按钮")
 	private String type;
+	/**
+	 * 菜单标签
+	 */
+	@ApiModelProperty(value = "菜单标签")
 	private String label;
+	/**
+	 * 排序值
+	 */
+	@ApiModelProperty(value = "排序值")
 	private Integer sort;
 
 	public MenuTree() {

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/TreeNode.java

@@ -19,6 +19,8 @@
 
 package com.pig4cloud.pigx.admin.api.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -29,9 +31,13 @@ import java.util.List;
  * @date 2017年11月9日23:33:45
  */
 @Data
+@ApiModel(value = "树形节点")
 public class TreeNode {
+	@ApiModelProperty(value = "当前节点id")
 	protected int id;
+	@ApiModelProperty(value = "父节点id")
 	protected int parentId;
+	@ApiModelProperty(value = "子节点列表")
 	protected List<TreeNode> children = new ArrayList<TreeNode>();
 
 	public void add(TreeNode node) {

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserDTO.java

@@ -20,6 +20,8 @@
 package com.pig4cloud.pigx.admin.api.dto;
 
 import com.pig4cloud.pigx.admin.api.entity.SysUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -30,17 +32,22 @@ import java.util.List;
  * @date 2017/11/5
  */
 @Data
+@ApiModel(value = "系统用户传输对象")
 @EqualsAndHashCode(callSuper = true)
 public class UserDTO extends SysUser {
 	/**
 	 * 角色ID
 	 */
+	@ApiModelProperty(value = "角色id集合")
 	private List<Integer> role;
-
+	/**
+	 * 部门id
+	 */
+	@ApiModelProperty(value = "部门id")
 	private Integer deptId;
-
 	/**
 	 * 新密码
 	 */
+	@ApiModelProperty(value = "新密码")
 	private String newpassword1;
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/UserInfo.java

@@ -20,6 +20,8 @@
 package com.pig4cloud.pigx.admin.api.dto;
 
 import com.pig4cloud.pigx.admin.api.entity.SysUser;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,26 +29,23 @@ import java.io.Serializable;
 /**
  * @author lengleng
  * @date 2017/11/11
- * <p>
- * commit('SET_ROLES', data)
- * commit('SET_NAME', data)
- * commit('SET_AVATAR', data)
- * commit('SET_INTRODUCTION', data)
- * commit('SET_PERMISSIONS', data)
  */
 @Data
+@ApiModel(value = "用户信息")
 public class UserInfo implements Serializable {
 	/**
 	 * 用户基本信息
 	 */
+	@ApiModelProperty(value = "用户基本信息")
 	private SysUser sysUser;
 	/**
 	 * 权限标识集合
 	 */
+	@ApiModelProperty(value = "权限标识集合")
 	private String[] permissions;
-
 	/**
 	 * 角色集合
 	 */
+	@ApiModelProperty(value = "角色标识集合")
 	private Integer[] roles;
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java

@@ -23,6 +23,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -39,38 +41,47 @@ import java.time.LocalDateTime;
  * @since 2018-01-22
  */
 @Data
+@ApiModel(value = "部门")
 @EqualsAndHashCode(callSuper = true)
 public class SysDept extends Model<SysDept> {
 
 	private static final long serialVersionUID = 1L;
 
 	@TableId(value = "dept_id", type = IdType.AUTO)
+	@ApiModelProperty(value = "部门id")
 	private Integer deptId;
 	/**
 	 * 部门名称
 	 */
 	@NotBlank(message = "部门名称不能为空")
+	@ApiModelProperty(value = "部门名称")
 	private String name;
 	/**
 	 * 排序
 	 */
 	@NotEmpty(message = "排序值不能为空")
+	@ApiModelProperty(value = "排序值")
 	private Integer sort;
 	/**
 	 * 创建时间
 	 */
+	@ApiModelProperty(value = "创建时间")
 	private LocalDateTime createTime;
 	/**
 	 * 修改时间
 	 */
+	@ApiModelProperty(value = "修改时间")
 	private LocalDateTime updateTime;
-
+	/**
+	 * 父级部门id
+	 */
+	@ApiModelProperty(value = "父级部门id")
 	private Integer parentId;
-
 	/**
 	 * 是否删除  -1：已删除  0：正常
 	 */
 	@TableLogic
+	@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
 	private String delFlag;
 
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java

@@ -20,6 +20,8 @@
 package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -32,18 +34,20 @@ import lombok.EqualsAndHashCode;
  * @since 2018-01-22
  */
 @Data
+@ApiModel(value = "部门关系")
 @EqualsAndHashCode(callSuper = true)
 public class SysDeptRelation extends Model<SysDeptRelation> {
 
 	private static final long serialVersionUID = 1L;
-
 	/**
 	 * 祖先节点
 	 */
+	@ApiModelProperty(value = "祖先节点")
 	private Integer ancestor;
 	/**
 	 * 后代节点
 	 */
+	@ApiModelProperty(value = "后代节点")
 	private Integer descendant;
 
 

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java

@@ -20,6 +20,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -32,6 +34,7 @@ import java.time.LocalDateTime;
  * @date 2019/03/19
  */
 @Data
+@ApiModel(value = "字典类型")
 @EqualsAndHashCode(callSuper = true)
 public class SysDict extends Model<SysDict> {
 	private static final long serialVersionUID = 1L;
@@ -40,40 +43,49 @@ public class SysDict extends Model<SysDict> {
 	 * 编号
 	 */
 	@TableId
+	@ApiModelProperty(value = "字典编号")
 	private Integer id;
 	/**
 	 * 类型
 	 */
+	@ApiModelProperty(value = "字典类型")
 	private String type;
 	/**
 	 * 描述
 	 */
+	@ApiModelProperty(value = "字典描述")
 	private String description;
 	/**
 	 * 创建时间
 	 */
+	@ApiModelProperty(value = "创建时间")
 	private LocalDateTime createTime;
 	/**
 	 * 更新时间
 	 */
+	@ApiModelProperty(value = "更新时间")
 	private LocalDateTime updateTime;
 	/**
 	 * 是否是系统内置
 	 */
 	@TableField(value = "`system`")
+	@ApiModelProperty(value = "是否系统内置")
 	private String system;
 	/**
 	 * 备注信息
 	 */
+	@ApiModelProperty (value = "备注信息")
 	private String remarks;
 	/**
 	 * 删除标记
 	 */
 	@TableLogic
+	@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
 	private String delFlag;
 	/**
 	 * 所属租户
 	 */
+	@ApiModelProperty(value = "所属租户")
 	private Integer tenantId;
 
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDictItem.java

@@ -18,8 +18,9 @@ package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -32,59 +33,71 @@ import java.time.LocalDateTime;
  * @date 2019/03/19
  */
 @Data
+@ApiModel(value = "字典项")
 @EqualsAndHashCode(callSuper = true)
 public class SysDictItem extends Model<SysDictItem> {
 	private static final long serialVersionUID = 1L;
-
 	/**
 	 * 编号
 	 */
 	@TableId
+	@ApiModelProperty(value = "字典项id")
 	private Integer id;
 	/**
-	 *
+	 * 所属字典类id
 	 */
+	@ApiModelProperty(value = "所属字典类id")
 	private Integer dictId;
 	/**
 	 * 数据值
 	 */
+	@ApiModelProperty(value = "数据值")
 	private String value;
 	/**
 	 * 标签名
 	 */
+	@ApiModelProperty(value = "标签名")
 	private String label;
 	/**
 	 * 类型
 	 */
+	@ApiModelProperty(value = "类型")
 	private String type;
 	/**
 	 * 描述
 	 */
+	@ApiModelProperty(value = "描述")
 	private String description;
 	/**
 	 * 排序（升序）
 	 */
+	@ApiModelProperty(value = "排序值，默认升序")
 	private Integer sort;
 	/**
 	 * 创建时间
 	 */
+	@ApiModelProperty(value = "创建时间")
 	private LocalDateTime createTime;
 	/**
 	 * 更新时间
 	 */
+	@ApiModelProperty(value = "更新时间")
 	private LocalDateTime updateTime;
 	/**
 	 * 备注信息
 	 */
+	@ApiModelProperty(value = "备注信息")
 	private String remarks;
 	/**
 	 * 删除标记
 	 */
 	@TableLogic
+	@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
 	private String delFlag;
 	/**
 	 * 所属租户
 	 */
+	@ApiModelProperty(value = "所属租户id")
 	private Integer tenantId;
 
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysFile.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -34,8 +35,8 @@ import java.time.LocalDateTime;
  * @date 2019-06-18 17:18:42
  */
 @Data
+@ApiModel(value = "文件")
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(description = "文件管理")
 public class SysFile extends Model<SysFile> {
 	private static final long serialVersionUID = 1L;
 
@@ -43,46 +44,57 @@ public class SysFile extends Model<SysFile> {
 	 * 编号
 	 */
 	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "文件编号")
 	private Long id;
 	/**
 	 * 文件名
 	 */
+	@ApiModelProperty(value = "文件名")
 	private String fileName;
 	/**
 	 * 原文件名
 	 */
+	@ApiModelProperty(value = "原始文件名")
 	private String original;
 	/**
 	 * 容器名称
 	 */
+	@ApiModelProperty(value = "存储桶名称")
 	private String bucketName;
 	/**
 	 * 文件类型
 	 */
+	@ApiModelProperty(value = "文件类型")
 	private String type;
 	/**
 	 * 文件大小
 	 */
+	@ApiModelProperty(value = "文件大小")
 	private Long fileSize;
 	/**
 	 * 上传人
 	 */
+	@ApiModelProperty(value = "创建者")
 	private String createUser;
 	/**
 	 * 上传时间
 	 */
+	@ApiModelProperty(value = "创建时间")
 	private LocalDateTime createTime;
 	/**
 	 * 更新人
 	 */
+	@ApiModelProperty(value = "更新者")
 	private String updateUser;
 	/**
 	 * 更新时间
 	 */
+	@ApiModelProperty(value = "更新时间")
 	private LocalDateTime updateTime;
 	/**
 	 * 删除标识：1-删除，0-正常
 	 */
 	@TableLogic
+	@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
 	private Integer delFlag;
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java

@@ -22,6 +22,8 @@ package com.pig4cloud.pigx.admin.api.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -37,6 +39,7 @@ import java.time.LocalDateTime;
  * @since 2017-11-20
  */
 @Data
+@ApiModel(value = "日志")
 public class SysLog implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -44,69 +47,81 @@ public class SysLog implements Serializable {
 	/**
 	 * 编号
 	 */
-	@TableId(value = "id", type = IdType.AUTO)
+	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "日志编号")
 	private Long id;
 	/**
 	 * 日志类型
 	 */
 	@NotBlank(message = "日志类型不能为空")
+	@ApiModelProperty(value = "日志类型")
 	private String type;
 	/**
 	 * 日志标题
 	 */
 	@NotBlank(message = "日志标题不能为空")
+	@ApiModelProperty(value = "日志标题")
 	private String title;
 	/**
 	 * 创建者
 	 */
+	@ApiModelProperty(value = "创建人")
 	private String createBy;
 	/**
 	 * 创建时间
 	 */
+	@ApiModelProperty(value = "创建时间")
 	private LocalDateTime createTime;
 	/**
 	 * 更新时间
 	 */
+	@ApiModelProperty(value = "更新时间")
 	private LocalDateTime updateTime;
 	/**
 	 * 操作IP地址
 	 */
+	@ApiModelProperty(value = "操作ip地址")
 	private String remoteAddr;
 	/**
 	 * 用户代理
 	 */
+	@ApiModelProperty(value = "用户代理")
 	private String userAgent;
 	/**
 	 * 请求URI
 	 */
+	@ApiModelProperty(value = "请求uri")
 	private String requestUri;
 	/**
 	 * 操作方式
 	 */
+	@ApiModelProperty(value = "操作方式")
 	private String method;
 	/**
 	 * 操作提交的数据
 	 */
+	@ApiModelProperty(value = "提交数据")
 	private String params;
 	/**
 	 * 执行时间
 	 */
+	@ApiModelProperty(value = "方法执行时间")
 	private Long time;
-
 	/**
 	 * 异常信息
 	 */
+	@ApiModelProperty(value = "异常信息")
 	private String exception;
-
 	/**
 	 * 服务ID
 	 */
+	@ApiModelProperty(value = "应用标识")
 	private String serviceId;
-
 	/**
 	 * 删除标记
 	 */
 	@TableLogic
+	@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
 	private String delFlag;
 
 

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java

@@ -23,6 +23,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -39,64 +41,75 @@ import java.time.LocalDateTime;
  * @since 2017-11-08
  */
 @Data
+@ApiModel(value = "菜单")
 @EqualsAndHashCode(callSuper = true)
 public class SysMenu extends Model<SysMenu> {
 
 	private static final long serialVersionUID = 1L;
-
 	/**
 	 * 菜单ID
 	 */
 	@TableId(value = "menu_id", type = IdType.AUTO)
+	@ApiModelProperty(value = "菜单id")
 	private Integer menuId;
 	/**
 	 * 菜单名称
 	 */
 	@NotBlank(message = "菜单名称不能为空")
+	@ApiModelProperty(value = "菜单名称")
 	private String name;
 	/**
 	 * 菜单权限标识
 	 */
+	@ApiModelProperty(value = "菜单权限标识")
 	private String permission;
 	/**
 	 * 父菜单ID
 	 */
 	@NotNull(message = "菜单父ID不能为空")
+	@ApiModelProperty(value = "菜单父id")
 	private Integer parentId;
 	/**
 	 * 图标
 	 */
+	@ApiModelProperty(value = "菜单图标")
 	private String icon;
-
 	/**
 	 * 前端路由标识路径，默认和 comment 保持一致
 	 * 过期
 	 */
+	@ApiModelProperty(value = "前端路由标识路径")
 	private String path;
 	/**
 	 * 排序值
 	 */
+	@ApiModelProperty(value = "排序值")
 	private Integer sort;
 	/**
 	 * 菜单类型 （0菜单 1按钮）
 	 */
 	@NotNull(message = "菜单类型不能为空")
+	@ApiModelProperty(value = "菜单类型,0:菜单 1:按钮")
 	private String type;
 	/**
 	 * 路由缓冲
 	 */
+	@ApiModelProperty(value = "路由缓冲")
 	private String keepAlive;
 	/**
 	 * 创建时间
 	 */
+	@ApiModelProperty(value = "创建时间")
 	private LocalDateTime createTime;
 	/**
 	 * 更新时间
 	 */
+	@ApiModelProperty(value = "更新时间")
 	private LocalDateTime updateTime;
 	/**
 	 * 0--正常 1--删除
 	 */
 	@TableLogic
+	@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
 	private String delFlag;
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java

@@ -22,6 +22,8 @@ package com.pig4cloud.pigx.admin.api.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -37,67 +39,68 @@ import java.io.Serializable;
  * @since 2018-05-15
  */
 @Data
+@ApiModel(value = "客户端信息")
 @EqualsAndHashCode(callSuper = true)
 public class SysOauthClientDetails extends Model<SysOauthClientDetails> {
 
 	private static final long serialVersionUID = 1L;
-
 	/**
 	 * 客户端ID
 	 */
 	@NotBlank(message = "client_id 不能为空")
 	@TableId(value = "client_id", type = IdType.INPUT)
+	@ApiModelProperty(value = "客户端id")
 	private String clientId;
-
 	/**
 	 * 客户端密钥
 	 */
 	@NotBlank(message = "client_secret 不能为空")
+	@ApiModelProperty(value = "客户端密钥")
 	private String clientSecret;
-
 	/**
 	 * 资源ID
 	 */
+	@ApiModelProperty(value = "资源id列表")
 	private String resourceIds;
-
 	/**
 	 * 作用域
 	 */
 	@NotBlank(message = "scope 不能为空")
+	@ApiModelProperty(value = "作用域")
 	private String scope;
-
 	/**
 	 * 授权方式（A,B,C）
 	 */
+	@ApiModelProperty(value = "授权方式")
 	private String authorizedGrantTypes;
-
+	/**
+	 * 回调地址
+	 */
+	@ApiModelProperty(value = "回调地址")
 	private String webServerRedirectUri;
-
+	/**
+	 * 权限
+	 */
+	@ApiModelProperty(value = "权限列表")
 	private String authorities;
-
 	/**
 	 * 请求令牌有效时间
 	 */
+	@ApiModelProperty(value = "请求令牌有效时间")
 	private Integer accessTokenValidity;
-
 	/**
 	 * 刷新令牌有效时间
 	 */
+	@ApiModelProperty(value = "刷新令牌有效时间")
 	private Integer refreshTokenValidity;
-
 	/**
 	 * 扩展信息
 	 */
+	@ApiModelProperty(value = "扩展信息")
 	private String additionalInformation;
-
 	/**
 	 * 是否自动放行
 	 */
+	@ApiModelProperty(value = "是否自动放行")
 	private String autoapprove;
-
-	@Override
-	protected Serializable pkVal() {
-		return this.clientId;
-	}
-
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java

@@ -37,83 +37,67 @@ import java.util.Date;
  * @date 2019-04-29
  */
 @Data
+@ApiModel(value = "公共参数")
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(description = "公共参数")
 public class SysPublicParam extends Model<SysPublicParam> {
 	private static final long serialVersionUID = 1L;
-
 	/**
 	 * 编号
 	 */
 	@TableId
+	@ApiModelProperty(value = "公共参数编号")
 	private Long publicId;
-
 	/**
 	 * 公共参数名称
 	 */
 	@ApiModelProperty(value = "公共参数名称", required = true, example = "公共参数名称")
 	private String publicName;
-
 	/**
 	 * 公共参数地址值,英文大写+下划线
 	 */
 	@ApiModelProperty(value = "键[英文大写+下划线]", required = true, example = "PIGX_PUBLIC_KEY")
 	private String publicKey;
-
 	/**
 	 * 值
 	 */
 	@ApiModelProperty(value = "值", required = true, example = "999")
 	private String publicValue;
-
 	/**
 	 * 状态（1有效；2无效；）
 	 */
 	@ApiModelProperty(value = "标识[1有效；2无效]", example = "1")
 	private String status;
-
 	/**
 	 * 删除状态（0：正常 1：已删除）
 	 */
 	@TableLogic
 	@ApiModelProperty(value = "状态[0-正常，1-删除]", example = "0")
 	private String delFlag;
-
 	/**
 	 * 公共参数编码
 	 */
 	@ApiModelProperty(value = "编码", example = "^(PIG|PIGX)$")
 	private String validateCode;
-
 	/**
 	 * 创建时间
 	 */
 	@ApiModelProperty(value = "创建时间", example = "2019-03-21 12:28:48")
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
-
 	/**
 	 * 修改时间
 	 */
 	@ApiModelProperty(value = "修改时间", example = "2019-03-21 12:28:48")
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
-
 	/**
 	 * 是否是系统内置
 	 */
-	@ApiModelProperty(value = "是否是系统内置")
 	@TableField(value = "`system`")
+	@ApiModelProperty(value = "是否是系统内置")
 	private String system;
-
-
 	/**
 	 * 配置类型：0-默认；1-检索；2-原文；3-报表；4-安全；5-文档；6-消息；9-其他
 	 */
 	@ApiModelProperty(value = "类型[1-检索；2-原文...]", example = "1")
 	private String publicType;
 
-
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java

@@ -23,6 +23,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -40,39 +42,51 @@ import java.time.LocalDateTime;
  * @since 2017-10-29
  */
 @Data
+@ApiModel(value = "角色")
 @EqualsAndHashCode(callSuper = true)
 public class SysRole extends Model<SysRole> {
 
 	private static final long serialVersionUID = 1L;
 
 	@TableId(value = "role_id", type = IdType.AUTO)
+	@ApiModelProperty(value = "角色编号")
 	private Integer roleId;
 
-	@NotBlank(message = "角色名称 不能为空")
+	@NotBlank(message = "角色名称不能为空")
+	@ApiModelProperty(value = "角色名称")
 	private String roleName;
 
-	@NotBlank(message = "角色标识 不能为空")
+	@NotBlank(message = "角色标识不能为空")
+	@ApiModelProperty(value = "角色标识")
 	private String roleCode;
 
-	@NotBlank(message = "角色描述 不能为空")
+	@NotBlank(message = "角色描述不能为空")
+	@ApiModelProperty(value = "角色描述")
 	private String roleDesc;
 
-	@NotNull(message = "数据权限类型 不能为空")
+	@NotNull(message = "数据权限类型不能为空")
+	@ApiModelProperty(value = "数据权限类型")
 	private Integer dsType;
-
+	/**
+	 * 数据权限作用范围
+	 */
+	@ApiModelProperty(value = "数据权限作用范围")
 	private String dsScope;
-
+	/**
+	 * 创建时间
+	 */
+	@ApiModelProperty(value = "创建时间")
 	private LocalDateTime createTime;
+	/**
+	 * 修改时间
+	 */
+	@ApiModelProperty(value = "修改时间")
 	private LocalDateTime updateTime;
 	/**
 	 * 删除标识（0-正常,1-删除）
 	 */
 	@TableLogic
+	@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
 	private String delFlag;
 
-	@Override
-	protected Serializable pkVal() {
-		return this.roleId;
-	}
-
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java

@@ -20,6 +20,8 @@
 package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -32,17 +34,19 @@ import lombok.EqualsAndHashCode;
  * @since 2017-10-29
  */
 @Data
+@ApiModel(value = "角色菜单")
 @EqualsAndHashCode(callSuper = true)
 public class SysRoleMenu extends Model<SysRoleMenu> {
 
 	private static final long serialVersionUID = 1L;
-
 	/**
 	 * 角色ID
 	 */
+	@ApiModelProperty(value = "角色id")
 	private Integer roleId;
 	/**
 	 * 菜单ID
 	 */
+	@ApiModelProperty(value = "菜单id")
 	private Integer menuId;
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java

@@ -23,6 +23,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -35,49 +37,60 @@ import java.time.LocalDateTime;
  * @date 2018-11-06 10:17:18
  */
 @Data
+@ApiModel(value = "网关路由信息")
 @EqualsAndHashCode(callSuper = true)
 public class SysRouteConf extends Model<SysRouteConf> {
 	private static final long serialVersionUID = 1L;
 	@JsonIgnore
 	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "主键")
 	private Integer id;
 	/**
 	 * 路由ID
 	 */
+	@ApiModelProperty(value = "路由id")
 	private String routeId;
 	/**
 	 * 路由名称
 	 */
+	@ApiModelProperty(value = "路由名称")
 	private String routeName;
 	/**
 	 * 断言
 	 */
+	@ApiModelProperty(value = "断言")
 	private String predicates;
 	/**
 	 * 过滤器
 	 */
+	@ApiModelProperty(value = "过滤器")
 	private String filters;
 	/**
 	 * uri
 	 */
+	@ApiModelProperty(value = "请求uri")
 	private String uri;
 	/**
 	 * 排序
 	 */
 	@TableField(value = "`order`")
+	@ApiModelProperty(value = "排序值")
 	private Integer order;
 	/**
 	 * 创建时间
 	 */
+	@ApiModelProperty(value = "创建时间")
 	private LocalDateTime createTime;
 	/**
 	 * 修改时间
 	 */
+	@ApiModelProperty(value = "修改时间")
 	private LocalDateTime updateTime;
 	/**
 	 * 删除标识（0-正常,1-删除）
 	 */
 	@TableLogic
+	@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
 	private String delFlag;
 
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java

@@ -20,6 +20,8 @@ package com.pig4cloud.pigx.admin.api.entity;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -33,6 +35,7 @@ import java.time.LocalDateTime;
  * @date 2018-08-16 21:30:41
  */
 @Data
+@ApiModel(value = "第三方账号信息")
 @EqualsAndHashCode(callSuper = true)
 public class SysSocialDetails extends Model<SysSocialDetails> {
 	private static final long serialVersionUID = 1L;
@@ -41,47 +44,56 @@ public class SysSocialDetails extends Model<SysSocialDetails> {
 	 * 主鍵
 	 */
 	@TableId
+	@ApiModelProperty(value = "主键")
 	private Integer id;
 	/**
 	 * 类型
 	 */
 	@NotBlank(message = "类型不能为空")
+	@ApiModelProperty(value = "账号类型")
 	private String type;
 	/**
 	 * 描述
 	 */
+	@ApiModelProperty(value = "描述")
 	private String remark;
 	/**
 	 * appid
 	 */
 	@NotBlank(message = "账号不能为空")
+	@ApiModelProperty(value = "appId")
 	private String appId;
 	/**
 	 * app_secret
 	 */
 	@NotBlank(message = "密钥不能为空")
+	@ApiModelProperty(value = "app secret")
 	private String appSecret;
 	/**
 	 * 回调地址
 	 */
+	@ApiModelProperty(value = "回调地址")
 	private String redirectUrl;
 	/**
 	 * 创建时间
 	 */
+	@ApiModelProperty(value = "创建时间")
 	private LocalDateTime createTime;
 	/**
 	 * 更新时间
 	 */
+	@ApiModelProperty(value = "更新时间")
 	private LocalDateTime updateTime;
 	/**
 	 * 删除标记
 	 */
 	@TableLogic
+	@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
 	private String delFlag;
-
 	/**
 	 * 租户ID
 	 */
+	@ApiModelProperty(value = "所属租户")
 	private Integer tenantId;
 
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysTenant.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -35,49 +36,56 @@ import java.time.LocalDateTime;
  * @date 2019-05-15 15:55:41
  */
 @Data
-@TableName("sys_tenant")
+@ApiModel(value = "租户信息")
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(description = "租户")
 public class SysTenant extends Model<SysTenant> {
 	private static final long serialVersionUID = 1L;
-
 	/**
 	 * 租户id
 	 */
 	@TableId
+	@ApiModelProperty(value = "租户id")
 	private Integer id;
 	/**
 	 * 租户名称
 	 */
+	@ApiModelProperty(value = "租户名称")
 	private String name;
 	/**
 	 * 租户编号
 	 */
+	@ApiModelProperty(value = "租户编号")
 	private String code;
 	/**
 	 * 开始时间
 	 */
+	@ApiModelProperty(value = "开始时间")
 	private LocalDate startTime;
 	/**
 	 * 结束时间
 	 */
+	@ApiModelProperty(value = "结束时间")
 	private LocalDate endTime;
 	/**
 	 * 0正常 9-冻结
 	 */
+	@ApiModelProperty(value = "租户冻结标记,9:冻结,0:正常")
 	private String status;
 	/**
 	 * 删除标记
 	 */
 	@TableLogic
+	@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
 	private String delFlag;
 	/**
-	 * 创建
+	 * 创建时间
 	 */
+	@ApiModelProperty(value = "创建时间")
 	private LocalDateTime createTime;
 	/**
 	 * 更新时间
 	 */
+	@ApiModelProperty(value = "更新时间")
 	private LocalDateTime updateTime;
 
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java

@@ -23,6 +23,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -37,6 +39,7 @@ import java.time.LocalDateTime;
  * @since 2017-10-29
  */
 @Data
+@ApiModel(value = "用户")
 public class SysUser implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -45,73 +48,83 @@ public class SysUser implements Serializable {
 	 * 主键ID
 	 */
 	@TableId(value = "user_id", type = IdType.AUTO)
+	@ApiModelProperty(value = "主键id")
 	private Integer userId;
 	/**
 	 * 用户名
 	 */
+	@ApiModelProperty(value = "用户名")
 	private String username;
-
+	/**
+	 * 密码
+	 */
+	@ApiModelProperty(value = "密码")
 	private String password;
 	/**
 	 * 随机盐
 	 */
 	@JsonIgnore
+	@ApiModelProperty(value = "随机盐")
 	private String salt;
 	/**
 	 * 创建时间
 	 */
+	@ApiModelProperty(value = "创建时间")
 	private LocalDateTime createTime;
 	/**
 	 * 修改时间
 	 */
+	@ApiModelProperty(value = "修改时间")
 	private LocalDateTime updateTime;
 	/**
 	 * 0-正常，1-删除
 	 */
 	@TableLogic
+	@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
 	private String delFlag;
-
 	/**
 	 * 锁定标记
 	 */
+	@ApiModelProperty(value = "锁定标记")
 	private String lockFlag;
-
 	/**
-	 * 简介
+	 * 手机号
 	 */
+	@ApiModelProperty(value = "手机号")
 	private String phone;
 	/**
 	 * 头像
 	 */
+	@ApiModelProperty(value = "头像地址")
 	private String avatar;
-
 	/**
 	 * 部门ID
 	 */
+	@ApiModelProperty(value = "用户所属部门id")
 	private Integer deptId;
-
 	/**
 	 * 租户ID
 	 */
+	@ApiModelProperty(value = "用户所属租户id")
 	private Integer tenantId;
-
 	/**
 	 * 微信openid
 	 */
+	@ApiModelProperty(value = "微信openid")
 	private String wxOpenid;
-
 	/**
 	 * QQ openid
 	 */
+	@ApiModelProperty(value = "QQ openid")
 	private String qqOpenid;
-
 	/**
 	 * 码云唯一标识
 	 */
+	@ApiModelProperty(value = "码云唯一标识")
 	private String giteeLogin;
-
 	/**
 	 * 开源中国唯一标识
 	 */
+	@ApiModelProperty(value = "开源中国唯一标识")
 	private String oscId;
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java

@@ -20,6 +20,8 @@
 package com.pig4cloud.pigx.admin.api.entity;
 
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -32,18 +34,20 @@ import lombok.EqualsAndHashCode;
  * @since 2017-10-29
  */
 @Data
+@ApiModel(value = "用户角色")
 @EqualsAndHashCode(callSuper = true)
 public class SysUserRole extends Model<SysUserRole> {
 
 	private static final long serialVersionUID = 1L;
-
 	/**
 	 * 用户ID
 	 */
+	@ApiModelProperty(value = "用户id")
 	private Integer userId;
 	/**
 	 * 角色ID
 	 */
+	@ApiModelProperty(value = "角色id")
 	private Integer roleId;
 
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/ImageCode.java

@@ -19,6 +19,8 @@
 
 package com.pig4cloud.pigx.admin.api.vo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.awt.image.BufferedImage;
@@ -27,15 +29,28 @@ import java.time.LocalDateTime;
 
 
 /**
+ * 图形验证码
+ *
  * @author lengleng
  * @date 2017-12-18
  */
 @Data
+@ApiModel(value =  "图形验证码")
 public class ImageCode implements Serializable {
+	/**
+	 * 随机数
+	 */
+	@ApiModelProperty(value = "随机数")
 	private String code;
-
+	/**
+	 * 验证码过期时间
+	 */
+	@ApiModelProperty(value = "验证码过期时间")
 	private LocalDateTime expireTime;
-
+	/**
+	 * 验证码图片
+	 */
+	@ApiModelProperty(value = "验证码图片")
 	private BufferedImage image;
 
 	public ImageCode(BufferedImage image, String sRand, int defaultImageExpire) {

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/LogVO.java

@@ -20,6 +20,8 @@
 package com.pig4cloud.pigx.admin.api.vo;
 
 import com.pig4cloud.pigx.admin.api.entity.SysLog;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -29,9 +31,12 @@ import java.io.Serializable;
  * @date 2017/11/20
  */
 @Data
+@ApiModel(value = "日志展示对象")
 public class LogVO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	@ApiModelProperty(value = "日志内容")
 	private SysLog sysLog;
+	@ApiModelProperty(value = "产生日志的用户")
 	private String username;
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/MenuVO.java

@@ -19,6 +19,8 @@
 
 package com.pig4cloud.pigx.admin.api.vo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -33,6 +35,7 @@ import java.time.LocalDateTime;
  * @since 2017-11-08
  */
 @Data
+@ApiModel(value = "菜单展示对象")
 public class MenuVO implements Serializable {
 
 	private static final long serialVersionUID = 1L;
@@ -40,50 +43,62 @@ public class MenuVO implements Serializable {
 	/**
 	 * 菜单ID
 	 */
+	@ApiModelProperty(value = "菜单id")
 	private Integer menuId;
 	/**
 	 * 菜单名称
 	 */
+	@ApiModelProperty(value = "菜单名称")
 	private String name;
 	/**
 	 * 菜单权限标识
 	 */
+	@ApiModelProperty(value = "菜单权限标识")
 	private String permission;
 	/**
 	 * 父菜单ID
 	 */
+	@ApiModelProperty(value = "父菜单id")
 	private Integer parentId;
 	/**
 	 * 图标
 	 */
+	@ApiModelProperty(value = "图标")
 	private String icon;
 	/**
-	 * 一个路径
+	 * 前端路由标识路径
 	 */
+	@ApiModelProperty(value = "前端路由标识路径")
 	private String path;
 	/**
 	 * 排序值
 	 */
+	@ApiModelProperty(value = "排序值")
 	private Integer sort;
 	/**
 	 * 菜单类型 （0菜单 1按钮）
 	 */
+	@ApiModelProperty(value = "菜单类型,0:菜单 1:按钮")
 	private String type;
 	/**
 	 * 是否缓冲
 	 */
+	@ApiModelProperty(value = "路由缓冲")
 	private String keepAlive;
 	/**
 	 * 创建时间
 	 */
+	@ApiModelProperty(value = "创建时间")
 	private LocalDateTime createTime;
 	/**
 	 * 更新时间
 	 */
+	@ApiModelProperty(value = "更新时间")
 	private LocalDateTime updateTime;
 	/**
 	 * 0--正常 1--删除
 	 */
+	@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
 	private String delFlag;
 
 

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/ParamVo.java

@@ -18,6 +18,8 @@
 package com.pig4cloud.pigx.admin.api.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -30,6 +32,7 @@ import java.io.Serializable;
  * 公共参数
  */
 @Data
+@ApiModel(value = "公共参数展示对象")
 @EqualsAndHashCode(callSuper = false)
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ParamVo implements Serializable {
@@ -38,13 +41,16 @@ public class ParamVo implements Serializable {
     /**
      * 公共参数键
      */
+    @ApiModelProperty(value = "公共参数键")
     private String publicKey;
     /**
      * 公共参数值
      */
+    @ApiModelProperty(value = "公共参数值")
     private String publicValue;
     /**
      * 公共参数名
      */
+    @ApiModelProperty(value = "公共参数名称")
     private String publicName;
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/PreLogVo.java

@@ -17,6 +17,8 @@
 
 package com.pig4cloud.pigx.admin.api.vo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -25,12 +27,41 @@ import lombok.Data;
  * 前端日志vo
  */
 @Data
+@ApiModel(value = "前端日志展示对象")
 public class PreLogVo {
+	/**
+	 * 请求url
+	 */
+	@ApiModelProperty(value = "请求url")
 	private String url;
+	/**
+	 * 请求耗时
+	 */
+	@ApiModelProperty(value = "请求耗时")
 	private String time;
+	/**
+	 * 请求用户
+	 */
+	@ApiModelProperty(value = "请求用户")
 	private String user;
+	/**
+	 * 请求结果
+	 */
+	@ApiModelProperty(value = "请求结果0:成功9:失败")
 	private String type;
+	/**
+	 * 请求传递参数
+	 */
+	@ApiModelProperty(value = "请求传递参数")
 	private String message;
+	/**
+	 * 异常信息
+	 */
+	@ApiModelProperty(value = "异常信息")
 	private String stack;
+	/**
+	 * 日志标题
+	 */
+	@ApiModelProperty(value = "日志标题")
 	private String info;
 }

pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/UserVO.java

@@ -20,6 +20,8 @@
 package com.pig4cloud.pigx.admin.api.vo;
 
 import com.pig4cloud.pigx.admin.api.entity.SysRole;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -31,79 +33,88 @@ import java.util.List;
  * @date 2017/10/29
  */
 @Data
+@ApiModel(value = "前端用户展示对象")
 public class UserVO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
 	 * 主键ID
 	 */
+	@ApiModelProperty(value = "主键")
 	private Integer userId;
 	/**
 	 * 用户名
 	 */
+	@ApiModelProperty(value = "用户名")
 	private String username;
 	/**
 	 * 密码
 	 */
+	@ApiModelProperty(value = "密码")
 	private String password;
 	/**
 	 * 随机盐
 	 */
+	@ApiModelProperty(value = "随机盐")
 	private String salt;
-
 	/**
 	 * 微信openid
 	 */
+	@ApiModelProperty(value = "微信open id")
 	private String wxOpenid;
-
 	/**
 	 * QQ openid
 	 */
+	@ApiModelProperty(value = "qq open id")
 	private String qqOpenid;
-
 	/**
 	 * 创建时间
 	 */
+	@ApiModelProperty(value = "创建时间")
 	private LocalDateTime createTime;
 	/**
 	 * 修改时间
 	 */
+	@ApiModelProperty(value = "修改时间")
 	private LocalDateTime updateTime;
 	/**
 	 * 0-正常，1-删除
 	 */
+	@ApiModelProperty(value = "删除标记,1:已删除,0:正常")
 	private String delFlag;
-
 	/**
 	 * 锁定标记
 	 */
+	@ApiModelProperty(value = "锁定标记,0:正常,9:已锁定")
 	private String lockFlag;
 	/**
-	 * 简介
+	 * 手机号
 	 */
+	@ApiModelProperty(value = "手机号")
 	private String phone;
 	/**
 	 * 头像
 	 */
+	@ApiModelProperty(value = "头像")
 	private String avatar;
-
 	/**
 	 * 部门ID
 	 */
+	@ApiModelProperty(value = "所属部门")
 	private Integer deptId;
-
 	/**
 	 * 租户ID
 	 */
+	@ApiModelProperty(value = "所属租户")
 	private Integer tenantId;
-
 	/**
 	 * 部门名称
 	 */
+	@ApiModelProperty(value = "所属部门名称")
 	private String deptName;
-
 	/**
 	 * 角色列表
 	 */
+	@ApiModelProperty(value = "拥有的角色列表")
 	private List<SysRole> roleList;
 }