From 19908bf04e0383d17c76510ab0aefd773c833912 Mon Sep 17 00:00:00 2001
From: fishtailfu <fishtailfu@tencent.com>
Date: Tue, 9 Dec 2025 17:19:39 +0800
Subject: [PATCH] feat: support java agent enable nacos discovery

---
 .../polaris/discovery/DiscoveryEnabledCondition.java |  6 +++---
 .../polaris/extend/nacos/NacosContextProperties.java |  2 +-
 .../polaris/registry/RegisterEnabledCondition.java   | 12 +++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

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 ed4af8299..fe89c8b3f 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
@@ -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;
 
diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/nacos/NacosContextProperties.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/nacos/NacosContextProperties.java
index 7986f6550..01f2e566b 100644
--- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/nacos/NacosContextProperties.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/extend/nacos/NacosContextProperties.java
@@ -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;
 
 	/**
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 ce5febb58..3a54a4543 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
@@ -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;