lbqms.git - Gitblit

			@@ -4,6 +4,7 @@
			import cn.dev33.satoken.secure.BCrypt;
			import cn.dev33.satoken.stp.StpUtil;
			import cn.hutool.core.bean.BeanUtil;
			import cn.hutool.core.convert.Convert;
			import cn.hutool.core.util.ObjectUtil;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.ruoyi.common.core.constant.Constants;
			@@ -30,12 +31,11 @@
			import com.ruoyi.system.domain.vo.SysTenantVo;
			import com.ruoyi.system.domain.vo.SysUserVo;
			import com.ruoyi.system.mapper.SysUserMapper;
			import com.ruoyi.system.service.ISysConfigService;
			import com.ruoyi.system.service.ISysPermissionService;
			import com.ruoyi.system.service.ISysTenantService;
			import jakarta.servlet.http.HttpServletRequest;
			import lombok.RequiredArgsConstructor;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.stereotype.Service;

			import java.time.Duration;
			@@ -58,11 +58,7 @@
			private final ISysPermissionService permissionService;
			private final ISysTenantService tenantService;

			@Value("${user.password.maxRetryCount}")
			private Integer maxRetryCount;

			@Value("${user.password.lockTime}")
			private Integer lockTime;
			private final ISysConfigService configService;

			/**
			* 登录验证
			@@ -74,11 +70,10 @@
			* @return 结果
			*/
			public String login(String tenantId, String username, String password, String code, String uuid) {
			HttpServletRequest request = ServletUtils.getRequest();
			boolean captchaEnabled = captchaProperties.getEnable();
			// 验证码开关
			if (captchaEnabled) {
			validateCaptcha(tenantId, username, code, uuid, request);
			validateCaptcha(tenantId, username, code, uuid);
			}
			// 校验租户
			checkTenant(tenantId);
			@@ -177,7 +172,6 @@
			* @param username 用户名
			* @param status 状态
			* @param message 消息内容
			* @return
			*/
			private void recordLogininfor(String tenantId, String username, String status, String message) {
			LogininforEvent logininforEvent = new LogininforEvent();
			@@ -220,7 +214,7 @@
			* @param code 验证码
			* @param uuid 唯一标识
			*/
			public void validateCaptcha(String tenantId, String username, String code, String uuid, HttpServletRequest request) {
			public void validateCaptcha(String tenantId, String username, String code, String uuid) {
			String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.defaultString(uuid, "");
			String captcha = RedisUtils.getCacheObject(verifyKey);
			RedisUtils.deleteObject(verifyKey);
			@@ -343,6 +337,10 @@

			// 获取用户登录错误次数(可自定义限制策略例如: key + username + ip)
			Integer errorNumber = RedisUtils.getCacheObject(errorKey);
			//密码最大错误次数
			Integer maxRetryCount = Convert.toInt(configService.selectConfigByKey("sys.user.maxRetryCount"));
			//密码锁定时间
			Integer lockTime = Convert.toInt(configService.selectConfigByKey("sys.user.lockTime"));
			// 锁定时间内登录则踢出
			if (ObjectUtil.isNotNull(errorNumber) && errorNumber.equals(maxRetryCount)) {
			recordLogininfor(tenantId, username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));