更新代码结构

src/main/java/com/zorkdata/tools/kafka/CommonProducer.java

@@ -2,27 +2,14 @@ package com.zorkdata.tools.kafka;
 
 import org.apache.kafka.clients.producer.KafkaProducer;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
+/**
+ * @author MSI-Gaming
+ */
 public class CommonProducer {
 
-    public String servers = "kafka-data1:9092,kafka-data2:9092,kafka-data2:9092";
-    public int batchSize = 1;
-    public Producer testProducer;
-    public String metricTopic;
-    public String errorLogTopic;
-    public String errorMetricTopic;
-    public String alarmTopic;
-    public String defaultLogTopic;
-    public List<String> cep_change_event_logtypename = new ArrayList<String>();
-    public String cep_change_event_topic;
-    public static Map<String, String> APPSYSTEM_TOPIC_MAP = new HashMap<String, String>();
-    public static Map<String, Map<String, String>> APPSYSTEM_SERVICE_TOPIC_MAP = new HashMap<String, Map<String, String>>();
+    private static KafkaProducer<String, byte[]> producerByte;
+    private static KafkaProducer<String, String> producerString;
+
 
-    static int partition = 6;
-    private static KafkaProducer<String, byte[]> producer;
-    private static KafkaProducer<String, String> noAvroProducer;
 }

src/main/java/com/zorkdata/tools/kafka/AvroDeserializer.java → src/main/java/com/zorkdata/tools/oldkafka/AvroDeserializer.java

-package com.zorkdata.tools.kafka;
+package com.zorkdata.tools.oldkafka;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/zorkdata/tools/kafka/AvroDeserializerFactory.java → src/main/java/com/zorkdata/tools/oldkafka/AvroDeserializerFactory.java

-package com.zorkdata.tools.kafka;
+package com.zorkdata.tools.oldkafka;
 
 /**
  * Created by zhuzhigang on 16/2/29.

src/main/java/com/zorkdata/tools/kafka/AvroMacroDef.java → src/main/java/com/zorkdata/tools/oldkafka/AvroMacroDef.java

-package com.zorkdata.tools.kafka;
+package com.zorkdata.tools.oldkafka;
 
 /**
  * @author zhuzhigang

src/main/java/com/zorkdata/tools/kafka/AvroSerializer.java → src/main/java/com/zorkdata/tools/oldkafka/AvroSerializer.java

-package com.zorkdata.tools.kafka;
+package com.zorkdata.tools.oldkafka;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/zorkdata/tools/kafka/AvroSerializerFactory.java → src/main/java/com/zorkdata/tools/oldkafka/AvroSerializerFactory.java

-package com.zorkdata.tools.kafka;
+package com.zorkdata.tools.oldkafka;
 
 /**
  * @author zhuzhigang

src/main/java/com/zorkdata/tools/kafka/Config.java → src/main/java/com/zorkdata/tools/oldkafka/Config.java

-package com.zorkdata.tools.kafka;
+package com.zorkdata.tools.oldkafka;
 
 import com.zorkdata.tools.utils.PropertiesUtil;
 

src/main/java/com/zorkdata/tools/kafka/LogAvroMacroDef.java → src/main/java/com/zorkdata/tools/oldkafka/LogAvroMacroDef.java

-package com.zorkdata.tools.kafka;
+package com.zorkdata.tools.oldkafka;
 
 /**
  * @author zhuzhigang

src/main/java/com/zorkdata/tools/kafka/Producer.java → src/main/java/com/zorkdata/tools/oldkafka/Producer.java

-package com.zorkdata.tools.kafka;
+package com.zorkdata.tools.oldkafka;
 
 
 import org.apache.kafka.clients.producer.KafkaProducer;

src/main/java/com/zorkdata/tools/kafka/ProducerPool.java → src/main/java/com/zorkdata/tools/oldkafka/ProducerPool.java

-package com.zorkdata.tools.kafka;
+package com.zorkdata.tools.oldkafka;
 
 import java.io.Closeable;
 import java.io.IOException;

src/main/java/com/zorkdata/tools/oldmock/LogAvroProducer.java

@@ -2,8 +2,8 @@ package com.zorkdata.tools.oldmock;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
-import com.zorkdata.tools.kafka.Producer;
-import com.zorkdata.tools.kafka.ProducerPool;
+import com.zorkdata.tools.oldkafka.Producer;
+import com.zorkdata.tools.oldkafka.ProducerPool;
 import com.zorkdata.tools.utils.StringUtil;
 
 import java.util.Date;

src/main/java/com/zorkdata/tools/oldmock/MockFilebeatDataToKafka.java

 package com.zorkdata.tools.oldmock;
 
 import com.alibaba.fastjson.JSONObject;
-import com.zorkdata.tools.kafka.Producer;
-import com.zorkdata.tools.kafka.ProducerPool;
+import com.zorkdata.tools.oldkafka.Producer;
+import com.zorkdata.tools.oldkafka.ProducerPool;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.clients.producer.ProducerRecord;
 import org.apache.kafka.common.serialization.StringSerializer;

src/main/java/com/zorkdata/tools/oldmock/MockStreamxLogAvro.java

 package com.zorkdata.tools.oldmock;
 
 import com.alibaba.fastjson.JSONObject;
-import com.zorkdata.tools.kafka.Producer;
-import com.zorkdata.tools.kafka.ProducerPool;
+import com.zorkdata.tools.oldkafka.Producer;
+import com.zorkdata.tools.oldkafka.ProducerPool;
 import com.zorkdata.tools.utils.DateUtil;
 import com.zorkdata.tools.utils.PropertiesUtil;
 import com.zorkdata.tools.utils.StringUtil;

src/main/java/com/zorkdata/tools/oldmock/MockStreamxMetricAvro.java

 package com.zorkdata.tools.oldmock;
 
 import com.alibaba.fastjson.JSONObject;
-import com.zorkdata.tools.kafka.Producer;
-import com.zorkdata.tools.kafka.ProducerPool;
+import com.zorkdata.tools.oldkafka.Producer;
+import com.zorkdata.tools.oldkafka.ProducerPool;
 import com.zorkdata.tools.utils.DateUtil;
 import com.zorkdata.tools.utils.PropertiesUtil;
 import com.zorkdata.tools.utils.StringUtil;