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 | 123 +++++++++++++++++-----------------------
1 files changed, 53 insertions(+), 70 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 929d124..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,21 +1,20 @@
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;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
-import org.dromara.common.core.constant.TenantConstants;
-import org.dromara.common.core.constant.UserConstants;
-import org.dromara.common.core.domain.model.LoginUser;
-import org.dromara.common.core.enums.DeviceType;
-import org.dromara.common.core.enums.UserType;
import lombok.AccessLevel;
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;
/**
* 鐧诲綍閴存潈鍔╂墜
@@ -35,42 +34,27 @@
public static final String LOGIN_USER_KEY = "loginUser";
public static final String TENANT_KEY = "tenantId";
public static final String USER_KEY = "userId";
-
- /**
- * 鐧诲綍绯荤粺
- *
- * @param loginUser 鐧诲綍鐢ㄦ埛淇℃伅
- */
- public static void login(LoginUser loginUser) {
- loginByDevice(loginUser, null);
- }
+ public static final String DEPT_KEY = "deptId";
+ public static final String CLIENT_KEY = "clientid";
+ public static final String TENANT_ADMIN_KEY = "isTenantAdmin";
/**
* 鐧诲綍绯荤粺 鍩轰簬 璁惧绫诲瀷
* 閽堝鐩稿悓鐢ㄦ埛浣撶郴涓嶅悓璁惧
*
* @param loginUser 鐧诲綍鐢ㄦ埛淇℃伅
+ * @param model 閰嶇疆鍙傛暟
*/
- public static void loginByDevice(LoginUser loginUser, DeviceType deviceType) {
- SaStorage storage = SaHolder.getStorage();
- storage.set(LOGIN_USER_KEY, loginUser);
- storage.set(TENANT_KEY, loginUser.getTenantId());
- storage.set(USER_KEY, loginUser.getUserId());
- SaLoginModel model = new SaLoginModel();
- if (ObjectUtil.isNotNull(deviceType)) {
- model.setDevice(deviceType.getDevice());
- }
- // 鑷畾涔夊垎閰� 涓嶅悓鐢ㄦ埛浣撶郴 涓嶅悓 token 鎺堟潈鏃堕棿 涓嶈缃粯璁よ蛋鍏ㄥ眬 yml 閰嶇疆
- // 渚嬪: 鍚庡彴鐢ㄦ埛30鍒嗛挓杩囨湡 app鐢ㄦ埛1澶╄繃鏈�
-// UserType userType = UserType.getUserType(loginUser.getUserType());
-// if (userType == UserType.SYS_USER) {
-// model.setTimeout(86400).setActiveTimeout(1800);
-// } else if (userType == UserType.APP_USER) {
-// model.setTimeout(86400).setActiveTimeout(1800);
-// }
+ public static void login(LoginUser loginUser, SaLoginModel model) {
+ 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()));
+ model.setExtra(TENANT_KEY, loginUser.getTenantId())
+ .setExtra(USER_KEY, loginUser.getUserId())
+ .setExtra(DEPT_KEY, loginUser.getDeptId()));
StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
}
@@ -78,17 +62,13 @@
* 鑾峰彇鐢ㄦ埛(澶氱骇缂撳瓨)
*/
public static LoginUser getLoginUser() {
- LoginUser loginUser = (LoginUser) SaHolder.getStorage().get(LOGIN_USER_KEY);
- if (loginUser != null) {
- return loginUser;
- }
- SaSession session = StpUtil.getTokenSession();
- 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);
+ });
}
/**
@@ -106,41 +86,25 @@
* 鑾峰彇鐢ㄦ埛id
*/
public static Long getUserId() {
- Long userId;
- try {
- userId = Convert.toLong(SaHolder.getStorage().get(USER_KEY));
- if (ObjectUtil.isNull(userId)) {
- userId = Convert.toLong(StpUtil.getExtra(USER_KEY));
- SaHolder.getStorage().set(USER_KEY, userId);
- }
- } catch (Exception e) {
- return null;
- }
- return userId;
+ return Convert.toLong(getExtra(USER_KEY));
}
/**
* 鑾峰彇绉熸埛ID
*/
public static String getTenantId() {
- String tenantId;
- try {
- tenantId = (String) SaHolder.getStorage().get(TENANT_KEY);
- if (ObjectUtil.isNull(tenantId)) {
- tenantId = (String) StpUtil.getExtra(TENANT_KEY);
- SaHolder.getStorage().set(TENANT_KEY, tenantId);
- }
- } catch (Exception e) {
- return null;
- }
- return tenantId;
+ return Convert.toStr(getExtra(TENANT_KEY));
}
/**
* 鑾峰彇閮ㄩ棬ID
*/
public static Long getDeptId() {
- return getLoginUser().getDeptId();
+ return Convert.toLong(getExtra(DEPT_KEY));
+ }
+
+ private static Object getExtra(String key) {
+ return getStorageIfAbsentSet(key, () -> StpUtil.getExtra(key));
}
/**
@@ -183,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