From 17f0c20242c6ee3d35b9ee8f677d747ed012423c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 02 九月 2022 16:30:20 +0800
Subject: [PATCH] remove 移除maven docker插件 过于老旧功能缺陷大 使用idea自带的docker插件替代
---
ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 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..09e1dc7 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
@@ -1,7 +1,9 @@
package com.ruoyi.common.helper;
+import cn.dev33.satoken.context.SaHolder;
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;
@@ -12,34 +14,41 @@
/**
* 鐧诲綍閴存潈鍔╂墜
- * 涓洪�傞厤澶氱鐧诲綍鑰屽皝瑁�
+ *
+ * user_type 涓� 鐢ㄦ埛绫诲瀷 鍚屼竴涓敤鎴疯〃 鍙互鏈夊绉嶇敤鎴风被鍨� 渚嬪 pc,app
+ * deivce 涓� 璁惧绫诲瀷 鍚屼竴涓敤鎴风被鍨� 鍙互鏈� 澶氱璁惧绫诲瀷 渚嬪 web,ios
+ * 鍙互缁勬垚 鐢ㄦ埛绫诲瀷涓庤澶囩被鍨嬪瀵瑰鐨� 鏉冮檺鐏垫椿鎺у埗
+ *
+ * 澶氱敤鎴蜂綋绯� 閽堝 澶氱鐢ㄦ埛绫诲瀷 浣嗘潈闄愭帶鍒朵笉涓�鑷�
+ * 鍙互缁勬垚 澶氱敤鎴风被鍨嬭〃涓庡璁惧绫诲瀷 鍒嗗埆鎺у埗鏉冮檺
*
* @author Lion Li
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class LoginHelper {
- private static final String LOGIN_USER_KEY = "loginUser";
- private static final ThreadLocal<LoginUser> LOGIN_CACHE = new ThreadLocal<>();
+ public static final String JOIN_CODE = ":";
+ public static final String LOGIN_USER_KEY = "loginUser";
/**
* 鐧诲綍绯荤粺
- * 閽堝涓ゅ鐢ㄦ埛浣撶郴
*
* @param loginUser 鐧诲綍鐢ㄦ埛淇℃伅
*/
public static void login(LoginUser loginUser) {
+ SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
StpUtil.login(loginUser.getLoginId());
setLoginUser(loginUser);
}
/**
* 鐧诲綍绯荤粺 鍩轰簬 璁惧绫诲瀷
- * 閽堝涓�濂楃敤鎴蜂綋绯�
+ * 閽堝鐩稿悓鐢ㄦ埛浣撶郴涓嶅悓璁惧
*
* @param loginUser 鐧诲綍鐢ㄦ埛淇℃伅
*/
public static void loginByDevice(LoginUser loginUser, DeviceType deviceType) {
+ SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
StpUtil.login(loginUser.getLoginId(), deviceType.getDevice());
setLoginUser(loginUser);
}
@@ -49,25 +58,19 @@
*/
public static void setLoginUser(LoginUser loginUser) {
StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
- LOGIN_CACHE.set(loginUser);
}
/**
* 鑾峰彇鐢ㄦ埛(澶氱骇缂撳瓨)
*/
public static LoginUser getLoginUser() {
- LoginUser loginUser = LOGIN_CACHE.get();
+ LoginUser loginUser = (LoginUser) SaHolder.getStorage().get(LOGIN_USER_KEY);
if (loginUser != null) {
return loginUser;
}
- return (LoginUser) StpUtil.getTokenSession().get(LOGIN_USER_KEY);
- }
-
- /**
- * 娓呴櫎涓�绾х紦瀛� 闃叉鍐呭瓨闂
- */
- public static void clearCache() {
- LOGIN_CACHE.remove();
+ loginUser = (LoginUser) StpUtil.getTokenSession().get(LOGIN_USER_KEY);
+ SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
+ return 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,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