From cb9a3c36e6b03a97a767a49d1ede6855b3512e4f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 30 十一月 2023 11:28:52 +0800
Subject: [PATCH] fix 修复 session 多账号共用覆盖问题 改为 tokenSession 独立存储
---
ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java | 106 +++++++++++++++++++++++++++--------------------------
1 files changed, 54 insertions(+), 52 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 e79b9ba..2406ba9 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
@@ -2,19 +2,20 @@
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 lombok.AccessLevel;
+import lombok.NoArgsConstructor;
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 java.util.Set;
+import java.util.function.Supplier;
/**
* 鐧诲綍閴存潈鍔╂墜
@@ -34,34 +35,28 @@
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) {
+ 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());
- SaLoginModel model = new SaLoginModel();
- if (ObjectUtil.isNotNull(deviceType)) {
- model.setDevice(deviceType.getDevice());
- }
+ storage.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(USER_KEY, loginUser.getUserId())
+ .setExtra(DEPT_KEY, loginUser.getDeptId()));
StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
}
@@ -69,61 +64,49 @@
* 鑾峰彇鐢ㄦ埛(澶氱骇缂撳瓨)
*/
public static LoginUser getLoginUser() {
- LoginUser loginUser = (LoginUser) SaHolder.getStorage().get(LOGIN_USER_KEY);
- if (loginUser != null) {
- return loginUser;
- }
- loginUser = (LoginUser) StpUtil.getTokenSession().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) {
- return (LoginUser) StpUtil.getTokenSessionByToken(token).get(LOGIN_USER_KEY);
+ SaSession session = StpUtil.getTokenSessionByToken(token);
+ if (ObjectUtil.isNull(session)) {
+ return null;
+ }
+ return (LoginUser) session.get(LOGIN_USER_KEY);
}
/**
* 鑾峰彇鐢ㄦ埛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));
}
/**
@@ -137,8 +120,8 @@
* 鑾峰彇鐢ㄦ埛绫诲瀷
*/
public static UserType getUserType() {
- String loginId = StpUtil.getLoginIdAsString();
- return UserType.getUserType(loginId);
+ String loginType = StpUtil.getLoginIdAsString();
+ return UserType.getUserType(loginType);
}
/**
@@ -166,7 +149,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 = SaHolder.getStorage().get(key);
+ if (ObjectUtil.isNull(obj)) {
+ obj = handle.get();
+ SaHolder.getStorage().set(key, obj);
+ }
+ return obj;
+ } catch (Exception e) {
+ return null;
+ }
+ }
}
--
Gitblit v1.9.3