MrBird 5 anos atrás
pai
commit
52b10a9034

+ 3 - 3
febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/entity/BlackList.java

@@ -17,8 +17,8 @@ import org.springframework.data.mongodb.core.mapping.Document;
 @AllArgsConstructor
 public class BlackList {
 
-    public static final String CLOSE = "0";
-    public static final String OPEN = "1";
+    public static final int CLOSE = 0;
+    public static final int OPEN = 1;
 
     public static final String METHOD_ALL = "all";
 
@@ -51,7 +51,7 @@ public class BlackList {
     /**
      * 状态,0关闭,1开启
      */
-    private Integer status;
+    private String status;
     /**
      * 规则创建时间
      */

+ 3 - 3
febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/entity/RateLimitRule.java

@@ -18,8 +18,8 @@ import org.springframework.data.mongodb.core.mapping.Document;
 @AllArgsConstructor
 public class RateLimitRule {
 
-    public static final String CLOSE = "0";
-    public static final String OPEN = "1";
+    public static final int CLOSE = 0;
+    public static final int OPEN = 1;
 
     public static final String METHOD_ALL = "all";
 
@@ -52,7 +52,7 @@ public class RateLimitRule {
     /**
      * 状态,0关闭,1开启
      */
-    private Integer status;
+    private String status;
     /**
      * 规则创建时间
      */

+ 3 - 3
febs-gateway/src/main/java/cc/mrbird/febs/gateway/enhance/service/impl/RouteEnhanceServiceImpl.java

@@ -164,7 +164,7 @@ public class RouteEnhanceServiceImpl implements RouteEnhanceService {
     private void doBlackListCheck(AtomicBoolean forbid, Set<Object> blackList, URI uri, String requestMethod) {
         for (Object o : blackList) {
             BlackList b = JSONObject.parseObject(o.toString(), BlackList.class);
-            if (pathMatcher.match(b.getRequestUri(), uri.getPath()) && BlackList.OPEN.equals(b.getStatus())) {
+            if (pathMatcher.match(b.getRequestUri(), uri.getPath()) && BlackList.OPEN == Integer.parseInt(b.getStatus())) {
                 if (BlackList.METHOD_ALL.equalsIgnoreCase(b.getRequestMethod())
                         || StringUtils.equalsIgnoreCase(requestMethod, b.getRequestMethod())) {
                     if (StringUtils.isNotBlank(b.getLimitFrom()) && StringUtils.isNotBlank(b.getLimitTo())) {
@@ -184,8 +184,8 @@ public class RouteEnhanceServiceImpl implements RouteEnhanceService {
 
     private Mono<Void> doRateLimitCheck(AtomicBoolean limit, RateLimitRule rule, URI uri,
                                         String requestIp, String requestMethod, ServerHttpResponse response) {
-        boolean isRateLimitRuleHit = RateLimitRule.OPEN.equals(rule.getStatus())
-                && (RateLimitRule.METHOD_ALL.equalsIgnoreCase(rule.getRequestMethod())
+        boolean isRateLimitRuleHit = RateLimitRule.OPEN == Integer.parseInt(rule.getStatus())
+                &&(RateLimitRule.METHOD_ALL.equalsIgnoreCase(rule.getRequestMethod())
                 || StringUtils.equalsIgnoreCase(requestMethod, rule.getRequestMethod()));
         if (isRateLimitRuleHit) {
             if (StringUtils.isNotBlank(rule.getLimitFrom()) && StringUtils.isNotBlank(rule.getLimitTo())) {