From b2faadeb52a32023e3d6470bc0616cd292bea4cc Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Thu, 4 Dec 2025 17:31:16 +0800 Subject: [PATCH] fix:fix NPE when rate-limiting with null value. (#1764) Signed-off-by: Haotian Zhang <928016560@qq.com> --- CHANGELOG.md | 3 ++- spring-cloud-tencent-dependencies/pom.xml | 2 +- .../callee/QuickstartCalleeController.java | 6 +++--- .../callee/QuickstartCalleeController.java | 16 ++++++++-------- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6cd70f2f..c69d101be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,4 +33,5 @@ - [fix: tsf gateway config support tsf-data-access.](https://github.com/Tencent/spring-cloud-tencent/pull/1745) - [fix: fix multiple bugs in tsf.](https://github.com/Tencent/spring-cloud-tencent/pull/1746) - [fix: fix get gateway config in tsf ipv6.](https://github.com/Tencent/spring-cloud-tencent/pull/1747) -- [fix: fix nacos service discovery. ](https://github.com/Tencent/spring-cloud-tencent/pull/1751) \ No newline at end of file +- [fix: fix nacos service discovery. ](https://github.com/Tencent/spring-cloud-tencent/pull/1751) +- [fix:fix NPE when rate-limiting with null value.](https://github.com/Tencent/spring-cloud-tencent/pull/1764) diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 291f26b02..b97f5ba6a 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -74,7 +74,7 @@ 2.1.0.1-2023.0.6-SNAPSHOT - 2.1.0.2-SNAPSHOT + 2.1.0.3-SNAPSHOT 2.8.13 diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/java/com/tencent/cloud/quickstart/callee/QuickstartCalleeController.java b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/java/com/tencent/cloud/quickstart/callee/QuickstartCalleeController.java index c8a1a785a..08bfb2e2d 100644 --- a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/java/com/tencent/cloud/quickstart/callee/QuickstartCalleeController.java +++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/java/com/tencent/cloud/quickstart/callee/QuickstartCalleeController.java @@ -87,9 +87,9 @@ public class QuickstartCalleeController { * @return information of callee */ @GetMapping("/info") - public String info() { - LOG.info("Quickstart [{}] Service [{}:{}] is called. datasource = [{}].", appName, ip, port, dataSourceProperties); - return String.format("Quickstart [%s] Service [%s:%s] is called. datasource = [%s].", appName, ip, port, dataSourceProperties); + public String info(@RequestParam(required = false) String param) { + LOG.info("Quickstart [{}] Service [{}:{}] is called with param [{}]. datasource = [{}].", appName, ip, port, param, dataSourceProperties); + return String.format("Quickstart [%s] Service [%s:%s] is called with param [%s]. datasource = [%s].", appName, ip, port, param, dataSourceProperties); } @PostMapping("/user") diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-b/src/main/java/com/tencent/cloud/quickstart/callee/QuickstartCalleeController.java b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-b/src/main/java/com/tencent/cloud/quickstart/callee/QuickstartCalleeController.java index 618550500..35f8f5bdb 100644 --- a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-b/src/main/java/com/tencent/cloud/quickstart/callee/QuickstartCalleeController.java +++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-b/src/main/java/com/tencent/cloud/quickstart/callee/QuickstartCalleeController.java @@ -85,9 +85,9 @@ public class QuickstartCalleeController { * @return information of callee */ @GetMapping("/info") - public String info() { - LOG.info("Quickstart [{}] Service [{}:{}] is called. datasource = [{}].", appName, ip, port, dataSourceProperties); - return String.format("Quickstart [%s] Service [%s:%s] is called. datasource = [%s].", appName, ip, port, dataSourceProperties); + public String info(@RequestParam(required = false) String param) { + LOG.info("Quickstart [{}] Service [{}:{}] is called with param [{}]. datasource = [{}].", appName, ip, port, param, dataSourceProperties); + return String.format("Quickstart [%s] Service [%s:%s] is called with param [%s]. datasource = [%s].", appName, ip, port, param, dataSourceProperties); } /** @@ -124,12 +124,12 @@ public class QuickstartCalleeController { return new ResponseEntity<>(result, HttpStatus.BAD_GATEWAY); } if (delay > 0) { - String result = String.format("Quickstart Callee Service [%s:%s] is called after %sms.", ip, port, delay); + String result = String.format("Quickstart Callee Service [%s:%s] is called after %sms.", ip, port, delay); Thread.sleep(delay); LOG.info(result); return new ResponseEntity<>(result, HttpStatus.OK); } - String result = String.format("Quickstart Callee Service [%s:%s] is called right.", ip, port); + String result = String.format("Quickstart Callee Service [%s:%s] is called right.", ip, port); LOG.info(result); return new ResponseEntity<>(result, HttpStatus.OK); } @@ -147,12 +147,12 @@ public class QuickstartCalleeController { return new ResponseEntity<>(result, HttpStatus.BAD_GATEWAY); } if (delay > 0) { - String result = String.format("Quickstart Callee Service uid %s [%s:%s] is called after %sms.", uid, ip, port, delay); + String result = String.format("Quickstart Callee Service uid %s [%s:%s] is called after %sms.", uid, ip, port, delay); Thread.sleep(delay); LOG.info(result); return new ResponseEntity<>(result, HttpStatus.OK); } - String result = String.format("Quickstart Callee Service uid %s [%s:%s] is called right.", uid, ip, port); + String result = String.format("Quickstart Callee Service uid %s [%s:%s] is called right.", uid, ip, port); LOG.info(result); return new ResponseEntity<>(result, HttpStatus.OK); } @@ -198,7 +198,7 @@ public class QuickstartCalleeController { LOG.info(result); return new ResponseEntity<>(result, HttpStatus.OK); } - String result = String.format("Quickstart Callee Service [%s:%s] is detected right.", ip, port); + String result = String.format("Quickstart Callee Service [%s:%s] is detected right.", ip, port); LOG.info(result); return new ResponseEntity<>(result, HttpStatus.OK); }