From 1672ae7597fa29f7b76d156f617bd0df15b74387 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                                                  | 1 +
 .../polaris/ratelimit/filter/QuotaCheckReactiveFilter.java    | 4 ++--
 .../polaris/ratelimit/filter/QuotaCheckServletFilter.java     | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a13d843a..1d81743c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,3 +14,4 @@
 - [fix:fix ApplicationContextAwareUtils NPE bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1297)
 - [feat:upgrade jacoco version.](https://github.com/Tencent/spring-cloud-tencent/pull/1310)
 - [fix:fix no registry when lossless is disabled.](https://github.com/Tencent/spring-cloud-tencent/pull/1312)
+- [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 425e740a..014f91f7 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 39dc86f8..ee6441f1 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;