修复等待时间

yzg-util-cloud/src/main/java/com/yanzuoguang/cloud/aop/log/LogFilter.java

+package com.yanzuoguang.cloud.aop.log;
+
+import java.util.List;
+
+/**
+ * 日志过滤
+ *
+ * @author 颜佐光
+ */
+public interface LogFilter {
+
+    /**
+     * 是否排除,排除后将不会再次过滤
+     *
+     * @param keys 关键字
+     * @return 是否排除
+     */
+    boolean logExpect(List<String> keys);
+
+    /**
+     * 过滤日志
+     *
+     * @param keys 关键字
+     * @return 是否过滤
+     */
+    boolean logFilter(List<String> keys);
+}

yzg-util-cloud/src/main/java/com/yanzuoguang/cloud/aop/log/LogFilterDefault.java

+package com.yanzuoguang.cloud.aop.log;
+
+import com.yanzuoguang.cloud.CloudConfig;
+import com.yanzuoguang.util.helper.StringHelper;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 日志默认过滤
+ *
+ * @author 颜佐光
+ */
+@Component
+public class LogFilterDefault implements LogFilter {
+
+    private final CloudConfig cloudConfig;
+
+    public LogFilterDefault(CloudConfig cloudConfig) {
+        this.cloudConfig = cloudConfig;
+    }
+
+    @Override
+    public boolean logExpect(List<String> keys) {
+        if (!StringHelper.isEmpty(this.cloudConfig.getLogNotFilter())) {
+            for (String key : keys) {
+                if (StringHelper.isEmpty(key)) {
+                    continue;
+                }
+                if (key.toLowerCase().matches(this.cloudConfig.getLogNotFilter())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean logFilter(List<String> keys) {
+        if (!StringHelper.isEmpty(this.cloudConfig.getLogFilter())) {
+            for (String key : keys) {
+                if (StringHelper.isEmpty(key)) {
+                    continue;
+                }
+                if (key.toLowerCase().matches(this.cloudConfig.getLogFilter())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}

yzg-util-cloud/src/main/java/com/yanzuoguang/cloud/aop/log/LogLocal.java

@@ -9,10 +9,7 @@ import com.yanzuoguang.util.vo.LogVo;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -27,6 +24,7 @@ public class LogLocal implements ThreadNext.Next, InitializingBean {
      */
     private final LogBase logBase;
     private final CloudConfig cloudConfig;
+    private final List<LogFilter> logFilters;
     /**
      * 超时状态
      */
@@ -37,9 +35,10 @@ public class LogLocal implements ThreadNext.Next, InitializingBean {
      */
     protected volatile Map<String, Timeout<LogVo>> cache = new ConcurrentHashMap<>();
 
-    public LogLocal(LogBase logBase, CloudConfig cloudConfig) {
+    public LogLocal(LogBase logBase, CloudConfig cloudConfig, List<LogFilter> logFilters) {
         this.logBase = logBase;
         this.cloudConfig = cloudConfig;
+        this.logFilters = logFilters;
     }
 
     /**
@@ -152,25 +151,18 @@ public class LogLocal implements ThreadNext.Next, InitializingBean {
     public boolean isLog(String... keys) {
         List<String> list = new ArrayList<>();
         list.add(this.cloudConfig.getApplicationName());
-        for (String item : keys) {
-            list.add(item);
-        }
-        // 是否排除
-        boolean notFilter = false;
-        // 是否过滤
-        boolean filter = false;
-        for (String item : list) {
-            if (item == null) {
-                continue;
+        list.addAll(Arrays.asList(keys));
+        for (LogFilter k : logFilters) {
+            if (k.logExpect(list)) {
+                return true;
             }
-            String lower = item.toLowerCase();
-            notFilter = notFilter || lower.matches(this.cloudConfig.getLogNotFilter());
-            filter = filter || lower.matches(this.cloudConfig.getLogFilter());
         }
-        if (notFilter) {
+        for (LogFilter k : logFilters) {
+            if (k.logFilter(list)) {
                 return false;
             }
-        return filter;
+        }
+        return true;
     }
 
     /**