fix 登录错误限制

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -121,6 +121,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Autowired
     private IUserStudyLogService iUserStudyLogService;
 
+    @Autowired
+    private IUserLoginErrorService iUserLoginErrorService;
+
 
     @Override
     public UserVo queryById(Long userId) {
@@ -1009,12 +1012,14 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(bo.getTel()==null){
             throw new CustomException("手机号不能为空");
         }
+        iUserLoginErrorService.checkLimit(bo.getTel());
         String key = Constants.LOGIN_SMS + bo.getTel();
         String code =  redisCache.getCacheObject(key);
         if(code==null){
             throw new CustomException("验证码错误");
         }
         if(!code.equals(bo.getCode())){
+            iUserLoginErrorService.saveErrorLog(bo.getTel());
             throw new CustomException("验证码错误");
         }
         redisCache.deleteObject(key);
@@ -1076,6 +1081,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         if(Validator.isEmpty(bo.getAccount())){
             throw new CustomException("账号不能为空");
         }
+        iUserLoginErrorService.checkLimit(bo.getAccount());
         LambdaQueryWrapper<User> queryWrapper =new LambdaQueryWrapper<User>();
         queryWrapper.and(wq -> wq
                 .eq(User::getTelphone,bo.getAccount())
@@ -1083,7 +1089,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 .eq(User::getIdCard,bo.getAccount()));
         User user = getOne(queryWrapper);
         if(Validator.isEmpty(user)){
-            throw new CustomException("该账号不存在");
+            iUserLoginErrorService.saveErrorLog(bo.getAccount());
+            throw new CustomException("登录信息错误");
         }
         else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
         {
@@ -1105,7 +1112,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         }
         if (!SecurityUtils.matchesPassword(password,user.getPassword()))
         {
-            throw new BaseException("用户信息错误");
+            iUserLoginErrorService.saveErrorLog(bo.getAccount());
+            throw new BaseException("登录信息错误");
         }
         //如果活动分销码变动
         if (StringUtils.isNotBlank(bo.getShareActivityCode())){

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserLoginErrorAddBo.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 用户登录错误日志添加对象 user_login_error
+ *
+ * @author hjl
+ * @date 2023-01-13
+ */
+@Data
+@ApiModel("用户登录错误日志添加对象")
+public class UserLoginErrorAddBo {
+
+    /** 登录账号，身份证或者手机号码 */
+    @ApiModelProperty("登录账号，身份证或者手机号码")
+    private String loginAccount;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+    /** 访问IP */
+    @ApiModelProperty("访问IP")
+    private String ip;
+    /** 日期时间戳 */
+    @ApiModelProperty("日期时间戳")
+    private Long date;
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserLoginErrorEditBo.java

@@ -0,0 +1,45 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 用户登录错误日志编辑对象 user_login_error
+ *
+ * @author hjl
+ * @date 2023-01-13
+ */
+@Data
+@ApiModel("用户登录错误日志编辑对象")
+public class UserLoginErrorEditBo {
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 登录账号，身份证或者手机号码 */
+    @ApiModelProperty("登录账号，身份证或者手机号码")
+    private String loginAccount;
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long updateTime;
+
+
+    /** 访问IP */
+    @ApiModelProperty("访问IP")
+    private String ip;
+
+    /** 日期时间戳 */
+    @ApiModelProperty("日期时间戳")
+    private Long date;
+
+    /** 状态 1正常 0关闭 */
+    @ApiModelProperty("状态 1正常 0关闭")
+    private Integer status;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserLoginErrorQueryBo.java

@@ -0,0 +1,51 @@
+package com.zhongzheng.modules.user.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 用户登录错误日志分页查询对象 user_login_error
+ *
+ * @author hjl
+ * @date 2023-01-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("用户登录错误日志分页查询对象")
+public class UserLoginErrorQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 登录账号，身份证或者手机号码 */
+	@ApiModelProperty("登录账号，身份证或者手机号码")
+	private String loginAccount;
+	/** 访问IP */
+	@ApiModelProperty("访问IP")
+	private String ip;
+	/** 日期时间戳 */
+	@ApiModelProperty("日期时间戳")
+	private Long date;
+	/** 状态 1正常 0关闭 */
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserLoginError.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.user.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.zhongzheng.common.annotation.Excel;
+
+/**
+ * 用户登录错误日志对象 user_login_error
+ *
+ * @author hjl
+ * @date 2023-01-13
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("user_login_error")
+public class UserLoginError implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    /** $column.columnComment */
+    @TableId(value = "id")
+    private Long id;
+    /** 登录账号，身份证或者手机号码 */
+    private String loginAccount;
+    /** 创建时间 */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createTime;
+    /** $column.columnComment */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateTime;
+    /** 访问IP */
+    private String ip;
+    /** 日期时间戳 */
+    private Long date;
+    /** 状态 1正常 0关闭 */
+    private Integer status;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserLoginErrorMapper.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.user.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.domain.UserLoginError;
+
+/**
+ * 用户登录错误日志Mapper接口
+ *
+ * @author hjl
+ * @date 2023-01-13
+ */
+public interface UserLoginErrorMapper extends BaseMapper<UserLoginError> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserLoginErrorService.java

@@ -0,0 +1,56 @@
+package com.zhongzheng.modules.user.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.user.bo.UserLoginErrorAddBo;
+import com.zhongzheng.modules.user.bo.UserLoginErrorEditBo;
+import com.zhongzheng.modules.user.bo.UserLoginErrorQueryBo;
+import com.zhongzheng.modules.user.domain.UserLoginError;
+import com.zhongzheng.modules.user.vo.UserLoginErrorVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户登录错误日志Service接口
+ *
+ * @author hjl
+ * @date 2023-01-13
+ */
+public interface IUserLoginErrorService extends IService<UserLoginError> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	UserLoginErrorVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+	List<UserLoginErrorVo> queryList(UserLoginErrorQueryBo bo);
+
+	/**
+	 * 根据新增业务对象插入用户登录错误日志
+	 * @param bo 用户登录错误日志新增业务对象
+	 * @return
+	 */
+	Boolean insertByAddBo(UserLoginErrorAddBo bo);
+
+	Boolean saveErrorLog(String loginAccount);
+
+	Boolean checkLimit(String loginAccount);
+
+	/**
+	 * 根据编辑业务对象修改用户登录错误日志
+	 * @param bo 用户登录错误日志编辑业务对象
+	 * @return
+	 */
+	Boolean updateByEditBo(UserLoginErrorEditBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserLoginErrorServiceImpl.java

@@ -0,0 +1,127 @@
+package com.zhongzheng.modules.user.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.exception.CustomException;
+import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.common.utils.ip.IpUtils;
+import com.zhongzheng.modules.exam.domain.ExamKnowledge;
+import com.zhongzheng.modules.user.bo.UserLoginErrorAddBo;
+import com.zhongzheng.modules.user.bo.UserLoginErrorEditBo;
+import com.zhongzheng.modules.user.bo.UserLoginErrorQueryBo;
+import com.zhongzheng.modules.user.domain.UserLoginError;
+import com.zhongzheng.modules.user.mapper.UserLoginErrorMapper;
+import com.zhongzheng.modules.user.service.IUserLoginErrorService;
+import com.zhongzheng.modules.user.vo.UserLoginErrorVo;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.Page;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户登录错误日志Service业务层处理
+ *
+ * @author hjl
+ * @date 2023-01-13
+ */
+@Service
+public class UserLoginErrorServiceImpl extends ServiceImpl<UserLoginErrorMapper, UserLoginError> implements IUserLoginErrorService {
+
+    @Override
+    public UserLoginErrorVo queryById(Long id){
+        UserLoginError db = this.baseMapper.selectById(id);
+        return BeanUtil.toBean(db, UserLoginErrorVo.class);
+    }
+
+    @Override
+    public List<UserLoginErrorVo> queryList(UserLoginErrorQueryBo bo) {
+        LambdaQueryWrapper<UserLoginError> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StrUtil.isNotBlank(bo.getLoginAccount()), UserLoginError::getLoginAccount, bo.getLoginAccount());
+        lqw.eq(StrUtil.isNotBlank(bo.getIp()), UserLoginError::getIp, bo.getIp());
+        lqw.eq(bo.getDate() != null, UserLoginError::getDate, bo.getDate());
+        lqw.eq(bo.getStatus() != null, UserLoginError::getStatus, bo.getStatus());
+        return entity2Vo(this.list(lqw));
+    }
+
+    /**
+    * 实体类转化成视图对象
+    *
+    * @param collection 实体类集合
+    * @return
+    */
+    private List<UserLoginErrorVo> entity2Vo(Collection<UserLoginError> collection) {
+        List<UserLoginErrorVo> voList = collection.stream()
+                .map(any -> BeanUtil.toBean(any, UserLoginErrorVo.class))
+                .collect(Collectors.toList());
+        if (collection instanceof Page) {
+            Page<UserLoginError> page = (Page<UserLoginError>)collection;
+            Page<UserLoginErrorVo> pageVo = new Page<>();
+            BeanUtil.copyProperties(page,pageVo);
+            pageVo.addAll(voList);
+            voList = pageVo;
+        }
+        return voList;
+    }
+
+    @Override
+    public Boolean insertByAddBo(UserLoginErrorAddBo bo) {
+        UserLoginError add = BeanUtil.toBean(bo, UserLoginError.class);
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        add.setDate(DateUtils.getTodayZeroTime());
+        add.setIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
+        return this.save(add);
+    }
+
+    @Override
+    public Boolean saveErrorLog(String loginAccount) {
+        UserLoginErrorAddBo errorAddBo = new UserLoginErrorAddBo();
+        errorAddBo.setLoginAccount(loginAccount);
+        return insertByAddBo(errorAddBo);
+    }
+
+    @Override
+    public Boolean checkLimit(String loginAccount) {
+        LambdaQueryWrapper<UserLoginError> lqwExam = Wrappers.lambdaQuery();
+        lqwExam.eq(UserLoginError::getLoginAccount, loginAccount);
+        lqwExam.eq(UserLoginError::getDate, DateUtils.getTodayZeroTime());
+        Integer count = baseMapper.selectCount(lqwExam);
+        if(count>=5){
+            throw new CustomException("今天你的错误次数已超过5次，请明天再登录");
+        }
+        return true;
+    }
+
+    @Override
+    public Boolean updateByEditBo(UserLoginErrorEditBo bo) {
+        UserLoginError update = BeanUtil.toBean(bo, UserLoginError.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(UserLoginError entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return this.removeByIds(ids);
+    }
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserLoginErrorVo.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.user.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 用户登录错误日志视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2023-01-13
+ */
+@Data
+@ApiModel("用户登录错误日志视图对象")
+public class UserLoginErrorVo {
+	private static final long serialVersionUID = 1L;
+
+	/** $pkColumn.columnComment */
+	@ApiModelProperty("$pkColumn.columnComment")
+	private Long id;
+
+	/** 登录账号，身份证或者手机号码 */
+	@Excel(name = "登录账号，身份证或者手机号码")
+	@ApiModelProperty("登录账号，身份证或者手机号码")
+	private String loginAccount;
+	/** 访问IP */
+	@Excel(name = "访问IP")
+	@ApiModelProperty("访问IP")
+	private String ip;
+	/** 日期时间戳 */
+	@Excel(name = "日期时间戳")
+	@ApiModelProperty("日期时间戳")
+	private Long date;
+	/** 状态 1正常 0关闭 */
+	@Excel(name = "状态 1正常 0关闭")
+	@ApiModelProperty("状态 1正常 0关闭")
+	private Integer status;
+}

zhongzheng-system/src/main/resources/mapper/modules/user/UserLoginErrorMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhongzheng.modules.user.mapper.UserLoginErrorMapper">
+
+    <resultMap type="com.zhongzheng.modules.user.domain.UserLoginError" id="UserLoginErrorResult">
+        <result property="id" column="id"/>
+        <result property="loginAccount" column="login_account"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="ip" column="ip"/>
+        <result property="date" column="date"/>
+        <result property="status" column="status"/>
+    </resultMap>
+
+
+</mapper>