style: modify some content of logs

5 files changed, 20 insertions, 6 deletions

diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/IocDarkWebUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/IocDarkWebUtils.java
index 87e251d..86d0e68 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/IocDarkWebUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/IocDarkWebUtils.java
@@ -67,7 +67,7 @@ public class IocDarkWebUtils {
 
     public static void updateInternalRuleId(Long key, RuleInfo ruleInfo) {
         tagRuleIdMap.put(ruleInfo.getName(), ruleInfo.getRuleId());
-        System.out.println("ioc dark web update rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
+        System.out.println(TimeUtils.getCurrentTime() + ": ioc dark web update rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
     }
 
     public static void removeInternalRuleId(Long key, RuleInfo ruleInfo) {
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/IocMalwareUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/IocMalwareUtils.java
index ee6574a..3894b69 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/IocMalwareUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/IocMalwareUtils.java
@@ -83,7 +83,7 @@ public class IocMalwareUtils {
 
     public static void updateInternalRuleId(Long key, RuleInfo ruleInfo) {
         tagRuleIdMap.put(ruleInfo.getName(), ruleInfo.getRuleId());
-        System.out.println("ioc malware update rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
+        System.out.println(TimeUtils.getCurrentTime() + ": ioc malware update rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
     }
 
     public static void removeInternalRuleId(Long key, RuleInfo ruleInfo) {
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/KnowledgeUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/KnowledgeUtils.java
index c8b65d6..67af672 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/KnowledgeUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/KnowledgeUtils.java
@@ -20,7 +20,6 @@ import java.util.*;
 public class KnowledgeUtils {
 
     private static String KNOWLEDGE_EXPR = null;
-    private static SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     private static Map<String, String> knowLedgeFileSha256 = new HashMap<>();
     private static Map<Long, String> ipTagKnowLedgeFileSha256 = new HashMap<>();
@@ -35,8 +34,7 @@ public class KnowledgeUtils {
     }
 
     public static void processNacosInfo(String nacosInfo) {
-        String currentDate = formatter.format(new Date());
-        System.out.println(currentDate + ": receive nacos config:" + nacosInfo);
+        System.out.println(TimeUtils.getCurrentTime() + ": receive nacos config:" + nacosInfo);
         ArrayList<Map<String, Object>> metaList = JsonPath.parse(nacosInfo).read(KNOWLEDGE_EXPR);
         System.out.println("resolve " + metaList.size() + " metadata from the config info pushed by nacos");
         loadKnowledge(metaList);
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/TagUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/TagUtils.java
index cda1cf1..47e9dad 100644
--- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/TagUtils.java
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/TagUtils.java
@@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStreamReader;
+import java.sql.Time;
 import java.util.*;
 
 public class TagUtils {
@@ -213,7 +214,7 @@ public class TagUtils {
     }
 
     public static void updateInternalRuleId(Long key, RuleInfo ruleInfo) {
-        System.out.println("tagUtils update rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
+        System.out.println(TimeUtils.getCurrentTime() + ": tagUtils update rule: " + ruleInfo.getName() + ":" + ruleInfo.getRuleId());
         long ruleId = ruleInfo.getRuleId();
         RuleInfo.RuleConfig ruleConfig = ruleInfo.getRuleConfig();
         if (ruleConfig instanceof RuleInfo.IndicatorMatchConfig) {
diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/TimeUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/TimeUtils.java
new file mode 100644
index 0000000..faccd8e
--- /dev/null
+++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/TimeUtils.java
@@ -0,0 +1,15 @@
+package com.zdjizhi.etl.utils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class TimeUtils {
+
+    private static final SimpleDateFormat FORMATTER = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+
+    public static synchronized String getCurrentTime() {
+        return FORMATTER.format(new Date());
+    }
+
+}