From dc3fda34c97f93e21fd40c335acbc0ea21bd27b7 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Tue, 4 Aug 2026 11:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/nacos/cn/baiyue-common.yml        | 2 ++
 config/nacos/cn/order-service.yml        | 3 ---
 config/nacos/cn/warehouse-service.yml    | 4 ----
 config/nacos/local/baiyue-common.yml     | 2 ++
 config/nacos/local/order-service.yml     | 3 ---
 config/nacos/local/warehouse-service.yml | 4 ----
 6 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/config/nacos/cn/baiyue-common.yml b/config/nacos/cn/baiyue-common.yml
index 73efb364b..1838c8ed9 100644
--- a/config/nacos/cn/baiyue-common.yml
+++ b/config/nacos/cn/baiyue-common.yml
@@ -8,6 +8,8 @@ baiyue:
     issuer: ${JWT_ISSUER:auth-service}
     internal-service-token: ${INTERNAL_SERVICE_TOKEN}
     token-key-prefix: ${REDIS_TOKEN_KEY_PREFIX:baiyue:auth}
+  warehouse:
+    public-tenant-id: ${DEFAULT_TENANT_ID:10001}
   openapi.enabled: ${SWAGGER_ENABLED:false}
   audit.enabled: true
 spring:
diff --git a/config/nacos/cn/order-service.yml b/config/nacos/cn/order-service.yml
index b21c16cff..ffcc1335b 100644
--- a/config/nacos/cn/order-service.yml
+++ b/config/nacos/cn/order-service.yml
@@ -8,6 +8,3 @@ spring:
 baiyue.clients:
   # 容器环境默认通过 Nacos 的 warehouse-service 实例调用；仅端口回归时显式设置直连 URL。
   warehouse.url: ${WAREHOUSE_SERVICE_URL:}
-baiyue:
-  warehouse:
-    public-tenant-id: ${DEFAULT_TENANT_ID:10001}
diff --git a/config/nacos/cn/warehouse-service.yml b/config/nacos/cn/warehouse-service.yml
index d01920f6a..a05d57b33 100644
--- a/config/nacos/cn/warehouse-service.yml
+++ b/config/nacos/cn/warehouse-service.yml
@@ -4,7 +4,3 @@ spring:
     username: ${WAREHOUSE_DB_USERNAME}
     password: ${WAREHOUSE_DB_PASSWORD}
     driver-class-name: com.mysql.cj.jdbc.Driver
-
-baiyue:
-  warehouse:
-    public-tenant-id: ${DEFAULT_TENANT_ID:10001}
diff --git a/config/nacos/local/baiyue-common.yml b/config/nacos/local/baiyue-common.yml
index 1ee127f26..5da69e0f2 100644
--- a/config/nacos/local/baiyue-common.yml
+++ b/config/nacos/local/baiyue-common.yml
@@ -8,6 +8,8 @@ baiyue:
     issuer: ${JWT_ISSUER:auth-service}
     internal-service-token: ${INTERNAL_SERVICE_TOKEN:phase1-local-internal-token-at-least-32-bytes}
     token-key-prefix: ${REDIS_TOKEN_KEY_PREFIX:baiyue:auth}
+  warehouse:
+    public-tenant-id: ${DEFAULT_TENANT_ID:10001}
   openapi.enabled: ${SWAGGER_ENABLED:true}
   audit.enabled: true
 spring:
diff --git a/config/nacos/local/order-service.yml b/config/nacos/local/order-service.yml
index c14d89074..f46a32771 100644
--- a/config/nacos/local/order-service.yml
+++ b/config/nacos/local/order-service.yml
@@ -5,6 +5,3 @@ spring.datasource:
   password: ${ORDER_DB_PASSWORD:123456}
 baiyue.clients:
   warehouse.url: ${WAREHOUSE_SERVICE_URL:}
-baiyue:
-  warehouse:
-    public-tenant-id: ${DEFAULT_TENANT_ID:10001}
diff --git a/config/nacos/local/warehouse-service.yml b/config/nacos/local/warehouse-service.yml
index e6fc0338b..b0e8a969c 100644
--- a/config/nacos/local/warehouse-service.yml
+++ b/config/nacos/local/warehouse-service.yml
@@ -3,7 +3,3 @@ spring.datasource:
   url: ${WAREHOUSE_DB_URL:jdbc:mysql://127.0.0.1:3306/baiyue_warehouse?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true}
   username: ${WAREHOUSE_DB_USERNAME:root}
   password: ${WAREHOUSE_DB_PASSWORD:123456}
-
-baiyue:
-  warehouse:
-    public-tenant-id: ${DEFAULT_TENANT_ID:10001}