From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java | 122 ++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 42 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 5f36ac3..e2c9236 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
@@ -3,18 +3,18 @@
import cn.dev33.satoken.session.SaSession;
import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import org.dromara.common.core.constant.SystemConstants;
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;
+
/**
* 鐧诲綍閴存潈鍔╂墜
@@ -34,9 +34,11 @@
public static final String LOGIN_USER_KEY = "loginUser";
public static final String TENANT_KEY = "tenantId";
public static final String USER_KEY = "userId";
+ public static final String USER_NAME_KEY = "userName";
public static final String DEPT_KEY = "deptId";
+ public static final String DEPT_NAME_KEY = "deptName";
+ public static final String DEPT_CATEGORY_KEY = "deptCategory";
public static final String CLIENT_KEY = "clientid";
- public static final String TENANT_ADMIN_KEY = "isTenantAdmin";
/**
* 鐧诲綍绯荤粺 鍩轰簬 璁惧绫诲瀷
@@ -46,15 +48,15 @@
* @param model 閰嶇疆鍙傛暟
*/
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())
- .setExtra(DEPT_KEY, loginUser.getDeptId()));
+ .setExtra(USER_NAME_KEY, loginUser.getUsername())
+ .setExtra(DEPT_KEY, loginUser.getDeptId())
+ .setExtra(DEPT_NAME_KEY, loginUser.getDeptName())
+ .setExtra(DEPT_CATEGORY_KEY, loginUser.getDeptCategory())
+ );
StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
}
@@ -62,13 +64,11 @@
* 鑾峰彇鐢ㄦ埛(澶氱骇缂撳瓨)
*/
public static LoginUser getLoginUser() {
- return (LoginUser) getStorageIfAbsentSet(LOGIN_USER_KEY, () -> {
- SaSession session = StpUtil.getTokenSession();
- if (ObjectUtil.isNull(session)) {
- return null;
- }
- return session.get(LOGIN_USER_KEY);
- });
+ SaSession session = StpUtil.getTokenSession();
+ if (ObjectUtil.isNull(session)) {
+ return null;
+ }
+ return (LoginUser) session.get(LOGIN_USER_KEY);
}
/**
@@ -86,7 +86,21 @@
* 鑾峰彇鐢ㄦ埛id
*/
public static Long getUserId() {
- return Convert.toLong(getExtra(USER_KEY));
+ return Convert.toLong(getExtra(USER_KEY));
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛id
+ */
+ public static String getUserIdStr() {
+ return Convert.toStr(getExtra(USER_KEY));
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛璐︽埛
+ */
+ public static String getUsername() {
+ return Convert.toStr(getExtra(USER_NAME_KEY));
}
/**
@@ -103,15 +117,32 @@
return Convert.toLong(getExtra(DEPT_KEY));
}
- private static Object getExtra(String key) {
- return getStorageIfAbsentSet(key, () -> StpUtil.getExtra(key));
+ /**
+ * 鑾峰彇閮ㄩ棬鍚�
+ */
+ public static String getDeptName() {
+ return Convert.toStr(getExtra(DEPT_NAME_KEY));
}
/**
- * 鑾峰彇鐢ㄦ埛璐︽埛
+ * 鑾峰彇閮ㄩ棬绫诲埆缂栫爜
*/
- public static String getUsername() {
- return getLoginUser().getUsername();
+ public static String getDeptCategory() {
+ return Convert.toStr(getExtra(DEPT_CATEGORY_KEY));
+ }
+
+ /**
+ * 鑾峰彇褰撳墠 Token 鐨勬墿灞曚俊鎭�
+ *
+ * @param key 閿��
+ * @return 瀵瑰簲鐨勬墿灞曟暟鎹�
+ */
+ private static Object getExtra(String key) {
+ try {
+ return StpUtil.getExtra(key);
+ } catch (Exception e) {
+ return null;
+ }
}
/**
@@ -129,44 +160,51 @@
* @return 缁撴灉
*/
public static boolean isSuperAdmin(Long userId) {
- return UserConstants.SUPER_ADMIN_ID.equals(userId);
- }
-
- public static boolean isSuperAdmin() {
- return isSuperAdmin(getUserId());
+ return SystemConstants.SUPER_ADMIN_ID.equals(userId);
}
/**
* 鏄惁涓鸿秴绾х鐞嗗憳
*
+ * @return 缁撴灉
+ */
+ public static boolean isSuperAdmin() {
+ return isSuperAdmin(getUserId());
+ }
+
+ /**
+ * 鏄惁涓虹鎴风鐞嗗憳
+ *
* @param rolePermission 瑙掕壊鏉冮檺鏍囪瘑缁�
* @return 缁撴灉
*/
public static boolean isTenantAdmin(Set<String> rolePermission) {
+ if (CollUtil.isEmpty(rolePermission)) {
+ return false;
+ }
return rolePermission.contains(TenantConstants.TENANT_ADMIN_ROLE_KEY);
}
+ /**
+ * 鏄惁涓虹鎴风鐞嗗憳
+ *
+ * @return 缁撴灉
+ */
public static boolean isTenantAdmin() {
- Object value = getStorageIfAbsentSet(TENANT_ADMIN_KEY, () -> {
- return isTenantAdmin(getLoginUser().getRolePermission());
- });
- return Convert.toBool(value);
+ return Convert.toBool(isTenantAdmin(getLoginUser().getRolePermission()));
}
+ /**
+ * 妫�鏌ュ綋鍓嶇敤鎴锋槸鍚﹀凡鐧诲綍
+ *
+ * @return 缁撴灉
+ */
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;
+ return getLoginUser() != null;
} catch (Exception e) {
- return null;
+ return false;
}
}
+
}
--
Gitblit v1.9.3