From 94ca60250a560f4615385a5894ca2195a064d79e Mon Sep 17 00:00:00 2001 From: wdtt Date: Sun, 26 Feb 2023 20:08:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=8F=96=E9=80=9A=E7=94=A8=E5=8F=98?= =?UTF-8?q?=E9=87=8F=20=E4=BB=A5=E5=8F=8A=E6=A0=BC=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/annotation/RateLimiter.java | 2 +- .../framework/aspectj/RateLimiterAspect.java | 42 ++++++++++--------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java index 41b656805..e2693b520 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java @@ -16,7 +16,7 @@ import java.lang.annotation.*; public @interface RateLimiter { /** * 限流key,支持使用Spring el表达式来动态获取方法上的参数值 - * 格式类似于 #{#code} 请注意格式！！ + * 格式类似于 #code.id #{#code} */ String key() default CacheConstants.RATE_LIMIT_KEY; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java index 29eb6a070..cc953b1fb 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java @@ -14,6 +14,10 @@ import org.aspectj.lang.annotation.Before; import org.aspectj.lang.reflect.MethodSignature; import org.redisson.api.RateType; import org.springframework.core.DefaultParameterNameDiscoverer; +import org.springframework.core.ParameterNameDiscoverer; +import org.springframework.expression.EvaluationContext; +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; @@ -31,6 +35,16 @@ import java.lang.reflect.Method; @Component public class RateLimiterAspect { + //定义spel表达式解析器 + private final ExpressionParser parser = new SpelExpressionParser(); + //定义spel解析模版 + 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 { int time = rateLimiter.time(); @@ -51,9 +65,9 @@ public class RateLimiterAspect { } log.info("限制令牌 => {}, 剩余令牌 => {}, 缓存key => '{}'", count, number, combineKey); } catch (Exception e) { - if(e instanceof ServiceException){ + if (e instanceof ServiceException) { throw e; - }else{ + } else { throw new RuntimeException("服务器限流异常，请稍候再试"); } } @@ -65,32 +79,23 @@ public class RateLimiterAspect { MethodSignature signature = (MethodSignature) point.getSignature(); Method method = signature.getMethod(); Class targetClass = method.getDeclaringClass(); - if(StringUtils.startsWith(key,"#{") && StringUtils.endsWith(key,"}")){ + //判断是否是spel格式 + if (StringUtils.containsAny(key, "#")) { //获取参数值 Object[] args = point.getArgs(); //获取方法上参数的名称 - /** - * 这里的DefaultParameterNameDiscoverers是Spring自带的解析器 - * 在SpringMvc获取参数的过程中也有用到 - */ - String[] parameterNames = new DefaultParameterNameDiscoverer().getParameterNames(method); - //使用Spring的el表达式解析 - SpelExpressionParser parser = new SpelExpressionParser(); - //注入到上下文对象中进行解析 - StandardEvaluationContext context = new StandardEvaluationContext(); + String[] parameterNames = pnd.getParameterNames(method); for (int i = 0; i < parameterNames.length; i++) { - context.setVariable(parameterNames[i],args[i]); + context.setVariable(parameterNames[i], args[i]); } - //定义解析模版 - TemplateParserContext parserContent = new TemplateParserContext(); //解析返回给key try { - key = parser.parseExpression(key,parserContent).getValue(context,String.class) + ""; - }catch (Exception e){ + key = parser.parseExpression(key, parserContext).getValue(context, String.class) + ":"; + } catch (Exception e) { throw new ServiceException("限流key解析异常!请联系管理员!"); } } - StringBuilder stringBuffer = new StringBuilder(); + StringBuilder stringBuffer = new StringBuilder(key); if (rateLimiter.limitType() == LimitType.IP) { // 获取请求ip stringBuffer.append(ServletUtils.getClientIP()).append("-"); @@ -99,7 +104,6 @@ public class RateLimiterAspect { stringBuffer.append(RedisUtils.getClient().getId()).append("-"); } stringBuffer.append(targetClass.getName()).append("-").append(method.getName()); - stringBuffer.append(":").append(key); return stringBuffer.toString(); } }