7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-11 21:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

4.4.0

Browse Source
This commit is contained in:
tanghc
2021-04-09 20:14:41 +08:00
parent 9c3bafdd92
commit 412a061668
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/filter/LimitFilter.java
View File

@@ -85,6 +85,7 @@ public class LimitFilter implements GlobalFilter, Ordered {
appKey, appKey,
routeId + appKey, routeId + appKey,
ip,
ip + routeId, ip + routeId,
ip + appKey, ip + appKey,
ip + routeId + appKey, ip + routeId + appKey,

17
sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/manager/DefaultLimitConfigManager.java
View File

@@ -82,20 +82,25 @@ public class DefaultLimitConfigManager implements LimitConfigManager {
if (StringUtils.isNotBlank(routeId) && StringUtils.isNotBlank(appKey) && StringUtils.isBlank(limitIp)) { if (StringUtils.isNotBlank(routeId) && StringUtils.isNotBlank(appKey) && StringUtils.isBlank(limitIp)) {
keys.add(routeId.trim() + appKey.trim()); keys.add(routeId.trim() + appKey.trim());
} }
Set<String> baseKeys = new HashSet<>(keys);
// 根据ip限流 // 根据ip限流
if (StringUtils.isBlank(routeId) && StringUtils.isBlank(appKey) && StringUtils.isNotBlank(limitIp)) { if (StringUtils.isBlank(routeId) && StringUtils.isBlank(appKey) && StringUtils.isNotBlank(limitIp)) {
String[] ips = limitIp.split("\\,|\\，"); String[] ips = limitIp.split("\\,|\\，");
keys.addAll(Arrays.asList(ips)); keys.addAll(Arrays.asList(ips));
} }
// 根据ip+路由id限流
// 根据ip+appKey限流
// 根据ip+路由id+appKey限流
if (StringUtils.isNotBlank(limitIp)) { if (StringUtils.isNotBlank(limitIp)) {
String[] ips = limitIp.split("\\,|\\，"); String[] ips = limitIp.split("\\,|\\，");
for (String ip : ips) { for (String ip : ips) {
for (String baseKey : baseKeys) { // 根据ip+路由id限流
keys.add(ip + baseKey); if (StringUtils.isNotBlank(ip) && StringUtils.isNotBlank(routeId) && StringUtils.isBlank(appKey)) {
keys.add(routeId);
}
// 根据ip+appKey限流
if (StringUtils.isNotBlank(ip) && StringUtils.isBlank(routeId) && StringUtils.isNotBlank(appKey)) {
keys.add(ip + appKey);
}
// 根据ip+路由id+appKey限流
if (StringUtils.isNotBlank(ip) && StringUtils.isNotBlank(routeId) && StringUtils.isNotBlank(appKey)) {
keys.add(ip + routeId +appKey);
} }
} }
} }