From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java | 73 ++++++++++++++++--------------------
1 files changed, 33 insertions(+), 40 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 75b32f1..2d6d82e 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,28 +1,29 @@
package org.dromara.common.ratelimiter.aspectj;
-import cn.hutool.core.util.ArrayUtil;
-import org.dromara.common.core.constant.GlobalConstants;
-import org.dromara.common.core.exception.ServiceException;
-import org.dromara.common.core.utils.MessageUtils;
-import org.dromara.common.core.utils.ServletUtils;
-import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.ratelimiter.annotation.RateLimiter;
-import org.dromara.common.ratelimiter.enums.LimitType;
-import org.dromara.common.redis.utils.RedisUtils;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.reflect.MethodSignature;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.ratelimiter.annotation.RateLimiter;
+import org.dromara.common.ratelimiter.enums.LimitType;
+import org.dromara.common.redis.utils.RedisUtils;
import org.redisson.api.RateType;
+import org.springframework.context.expression.BeanFactoryResolver;
+import org.springframework.context.expression.MethodBasedEvaluationContext;
import org.springframework.core.DefaultParameterNameDiscoverer;
import org.springframework.core.ParameterNameDiscoverer;
-import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.Expression;
import org.springframework.expression.ExpressionParser;
import org.springframework.expression.ParserContext;
import org.springframework.expression.common.TemplateParserContext;
import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.expression.spel.support.StandardEvaluationContext;
import java.lang.reflect.Method;
@@ -44,25 +45,23 @@
*/
private final ParserContext parserContext = new TemplateParserContext();
/**
- * 瀹氫箟spel涓婁笅鏂囧璞¤繘琛岃В鏋�
- */
- private final EvaluationContext context = new StandardEvaluationContext();
- /**
* 鏂规硶鍙傛暟瑙ｆ瀽鍣�
*/
private final ParameterNameDiscoverer pnd = new DefaultParameterNameDiscoverer();
+
@Before("@annotation(rateLimiter)")
- public void doBefore(JoinPoint point, RateLimiter rateLimiter) throws Throwable {
+ public void doBefore(JoinPoint point, RateLimiter rateLimiter) {
int time = rateLimiter.time();
int count = rateLimiter.count();
- String combineKey = getCombineKey(rateLimiter, point);
+ int timeout = rateLimiter.timeout();
try {
+ String combineKey = getCombineKey(rateLimiter, point);
RateType rateType = RateType.OVERALL;
if (rateLimiter.limitType() == LimitType.CLUSTER) {
rateType = RateType.PER_CLIENT;
}
- long number = RedisUtils.rateLimiter(combineKey, rateType, count, time);
+ long number = RedisUtils.rateLimiter(combineKey, rateType, count, time, timeout);
if (number == -1) {
String message = rateLimiter.message();
if (StringUtils.startsWith(message, "{") && StringUtils.endsWith(message, "}")) {
@@ -75,35 +74,29 @@
if (e instanceof ServiceException) {
throw e;
} else {
- throw new RuntimeException("鏈嶅姟鍣ㄩ檺娴佸紓甯革紝璇风◢鍊欏啀璇�");
+ throw new RuntimeException("鏈嶅姟鍣ㄩ檺娴佸紓甯革紝璇风◢鍊欏啀璇�", e);
}
}
}
- public String getCombineKey(RateLimiter rateLimiter, JoinPoint point) {
+ private String getCombineKey(RateLimiter rateLimiter, JoinPoint point) {
String key = rateLimiter.key();
- // 鑾峰彇鏂规硶(閫氳繃鏂规硶绛惧悕鏉ヨ幏鍙�)
- MethodSignature signature = (MethodSignature) point.getSignature();
- Method method = signature.getMethod();
- Class<?> targetClass = method.getDeclaringClass();
- // 鍒ゆ柇鏄惁鏄痵pel鏍煎紡
- if (StringUtils.containsAny(key, "#")) {
- // 鑾峰彇鍙傛暟鍊�
+ // 鍒ゆ柇 key 涓嶄负绌� 鍜� 涓嶆槸琛ㄨ揪寮�
+ if (StringUtils.isNotBlank(key) && StringUtils.containsAny(key, "#")) {
+ MethodSignature signature = (MethodSignature) point.getSignature();
+ Method targetMethod = signature.getMethod();
Object[] args = point.getArgs();
- // 鑾峰彇鏂规硶涓婂弬鏁扮殑鍚嶇О
- String[] parameterNames = pnd.getParameterNames(method);
- if (ArrayUtil.isEmpty(parameterNames)) {
- throw new ServiceException("闄愭祦key瑙ｆ瀽寮傚父!璇疯仈绯荤鐞嗗憳!");
+ MethodBasedEvaluationContext context =
+ new MethodBasedEvaluationContext(null, targetMethod, args, pnd);
+ context.setBeanResolver(new BeanFactoryResolver(SpringUtils.getBeanFactory()));
+ Expression expression;
+ if (StringUtils.startsWith(key, parserContext.getExpressionPrefix())
+ && StringUtils.endsWith(key, parserContext.getExpressionSuffix())) {
+ expression = parser.parseExpression(key, parserContext);
+ } else {
+ expression = parser.parseExpression(key);
}
- for (int i = 0; i < parameterNames.length; i++) {
- context.setVariable(parameterNames[i], args[i]);
- }
- // 瑙ｆ瀽杩斿洖缁檏ey
- try {
- key = parser.parseExpression(key, parserContext).getValue(context, String.class) + ":";
- } catch (Exception e) {
- throw new ServiceException("闄愭祦key瑙ｆ瀽寮傚父!璇疯仈绯荤鐞嗗憳!");
- }
+ key = expression.getValue(context, String.class);
}
StringBuilder stringBuffer = new StringBuilder(GlobalConstants.RATE_LIMIT_KEY);
stringBuffer.append(ServletUtils.getRequest().getRequestURI()).append(":");
--
Gitblit v1.9.3