From 264b6548371980be2a8cecf2f4ebe877b5ced36d Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Tue, 8 Aug 2023 17:02:21 +0800
Subject: [PATCH] fix:fix feign report -1 port bug.

---
 pom.xml                                                       | 2 +-
 .../core/EncodeTransferMedataFeignInterceptorTest.java        | 4 ++--
 spring-cloud-tencent-dependencies/pom.xml                     | 2 +-
 .../cloud/rpc/enhancement/feign/EnhancedFeignClient.java      | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 51052f8b7..8620f7229 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.11.8-Hoxton.SR12</revision>
+		<revision>1.11.9-Hoxton.SR12</revision>
 
 		<!-- Spring Framework -->
 		<spring.framework.version>5.2.22.RELEASE</spring.framework.version>
diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignInterceptorTest.java b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignInterceptorTest.java
index 51337d8bf..ace36e94b 100644
--- a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignInterceptorTest.java
+++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignInterceptorTest.java
@@ -47,7 +47,7 @@
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = DEFINED_PORT,
 		classes = EncodeTransferMedataFeignInterceptorTest.TestApplication.class,
-		properties = {"server.port=8081",
+		properties = {"server.port=18081",
 				"spring.config.location = classpath:application-test.yml",
 				"spring.main.web-application-type = servlet",
 				"spring.cloud.gateway.enabled = false"})
@@ -77,7 +77,7 @@ public String test() {
 			return MetadataContextHolder.get().getContext(MetadataContext.FRAGMENT_TRANSITIVE, "b");
 		}
 
-		@FeignClient(name = "test-feign", url = "http://localhost:8081")
+		@FeignClient(name = "test-feign", url = "http://localhost:18081")
 		public interface TestFeign {
 
 			@RequestMapping("/test")
diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index 25bc43416..7153ece0e 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -70,7 +70,7 @@
 	</developers>
 
 	<properties>
-		<revision>1.11.8-Hoxton.SR12</revision>
+		<revision>1.11.9-Hoxton.SR12</revision>
 
 		<!-- Dependencies -->
 		<polaris.version>1.12.11</polaris.version>
diff --git a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/EnhancedFeignClient.java b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/EnhancedFeignClient.java
index 003dc5f65..301716ace 100644
--- a/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/EnhancedFeignClient.java
+++ b/spring-cloud-tencent-rpc-enhancement/src/main/java/com/tencent/cloud/rpc/enhancement/feign/EnhancedFeignClient.java
@@ -89,6 +89,8 @@ public Response execute(Request request, Options options) throws IOException {
 
 			DefaultServiceInstance serviceInstance = new DefaultServiceInstance(request.requestTemplate().feignTarget()
 					.name(), url.getHost(), url.getPort(), url.getScheme().equals("https"));
+			// -1 means access directly by url, and use http default port number 80
+			serviceInstance.setPort(serviceInstance.getPort() == -1 ? 80 : serviceInstance.getPort());
 			enhancedPluginContext.setServiceInstance(serviceInstance);
 
 			// Run post enhanced plugins.