From ab1299cbb297f7eca17e882582826d953a1376cc Mon Sep 17 00:00:00 2001 From: wdtt Date: Sun, 26 Feb 2023 18:58:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=99=90=E6=B5=81=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=E7=9A=84=E8=87=AA=E5=AE=9A=E4=B9=89=E6=B3=A8=E8=A7=A3=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E4=BD=BF=E7=94=A8SpringEl=E8=A1=A8=E8=BE=BE=E5=BC=8F?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=AE=9A=E4=B9=89Key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/annotation/RateLimiter.java | 8 ++- .../framework/aspectj/RateLimiterAspect.java | 55 ++++++++++++++++--- 2 files changed, 54 insertions(+), 9 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 2e3ff7a82..41b656805 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 @@ -15,7 +15,8 @@ import java.lang.annotation.*; @Documented public @interface RateLimiter { /** - * 限流key + * 限流key,支持使用Spring el表达式来动态获取方法上的参数值 + * 格式类似于 #{#code} 请注意格式！！ */ String key() default CacheConstants.RATE_LIMIT_KEY; @@ -33,4 +34,9 @@ public @interface RateLimiter { * 限流类型 */ LimitType limitType() default LimitType.DEFAULT; + + /** + * 提示消息 支持国际化 格式为 {code} + */ + String message() default "{rate.limiter.message}"; } 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 542b16bfd..52b10d944 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 @@ -5,6 +5,7 @@ import com.ruoyi.common.enums.LimitType; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.redis.RedisUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; @@ -12,6 +13,10 @@ import org.aspectj.lang.annotation.Aspect; 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.expression.common.TemplateParserContext; +import org.springframework.expression.spel.standard.SpelExpressionParser; +import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.stereotype.Component; import java.lang.reflect.Method; @@ -38,18 +43,54 @@ public class RateLimiterAspect { } long number = RedisUtils.rateLimiter(combineKey, rateType, count, time); if (number == -1) { - throw new ServiceException(MessageUtils.message("rate.limiter.message")); + String message = rateLimiter.message(); + if (StringUtils.startsWith(message, "{") && StringUtils.endsWith(message, "}")) { + message = MessageUtils.message(StringUtils.substring(message, 1, message.length() - 1)); + } + throw new ServiceException(message); } log.info("限制令牌 => {}, 剩余令牌 => {}, 缓存key => '{}'", count, number, combineKey); - } catch (ServiceException e) { - throw e; } catch (Exception e) { - throw new RuntimeException("服务器限流异常，请稍候再试"); + if(e instanceof ServiceException){ + throw e; + }else{ + throw new RuntimeException("服务器限流异常，请稍候再试"); + } } } public String getCombineKey(RateLimiter rateLimiter, JoinPoint point) { - StringBuilder stringBuffer = new StringBuilder(rateLimiter.key()); + String key = rateLimiter.key(); + //获取方法(通过方法签名来获取) + MethodSignature signature = (MethodSignature) point.getSignature(); + Method method = signature.getMethod(); + Class targetClass = method.getDeclaringClass(); + if(StringUtils.startsWith(key,"#{") && StringUtils.endsWith(key,"}")){ + //获取参数值 + Object[] args = point.getArgs(); + //获取方法上参数的名称 + /** + * 这里的DefaultParameterNameDiscoverers是Spring自带的解析器 + * 在SpringMvc获取参数的过程中也有用到 + */ + String[] parameterNames = new DefaultParameterNameDiscoverer().getParameterNames(method); + //使用Spring的el表达式解析 + SpelExpressionParser parser = new SpelExpressionParser(); + //注入到上下文对象中进行解析 + StandardEvaluationContext context = new StandardEvaluationContext(); + for (int i = 0; i < parameterNames.length; i++) { + context.setVariable(parameterNames[i],args[i]); + } + //定义解析模版 + TemplateParserContext parser_content = new TemplateParserContext(); + //解析返回给key + try { + key = parser.parseExpression(key,parser_content).getValue(context,String.class) + ""; + }catch (Exception e){ + throw new ServiceException("限流key解析异常!请联系管理员!"); + } + } + StringBuilder stringBuffer = new StringBuilder(); if (rateLimiter.limitType() == LimitType.IP) { // 获取请求ip stringBuffer.append(ServletUtils.getClientIP()).append("-"); @@ -57,10 +98,8 @@ public class RateLimiterAspect { // 获取客户端实例id stringBuffer.append(RedisUtils.getClient().getId()).append("-"); } - MethodSignature signature = (MethodSignature) point.getSignature(); - Method method = signature.getMethod(); - Class targetClass = method.getDeclaringClass(); stringBuffer.append(targetClass.getName()).append("-").append(method.getName()); + stringBuffer.append(":").append(key); return stringBuffer.toString(); } } From 560cb1d95a8cabd78fa7d8a7d17d365478a22235 Mon Sep 17 00:00:00 2001 From: wdtt Date: Sun, 26 Feb 2023 19:20:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E4=B8=BA=E9=A9=BC=E5=B3=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/framework/aspectj/RateLimiterAspect.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 52b10d944..29eb6a070 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 @@ -82,10 +82,10 @@ public class RateLimiterAspect { context.setVariable(parameterNames[i],args[i]); } //定义解析模版 - TemplateParserContext parser_content = new TemplateParserContext(); + TemplateParserContext parserContent = new TemplateParserContext(); //解析返回给key try { - key = parser.parseExpression(key,parser_content).getValue(context,String.class) + ""; + key = parser.parseExpression(key,parserContent).getValue(context,String.class) + ""; }catch (Exception e){ throw new ServiceException("限流key解析异常!请联系管理员!"); } From 94ca60250a560f4615385a5894ca2195a064d79e Mon Sep 17 00:00:00 2001 From: wdtt Date: Sun, 26 Feb 2023 20:08:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8A=BD=E5=8F=96=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E5=8F=98=E9=87=8F=20=E4=BB=A5=E5=8F=8A=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=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(); } }