From b33b645ef01512024d0aa84b7e3a74b48e6c04bf Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 17 八月 2024 10:29:33 +0800
Subject: [PATCH] remove 移除 alibaba ttl 与线程池搭配有问题(可传递但无法清除与更新)
---
ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java
index c8bb25d..6c93ee5 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/handle/PlusTenantLineHandler.java
@@ -1,14 +1,15 @@
package org.dromara.common.tenant.handle;
+import cn.hutool.core.collection.ListUtil;
import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.common.tenant.helper.TenantHelper;
-import org.dromara.common.tenant.properties.TenantProperties;
import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import net.sf.jsqlparser.expression.Expression;
import net.sf.jsqlparser.expression.NullValue;
import net.sf.jsqlparser.expression.StringValue;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.tenant.helper.TenantHelper;
+import org.dromara.common.tenant.properties.TenantProperties;
import java.util.List;
@@ -17,6 +18,7 @@
*
* @author Lion Li
*/
+@Slf4j
@AllArgsConstructor
public class PlusTenantLineHandler implements TenantLineHandler {
@@ -24,14 +26,10 @@
@Override
public Expression getTenantId() {
- String tenantId = LoginHelper.getTenantId();
+ String tenantId = TenantHelper.getTenantId();
if (StringUtils.isBlank(tenantId)) {
+ log.error("鏃犳硶鑾峰彇鏈夋晥鐨勭鎴穒d -> Null");
return new NullValue();
- }
- String dynamicTenantId = TenantHelper.getDynamic();
- if (StringUtils.isNotBlank(dynamicTenantId)) {
- // 杩斿洖鍔ㄦ�佺鎴�
- return new StringValue(dynamicTenantId);
}
// 杩斿洖鍥哄畾绉熸埛
return new StringValue(tenantId);
@@ -39,17 +37,18 @@
@Override
public boolean ignoreTable(String tableName) {
- String tenantId = LoginHelper.getTenantId();
+ String tenantId = TenantHelper.getTenantId();
// 鍒ゆ柇鏄惁鏈夌鎴�
if (StringUtils.isNotBlank(tenantId)) {
// 涓嶉渶瑕佽繃婊ょ鎴风殑琛�
List<String> excludes = tenantProperties.getExcludes();
// 闈炰笟鍔¤〃
- excludes.addAll(List.of(
- "gen_table",
- "gen_table_column"
- ));
- return excludes.contains(tableName);
+ List<String> tables = ListUtil.toList(
+ "gen_table",
+ "gen_table_column"
+ );
+ tables.addAll(excludes);
+ return tables.contains(tableName);
}
return true;
}
--
Gitblit v1.9.3