From 93a75af7ff8bf32fd89c85665a151760bf0eacca Mon Sep 17 00:00:00 2001
From: seanyu <seansyyu@tencent.com>
Date: Fri, 31 Mar 2023 12:04:23 +0800
Subject: [PATCH] fix dependency

---
 spring-cloud-tencent-dependencies/pom.xml                   | 6 ------
 .../nacos-callee-service-a/pom.xml                          | 1 +
 .../nacos-callee-service-a/src/main/resources/bootstrap.yml | 2 +-
 .../nacos-callee-service-b/pom.xml                          | 1 +
 .../nacos-callee-service-b/src/main/resources/bootstrap.yml | 2 +-
 .../nacos-discovery-caller/pom.xml                          | 1 +
 .../nacos-discovery-caller/src/main/resources/bootstrap.yml | 2 +-
 .../pom.xml                                                 | 1 +
 8 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index 15b06002a..c643989c2 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -80,7 +80,6 @@
 		<protobuf-java.version>3.21.7</protobuf-java.version>
 		<bcprov-jdk15on.version>1.69</bcprov-jdk15on.version>
 		<system-stubs-jupiter.version>2.0.2</system-stubs-jupiter.version>
-		<spring-cloud-alibaba.version>2022.0.0.0-RC1</spring-cloud-alibaba.version>
 
 		<!-- Maven Plugin Versions -->
 		<flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
@@ -236,11 +235,6 @@
 				<scope>test</scope>
 			</dependency>
 
-			<dependency>
-				<groupId>com.alibaba.cloud</groupId>
-				<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-				<version>${spring-cloud-alibaba.version}</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
diff --git a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-a/pom.xml b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-a/pom.xml
index 95b22f311..b649aa5e3 100644
--- a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-a/pom.xml
+++ b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-a/pom.xml
@@ -21,6 +21,7 @@
 		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
 			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+			<version>2022.0.0.0-RC1</version>
 		</dependency>
 
 		<dependency>
diff --git a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-a/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-a/src/main/resources/bootstrap.yml
index 93e1b0529..654ef41a5 100644
--- a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-a/src/main/resources/bootstrap.yml
+++ b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-a/src/main/resources/bootstrap.yml
@@ -13,4 +13,4 @@ spring:
         port: 28083
     nacos:
       discovery:
-        server-addr: 9.134.5.52:8848
+        server-addr: 127.0.0.1:8848
diff --git a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-b/pom.xml b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-b/pom.xml
index f7990f837..ec234e4fc 100644
--- a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-b/pom.xml
+++ b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-b/pom.xml
@@ -21,6 +21,7 @@
 		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
 			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+			<version>2022.0.0.0-RC1</version>
 		</dependency>
 
 		<dependency>
diff --git a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-b/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-b/src/main/resources/bootstrap.yml
index dc744981b..76c1bc568 100644
--- a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-b/src/main/resources/bootstrap.yml
+++ b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-b/src/main/resources/bootstrap.yml
@@ -13,5 +13,5 @@ spring:
         port: 28083
     nacos:
       discovery:
-        server-addr: 9.134.5.52:8848
+        server-addr: 127.0.0.1:8848
 
diff --git a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-discovery-caller/pom.xml b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-discovery-caller/pom.xml
index d30e426b7..72366e556 100644
--- a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-discovery-caller/pom.xml
+++ b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-discovery-caller/pom.xml
@@ -21,6 +21,7 @@
 		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
 			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+			<version>2022.0.0.0-RC1</version>
 		</dependency>
 
 		<dependency>
diff --git a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-discovery-caller/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-discovery-caller/src/main/resources/bootstrap.yml
index aea877eda..3133ebf47 100644
--- a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-discovery-caller/src/main/resources/bootstrap.yml
+++ b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-discovery-caller/src/main/resources/bootstrap.yml
@@ -14,7 +14,7 @@ spring:
         enabled: true
     nacos:
       discovery:
-        server-addr: 9.134.5.52:8848
+        server-addr: 127.0.0.1:8848
 
 feign:
   circuitbreaker:
diff --git a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/pom.xml b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/pom.xml
index 9067b0686..6ddc376c7 100644
--- a/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/pom.xml
+++ b/spring-cloud-tencent-plugin-starters/spring-cloud-starter-tencent-discovery-adapter-plugin/pom.xml
@@ -23,6 +23,7 @@
 		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
 			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+			<version>2022.0.0.0-RC1</version>
 			<optional>true</optional>
 		</dependency>