From 125547f08f9123913b8ca704208fce7e99d011c1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 26 九月 2021 10:05:29 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
index 886537f..06aa9ac 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
@@ -25,7 +25,7 @@
/**
* 鐧诲綍鏍￠獙鏂规硶
- *
+ *
* @author ruoyi
*/
@Component
@@ -48,7 +48,7 @@
/**
* 鐧诲綍楠岃瘉
- *
+ *
* @param username 鐢ㄦ埛鍚�
* @param password 瀵嗙爜
* @param code 楠岃瘉鐮�
@@ -81,20 +81,20 @@
}
else
{
- asyncService.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage(), request);
+ AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
throw new ServiceException(e.getMessage());
}
}
asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request);
LoginUser loginUser = (LoginUser) authentication.getPrincipal();
- recordLoginInfo(loginUser.getUser());
+ recordLoginInfo(loginUser.getUserId());
// 鐢熸垚token
return tokenService.createToken(loginUser);
}
/**
* 鏍￠獙楠岃瘉鐮�
- *
+ *
* @param username 鐢ㄦ埛鍚�
* @param code 楠岃瘉鐮�
* @param uuid 鍞竴鏍囪瘑
@@ -116,12 +116,15 @@
/**
* 璁板綍鐧诲綍淇℃伅
+ *
+ * @param userId 鐢ㄦ埛ID
*/
- public void recordLoginInfo(SysUser user)
+ public void recordLoginInfo(Long userId)
{
- user.setLoginIp(ServletUtils.getClientIP());
- user.setLoginDate(DateUtils.getNowDate());
- user.setUpdateBy(user.getUserName());
- 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.3