From 02e5c8ce6f91b231e2e0720558928c4e96f585f8 Mon Sep 17 00:00:00 2001 From: lepdou Date: Mon, 28 Nov 2022 16:57:48 +0800 Subject: [PATCH] Adapt polaris-java 1.10.1 version, set GetHealthyInstancesRequest's includeCircuitBreakInstance to false --- CHANGELOG.md | 1 + .../cloud/polaris/discovery/PolarisDiscoveryHandler.java | 1 + spring-cloud-tencent-dependencies/pom.xml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9a4932f6..83c5a184e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,3 +12,4 @@ - [Code optimization & correct comment](https://github.com/Tencent/spring-cloud-tencent/pull/724) - [fix:fix javadoc.](https://github.com/Tencent/spring-cloud-tencent/pull/727) - [fix:fix discovery junit.](https://github.com/Tencent/spring-cloud-tencent/pull/729) +- [adapt polaris-java 1.10.1 version](https://github.com/Tencent/spring-cloud-tencent/pull/747) diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java index 51e16e34d..688562d76 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryHandler.java @@ -61,6 +61,7 @@ public class PolarisDiscoveryHandler { GetHealthyInstancesRequest getHealthyInstancesRequest = new GetHealthyInstancesRequest(); getHealthyInstancesRequest.setNamespace(namespace); getHealthyInstancesRequest.setService(service); + getHealthyInstancesRequest.setIncludeCircuitBreakInstances(false); return polarisConsumer.getHealthyInstances(getHealthyInstancesRequest); } diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 012d5d54f..18e17cf64 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -71,7 +71,7 @@ 1.9.0-Hoxton.SR12-SNAPSHOT - 1.10.0-SNAPSHOT + 1.10.1-SNAPSHOT 1.2.11 4.5.1 1.12.10