diff --git a/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/util/RedisUtils.java b/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/util/RedisUtils.java index a3079d9a..c65f7b8e 100644 --- a/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/util/RedisUtils.java +++ b/continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/util/RedisUtils.java @@ -16,6 +16,7 @@ package top.continew.starter.cache.redisson.util; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.extra.spring.SpringUtil; import org.redisson.api.*; import top.continew.starter.core.constant.StringConstants; @@ -206,25 +207,6 @@ public class RedisUtils { return rateLimiter.tryAcquire(1); } - /** - * 限流 - * - * @param key 限流key - * @param rateType 限流类型 - * @param rate 速率 - * @param rateInterval 速率间隔 - * @return -1 表示失败 - */ - public static long rateLimiter(String key, RateType rateType, int rate, int rateInterval, RateIntervalUnit unit) { - RRateLimiter rateLimiter = CLIENT.getRateLimiter(key); - rateLimiter.trySetRate(rateType, rate, rateInterval, unit); - if (rateLimiter.tryAcquire()) { - return rateLimiter.availablePermits(); - } else { - return -1L; - } - } - /** * 格式化键,将各子键用 : 拼接起来 * @@ -232,6 +214,6 @@ public class RedisUtils { * @return 键 */ public static String formatKey(String... subKeys) { - return String.join(StringConstants.COLON, subKeys); + return String.join(StringConstants.COLON, ArrayUtil.removeBlank(subKeys)); } } diff --git a/continew-starter-security/continew-starter-security-limiter/src/main/java/top/continew/starter/security/limiter/core/DefaultRateLimiterNameGenerator.java b/continew-starter-security/continew-starter-security-limiter/src/main/java/top/continew/starter/security/limiter/core/DefaultRateLimiterNameGenerator.java index c2a1a847..3ff7005f 100644 --- a/continew-starter-security/continew-starter-security-limiter/src/main/java/top/continew/starter/security/limiter/core/DefaultRateLimiterNameGenerator.java +++ b/continew-starter-security/continew-starter-security-limiter/src/main/java/top/continew/starter/security/limiter/core/DefaultRateLimiterNameGenerator.java @@ -45,9 +45,7 @@ public class DefaultRateLimiterNameGenerator implements RateLimiterNameGenerator this.getDescriptor(nameSb, clazz); } nameSb.append(StringConstants.ROUND_BRACKET_END); - String str = nameSb.toString(); - nameMap.put(method, str); - return str; + return nameSb.toString(); }); } @@ -71,7 +69,7 @@ public class DefaultRateLimiterNameGenerator implements RateLimiterNameGenerator String name = clazz.getName(); name = ClassUtil.getShortClassName(name); sb.append(name); - sb.append(StringConstants.COLON); + sb.append(StringConstants.SEMICOLON); return; } }