ContiNew/continew-starter
1
1
Fork 0
mirror of https://github.com/continew-org/continew-starter.git synced 2025-09-08 16:57:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(security/limiter): 修复默认限流器名称生成器错误

Browse Source
This commit is contained in:
Charles7c
2024-06-30 11:10:38 +08:00
parent 51c47751f4
commit 7bc25b2f8b
2 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
continew-starter-cache/continew-starter-cache-redisson/src/main/java/top/continew/starter/cache/redisson/util/RedisUtils.java vendored
View File

@@ -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));
}
}

6
continew-starter-security/continew-starter-security-limiter/src/main/java/top/continew/starter/security/limiter/core/DefaultRateLimiterNameGenerator.java
View File

@@ -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;
}
}