commit：同步1.3版本

2026-01-18 02:56:30 +08:00 · 2021-01-03 22:29:02 +08:00
parent ef316438da
commit 25023e29b5
706 changed files with 23404 additions and 14179 deletions
--- a/orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginController.java
+++ b/orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginController.java
@@ -1,6 +1,10 @@
 package com.orange.demo.upmsservice.controller;

 import com.alibaba.fastjson.JSONObject;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import lombok.extern.slf4j.Slf4j;
 import com.orange.demo.common.core.annotation.MyRequestBody;
 import com.orange.demo.common.core.constant.ErrorCodeEnum;
@@ -28,6 +32,8 @@ import java.nio.charset.StandardCharsets;
 * @author Jerry
 * @date 2020-08-08
 */
+@ApiSupport(order = 1)
+@Api(tags = "登录接口")
@Slf4j
@RestController
@RequestMapping("/login")
@@ -49,6 +55,12 @@ public class LoginController {
     * @param password  密码。
     * @return 应答结果对象，其中包括JWT的Token数据，以及菜单列表。
     */
+    @ApiImplicitParams({
+            // 这里包含密码密文，仅用于方便开发期间的接口测试，集成测试和发布阶段，需要将当前注解去掉。
+            // 如果您重新生成了公钥和私钥，请替换password的缺省值。
+            @ApiImplicitParam(name = "loginName", defaultValue = "admin"),
+            @ApiImplicitParam(name = "password", defaultValue = "IP3ccke3GhH45iGHB5qP9p7iZw6xUyj28Ju10rnBiPKOI35sc%2BjI7%2FdsjOkHWMfUwGYGfz8ik31HC2Ruk%2Fhkd9f6RPULTHj7VpFdNdde2P9M4mQQnFBAiPM7VT9iW3RyCtPlJexQ3nAiA09OqG%2F0sIf1kcyveSrulxembARDbDo%3D")
+    })
    @PostMapping("/doLogin")
    public ResponseResult<JSONObject> doLogin(
            @MyRequestBody String loginName, @MyRequestBody String password) throws Exception {
--- a/orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysUserController.java
+++ b/orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/SysUserController.java
@@ -9,11 +9,13 @@ import com.orange.demo.common.core.object.*;
 import com.orange.demo.common.core.util.*;
 import com.orange.demo.common.core.constant.*;
 import com.orange.demo.common.core.base.controller.BaseController;
-import com.orange.demo.common.core.base.service.BaseService;
+import com.orange.demo.common.core.base.service.IBaseService;
 import com.orange.demo.common.core.annotation.MyRequestBody;
 import com.orange.demo.common.core.validator.AddGroup;
 import com.orange.demo.common.core.validator.UpdateGroup;
 import com.orange.demo.upmsservice.config.ApplicationConfig;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -27,6 +29,7 @@ import java.util.*;
 * @author Jerry
 * @date 2020-08-08
 */
+@Api(tags = "用户管理管理接口")
@Slf4j
@RestController
@RequestMapping("/sysUser")
@@ -38,7 +41,7 @@ public class SysUserController extends BaseController<SysUser, SysUserVo, Long>
    private ApplicationConfig appConfig;

    @Override
-    protected BaseService<SysUser, Long> service() {
+    protected IBaseService<SysUser, Long> service() {
        return sysUserService;
    }

@@ -48,6 +51,10 @@ public class SysUserController extends BaseController<SysUser, SysUserVo, Long>
     * @param sysUserDto 新增用户对象。
     * @return 应答结果对象，包含新增用户的主键Id。
     */
+    @ApiOperationSupport(ignoreParameters = {
+            "sysUser.userId",
+            "sysUser.createTimeStart",
+            "sysUser.createTimeEnd"})
    @PostMapping("/add")
    public ResponseResult<Long> add(@MyRequestBody("sysUser") SysUserDto sysUserDto) {
        String errorMessage = MyCommonUtil.getModelValidationError(sysUserDto, Default.class, AddGroup.class);
@@ -69,6 +76,9 @@ public class SysUserController extends BaseController<SysUser, SysUserVo, Long>
     * @param sysUserDto 更新用户对象。
     * @return 应答结果对象。
     */
+    @ApiOperationSupport(ignoreParameters = {
+            "sysUser.createTimeStart",
+            "sysUser.createTimeEnd"})
    @PostMapping("/update")
    public ResponseResult<Void> update(@MyRequestBody("sysUser") SysUserDto sysUserDto) {
        String errorMessage = MyCommonUtil.getModelValidationError(sysUserDto, Default.class, UpdateGroup.class);
@@ -184,6 +194,7 @@ public class SysUserController extends BaseController<SysUser, SysUserVo, Long>
     * @param withDict 是否包含字典关联。
     * @return 应答结果对象，包含主对象集合。
     */
+    @ApiOperation(hidden = true, value = "listByIds")
    @PostMapping("/listByIds")
    public ResponseResult<List<SysUserVo>> listByIds(
            @RequestParam Set<Long> userIds, @RequestParam Boolean withDict) {
@@ -197,6 +208,7 @@ public class SysUserController extends BaseController<SysUser, SysUserVo, Long>
     * @param withDict 是否包含字典关联。
     * @return 应答结果对象，包含主对象数据。
     */
+    @ApiOperation(hidden = true, value = "getById")
    @PostMapping("/getById")
    public ResponseResult<SysUserVo> getById(
            @RequestParam Long userId, @RequestParam Boolean withDict) {
@@ -209,6 +221,7 @@ public class SysUserController extends BaseController<SysUser, SysUserVo, Long>
     * @param userIds 主键Id集合。
     * @return 应答结果对象，包含true全部存在，否则false。
     */
+    @ApiOperation(hidden = true, value = "existIds")
    @PostMapping("/existIds")
    public ResponseResult<Boolean> existIds(@RequestParam Set<Long> userIds) {
        return super.baseExistIds(userIds);
@@ -220,6 +233,7 @@ public class SysUserController extends BaseController<SysUser, SysUserVo, Long>
     * @param userId 主键Id。
     * @return 应答结果对象，包含true表示存在，否则false。
     */
+    @ApiOperation(hidden = true, value = "existId")
    @PostMapping("/existId")
    public ResponseResult<Boolean> existId(@RequestParam Long userId) {
        return super.baseExistId(userId);
@@ -231,6 +245,7 @@ public class SysUserController extends BaseController<SysUser, SysUserVo, Long>
     * @param filter 过滤对象。
     * @return 删除数量。
     */
+    @ApiOperation(hidden = true, value = "deleteBy")
    @PostMapping("/deleteBy")
    public ResponseResult<Integer> deleteBy(@RequestBody SysUserDto filter) throws Exception {
        return super.baseDeleteBy(MyModelUtil.copyTo(filter, SysUser.class));
@@ -242,6 +257,7 @@ public class SysUserController extends BaseController<SysUser, SysUserVo, Long>
     * @param queryParam 查询参数。
     * @return 分页数据集合对象。如MyQueryParam参数的分页属性为空，则不会执行分页操作，只是基于MyPageData对象返回数据结果。
     */
+    @ApiOperation(hidden = true, value = "listBy")
    @PostMapping("/listBy")
    public ResponseResult<MyPageData<SysUserVo>> listBy(@RequestBody MyQueryParam queryParam) {
        return super.baseListBy(queryParam, SysUser.INSTANCE);
@@ -253,6 +269,7 @@ public class SysUserController extends BaseController<SysUser, SysUserVo, Long>
     * @param queryParam 查询参数。
     * @return 分页数据集合对象。如MyQueryParam参数的分页属性为空，则不会执行分页操作，只是基于MyPageData对象返回数据结果。
     */
+    @ApiOperation(hidden = true, value = "listMapBy")
    @PostMapping("/listMapBy")
    public ResponseResult<MyPageData<Map<String, Object>>> listMapBy(@RequestBody MyQueryParam queryParam) {
        return super.baseListMapBy(queryParam, SysUser.INSTANCE);
@@ -264,6 +281,7 @@ public class SysUserController extends BaseController<SysUser, SysUserVo, Long>
     * @param queryParam 查询参数。
     * @return 应答结果对象，包含符合查询过滤条件的对象结果集。
     */
+    @ApiOperation(hidden = true, value = "getBy")
    @PostMapping("/getBy")
    public ResponseResult<SysUserVo> getBy(@RequestBody MyQueryParam queryParam) {
        return super.baseGetBy(queryParam, SysUser.INSTANCE);
@@ -275,6 +293,7 @@ public class SysUserController extends BaseController<SysUser, SysUserVo, Long>
     * @param queryParam 查询参数。
     * @return 应答结果对象，包含结果数量。
     */
+    @ApiOperation(hidden = true, value = "countBy")
    @PostMapping("/countBy")
    public ResponseResult<Integer> countBy(@RequestBody MyQueryParam queryParam) {
        return super.baseCountBy(queryParam);
@@ -286,6 +305,7 @@ public class SysUserController extends BaseController<SysUser, SysUserVo, Long>
     * @param aggregationParam 聚合参数。
     * @return 应该结果对象，包含聚合计算后的分组Map列表。
     */
+    @ApiOperation(hidden = true, value = "aggregateBy")
    @PostMapping("/aggregateBy")
    public ResponseResult<List<Map<String, Object>>> aggregateBy(@RequestBody MyAggregationParam aggregationParam) {
        return super.baseAggregateBy(aggregationParam);
--- a/orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysUserMapper.xml
+++ b/orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysUserMapper.xml
@@ -11,7 +11,7 @@
        <result column="user_status" jdbcType="INTEGER" property="userStatus"/>
        <result column="deleted_flag" jdbcType="INTEGER" property="deletedFlag"/>
        <result column="create_user_id" jdbcType="BIGINT" property="createUserId"/>
-        <result column="create_username" jdbcType="VARCHAR" property="createUsername"/>
+        <result column="update_user_id" jdbcType="BIGINT" property="updateUserId"/>
        <result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
    </resultMap>
--- a/orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUser.java
+++ b/orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUser.java
@@ -6,13 +6,11 @@ import com.orange.demo.upmsinterface.constant.SysUserStatus;
 import com.orange.demo.common.core.annotation.RelationConstDict;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import com.orange.demo.common.core.annotation.DeletedFlagColumn;
-import com.orange.demo.common.core.validator.ConstDictRef;
 import com.orange.demo.upmsinterface.vo.SysUserVo;
 import lombok.Data;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
 import javax.persistence.*;
-import javax.validation.constraints.*;

 import java.util.Date;
 import java.util.Map;
@@ -30,7 +28,6 @@ public class SysUser {
    /**
     * 用户Id。
     */
-    @NotNull(message = "数据验证失败，用户Id不能为空！")
    @Id
    @Column(name = "user_id")
    private Long userId;
@@ -38,28 +35,23 @@ public class SysUser {
    /**
     * 登录用户名。
     */
-    @NotBlank(message = "数据验证失败，登录用户名不能为空！")
    @Column(name = "login_name")
    private String loginName;

    /**
     * 用户密码。
     */
-    @NotBlank(message = "数据验证失败，用户密码不能为空！")
    private String password;

    /**
     * 用户显示名称。
     */
-    @NotBlank(message = "数据验证失败，用户显示名称不能为空！")
    @Column(name = "show_name")
    private String showName;

    /**
     * 用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)。
     */
-    @NotNull(message = "数据验证失败，用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)不能为空！")
-    @ConstDictRef(constDictClass = SysUserType.class, message = "数据验证失败，用户类型(0: 管理员 1: 系统管理用户 2: 系统业务用户)为无效值！")
    @Column(name = "user_type")
    private Integer userType;

@@ -72,8 +64,6 @@ public class SysUser {
    /**
     * 用户状态(0: 正常 1: 锁定)。
     */
-    @NotNull(message = "数据验证失败，用户状态(0: 正常 1: 锁定)不能为空！")
-    @ConstDictRef(constDictClass = SysUserStatus.class, message = "数据验证失败，用户状态(0: 正常 1: 锁定)为无效值！")
    @Column(name = "user_status")
    private Integer userStatus;

@@ -92,10 +82,10 @@ public class SysUser {
    private Long createUserId;

    /**
-     * 创建用户名。
+     * 更新者Id。
     */
-    @Column(name = "create_username")
-    private String createUsername;
+    @Column(name = "update_user_id")
+    private Long updateUserId;

    /**
     * 创建时间。
--- a/orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysUserService.java
+++ b/orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/SysUserService.java
@@ -1,48 +1,18 @@
 package com.orange.demo.upmsservice.service;

-import com.alibaba.fastjson.JSONObject;
-import com.orange.demo.upmsservice.dao.*;
 import com.orange.demo.upmsservice.model.*;
-import com.orange.demo.common.core.util.*;
-import com.orange.demo.common.core.object.*;
-import com.orange.demo.common.core.constant.GlobalDeletedFlag;
-import com.orange.demo.common.core.base.dao.BaseDaoMapper;
-import com.orange.demo.common.core.base.service.BaseService;
-import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
-import com.orange.demo.upmsinterface.constant.SysUserStatus;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.entity.Example;
+import com.orange.demo.common.core.object.CallResult;
+import com.orange.demo.common.core.base.service.IBaseService;

 import java.util.*;

 /**
- * 用户管理数据操作服务类。
+ * 用户管理数据操作服务接口。
 *
 * @author Jerry
 * @date 2020-08-08
 */
-@Service
-public class SysUserService extends BaseService<SysUser, Long> {
-
-    @Autowired
-    private SysUserMapper sysUserMapper;
-    @Autowired
-    private IdGeneratorWrapper idGenerator;
-    @Autowired
-    private PasswordEncoder passwordEncoder;
-
-    /**
-     * 返回当前Service的主表Mapper对象。
-     *
-     * @return 主表Mapper对象。
-     */
-    @Override
-    protected BaseDaoMapper<SysUser> mapper() {
-        return sysUserMapper;
-    }
+public interface SysUserService extends IBaseService<SysUser, Long> {

    /**
     * 获取指定登录名的用户对象。
@@ -50,13 +20,7 @@ public class SysUserService extends BaseService<SysUser, Long> {
     * @param loginName 指定登录用户名。
     * @return 用户对象。
     */
-    public SysUser getSysUserByLoginName(String loginName) {
-        Example e = new Example(SysUser.class);
-        Example.Criteria c = e.createCriteria();
-        c.andEqualTo("loginName", loginName);
-        c.andEqualTo("deletedFlag", GlobalDeletedFlag.NORMAL);
-        return sysUserMapper.selectOneByExample(e);
-    }
+    SysUser getSysUserByLoginName(String loginName);

    /**
     * 保存新增的用户对象。
@@ -64,21 +28,7 @@ public class SysUserService extends BaseService<SysUser, Long> {
     * @param user 新增的用户对象。
     * @return 新增后的用户对象。
     */
-    @Transactional(rollbackFor = Exception.class)
-    public SysUser saveNew(SysUser user) {
-        user.setUserId(idGenerator.nextLongId());
-        user.setPassword(passwordEncoder.encode(user.getPassword()));
-        user.setUserStatus(SysUserStatus.STATUS_NORMAL);
-        user.setDeletedFlag(GlobalDeletedFlag.NORMAL);
-        TokenData tokenData = TokenData.takeFromRequest();
-        user.setCreateUserId(tokenData.getUserId());
-        user.setCreateUsername(tokenData.getShowName());
-        Date now = new Date();
-        user.setCreateTime(now);
-        user.setUpdateTime(now);
-        sysUserMapper.insert(user);
-        return user;
-    }
+    SysUser saveNew(SysUser user);

    /**
     * 更新用户对象。
@@ -87,16 +37,7 @@ public class SysUserService extends BaseService<SysUser, Long> {
     * @param originalUser 原有的用户对象。
     * @return 更新成功返回true，否则false。
     */
-    @Transactional(rollbackFor = Exception.class)
-    public boolean update(SysUser user, SysUser originalUser) {
-        user.setLoginName(originalUser.getLoginName());
-        user.setPassword(originalUser.getPassword());
-        user.setCreateUserId(originalUser.getCreateUserId());
-        user.setCreateUsername(originalUser.getCreateUsername());
-        user.setCreateTime(originalUser.getCreateTime());
-        user.setUpdateTime(new Date());
-        return sysUserMapper.updateByPrimaryKeySelective(user) == 1;
-    }
+    boolean update(SysUser user, SysUser originalUser);

    /**
     * 重置用户密码。
@@ -104,16 +45,7 @@ public class SysUserService extends BaseService<SysUser, Long> {
     * @param newPass 新密码。
     * @return 成功返回true，否则false。
     */
-    @Transactional(rollbackFor = Exception.class)
-    public boolean changePassword(Long userId, String newPass) {
-        Example e = new Example(SysUser.class);
-        e.createCriteria()
-                .andEqualTo(super.idFieldName, userId)
-                .andEqualTo(super.deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
-        SysUser updatedUser = new SysUser();
-        updatedUser.setPassword(passwordEncoder.encode(newPass));
-        return sysUserMapper.updateByExampleSelective(updatedUser, e) == 1;
-    }
+    boolean changePassword(Long userId, String newPass);

    /**
     * 删除指定数据。
@@ -121,17 +53,7 @@ public class SysUserService extends BaseService<SysUser, Long> {
     * @param userId 主键Id。
     * @return 成功返回true，否则false。
     */
-    @Transactional(rollbackFor = Exception.class)
-    public boolean remove(Long userId) {
-        Example sysUserExample = new Example(SysUser.class);
-        Example.Criteria c = sysUserExample.createCriteria();
-        c.andEqualTo(super.idFieldName, userId);
-        c.andEqualTo(super.deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
-        // 这里先删除主数据
-        SysUser deletedObject = new SysUser();
-        deletedObject.setDeletedFlag(GlobalDeletedFlag.DELETED);
-        return sysUserMapper.updateByExampleSelective(deletedObject, sysUserExample) != 0;
-    }
+    boolean remove(Long userId);

    /**
     * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
@@ -141,9 +63,7 @@ public class SysUserService extends BaseService<SysUser, Long> {
     * @param orderBy 排序参数。
     * @return 查询结果集。
     */
-    public List<SysUser> getSysUserList(SysUser filter, String orderBy) {
-        return sysUserMapper.getSysUserList(null, null, filter, orderBy);
-    }
+    List<SysUser> getSysUserList(SysUser filter, String orderBy);

    /**
     * 获取主表的查询结果，查询条件中包括主表过滤对象和指定字段的(in list)过滤。
@@ -156,11 +76,7 @@ public class SysUserService extends BaseService<SysUser, Long> {
     * @param orderBy 排序参数。
     * @return 查询结果集。
     */
-    public <M> List<SysUser> getSysUserList(
-            String inFilterField, Set<M> inFilterValues, SysUser filter, String orderBy) {
-        String inFilterColumn = MyModelUtil.mapToColumnName(inFilterField, SysUser.class);
-        return sysUserMapper.getSysUserList(inFilterColumn, inFilterValues, filter, orderBy);
-    }
+    <M> List<SysUser> getSysUserList(String inFilterField, Set<M> inFilterValues, SysUser filter, String orderBy);

    /**
     * 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
@@ -170,12 +86,7 @@ public class SysUserService extends BaseService<SysUser, Long> {
     * @param orderBy 排序对象。
     * @return 查询结果集。
     */
-    public List<SysUser> getSysUserListWithRelation(SysUser filter, String orderBy) {
-        List<SysUser> resultList = sysUserMapper.getSysUserList(null, null, filter, orderBy);
-        Map<String, List<MyWhereCriteria>> criteriaMap = buildAggregationAdditionalWhereCriteria();
-        this.buildRelationForDataList(resultList, MyRelationParam.normal(), criteriaMap);
-        return resultList;
-    }
+    List<SysUser> getSysUserListWithRelation(SysUser filter, String orderBy);

    /**
     * 获取主表的查询结果，查询条件中包括主表过滤对象和指定字段的(in list)过滤。
@@ -188,13 +99,8 @@ public class SysUserService extends BaseService<SysUser, Long> {
     * @param orderBy 排序对象。
     * @return 查询结果集。
     */
-    public <M> List<SysUser> getSysUserListWithRelation(
-            String inFilterField, Set<M> inFilterValues, SysUser filter, String orderBy) {
-        List<SysUser> resultList =
-                sysUserMapper.getSysUserList(inFilterField, inFilterValues, filter, orderBy);
-        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly(), null);
-        return resultList;
-    }
+    <M> List<SysUser> getSysUserListWithRelation(
+            String inFilterField, Set<M> inFilterValues, SysUser filter, String orderBy);

    /**
     * 验证用户对象关联的数据是否都合法。
@@ -203,8 +109,5 @@ public class SysUserService extends BaseService<SysUser, Long> {
     * @param originalSysUser 原有对象。
     * @return 验证结果。
     */
-    public CallResult verifyRelatedData(SysUser sysUser, SysUser originalSysUser) {
-        JSONObject jsonObject = new JSONObject();
-        return CallResult.ok(jsonObject);
-    }
+    CallResult verifyRelatedData(SysUser sysUser, SysUser originalSysUser);
 }
--- a/orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysUserServiceImpl.java
+++ b/orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysUserServiceImpl.java
@@ -0,0 +1,208 @@
+package com.orange.demo.upmsservice.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.orange.demo.upmsservice.service.*;
+import com.orange.demo.upmsservice.dao.*;
+import com.orange.demo.upmsservice.model.*;
+import com.orange.demo.common.core.util.*;
+import com.orange.demo.common.core.object.*;
+import com.orange.demo.common.core.constant.GlobalDeletedFlag;
+import com.orange.demo.common.core.base.dao.BaseDaoMapper;
+import com.orange.demo.common.core.base.service.BaseService;
+import com.orange.demo.common.sequence.wrapper.IdGeneratorWrapper;
+import com.orange.demo.upmsinterface.constant.SysUserStatus;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
+
+import java.util.*;
+
+/**
+ * 用户管理数据操作服务类。
+ *
+ * @author Jerry
+ * @date 2020-08-08
+ */
+@Service("sysUserService")
+public class SysUserServiceImpl extends BaseService<SysUser, Long> implements SysUserService {
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+    @Autowired
+    private IdGeneratorWrapper idGenerator;
+    @Autowired
+    private PasswordEncoder passwordEncoder;
+
+    /**
+     * 返回当前Service的主表Mapper对象。
+     *
+     * @return 主表Mapper对象。
+     */
+    @Override
+    protected BaseDaoMapper<SysUser> mapper() {
+        return sysUserMapper;
+    }
+
+    /**
+     * 获取指定登录名的用户对象。
+     *
+     * @param loginName 指定登录用户名。
+     * @return 用户对象。
+     */
+    @Override
+    public SysUser getSysUserByLoginName(String loginName) {
+        Example e = new Example(SysUser.class);
+        Example.Criteria c = e.createCriteria();
+        c.andEqualTo("loginName", loginName);
+        c.andEqualTo("deletedFlag", GlobalDeletedFlag.NORMAL);
+        return sysUserMapper.selectOneByExample(e);
+    }
+
+    /**
+     * 保存新增的用户对象。
+     *
+     * @param user 新增的用户对象。
+     * @return 新增后的用户对象。
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public SysUser saveNew(SysUser user) {
+        user.setUserId(idGenerator.nextLongId());
+        user.setPassword(passwordEncoder.encode(user.getPassword()));
+        user.setUserStatus(SysUserStatus.STATUS_NORMAL);
+        user.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+        MyModelUtil.fillCommonsForInsert(user);
+        sysUserMapper.insert(user);
+        return user;
+    }
+
+    /**
+     * 更新用户对象。
+     *
+     * @param user         更新的用户对象。
+     * @param originalUser 原有的用户对象。
+     * @return 更新成功返回true，否则false。
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean update(SysUser user, SysUser originalUser) {
+        user.setLoginName(originalUser.getLoginName());
+        user.setPassword(originalUser.getPassword());
+        MyModelUtil.fillCommonsForUpdate(user, originalUser);
+        user.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+        return sysUserMapper.updateByPrimaryKey(user) == 1;
+    }
+
+    /**
+     * 重置用户密码。
+     * @param userId  用户主键Id。
+     * @param newPass 新密码。
+     * @return 成功返回true，否则false。
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean changePassword(Long userId, String newPass) {
+        Example e = new Example(SysUser.class);
+        e.createCriteria()
+                .andEqualTo(super.idFieldName, userId)
+                .andEqualTo(super.deletedFlagFieldName, GlobalDeletedFlag.NORMAL);
+        SysUser updatedUser = new SysUser();
+        updatedUser.setPassword(passwordEncoder.encode(newPass));
+        return sysUserMapper.updateByExampleSelective(updatedUser, e) == 1;
+    }
+
+    /**
+     * 删除指定数据。
+     *
+     * @param userId 主键Id。
+     * @return 成功返回true，否则false。
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean remove(Long userId) {
+        // 这里先删除主数据
+        return this.removeById(userId);
+    }
+
+    /**
+     * 获取单表查询结果。由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
+     * 如果需要同时获取关联数据，请移步(getSysUserListWithRelation)方法。
+     *
+     * @param filter  过滤对象。
+     * @param orderBy 排序参数。
+     * @return 查询结果集。
+     */
+    @Override
+    public List<SysUser> getSysUserList(SysUser filter, String orderBy) {
+        return sysUserMapper.getSysUserList(null, null, filter, orderBy);
+    }
+
+    /**
+     * 获取主表的查询结果，查询条件中包括主表过滤对象和指定字段的(in list)过滤。
+     * 由于没有关联数据查询，因此在仅仅获取单表数据的场景下，效率更高。
+     * 如果需要同时获取关联数据，请移步(getSysUserListWithRelation)方法。
+     *
+     * @param inFilterField (In-list)指定的字段(Java成员字段，而非数据列名)。
+     * @param inFilterValues inFilterField指定字段的(In-list)数据列表。
+     * @param filter 过滤对象。
+     * @param orderBy 排序参数。
+     * @return 查询结果集。
+     */
+    @Override
+    public <M> List<SysUser> getSysUserList(
+            String inFilterField, Set<M> inFilterValues, SysUser filter, String orderBy) {
+        String inFilterColumn = MyModelUtil.mapToColumnName(inFilterField, SysUser.class);
+        return sysUserMapper.getSysUserList(inFilterColumn, inFilterValues, filter, orderBy);
+    }
+
+    /**
+     * 获取主表的查询结果，以及主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
+     * 该查询会涉及到一对一从表的关联过滤，或一对多从表的嵌套关联过滤，因此性能不如单表过滤。
+     * 如果仅仅需要获取主表数据，请移步(getSysUserList)，以便获取更好的查询性能。
+     *
+     * @param filter 主表过滤对象。
+     * @param orderBy 排序对象。
+     * @return 查询结果集。
+     */
+    @Override
+    public List<SysUser> getSysUserListWithRelation(SysUser filter, String orderBy) {
+        List<SysUser> resultList = sysUserMapper.getSysUserList(null, null, filter, orderBy);
+        this.buildRelationForDataList(resultList, MyRelationParam.normal());
+        return resultList;
+    }
+
+    /**
+     * 获取主表的查询结果，查询条件中包括主表过滤对象和指定字段的(in list)过滤。
+     * 同时还包含主表关联的字典数据和一对一从表数据，以及一对一从表的字典数据。
+     * 如果仅仅需要获取主表数据，请移步(getSysUserList)，以便获取更好的查询性能。
+     *
+     * @param inFilterField (In-list)指定的字段(Java成员字段，而非数据列名)。
+     * @param inFilterValues inFilterField指定字段的(In-list)数据列表。
+     * @param filter 主表过滤对象。
+     * @param orderBy 排序对象。
+     * @return 查询结果集。
+     */
+    @Override
+    public <M> List<SysUser> getSysUserListWithRelation(
+            String inFilterField, Set<M> inFilterValues, SysUser filter, String orderBy) {
+        List<SysUser> resultList =
+                sysUserMapper.getSysUserList(inFilterField, inFilterValues, filter, orderBy);
+        this.buildRelationForDataList(resultList, MyRelationParam.dictOnly());
+        return resultList;
+    }
+
+    /**
+     * 验证用户对象关联的数据是否都合法。
+     *
+     * @param sysUser         当前操作的对象。
+     * @param originalSysUser 原有对象。
+     * @return 验证结果。
+     */
+    @Override
+    public CallResult verifyRelatedData(SysUser sysUser, SysUser originalSysUser) {
+        JSONObject jsonObject = new JSONObject();
+        return CallResult.ok(jsonObject);
+    }
+}
--- a/orange-demo-multi-service-for-app/application/upms/upms-service/src/main/resources/log4j2.xml
+++ b/orange-demo-multi-service-for-app/application/upms/upms-service/src/main/resources/log4j2.xml
@@ -59,6 +59,9 @@
        <Root level="${OUTPUT_LOG_LEVEL}">
            <AppenderRef ref="console"/>
        </Root>
+        <Logger name="springfox.documentation" additivity="false" level="error">
+            <AppenderRef ref="console"/>
+        </Logger>
        <!-- AsyncLogger 是基于Disruptor的全量异步队列，性能极高，队列默认大小4096。-->
        <!-- 队列默认值可通过JVM参数设置，参考博客：https://www.jianshu.com/p/82469047acbf -->
        <AsyncLogger name="com.orange.demo" additivity="false" level="info">
--- a/orange-demo-multi-service-for-app/application/upms/upms-service/upms-service.iml
+++ b/orange-demo-multi-service-for-app/application/upms/upms-service/upms-service.iml
@@ -82,13 +82,30 @@
    <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: 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="module" module-name="common-redis" />
    <orderEntry type="library" name="Maven: redis.clients:jedis:3.1.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.7.0" level="project" />