From 57b5f67382ee680852b7464d7035a894f539af33 Mon Sep 17 00:00:00 2001
From: Fishtail <49390359+fuyuwei01@users.noreply.github.com>
Date: Wed, 17 Jul 2024 20:04:36 +0800
Subject: [PATCH] fix: fix the ratelimit bug for 2021 (#1348)

---
 CHANGELOG.md                                                  | 2 +-
 .../polaris/ratelimit/filter/QuotaCheckReactiveFilter.java    | 4 ++--
 .../polaris/ratelimit/filter/QuotaCheckServletFilter.java     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e39577d6d..97a5fd6bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,4 +15,4 @@
 - [fix: fix lossless deregister failed when no healthcheck configured](https://github.com/Tencent/spring-cloud-tencent/pull/1345)
 - [feat:add zero protection.](https://github.com/Tencent/spring-cloud-tencent/pull/1346)
 - [fix:fix no registry when lossless is disabled.](https://github.com/Tencent/spring-cloud-tencent/pull/1347)
-
+- [fix:fix the ratelimit bug for 2022](https://github.com/Tencent/spring-cloud-tencent/pull/1348)
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 7a56e7547..ec043a3b4 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
@@ -128,12 +128,12 @@ public class QuotaCheckReactiveFilter implements WebFilter, Ordered {
 				if (Objects.nonNull(quotaResponse.getActiveRule())) {
 					try {
 						String encodedActiveRuleName = URLEncoder.encode(
-								quotaResponse.getActiveRule().getName().getValue(), UTF_8);
+								quotaResponse.getActiveRuleName(), UTF_8);
 						response.getHeaders().add(HeaderConstant.INTERNAL_ACTIVE_RULE_NAME, encodedActiveRuleName);
 					}
 					catch (UnsupportedEncodingException e) {
 						LOG.error("Cannot encode {} for header internal-callee-activerule.",
-								quotaResponse.getActiveRule().getName().getValue(), e);
+								quotaResponse.getActiveRuleName(), e);
 					}
 				}
 				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 2f4a56eac..7266e5b54 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
@@ -121,12 +121,12 @@ public class QuotaCheckServletFilter extends OncePerRequestFilter {
 				if (Objects.nonNull(quotaResponse.getActiveRule())) {
 					try {
 						String encodedActiveRuleName = URLEncoder.encode(
-								quotaResponse.getActiveRule().getName().getValue(), UTF_8);
+								quotaResponse.getActiveRuleName(), UTF_8);
 						response.addHeader(HeaderConstant.INTERNAL_ACTIVE_RULE_NAME, encodedActiveRuleName);
 					}
 					catch (UnsupportedEncodingException e) {
 						LOG.error("Cannot encode {} for header internal-callee-activerule.",
-								quotaResponse.getActiveRule().getName().getValue(), e);
+								quotaResponse.getActiveRuleName(), e);
 					}
 				}
 				return;