fizzgate/fizz-gateway-node
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release 2.2.0-beta7

Browse Source
This commit is contained in:
hongqiaowei
2021-07-06 17:24:20 +08:00
parent 1bb09f76d6
commit a8a752feb9
7 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fizz-bootstrap/pom.xml
View File

@@ -12,7 +12,7 @@
<groupId>com.fizzgate</groupId>
<artifactId>fizz-bootstrap</artifactId>
<version>2.2.0-beta6</version>
<version>2.2.0-beta7</version>
<properties>
<java.version>1.8</java.version>

2
fizz-common/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>fizz-gateway-community</artifactId>
<groupId>com.fizzgate</groupId>
<version>2.2.0-beta6</version>
<version>2.2.0-beta7</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
fizz-core/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>fizz-gateway-community</artifactId>
<groupId>com.fizzgate</groupId>
<version>2.2.0-beta6</version>
<version>2.2.0-beta7</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

34
fizz-core/src/main/java/we/filter/FlowControlFilter.java
View File

@@ -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) {

2
fizz-plugin/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>fizz-gateway-community</artifactId>
<groupId>com.fizzgate</groupId>
<version>2.2.0-beta6</version>
<version>2.2.0-beta7</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
fizz-spring-boot-starter/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>fizz-gateway-community</artifactId>
<groupId>com.fizzgate</groupId>
<version>2.2.0-beta6</version>
<version>2.2.0-beta7</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

2
pom.xml
View File

@@ -31,7 +31,7 @@
<artifactId>fizz-gateway-community</artifactId>
<name>${project.artifactId}</name>
<description>fizz gateway community</description>
<version>2.2.0-beta6</version>
<version>2.2.0-beta7</version>
<packaging>pom</packaging>
<modules>
<module>fizz-common</module>