From 0c9aafcded0839522f95da74c8f518476f0b450e Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Fri, 1 Sep 2023 01:30:57 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.0=E3=80=91=E3=80=90tenant=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=A7=9F=E6=88=B7=E5=8F=82=E6=95=B0=E6=9C=AA?= =?UTF-8?q?=E4=BC=A0=E9=80=92=E4=B8=BA=E7=A9=BA=E7=9A=84=E5=88=A4=E6=96=AD?= =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=9B=9E=E9=BB=98=E8=AE=A4=E7=A7=9F=E6=88=B7?= =?UTF-8?q?id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/auth/DefaultTenantCodeProvider.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/DefaultTenantCodeProvider.java b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/DefaultTenantCodeProvider.java index 14d576f0b..483d93e2d 100644 --- a/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/DefaultTenantCodeProvider.java +++ b/kernel-d-auth/auth-sdk/src/main/java/cn/stylefeng/roses/kernel/auth/auth/DefaultTenantCodeProvider.java @@ -1,5 +1,6 @@ package cn.stylefeng.roses.kernel.auth.auth; +import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.auth.api.TenantCodeGetApi; import cn.stylefeng.roses.kernel.sys.api.expander.TenantConfigExpander; import lombok.extern.slf4j.Slf4j; @@ -22,10 +23,21 @@ public class DefaultTenantCodeProvider implements TenantCodeGetApi { @Override public Long getTenantIdByCode(String tenantCode) { + Long defaultRootTenantId = TenantConfigExpander.getDefaultRootTenantId(); + + // 如果租户编码为空，那么返回默认的租户id + if (ObjectUtil.isEmpty(tenantCode)) { + return defaultRootTenantId; + } + + // 判断请求的租户编码是否是默认的租户id一致，字符串比较，如果一致则返回默认的租户id if (defaultRootTenantId.toString().equals(tenantCode)) { return defaultRootTenantId; - } else { + } + + // 如果不一致，则返回不存在的租户id + else { log.warn("当前系统为单租户系统，不支持多租户功能！"); return DEFAULT_NONE_TENANT_ID; }