From 22e12b5152413f7c1f5152820a79cd291c175769 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Fri, 6 Jan 2023 16:53:16 +0800
Subject: [PATCH] fix:fix nacos enabled condition bugs. (#795)

---
 CHANGELOG.md                                     |  1 +
 .../discovery/DiscoveryEnabledCondition.java     | 16 +++++++++++-----
 .../registry/RegisterEnabledCondition.java       |  9 +++++++++
 spring-cloud-tencent-dependencies/pom.xml        |  8 +++++++-
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 190dd010..a52669f3 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 f6395918..ae9447cf 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 83ebb1d8..a8386a0e 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 18e17cf6..2465e949 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -71,7 +71,7 @@
 
 	<properties>
 		<revision>1.9.0-Hoxton.SR12-SNAPSHOT</revision>
-		<polaris.version>1.10.1-SNAPSHOT</polaris.version>
+		<polaris.version>1.10.1</polaris.version>
 		<logback.version>1.2.11</logback.version>
 		<mocktio.version>4.5.1</mocktio.version>
 		<byte-buddy.version>1.12.10</byte-buddy.version>
@@ -247,6 +247,12 @@
 				<version>${bcprov-jdk15on.version}</version>
 			</dependency>
 
+			<dependency>
+				<groupId>net.bytebuddy</groupId>
+				<artifactId>byte-buddy</artifactId>
+				<version>${byte-buddy.version}</version>
+			</dependency>
+
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-inline</artifactId>