From 4ceb79afa35b2be369b8c84219524d687451974b Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: 星期五, 29 十二月 2023 11:39:15 +0800
Subject: [PATCH] !467 新增 ThreadLocalHolder 整合 SaHolder，ThreadLocal * fix 修复 issue#I8RWB5 字段缺少问题 ; * add 新增 ThreadLocalHolder 替换 SaHolder ;
---
ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java | 70 ++++++++++++++++++----------------
1 files changed, 37 insertions(+), 33 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 97b7041..5f36ac3 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
@@ -1,7 +1,5 @@
package org.dromara.common.satoken.utils;
-import cn.dev33.satoken.context.SaHolder;
-import cn.dev33.satoken.context.model.SaStorage;
import cn.dev33.satoken.session.SaSession;
import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil;
@@ -11,10 +9,12 @@
import lombok.NoArgsConstructor;
import org.dromara.common.core.constant.TenantConstants;
import org.dromara.common.core.constant.UserConstants;
+import org.dromara.common.core.context.ThreadLocalHolder;
import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.core.enums.UserType;
import java.util.Set;
+import java.util.function.Supplier;
/**
* 鐧诲綍閴存潈鍔╂墜
@@ -36,6 +36,7 @@
public static final String USER_KEY = "userId";
public static final String DEPT_KEY = "deptId";
public static final String CLIENT_KEY = "clientid";
+ public static final String TENANT_ADMIN_KEY = "isTenantAdmin";
/**
* 鐧诲綍绯荤粺 鍩轰簬 璁惧绫诲瀷
@@ -45,42 +46,36 @@
* @param model 閰嶇疆鍙傛暟
*/
public static void login(LoginUser loginUser, SaLoginModel model) {
- SaStorage storage = SaHolder.getStorage();
- storage.set(LOGIN_USER_KEY, loginUser);
- storage.set(TENANT_KEY, loginUser.getTenantId());
- storage.set(USER_KEY, loginUser.getUserId());
- storage.set(DEPT_KEY, loginUser.getDeptId());
+ ThreadLocalHolder.set(LOGIN_USER_KEY, loginUser);
+ ThreadLocalHolder.set(TENANT_KEY, loginUser.getTenantId());
+ ThreadLocalHolder.set(USER_KEY, loginUser.getUserId());
+ ThreadLocalHolder.set(DEPT_KEY, loginUser.getDeptId());
model = ObjectUtil.defaultIfNull(model, new SaLoginModel());
StpUtil.login(loginUser.getLoginId(),
model.setExtra(TENANT_KEY, loginUser.getTenantId())
.setExtra(USER_KEY, loginUser.getUserId())
.setExtra(DEPT_KEY, loginUser.getDeptId()));
- StpUtil.getSession().set(LOGIN_USER_KEY, loginUser);
+ StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
}
/**
* 鑾峰彇鐢ㄦ埛(澶氱骇缂撳瓨)
*/
public static LoginUser getLoginUser() {
- LoginUser loginUser = (LoginUser) SaHolder.getStorage().get(LOGIN_USER_KEY);
- if (loginUser != null) {
- return loginUser;
- }
- SaSession session = StpUtil.getSession();
- if (ObjectUtil.isNull(session)) {
- return null;
- }
- loginUser = (LoginUser) session.get(LOGIN_USER_KEY);
- SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
- return loginUser;
+ return (LoginUser) getStorageIfAbsentSet(LOGIN_USER_KEY, () -> {
+ SaSession session = StpUtil.getTokenSession();
+ if (ObjectUtil.isNull(session)) {
+ return null;
+ }
+ return session.get(LOGIN_USER_KEY);
+ });
}
/**
* 鑾峰彇鐢ㄦ埛鍩轰簬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;
}
@@ -109,17 +104,7 @@
}
private static Object getExtra(String key) {
- Object obj;
- try {
- obj = SaHolder.getStorage().get(key);
- if (ObjectUtil.isNull(obj)) {
- obj = StpUtil.getExtra(key);
- SaHolder.getStorage().set(key, obj);
- }
- } catch (Exception e) {
- return null;
- }
- return obj;
+ return getStorageIfAbsentSet(key, () -> StpUtil.getExtra(key));
}
/**
@@ -162,7 +147,26 @@
}
public static boolean isTenantAdmin() {
- return isTenantAdmin(getLoginUser().getRolePermission());
+ Object value = getStorageIfAbsentSet(TENANT_ADMIN_KEY, () -> {
+ return isTenantAdmin(getLoginUser().getRolePermission());
+ });
+ return Convert.toBool(value);
}
+ public static boolean isLogin() {
+ return getLoginUser() != null;
+ }
+
+ public static Object getStorageIfAbsentSet(String key, Supplier<Object> handle) {
+ try {
+ Object obj = ThreadLocalHolder.get(key);
+ if (ObjectUtil.isNull(obj)) {
+ obj = handle.get();
+ ThreadLocalHolder.set(key, obj);
+ }
+ return obj;
+ } catch (Exception e) {
+ return null;
+ }
+ }
}
--
Gitblit v1.9.3