From 61e2a07ee2709d6eb9144ec069ef7229bd8ee398 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 11 二月 2022 15:03:09 +0800
Subject: [PATCH] update 使用 satoken 自带的 BCrypt 工具 替换 Security 加密工具 减少依赖
---
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..a152208 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
@@ -19,7 +19,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 +31,7 @@
* @param loginUser 鐧诲綍鐢ㄦ埛淇℃伅
*/
public static void login(LoginUser loginUser) {
+ LOGIN_CACHE.set(loginUser);
StpUtil.login(loginUser.getLoginId());
setLoginUser(loginUser);
}
@@ -40,6 +43,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 +53,6 @@
*/
public static void setLoginUser(LoginUser loginUser) {
StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
- LOGIN_CACHE.set(loginUser);
}
/**
@@ -80,7 +83,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 +118,19 @@
return UserType.getUserType(loginId);
}
+ /**
+ * 鏄惁涓虹鐞嗗憳
+ *
+ * @param userId 鐢ㄦ埛ID
+ * @return 缁撴灉
+ */
+ public static boolean isAdmin(Long userId) {
+ return userId != null && 1L == userId;
+ }
+
+ public static boolean isAdmin() {
+ Long userId = getUserId();
+ return userId != null && 1L == userId;
+ }
+
}
--
Gitblit v1.9.3