diff --git a/fizz-bootstrap/pom.xml b/fizz-bootstrap/pom.xml
index 8cc05e1..628a4c9 100644
--- a/fizz-bootstrap/pom.xml
+++ b/fizz-bootstrap/pom.xml
@@ -12,7 +12,7 @@
com.fizzgate
fizz-bootstrap
- 2.2.0-beta5
+ 2.2.0-beta6
1.8
diff --git a/fizz-common/pom.xml b/fizz-common/pom.xml
index cba3f59..71294c2 100644
--- a/fizz-common/pom.xml
+++ b/fizz-common/pom.xml
@@ -5,7 +5,7 @@
fizz-gateway-community
com.fizzgate
- 2.2.0-beta5
+ 2.2.0-beta6
../pom.xml
4.0.0
diff --git a/fizz-core/pom.xml b/fizz-core/pom.xml
index 58fc7a7..317819f 100644
--- a/fizz-core/pom.xml
+++ b/fizz-core/pom.xml
@@ -5,7 +5,7 @@
fizz-gateway-community
com.fizzgate
- 2.2.0-beta5
+ 2.2.0-beta6
../pom.xml
4.0.0
diff --git a/fizz-core/src/main/java/we/config/FlowStatSchedConfig.java b/fizz-core/src/main/java/we/config/FlowStatSchedConfig.java
index ec820bc..cf8f6c4 100644
--- a/fizz-core/src/main/java/we/config/FlowStatSchedConfig.java
+++ b/fizz-core/src/main/java/we/config/FlowStatSchedConfig.java
@@ -240,7 +240,8 @@ public class FlowStatSchedConfig extends SchedConfig {
rt.convertAndSend(flowStatSchedConfigProperties.getQueue(), msg).subscribe();
}
if (log.isDebugEnabled()) {
- log.debug("report " + toDP19(timeWin) + " win10: " + msg);
+ String wt = 'w' + toDP19(timeWin);
+ log.debug("report " + wt + ": " + msg, LogService.BIZ_ID, wt);
}
}
}
diff --git a/fizz-core/src/main/java/we/filter/FlowControlFilter.java b/fizz-core/src/main/java/we/filter/FlowControlFilter.java
index 90481e1..fcda08f 100644
--- a/fizz-core/src/main/java/we/filter/FlowControlFilter.java
+++ b/fizz-core/src/main/java/we/filter/FlowControlFilter.java
@@ -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 (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);
+ if (rateLimitConfig.service == null && rateLimitConfig.path == null) {
+ } else if (rateLimitConfig.path == null) {
+ String ip = ResourceRateLimitConfig.getIp(prev);
+ if (ip == null) {
+ something4(resourceConfigs, null, rateLimitConfig.ip, null);
+ }
} else {
- ip = ResourceRateLimitConfig.getIp(prevPrev);
- if (ip == null) {
- something4(resourceConfigs, null, rateLimitConfig.ip, null);
- }
+ String ip = ResourceRateLimitConfig.getIp(prev);
+ if (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);
+ }
+ }
+ }
}
- }
}
}
}
diff --git a/fizz-core/src/main/java/we/stats/ratelimit/ResourceRateLimitConfig.java b/fizz-core/src/main/java/we/stats/ratelimit/ResourceRateLimitConfig.java
index 039b6e2..464f065 100644
--- a/fizz-core/src/main/java/we/stats/ratelimit/ResourceRateLimitConfig.java
+++ b/fizz-core/src/main/java/we/stats/ratelimit/ResourceRateLimitConfig.java
@@ -98,9 +98,11 @@ public class ResourceRateLimitConfig {
}
public void setResource(String r) {
- resource = r;
- if (!resource.equals(NODE)) {
- service = resource;
+ if (StringUtils.isNotBlank(r)) {
+ resource = r;
+ 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) {
if (StringUtils.isNotBlank(p)) {
path = p;
diff --git a/fizz-plugin/pom.xml b/fizz-plugin/pom.xml
index 8591649..6079cba 100644
--- a/fizz-plugin/pom.xml
+++ b/fizz-plugin/pom.xml
@@ -5,7 +5,7 @@
fizz-gateway-community
com.fizzgate
- 2.2.0-beta5
+ 2.2.0-beta6
../pom.xml
4.0.0
diff --git a/fizz-spring-boot-starter/pom.xml b/fizz-spring-boot-starter/pom.xml
index f9860b0..37a19b0 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-beta5
+ 2.2.0-beta6
../pom.xml
4.0.0
diff --git a/pom.xml b/pom.xml
index 10f503a..7f8c28b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
fizz-gateway-community
${project.artifactId}
fizz gateway community
- 2.2.0-beta5
+ 2.2.0-beta6
pom
fizz-common