<dev>

1. 规范部分代码

src/main/java/com/zorkdta/tools/MockProduct.java

@@ -62,7 +62,7 @@ public class MockProduct {
         zorkData.setNormalFields(normalFields);
         String msg = JSON.toJSONString(zorkData);
         System.out.println(msg);
-        AvroSerializer avroSerializer = AvroSerializerFactory.getLogAvorSerializer();
+        AvroSerializer avroSerializer = AvroSerializerFactory.getLogAvroSerializer();
         byte[] bytes = avroSerializer.serializingLog(logTypeName, timestamp, source, offset, dimensions, measures, normalFields);
         return bytes;
     }
@@ -96,7 +96,7 @@ public class MockProduct {
         zorkData.setNormalFields(normalFields);
         String msg = JSON.toJSONString(zorkData);
         System.out.println(msg);
-        AvroSerializer avroSerializer = AvroSerializerFactory.getLogAvorSerializer();
+        AvroSerializer avroSerializer = AvroSerializerFactory.getLogAvroSerializer();
         byte[] bytes = avroSerializer.serializingLog(logTypeName, timestamp, source, offset, dimensions, measures, normalFields);
         return bytes;
     }

src/main/java/com/zorkdta/tools/avro/AvroDeserializer.java

@@ -13,11 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * todo
- *
- * @version V1.0
- * @Author XieSen
- * @Date 2019/4/3 11:00.
+ * @author DeleMing
  */
 public class AvroDeserializer {
     private static final Logger LOGGER = LoggerFactory.getLogger(AvroDeserializer.class);

src/main/java/com/zorkdta/tools/avro/AvroDeserializerFactory.java

 package com.zorkdta.tools.avro;
 
 /**
- * todo
- *
- * @version V1.0
- * @Author XieSen
- * @Date 2019/4/3 11:01.
+ * @author DeleMing
  */
 public class AvroDeserializerFactory {
     private static AvroDeserializer logs = null;

src/main/java/com/zorkdta/tools/avro/AvroSerializer.java

@@ -18,11 +18,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * todo
- *
- * @version V1.0
- * @Author XieSen
- * @Date 2019/4/3 11:01.
+ * @author DeleMing
  */
 public class AvroSerializer {
     public JSONObject jsonObject;

src/main/java/com/zorkdta/tools/avro/AvroSerializerFactory.java

 package com.zorkdta.tools.avro;
 
 /**
- * todo
- *
- * @version V1.0
- * @Author XieSen
- * @Date 2019/4/3 11:05.
+ * @author DeleMing
  */
 public class AvroSerializerFactory {
     private static AvroSerializer metricMetadata = null;
     private static AvroSerializer logMetadata = null;
 
-    public static AvroSerializer getLogAvorSerializer() {
+    public static AvroSerializer getLogAvroSerializer() {
         if (logMetadata == null) {
             logMetadata = new AvroSerializer(LogAvroMacroDef.metadata);
         }
@@ -19,7 +15,7 @@ public class AvroSerializerFactory {
     }
 
 
-    public static AvroSerializer getMetricAvorSerializer() {
+    public static AvroSerializer getMetricAvroSerializer() {
         if (metricMetadata == null) {
             metricMetadata = new AvroSerializer(MetricAvroMacroDef.metadata);
         }

src/main/java/com/zorkdta/tools/avro/LogAvroMacroDef.java

 package com.zorkdta.tools.avro;
 
 /**
- * todo
- *
- * @version V1.0
- * @Author XieSen
- * @Date 2019/4/3 10:59.
+ * @author DeleMing
  */
 public class LogAvroMacroDef {
     public static String metadata = "{\n" +

src/main/java/com/zorkdta/tools/avro/MetricAvroMacroDef.java

 package com.zorkdta.tools.avro;
 
 /**
- * todo
- *
- * @version V1.0
- * @Author XieSen
- * @Date 2019/4/3 11:00.
+ * @author DeleMing
  */
 public class MetricAvroMacroDef {
     public static String metadata = "{\n" +

src/main/java/com/zorkdta/tools/mock/KafkaProducerUtil.java

@@ -7,15 +7,11 @@ import org.apache.kafka.clients.producer.ProducerRecord;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.security.auth.login.Configuration;
 import java.util.Map;
 import java.util.Properties;
 
 /**
- * @author shaojiao
- * Date: 2020/1/8
- * Time: 10:12
- * Description: 当前kafkaUtil适用于1.1.0版本
+ * @author DeleMing
  */
 @Data
 public class KafkaProducerUtil {
@@ -149,7 +145,7 @@ public class KafkaProducerUtil {
     public void sendMetric(String metricSetName, String timestamp, Map<String, String> dimensions,
                            Map<String, Double> metrics, String topic) {
         try {
-            byte[] bytes = AvroSerializerFactory.getMetricAvorSerializer().serializingMetric(metricSetName, timestamp,
+            byte[] bytes = AvroSerializerFactory.getMetricAvroSerializer().serializingMetric(metricSetName, timestamp,
                     dimensions, metrics);
             producer.send(new ProducerRecord<String, byte[]>(topic, null, bytes));
         } catch (Exception e) {
@@ -160,7 +156,7 @@ public class KafkaProducerUtil {
     public void sendLog(String topic, String logTypeName, String timestamp, String source, String offset,
                         Map<String, String> dimensions, Map<String, Double> metrics, Map<String, String> normalFields) {
         try {
-            byte[] bytes = AvroSerializerFactory.getLogAvorSerializer().serializingLog(logTypeName, timestamp, source,
+            byte[] bytes = AvroSerializerFactory.getLogAvroSerializer().serializingLog(logTypeName, timestamp, source,
                     offset, dimensions, metrics, normalFields);
             producer.send(new ProducerRecord<String, byte[]>(topic, null, bytes));
         } catch (Exception e) {

src/main/java/com/zorkdta/tools/mock/MockConnectJsonData.java

@@ -12,9 +12,7 @@ import java.util.Properties;
 import java.util.concurrent.Future;
 
 /**
- * 生产数据(功能正常)
- * @author zhangwei (<a href="mailto:zhangwei@zork.com.cn">zhangwei@zork.com.cn</a>)
- * @date 2020-06-15 14:36
+ * @author DeleMing
  */
 public class MockConnectJsonData {
     private static String topic;

src/main/java/com/zorkdta/tools/mock/MockFilebeatDataToKafka.java

@@ -11,8 +11,7 @@ import java.util.Properties;
 import java.util.concurrent.ExecutionException;
 
 /**
- * @author: LiaoMingtao
- * @date: 2020/6/19
+ * @author DeleMing
  */
 public class MockFilebeatDataToKafka {
 

src/main/java/com/zorkdta/tools/mock/MockFlinkxJson.java

@@ -10,10 +10,7 @@ import java.util.Properties;
 import java.util.concurrent.ExecutionException;
 
 /**
- * @description:
- * @author: 谢森
- * @Email xiesen@zork.com.cn
- * @time: 2020/1/17 0017 10:57
+ * @author DeleMing
  */
 public class MockFlinkxJson {
     //    private static String topic = "flinkx_json";

src/main/java/com/zorkdta/tools/mock/MockKafkaConnect.java

@@ -14,10 +14,7 @@ import java.util.Properties;
 import java.util.concurrent.ExecutionException;
 
 /**
- * @description:
- * @author: 谢森
- * @Email xiesen@zork.com.cn
- * @time: 2020/1/17 0017 10:57
+ * @author DeleMing
  */
 public class MockKafkaConnect {
     //    private static String topic = "test";
@@ -57,7 +54,7 @@ public class MockKafkaConnect {
 
 
 
-        AvroSerializer avroSerializer = AvroSerializerFactory.getLogAvorSerializer();
+        AvroSerializer avroSerializer = AvroSerializerFactory.getLogAvroSerializer();
         byte[] bytes = avroSerializer.serializingLog(logTypeName, timestamp, source, offset, dimensions, measures, normalFields);
         return bytes;
     }
@@ -105,7 +102,7 @@ public class MockKafkaConnect {
             jsonObject.put("normalFields", normalFields);
             System.out.println(jsonObject.toJSONString());
 
-            AvroSerializer avroSerializer = AvroSerializerFactory.getLogAvorSerializer();
+            AvroSerializer avroSerializer = AvroSerializerFactory.getLogAvroSerializer();
             byte[] bytes = avroSerializer.serializingLog(logTypeName, timestamp, source, offset, dimensions, measures, normalFields);
 
             send(topic, bytes);

src/main/java/com/zorkdta/tools/mock/MockKafkaConnectAvro.java

@@ -8,10 +8,7 @@ import java.util.Map;
 import java.util.Properties;
 
 /**
- * @description:
- * @author: 谢森
- * @Email xiesen@zork.com.cn
- * @time: 2020/1/17 0017 10:57
+ * @author DeleMing
  */
 public class MockKafkaConnectAvro {
     private static long getSize(String propertiesName) throws Exception {

src/main/java/com/zorkdta/tools/mock/MockKafkaConnectAvroTest.java

@@ -12,10 +12,7 @@ import java.util.Map;
 import java.util.Properties;
 
 /**
- * @description:
- * @author: 谢森
- * @Email xiesen@zork.com.cn
- * @time: 2020/1/17 0017 10:57
+ * @author DeleMing
  */
 public class MockKafkaConnectAvroTest {
 
@@ -58,7 +55,7 @@ public class MockKafkaConnectAvroTest {
             normalFields.put("message", "成功处理");
             normalFields.put("id", String.valueOf(i));
 
-            AvroSerializer avroSerializer = AvroSerializerFactory.getLogAvorSerializer();
+            AvroSerializer avroSerializer = AvroSerializerFactory.getLogAvroSerializer();
             byte[] bytes = avroSerializer.serializingLog(logTypeName, timestamp, source, offset, dimensions, measures, normalFields);
 
             ProducerRecord<String, byte[]> producerRecord = new ProducerRecord<String, byte[]>(

src/main/java/com/zorkdta/tools/mock/MockKafkaConnectJson.java

@@ -9,10 +9,7 @@ import com.zorkdta.tools.utils.StringUtil;
 import java.util.Properties;
 
 /**
- * @description:
- * @author: 谢森
- * @Email xiesen@zork.com.cn
- * @time: 2020/1/17 0017 10:57
+ * @author DeleMing
  */
 public class MockKafkaConnectJson {
     private static long getSize(String propertiesName) throws Exception {

src/main/java/com/zorkdta/tools/mock/MockMetricEvent.java

@@ -12,10 +12,7 @@ import java.util.Properties;
 import java.util.concurrent.ExecutionException;
 
 /**
- * @description:
- * @author: 谢森
- * @Email xiesen@zork.com.cn
- * @time: 2020/1/16 0016 9:28
+ * @author DeleMing
  */
 public class MockMetricEvent {
     private static String topic = "flink-metric";

src/main/java/com/zorkdta/tools/mock/MockStreamxJson.java

@@ -10,10 +10,7 @@ import java.util.Date;
 import java.util.Properties;
 
 /**
- * @description:
- * @author: 谢森
- * @Email xiesen@zork.com.cn
- * @time: 2020/1/17 0017 10:57
+ * @author DeleMing
  */
 public class MockStreamxJson {
     private static String topic = "streamx_json_test";

src/main/java/com/zorkdta/tools/mock/MockStreamxJson1.java

@@ -9,10 +9,7 @@ import java.util.Properties;
 import java.util.Random;
 
 /**
- * @description:
- * @author: 谢森
- * @Email xiesen@zork.com.cn
- * @time: 2020/1/17 0017 10:57
+ * @author DeleMing
  */
 public class MockStreamxJson1 {
     private static String topic = "streamx_json";

src/main/java/com/zorkdta/tools/mock/MockZorkMetric.java

@@ -12,11 +12,7 @@ import java.util.Properties;
 import java.util.Random;
 
 /**
- * @Description
- * @className top.xiesen.mock.kafka.mock.MockZorkMetric
- * @Author 谢森
- * @Email xiesen@zork.com.cn
- * @Date 2020/3/15 18:15
+ * @author DeleMing
  */
 public class MockZorkMetric {
     private static String topic = "zorkdata_metric";
@@ -49,7 +45,7 @@ public class MockZorkMetric {
         Map<String, Double> metrics = new HashMap<>();
         metrics.put("cpu_usage", random.nextDouble());
 
-        AvroSerializer metricSerializer = AvroSerializerFactory.getMetricAvorSerializer();
+        AvroSerializer metricSerializer = AvroSerializerFactory.getMetricAvroSerializer();
         byte[] bytes = metricSerializer.serializingMetric(metricSetName, timestamp, dimensions, metrics);
         return bytes;
     }

src/main/java/com/zorkdta/tools/utils/CustomerProducer.java

@@ -3,7 +3,6 @@ package com.zorkdta.tools.utils;
 import com.zorkdta.tools.avro.AvroSerializerFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.Producer;
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.clients.producer.ProducerRecord;
 
@@ -102,7 +101,7 @@ public class CustomerProducer {
                         Map<String, String> dimensions, Map<String, Double> metrics, Map<String, String> normalFields) throws ExecutionException, InterruptedException {
         try {
             long l1 = System.currentTimeMillis();
-            byte[] bytes = AvroSerializerFactory.getLogAvorSerializer().serializingLog(logTypeName, timestamp, source,
+            byte[] bytes = AvroSerializerFactory.getLogAvroSerializer().serializingLog(logTypeName, timestamp, source,
                     offset, dimensions, metrics, normalFields);
             long l2 = System.currentTimeMillis();
 //            System.out.println("数据序列化需要的时间: " + (l2 - l1) + "ms");

src/main/java/com/zorkdta/tools/utils/DateUtil.java

@@ -7,6 +7,9 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+/**
+ * @author DeleMing
+ */
 public class DateUtil {
     private static DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS+08:00");
 

src/main/java/com/zorkdta/tools/utils/JConsumerMutil.java

@@ -16,12 +16,9 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+
 /**
- * @Description
- * @className top.xiesen.mock.kafka.utils.JConsumerMutil
- * @Author 谢森
- * @Email xiesen@zork.com.cn
- * @Date 2020/4/19 23:05
+ * @author DeleMing
  */
 public class JConsumerMutil {
     private final static Logger log = LoggerFactory.getLogger(JConsumerMutil.class);

src/main/java/com/zorkdta/tools/utils/JProducer.java

@@ -9,13 +9,8 @@ import java.util.Date;
 import java.util.Properties;
 
 /**
- * @Description 单线程实现一个 kafka 生产者客户端
- * @className top.xiesen.mock.kafka.utils.JProducer
- * @Author 谢森
- * @Email xiesen@zork.com.cn
- * @Date 2020/4/19 21:22
+ * @author DeleMing
  */
-
 public class JProducer extends Thread {
     private final Logger log = LoggerFactory.getLogger(JProducer.class);
 

src/main/java/com/zorkdta/tools/utils/JProducerThread.java

@@ -11,11 +11,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 /**
- * @Description 实现一个多线程生产者应用客户端
- * @className top.xiesen.mock.kafka.utils.JProducerThread
- * @Author 谢森
- * @Email xiesen@zork.com.cn
- * @Date 2020/4/19 22:50
+ * @author DeleMing
  */
 public class JProducerThread extends Thread {
     private final Logger log = LoggerFactory.getLogger(JProducerThread.class);

src/main/java/com/zorkdta/tools/utils/ProducerPool.java

@@ -4,11 +4,7 @@ import java.io.Closeable;
 import java.io.IOException;
 
 /**
- * @Description
- * @className top.xiesen.mock.kafka.utils.ProducerPool
- * @Author 谢森
- * @Email xiesen@zork.com.cn
- * @Date 2020/4/2 9:39
+ * @author DeleMing
  */
 public class ProducerPool implements Closeable {
 

src/main/java/com/zorkdta/tools/utils/PropertiesUtil.java

@@ -7,11 +7,7 @@ import java.io.InputStreamReader;
 import java.util.Properties;
 
 /**
- * @Description
- * @className top.xiesen.mock.kafka.utils.PropertiesUtil
- * @Author 谢森
- * @Email xiesen@zork.com.cn
- * @Date 2020/4/2 9:41
+ * @author DeleMing
  */
 public class PropertiesUtil {
     /**

src/main/java/com/zorkdta/tools/utils/StringUtil.java

@@ -10,11 +10,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * @Description
- * @className top.xiesen.mock.kafka.utils.StringUtil
- * @Author 谢森
- * @Email xiesen@zork.com.cn
- * @Date 2020/4/2 9:50
+ * @author DeleMing
  */
 public class StringUtil {
     public static void main(String[] args) {
@@ -102,8 +98,7 @@ public class StringUtil {
             return true;
         }
         str = str.trim();
-
-        return str.equals("") || str.equalsIgnoreCase("NULL");
+        return "".equals(str) || "NULL".equalsIgnoreCase(str);
     }
 
     public static boolean isDouble(String str) {