diff --git a/fizz-bootstrap/pom.xml b/fizz-bootstrap/pom.xml index 628a4c9..8b6a76e 100644 --- a/fizz-bootstrap/pom.xml +++ b/fizz-bootstrap/pom.xml @@ -12,7 +12,7 @@ com.fizzgate fizz-bootstrap - 2.2.0-beta6 + 2.2.0-beta7 1.8 diff --git a/fizz-common/pom.xml b/fizz-common/pom.xml index 71294c2..1d584a9 100644 --- a/fizz-common/pom.xml +++ b/fizz-common/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.2.0-beta6 + 2.2.0-beta7 ../pom.xml 4.0.0 diff --git a/fizz-core/pom.xml b/fizz-core/pom.xml index 317819f..b6ed397 100644 --- a/fizz-core/pom.xml +++ b/fizz-core/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.2.0-beta6 + 2.2.0-beta7 ../pom.xml 4.0.0 diff --git a/fizz-core/src/main/java/we/filter/FlowControlFilter.java b/fizz-core/src/main/java/we/filter/FlowControlFilter.java index af2001c..655d32a 100644 --- a/fizz-core/src/main/java/we/filter/FlowControlFilter.java +++ b/fizz-core/src/main/java/we/filter/FlowControlFilter.java @@ -285,22 +285,28 @@ public class FlowControlFilter extends FizzWebFilter { prev = resourceConfigs.get(sz - 1).getResourceId(); prevPrev = resourceConfigs.get(sz - 2).getResourceId(); - if (rateLimitConfig.type == ResourceRateLimitConfig.Type.APP && rateLimitConfig.path != null) { - String app = ResourceRateLimitConfig.getApp(prev); - if (app == null) { - something4(resourceConfigs, rateLimitConfig.app, null, null); - something4(resourceConfigs, rateLimitConfig.app, null, rateLimitConfig.service); - } else { - String service = ResourceRateLimitConfig.getService(prev); - if (service == null) { - something4(resourceConfigs, rateLimitConfig.app, null, rateLimitConfig.service); + if (rateLimitConfig.type == ResourceRateLimitConfig.Type.APP) { + String app = ResourceRateLimitConfig.getApp(prev); + if (rateLimitConfig.path == null) { + if (rateLimitConfig.service != null && app == null) { + something4(resourceConfigs, rateLimitConfig.app, null, null); + } } else { - app = ResourceRateLimitConfig.getApp(prevPrev); - if (app == null) { - something4(resourceConfigs, rateLimitConfig.app, null, null); - } + if (app == null) { + something4(resourceConfigs, rateLimitConfig.app, null, null); + something4(resourceConfigs, rateLimitConfig.app, null, rateLimitConfig.service); + } else { + String service = ResourceRateLimitConfig.getService(prev); + if (service == null) { + something4(resourceConfigs, rateLimitConfig.app, null, rateLimitConfig.service); + } else { + app = ResourceRateLimitConfig.getApp(prevPrev); + if (app == null) { + something4(resourceConfigs, rateLimitConfig.app, null, null); + } + } + } } - } } else if (rateLimitConfig.type == ResourceRateLimitConfig.Type.IP) { diff --git a/fizz-plugin/pom.xml b/fizz-plugin/pom.xml index 6079cba..c6bff1e 100644 --- a/fizz-plugin/pom.xml +++ b/fizz-plugin/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.2.0-beta6 + 2.2.0-beta7 ../pom.xml 4.0.0 diff --git a/fizz-spring-boot-starter/pom.xml b/fizz-spring-boot-starter/pom.xml index 37a19b0..1d49a14 100644 --- a/fizz-spring-boot-starter/pom.xml +++ b/fizz-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ fizz-gateway-community com.fizzgate - 2.2.0-beta6 + 2.2.0-beta7 ../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 7f8c28b..34a0752 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ fizz-gateway-community ${project.artifactId} fizz gateway community - 2.2.0-beta6 + 2.2.0-beta7 pom fizz-common