From f9c62fc23bd6f7c8095957671ed7aa52323be700 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 17 九月 2021 16:20:05 +0800
Subject: [PATCH] update 使用 Redisson 限流工具 重写限流实现
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java | 84 ++++++++++--------------------------------
1 files changed, 20 insertions(+), 64 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 1e21e37..e63e47b 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
@@ -3,83 +3,54 @@
import com.ruoyi.common.annotation.RateLimiter;
import com.ruoyi.common.enums.LimitType;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.RedisUtils;
+import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.Signature;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.script.RedisScript;
+import org.redisson.api.RateType;
import org.springframework.stereotype.Component;
import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.List;
/**
* 闄愭祦澶勭悊
*
- * @author ruoyi
+ * @author Lion Li
*/
+@Slf4j
@Aspect
@Component
-public class RateLimiterAspect
-{
- private static final Logger log = LoggerFactory.getLogger(RateLimiterAspect.class);
-
- private RedisTemplate<Object, Object> redisTemplate;
-
- private RedisScript<Long> limitScript;
-
- @Autowired
- public void setRedisTemplate1(RedisTemplate<Object, Object> redisTemplate)
- {
- this.redisTemplate = redisTemplate;
- }
-
- @Autowired
- public void setLimitScript(RedisScript<Long> limitScript)
- {
- this.limitScript = limitScript;
- }
+public class RateLimiterAspect {
// 閰嶇疆缁囧叆鐐�
@Pointcut("@annotation(com.ruoyi.common.annotation.RateLimiter)")
- public void rateLimiterPointCut()
- {
+ public void rateLimiterPointCut() {
}
@Before("rateLimiterPointCut()")
- public void doBefore(JoinPoint point) throws Throwable
- {
+ public void doBefore(JoinPoint point) throws Throwable {
RateLimiter rateLimiter = getAnnotationRateLimiter(point);
String key = rateLimiter.key();
int time = rateLimiter.time();
int count = rateLimiter.count();
- String combineKey = getCombineKey(rateLimiter, point);
- List<Object> keys = Collections.singletonList(combineKey);
- try
- {
- Long number = redisTemplate.execute(limitScript, keys, count, time);
- if (StringUtils.isNull(number) || number.intValue() > count)
- {
+ try {
+ RateType rateType = RateType.OVERALL;
+ if (rateLimiter.limitType() == LimitType.IP) {
+ rateType = RateType.PER_CLIENT;
+ }
+ // 杩斿洖 false 璇存槑 鑾峰彇浠ょ墝澶辫触
+ if (!RedisUtils.rateLimiter(key, rateType, count, time)) {
throw new ServiceException("璁块棶杩囦簬棰戠箒锛岃绋嶅悗鍐嶈瘯");
}
- log.info("闄愬埗璇锋眰'{}',褰撳墠璇锋眰'{}',缂撳瓨key'{}'", count, number.intValue(), key);
- }
- catch (ServiceException e)
- {
+ log.info("闄愬埗璇锋眰'{}',缂撳瓨key'{}'", count, key);
+ } catch (ServiceException e) {
throw e;
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
throw new RuntimeException("鏈嶅姟鍣ㄩ檺娴佸紓甯革紝璇风◢鍚庡啀璇�");
}
}
@@ -87,30 +58,15 @@
/**
* 鏄惁瀛樺湪娉ㄨВ锛屽鏋滃瓨鍦ㄥ氨鑾峰彇
*/
- private RateLimiter getAnnotationRateLimiter(JoinPoint joinPoint)
- {
+ private RateLimiter getAnnotationRateLimiter(JoinPoint joinPoint) {
Signature signature = joinPoint.getSignature();
MethodSignature methodSignature = (MethodSignature) signature;
Method method = methodSignature.getMethod();
- if (method != null)
- {
+ if (method != null) {
return method.getAnnotation(RateLimiter.class);
}
return null;
}
- public String getCombineKey(RateLimiter rateLimiter, JoinPoint point)
- {
- StringBuffer stringBuffer = new StringBuffer(rateLimiter.key());
- if (rateLimiter.limitType() == LimitType.IP)
- {
- stringBuffer.append(ServletUtils.getClientIP());
- }
- MethodSignature signature = (MethodSignature) point.getSignature();
- Method method = signature.getMethod();
- Class<?> targetClass = method.getDeclaringClass();
- stringBuffer.append("-").append(targetClass.getName()).append("- ").append(method.getName());
- return stringBuffer.toString();
- }
}
--
Gitblit v1.9.3