From 9cdcbbccbf4b8752504d11e3379a7156492b07f9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 11 十一月 2024 10:26:34 +0800
Subject: [PATCH] update 重构 将UserConstants改为SystemConstants 统一常量使用 降低使用难度避免误解
---
ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 99f6afc..cdc5684 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,12 +3,13 @@
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.domain.model.LoginUser;
import org.dromara.common.core.enums.UserType;
@@ -151,7 +152,7 @@
* @return 缁撴灉
*/
public static boolean isSuperAdmin(Long userId) {
- return UserConstants.SUPER_ADMIN_ID.equals(userId);
+ return SystemConstants.SUPER_ADMIN_ID.equals(userId);
}
/**
@@ -170,6 +171,9 @@
* @return 缁撴灉
*/
public static boolean isTenantAdmin(Set<String> rolePermission) {
+ if (CollUtil.isEmpty(rolePermission)) {
+ return false;
+ }
return rolePermission.contains(TenantConstants.TENANT_ADMIN_ROLE_KEY);
}
@@ -188,7 +192,11 @@
* @return 缁撴灉
*/
public static boolean isLogin() {
- return getLoginUser() != null;
+ try {
+ return getLoginUser() != null;
+ } catch (Exception e) {
+ return false;
+ }
}
}
--
Gitblit v1.9.3