abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化 限流功能 redis key 生成规则 以功能头+url+ip+key格式

Browse Source 
fix 修复 !pr290 的问题
This commit is contained in:
疯狂的狮子li 2023-02-26 20:39:51 +08:00
parent 995578c561
commit 2a46cdbd88
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.framework.aspectj; package com.ruoyi.framework.aspectj;
import cn.hutool.core.util.ArrayUtil;
import com.ruoyi.common.annotation.RateLimiter; import com.ruoyi.common.annotation.RateLimiter;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.enums.LimitType; import com.ruoyi.common.enums.LimitType;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.common.utils.MessageUtils;
@ -35,16 +37,23 @@ import java.lang.reflect.Method;
@Component @Component
public class RateLimiterAspect { public class RateLimiterAspect {
//定义spel表达式解析器 /**
* 定义spel表达式解析器
*/
private final ExpressionParser parser = new SpelExpressionParser(); private final ExpressionParser parser = new SpelExpressionParser();
//定义spel解析模版 /**
* 定义spel解析模版
*/
private final ParserContext parserContext = new TemplateParserContext(); private final ParserContext parserContext = new TemplateParserContext();
//定义spel上下文对象进行解析 /**
* 定义spel上下文对象进行解析
*/
private final EvaluationContext context = new StandardEvaluationContext(); private final EvaluationContext context = new StandardEvaluationContext();
//方法参数解析器 /**
* 方法参数解析器
*/
private final ParameterNameDiscoverer pnd = new DefaultParameterNameDiscoverer(); private final ParameterNameDiscoverer pnd = new DefaultParameterNameDiscoverer();
@Before("@annotation(rateLimiter)") @Before("@annotation(rateLimiter)")
public void doBefore(JoinPoint point, RateLimiter rateLimiter) throws Throwable { public void doBefore(JoinPoint point, RateLimiter rateLimiter) throws Throwable {
int time = rateLimiter.time(); int time = rateLimiter.time();
@ -75,35 +84,38 @@ public class RateLimiterAspect {
public String getCombineKey(RateLimiter rateLimiter, JoinPoint point) { public String getCombineKey(RateLimiter rateLimiter, JoinPoint point) {
String key = rateLimiter.key(); String key = rateLimiter.key();
//获取方法(通过方法签名来获取) // 获取方法(通过方法签名来获取)
MethodSignature signature = (MethodSignature) point.getSignature(); MethodSignature signature = (MethodSignature) point.getSignature();
Method method = signature.getMethod(); Method method = signature.getMethod();
Class<?> targetClass = method.getDeclaringClass(); Class<?> targetClass = method.getDeclaringClass();
//判断是否是spel格式 // 判断是否是spel格式
if (StringUtils.containsAny(key, "#")) { if (StringUtils.containsAny(key, "#")) {
//获取参数值 // 获取参数值
Object[] args = point.getArgs(); Object[] args = point.getArgs();
//获取方法上参数的名称 // 获取方法上参数的名称
String[] parameterNames = pnd.getParameterNames(method); String[] parameterNames = pnd.getParameterNames(method);
if (ArrayUtil.isEmpty(parameterNames)) {
throw new ServiceException("限流key解析异常!请联系管理员!");
}
for (int i = 0; i < parameterNames.length; i++) { for (int i = 0; i < parameterNames.length; i++) {
context.setVariable(parameterNames[i], args[i]); context.setVariable(parameterNames[i], args[i]);
} }
//解析返回给key // 解析返回给key
try { try {
key = parser.parseExpression(key, parserContext).getValue(context, String.class) + ":"; key = parser.parseExpression(key, parserContext).getValue(context, String.class) + ":";
} catch (Exception e) { } catch (Exception e) {
throw new ServiceException("限流key解析异常!请联系管理员!"); throw new ServiceException("限流key解析异常!请联系管理员!");
} }
} }
StringBuilder stringBuffer = new StringBuilder(key); StringBuilder stringBuffer = new StringBuilder(CacheConstants.RATE_LIMIT_KEY);
stringBuffer.append(ServletUtils.getRequest().getRequestURI()).append(":");
if (rateLimiter.limitType() == LimitType.IP) { if (rateLimiter.limitType() == LimitType.IP) {
// 获取请求ip // 获取请求ip
stringBuffer.append(ServletUtils.getClientIP()).append("-"); stringBuffer.append(ServletUtils.getClientIP()).append(":");
} else if (rateLimiter.limitType() == LimitType.CLUSTER) { } else if (rateLimiter.limitType() == LimitType.CLUSTER) {
// 获取客户端实例id // 获取客户端实例id
stringBuffer.append(RedisUtils.getClient().getId()).append("-"); stringBuffer.append(RedisUtils.getClient().getId()).append(":");
} }
stringBuffer.append(targetClass.getName()).append("-").append(method.getName()); return stringBuffer.append(key).toString();
return stringBuffer.toString();
} }
} }