Release v2.2.0-beta6

fizz-bootstrap/pom.xml

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

fizz-common/pom.xml

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

fizz-core/pom.xml

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

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);
                         }
                     }
                 }

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);
+										}
+									}
+								}
 					}
-				}
 			}
 		}
 	}

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;

fizz-plugin/pom.xml

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

fizz-spring-boot-starter/pom.xml

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

pom.xml

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