From 43d76e599091dc6b79b51f89c79514b50e33ea35 Mon Sep 17 00:00:00 2001
From: fuzui <73400@163.com>
Date: 星期四, 16 十二月 2021 02:18:48 +0800
Subject: [PATCH] fix: cron组件中周回显bug
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
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 d605303..2b54743 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
@@ -11,7 +11,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.user.CaptchaException;
import com.ruoyi.common.exception.user.CaptchaExpireException;
import com.ruoyi.common.exception.user.UserPasswordNotMatchException;
@@ -62,7 +62,7 @@
// 验证码开关
if (captchaOnOff)
{
- validateCapcha(username, code, uuid);
+ validateCaptcha(username, code, uuid);
}
// 用户验证
Authentication authentication = null;
@@ -82,12 +82,12 @@
else
{
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
- throw new CustomException(e.getMessage());
+ throw new ServiceException(e.getMessage());
}
}
AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
LoginUser loginUser = (LoginUser) authentication.getPrincipal();
- recordLoginInfo(loginUser.getUser());
+ recordLoginInfo(loginUser.getUserId());
// 生成token
return tokenService.createToken(loginUser);
}
@@ -100,7 +100,7 @@
* @param uuid 唯一标识
* @return 结果
*/
- public void validateCapcha(String username, String code, String uuid)
+ public void validateCaptcha(String username, String code, String uuid)
{
String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
String captcha = redisCache.getCacheObject(verifyKey);
@@ -119,11 +119,15 @@
/**
* 记录登录信息
+ *
+ * @param userId 用户ID
*/
- public void recordLoginInfo(SysUser user)
+ public void recordLoginInfo(Long userId)
{
- user.setLoginIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
- user.setLoginDate(DateUtils.getNowDate());
- userService.updateUserProfile(user);
+ SysUser sysUser = new SysUser();
+ sysUser.setUserId(userId);
+ sysUser.setLoginIp(IpUtils.getIpAddr(ServletUtils.getRequest()));
+ sysUser.setLoginDate(DateUtils.getNowDate());
+ userService.updateUserProfile(sysUser);
}
}
--
Gitblit v1.9.2