From af77bf73bbf31601b1f3fb00549a82f64bdcc284 Mon Sep 17 00:00:00 2001
From: dhy1725534722 <1725534722@qq.com>
Date: Wed, 10 Apr 2024 10:01:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=B7=BB=E5=8A=A0=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/framework/web/service/SysLoginService.java  | 2 +-
 .../ruoyi/framework/web/service/SysRegisterService.java   | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index e448993..722c4ad 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -132,7 +132,7 @@ public class SysLoginService
             addRecord(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员");
             throw new ServiceException("对不起，您的账号：" + username + " 已停用");
         }
-//        sysPasswordService.validate(user);
+        sysPasswordService.validate(user);
         addRecord(username, Constants.LOGIN_SUCCESS, "登录成功");
         // 生成token
         return tokenService.createToken(loginUser);
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
index f2afe31..008b8e1 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
@@ -18,6 +18,8 @@ import com.ruoyi.framework.manager.factory.AsyncFactory;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
 
+import javax.annotation.Resource;
+
 /**
  * 注册校验方法
  * 
@@ -35,6 +37,9 @@ public class SysRegisterService
     @Autowired
     private RedisCache redisCache;
 
+    @Resource
+    private SysLoginService sysLoginService;
+
     /**
      * 注册
      */
@@ -72,6 +77,7 @@ public class SysRegisterService
         else if (!userService.checkUserNameUnique(sysUser))
         {
             msg = "保存用户'" + username + "'失败，注册账号已存在";
+            sysLoginService.addRecord(username, Constants.LOGIN_FAIL, "注册失败");
         }
         else
         {
@@ -81,10 +87,12 @@ public class SysRegisterService
             if (!regFlag)
             {
                 msg = "注册失败,请联系系统管理人员";
+                sysLoginService.addRecord(username, Constants.LOGIN_FAIL, "注册失败");
             }
             else
             {
                 AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.REGISTER, MessageUtils.message("user.register.success")));
+                sysLoginService.addRecord(username, Constants.LOGIN_FAIL, "注册成功");
             }
         }
         return msg;