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 dd03d2ad6..036323d5f 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 @@ -35,8 +35,13 @@ public class DiscoveryEnabledCondition implements Condition { boolean isDiscoveryEnabled = Boolean .parseBoolean(conditionContext.getEnvironment() .getProperty("spring.cloud.polaris.discovery.enabled", "true")); - isDiscoveryEnabled |= Boolean.parseBoolean(conditionContext.getEnvironment() - .getProperty("spring.cloud.consul.discovery.enabled", "false")); + + boolean isConsulDiscoveryEnabled = Boolean.parseBoolean(conditionContext.getEnvironment() + .getProperty("spring.cloud.consul.enabled", "false")) && + Boolean.parseBoolean(conditionContext.getEnvironment() + .getProperty("spring.cloud.consul.discovery.enabled", "true")); + + isDiscoveryEnabled |= isConsulDiscoveryEnabled; return isDiscoveryEnabled; } diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/consul/ConsulContextProperties.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/consul/ConsulContextProperties.java index 529a1fb62..cfea83cf3 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/consul/ConsulContextProperties.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/consul/ConsulContextProperties.java @@ -55,11 +55,11 @@ public class ConsulContextProperties { private boolean enabled = false; - @Value("${spring.cloud.consul.discovery.register:#{'false'}}") + @Value("${spring.cloud.consul.discovery.register:#{'true'}}") private boolean register; - @Value("${spring.cloud.consul.discovery.enabled:#{'false'}}") - private boolean discoveryEnabled = false; + @Value("${spring.cloud.consul.discovery.enabled:#{'true'}}") + private boolean discoveryEnabled; @Value("${spring.cloud.consul.discovery.instance-id:}") private String instanceId; 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 fc1afd2ae..60cb5e0f0 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 @@ -33,8 +33,13 @@ public class RegisterEnabledCondition implements Condition { AnnotatedTypeMetadata annotatedTypeMetadata) { boolean isRegisterEnabled = Boolean.parseBoolean(conditionContext.getEnvironment() .getProperty("spring.cloud.polaris.discovery.register", "true")); - isRegisterEnabled |= Boolean.parseBoolean(conditionContext.getEnvironment() - .getProperty("spring.cloud.consul.discovery.register", "false")); + + boolean isConsulRegisterEnabled = Boolean.parseBoolean(conditionContext.getEnvironment() + .getProperty("spring.cloud.consul.enabled", "false")) && + Boolean.parseBoolean(conditionContext.getEnvironment() + .getProperty("spring.cloud.consul.discovery.register", "true")); + + isRegisterEnabled |= isConsulRegisterEnabled; return isRegisterEnabled; }