From 96d936331f7840b8157b64ad8bb9cbace99c1557 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 21:16:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java |   10 +++++++---
 1 files changed, 7 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 a54019d..47783e0 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
@@ -24,7 +24,6 @@
     private RedisService redisService;
 
     private int maxRetryCount = CacheConstants.PASSWORD_MAX_RETRY_COUNT;
-
     private Long lockTime = CacheConstants.PASSWORD_LOCK_TIME;
 
     @Autowired
@@ -59,8 +58,13 @@
             throw new ServiceException(errMsg);
         }
 
-//        if (!matches(user, password))
-//        {
+        if (!matches(user,password)){
+            retryCount = retryCount + 1;
+            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("密码错误");
+        }
+//        if (!user.getPassword().equals(password)){
 //            retryCount = retryCount + 1;
 //            recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS, String.format("密码输入错误%s次", retryCount));
 //            redisService.setCacheObject(getCacheKey(username), retryCount, lockTime, TimeUnit.MINUTES);

--
Gitblit v1.7.1