From 8bd023b49fbdf2bc0677da8b7bbdce6c820f32f9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 02 十一月 2022 10:34:58 +0800
Subject: [PATCH] fix 修复 sqlserver 分页问题
---
ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 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..9c48c13 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,11 @@
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";
+ if(tokenConfig.getTimeout() == -1) {
+ RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto);
+ } else {
+ RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto, Duration.ofSeconds(tokenConfig.getTimeout()));
}
- CacheUtils.put(cacheNames, tokenValue, dto);
log.info("user doLogin, userId:{}, token:{}", loginId, tokenValue);
} else if (userType == UserType.APP_USER) {
// app绔� 鑷鏍规嵁涓氬姟缂栧啓
@@ -65,7 +66,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 +75,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 +84,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);
}
@@ -91,14 +92,14 @@
* 姣忔琚皝绂佹椂瑙﹀彂
*/
@Override
- public void doDisable(String loginType, Object loginId, long disableTime) {
+ public void doDisable(String loginType, Object loginId, String service, int level, long disableTime) {
}
/**
* 姣忔琚В灏佹椂瑙﹀彂
*/
@Override
- public void doUntieDisable(String loginType, Object loginId) {
+ public void doUntieDisable(String loginType, Object loginId, String service) {
}
/**
@@ -115,5 +116,10 @@
public void doLogoutSession(String id) {
}
-
+ /**
+ * 姣忔Token缁湡鏃惰Е鍙�
+ */
+ @Override
+ public void doRenewTimeout(String tokenValue, Object loginId, long timeout) {
+ }
}
--
Gitblit v1.9.3