From 6dc6bf305e745219e4093c0927913bc5751ba93e Mon Sep 17 00:00:00 2001
From: cheese8 <yinwerhong@163.com>
Date: Thu, 23 Jun 2022 07:08:41 +0800
Subject: [PATCH 1/9] solve the chaos code problem on rejectTips (#279)

* solve the chaos code problem on rejectTips

* Update CHANGELOG.md
---
 CHANGELOG.md                                                | 1 +
 .../polaris/ratelimit/filter/QuotaCheckServletFilter.java   | 1 +
 .../ratelimit/filter/QuotaCheckServletFilterTest.java       | 6 +++---
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dafd6abbb..58f263540 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,3 +12,4 @@
 - [fix:fix ClassNotFoundException while not importing openfeign when using circuit-breaker module.](https://github.com/Tencent/spring-cloud-tencent/pull/269)
 - [Update GitHub Actions workflow](https://github.com/Tencent/spring-cloud-tencent/pull/273)
 - [fix:fix TypeNotPresentException in @ConditionalOnClass of router.](https://github.com/Tencent/spring-cloud-tencent/pull/276)
+- [fix:solve the chaos code problem on rejectTips.](https://github.com/Tencent/spring-cloud-tencent/pull/279)
diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java
index 08767b721..e97c4ace7 100644
--- a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java
+++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java
@@ -99,6 +99,7 @@ public class QuotaCheckServletFilter extends OncePerRequestFilter {
 
 			if (quotaResponse.getCode() == QuotaResultCode.QuotaResultLimited) {
 				response.setStatus(polarisRateLimitProperties.getRejectHttpCode());
+				response.setContentType("text/plain;charset=UTF-8");
 				response.getWriter().write(rejectTips);
 				return;
 			}
diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilterTest.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilterTest.java
index a2cc344dc..5cee8793d 100644
--- a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilterTest.java
+++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilterTest.java
@@ -118,7 +118,7 @@ public class QuotaCheckServletFilterTest {
 		});
 
 		PolarisRateLimitProperties polarisRateLimitProperties = new PolarisRateLimitProperties();
-		polarisRateLimitProperties.setRejectRequestTips("RejectRequestTips");
+		polarisRateLimitProperties.setRejectRequestTips("RejectRequestTips提示消息");
 		polarisRateLimitProperties.setRejectHttpCode(419);
 
 		RateLimitRuleLabelResolver rateLimitRuleLabelResolver = mock(RateLimitRuleLabelResolver.class);
@@ -133,7 +133,7 @@ public class QuotaCheckServletFilterTest {
 		try {
 			Field rejectTips = QuotaCheckServletFilter.class.getDeclaredField("rejectTips");
 			rejectTips.setAccessible(true);
-			assertThat(rejectTips.get(quotaCheckServletFilter)).isEqualTo("RejectRequestTips");
+			assertThat(rejectTips.get(quotaCheckServletFilter)).isEqualTo("RejectRequestTips提示消息");
 		}
 		catch (NoSuchFieldException | IllegalAccessException e) {
 			fail("Exception encountered.", e);
@@ -201,7 +201,7 @@ public class QuotaCheckServletFilterTest {
 			MetadataContext.LOCAL_SERVICE = "TestApp3";
 			quotaCheckServletFilter.doFilterInternal(request, response, filterChain);
 			assertThat(response.getStatus()).isEqualTo(419);
-			assertThat(response.getContentAsString()).isEqualTo("RejectRequestTips");
+			assertThat(response.getContentAsString()).isEqualTo("RejectRequestTips提示消息");
 
 
 			// Exception

From c28a02aa67681883b221d816fac25764ca8b6c98 Mon Sep 17 00:00:00 2001
From: shouyuwang <93957183+shouyuwang@users.noreply.github.com>
Date: Thu, 23 Jun 2022 10:49:49 +0800
Subject: [PATCH 2/9] fix: ratelimit-callee-service UnknownHostException:
 RateLimitCalleeService (#281)

* fix:UnknownHostException: RateLimitCalleeService

* Update CHANGELOG.md
---
 CHANGELOG.md                                                 | 1 +
 .../ratelimit-callee-service/pom.xml                         | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58f263540..7825695db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,3 +13,4 @@
 - [Update GitHub Actions workflow](https://github.com/Tencent/spring-cloud-tencent/pull/273)
 - [fix:fix TypeNotPresentException in @ConditionalOnClass of router.](https://github.com/Tencent/spring-cloud-tencent/pull/276)
 - [fix:solve the chaos code problem on rejectTips.](https://github.com/Tencent/spring-cloud-tencent/pull/279)
+- [fix:solve ratelimit-callee-service UnknownHostException.](https://github.com/Tencent/spring-cloud-tencent/pull/281)
diff --git a/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/pom.xml b/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/pom.xml
index dd28040b5..cd9f48757 100644
--- a/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/pom.xml
+++ b/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/pom.xml
@@ -18,6 +18,11 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-starter-tencent-polaris-discovery</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>com.tencent.cloud</groupId>
 			<artifactId>spring-cloud-starter-tencent-polaris-ratelimit</artifactId>

From 53587ad327f60c209dbd070c7eef95c6f2d0aa15 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <928016560@qq.com>
Date: Thu, 23 Jun 2022 13:36:48 +0800
Subject: [PATCH 3/9] doc:update PULL_REQUEST_TEMPLATE.md. (#282)

---
 .github/PULL_REQUEST_TEMPLATE.md | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index c6cfbfecc..b162ac3a2 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -10,17 +10,19 @@ Other... Please describe:
 
 ## Describe what this PR does for and how you did.
 
+## Adding the issue link (#xxx) if possible.
 
-## Does this PR be associated with issue? If so, please adding the issue link below.
+## Note
 
+## Checklist
 
-## Note
+- [ ] Add copyright holder at the beginning of .class file if it is new.
+- [ ] Add information of this PR to CHANGELOG.md in root of project.
+- [ ] All junit tests passing.
+- [ ] Coverage from `Codecov Report` should not decrease.
 
+## Checklist (Optional)
 
-### Checklist
-- [ ] Code compiles correctly
-- [ ] Pull Request has submit to 2020.0 and Greenwich
-- [ ] Create at least one junit test if possible
-- [ ] All tests passing
-- [ ] Extend documentation if necessary
-- [ ] Add myself / the copyright holder to the AUTHORS file
+- [ ] Will Pull Request to branch of 2020.0 and 2021.0.
+- [ ] Add documentation in javadoc in code or comment below the PR if necessary.
+- [ ] Add your name as @author to the beginning of .class file.

From e4557599123270e98ab1d140a3dd1333894a280a Mon Sep 17 00:00:00 2001
From: cheese8 <yinwerhong@163.com>
Date: Thu, 23 Jun 2022 15:31:50 +0800
Subject: [PATCH 4/9] refactor to use text/html resolve chaos problem on
 rejectTips (#285)

* refactor to use text/html resolve chaos problem on rejectTips

* Update QuotaCheckServletFilterTest.java

* Update QuotaCheckReactiveFilter.java

* Update CHANGELOG.md
---
 CHANGELOG.md                                  |  1 +
 .../filter/QuotaCheckReactiveFilter.java      |  4 ++--
 .../filter/QuotaCheckServletFilter.java       |  4 ++--
 .../filter/QuotaCheckReactiveFilterTest.java  |  6 ++---
 .../filter/QuotaCheckServletFilterTest.java   | 22 ++++++++++++++++++-
 5 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7825695db..b91ccb8d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,3 +14,4 @@
 - [fix:fix TypeNotPresentException in @ConditionalOnClass of router.](https://github.com/Tencent/spring-cloud-tencent/pull/276)
 - [fix:solve the chaos code problem on rejectTips.](https://github.com/Tencent/spring-cloud-tencent/pull/279)
 - [fix:solve ratelimit-callee-service UnknownHostException.](https://github.com/Tencent/spring-cloud-tencent/pull/281)
+- [fix:refactor to use text/html resolve chaos problem on rejectTips](https://github.com/Tencent/spring-cloud-tencent/pull/285)
\ No newline at end of file
diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java
index 7340c73de..8796fc1ab 100644
--- a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java
+++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java
@@ -55,7 +55,7 @@ import static com.tencent.cloud.polaris.ratelimit.constant.RateLimitConstant.LAB
 /**
  * Reactive filter to check quota.
  *
- * @author Haotian Zhang, lepdou
+ * @author Haotian Zhang, lepdou, cheese8
  */
 public class QuotaCheckReactiveFilter implements WebFilter, Ordered {
 
@@ -106,7 +106,7 @@ public class QuotaCheckReactiveFilter implements WebFilter, Ordered {
 			if (quotaResponse.getCode() == QuotaResultCode.QuotaResultLimited) {
 				ServerHttpResponse response = exchange.getResponse();
 				response.setRawStatusCode(polarisRateLimitProperties.getRejectHttpCode());
-				response.getHeaders().setContentType(MediaType.APPLICATION_JSON);
+				response.getHeaders().setContentType(MediaType.TEXT_HTML);
 				DataBuffer dataBuffer = response.bufferFactory().allocateBuffer()
 						.write(rejectTips.getBytes(StandardCharsets.UTF_8));
 				return response.writeWith(Mono.just(dataBuffer));
diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java
index e97c4ace7..f3e4c3b07 100644
--- a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java
+++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilter.java
@@ -53,7 +53,7 @@ import static com.tencent.cloud.polaris.ratelimit.constant.RateLimitConstant.LAB
 /**
  * Servlet filter to check quota.
  *
- * @author Haotian Zhang, lepdou
+ * @author Haotian Zhang, lepdou, cheese8
  */
 @Order(RateLimitConstant.FILTER_ORDER)
 public class QuotaCheckServletFilter extends OncePerRequestFilter {
@@ -99,7 +99,7 @@ public class QuotaCheckServletFilter extends OncePerRequestFilter {
 
 			if (quotaResponse.getCode() == QuotaResultCode.QuotaResultLimited) {
 				response.setStatus(polarisRateLimitProperties.getRejectHttpCode());
-				response.setContentType("text/plain;charset=UTF-8");
+				response.setContentType("text/html;charset=UTF-8");
 				response.getWriter().write(rejectTips);
 				return;
 			}
diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilterTest.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilterTest.java
index 3bae2e3bd..0a9a4988f 100644
--- a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilterTest.java
+++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilterTest.java
@@ -65,7 +65,7 @@ import static org.mockito.Mockito.when;
 /**
  * Test for {@link QuotaCheckReactiveFilter}.
  *
- * @author Haotian Zhang
+ * @author Haotian Zhang, cheese8
  */
 @RunWith(MockitoJUnitRunner.class)
 @SpringBootTest(classes = QuotaCheckReactiveFilterTest.TestApplication.class, properties = {
@@ -118,7 +118,7 @@ public class QuotaCheckReactiveFilterTest {
 		});
 
 		PolarisRateLimitProperties polarisRateLimitProperties = new PolarisRateLimitProperties();
-		polarisRateLimitProperties.setRejectRequestTips("RejectRequestTips");
+		polarisRateLimitProperties.setRejectRequestTips("RejectRequestTips提示消息");
 		polarisRateLimitProperties.setRejectHttpCode(419);
 
 		RateLimitRuleLabelResolver rateLimitRuleLabelResolver = mock(RateLimitRuleLabelResolver.class);
@@ -138,7 +138,7 @@ public class QuotaCheckReactiveFilterTest {
 		try {
 			Field rejectTips = QuotaCheckReactiveFilter.class.getDeclaredField("rejectTips");
 			rejectTips.setAccessible(true);
-			assertThat(rejectTips.get(quotaCheckReactiveFilter)).isEqualTo("RejectRequestTips");
+			assertThat(rejectTips.get(quotaCheckReactiveFilter)).isEqualTo("RejectRequestTips提示消息");
 		}
 		catch (NoSuchFieldException | IllegalAccessException e) {
 			fail("Exception encountered.", e);
diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilterTest.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilterTest.java
index 5cee8793d..7ff8e8793 100644
--- a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilterTest.java
+++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckServletFilterTest.java
@@ -65,7 +65,7 @@ import static org.mockito.Mockito.when;
 /**
  * Test for {@link QuotaCheckServletFilter}.
  *
- * @author Haotian Zhang
+ * @author Haotian Zhang, cheese8
  */
 @RunWith(MockitoJUnitRunner.class)
 @SpringBootTest(classes = QuotaCheckServletFilterTest.TestApplication.class, properties = {
@@ -77,6 +77,8 @@ public class QuotaCheckServletFilterTest {
 
 	private QuotaCheckServletFilter quotaCheckServletFilter;
 
+	private QuotaCheckServletFilter quotaCheckWithHtmlRejectTipsServletFilter;
+
 	private static MockedStatic<ApplicationContextAwareUtils> mockedApplicationContextAwareUtils;
 	private static MockedStatic<ExpressionLabelUtils> expressionLabelUtilsMockedStatic;
 	@BeforeClass
@@ -121,10 +123,15 @@ public class QuotaCheckServletFilterTest {
 		polarisRateLimitProperties.setRejectRequestTips("RejectRequestTips提示消息");
 		polarisRateLimitProperties.setRejectHttpCode(419);
 
+		PolarisRateLimitProperties polarisRateLimitWithHtmlRejectTipsProperties = new PolarisRateLimitProperties();
+		polarisRateLimitWithHtmlRejectTipsProperties.setRejectRequestTips("<h1>RejectRequestTips提示消息</h1>");
+		polarisRateLimitWithHtmlRejectTipsProperties.setRejectHttpCode(419);
+
 		RateLimitRuleLabelResolver rateLimitRuleLabelResolver = mock(RateLimitRuleLabelResolver.class);
 		when(rateLimitRuleLabelResolver.getExpressionLabelKeys(anyString(), anyString())).thenReturn(Collections.EMPTY_SET);
 
 		this.quotaCheckServletFilter = new QuotaCheckServletFilter(limitAPI, labelResolver, polarisRateLimitProperties, rateLimitRuleLabelResolver);
+		this.quotaCheckWithHtmlRejectTipsServletFilter = new QuotaCheckServletFilter(limitAPI, labelResolver, polarisRateLimitWithHtmlRejectTipsProperties, rateLimitRuleLabelResolver);
 	}
 
 	@Test
@@ -138,6 +145,15 @@ public class QuotaCheckServletFilterTest {
 		catch (NoSuchFieldException | IllegalAccessException e) {
 			fail("Exception encountered.", e);
 		}
+		quotaCheckWithHtmlRejectTipsServletFilter.init();
+		try {
+			Field rejectTips = QuotaCheckServletFilter.class.getDeclaredField("rejectTips");
+			rejectTips.setAccessible(true);
+			assertThat(rejectTips.get(quotaCheckWithHtmlRejectTipsServletFilter)).isEqualTo("<h1>RejectRequestTips提示消息</h1>");
+		}
+		catch (NoSuchFieldException | IllegalAccessException e) {
+			fail("Exception encountered.", e);
+		}
 	}
 
 	@Test
@@ -203,6 +219,10 @@ public class QuotaCheckServletFilterTest {
 			assertThat(response.getStatus()).isEqualTo(419);
 			assertThat(response.getContentAsString()).isEqualTo("RejectRequestTips提示消息");
 
+			quotaCheckWithHtmlRejectTipsServletFilter.doFilterInternal(request, response, filterChain);
+			assertThat(response.getStatus()).isEqualTo(419);
+			assertThat(response.getContentAsString()).isEqualTo("RejectRequestTips提示消息");
+
 
 			// Exception
 			MetadataContext.LOCAL_SERVICE = "TestApp4";

From cbed6df22a14cb0f37294c4086fc0d9fca977dc7 Mon Sep 17 00:00:00 2001
From: shouyuwang <93957183+shouyuwang@users.noreply.github.com>
Date: Fri, 24 Jun 2022 11:08:56 +0800
Subject: [PATCH 5/9] UT add metadata-transfer unit test (#294)

---
 CHANGELOG.md                                  |  3 +-
 .../CustomTransitiveMetadataResolverTest.java | 54 ++++++++++++
 .../EncodeTransferMedataScgFilterTest.java    | 77 +++++++++++++++++
 .../EncodeTransferMetadataZuulFilterTest.java | 83 +++++++++++++++++++
 4 files changed, 216 insertions(+), 1 deletion(-)
 create mode 100644 spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/CustomTransitiveMetadataResolverTest.java
 create mode 100644 spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/EncodeTransferMedataScgFilterTest.java
 create mode 100644 spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/EncodeTransferMetadataZuulFilterTest.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b91ccb8d9..999df52ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,4 +14,5 @@
 - [fix:fix TypeNotPresentException in @ConditionalOnClass of router.](https://github.com/Tencent/spring-cloud-tencent/pull/276)
 - [fix:solve the chaos code problem on rejectTips.](https://github.com/Tencent/spring-cloud-tencent/pull/279)
 - [fix:solve ratelimit-callee-service UnknownHostException.](https://github.com/Tencent/spring-cloud-tencent/pull/281)
-- [fix:refactor to use text/html resolve chaos problem on rejectTips](https://github.com/Tencent/spring-cloud-tencent/pull/285)
\ No newline at end of file
+- [fix:refactor to use text/html resolve chaos problem on rejectTips](https://github.com/Tencent/spring-cloud-tencent/pull/285)
+- [UT: add metadata-transfer unit test](https://github.com/Tencent/spring-cloud-tencent/pull/294)
diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/CustomTransitiveMetadataResolverTest.java b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/CustomTransitiveMetadataResolverTest.java
new file mode 100644
index 000000000..f3fbfc4e0
--- /dev/null
+++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/CustomTransitiveMetadataResolverTest.java
@@ -0,0 +1,54 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ */
+
+package com.tencent.cloud.metadata;
+
+import java.util.Map;
+
+import com.tencent.cloud.metadata.core.CustomTransitiveMetadataResolver;
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+
+import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.server.MockServerWebExchange;
+
+/**
+ * @author quan
+ */
+public class CustomTransitiveMetadataResolverTest {
+
+	@Test
+	public void test() {
+		MockServerHttpRequest.BaseBuilder<?> builder = MockServerHttpRequest.get("");
+		builder.header("X-SCT-Metadata-Transitive-a", "test");
+		MockServerWebExchange exchange = MockServerWebExchange.from(builder);
+		Map<String, String> resolve = CustomTransitiveMetadataResolver.resolve(exchange);
+		Assertions.assertThat(resolve.size()).isEqualTo(1);
+		Assertions.assertThat(resolve.get("a")).isEqualTo("test");
+	}
+
+	@Test
+	public void testServlet() {
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addHeader("X-SCT-Metadata-Transitive-a", "test");
+		Map<String, String> resolve = CustomTransitiveMetadataResolver.resolve(request);
+		Assertions.assertThat(resolve.size()).isEqualTo(1);
+		Assertions.assertThat(resolve.get("a")).isEqualTo("test");
+	}
+}
diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/EncodeTransferMedataScgFilterTest.java b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/EncodeTransferMedataScgFilterTest.java
new file mode 100644
index 000000000..eba85a3d4
--- /dev/null
+++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/EncodeTransferMedataScgFilterTest.java
@@ -0,0 +1,77 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ */
+
+package com.tencent.cloud.metadata.core.filter;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Map;
+
+import com.tencent.cloud.common.constant.MetadataConstant;
+import com.tencent.cloud.common.util.JacksonUtils;
+import com.tencent.cloud.metadata.core.EncodeTransferMedataScgFilter;
+import org.assertj.core.api.Assertions;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.context.ApplicationContext;
+import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
+import org.springframework.mock.web.server.MockServerWebExchange;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+/**
+ * @author quan
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = RANDOM_PORT,
+		classes = EncodeTransferMedataScgFilterTest.TestApplication.class,
+		properties = { "spring.config.location = classpath:application-test.yml", "spring.main.web-application-type = reactive" })
+public class EncodeTransferMedataScgFilterTest {
+
+	@Autowired
+	private ApplicationContext applicationContext;
+
+	@Mock
+	private GatewayFilterChain chain;
+
+	@Test
+	public void testTransitiveMetadataFromApplicationConfig() throws UnsupportedEncodingException {
+		EncodeTransferMedataScgFilter filter = applicationContext.getBean(EncodeTransferMedataScgFilter.class);
+		MockServerHttpRequest.BaseBuilder<?> builder = MockServerHttpRequest.get("");
+		MockServerWebExchange exchange = MockServerWebExchange.from(builder);
+		filter.filter(exchange, chain);
+		String metadataStr = exchange.getRequest().getHeaders().getFirst(MetadataConstant.HeaderName.CUSTOM_METADATA);
+		String decode = URLDecoder.decode(metadataStr, "UTF-8");
+		Map<String, String> transitiveMap = JacksonUtils.deserialize2Map(decode);
+		Assertions.assertThat(transitiveMap.size()).isEqualTo(1);
+		Assert.assertEquals(transitiveMap.get("b"), "2");
+	}
+
+	@SpringBootApplication
+	protected static class TestApplication {
+
+	}
+}
diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/EncodeTransferMetadataZuulFilterTest.java b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/EncodeTransferMetadataZuulFilterTest.java
new file mode 100644
index 000000000..5b84461a8
--- /dev/null
+++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/EncodeTransferMetadataZuulFilterTest.java
@@ -0,0 +1,83 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ */
+
+package com.tencent.cloud.metadata.core.filter;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Map;
+
+import com.netflix.zuul.context.RequestContext;
+import com.tencent.cloud.common.constant.MetadataConstant;
+import com.tencent.cloud.common.util.JacksonUtils;
+import com.tencent.cloud.metadata.core.EncodeTransferMetadataZuulFilter;
+import org.assertj.core.api.Assertions;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.mock.web.MockMultipartHttpServletRequest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
+
+/**
+ * @author quan
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = RANDOM_PORT,
+		classes = EncodeTransferMetadataZuulFilterTest.TestApplication.class,
+		properties = { "spring.config.location = classpath:application-test.yml", "spring.main.web-application-type = reactive" })
+
+public class EncodeTransferMetadataZuulFilterTest {
+
+	@Autowired
+	private ApplicationContext applicationContext;
+
+	private MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest();
+
+	@Before
+	public void init() {
+		RequestContext ctx = RequestContext.getCurrentContext();
+		ctx.clear();
+		ctx.setRequest(this.request);
+	}
+
+	@Test
+	public void multiplePartNamesWithMultipleParts() throws UnsupportedEncodingException {
+		EncodeTransferMetadataZuulFilter filter = applicationContext.getBean(EncodeTransferMetadataZuulFilter.class);
+		filter.run();
+		final RequestContext ctx = RequestContext.getCurrentContext();
+		Map<String, String> zuulRequestHeaders = ctx.getZuulRequestHeaders();
+		String metaData = zuulRequestHeaders.get(MetadataConstant.HeaderName.CUSTOM_METADATA.toLowerCase());
+		String decode = URLDecoder.decode(metaData, "UTF-8");
+		Map<String, String> transitiveMap = JacksonUtils.deserialize2Map(decode);
+		Assertions.assertThat(transitiveMap.size()).isEqualTo(1);
+		Assert.assertEquals(transitiveMap.get("b"), "2");
+	}
+
+	@SpringBootApplication
+	protected static class TestApplication {
+
+	}
+}

From 99d22321ff885eddcf172412cb232d4c2b51edad Mon Sep 17 00:00:00 2001
From: weihubeats <weihubeats@163.com>
Date: Fri, 24 Jun 2022 14:36:15 +0800
Subject: [PATCH 6/9] add restTemplate Report Polaris (#272)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add restTemplate Report Polaris

* add listener

* add auto config

* add listener

* add java doc

* add java doc

* Add empty judgment

* add instanceof

* add test

* 删除多余空行

* format code

* format code

* format code

* remove redundant code

* rename class name

* format code

* update http code  judge

* add change log

Co-authored-by: Haotian Zhang <928016560@qq.com>
---
 CHANGELOG.md                                  |   1 +
 ...sCircuitBreakerBootstrapConfiguration.java |   2 +-
 .../PolarisFeignClientAutoConfiguration.java  |   8 +-
 .../PolarisRestTemplateAutoConfiguration.java |  56 +++++++++
 .../PolarisResponseErrorHandler.java          |  29 +++++
 .../PolarisRestTemplateModifier.java          |  65 ++++++++++
 ...larisRestTemplateResponseErrorHandler.java | 111 ++++++++++++++++++
 .../main/resources/META-INF/spring.factories  |   6 +-
 ...cuitBreakerBootstrapConfigurationTest.java |   1 +
 ...larisFeignClientAutoConfigurationTest.java |   1 +
 ...sRestTemplateResponseErrorHandlerTest.java |  70 +++++++++++
 .../SimpleClientHttpResponseTest.java         | 106 +++++++++++++++++
 .../example/ServiceAController.java           |   5 +
 13 files changed, 453 insertions(+), 8 deletions(-)
 rename spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/{ => config}/PolarisCircuitBreakerBootstrapConfiguration.java (97%)
 rename spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/{ => config}/PolarisFeignClientAutoConfiguration.java (94%)
 create mode 100644 spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/PolarisRestTemplateAutoConfiguration.java
 create mode 100644 spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisResponseErrorHandler.java
 create mode 100644 spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisRestTemplateModifier.java
 create mode 100644 spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisRestTemplateResponseErrorHandler.java
 create mode 100644 spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisRestTemplateResponseErrorHandlerTest.java
 create mode 100644 spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/SimpleClientHttpResponseTest.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 999df52ed..6dfd7af32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,3 +16,4 @@
 - [fix:solve ratelimit-callee-service UnknownHostException.](https://github.com/Tencent/spring-cloud-tencent/pull/281)
 - [fix:refactor to use text/html resolve chaos problem on rejectTips](https://github.com/Tencent/spring-cloud-tencent/pull/285)
 - [UT: add metadata-transfer unit test](https://github.com/Tencent/spring-cloud-tencent/pull/294)
+- [Feature:add restTemplate Report Polaris](https://github.com/Tencent/spring-cloud-tencent/pull/272)
diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerBootstrapConfiguration.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/PolarisCircuitBreakerBootstrapConfiguration.java
similarity index 97%
rename from spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerBootstrapConfiguration.java
rename to spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/PolarisCircuitBreakerBootstrapConfiguration.java
index d0b276059..393c0ea7d 100644
--- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerBootstrapConfiguration.java
+++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/PolarisCircuitBreakerBootstrapConfiguration.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.tencent.cloud.polaris.circuitbreaker;
+package com.tencent.cloud.polaris.circuitbreaker.config;
 
 import com.tencent.cloud.common.constant.ContextConstant;
 import com.tencent.cloud.polaris.context.ConditionalOnPolarisEnabled;
diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/PolarisFeignClientAutoConfiguration.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/PolarisFeignClientAutoConfiguration.java
similarity index 94%
rename from spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/PolarisFeignClientAutoConfiguration.java
rename to spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/PolarisFeignClientAutoConfiguration.java
index eac1e04a2..ae699dead 100644
--- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/PolarisFeignClientAutoConfiguration.java
+++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/PolarisFeignClientAutoConfiguration.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations under the License.
  */
 
-package com.tencent.cloud.polaris.circuitbreaker;
+package com.tencent.cloud.polaris.circuitbreaker.config;
 
 import com.tencent.cloud.polaris.circuitbreaker.feign.PolarisFeignBeanPostProcessor;
 import com.tencent.cloud.polaris.context.PolarisContextAutoConfiguration;
@@ -40,8 +40,7 @@ import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE;
  *
  * @author Haotian Zhang
  */
-@ConditionalOnProperty(value = "spring.cloud.polaris.circuitbreaker.enabled",
-		havingValue = "true", matchIfMissing = true)
+@ConditionalOnProperty(value = "spring.cloud.polaris.circuitbreaker.enabled", havingValue = "true", matchIfMissing = true)
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(name = "org.springframework.cloud.openfeign.FeignAutoConfiguration")
 @AutoConfigureAfter(PolarisContextAutoConfiguration.class)
@@ -55,8 +54,7 @@ public class PolarisFeignClientAutoConfiguration {
 
 	@Bean
 	@Order(HIGHEST_PRECEDENCE)
-	public PolarisFeignBeanPostProcessor polarisFeignBeanPostProcessor(
-			ConsumerAPI consumerAPI) {
+	public PolarisFeignBeanPostProcessor polarisFeignBeanPostProcessor(ConsumerAPI consumerAPI) {
 		return new PolarisFeignBeanPostProcessor(consumerAPI);
 	}
 
diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/PolarisRestTemplateAutoConfiguration.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/PolarisRestTemplateAutoConfiguration.java
new file mode 100644
index 000000000..ea99fce36
--- /dev/null
+++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/config/PolarisRestTemplateAutoConfiguration.java
@@ -0,0 +1,56 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package com.tencent.cloud.polaris.circuitbreaker.config;
+
+import com.tencent.cloud.polaris.circuitbreaker.resttemplate.PolarisResponseErrorHandler;
+import com.tencent.cloud.polaris.circuitbreaker.resttemplate.PolarisRestTemplateModifier;
+import com.tencent.cloud.polaris.circuitbreaker.resttemplate.PolarisRestTemplateResponseErrorHandler;
+import com.tencent.cloud.polaris.context.PolarisContextAutoConfiguration;
+import com.tencent.polaris.api.core.ConsumerAPI;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @author : wh
+ * @date : 2022/6/21 21:34
+ * @description: Auto configuration PolarisRestTemplateAutoConfiguration
+ */
+@ConditionalOnProperty(value = "spring.cloud.polaris.circuitbreaker.enabled",
+		havingValue = "true", matchIfMissing = true)
+@Configuration(proxyBeanMethods = false)
+@AutoConfigureAfter(PolarisContextAutoConfiguration.class)
+public class PolarisRestTemplateAutoConfiguration {
+
+	@Bean
+	@ConditionalOnBean(RestTemplate.class)
+	public PolarisRestTemplateResponseErrorHandler polarisRestTemplateResponseErrorHandler(ConsumerAPI consumerAPI, @Autowired(required = false) PolarisResponseErrorHandler polarisResponseErrorHandler) {
+		return new PolarisRestTemplateResponseErrorHandler(consumerAPI, polarisResponseErrorHandler);
+	}
+
+	@Bean
+	@ConditionalOnBean(RestTemplate.class)
+	public PolarisRestTemplateModifier polarisRestTemplateBeanPostProcessor(PolarisRestTemplateResponseErrorHandler restTemplateResponseErrorHandler) {
+		return new PolarisRestTemplateModifier(restTemplateResponseErrorHandler);
+	}
+}
diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisResponseErrorHandler.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisResponseErrorHandler.java
new file mode 100644
index 000000000..5ddd1e6aa
--- /dev/null
+++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisResponseErrorHandler.java
@@ -0,0 +1,29 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package com.tencent.cloud.polaris.circuitbreaker.resttemplate;
+
+import org.springframework.web.client.ResponseErrorHandler;
+
+/**
+ * @author : wh
+ * @date : 2022/6/21 19:12
+ * @description: errorHandler {@link ResponseErrorHandler}
+ */
+public interface PolarisResponseErrorHandler extends ResponseErrorHandler {
+
+}
diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisRestTemplateModifier.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisRestTemplateModifier.java
new file mode 100644
index 000000000..bd43913f4
--- /dev/null
+++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisRestTemplateModifier.java
@@ -0,0 +1,65 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package com.tencent.cloud.polaris.circuitbreaker.resttemplate;
+
+import java.util.Map;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.SmartInitializingSingleton;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @author : wh
+ * @date : 2022/6/21 21:20
+ * @description: auto configuration RestTemplate Find the RestTemplate bean annotated with {@link LoadBalanced} and replace {@link org.springframework.web.client.ResponseErrorHandler}
+ * with {@link PolarisRestTemplateResponseErrorHandler}
+ */
+public class PolarisRestTemplateModifier implements ApplicationContextAware, SmartInitializingSingleton {
+
+	private ApplicationContext applicationContext;
+
+	private final PolarisRestTemplateResponseErrorHandler polarisRestTemplateResponseErrorHandler;
+
+	public PolarisRestTemplateModifier(PolarisRestTemplateResponseErrorHandler polarisRestTemplateResponseErrorHandler) {
+		this.polarisRestTemplateResponseErrorHandler = polarisRestTemplateResponseErrorHandler;
+	}
+
+	@Override
+	public void afterSingletonsInstantiated() {
+		Map<String, Object> beans = this.applicationContext.getBeansWithAnnotation(LoadBalanced.class);
+		if (!ObjectUtils.isEmpty(beans)) {
+			beans.forEach(this::initRestTemplate);
+		}
+	}
+
+	private void initRestTemplate(String beanName, Object bean) {
+		if (bean instanceof RestTemplate) {
+			RestTemplate restTemplate = (RestTemplate) bean;
+			restTemplate.setErrorHandler(polarisRestTemplateResponseErrorHandler);
+		}
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		this.applicationContext = applicationContext;
+	}
+}
diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisRestTemplateResponseErrorHandler.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisRestTemplateResponseErrorHandler.java
new file mode 100644
index 000000000..e6e003d90
--- /dev/null
+++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/java/com/tencent/cloud/polaris/circuitbreaker/resttemplate/PolarisRestTemplateResponseErrorHandler.java
@@ -0,0 +1,111 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package com.tencent.cloud.polaris.circuitbreaker.resttemplate;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URL;
+import java.util.Objects;
+
+import com.tencent.cloud.common.metadata.MetadataContext;
+import com.tencent.cloud.common.util.ReflectionUtils;
+import com.tencent.polaris.api.core.ConsumerAPI;
+import com.tencent.polaris.api.pojo.RetStatus;
+import com.tencent.polaris.api.pojo.ServiceKey;
+import com.tencent.polaris.api.rpc.ServiceCallResult;
+import com.tencent.polaris.api.utils.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.http.HttpMethod;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.web.client.ResponseErrorHandler;
+
+/**
+ * @author : wh
+ * @date : 2022/6/21 17:25
+ * @description: Extend ResponseErrorHandler to get request information
+ */
+public class PolarisRestTemplateResponseErrorHandler implements ResponseErrorHandler {
+
+	private static final Logger LOG = LoggerFactory.getLogger(PolarisRestTemplateResponseErrorHandler.class);
+
+	private static final String FileName = "connection";
+
+	private final ConsumerAPI consumerAPI;
+
+	private final PolarisResponseErrorHandler polarisResponseErrorHandler;
+
+
+	public PolarisRestTemplateResponseErrorHandler(ConsumerAPI consumerAPI, PolarisResponseErrorHandler polarisResponseErrorHandler) {
+		this.consumerAPI = consumerAPI;
+		this.polarisResponseErrorHandler = polarisResponseErrorHandler;
+	}
+
+	@Override
+	public boolean hasError(ClientHttpResponse response) {
+		return true;
+	}
+
+	@Override
+	public void handleError(ClientHttpResponse response) throws IOException {
+		if (Objects.nonNull(polarisResponseErrorHandler)) {
+			if (polarisResponseErrorHandler.hasError(response)) {
+				polarisResponseErrorHandler.handleError(response);
+			}
+		}
+	}
+
+	public void handleError(URI url, HttpMethod method, ClientHttpResponse response) throws IOException {
+		ServiceCallResult resultRequest = null;
+		try {
+			resultRequest = builderServiceCallResult(url, response);
+		}
+		catch (IOException e) {
+			LOG.error("Will report response of {} url {}", response, url, e);
+			throw e;
+		}
+		finally {
+			consumerAPI.updateServiceCallResult(resultRequest);
+		}
+	}
+
+	private ServiceCallResult builderServiceCallResult(URI uri, ClientHttpResponse response) throws IOException {
+		ServiceCallResult resultRequest = new ServiceCallResult();
+		String serviceName = uri.getHost();
+		resultRequest.setService(serviceName);
+		resultRequest.setNamespace(MetadataContext.LOCAL_NAMESPACE);
+		resultRequest.setMethod(uri.getPath());
+		resultRequest.setRetStatus(RetStatus.RetSuccess);
+		String sourceNamespace = MetadataContext.LOCAL_NAMESPACE;
+		String sourceService = MetadataContext.LOCAL_SERVICE;
+		if (StringUtils.isNotBlank(sourceNamespace) && StringUtils.isNotBlank(sourceService)) {
+			resultRequest.setCallerService(new ServiceKey(sourceNamespace, sourceService));
+		}
+		HttpURLConnection connection = (HttpURLConnection) ReflectionUtils.getFieldValue(response, FileName);
+		URL url = connection.getURL();
+		resultRequest.setHost(url.getHost());
+		resultRequest.setPort(url.getPort());
+		if (response.getStatusCode().value() > 500) {
+			resultRequest.setRetStatus(RetStatus.RetFail);
+		}
+		return resultRequest;
+	}
+
+}
diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/resources/META-INF/spring.factories b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/resources/META-INF/spring.factories
index 04fa47a13..229cc2af0 100644
--- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/main/resources/META-INF/spring.factories
@@ -1,4 +1,6 @@
 org.springframework.cloud.bootstrap.BootstrapConfiguration=\
-  com.tencent.cloud.polaris.circuitbreaker.PolarisCircuitBreakerBootstrapConfiguration
+  com.tencent.cloud.polaris.circuitbreaker.config.PolarisCircuitBreakerBootstrapConfiguration
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  com.tencent.cloud.polaris.circuitbreaker.PolarisFeignClientAutoConfiguration
+  com.tencent.cloud.polaris.circuitbreaker.config.PolarisFeignClientAutoConfiguration,\
+  com.tencent.cloud.polaris.circuitbreaker.config.PolarisRestTemplateAutoConfiguration
+
diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerBootstrapConfigurationTest.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerBootstrapConfigurationTest.java
index 42777a3b6..a5bd4f2e6 100644
--- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerBootstrapConfigurationTest.java
+++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisCircuitBreakerBootstrapConfigurationTest.java
@@ -17,6 +17,7 @@
 
 package com.tencent.cloud.polaris.circuitbreaker;
 
+import com.tencent.cloud.polaris.circuitbreaker.config.PolarisCircuitBreakerBootstrapConfiguration;
 import org.junit.Test;
 
 import org.springframework.boot.autoconfigure.AutoConfigurations;
diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisFeignClientAutoConfigurationTest.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisFeignClientAutoConfigurationTest.java
index c83608478..2443949c9 100644
--- a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisFeignClientAutoConfigurationTest.java
+++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisFeignClientAutoConfigurationTest.java
@@ -17,6 +17,7 @@
 
 package com.tencent.cloud.polaris.circuitbreaker;
 
+import com.tencent.cloud.polaris.circuitbreaker.config.PolarisFeignClientAutoConfiguration;
 import com.tencent.cloud.polaris.circuitbreaker.feign.PolarisFeignBeanPostProcessor;
 import com.tencent.cloud.polaris.context.PolarisContextAutoConfiguration;
 import com.tencent.polaris.api.core.ConsumerAPI;
diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisRestTemplateResponseErrorHandlerTest.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisRestTemplateResponseErrorHandlerTest.java
new file mode 100644
index 000000000..5daf30bc6
--- /dev/null
+++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/PolarisRestTemplateResponseErrorHandlerTest.java
@@ -0,0 +1,70 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package com.tencent.cloud.polaris.circuitbreaker;
+
+
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URL;
+
+import com.tencent.cloud.polaris.circuitbreaker.resttemplate.PolarisRestTemplateResponseErrorHandler;
+import com.tencent.polaris.api.core.ConsumerAPI;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.HttpMethod;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author : wh
+ * @date : 2022/6/22 09:00
+ * @description: Test for {@link PolarisRestTemplateResponseErrorHandler}.
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = PolarisRestTemplateResponseErrorHandlerTest.TestApplication.class,
+		properties = {"spring.cloud.polaris.namespace=Test", "spring.cloud.polaris.service=TestApp"})
+public class PolarisRestTemplateResponseErrorHandlerTest {
+
+	@Test
+	public void handleError() throws Exception {
+		ConsumerAPI consumerAPI = mock(ConsumerAPI.class);
+		PolarisRestTemplateResponseErrorHandler polarisRestTemplateResponseErrorHandler = new PolarisRestTemplateResponseErrorHandler(consumerAPI, null);
+		URI uri = mock(URI.class);
+		when(uri.getPath()).thenReturn("/test");
+		when(uri.getHost()).thenReturn("host");
+		HttpURLConnection httpURLConnection = mock(HttpURLConnection.class);
+		URL url = mock(URL.class);
+		when(httpURLConnection.getURL()).thenReturn(url);
+		when(url.getHost()).thenReturn("127.0.0.1");
+		when(url.getPort()).thenReturn(8080);
+		when(httpURLConnection.getResponseCode()).thenReturn(200);
+		SimpleClientHttpResponseTest clientHttpResponse = new SimpleClientHttpResponseTest(httpURLConnection);
+		polarisRestTemplateResponseErrorHandler.handleError(uri, HttpMethod.GET, clientHttpResponse);
+		when(consumerAPI.unWatchService(null)).thenReturn(true);
+	}
+
+	@SpringBootApplication
+	protected static class TestApplication {
+
+	}
+}
diff --git a/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/SimpleClientHttpResponseTest.java b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/SimpleClientHttpResponseTest.java
new file mode 100644
index 000000000..ed76da17b
--- /dev/null
+++ b/spring-cloud-starter-tencent-polaris-circuitbreaker/src/test/java/com/tencent/cloud/polaris/circuitbreaker/SimpleClientHttpResponseTest.java
@@ -0,0 +1,106 @@
+/*
+ * Tencent is pleased to support the open source community by making Spring Cloud Tencent available.
+ *
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ *
+ * Licensed under the BSD 3-Clause License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://opensource.org/licenses/BSD-3-Clause
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed
+ * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package com.tencent.cloud.polaris.circuitbreaker;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.client.AbstractClientHttpResponse;
+import org.springframework.lang.Nullable;
+import org.springframework.util.StreamUtils;
+import org.springframework.util.StringUtils;
+
+
+/**
+ * @author : wh
+ * @date : 2022/6/22 09:00
+ * @description: mock {@link org.springframework.http.client.SimpleClientHttpResponse}
+ */
+public class SimpleClientHttpResponseTest extends AbstractClientHttpResponse {
+
+	private final HttpURLConnection connection;
+
+	@Nullable
+	private HttpHeaders headers;
+
+	@Nullable
+	private InputStream responseStream;
+
+
+	SimpleClientHttpResponseTest(HttpURLConnection connection) {
+		this.connection = connection;
+	}
+
+
+	@Override
+	public int getRawStatusCode() throws IOException {
+		return this.connection.getResponseCode();
+	}
+
+	@Override
+	public String getStatusText() throws IOException {
+		String result = this.connection.getResponseMessage();
+		return (result != null) ? result : "";
+	}
+
+	@Override
+	public HttpHeaders getHeaders() {
+		if (this.headers == null) {
+			this.headers = new HttpHeaders();
+			// Header field 0 is the status line for most HttpURLConnections, but not on GAE
+			String name = this.connection.getHeaderFieldKey(0);
+			if (StringUtils.hasLength(name)) {
+				this.headers.add(name, this.connection.getHeaderField(0));
+			}
+			int i = 1;
+			while (true) {
+				name = this.connection.getHeaderFieldKey(i);
+				if (!StringUtils.hasLength(name)) {
+					break;
+				}
+				this.headers.add(name, this.connection.getHeaderField(i));
+				i++;
+			}
+		}
+		return this.headers;
+	}
+
+	@Override
+	public InputStream getBody() throws IOException {
+		InputStream errorStream = this.connection.getErrorStream();
+		this.responseStream = (errorStream != null ? errorStream : this.connection.getInputStream());
+		return this.responseStream;
+	}
+
+	@Override
+	public void close() {
+		try {
+			if (this.responseStream == null) {
+				getBody();
+			}
+			StreamUtils.drain(this.responseStream);
+			this.responseStream.close();
+		}
+		catch (Exception ex) {
+			// ignore
+		}
+	}
+
+}
diff --git a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/java/com/tencent/cloud/polaris/circuitbreaker/example/ServiceAController.java b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/java/com/tencent/cloud/polaris/circuitbreaker/example/ServiceAController.java
index d9d2e4370..29768d584 100644
--- a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/java/com/tencent/cloud/polaris/circuitbreaker/example/ServiceAController.java
+++ b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/java/com/tencent/cloud/polaris/circuitbreaker/example/ServiceAController.java
@@ -48,6 +48,11 @@ public class ServiceAController {
 		return polarisServiceB.info();
 	}
 
+	@GetMapping("/getBServiceInfoByRestTemplate")
+	public String getBServiceInfoByRestTemplate() {
+		return restTemplate.getForObject("http://polaris-circuitbreaker-example-b/example/service/b/info", String.class);
+	}
+
 	/**
 	 * Get info of Service B by RestTemplate.
 	 * @return info of Service B

From 6a870b9935e9f2aba850cf0825d719d54d4e2942 Mon Sep 17 00:00:00 2001
From: weihubeats <weihubeats@163.com>
Date: Sat, 25 Jun 2022 18:53:09 +0800
Subject: [PATCH 7/9] format constatns UTF-8 (#313)

* format constatns UTF-8

* add update log
---
 CHANGELOG.md                                                 | 1 +
 .../metadata/core/DecodeTransferMetadataReactiveFilter.java  | 3 ++-
 .../metadata/core/DecodeTransferMetadataServletFilter.java   | 3 ++-
 .../metadata/core/EncodeTransferMedataFeignInterceptor.java  | 3 ++-
 .../core/EncodeTransferMedataRestTemplateInterceptor.java    | 3 ++-
 .../cloud/metadata/core/EncodeTransferMedataScgFilter.java   | 3 ++-
 .../metadata/core/EncodeTransferMetadataZuulFilter.java      | 3 ++-
 .../core/filter/EncodeTransferMedataScgFilterTest.java       | 3 ++-
 .../core/filter/EncodeTransferMetadataZuulFilterTest.java    | 3 ++-
 .../gateway/example/callee/GatewayCalleeController.java      | 5 +++--
 .../gateway/example/callee/GatewayCalleeController.java      | 5 +++--
 11 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6dfd7af32..930ed3425 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,3 +17,4 @@
 - [fix:refactor to use text/html resolve chaos problem on rejectTips](https://github.com/Tencent/spring-cloud-tencent/pull/285)
 - [UT: add metadata-transfer unit test](https://github.com/Tencent/spring-cloud-tencent/pull/294)
 - [Feature:add restTemplate Report Polaris](https://github.com/Tencent/spring-cloud-tencent/pull/272)
+- [Use jdk constants instead of magic variables](https://github.com/Tencent/spring-cloud-tencent/pull/313)
diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataReactiveFilter.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataReactiveFilter.java
index 48a540f1f..3a258560e 100644
--- a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataReactiveFilter.java
+++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataReactiveFilter.java
@@ -20,6 +20,7 @@ package com.tencent.cloud.metadata.core;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -86,7 +87,7 @@ public class DecodeTransferMetadataReactiveFilter implements WebFilter, Ordered
 				.getFirst(MetadataConstant.HeaderName.CUSTOM_METADATA);
 		try {
 			if (StringUtils.hasText(customMetadataStr)) {
-				customMetadataStr = URLDecoder.decode(customMetadataStr, "UTF-8");
+				customMetadataStr = URLDecoder.decode(customMetadataStr, StandardCharsets.UTF_8.name());
 			}
 		}
 		catch (UnsupportedEncodingException e) {
diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilter.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilter.java
index 35a3f13cc..10aa7b60f 100644
--- a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilter.java
+++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataServletFilter.java
@@ -21,6 +21,7 @@ package com.tencent.cloud.metadata.core;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -78,7 +79,7 @@ public class DecodeTransferMetadataServletFilter extends OncePerRequestFilter {
 				.getHeader(MetadataConstant.HeaderName.CUSTOM_METADATA);
 		try {
 			if (StringUtils.hasText(customMetadataStr)) {
-				customMetadataStr = URLDecoder.decode(customMetadataStr, "UTF-8");
+				customMetadataStr = URLDecoder.decode(customMetadataStr, StandardCharsets.UTF_8.name());
 			}
 		}
 		catch (UnsupportedEncodingException e) {
diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignInterceptor.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignInterceptor.java
index 7b290d7d8..cf889d754 100644
--- a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignInterceptor.java
+++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignInterceptor.java
@@ -20,6 +20,7 @@ package com.tencent.cloud.metadata.core;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 import com.tencent.cloud.common.constant.MetadataConstant;
@@ -63,7 +64,7 @@ public class EncodeTransferMedataFeignInterceptor implements RequestInterceptor,
 			requestTemplate.removeHeader(CUSTOM_METADATA);
 			try {
 				requestTemplate.header(CUSTOM_METADATA,
-						URLEncoder.encode(encodedTransitiveMetadata, "UTF-8"));
+						URLEncoder.encode(encodedTransitiveMetadata, StandardCharsets.UTF_8.name()));
 			}
 			catch (UnsupportedEncodingException e) {
 				LOG.error("Set header failed.", e);
diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataRestTemplateInterceptor.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataRestTemplateInterceptor.java
index 96c6439a4..9f3a7940f 100644
--- a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataRestTemplateInterceptor.java
+++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataRestTemplateInterceptor.java
@@ -21,6 +21,7 @@ package com.tencent.cloud.metadata.core;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 import com.tencent.cloud.common.constant.MetadataConstant;
@@ -60,7 +61,7 @@ public class EncodeTransferMedataRestTemplateInterceptor
 			String encodedTransitiveMetadata = JacksonUtils.serialize2Json(customMetadata);
 			try {
 				httpRequest.getHeaders().set(MetadataConstant.HeaderName.CUSTOM_METADATA,
-						URLEncoder.encode(encodedTransitiveMetadata, "UTF-8"));
+						URLEncoder.encode(encodedTransitiveMetadata, StandardCharsets.UTF_8.name()));
 			}
 			catch (UnsupportedEncodingException e) {
 				httpRequest.getHeaders().set(MetadataConstant.HeaderName.CUSTOM_METADATA,
diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataScgFilter.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataScgFilter.java
index 200a83743..cc3aa2aa1 100644
--- a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataScgFilter.java
+++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataScgFilter.java
@@ -20,6 +20,7 @@ package com.tencent.cloud.metadata.core;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 import com.tencent.cloud.common.constant.MetadataConstant;
@@ -70,7 +71,7 @@ public class EncodeTransferMedataScgFilter implements GlobalFilter, Ordered {
 			String metadataStr = JacksonUtils.serialize2Json(customMetadata);
 			try {
 				builder.header(MetadataConstant.HeaderName.CUSTOM_METADATA,
-						URLEncoder.encode(metadataStr, "UTF-8"));
+						URLEncoder.encode(metadataStr, StandardCharsets.UTF_8.name()));
 			}
 			catch (UnsupportedEncodingException e) {
 				builder.header(MetadataConstant.HeaderName.CUSTOM_METADATA, metadataStr);
diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMetadataZuulFilter.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMetadataZuulFilter.java
index cf192e955..bb34a96f6 100644
--- a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMetadataZuulFilter.java
+++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMetadataZuulFilter.java
@@ -20,6 +20,7 @@ package com.tencent.cloud.metadata.core;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 import com.netflix.zuul.ZuulFilter;
@@ -71,7 +72,7 @@ public class EncodeTransferMetadataZuulFilter extends ZuulFilter {
 			try {
 				requestContext.addZuulRequestHeader(
 						MetadataConstant.HeaderName.CUSTOM_METADATA,
-						URLEncoder.encode(metadataStr, "UTF-8"));
+						URLEncoder.encode(metadataStr, StandardCharsets.UTF_8.name()));
 			}
 			catch (UnsupportedEncodingException e) {
 				requestContext.addZuulRequestHeader(
diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/EncodeTransferMedataScgFilterTest.java b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/EncodeTransferMedataScgFilterTest.java
index eba85a3d4..bc8a6277e 100644
--- a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/EncodeTransferMedataScgFilterTest.java
+++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/EncodeTransferMedataScgFilterTest.java
@@ -20,6 +20,7 @@ package com.tencent.cloud.metadata.core.filter;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 import com.tencent.cloud.common.constant.MetadataConstant;
@@ -64,7 +65,7 @@ public class EncodeTransferMedataScgFilterTest {
 		MockServerWebExchange exchange = MockServerWebExchange.from(builder);
 		filter.filter(exchange, chain);
 		String metadataStr = exchange.getRequest().getHeaders().getFirst(MetadataConstant.HeaderName.CUSTOM_METADATA);
-		String decode = URLDecoder.decode(metadataStr, "UTF-8");
+		String decode = URLDecoder.decode(metadataStr, StandardCharsets.UTF_8.name());
 		Map<String, String> transitiveMap = JacksonUtils.deserialize2Map(decode);
 		Assertions.assertThat(transitiveMap.size()).isEqualTo(1);
 		Assert.assertEquals(transitiveMap.get("b"), "2");
diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/EncodeTransferMetadataZuulFilterTest.java b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/EncodeTransferMetadataZuulFilterTest.java
index 5b84461a8..7cb159e84 100644
--- a/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/EncodeTransferMetadataZuulFilterTest.java
+++ b/spring-cloud-starter-tencent-metadata-transfer/src/test/java/com/tencent/cloud/metadata/core/filter/EncodeTransferMetadataZuulFilterTest.java
@@ -20,6 +20,7 @@ package com.tencent.cloud.metadata.core.filter;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 import com.netflix.zuul.context.RequestContext;
@@ -70,7 +71,7 @@ public class EncodeTransferMetadataZuulFilterTest {
 		final RequestContext ctx = RequestContext.getCurrentContext();
 		Map<String, String> zuulRequestHeaders = ctx.getZuulRequestHeaders();
 		String metaData = zuulRequestHeaders.get(MetadataConstant.HeaderName.CUSTOM_METADATA.toLowerCase());
-		String decode = URLDecoder.decode(metaData, "UTF-8");
+		String decode = URLDecoder.decode(metaData, StandardCharsets.UTF_8.name());
 		Map<String, String> transitiveMap = JacksonUtils.deserialize2Map(decode);
 		Assertions.assertThat(transitiveMap.size()).isEqualTo(1);
 		Assert.assertEquals(transitiveMap.get("b"), "2");
diff --git a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/java/com/tencent/cloud/polaris/gateway/example/callee/GatewayCalleeController.java b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/java/com/tencent/cloud/polaris/gateway/example/callee/GatewayCalleeController.java
index 40ddeb240..7b53d688f 100644
--- a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/java/com/tencent/cloud/polaris/gateway/example/callee/GatewayCalleeController.java
+++ b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/java/com/tencent/cloud/polaris/gateway/example/callee/GatewayCalleeController.java
@@ -19,6 +19,7 @@ package com.tencent.cloud.polaris.gateway.example.callee;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 
 import com.tencent.cloud.common.constant.MetadataConstant;
 import org.slf4j.Logger;
@@ -64,8 +65,8 @@ public class GatewayCalleeController {
 	public String echoHeader(
 			@RequestHeader(MetadataConstant.HeaderName.CUSTOM_METADATA) String metadataStr)
 			throws UnsupportedEncodingException {
-		LOG.info(URLDecoder.decode(metadataStr, "UTF-8"));
-		return URLDecoder.decode(metadataStr, "UTF-8");
+		LOG.info(URLDecoder.decode(metadataStr, StandardCharsets.UTF_8.name()));
+		return URLDecoder.decode(metadataStr, StandardCharsets.UTF_8.name());
 	}
 
 }
diff --git a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service2/src/main/java/com/tencent/cloud/polaris/gateway/example/callee/GatewayCalleeController.java b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service2/src/main/java/com/tencent/cloud/polaris/gateway/example/callee/GatewayCalleeController.java
index 40ddeb240..7b53d688f 100644
--- a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service2/src/main/java/com/tencent/cloud/polaris/gateway/example/callee/GatewayCalleeController.java
+++ b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service2/src/main/java/com/tencent/cloud/polaris/gateway/example/callee/GatewayCalleeController.java
@@ -19,6 +19,7 @@ package com.tencent.cloud.polaris.gateway.example.callee;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 
 import com.tencent.cloud.common.constant.MetadataConstant;
 import org.slf4j.Logger;
@@ -64,8 +65,8 @@ public class GatewayCalleeController {
 	public String echoHeader(
 			@RequestHeader(MetadataConstant.HeaderName.CUSTOM_METADATA) String metadataStr)
 			throws UnsupportedEncodingException {
-		LOG.info(URLDecoder.decode(metadataStr, "UTF-8"));
-		return URLDecoder.decode(metadataStr, "UTF-8");
+		LOG.info(URLDecoder.decode(metadataStr, StandardCharsets.UTF_8.name()));
+		return URLDecoder.decode(metadataStr, StandardCharsets.UTF_8.name());
 	}
 
 }

From db8184a5765fa77bb5d2362015813326c3494312 Mon Sep 17 00:00:00 2001
From: kaiybaby <45356448+kaiybaby@users.noreply.github.com>
Date: Sun, 26 Jun 2022 13:22:46 +0800
Subject: [PATCH 8/9] fix the current limiting effect is that other requests
 cannot be processed when queuing at a constant speed (#316)

---
 CHANGELOG.md                                         |  1 +
 .../ratelimit/filter/QuotaCheckReactiveFilter.java   |  5 +++--
 .../filter/QuotaCheckReactiveFilterTest.java         | 12 ++++++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 930ed3425..09e09b284 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,3 +18,4 @@
 - [UT: add metadata-transfer unit test](https://github.com/Tencent/spring-cloud-tencent/pull/294)
 - [Feature:add restTemplate Report Polaris](https://github.com/Tencent/spring-cloud-tencent/pull/272)
 - [Use jdk constants instead of magic variables](https://github.com/Tencent/spring-cloud-tencent/pull/313)
+- [Fix the current limiting effect is that other requests cannot be processed when queuing at a constant speed](https://github.com/Tencent/spring-cloud-tencent/pull/316)
diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java
index 8796fc1ab..31320dda0 100644
--- a/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java
+++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/main/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilter.java
@@ -19,6 +19,7 @@
 package com.tencent.cloud.polaris.ratelimit.filter;
 
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
@@ -55,7 +56,7 @@ import static com.tencent.cloud.polaris.ratelimit.constant.RateLimitConstant.LAB
 /**
  * Reactive filter to check quota.
  *
- * @author Haotian Zhang, lepdou, cheese8
+ * @author Haotian Zhang, lepdou, cheese8, kaiy
  */
 public class QuotaCheckReactiveFilter implements WebFilter, Ordered {
 
@@ -113,7 +114,7 @@ public class QuotaCheckReactiveFilter implements WebFilter, Ordered {
 			}
 			// Unirate
 			if (quotaResponse.getCode() == QuotaResultCode.QuotaResultOk && quotaResponse.getWaitMs() > 0) {
-				Thread.sleep(quotaResponse.getWaitMs());
+				return Mono.delay(Duration.ofMillis(quotaResponse.getWaitMs())).flatMap(e -> chain.filter(exchange));
 			}
 		}
 		catch (Throwable t) {
diff --git a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilterTest.java b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilterTest.java
index 0a9a4988f..6d3ef804f 100644
--- a/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilterTest.java
+++ b/spring-cloud-starter-tencent-polaris-ratelimit/src/test/java/com/tencent/cloud/polaris/ratelimit/filter/QuotaCheckReactiveFilterTest.java
@@ -22,6 +22,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.Map;
+import java.util.concurrent.CountDownLatch;
 
 import com.tencent.cloud.common.metadata.MetadataContext;
 import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
@@ -65,7 +66,7 @@ import static org.mockito.Mockito.when;
 /**
  * Test for {@link QuotaCheckReactiveFilter}.
  *
- * @author Haotian Zhang, cheese8
+ * @author Haotian Zhang, cheese8, kaiy
  */
 @RunWith(MockitoJUnitRunner.class)
 @SpringBootTest(classes = QuotaCheckReactiveFilterTest.TestApplication.class, properties = {
@@ -201,7 +202,14 @@ public class QuotaCheckReactiveFilterTest {
 		// Unirate waiting 1000ms
 		MetadataContext.LOCAL_SERVICE = "TestApp2";
 		long startTimestamp = System.currentTimeMillis();
-		quotaCheckReactiveFilter.filter(exchange, webFilterChain);
+		CountDownLatch countDownLatch = new CountDownLatch(1);
+		quotaCheckReactiveFilter.filter(exchange, webFilterChain).subscribe(e -> { }, t -> { }, countDownLatch::countDown);
+		try {
+			countDownLatch.await();
+		}
+		catch (InterruptedException e) {
+			fail("Exception encountered.", e);
+		}
 		assertThat(System.currentTimeMillis() - startTimestamp).isGreaterThanOrEqualTo(1000L);
 
 		// Rate limited

From f88a342c4d2eff58292f158a879fa15a29acaac7 Mon Sep 17 00:00:00 2001
From: lepdou <ledouzhang@tencent.com>
Date: Mon, 27 Jun 2022 19:25:06 +0800
Subject: [PATCH 9/9] fix config file format misspell (#319)

---
 CHANGELOG.md                                                  | 1 +
 .../tencent/cloud/polaris/config/enums/ConfigFileFormat.java  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09e09b284..2573c6d38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,3 +19,4 @@
 - [Feature:add restTemplate Report Polaris](https://github.com/Tencent/spring-cloud-tencent/pull/272)
 - [Use jdk constants instead of magic variables](https://github.com/Tencent/spring-cloud-tencent/pull/313)
 - [Fix the current limiting effect is that other requests cannot be processed when queuing at a constant speed](https://github.com/Tencent/spring-cloud-tencent/pull/316)
+- [Fix config file format misspell](https://github.com/Tencent/spring-cloud-tencent/pull/319)
diff --git a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/enums/ConfigFileFormat.java b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/enums/ConfigFileFormat.java
index 2b7be5774..024ad67d0 100644
--- a/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/enums/ConfigFileFormat.java
+++ b/spring-cloud-starter-tencent-polaris-config/src/main/java/com/tencent/cloud/polaris/config/enums/ConfigFileFormat.java
@@ -28,7 +28,7 @@ public enum ConfigFileFormat {
 	/**
 	 * property format.
 	 */
-	PROPERTY(".property"),
+	PROPERTY(".properties"),
 	/**
 	 * yaml format.
 	 */
@@ -48,7 +48,7 @@ public enum ConfigFileFormat {
 	/**
 	 * text format.
 	 */
-	TEXT(".text"),
+	TEXT(".txt"),
 	/**
 	 * html format.
 	 */