From 344067d314bff805776389ce5763f03084102a2b Mon Sep 17 00:00:00 2001
From: liwq <122639653@qq.com>
Date: Sat, 19 Apr 2025 14:41:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tashow/cloud/tenant/config/TenantRpcAutoConfiguration.java  | 2 +-
 .../tashow-module-infra-biz/src/main/resources/application.yaml | 1 +
 .../src/main/resources/application.yaml                         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/config/TenantRpcAutoConfiguration.java b/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/config/TenantRpcAutoConfiguration.java
index 35447a9..c905345 100644
--- a/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/config/TenantRpcAutoConfiguration.java
+++ b/tashow-framework/tashow-framework-tenant/src/main/java/com/tashow/cloud/tenant/config/TenantRpcAutoConfiguration.java
@@ -9,7 +9,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
 
 @AutoConfiguration
-@ConditionalOnProperty(prefix = "yudao.tenant", value = "enable", matchIfMissing = true) // 允许使用 yudao.tenant.enable=false 禁用多租户
+@ConditionalOnProperty(prefix = "tashow.tenant", value = "enable", matchIfMissing = true) // 允许使用 yudao.tenant.enable=false 禁用多租户
 @EnableFeignClients(clients = TenantApi.class) // 主要是引入相关的 API 服务
 public class TenantRpcAutoConfiguration {
 
diff --git a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/application.yaml b/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/application.yaml
index b9d404b..e4e14f6 100644
--- a/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/application.yaml
+++ b/tashow-module/tashow-module-infra/tashow-module-infra-biz/src/main/resources/application.yaml
@@ -9,4 +9,5 @@ spring:
     import:
       - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置
       - optional:nacos:application.yaml # 加载【Nacos】的配置
+      - optional:nacos:tenant.yaml # 加载【Nacos】的配置
       - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置
diff --git a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/application.yaml b/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/application.yaml
index f91282c..ab25c7d 100644
--- a/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/application.yaml
+++ b/tashow-module/tashow-module-system/tashow-module-system-biz/src/main/resources/application.yaml
@@ -9,6 +9,7 @@ spring:
     import:
       - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置
       - optional:nacos:application.yaml # 加载【Nacos】通用的配置
+      - optional:nacos:tenant.yaml # 加载【Nacos】通用的配置
       - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置