commit：同步1.3版本

orange-demo-multi-service-for-app/application/upms/upms-interface/pom.xml

@@ -25,5 +25,11 @@
             <artifactId>application-common</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <!-- knife4j 接口文档框架 -->
+        <dependency>
+            <groupId>com.orange.demo</groupId>
+            <artifactId>common-swagger</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 </project>

orange-demo-multi-service-for-app/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/dto/SysUserDto.java

@@ -6,48 +6,54 @@ import com.orange.demo.common.core.validator.ConstDictRef;
 import com.orange.demo.upmsinterface.constant.SysUserType;
 import com.orange.demo.upmsinterface.constant.SysUserStatus;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.*;
 
-import java.util.Date;
-
 /**
  * SysUserDto对象。
  *
  * @author Jerry
  * @date 2020-08-08
  */
+@ApiModel("SysUserDto对象")
 @Data
 public class SysUserDto {
 
     /**
      * 用户Id。
      */
+    @ApiModelProperty(value = "用户Id", required = true)
     @NotNull(message = "数据验证失败，用户Id不能为空！", groups = {UpdateGroup.class})
     private Long userId;
 
     /**
      * 登录用户名。
      */
+    @ApiModelProperty(value = "登录用户名", required = true)
     @NotBlank(message = "数据验证失败，登录用户名不能为空！")
     private String loginName;
 
     /**
      * 用户密码。
      */
+    @ApiModelProperty(value = "用户密码", required = true)
     @NotBlank(message = "数据验证失败，用户密码不能为空！", groups = {AddGroup.class})
     private String password;
 
     /**
      * 用户显示名称。
      */
+    @ApiModelProperty(value = "用户显示名称", required = true)
     @NotBlank(message = "数据验证失败，用户显示名称不能为空！")
     private String showName;
 
     /**
      * 用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)。
      */
+    @ApiModelProperty(value = "用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)", required = true)
     @NotNull(message = "数据验证失败，用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)不能为空！")
     @ConstDictRef(constDictClass = SysUserType.class, message = "数据验证失败，用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)为无效值！")
     private Integer userType;
@@ -55,42 +61,26 @@ public class SysUserDto {
     /**
      * 用户头像的Url。
      */
+    @ApiModelProperty(value = "用户头像的Url")
     private String headImageUrl;
 
     /**
      * 用户状态(0: 正常 1: 锁定)。
      */
+    @ApiModelProperty(value = "用户状态(0: 正常 1: 锁定)", required = true)
     @NotNull(message = "数据验证失败，用户状态(0: 正常 1: 锁定)不能为空！")
     @ConstDictRef(constDictClass = SysUserStatus.class, message = "数据验证失败，用户状态(0: 正常 1: 锁定)为无效值！")
     private Integer userStatus;
 
-    /**
-     * 创建用户Id。
-     */
-    private Long createUserId;
-
-    /**
-     * 创建用户名。
-     */
-    private String createUsername;
-
-    /**
-     * 创建时间。
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间。
-     */
-    private Date updateTime;
-
     /**
      * createTime 范围过滤起始值(>=)。
      */
+    @ApiModelProperty(value = "createTime 范围过滤起始值(>=)")
     private String createTimeStart;
 
     /**
      * createTime 范围过滤结束值(<=)。
      */
+    @ApiModelProperty(value = "createTime 范围过滤结束值(<=)")
     private String createTimeEnd;
 }

orange-demo-multi-service-for-app/application/upms/upms-interface/src/main/java/com/orange/demo/upmsinterface/vo/SysUserVo.java

@@ -1,5 +1,7 @@
 package com.orange.demo.upmsinterface.vo;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -11,71 +13,85 @@ import java.util.Map;
  * @author Jerry
  * @date 2020-08-08
  */
+@ApiModel("SysUserVO实体对象")
 @Data
 public class SysUserVo {
 
     /**
      * 用户Id。
      */
+    @ApiModelProperty(value = "用户Id")
     private Long userId;
 
     /**
      * 登录用户名。
      */
+    @ApiModelProperty(value = "登录用户名")
     private String loginName;
 
     /**
      * 用户密码。
      */
+    @ApiModelProperty(value = "用户密码")
     private String password;
 
     /**
      * 用户显示名称。
      */
+    @ApiModelProperty(value = "用户显示名称")
     private String showName;
 
     /**
      * 用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)。
      */
+    @ApiModelProperty(value = "用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)")
     private Integer userType;
 
     /**
      * 用户头像的Url。
      */
+    @ApiModelProperty(value = "用户头像的Url")
     private String headImageUrl;
 
     /**
      * 用户状态(0: 正常 1: 锁定)。
      */
+    @ApiModelProperty(value = "用户状态(0: 正常 1: 锁定)")
     private Integer userStatus;
 
     /**
      * 创建用户Id。
      */
+    @ApiModelProperty(value = "创建用户Id")
     private Long createUserId;
 
     /**
-     * 创建用户名。
+     * 更新者Id。
      */
-    private String createUsername;
+    @ApiModelProperty(value = "更新者Id")
+    private Long updateUserId;
 
     /**
      * 创建时间。
      */
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
     /**
      * 更新时间。
      */
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
     /**
      * userType 常量字典关联数据。
      */
+    @ApiModelProperty(value = "userType 常量字典关联数据")
     private Map<String, Object> userTypeDictMap;
 
     /**
      * userStatus 常量字典关联数据。
      */
+    @ApiModelProperty(value = "userStatus 常量字典关联数据")
     private Map<String, Object> userStatusDictMap;
 }

orange-demo-multi-service-for-app/application/upms/upms-interface/upms-interface.iml

@@ -84,13 +84,31 @@
     <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring:1.1.5" level="project" />
     <orderEntry type="library" name="Maven: tk.mybatis:mapper-extra:1.1.5" level="project" />
     <orderEntry type="library" name="Maven: tk.mybatis:mapper-spring-boot-autoconfigure:2.1.5" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.2.13" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.2.13" level="project" />
-    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.1.11" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.3" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.3.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:3.2" level="project" />
     <orderEntry type="module" module-name="application-common" />
+    <orderEntry type="module" module-name="common-swagger" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-micro-spring-boot-starter:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-boot-autoconfigure:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-annotations:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-core:2.0.5" level="project" />
+    <orderEntry type="library" name="Maven: org.javassist:javassist:3.25.0-GA" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.22" level="project" />
+    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.22" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.9.2" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:2.2.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-client:1.2.1" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba.nacos:nacos-common:1.2.1" level="project" />
@@ -247,7 +265,7 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.13.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest:2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:3.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy:1.10.8" level="project" />
+    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.8" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.bytebuddy:byte-buddy-agent:1.10.8" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:2.6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.skyscreamer:jsonassert:1.5.0" level="project" />