diff --git a/CHANGELOG.md b/CHANGELOG.md index 28a89972f..d268348d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,3 +15,5 @@ - [adapt polaris-java 1.10.1 version](https://github.com/Tencent/spring-cloud-tencent/pull/747) - [Optimize: change RouteArgument.buildCustom to RouteArgument.fromLabel](https://github.com/Tencent/spring-cloud-tencent/pull/751) - [Feature: support nacos registry](https://github.com/Tencent/spring-cloud-tencent/pull/758) +- [Optimize: support delete config for ConfigurationProperties bean ](https://github.com/Tencent/spring-cloud-tencent/pull/756) +- [Test:add sct-stater-polaris-router junit.](https://github.com/Tencent/spring-cloud-tencent/pull/768) diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/DiscoveryEnabledCondition.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/DiscoveryEnabledCondition.java index 1963537c2..f63959187 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/DiscoveryEnabledCondition.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/DiscoveryEnabledCondition.java @@ -39,7 +39,9 @@ public class DiscoveryEnabledCondition implements Condition { && Boolean.parseBoolean(conditionContext.getEnvironment() .getProperty("spring.cloud.consul.discovery.enabled", "true")); - isDiscoveryEnabled |= isConsulDiscoveryEnabled; - return isDiscoveryEnabled; + boolean isNacosEnabled = Boolean.parseBoolean( + conditionContext.getEnvironment().getProperty("spring.cloud.nacos.discovery.enabled", "false")); + + return isDiscoveryEnabled || isConsulDiscoveryEnabled || isNacosEnabled; } }