From 2917d335bc3fd1f6dfb57cbad6d73ba48bc5f9d7 Mon Sep 17 00:00:00 2001
From: konbai <1527468660@qq.com>
Date: 星期六, 19 二月 2022 16:15:44 +0800
Subject: [PATCH] update 优化 是否为管理员的判断
---
ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
index ddd5018..daa20d8 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java
@@ -2,6 +2,7 @@
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.DeviceType;
import com.ruoyi.common.enums.UserType;
@@ -19,7 +20,9 @@
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class LoginHelper {
- private static final String LOGIN_USER_KEY = "loginUser";
+ public static final String JOIN_CODE = ":";
+ public static final String LOGIN_USER_KEY = "loginUser";
+
private static final ThreadLocal<LoginUser> LOGIN_CACHE = new ThreadLocal<>();
/**
@@ -29,6 +32,7 @@
* @param loginUser 鐧诲綍鐢ㄦ埛淇℃伅
*/
public static void login(LoginUser loginUser) {
+ LOGIN_CACHE.set(loginUser);
StpUtil.login(loginUser.getLoginId());
setLoginUser(loginUser);
}
@@ -40,6 +44,7 @@
* @param loginUser 鐧诲綍鐢ㄦ埛淇℃伅
*/
public static void loginByDevice(LoginUser loginUser, DeviceType deviceType) {
+ LOGIN_CACHE.set(loginUser);
StpUtil.login(loginUser.getLoginId(), deviceType.getDevice());
setLoginUser(loginUser);
}
@@ -49,7 +54,6 @@
*/
public static void setLoginUser(LoginUser loginUser) {
StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
- LOGIN_CACHE.set(loginUser);
}
/**
@@ -80,7 +84,9 @@
String userId = null;
for (UserType value : UserType.values()) {
if (StringUtils.contains(loginId, value.getUserType())) {
- userId = StringUtils.replace(loginId, value.getUserType(), StringUtils.EMPTY);
+ String[] strs = StringUtils.split(loginId, JOIN_CODE);
+ // 鐢ㄦ埛id鍦ㄦ�绘槸鍦ㄦ渶鍚�
+ userId = strs[strs.length - 1];
}
}
if (StringUtils.isBlank(userId)) {
@@ -113,4 +119,18 @@
return UserType.getUserType(loginId);
}
+ /**
+ * 鏄惁涓虹鐞嗗憳
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @return 缁撴灉
+ */
+ public static boolean isAdmin(Long userId) {
+ return UserConstants.ADMIN_ID.equals(userId);
+ }
+
+ public static boolean isAdmin() {
+ return isAdmin(getUserId());
+ }
+
}
--
Gitblit v1.9.3