From 6cbe15b5456b1b6a10ef74046f2b69a2ed85cbda Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 31 十月 2024 15:40:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java
index e00b1a4..1f6a419 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java
@@ -10,6 +10,8 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysUser;
+import javax.servlet.http.HttpServletRequest;
+
/**
* 登录密码方法
*
@@ -39,7 +41,7 @@
return CacheConstants.PWD_ERR_CNT_KEY + username;
}
- public void validate(SysUser user, String password)
+ public void validate(SysUser user, String password, HttpServletRequest request)
{
String username = user.getUserName();
@@ -53,14 +55,14 @@
if (retryCount >= Integer.valueOf(maxRetryCount).intValue())
{
String errMsg = String.format("密码输入错误%s次，帐户锁定%s分钟", maxRetryCount, lockTime);
- recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL,errMsg);
+ recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS,errMsg);
throw new ServiceException(errMsg);
}
if (!matches(user, password))
{
retryCount = retryCount + 1;
- recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, String.format("密码输入错误%s次", retryCount));
+ recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS, String.format("密码输入错误%s次", retryCount));
redisService.setCacheObject(getCacheKey(username), retryCount, lockTime, TimeUnit.MINUTES);
throw new ServiceException("密码错误");
}
--
Gitblit v1.7.1