三级等保登录逻辑修改

portal-manager/db/add.sql

@@ -18,3 +18,26 @@ CREATE TABLE mortals_xhx_product_interface_log(
     `updateTime` datetime      COMMENT '更新时间',
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='产品接口';
+
+ALTER TABLE `mortals_xhx_user`
+ADD COLUMN `saltKey` varchar(32)  DEFAULT NULL  COMMENT '密码盐值',
+ADD COLUMN `lastUpdatePwdTime` datetime  DEFAULT NULL  COMMENT '最后一次修改密码时间',
+ADD COLUMN `errorCount` tinyint(2)  DEFAULT '0'  COMMENT '当日登录失败数',
+ADD COLUMN `loginLock` tinyint(2)  DEFAULT '0'  COMMENT '登录锁定状态0未锁定1已锁定',
+ADD COLUMN `lockTime` datetime DEFAULT NULL COMMENT '锁定时间';
+
+-- ----------------------------
+-- 用户密码修改记录表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_user_pwd_record`;
+CREATE TABLE `mortals_xhx_user_pwd_record` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键，自增长',
+  `userId` bigint(20) DEFAULT NULL COMMENT '用户ID，主键，自增长',
+  `loginName` varchar(50) DEFAULT NULL COMMENT '登录名',
+  `loginPwd` varchar(128) DEFAULT NULL COMMENT '登录密码，使用md5双次加密',
+  `createTime` datetime DEFAULT NULL COMMENT '创建时间',
+  `createUserId` bigint(20) DEFAULT NULL COMMENT '创建用户',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户密码修改记录';
+
+UPDATE mortals_xhx_user SET lastUpdatePwdTime=NOW();
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -6,14 +6,12 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.IAuthTokenService;
-import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.IUser;
-import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.util.DateUtils;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.valid.service.ValidCodeService;
 import com.mortals.xhx.common.code.YesNoEnum;
-import com.mortals.xhx.common.key.Constant;
 import com.mortals.xhx.common.pdu.SitePdu;
 import com.mortals.xhx.feign.model.IApiModelFeign;
 import com.mortals.xhx.feign.rsp.ApiResp;
@@ -22,8 +20,6 @@ import com.mortals.xhx.module.menu.service.MenuService;
 import com.mortals.xhx.module.user.model.UserEntity;
 import com.mortals.xhx.module.user.service.UserService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.ArrayStack;
-import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -44,6 +40,8 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
     private IAuthTokenService authTokenService;
     @Autowired
     private IApiModelFeign apiModelFeign;
+    @Autowired
+    private ValidCodeService validCodeService;
 
     @RequestMapping("login")
     public String login(@RequestBody LoginForm loginForm) throws Exception {
@@ -60,7 +58,11 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         UserEntity userEntity = null;
         try {
             loginForm.validate();
-            userEntity = userService.doLogin(loginName, password, ip);
+            boolean validCode = validCodeService.doCheckImageValidCode(request.getSession().getId(),super.getRequestIP(request),loginForm.getCode());
+            if(!validCode){
+                throw new AppException("验证码错误");
+            }
+            userEntity = userService.userdoLogin(loginName, password, ip);
             userEntity.setLastLoginAddress(ip);
             userEntity.setLoginTime(System.currentTimeMillis());
             String tmpToken = userEntity.getId() + ":" + IdUtil.fastSimpleUUID();

portal-manager/src/main/java/com/mortals/xhx/base/login/web/LoginForm.java

 package com.mortals.xhx.base.login.web;
 
 import com.mortals.framework.exception.AppException;
-import com.mortals.framework.web.BaseForm;
 import lombok.Data;
 
 
@@ -11,6 +10,8 @@ public class LoginForm {
 
     private String password;
 
+    private String code;
+
 
     @Override
     public String toString() {

portal-manager/src/main/java/com/mortals/xhx/common/utils/Solution.java

+package com.mortals.xhx.common.utils;
+
+
+public class Solution {
+    //判断输入是否为数字
+    public static boolean isNumber(char s) {
+        return s >= '0' && s <= '9';
+    }
+
+    //判断输入是否为大写字母
+    public static boolean isUpper(char s) {
+        return s >= 'A' && s <= 'Z';
+    }
+
+    //判断输入是否为小写字母
+    public static boolean isLower(char s) {
+        return s >= 'a' && s <= 'z';
+    }
+
+    //判断输入是否为特殊字符
+    public static boolean isCharacter(char s) {
+        return (s < 'a' || s > 'z') && (s < 'A' || s > 'Z') && (s < '0' || s > '9');
+    }
+
+    //判断输入长度是否合法
+    public static boolean lengthOK(String s, int length) {
+        return s.length() >= length;
+    }
+
+    //判断是否有连续相同输入
+    public static boolean isSample(char[] arr) {
+        for (int i = 0; i < arr.length; i++) {
+            if (i < arr.length - 1 && (arr[i] == arr[i + 1])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    //判断密码是否是强密码
+    public static boolean strongPasswordCheckerII(String password) {
+        //以五个boolean变量记录是否包含其指定字符，若包含，将对应值置为true
+        boolean isSample = false, isNumber = false, isUpper = false, isLower = false, isCharacter = false;
+        //首先判断长度，若长度不符，return false
+        if (lengthOK(password, 8)) {
+            //将输入转为数组，便于操作
+            char[] arr = password.toCharArray();
+            //判断是否有连续相同输入，若有则isSample=false
+            isSample = isSample(arr);
+            for (char c : arr) {
+                //判断是否包含数字，若有则isNumber=true
+                if (!isNumber) {
+                    isNumber = isNumber(c);
+                }
+                //判断是否包含大写字母，若有则isUpper=true
+                if (!isUpper) {
+                    isUpper = isUpper(c);
+                }
+                //判断是否包含小写字母，若有则isLower=true
+                if (!isLower) {
+                    isLower = isLower(c);
+                }
+                //判断是否包含特殊字符，若有则isCharacter=true
+                if (!isCharacter) {
+                    isCharacter = isCharacter(c);
+                }
+            }
+        }
+        //若满足强密码所有条件，则返回true
+        return isNumber && isUpper && isLower && isCharacter && isSample;
+    }
+}
+

portal-manager/src/main/java/com/mortals/xhx/module/user/dao/UserPwdRecordDao.java

+package com.mortals.xhx.module.user.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.user.model.UserPwdRecordEntity;
+import java.util.List;
+/**
+* 用户密码修改记录Dao
+* 用户密码修改记录 DAO接口
+*
+* @author zxfei
+* @date 2023-07-26
+*/
+
+public interface  UserPwdRecordDao extends ICRUDDao<UserPwdRecordEntity,Long>{
+
+
+}

portal-manager/src/main/java/com/mortals/xhx/module/user/dao/ibatis/UserPwdRecordDaoImpl.java

+package com.mortals.xhx.module.user.dao.ibatis;
+
+
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import com.mortals.xhx.module.user.dao.UserPwdRecordDao;
+import com.mortals.xhx.module.user.model.UserPwdRecordEntity;
+import org.springframework.stereotype.Repository;
+/**
+* 用户密码修改记录DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-07-26
+*/
+@Repository("userPwdRecordDao")
+public class UserPwdRecordDaoImpl extends BaseCRUDDaoMybatis<UserPwdRecordEntity,Long> implements UserPwdRecordDao {
+
+
+
+}

portal-manager/src/main/java/com/mortals/xhx/module/user/model/UserEntity.java

 package com.mortals.xhx.module.user.model;
 
-import java.util.Date;
-import java.util.List;
-import java.util.ArrayList;
-
 import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.ap.SysConstains;
-import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.framework.service.IUser;
 import com.mortals.xhx.module.user.model.vo.UserVo;
+
+import java.util.Date;
 /**
 * 用户信息业务实体对象
 *
@@ -94,7 +90,26 @@ public class UserEntity extends UserVo implements IUser {
      * 所属区域code,多个逗号分隔
      */
     private String areaNames;
-
+    /**
+     * 密码盐值
+     */
+    private String saltKey;
+    /**
+     * 最后一次修改密码时间
+     */
+    private Date lastUpdatePwdTime;
+    /**
+     * 当日登录失败数
+     */
+    private Integer errorCount;
+    /**
+     * 登录锁定状态0未锁定1已锁定
+     */
+    private Integer loginLock;
+    /**
+     * 锁定时间
+     */
+    private Date lockTime;
 
 
     public UserEntity(){}
@@ -379,6 +394,45 @@ public class UserEntity extends UserVo implements IUser {
         this.areaNames = areaNames;
     }
 
+    public String getSaltKey() {
+        return saltKey;
+    }
+
+    public void setSaltKey(String saltKey) {
+        this.saltKey = saltKey;
+    }
+
+    public Date getLastUpdatePwdTime() {
+        return lastUpdatePwdTime;
+    }
+
+    public void setLastUpdatePwdTime(Date lastUpdatePwdTime) {
+        this.lastUpdatePwdTime = lastUpdatePwdTime;
+    }
+
+    public Integer getErrorCount() {
+        return errorCount;
+    }
+
+    public void setErrorCount(Integer errorCount) {
+        this.errorCount = errorCount;
+    }
+
+    public Integer getLoginLock() {
+        return loginLock;
+    }
+
+    public void setLoginLock(Integer loginLock) {
+        this.loginLock = loginLock;
+    }
+
+    public Date getLockTime() {
+        return lockTime;
+    }
+
+    public void setLockTime(Date lockTime) {
+        this.lockTime = lockTime;
+    }
 
     @Override
     public int hashCode() {
@@ -450,5 +504,15 @@ public class UserEntity extends UserVo implements IUser {
             this.lastLoginAddress = "";
 
             this.areaNames = "";
+
+            this.saltKey = "";
+
+            this.lastUpdatePwdTime = null;
+
+            this.errorCount = 0;
+
+            this.loginLock = 0;
+
+            this.lockTime = null;
     }
 }
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/model/UserPwdRecordEntity.java

+package com.mortals.xhx.module.user.model;
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.user.model.vo.UserPwdRecordVo;
+import lombok.Data;
+/**
+* 用户密码修改记录实体对象
+*
+* @author zxfei
+* @date 2023-07-26
+*/
+@Data
+public class UserPwdRecordEntity extends UserPwdRecordVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+    * 用户ID，主键，自增长
+    */
+    private Long userId;
+    /**
+    * 登录名
+    */
+    private String loginName;
+    /**
+    * 登录密码，使用md5双次加密
+    */
+    private String loginPwd;
+    @Override
+    public int hashCode() {
+         return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof UserPwdRecordEntity) {
+            UserPwdRecordEntity tmp = (UserPwdRecordEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                 return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+
+            this.userId = -1L;
+
+            this.loginName = "";
+
+            this.loginPwd = "";
+    }
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/model/vo/UserPwdRecordVo.java

+package com.mortals.xhx.module.user.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.user.model.UserPwdRecordEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 用户密码修改记录视图对象
+*
+* @author zxfei
+* @date 2023-07-26
+*/
+@Data
+public class UserPwdRecordVo extends BaseEntityLong {
+
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/service/UserPwdRecordService.java

+package com.mortals.xhx.module.user.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.user.model.UserPwdRecordEntity;
+import com.mortals.xhx.module.user.dao.UserPwdRecordDao;
+/**
+* UserPwdRecordService
+*
+* 用户密码修改记录 service接口
+*
+* @author zxfei
+* @date 2023-07-26
+*/
+public interface UserPwdRecordService extends ICRUDService<UserPwdRecordEntity,Long>{
+
+    UserPwdRecordDao getDao();
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/service/UserService.java

@@ -5,14 +5,9 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.framework.service.ICRUDService;
-import com.mortals.framework.service.IUser;
-import com.mortals.xhx.module.menu.model.MenuEntity;
 import com.mortals.xhx.module.user.model.UserEntity;
 import com.mortals.xhx.module.user.model.UserEntityExt;
 
-import java.util.List;
-import java.util.Set;
-
 /**
 * UserService
 *
@@ -31,7 +26,7 @@ public interface UserService extends ICRUDService<UserEntity,Long>{
      * @return
      * @throws AppException
      */
-    UserEntity doLogin(String loginName, String password, String loginIp) throws AppException;
+    UserEntity userdoLogin(String loginName, String password, String loginIp) throws AppException;
 
     /**
      * 校验用户名与密码是否正确

portal-manager/src/main/java/com/mortals/xhx/module/user/service/impl/UserPwdRecordServiceImpl.java

+package com.mortals.xhx.module.user.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.user.dao.UserPwdRecordDao;
+import com.mortals.xhx.module.user.model.UserPwdRecordEntity;
+import com.mortals.xhx.module.user.service.UserPwdRecordService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* UserPwdRecordService
+* 用户密码修改记录 service实现
+*
+* @author zxfei
+* @date 2023-07-26
+*/
+@Service("userPwdRecordService")
+@Slf4j
+public class UserPwdRecordServiceImpl extends AbstractCRUDServiceImpl<UserPwdRecordDao, UserPwdRecordEntity, Long> implements UserPwdRecordService {
+    
+}
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserPwdRecordController.java

+package com.mortals.xhx.module.user.web;
+
+import com.mortals.framework.model.Context;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.user.model.UserPwdRecordEntity;
+import com.mortals.xhx.module.user.service.UserPwdRecordService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+/**
+*
+* 用户密码修改记录
+*
+* @author zxfei
+* @date 2023-07-26
+*/
+@RestController
+@RequestMapping("user/pwd/record")
+public class UserPwdRecordController extends BaseCRUDJsonBodyMappingController<UserPwdRecordService,UserPwdRecordEntity,Long> {
+
+    public UserPwdRecordController(){
+        super.setModuleDesc( "用户密码修改记录");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file