From d131a833ab2421026a7256ff74955256ac593629 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 29 十一月 2023 16:09:20 +0800
Subject: [PATCH] fix 修复 token 失效后 登录获取用户null问题
---
ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java | 97 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 88 insertions(+), 9 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java
index e1784b5..e830c19 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/helper/TenantHelper.java
@@ -1,19 +1,21 @@
package org.dromara.common.tenant.helper;
import cn.dev33.satoken.context.SaHolder;
-import cn.dev33.satoken.spring.SpringMVCUtil;
+import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.convert.Convert;
import com.alibaba.ttl.TransmittableThreadLocal;
import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy;
import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.satoken.utils.LoginHelper;
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+
+import java.util.function.Supplier;
/**
* 绉熸埛鍔╂墜
@@ -50,12 +52,43 @@
}
/**
+ * 鍦ㄥ拷鐣ョ鎴蜂腑鎵ц
+ *
+ * @param handle 澶勭悊鎵ц鏂规硶
+ */
+ public static void ignore(Runnable handle) {
+ enableIgnore();
+ try {
+ handle.run();
+ } finally {
+ disableIgnore();
+ }
+ }
+
+ /**
+ * 鍦ㄥ拷鐣ョ鎴蜂腑鎵ц
+ *
+ * @param handle 澶勭悊鎵ц鏂规硶
+ */
+ public static <T> T ignore(Supplier<T> handle) {
+ enableIgnore();
+ try {
+ return handle.get();
+ } finally {
+ disableIgnore();
+ }
+ }
+
+ /**
* 璁剧疆鍔ㄦ�佺鎴�(涓�鐩存湁鏁� 闇�瑕佹墜鍔ㄦ竻鐞�)
* <p>
- * 濡傛灉涓洪潪web鐜 閭ｄ箞鍙湪褰撳墠绾跨▼鍐呯敓鏁�
+ * 濡傛灉涓烘湭鐧诲綍鐘舵�佷笅 閭ｄ箞鍙湪褰撳墠绾跨▼鍐呯敓鏁�
*/
public static void setDynamic(String tenantId) {
- if (!SpringMVCUtil.isWeb()) {
+ if (!isEnable()) {
+ return;
+ }
+ if (!isLogin()) {
TEMP_DYNAMIC_TENANT.set(tenantId);
return;
}
@@ -67,10 +100,13 @@
/**
* 鑾峰彇鍔ㄦ�佺鎴�(涓�鐩存湁鏁� 闇�瑕佹墜鍔ㄦ竻鐞�)
* <p>
- * 濡傛灉涓洪潪web鐜 閭ｄ箞鍙湪褰撳墠绾跨▼鍐呯敓鏁�
+ * 濡傛灉涓烘湭鐧诲綍鐘舵�佷笅 閭ｄ箞鍙湪褰撳墠绾跨▼鍐呯敓鏁�
*/
public static String getDynamic() {
- if (!SpringMVCUtil.isWeb()) {
+ if (!isEnable()) {
+ return null;
+ }
+ if (!isLogin()) {
return TEMP_DYNAMIC_TENANT.get();
}
String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getUserId();
@@ -87,7 +123,10 @@
* 娓呴櫎鍔ㄦ�佺鎴�
*/
public static void clearDynamic() {
- if (!SpringMVCUtil.isWeb()) {
+ if (!isEnable()) {
+ return;
+ }
+ if (!isLogin()) {
TEMP_DYNAMIC_TENANT.remove();
return;
}
@@ -97,9 +136,40 @@
}
/**
+ * 鍦ㄥ姩鎬佺鎴蜂腑鎵ц
+ *
+ * @param handle 澶勭悊鎵ц鏂规硶
+ */
+ public static void dynamic(String tenantId, Runnable handle) {
+ setDynamic(tenantId);
+ try {
+ handle.run();
+ } finally {
+ clearDynamic();
+ }
+ }
+
+ /**
+ * 鍦ㄥ姩鎬佺鎴蜂腑鎵ц
+ *
+ * @param handle 澶勭悊鎵ц鏂规硶
+ */
+ public static <T> T dynamic(String tenantId, Supplier<T> handle) {
+ setDynamic(tenantId);
+ try {
+ return handle.get();
+ } finally {
+ clearDynamic();
+ }
+ }
+
+ /**
* 鑾峰彇褰撳墠绉熸埛id(鍔ㄦ�佺鎴蜂紭鍏�)
*/
public static String getTenantId() {
+ if (!isEnable()) {
+ return null;
+ }
String tenantId = TenantHelper.getDynamic();
if (StringUtils.isBlank(tenantId)) {
tenantId = LoginHelper.getTenantId();
@@ -107,4 +177,13 @@
return tenantId;
}
+ private static boolean isLogin() {
+ try {
+ StpUtil.checkLogin();
+ return true;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+
}
--
Gitblit v1.9.3