From 3f4d51b485758e547ac6a504c4a0f41addf0dcfe Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 30 八月 2022 12:42:59 +0800
Subject: [PATCH] !223 fix 修复 spring cache 获取在线用户失败问题 Merge pull request !223 from MichelleChung/dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 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 d6268eb..1e3c22c 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
@@ -5,17 +5,19 @@
import cn.dev33.satoken.stp.SaLoginModel;
import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil;
-import com.ruoyi.common.constant.CacheNames;
+import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.domain.dto.UserOnlineDTO;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.UserType;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.redis.CacheUtils;
import com.ruoyi.common.utils.ip.AddressUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
+
+import java.time.Duration;
/**
* 鐢ㄦ埛琛屼负 渚﹀惉鍣ㄧ殑瀹炵幇
@@ -48,12 +50,7 @@
dto.setTokenId(tokenValue);
dto.setUserName(user.getUsername());
dto.setDeptName(user.getDeptName());
- String cacheNames = CacheNames.ONLINE_TOKEN;
- if (tokenConfig.getTimeout() > 0) {
- // 澧炲姞 ttl 杩囨湡鏃堕棿 鍗曚綅绉�
- cacheNames = CacheNames.ONLINE_TOKEN + "#" + tokenConfig.getTimeout() + "s";
- }
- CacheUtils.put(cacheNames, tokenValue, dto);
+ RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto, Duration.ofSeconds(tokenConfig.getTimeout()));
log.info("user doLogin, userId:{}, token:{}", loginId, tokenValue);
} else if (userType == UserType.APP_USER) {
// app绔� 鑷鏍规嵁涓氬姟缂栧啓
@@ -65,7 +62,7 @@
*/
@Override
public void doLogout(String loginType, Object loginId, String tokenValue) {
- CacheUtils.evict(CacheNames.ONLINE_TOKEN, tokenValue);
+ RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
log.info("user doLogout, userId:{}, token:{}", loginId, tokenValue);
}
@@ -74,7 +71,7 @@
*/
@Override
public void doKickout(String loginType, Object loginId, String tokenValue) {
- CacheUtils.evict(CacheNames.ONLINE_TOKEN, tokenValue);
+ RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
log.info("user doLogoutByLoginId, userId:{}, token:{}", loginId, tokenValue);
}
@@ -83,7 +80,7 @@
*/
@Override
public void doReplaced(String loginType, Object loginId, String tokenValue) {
- CacheUtils.evict(CacheNames.ONLINE_TOKEN, tokenValue);
+ RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
log.info("user doReplaced, userId:{}, token:{}", loginId, tokenValue);
}
--
Gitblit v1.9.3