From 13f00d1c0d251e7b238d0e71cae93a940adbbb03 Mon Sep 17 00:00:00 2001 From: Angell Date: Wed, 9 Sep 2026 13:33:27 +0800 Subject: [PATCH] =?UTF-8?q?fix(common-ratelimiter):=20RateLimiterAspect=20?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E9=9D=9E=20HTTP=20=E7=BA=BF=E7=A8=8B?= =?UTF-8?q?=EF=BC=88gRPC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 5.X 分支限流切面位于 ruoyi-common-ratelimiter 模块，getCombineKey 与 6.X 一样 直接调用 ServletUtils.getRequest().getRequestURI()，非 HTTP 线程（如 gRPC 的 grpc-default-executor）无请求上下文导致 NPE，被切面包装为“服务器限流异常”， 使 @RateLimiter 注解在 gRPC 场景每次调用都失败。修复：request 为 null 时 跳过 URI/IP 段，仅以注解 key 限流；HTTP 线程行为不变。 --- .../common/ratelimiter/aspectj/RateLimiterAspect.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java index 2d6d82ea3..94b976d18 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java +++ b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java @@ -1,5 +1,6 @@ package org.dromara.common.ratelimiter.aspectj; +import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; @@ -99,8 +100,14 @@ public class RateLimiterAspect { key = expression.getValue(context, String.class); } StringBuilder stringBuffer = new StringBuilder(GlobalConstants.RATE_LIMIT_KEY); - stringBuffer.append(ServletUtils.getRequest().getRequestURI()).append(":"); - if (rateLimiter.limitType() == LimitType.IP) { + // 非 HTTP 线程（gRPC、消息消费、异步任务等场景）没有请求上下文，getRequest() 返回 null。 + // 此处跳过 URI/IP 段仅以注解 key 限流，否则 NPE 会导致被拦截方法每次调用都失败 + // （业务侧表现为限流注解在非 HTTP 场景完全不可用） + HttpServletRequest request = ServletUtils.getRequest(); + if (request != null) { + stringBuffer.append(request.getRequestURI()).append(":"); + } + if (rateLimiter.limitType() == LimitType.IP && request != null) { // 获取请求ip stringBuffer.append(ServletUtils.getClientIP()).append(":"); } else if (rateLimiter.limitType() == LimitType.CLUSTER) {