From 168d49fe0b21aaf1d06512a2896959120beec312 Mon Sep 17 00:00:00 2001
From: abbfun <819589789@qq.com>
Date: 星期一, 08 八月 2022 09:46:08 +0800
Subject: [PATCH] 优化表格上右侧工具条（搜索按钮显隐&右侧样式凸出） 无搜索条件时可通过search隐藏搜索按钮，工具条组右侧样式超出5px（相对于底部表格）,其父节点gutter代码生成默认10，此处也默认10，使工具组样式左右一致
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 ce3de2b..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,7 +53,7 @@
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.getClient().getId()).append("-");
}
--
Gitblit v1.9.3