From ba1a540add437649bae209ba8a8b44f2e2d95451 Mon Sep 17 00:00:00 2001
From: dhb52 <dhb52@126.com>
Date: 星期五, 24 五月 2024 13:30:51 +0800
Subject: [PATCH] !542 更新SnailJob版本到1.0.0-beta2 * feat: 配置项变更，避免误解snail-job.group-name => snail-job.group * chore: 更新snail-job版本到1.0.0-beta2
---
ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/TenantKeyPrefixHandler.java | 19 +++++++++++++++++--
1 files changed, 17 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..9475398 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,7 @@
package org.dromara.common.tenant.handle;
+import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
+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 +12,7 @@
*
* @author Lion Li
*/
+@Slf4j
public class TenantKeyPrefixHandler extends KeyPrefixHandler {
public TenantKeyPrefixHandler(String keyPrefix) {
@@ -24,11 +27,17 @@
if (StringUtils.isBlank(name)) {
return null;
}
+ if (InterceptorIgnoreHelper.willIgnoreTenantLine("")) {
+ return super.map(name);
+ }
if (StringUtils.contains(name, GlobalConstants.GLOBAL_REDIS_KEY)) {
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);
}
@@ -44,11 +53,17 @@
if (StringUtils.isBlank(unmap)) {
return null;
}
+ if (InterceptorIgnoreHelper.willIgnoreTenantLine("")) {
+ return super.unmap(name);
+ }
if (StringUtils.contains(name, GlobalConstants.GLOBAL_REDIS_KEY)) {
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