From 80d1e28d0f5b643a753a2989dbba4e123b9ad87d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 10 五月 2022 14:42:02 +0800
Subject: [PATCH] update springboot-admin 2.6.6 => 2.6.7 update springboot-mybatis 2.2.0 => 2.2.2 update sa-token 1.29.0 => 1.30.0 update hutool 5.7.22 => 5.8.0 update druid 1.2.8 => 1.2.9 update tlog 1.3.6 => 1.4.0
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 df4d9c8..542b16b 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,8 +3,9 @@
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.MessageUtils;
import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
@@ -37,7 +38,7 @@
}
long number = RedisUtils.rateLimiter(combineKey, rateType, count, time);
if (number == -1) {
- throw new ServiceException("璁块棶杩囦簬棰戠箒锛岃绋嶅�欏啀璇�");
+ throw new ServiceException(MessageUtils.message("rate.limiter.message"));
}
log.info("闄愬埗浠ょ墝 => {}, 鍓╀綑浠ょ墝 => {}, 缂撳瓨key => '{}'", count, number, combineKey);
} catch (ServiceException e) {
@@ -52,9 +53,9 @@
if (rateLimiter.limitType() == LimitType.IP) {
// 鑾峰彇璇锋眰ip
stringBuffer.append(ServletUtils.getClientIP()).append("-");
- } else if (rateLimiter.limitType() == LimitType.CLUSTER){
+ } else if (rateLimiter.limitType() == LimitType.CLUSTER) {
// 鑾峰彇瀹㈡埛绔疄渚媔d
- stringBuffer.append(RedisUtils.getClientId()).append("-");
+ stringBuffer.append(RedisUtils.getClient().getId()).append("-");
}
MethodSignature signature = (MethodSignature) point.getSignature();
Method method = signature.getMethod();
--
Gitblit v1.9.3