diff --git a/CHANGELOG.md b/CHANGELOG.md index 190dd0101..a52669f36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,3 +19,4 @@ - [Test:add sct-stater-polaris-router junit.](https://github.com/Tencent/spring-cloud-tencent/pull/768) - [Optimize: add equals&hasCode for PolarisServiceInstance](https://github.com/Tencent/spring-cloud-tencent/pull/773) - [Fix issue: prompt no registration if web dependence was not imported.](https://github.com/Tencent/spring-cloud-tencent/pull/778) +- [fix:fix nacos enabled condition bugs.](https://github.com/Tencent/spring-cloud-tencent/pull/795) 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 f63959187..ae9447cfa 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 @@ -36,12 +36,18 @@ public class DiscoveryEnabledCondition implements Condition { boolean isConsulDiscoveryEnabled = Boolean.parseBoolean( conditionContext.getEnvironment().getProperty("spring.cloud.consul.enabled", "false")) - && Boolean.parseBoolean(conditionContext.getEnvironment() - .getProperty("spring.cloud.consul.discovery.enabled", "true")); + && Boolean.parseBoolean( + conditionContext.getEnvironment().getProperty("spring.cloud.consul.discovery.enabled", "true")); - boolean isNacosEnabled = Boolean.parseBoolean( - conditionContext.getEnvironment().getProperty("spring.cloud.nacos.discovery.enabled", "false")); + isDiscoveryEnabled |= isConsulDiscoveryEnabled; - return isDiscoveryEnabled || isConsulDiscoveryEnabled || isNacosEnabled; + boolean isNacosDiscoveryEnabled = Boolean.parseBoolean( + conditionContext.getEnvironment().getProperty("spring.cloud.nacos.enabled", "false")) + && Boolean.parseBoolean( + conditionContext.getEnvironment().getProperty("spring.cloud.nacos.discovery.enabled", "true")); + + isDiscoveryEnabled |= isNacosDiscoveryEnabled; + + return isDiscoveryEnabled; } } diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/RegisterEnabledCondition.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/RegisterEnabledCondition.java index 83ebb1d8b..a8386a0ec 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/RegisterEnabledCondition.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/RegisterEnabledCondition.java @@ -39,6 +39,15 @@ public class RegisterEnabledCondition implements Condition { .getProperty("spring.cloud.consul.discovery.register", "true")); isRegisterEnabled |= isConsulRegisterEnabled; + + boolean isNacosRegisterEnabled = Boolean + .parseBoolean(conditionContext.getEnvironment() + .getProperty("spring.cloud.nacos.enabled", "false")) + && Boolean.parseBoolean(conditionContext.getEnvironment() + .getProperty("spring.cloud.nacos.discovery.register-enabled", "true")); + + isRegisterEnabled |= isNacosRegisterEnabled; + return isRegisterEnabled; } } diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 18e17cf64..2465e949c 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -71,7 +71,7 @@ 1.9.0-Hoxton.SR12-SNAPSHOT - 1.10.1-SNAPSHOT + 1.10.1 1.2.11 4.5.1 1.12.10 @@ -247,6 +247,12 @@ ${bcprov-jdk15on.version} + + net.bytebuddy + byte-buddy + ${byte-buddy.version} + + org.mockito mockito-inline