From 520cbec1b392442a6ee661dfad4178c2ceaf3e65 Mon Sep 17 00:00:00 2001
From: Yjoioooo <693337446@qq.com>
Date: 星期五, 24 三月 2023 14:50:41 +0800
Subject: [PATCH] fix 遗漏动态租户修改内容
---
ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/helper/TenantHelper.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/helper/TenantHelper.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/helper/TenantHelper.java
index f9815be..7f762aa 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/helper/TenantHelper.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/helper/TenantHelper.java
@@ -2,6 +2,7 @@
import cn.dev33.satoken.context.SaHolder;
import cn.dev33.satoken.spring.SpringMVCUtil;
+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;
@@ -10,7 +11,6 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.redis.utils.RedisUtils;
import com.ruoyi.common.satoken.utils.LoginHelper;
-import com.ruoyi.common.tenant.properties.TenantProperties;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -24,8 +24,6 @@
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class TenantHelper {
- private static final TenantProperties PROPERTIES = SpringUtils.getBean(TenantProperties.class);
-
private static final String DYNAMIC_TENANT_KEY = GlobalConstants.GLOBAL_REDIS_KEY + "dynamicTenant";
private static final ThreadLocal<String> TEMP_DYNAMIC_TENANT = new TransmittableThreadLocal<>();
@@ -34,7 +32,7 @@
* 绉熸埛鍔熻兘鏄惁鍚敤
*/
public static boolean isEnable() {
- return PROPERTIES.getEnable();
+ return Convert.toBool(SpringUtils.getProperty("tenant.enable"), false);
}
/**
@@ -61,7 +59,7 @@
TEMP_DYNAMIC_TENANT.set(tenantId);
return;
}
- String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getTenantId();
+ String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getUserId();
RedisUtils.setCacheObject(cacheKey, tenantId);
SaHolder.getStorage().set(cacheKey, tenantId);
}
@@ -75,7 +73,7 @@
if (!SpringMVCUtil.isWeb()) {
return TEMP_DYNAMIC_TENANT.get();
}
- String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getTenantId();
+ String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getUserId();
String tenantId = (String) SaHolder.getStorage().get(cacheKey);
if (StringUtils.isNotBlank(tenantId)) {
return tenantId;
@@ -93,7 +91,7 @@
TEMP_DYNAMIC_TENANT.remove();
return;
}
- String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getTenantId();
+ String cacheKey = DYNAMIC_TENANT_KEY + ":" + LoginHelper.getUserId();
RedisUtils.deleteObject(cacheKey);
SaHolder.getStorage().delete(cacheKey);
}
--
Gitblit v1.9.3