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

Release v2.2.0-beta6

Browse Source
This commit is contained in:
hongqiaowei
2021-06-30 14:47:33 +08:00
parent 24bb6cbf00
commit 82e6fe63ad
9 changed files with 41 additions and 24 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> <groupId>com.fizzgate</groupId>
<artifactId>fizz-bootstrap</artifactId> <artifactId>fizz-bootstrap</artifactId>
<version>2.2.0-beta5</version> <version>2.2.0-beta6</version>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>

2
fizz-common/pom.xml
View File

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

2
fizz-core/pom.xml
View File

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

3
fizz-core/src/main/java/we/config/FlowStatSchedConfig.java
View File

@@ -240,7 +240,8 @@ public class FlowStatSchedConfig extends SchedConfig {
rt.convertAndSend(flowStatSchedConfigProperties.getQueue(), msg).subscribe(); rt.convertAndSend(flowStatSchedConfigProperties.getQueue(), msg).subscribe();
} }
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("report " + toDP19(timeWin) + " win10: " + msg); String wt = 'w' + toDP19(timeWin);
log.debug("report " + wt + ": " + msg, LogService.BIZ_ID, wt);
} }
} }
} }

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

@@ -255,23 +255,31 @@ public class FlowControlFilter extends FizzWebFilter {
} }
} }
} else if (rateLimitConfig.type == ResourceRateLimitConfig.Type.IP && rateLimitConfig.path != null) { } else if (rateLimitConfig.type == ResourceRateLimitConfig.Type.IP) {
String ip = ResourceRateLimitConfig.getIp(prev); if (rateLimitConfig.service == null && rateLimitConfig.path == null) {
if (ip == null) { } else if (rateLimitConfig.path == null) {
something4(resourceConfigs, null, rateLimitConfig.ip, null); String ip = ResourceRateLimitConfig.getIp(prev);
something4(resourceConfigs, null, rateLimitConfig.ip, rateLimitConfig.service); if (ip == null) {
} else { something4(resourceConfigs, null, rateLimitConfig.ip, null);
String service = ResourceRateLimitConfig.getService(prev); }
if (service == null) {
something4(resourceConfigs, null, rateLimitConfig.ip, rateLimitConfig.service);
} else { } else {
ip = ResourceRateLimitConfig.getIp(prevPrev); String ip = ResourceRateLimitConfig.getIp(prev);
if (ip == null) { if (ip == null) {
something4(resourceConfigs, null, rateLimitConfig.ip, null); something4(resourceConfigs, null, rateLimitConfig.ip, null);
} something4(resourceConfigs, null, rateLimitConfig.ip, rateLimitConfig.service);
} else {
String service = ResourceRateLimitConfig.getService(prev);
if (service == null) {
something4(resourceConfigs, null, rateLimitConfig.ip, rateLimitConfig.service);
} else {
ip = ResourceRateLimitConfig.getIp(prevPrev);
if (ip == null) {
something4(resourceConfigs, null, rateLimitConfig.ip, null);
}
}
}
} }
}
} }
} }
} }

14
fizz-core/src/main/java/we/stats/ratelimit/ResourceRateLimitConfig.java
View File

@@ -98,9 +98,11 @@ public class ResourceRateLimitConfig {
} }
public void setResource(String r) { public void setResource(String r) {
resource = r; if (StringUtils.isNotBlank(r)) {
if (!resource.equals(NODE)) { resource = r;
service = resource; if (!resource.equals(NODE)) {
service = resource;
}
} }
} }
@@ -115,6 +117,12 @@ public class ResourceRateLimitConfig {
} }
} }
public void setService(String s) {
if (StringUtils.isNotBlank(s)) {
service = s;
}
}
public void setPath(String p) { public void setPath(String p) {
if (StringUtils.isNotBlank(p)) { if (StringUtils.isNotBlank(p)) {
path = p; path = p;

2
fizz-plugin/pom.xml
View File

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

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

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

2
pom.xml
View File

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