From 8e091d712ffa0a45b0af08360e00acce3a6de6ec Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 29 三月 2024 11:11:05 +0800
Subject: [PATCH] fix 修复 临时解决 token与token-session 过期时间不一致问题(等satoken处理)
---
ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
index f20a505..8488ac1 100644
--- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
@@ -57,7 +57,9 @@
model.setExtra(TENANT_KEY, loginUser.getTenantId())
.setExtra(USER_KEY, loginUser.getUserId())
.setExtra(DEPT_KEY, loginUser.getDeptId()));
- StpUtil.getSession().set(LOGIN_USER_KEY, loginUser);
+ SaSession tokenSession = StpUtil.getTokenSession();
+ tokenSession.updateTimeout(model.getTimeout());
+ tokenSession.set(LOGIN_USER_KEY, loginUser);
}
/**
@@ -65,7 +67,7 @@
*/
public static LoginUser getLoginUser() {
return (LoginUser) getStorageIfAbsentSet(LOGIN_USER_KEY, () -> {
- SaSession session = StpUtil.getSession();
+ SaSession session = StpUtil.getTokenSession();
if (ObjectUtil.isNull(session)) {
return null;
}
@@ -77,8 +79,7 @@
* 鑾峰彇鐢ㄦ埛鍩轰簬token
*/
public static LoginUser getLoginUser(String token) {
- Object loginId = StpUtil.getLoginIdByToken(token);
- SaSession session = StpUtil.getSessionByLoginId(loginId);
+ SaSession session = StpUtil.getTokenSessionByToken(token);
if (ObjectUtil.isNull(session)) {
return null;
}
--
Gitblit v1.9.3