From a78ccaeae5dd5c1ba5b98db6cb93c0508926c4e2 Mon Sep 17 00:00:00 2001 From: zhangjf Date: Fri, 20 Feb 2026 18:15:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20NacosMetadataConfig=E6=B7=BB=E5=8A=A0@Co?= =?UTF-8?q?nditionalOnBean=E9=81=BF=E5=85=8DGateway=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NacosMetadataConfig仅在Registration bean存在时生效， 解决Gateway等不需要服务注册的场景无法启动的问题 --- .../0.0.1-SNAPSHOT/_remote.repositories | 2 +- .../fund-common-0.0.1-SNAPSHOT.jar | Bin 44622 -> 44645 bytes .../0.0.1-SNAPSHOT/maven-metadata-local.xml | 6 +++--- .../fund-common/maven-metadata-local.xml | 2 +- .../0.0.1-SNAPSHOT/_remote.repositories | 2 +- .../0.0.1-SNAPSHOT/maven-metadata-local.xml | 4 ++-- .../fundplatform/maven-metadata-local.xml | 2 +- .../common/nacos/NacosMetadataConfig.java | 7 +++++++ 8 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.mvn/repository/com/fundplatform/fund-common/0.0.1-SNAPSHOT/_remote.repositories b/.mvn/repository/com/fundplatform/fund-common/0.0.1-SNAPSHOT/_remote.repositories index 8c4e1aa..de933e1 100644 --- a/.mvn/repository/com/fundplatform/fund-common/0.0.1-SNAPSHOT/_remote.repositories +++ b/.mvn/repository/com/fundplatform/fund-common/0.0.1-SNAPSHOT/_remote.repositories @@ -1,4 +1,4 @@ #NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Feb 20 17:27:25 CST 2026 +#Fri Feb 20 18:12:34 CST 2026 fund-common-0.0.1-SNAPSHOT.jar>= fund-common-0.0.1-SNAPSHOT.pom>= diff --git a/.mvn/repository/com/fundplatform/fund-common/0.0.1-SNAPSHOT/fund-common-0.0.1-SNAPSHOT.jar b/.mvn/repository/com/fundplatform/fund-common/0.0.1-SNAPSHOT/fund-common-0.0.1-SNAPSHOT.jar index b950bbf1a62efee75d63b25a23de6c117d4122df..6b9b9f22490c4a9785468d1903e395f9bb80c10d 100644 GIT binary patch delta 1664 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 diff --git a/.mvn/repository/com/fundplatform/fund-common/0.0.1-SNAPSHOT/maven-metadata-local.xml b/.mvn/repository/com/fundplatform/fund-common/0.0.1-SNAPSHOT/maven-metadata-local.xml index fd1fc18..18cd308 100644 --- a/.mvn/repository/com/fundplatform/fund-common/0.0.1-SNAPSHOT/maven-metadata-local.xml +++ b/.mvn/repository/com/fundplatform/fund-common/0.0.1-SNAPSHOT/maven-metadata-local.xml @@ -3,7 +3,7 @@ com.fundplatform fund-common - 20260220092715 + 20260220101230 true @@ -11,12 +11,12 @@ pom 0.0.1-SNAPSHOT - 20260220092715 + 20260220101230 jar 0.0.1-SNAPSHOT - 20260220092715 + 20260220101230 diff --git a/.mvn/repository/com/fundplatform/fund-common/maven-metadata-local.xml b/.mvn/repository/com/fundplatform/fund-common/maven-metadata-local.xml index f71d53b..381394d 100644 --- a/.mvn/repository/com/fundplatform/fund-common/maven-metadata-local.xml +++ b/.mvn/repository/com/fundplatform/fund-common/maven-metadata-local.xml @@ -6,6 +6,6 @@ 0.0.1-SNAPSHOT - 20260220092715 + 20260220101230 diff --git a/.mvn/repository/com/fundplatform/fundplatform/0.0.1-SNAPSHOT/_remote.repositories b/.mvn/repository/com/fundplatform/fundplatform/0.0.1-SNAPSHOT/_remote.repositories index 7f338c2..4fa4571 100644 --- a/.mvn/repository/com/fundplatform/fundplatform/0.0.1-SNAPSHOT/_remote.repositories +++ b/.mvn/repository/com/fundplatform/fundplatform/0.0.1-SNAPSHOT/_remote.repositories @@ -1,3 +1,3 @@ #NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice. -#Fri Feb 20 17:13:04 CST 2026 +#Fri Feb 20 18:12:31 CST 2026 fundplatform-0.0.1-SNAPSHOT.pom>= diff --git a/.mvn/repository/com/fundplatform/fundplatform/0.0.1-SNAPSHOT/maven-metadata-local.xml b/.mvn/repository/com/fundplatform/fundplatform/0.0.1-SNAPSHOT/maven-metadata-local.xml index 4416f68..c0e275e 100644 --- a/.mvn/repository/com/fundplatform/fundplatform/0.0.1-SNAPSHOT/maven-metadata-local.xml +++ b/.mvn/repository/com/fundplatform/fundplatform/0.0.1-SNAPSHOT/maven-metadata-local.xml @@ -3,7 +3,7 @@ com.fundplatform fundplatform - 20260220091303 + 20260220101230 true @@ -11,7 +11,7 @@ pom 0.0.1-SNAPSHOT - 20260220091303 + 20260220101230 diff --git a/.mvn/repository/com/fundplatform/fundplatform/maven-metadata-local.xml b/.mvn/repository/com/fundplatform/fundplatform/maven-metadata-local.xml index f4a526e..9165a2b 100644 --- a/.mvn/repository/com/fundplatform/fundplatform/maven-metadata-local.xml +++ b/.mvn/repository/com/fundplatform/fundplatform/maven-metadata-local.xml @@ -6,6 +6,6 @@ 0.0.1-SNAPSHOT - 20260220091303 + 20260220101230 diff --git a/fund-common/src/main/java/com/fundplatform/common/nacos/NacosMetadataConfig.java b/fund-common/src/main/java/com/fundplatform/common/nacos/NacosMetadataConfig.java index 71b7f0c..d8109f1 100644 --- a/fund-common/src/main/java/com/fundplatform/common/nacos/NacosMetadataConfig.java +++ b/fund-common/src/main/java/com/fundplatform/common/nacos/NacosMetadataConfig.java @@ -2,7 +2,9 @@ package com.fundplatform.common.nacos; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.client.serviceregistry.Registration; import org.springframework.context.annotation.Configuration; @@ -29,8 +31,12 @@ import java.util.Map; * # 方式2: 配置文件 * spring.cloud.nacos.discovery.metadata.tenant-id=VIP_001 * + * + *

注意：此配置仅在 Registration Bean 存在时生效（普通微服务）， + * Gateway 等不需要服务注册的场景不会加载此类。

*/ @Configuration +@ConditionalOnBean(Registration.class) @ConditionalOnProperty(name = "tenant.routing.enabled", havingValue = "true", matchIfMissing = true) public class NacosMetadataConfig { @@ -48,6 +54,7 @@ public class NacosMetadataConfig { private final Registration registration; + @Autowired public NacosMetadataConfig(Registration registration) { this.registration = registration; }