From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java | 158 +++++++++++++++++++++-------------------------------
1 files changed, 65 insertions(+), 93 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 4187cee..df4d9c8 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
@@ -1,93 +1,65 @@
-package com.ruoyi.framework.aspectj;
-
-import java.lang.reflect.Method;
-import java.util.Collections;
-import java.util.List;
-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.springframework.stereotype.Component;
-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.ip.IpUtils;
-
-/**
- * 闄愭祦澶勭悊
- *
- * @author ruoyi
- */
-@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;
- }
-
- @Before("@annotation(rateLimiter)")
- public void doBefore(JoinPoint point, RateLimiter rateLimiter) throws Throwable
- {
- 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)
- {
- throw new ServiceException("璁块棶杩囦簬棰戠箒锛岃绋嶅悗鍐嶈瘯");
- }
- log.info("闄愬埗璇锋眰'{}',褰撳墠璇锋眰'{}',缂撳瓨key'{}'", count, number.intValue(), key);
- }
- catch (ServiceException e)
- {
- throw e;
- }
- catch (Exception e)
- {
- throw new RuntimeException("鏈嶅姟鍣ㄩ檺娴佸紓甯革紝璇风◢鍚庡啀璇�");
- }
- }
-
- public String getCombineKey(RateLimiter rateLimiter, JoinPoint point)
- {
- StringBuffer stringBuffer = new StringBuffer(rateLimiter.key());
- if (rateLimiter.limitType() == LimitType.IP)
- {
- stringBuffer.append(IpUtils.getIpAddr(ServletUtils.getRequest()));
- }
- 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();
- }
-}
+package com.ruoyi.framework.aspectj;
+
+import com.ruoyi.common.annotation.RateLimiter;
+import com.ruoyi.common.enums.LimitType;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.RedisUtils;
+import com.ruoyi.common.utils.ServletUtils;
+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.redisson.api.RateType;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+
+/**
+ * 闄愭祦澶勭悊
+ *
+ * @author Lion Li
+ */
+@Slf4j
+@Aspect
+@Component
+public class RateLimiterAspect {
+
+ @Before("@annotation(rateLimiter)")
+ public void doBefore(JoinPoint point, RateLimiter rateLimiter) throws Throwable {
+ int time = rateLimiter.time();
+ int count = rateLimiter.count();
+ String combineKey = getCombineKey(rateLimiter, point);
+ try {
+ RateType rateType = RateType.OVERALL;
+ if (rateLimiter.limitType() == LimitType.CLUSTER) {
+ rateType = RateType.PER_CLIENT;
+ }
+ long number = RedisUtils.rateLimiter(combineKey, rateType, count, time);
+ if (number == -1) {
+ throw new ServiceException("璁块棶杩囦簬棰戠箒锛岃绋嶅�欏啀璇�");
+ }
+ log.info("闄愬埗浠ょ墝 => {}, 鍓╀綑浠ょ墝 => {}, 缂撳瓨key => '{}'", count, number, combineKey);
+ } catch (ServiceException e) {
+ throw e;
+ } catch (Exception e) {
+ throw new RuntimeException("鏈嶅姟鍣ㄩ檺娴佸紓甯革紝璇风◢鍊欏啀璇�");
+ }
+ }
+
+ public String getCombineKey(RateLimiter rateLimiter, JoinPoint point) {
+ StringBuilder stringBuffer = new StringBuilder(rateLimiter.key());
+ if (rateLimiter.limitType() == LimitType.IP) {
+ // 鑾峰彇璇锋眰ip
+ stringBuffer.append(ServletUtils.getClientIP()).append("-");
+ } else if (rateLimiter.limitType() == LimitType.CLUSTER){
+ // 鑾峰彇瀹㈡埛绔疄渚媔d
+ stringBuffer.append(RedisUtils.getClientId()).append("-");
+ }
+ MethodSignature signature = (MethodSignature) point.getSignature();
+ Method method = signature.getMethod();
+ Class<?> targetClass = method.getDeclaringClass();
+ stringBuffer.append(targetClass.getName()).append("-").append(method.getName());
+ return stringBuffer.toString();
+ }
+}
--
Gitblit v1.9.3