From 6b05ddb576d21884c89214f3910f6f8405779105 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 19 九月 2024 23:13:00 +0800
Subject: [PATCH] update 优化 redis操作 如果无法忽略租户id则全局处理
---
ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java | 6 ++++--
ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java
index 67be2fb..6fa3b74 100644
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java
@@ -517,7 +517,7 @@
}
/**
- * 鑾峰緱缂撳瓨鐨勫熀鏈璞″垪琛�
+ * 鑾峰緱缂撳瓨鐨勫熀鏈璞″垪琛�(鍏ㄥ眬鍖归厤蹇界暐绉熸埛 鑷鎷兼帴绉熸埛id)
*
* @param pattern 瀛楃涓插墠缂�
* @return 瀵硅薄鍒楄〃
@@ -528,7 +528,7 @@
}
/**
- * 鍒犻櫎缂撳瓨鐨勫熀鏈璞″垪琛�
+ * 鍒犻櫎缂撳瓨鐨勫熀鏈璞″垪琛�(鍏ㄥ眬鍖归厤蹇界暐绉熸埛 鑷鎷兼帴绉熸埛id)
*
* @param pattern 瀛楃涓插墠缂�
*/
diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java
index 9475398..65f5233 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java
@@ -35,7 +35,8 @@
}
String tenantId = TenantHelper.getTenantId();
if (StringUtils.isBlank(tenantId)) {
- log.error("鏃犳硶鑾峰彇鏈夋晥鐨勭鎴穒d -> Null");
+ log.debug("鏃犳硶鑾峰彇鏈夋晥鐨勭鎴穒d -> Null");
+ return super.map(name);
}
if (StringUtils.startsWith(name, tenantId + "")) {
// 濡傛灉瀛樺湪鍒欑洿鎺ヨ繑鍥�
@@ -61,7 +62,8 @@
}
String tenantId = TenantHelper.getTenantId();
if (StringUtils.isBlank(tenantId)) {
- log.error("鏃犳硶鑾峰彇鏈夋晥鐨勭鎴穒d -> Null");
+ log.debug("鏃犳硶鑾峰彇鏈夋晥鐨勭鎴穒d -> Null");
+ return super.unmap(name);
}
if (StringUtils.startsWith(unmap, tenantId + "")) {
// 濡傛灉瀛樺湪鍒欏垹闄�
--
Gitblit v1.9.3