From 30d7651322cf24470e432f2827e06ae5578d3212 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 04 一月 2024 16:33:48 +0800
Subject: [PATCH] update springboot 3.1.7 => 3.2.1 全面支持虚拟线程 update springboot-admin 3.1.8 => 3.2.0 update springdoc 2.2.0 => 2.3.0 update redisson 3.24.3 => 3.25.2 update hutool 5.8.22 => 5.8.24 update dynamic-ds 4.2.0 => 4.3.0
---
ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
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 c9c2f95..14dad1a 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
@@ -1,5 +1,6 @@
package org.dromara.common.tenant.handle;
+import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.redis.handler.KeyPrefixHandler;
@@ -10,6 +11,7 @@
*
* @author Lion Li
*/
+@Slf4j
public class TenantKeyPrefixHandler extends KeyPrefixHandler {
public TenantKeyPrefixHandler(String keyPrefix) {
@@ -28,7 +30,10 @@
return super.map(name);
}
String tenantId = TenantHelper.getTenantId();
- if (StringUtils.startsWith(name, tenantId)) {
+ if (StringUtils.isBlank(tenantId)) {
+ log.error("鏃犳硶鑾峰彇鏈夋晥鐨勭鎴穒d -> Null");
+ }
+ if (StringUtils.startsWith(name, tenantId + "")) {
// 濡傛灉瀛樺湪鍒欑洿鎺ヨ繑鍥�
return super.map(name);
}
@@ -48,7 +53,10 @@
return super.unmap(name);
}
String tenantId = TenantHelper.getTenantId();
- if (StringUtils.startsWith(unmap, tenantId)) {
+ if (StringUtils.isBlank(tenantId)) {
+ log.error("鏃犳硶鑾峰彇鏈夋晥鐨勭鎴穒d -> Null");
+ }
+ if (StringUtils.startsWith(unmap, tenantId + "")) {
// 濡傛灉瀛樺湪鍒欏垹闄�
return unmap.substring((tenantId + ":").length());
}
--
Gitblit v1.9.3