Browse Source

作者回来了

weifengwu 7 months ago
parent
commit
eb58745398

+ 5 - 0
config/config-core/pom.xml

@@ -21,6 +21,11 @@
             <artifactId>snakeyaml</artifactId>
             <version>1.28</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>1.7.32</version>
+        </dependency>
     </dependencies>
 
 </project>

+ 0 - 1
config/config-core/src/main/java/com/jd/platform/jlog/core/ClientHandler.java

@@ -2,7 +2,6 @@ package com.jd.platform.jlog.core;
 
 import com.jd.platform.jlog.common.handler.CompressHandler;
 import com.jd.platform.jlog.common.handler.CompressHandler.Outcome;
-import com.jd.platform.jlog.common.handler.ExtractHandler;
 
 import java.util.Map;
 

+ 0 - 1
config/config-core/src/main/java/com/jd/platform/jlog/core/ClientHandlerBuilder.java

@@ -1,7 +1,6 @@
 package com.jd.platform.jlog.core;
 
 import com.jd.platform.jlog.common.handler.CompressHandler;
-import com.jd.platform.jlog.common.handler.ExtractHandler;
 import com.jd.platform.jlog.common.handler.TagConfig;
 
 /**

+ 7 - 20
common/src/main/java/com/jd/platform/jlog/common/handler/ExtractHandler.java → config/config-core/src/main/java/com/jd/platform/jlog/core/ExtractHandler.java

@@ -1,22 +1,21 @@
-package com.jd.platform.jlog.common.handler;
+package com.jd.platform.jlog.core;
 
-import com.alibaba.fastjson.JSON;
+import com.jd.platform.jlog.common.handler.TagConfig;
 import com.jd.platform.jlog.common.utils.CollectionUtil;
 import com.jd.platform.jlog.common.utils.ConfigUtil;
 import com.jd.platform.jlog.common.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static com.jd.platform.jlog.common.constant.Constant.EXTRACT_MIN_LEN;
-import static com.jd.platform.jlog.common.constant.Constant.TAG_NORMAL_KEY;
-import static com.jd.platform.jlog.common.constant.Constant.TAG_NORMAL_KEY_MAX_LEN;
+import static com.jd.platform.jlog.common.constant.Constant.*;
 import static com.jd.platform.jlog.common.handler.CollectMode.*;
-import static com.jd.platform.jlog.common.handler.CollectMode.E_LOG;
-import static com.jd.platform.jlog.common.handler.CollectMode.E_REQ;
 import static com.jd.platform.jlog.common.utils.ConfigUtil.RANDOM;
 
 /**
@@ -204,16 +203,4 @@ public class ExtractHandler {
     static String str3 = "||a=1||eee||b=2";
     static String str4 = "||a=1||eee||b=2||";
 
-
-    public static void main(String[] args) {
-
-
-        //### INSTANCE:TagHandler{reqTags=[uid, url], logTags=[node, bizType],
-        // delimiter='|', delimiterLen=1, join='"="', pattern="", extract=41}
-        //### .content:|errno=val3||node=val4||这是随便的log|
-       System.out.println("msgByRegular1==> "+JSON.toJSONString(extractTest(str1)));
-      /*  System.out.println("msgByRegular2==> "+JSON.toJSONString(extractTest(str2)));
-        System.out.println("msgByRegular3==> "+JSON.toJSONString(extractTest(str3)));
-        System.out.println("msgByRegular4==> "+JSON.toJSONString(extractTest(str4)));*/
-    }
 }