From 8372b35bacf0f8611e832b643328cad83381acc0 Mon Sep 17 00:00:00 2001
From: fredrikliu <139424001+fredrikliu@users.noreply.github.com>
Date: Thu, 6 Jun 2024 15:40:46 +0800
Subject: [PATCH] fix: fix the ratelimit bug for 2023 (#1316)

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 500fed55f..d01b0b51d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,4 +7,5 @@
 - [feat: add lane router examples](https://github.com/Tencent/spring-cloud-tencent/pull/1260)
 - [feat:upgrade jackson version.](https://github.com/Tencent/spring-cloud-tencent/pull/1262)
 - [fix: fix the lossless provider override in multiple registries scenario](https://github.com/Tencent/spring-cloud-tencent/pull/1263)
-- [fix:fix nearby router properties loading bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1272)
\ No newline at end of file
+- [fix:fix nearby router properties loading bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1272)
+- [fix:fix the ratelimit bug for 2023](https://github.com/Tencent/spring-cloud-tencent/pull/1316)
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 425e740a4..014f91f72 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
@@ -127,12 +127,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 39dc86f8a..ee6441f12 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
@@ -119,12 +119,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;