From 80d1e28d0f5b643a753a2989dbba4e123b9ad87d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 10 五月 2022 14:42:02 +0800
Subject: [PATCH] update springboot-admin 2.6.6 => 2.6.7 update springboot-mybatis 2.2.0 => 2.2.2 update sa-token 1.29.0 => 1.30.0 update hutool 5.7.22 => 5.8.0 update druid 1.2.8 => 1.2.9 update tlog 1.3.6 => 1.4.0
---
ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
index 75277c2..dcb9b19 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
@@ -3,7 +3,6 @@
import cn.dev33.satoken.config.SaTokenConfig;
import cn.dev33.satoken.listener.SaTokenListener;
import cn.dev33.satoken.stp.SaLoginModel;
-import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil;
import com.ruoyi.common.constant.Constants;
@@ -18,7 +17,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
/**
* 鐢ㄦ埛琛屼负 渚﹀惉鍣ㄧ殑瀹炵幇
@@ -36,13 +35,12 @@
* 姣忔鐧诲綍鏃惰Е鍙�
*/
@Override
- public void doLogin(String loginType, Object loginId, SaLoginModel loginModel) {
+ public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginModel loginModel) {
UserType userType = UserType.getUserType(loginId.toString());
if (userType == UserType.SYS_USER) {
UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
String ip = ServletUtils.getClientIP();
LoginUser user = LoginHelper.getLoginUser();
- String tokenValue = StpUtil.getTokenValueByLoginId(loginId);
UserOnlineDTO dto = new UserOnlineDTO();
dto.setIpaddr(ip);
dto.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
@@ -52,7 +50,7 @@
dto.setTokenId(tokenValue);
dto.setUserName(user.getUsername());
dto.setDeptName(user.getDeptName());
- RedisUtils.setCacheObject(Constants.ONLINE_TOKEN_KEY + tokenValue, dto, tokenConfig.getTimeout(), TimeUnit.SECONDS);
+ RedisUtils.setCacheObject(Constants.ONLINE_TOKEN_KEY + tokenValue, dto, Duration.ofSeconds(tokenConfig.getTimeout()));
log.info("user doLogin, userId:{}, token:{}", loginId, tokenValue);
} else if (userType == UserType.APP_USER) {
// app绔� 鑷鏍规嵁涓氬姟缂栧啓
--
Gitblit v1.9.3