add 增加 集群限流功能
This commit is contained in:
parent
30fe14c0ff
commit
dcaeb18870
@ -16,5 +16,10 @@ public enum LimitType
|
|||||||
/**
|
/**
|
||||||
* 根据请求者IP进行限流
|
* 根据请求者IP进行限流
|
||||||
*/
|
*/
|
||||||
IP
|
IP,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 实例限流(集群多后端实例)
|
||||||
|
*/
|
||||||
|
CLUSTER
|
||||||
}
|
}
|
||||||
|
@ -4,6 +4,7 @@ import com.ruoyi.common.annotation.RateLimiter;
|
|||||||
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.RedisUtils;
|
import com.ruoyi.common.utils.RedisUtils;
|
||||||
|
import com.ruoyi.common.utils.ServletUtils;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.aspectj.lang.JoinPoint;
|
import org.aspectj.lang.JoinPoint;
|
||||||
import org.aspectj.lang.Signature;
|
import org.aspectj.lang.Signature;
|
||||||
@ -34,20 +35,19 @@ public class RateLimiterAspect {
|
|||||||
@Before("rateLimiterPointCut()")
|
@Before("rateLimiterPointCut()")
|
||||||
public void doBefore(JoinPoint point) throws Throwable {
|
public void doBefore(JoinPoint point) throws Throwable {
|
||||||
RateLimiter rateLimiter = getAnnotationRateLimiter(point);
|
RateLimiter rateLimiter = getAnnotationRateLimiter(point);
|
||||||
String key = rateLimiter.key();
|
|
||||||
int time = rateLimiter.time();
|
int time = rateLimiter.time();
|
||||||
int count = rateLimiter.count();
|
int count = rateLimiter.count();
|
||||||
|
String combineKey = getCombineKey(rateLimiter, point);
|
||||||
try {
|
try {
|
||||||
RateType rateType = RateType.OVERALL;
|
RateType rateType = RateType.OVERALL;
|
||||||
if (rateLimiter.limitType() == LimitType.IP) {
|
if (rateLimiter.limitType() == LimitType.CLUSTER) {
|
||||||
rateType = RateType.PER_CLIENT;
|
rateType = RateType.PER_CLIENT;
|
||||||
}
|
}
|
||||||
// 返回 false 说明 获取令牌失败
|
long number = RedisUtils.rateLimiter(combineKey, rateType, count, time);
|
||||||
if (!RedisUtils.rateLimiter(key, rateType, count, time)) {
|
if (number == -1) {
|
||||||
throw new ServiceException("访问过于频繁,请稍后再试");
|
throw new ServiceException("访问过于频繁,请稍后再试");
|
||||||
}
|
}
|
||||||
log.info("限制请求'{}',缓存key'{}'", count, key);
|
log.info("限制令牌 => {}, 剩余令牌 => {}, 缓存key => '{}'", count, number, combineKey);
|
||||||
} catch (ServiceException e) {
|
} catch (ServiceException e) {
|
||||||
throw e;
|
throw e;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@ -69,4 +69,20 @@ public class RateLimiterAspect {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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){
|
||||||
|
// 获取客户端实例id
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user