修复EAL4版本v3.21.03.16-eal4

10 files changed, 67 insertions, 71 deletions

diff --git a/pom.xml b/pom.xml
index 33fc727..bb712a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,25 +12,25 @@
 
     <repositories>
 
-        <!--<repository>-->
-            <!--<id>nexus</id>-->
-            <!--<name>Team Nexus Repository</name>-->
-            <!--<url>http://192.168.40.125:8099/content/groups/public</url>-->
-        <!--</repository>-->
+        <repository>
+            <id>nexus</id>
+            <name>Team Nexus Repository</name>
+            <url>http://192.168.40.125:8099/content/groups/public</url>
+        </repository>
 
 
-        <!--<repository>-->
-            <!--<id>maven-ali</id>-->
-            <!--<url>http://maven.aliyun.com/nexus/content/groups/public/</url>-->
-            <!--<releases>-->
-                <!--<enabled>true</enabled>-->
-            <!--</releases>-->
-            <!--<snapshots>-->
-                <!--<enabled>true</enabled>-->
-                <!--<updatePolicy>always</updatePolicy>-->
-                <!--<checksumPolicy>fail</checksumPolicy>-->
-            <!--</snapshots>-->
-        <!--</repository>-->
+        <repository>
+            <id>maven-ali</id>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>fail</checksumPolicy>
+            </snapshots>
+        </repository>
 
     </repositories>
 
@@ -51,7 +51,7 @@
                             <transformers>
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>cn.ac.iie.topology.LogSubscriberTopology</mainClass>
+                                    <mainClass>com.zdjizhi.topology.LogSubscriberTopology</mainClass>
                                 </transformer>
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
@@ -285,6 +285,12 @@
             </exclusions>
         </dependency>
 
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.5.2</version>
+        </dependency>
+
 
     </dependencies>
 </project>
diff --git a/src/main/java/cn/ac/iie/bolt/SubscriberIdBolt.java b/src/main/java/com/zdjizhi/bolt/SubscriberIdBolt.java
index 9f7598c..2306817 100644
--- a/src/main/java/cn/ac/iie/bolt/SubscriberIdBolt.java
+++ b/src/main/java/com/zdjizhi/bolt/SubscriberIdBolt.java
@@ -1,11 +1,12 @@
-package cn.ac.iie.bolt;
+package com.zdjizhi.bolt;
 
-import cn.ac.iie.common.SubscriberConfig;
-import cn.ac.iie.utils.TupleUtils;
-import cn.ac.iie.utils.hbase.PullHBaseUtils;
-import cn.ac.iie.utils.hbase.PushHBaseUtils;
+import com.zdjizhi.common.SubscriberConfig;
+import com.zdjizhi.utils.TupleUtils;
+import com.zdjizhi.utils.hbase.PullHBaseUtils;
+import com.zdjizhi.utils.hbase.PushHBaseUtils;
+import cn.hutool.log.Log;
+import cn.hutool.log.LogFactory;
 import org.apache.hadoop.hbase.client.*;
-import org.apache.log4j.Logger;
 import org.apache.storm.task.TopologyContext;
 import org.apache.storm.topology.BasicOutputCollector;
 import org.apache.storm.topology.OutputFieldsDeclarer;
@@ -18,7 +19,7 @@ import java.util.*;
  * @author qidaijie
  */
 public class SubscriberIdBolt extends BaseBasicBolt {
-    private static Logger logger = Logger.getLogger(SubscriberIdBolt.class);
+    private static final Log logger = LogFactory.get();
     private static Map<String, String> subIdMap;
     private List<Put> putList;
 
diff --git a/src/main/java/cn/ac/iie/common/SubscriberConfig.java b/src/main/java/com/zdjizhi/common/SubscriberConfig.java
index 5157e01..9dda69d 100644
--- a/src/main/java/cn/ac/iie/common/SubscriberConfig.java
+++ b/src/main/java/com/zdjizhi/common/SubscriberConfig.java
@@ -1,6 +1,6 @@
-package cn.ac.iie.common;
+package com.zdjizhi.common;
 
-import cn.ac.iie.utils.SubscriberConfigurations;
+import com.zdjizhi.utils.SubscriberConfigurations;
 
 import java.io.Serializable;
 
@@ -11,6 +11,7 @@ public class SubscriberConfig implements Serializable {
     private static final long serialVersionUID = -8326385159484059324L;
 
     public static final int LIST_SIZE_MAX = 5000;
+    public static final String MODEL = "remote";
 
     /***
      * kafka and system
diff --git a/src/main/java/cn/ac/iie/spout/CustomizedKafkaSpout.java b/src/main/java/com/zdjizhi/spout/CustomizedKafkaSpout.java
index 5d4619a..0d2b92b 100644
--- a/src/main/java/cn/ac/iie/spout/CustomizedKafkaSpout.java
+++ b/src/main/java/com/zdjizhi/spout/CustomizedKafkaSpout.java
@@ -1,10 +1,11 @@
-package cn.ac.iie.spout;
+package com.zdjizhi.spout;
 
-import cn.ac.iie.common.SubscriberConfig;
+import com.zdjizhi.common.SubscriberConfig;
+import cn.hutool.log.Log;
+import cn.hutool.log.LogFactory;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
-import org.apache.log4j.Logger;
 import org.apache.storm.spout.SpoutOutputCollector;
 import org.apache.storm.task.TopologyContext;
 import org.apache.storm.topology.OutputFieldsDeclarer;
@@ -13,7 +14,6 @@ import org.apache.storm.tuple.Fields;
 import org.apache.storm.tuple.Values;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
@@ -22,10 +22,10 @@ import java.util.Properties;
  */
 public class CustomizedKafkaSpout extends BaseRichSpout {
     private static final long serialVersionUID = 2934528972182398950L;
+    private static final Log logger = LogFactory.get();
     private KafkaConsumer<String, String> consumer;
     private SpoutOutputCollector collector = null;
     private TopologyContext context = null;
-    private final static Logger logger = Logger.getLogger(CustomizedKafkaSpout.class);
 
 
     private static Properties createConsumerConfig() {
diff --git a/src/main/java/cn/ac/iie/topology/LogSubscriberTopology.java b/src/main/java/com/zdjizhi/topology/LogSubscriberTopology.java
index 5a0c903..f11f4eb 100644
--- a/src/main/java/cn/ac/iie/topology/LogSubscriberTopology.java
+++ b/src/main/java/com/zdjizhi/topology/LogSubscriberTopology.java
@@ -1,21 +1,21 @@
-package cn.ac.iie.topology;
+package com.zdjizhi.topology;
 
-import cn.ac.iie.bolt.SubscriberIdBolt;
-import cn.ac.iie.common.SubscriberConfig;
-import cn.ac.iie.spout.CustomizedKafkaSpout;
+import com.zdjizhi.bolt.SubscriberIdBolt;
+import com.zdjizhi.common.SubscriberConfig;
+import com.zdjizhi.spout.CustomizedKafkaSpout;
+import cn.hutool.log.Log;
+import cn.hutool.log.LogFactory;
 import org.apache.storm.Config;
 import org.apache.storm.generated.AlreadyAliveException;
 import org.apache.storm.generated.AuthorizationException;
 import org.apache.storm.generated.InvalidTopologyException;
 import org.apache.storm.topology.TopologyBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * @author qidaijie
  */
 public class LogSubscriberTopology {
-    private static final Logger logger = LoggerFactory.getLogger(LogSubscriberTopology.class);
+    private static final Log logger = LogFactory.get();
     private final String topologyName;
     private final Config topologyConfig;
     private TopologyBuilder builder;
@@ -60,22 +60,22 @@ public class LogSubscriberTopology {
     }
 
     public static void main(String[] args) throws Exception {
-        LogSubscriberTopology csst = null;
+        LogSubscriberTopology logSubscriberTopology;
         boolean runLocally = true;
-        if (args.length >= 2 && "remote".equalsIgnoreCase(args[1])) {
+        if (args.length >= 2 && SubscriberConfig.MODEL.equalsIgnoreCase(args[1])) {
             runLocally = false;
-            csst = new LogSubscriberTopology(args[0]);
+            logSubscriberTopology = new LogSubscriberTopology(args[0]);
         } else {
-            csst = new LogSubscriberTopology();
+            logSubscriberTopology = new LogSubscriberTopology();
         }
-        csst.buildTopology();
+        logSubscriberTopology.buildTopology();
 
         if (runLocally) {
             logger.info("执行本地模式...");
-            csst.runLocally();
+            logSubscriberTopology.runLocally();
         } else {
             logger.info("执行远程部署模式...");
-            csst.runRemotely();
+            logSubscriberTopology.runRemotely();
         }
     }
 }
diff --git a/src/main/java/cn/ac/iie/topology/StormRunner.java b/src/main/java/com/zdjizhi/topology/StormRunner.java
index 4d5be53..2890bf7 100644
--- a/src/main/java/cn/ac/iie/topology/StormRunner.java
+++ b/src/main/java/com/zdjizhi/topology/StormRunner.java
@@ -1,4 +1,4 @@
-package cn.ac.iie.topology;
+package com.zdjizhi.topology;
 
 
 import org.apache.storm.Config;
diff --git a/src/main/java/cn/ac/iie/utils/SubscriberConfigurations.java b/src/main/java/com/zdjizhi/utils/SubscriberConfigurations.java
index 95dd847..32fe27b 100644
--- a/src/main/java/cn/ac/iie/utils/SubscriberConfigurations.java
+++ b/src/main/java/com/zdjizhi/utils/SubscriberConfigurations.java
@@ -1,4 +1,4 @@
-package cn.ac.iie.utils;
+package com.zdjizhi.utils;
 
 import java.util.Properties;
 
@@ -7,14 +7,11 @@ import java.util.Properties;
 public final class SubscriberConfigurations {
 
     private static Properties propCommon = new Properties();
-//    private static Properties propService = new Properties();
 
 
     public static String getStringProperty(Integer type, String key) {
         if (type == 0) {
             return propCommon.getProperty(key);
-//        } else if (type == 1) {
-//            return propService.getProperty(key);
         } else {
             return null;
         }
@@ -24,8 +21,6 @@ public final class SubscriberConfigurations {
     public static Integer getIntProperty(Integer type, String key) {
         if (type == 0) {
             return Integer.parseInt(propCommon.getProperty(key));
-//        } else if (type == 1) {
-//            return Integer.parseInt(propService.getProperty(key));
         } else {
             return null;
         }
@@ -34,8 +29,6 @@ public final class SubscriberConfigurations {
     public static Long getLongProperty(Integer type, String key) {
         if (type == 0) {
             return Long.parseLong(propCommon.getProperty(key));
-//        } else if (type == 1) {
-//            return Long.parseLong(propService.getProperty(key));
         } else {
             return null;
         }
@@ -44,8 +37,6 @@ public final class SubscriberConfigurations {
     public static Boolean getBooleanProperty(Integer type, String key) {
         if (type == 0) {
             return "true".equals(propCommon.getProperty(key).toLowerCase().trim());
-//        } else if (type == 1) {
-//            return propService.getProperty(key).toLowerCase().trim().equals("true");
         } else {
             return null;
         }
diff --git a/src/main/java/cn/ac/iie/utils/TupleUtils.java b/src/main/java/com/zdjizhi/utils/TupleUtils.java
index c0dc410..431f08f 100644
--- a/src/main/java/cn/ac/iie/utils/TupleUtils.java
+++ b/src/main/java/com/zdjizhi/utils/TupleUtils.java
@@ -1,4 +1,4 @@
-package cn.ac.iie.utils;
+package com.zdjizhi.utils;
 
 import org.apache.storm.Constants;
 import org.apache.storm.tuple.Tuple;
diff --git a/src/main/java/cn/ac/iie/utils/hbase/PullHBaseUtils.java b/src/main/java/com/zdjizhi/utils/hbase/PullHBaseUtils.java
index f464d95..551b42a 100644
--- a/src/main/java/cn/ac/iie/utils/hbase/PullHBaseUtils.java
+++ b/src/main/java/com/zdjizhi/utils/hbase/PullHBaseUtils.java
@@ -1,6 +1,8 @@
-package cn.ac.iie.utils.hbase;
+package com.zdjizhi.utils.hbase;
 
-import cn.ac.iie.common.SubscriberConfig;
+import com.zdjizhi.common.SubscriberConfig;
+import cn.hutool.log.Log;
+import cn.hutool.log.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
@@ -8,7 +10,6 @@ import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.*;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.log4j.Logger;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -21,7 +22,7 @@ import java.util.Map;
  */
 
 public class PullHBaseUtils {
-    private final static Logger logger = Logger.getLogger(PullHBaseUtils.class);
+    private static final Log logger = LogFactory.get();
     private static Map<String, String> subIdMap = new HashMap<>(83334);
     private static Connection connection;
     private static Long time;
diff --git a/src/main/java/cn/ac/iie/utils/hbase/PushHBaseUtils.java b/src/main/java/com/zdjizhi/utils/hbase/PushHBaseUtils.java
index 1e98181..38b6d95 100644
--- a/src/main/java/cn/ac/iie/utils/hbase/PushHBaseUtils.java
+++ b/src/main/java/com/zdjizhi/utils/hbase/PushHBaseUtils.java
@@ -1,19 +1,15 @@
-package cn.ac.iie.utils.hbase;
+package com.zdjizhi.utils.hbase;
 
-import cn.ac.iie.common.SubscriberConfig;
+import com.zdjizhi.common.SubscriberConfig;
+import cn.hutool.log.Log;
+import cn.hutool.log.LogFactory;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.*;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.log4j.Logger;
 
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * HBase 工具类
@@ -22,7 +18,7 @@ import java.util.Map;
  */
 
 public class PushHBaseUtils {
-    private final static Logger logger = Logger.getLogger(PushHBaseUtils.class);
+    private static final Log logger = LogFactory.get();
     private static Connection connection;
     private static String zookeeperIp;
     private static PushHBaseUtils pushHBaseUtils;