commit：同步1.4版本

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

@@ -29,12 +29,6 @@ public class SysUserVo {
     @ApiModelProperty(value = "登录用户名")
     private String loginName;
 
-    /**
-     * 用户密码。
-     */
-    @ApiModelProperty(value = "用户密码")
-    private String password;
-
     /**
      * 用户显示名称。
      */

orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/controller/LoginController.java

@@ -16,7 +16,6 @@ import com.orange.demo.common.core.util.RsaUtil;
 import com.orange.demo.common.redis.cache.SessionCacheHelper;
 import com.orange.demo.upmsinterface.constant.SysUserStatus;
 import com.orange.demo.upmsinterface.constant.SysUserType;
-import com.orange.demo.upmsservice.config.ApplicationConfig;
 import com.orange.demo.upmsservice.model.SysUser;
 import com.orange.demo.upmsservice.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,8 +41,6 @@ public class LoginController {
     @Autowired
     private SysUserService sysUserService;
     @Autowired
-    private ApplicationConfig appConfig;
-    @Autowired
     private SessionCacheHelper cacheHelper;
     @Autowired
     private PasswordEncoder passwordEncoder;
@@ -68,11 +65,14 @@ public class LoginController {
             return ResponseResult.error(ErrorCodeEnum.ARGUMENT_NULL_EXIST);
         }
         SysUser user = sysUserService.getSysUserByLoginName(loginName);
+        if (user == null) {
+            return ResponseResult.error(ErrorCodeEnum.INVALID_USERNAME_PASSWORD);
+        }
         password = URLDecoder.decode(password, StandardCharsets.UTF_8.name());
         // NOTE: 第一次使用时，请务必阅读ApplicationConstant.PRIVATE_KEY的代码注释。
         // 执行RsaUtil工具类中的main函数，可以生成新的公钥和私钥。
         password = RsaUtil.decrypt(password, ApplicationConstant.PRIVATE_KEY);
-        if (user == null || !passwordEncoder.matches(password, user.getPassword())) {
+        if (!passwordEncoder.matches(password, user.getPassword())) {
             return ResponseResult.error(ErrorCodeEnum.INVALID_USERNAME_PASSWORD);
         }
         String errorMessage;

orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/dao/mapper/SysUserMapper.xml

@@ -42,7 +42,6 @@
                 AND zz_sys_user.create_time <= #{sysUserFilter.createTimeEnd}
             </if>
         </if>
-        AND zz_sys_user.deleted_flag = ${@com.orange.demo.common.core.constant.GlobalDeletedFlag@NORMAL}
     </sql>
 
     <select id="getSysUserList" resultMap="BaseResultMap" parameterType="com.orange.demo.upmsservice.model.SysUser">

orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/model/SysUser.java

@@ -1,18 +1,18 @@
 package com.orange.demo.upmsservice.model;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.orange.demo.upmsinterface.constant.SysUserType;
 import com.orange.demo.upmsinterface.constant.SysUserStatus;
 import com.orange.demo.common.core.annotation.RelationConstDict;
+import com.orange.demo.common.core.base.model.BaseModel;
 import com.orange.demo.common.core.base.mapper.BaseModelMapper;
 import com.orange.demo.common.core.annotation.DeletedFlagColumn;
 import com.orange.demo.upmsinterface.vo.SysUserVo;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
 import javax.persistence.*;
 
-import java.util.Date;
 import java.util.Map;
 
 /**
@@ -22,8 +22,9 @@ import java.util.Map;
  * @date 2020-08-08
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 @Table(name = "zz_sys_user")
-public class SysUser {
+public class SysUser extends BaseModel {
 
     /**
      * 用户Id。
@@ -70,35 +71,10 @@ public class SysUser {
     /**
      * 逻辑删除标记字段(1: 正常 -1: 已删除)。
      */
-    @JSONField(serialize = false)
     @DeletedFlagColumn
     @Column(name = "deleted_flag")
     private Integer deletedFlag;
 
-    /**
-     * 创建用户Id。
-     */
-    @Column(name = "create_user_id")
-    private Long createUserId;
-
-    /**
-     * 更新者Id。
-     */
-    @Column(name = "update_user_id")
-    private Long updateUserId;
-
-    /**
-     * 创建时间。
-     */
-    @Column(name = "create_time")
-    private Date createTime;
-
-    /**
-     * 更新时间。
-     */
-    @Column(name = "update_time")
-    private Date updateTime;
-
     /**
      * createTime 范围过滤起始值(>=)。
      */

orange-demo-multi-service-for-app/application/upms/upms-service/src/main/java/com/orange/demo/upmsservice/service/impl/SysUserServiceImpl.java

@@ -53,11 +53,10 @@ public class SysUserServiceImpl extends BaseService<SysUser, Long> implements Sy
      */
     @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);
+        SysUser filter = new SysUser();
+        filter.setLoginName(loginName);
+        filter.setDeletedFlag(GlobalDeletedFlag.NORMAL);
+        return sysUserMapper.selectOne(filter);
     }
 
     /**