feat: support java agent enable nacos discovery

pull/1768/head
fishtailfu 2 weeks ago
parent 78e1a8cc78
commit 19908bf04e

@ -42,9 +42,9 @@ public class DiscoveryEnabledCondition implements Condition {
isDiscoveryEnabled |= isConsulDiscoveryEnabled;
boolean isNacosDiscoveryEnabled = Boolean.parseBoolean(
conditionContext.getEnvironment().getProperty("spring.cloud.nacos.enabled", "false"))
&& Boolean.parseBoolean(
conditionContext.getEnvironment().getProperty("spring.cloud.nacos.discovery.enabled", "true"));
conditionContext.getEnvironment().getProperty("spring.cloud.nacos.discovery.enabled", "false"))
|| Boolean.parseBoolean(
conditionContext.getEnvironment().getProperty("polaris.agent.nacos.discovery.enabled", "false"));
isDiscoveryEnabled |= isNacosDiscoveryEnabled;

@ -32,7 +32,7 @@ import static shade.polaris.com.alibaba.nacos.api.common.Constants.DEFAULT_NAMES
@ConfigurationProperties("spring.cloud.nacos")
public class NacosContextProperties {
@Value("${spring.cloud.nacos.discovery.enabled:#{'false'}}")
@Value("${polaris.agent.nacos.discovery.enabled:${spring.cloud.nacos.discovery.enabled:#{'false'}}}")
private boolean discoveryEnabled;
/**

@ -40,11 +40,13 @@ public class RegisterEnabledCondition implements Condition {
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"));
boolean isNacosDiscoveryEnabled = Boolean.parseBoolean(
conditionContext.getEnvironment().getProperty("spring.cloud.nacos.discovery.enabled", "false")) ||
Boolean.parseBoolean(
conditionContext.getEnvironment()
.getProperty("polaris.agent.nacos.discovery.enabled", "false"));
boolean isNacosRegisterEnabled = isNacosDiscoveryEnabled && Boolean.parseBoolean(conditionContext.getEnvironment()
.getProperty("spring.cloud.nacos.discovery.register-enabled", "false"));
isRegisterEnabled |= isNacosRegisterEnabled;

Loading…
Cancel
Save