feat:modify default value of consul discovery and register.

pull/124/head
SkyeBeFreeman 3 years ago
parent 4038c23fe5
commit 5040d3b6fb

@ -35,8 +35,13 @@ public class DiscoveryEnabledCondition implements Condition {
boolean isDiscoveryEnabled = Boolean boolean isDiscoveryEnabled = Boolean
.parseBoolean(conditionContext.getEnvironment() .parseBoolean(conditionContext.getEnvironment()
.getProperty("spring.cloud.polaris.discovery.enabled", "true")); .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; return isDiscoveryEnabled;
} }

@ -55,11 +55,11 @@ public class ConsulContextProperties {
private boolean enabled = false; private boolean enabled = false;
@Value("${spring.cloud.consul.discovery.register:#{'false'}}") @Value("${spring.cloud.consul.discovery.register:#{'true'}}")
private boolean register; private boolean register;
@Value("${spring.cloud.consul.discovery.enabled:#{'false'}}") @Value("${spring.cloud.consul.discovery.enabled:#{'true'}}")
private boolean discoveryEnabled = false; private boolean discoveryEnabled;
@Value("${spring.cloud.consul.discovery.instance-id:}") @Value("${spring.cloud.consul.discovery.instance-id:}")
private String instanceId; private String instanceId;

@ -33,8 +33,13 @@ public class RegisterEnabledCondition implements Condition {
AnnotatedTypeMetadata annotatedTypeMetadata) { AnnotatedTypeMetadata annotatedTypeMetadata) {
boolean isRegisterEnabled = Boolean.parseBoolean(conditionContext.getEnvironment() boolean isRegisterEnabled = Boolean.parseBoolean(conditionContext.getEnvironment()
.getProperty("spring.cloud.polaris.discovery.register", "true")); .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; return isRegisterEnabled;
} }

Loading…
Cancel
Save