From a778e3182a8163e9e3ea5bbc677090da2efe0a31 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sun, 20 Jul 2025 00:01:04 +0800 Subject: [PATCH] =?UTF-8?q?refactor(extension/tenant):=20=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E8=B6=85=E7=BA=A7=E7=A7=9F=E6=88=B7=20ID=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除了 DefaultTenantLineHandler 中关于超级租户的判断逻辑 - 移除了 TenantProperties 中的 superTenantId 相关配置项 --- .../tenant/autoconfigure/TenantProperties.java | 13 ------------- .../handler/line/DefaultTenantLineHandler.java | 5 ----- 2 files changed, 18 deletions(-) diff --git a/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantProperties.java b/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantProperties.java index 1468fff0..337d10ea 100644 --- a/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantProperties.java +++ b/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-core/src/main/java/top/continew/starter/extension/tenant/autoconfigure/TenantProperties.java @@ -51,11 +51,6 @@ public class TenantProperties { */ private String tenantIdHeader = "X-Tenant-Id"; - /** - * 超级/默认租户 ID(超管用户所在租户) - */ - private Long superTenantId = 0L; - /** * 忽略表(忽略拼接租户条件) */ @@ -93,14 +88,6 @@ public class TenantProperties { this.tenantIdHeader = tenantIdHeader; } - public Long getSuperTenantId() { - return superTenantId; - } - - public void setSuperTenantId(Long superTenantId) { - this.superTenantId = superTenantId; - } - public List getIgnoreTables() { return ignoreTables; } diff --git a/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/handler/line/DefaultTenantLineHandler.java b/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/handler/line/DefaultTenantLineHandler.java index fb373b75..c08b45a9 100644 --- a/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/handler/line/DefaultTenantLineHandler.java +++ b/continew-starter-extension/continew-starter-extension-tenant/continew-starter-extension-tenant-mp/src/main/java/top/continew/starter/extension/tenant/handler/line/DefaultTenantLineHandler.java @@ -63,11 +63,6 @@ public class DefaultTenantLineHandler implements TenantLineHandler { if (TenantContextHolder.isIgnore()) { return true; } - // 忽略超级租户 - Long tenantId = TenantContextHolder.getTenantId(); - if (tenantId == null || tenantId.equals(tenantProperties.getSuperTenantId())) { - return true; - } // 忽略数据源级隔离 if (TenantIsolationLevel.DATASOURCE.equals(TenantContextHolder.getIsolationLevel())) { return true;