From 54b8111272575801026f573291d87fc09bb56119 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Tue, 16 May 2023 11:13:55 +0800
Subject: [PATCH] fix:compatible with older Spring Cloud version.
---
README-zh.md | 2 +-
README.md | 2 +-
pom.xml | 2 +-
spring-cloud-tencent-dependencies/pom.xml | 2 +-
spring-cloud-tencent-rpc-enhancement/pom.xml | 2 +-
.../cloud/rpc/enhancement/feign/EnhancedFeignClient.java | 6 ++----
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/README-zh.md b/README-zh.md
index 4ede14dd..8eab975f 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -79,7 +79,7 @@ Spring Cloud Tencent 所有组件都已上传到 Maven 中央仓库,只需要
com.tencent.cloud
spring-cloud-tencent-dependencies
- 1.11.4-Hoxton.SR12
+ 1.11.5-Hoxton.SR12
pom
import
diff --git a/README.md b/README.md
index d9533b09..7136fb2a 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ For example:
com.tencent.cloud
spring-cloud-tencent-dependencies
- 1.11.4-Hoxton.SR12
+ 1.11.5-Hoxton.SR12
pom
import
diff --git a/pom.xml b/pom.xml
index 12bee448..e499f233 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
- 1.11.4-Hoxton.SR12
+ 1.11.6-Hoxton.SR12-SNAPSHOT
5.2.22.RELEASE
diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index 55a94690..4d26cb35 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -70,7 +70,7 @@
- 1.11.4-Hoxton.SR12
+ 1.11.6-Hoxton.SR12-SNAPSHOT
1.12.5
diff --git a/spring-cloud-tencent-rpc-enhancement/pom.xml b/spring-cloud-tencent-rpc-enhancement/pom.xml
index f9fb9873..abf4786c 100644
--- a/spring-cloud-tencent-rpc-enhancement/pom.xml
+++ b/spring-cloud-tencent-rpc-enhancement/pom.xml
@@ -17,7 +17,7 @@
com.tencent.cloud
- spring-cloud-tencent-polaris-loadbalancer
+ spring-cloud-tencent-polaris-context
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 e191edfd..003dc5f6 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
@@ -87,10 +87,8 @@ public class EnhancedFeignClient implements Client {
.build();
enhancedPluginContext.setResponse(enhancedResponseContext);
- DefaultServiceInstance serviceInstance = new DefaultServiceInstance();
- serviceInstance.setServiceId(request.requestTemplate().feignTarget().name());
- serviceInstance.setHost(url.getHost());
- serviceInstance.setPort(url.getPort());
+ DefaultServiceInstance serviceInstance = new DefaultServiceInstance(request.requestTemplate().feignTarget()
+ .name(), url.getHost(), url.getPort(), url.getScheme().equals("https"));
enhancedPluginContext.setServiceInstance(serviceInstance);
// Run post enhanced plugins.