修复EAL4中低级警告版本3.21.03.16-eal4

11 files changed, 91 insertions, 50 deletions

diff --git a/pom.xml b/pom.xml
index bb712a3..025e1e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,12 +2,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>log-subscriber-hbase-datacenter</groupId>
-    <artifactId>log-subscriber-hbase-datacenter</artifactId>
-    <version>v3.20.08.18</version>
+    <groupId>log-subscriber-hbase-sync</groupId>
+    <artifactId>log-subscriber-hbase-sync</artifactId>
+    <version>v3.21.03.25-eal4</version>
     <packaging>jar</packaging>
 
-    <name>log-subscriber-hbase</name>
+    <name>log-subscriber-hbase-sync</name>
     <url>http://maven.apache.org</url>
 
     <repositories>
@@ -67,6 +67,19 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>io.github.zlika</groupId>
+                <artifactId>reproducible-build-maven-plugin</artifactId>
+                <version>0.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>strip-jar</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -167,21 +180,21 @@
             <version>1.2.70</version>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>com.zdjizhi</groupId>-->
-            <!--<artifactId>galaxy</artifactId>-->
-            <!--<version>1.0.3</version>-->
-            <!--<exclusions>-->
-                <!--<exclusion>-->
-                    <!--<artifactId>slf4j-log4j12</artifactId>-->
-                    <!--<groupId>org.slf4j</groupId>-->
-                <!--</exclusion>-->
-                <!--<exclusion>-->
-                    <!--<artifactId>log4j-over-slf4j</artifactId>-->
-                    <!--<groupId>org.slf4j</groupId>-->
-                <!--</exclusion>-->
-            <!--</exclusions>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>com.zdjizhi</groupId>
+            <artifactId>galaxy</artifactId>
+            <version>1.0.3</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-log4j12</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>log4j-over-slf4j</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.apache.zookeeper/zookeeper -->
         <dependency>
diff --git a/properties/subscriber-config.properties b/properties/subscriber-config.properties
index 50c0415..0d79a9b 100644
--- a/properties/subscriber-config.properties
+++ b/properties/subscriber-config.properties
@@ -34,3 +34,6 @@ spout.parallelism=1
 
 #storm bolt parallelism
 format.bolt.parallelism=1
+
+#spout接收睡眠时间
+topology.spout.sleep.time=1
diff --git a/src/main/java/com/zdjizhi/bolt/SubscriberIdBolt.java b/src/main/java/com/zdjizhi/bolt/SubscriberIdBolt.java
index 2306817..ec401fe 100644
--- a/src/main/java/com/zdjizhi/bolt/SubscriberIdBolt.java
+++ b/src/main/java/com/zdjizhi/bolt/SubscriberIdBolt.java
@@ -1,7 +1,8 @@
 package com.zdjizhi.bolt;
 
 import com.zdjizhi.common.SubscriberConfig;
-import com.zdjizhi.utils.TupleUtils;
+import com.zdjizhi.utils.exception.SubscriberSyncException;
+import com.zdjizhi.utils.system.TupleUtils;
 import com.zdjizhi.utils.hbase.PullHBaseUtils;
 import com.zdjizhi.utils.hbase.PushHBaseUtils;
 import cn.hutool.log.Log;
@@ -45,9 +46,8 @@ public class SubscriberIdBolt extends BaseBasicBolt {
             } else {
                 logger.warn(tuple.getString(0));
             }
-        } catch (Exception e) {
-            logger.error("获取国家中心HBase Radius 写入分中心 HBase 异常");
-            e.printStackTrace();
+        } catch (SubscriberSyncException e) {
+            logger.error("Update the local HBase exception by getting the main HBaseRadius data. Message:" + e);
         }
     }
 
diff --git a/src/main/java/com/zdjizhi/common/SubscriberConfig.java b/src/main/java/com/zdjizhi/common/SubscriberConfig.java
index 9dda69d..209ce85 100644
--- a/src/main/java/com/zdjizhi/common/SubscriberConfig.java
+++ b/src/main/java/com/zdjizhi/common/SubscriberConfig.java
@@ -1,6 +1,6 @@
 package com.zdjizhi.common;
 
-import com.zdjizhi.utils.SubscriberConfigurations;
+import com.zdjizhi.utils.system.SubscriberConfigurations;
 
 import java.io.Serializable;
 
@@ -29,6 +29,7 @@ public class SubscriberConfig implements Serializable {
     public static final Integer TOPOLOGY_WORKERS = SubscriberConfigurations.getIntProperty(0, "topology.workers");
 
     public static final String CHECK_IP_SCOPE = SubscriberConfigurations.getStringProperty(0, "check.ip.scope");
+    public static final Integer TOPOLOGY_SPOUT_SLEEP_TIME = SubscriberConfigurations.getIntProperty(0, "topology.spout.sleep.time");
 
     public static final String CENTER_HBASE_ZOOKEEPER_SERVERS = SubscriberConfigurations.getStringProperty(0, "center.hbase.zookeeper.servers");
     public static final String HBASE_TABLE_NAME = SubscriberConfigurations.getStringProperty(0, "hbase.table.name");
diff --git a/src/main/java/com/zdjizhi/spout/CustomizedKafkaSpout.java b/src/main/java/com/zdjizhi/spout/CustomizedKafkaSpout.java
index 0d2b92b..ef90271 100644
--- a/src/main/java/com/zdjizhi/spout/CustomizedKafkaSpout.java
+++ b/src/main/java/com/zdjizhi/spout/CustomizedKafkaSpout.java
@@ -1,8 +1,10 @@
 package com.zdjizhi.spout;
 
+import cn.hutool.core.thread.ThreadUtil;
 import com.zdjizhi.common.SubscriberConfig;
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
+import com.zdjizhi.utils.exception.SubscriberSyncException;
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
@@ -61,13 +63,12 @@ public class CustomizedKafkaSpout extends BaseRichSpout {
         try {
             // TODO Auto-generated method stub
             ConsumerRecords<String, String> records = consumer.poll(10000L);
-            Thread.sleep(300);
+            ThreadUtil.sleep(SubscriberConfig.TOPOLOGY_SPOUT_SLEEP_TIME);
             for (ConsumerRecord<String, String> record : records) {
                 this.collector.emit(new Values(record.value()));
             }
-        } catch (Exception e) {
-            logger.error("kfaka-spout 发送数据出现异常" + e);
-            e.printStackTrace();
+        } catch (SubscriberSyncException e) {
+            logger.error("Spout sed Messages is Error! Exception information is:" + e);
         }
     }
 
diff --git a/src/main/java/com/zdjizhi/topology/StormRunner.java b/src/main/java/com/zdjizhi/topology/StormRunner.java
index 2890bf7..32e41ad 100644
--- a/src/main/java/com/zdjizhi/topology/StormRunner.java
+++ b/src/main/java/com/zdjizhi/topology/StormRunner.java
@@ -1,6 +1,7 @@
 package com.zdjizhi.topology;
 
 
+import cn.hutool.core.thread.ThreadUtil;
 import org.apache.storm.Config;
 import org.apache.storm.LocalCluster;
 import org.apache.storm.StormSubmitter;
@@ -21,7 +22,7 @@ public final class StormRunner{
 		
 		LocalCluster localCluster = new LocalCluster();
 		localCluster.submitTopology(topologyName, conf, builder.createTopology());
-		Thread.sleep((long) runtimeInSeconds * MILLS_IN_SEC); 
+		ThreadUtil.sleep((long) runtimeInSeconds * MILLS_IN_SEC);
 		localCluster.shutdown();
 		
 	}
diff --git a/src/main/java/com/zdjizhi/utils/exception/SubscriberSyncException.java b/src/main/java/com/zdjizhi/utils/exception/SubscriberSyncException.java
new file mode 100644
index 0000000..eb3c909
--- /dev/null
+++ b/src/main/java/com/zdjizhi/utils/exception/SubscriberSyncException.java
@@ -0,0 +1,18 @@
+package com.zdjizhi.utils.exception;
+
+/**
+ * @author qidaijie
+ * @Package com.zdjizhi.utils.exception
+ * @Description:
+ * @date 2021/3/2510:14
+ */
+public class SubscriberSyncException extends RuntimeException {
+
+    public SubscriberSyncException(Exception e) {
+        super(e);
+    }
+
+    public SubscriberSyncException(String e) {
+        super(e);
+    }
+}
diff --git a/src/main/java/com/zdjizhi/utils/hbase/PullHBaseUtils.java b/src/main/java/com/zdjizhi/utils/hbase/PullHBaseUtils.java
index 551b42a..e59a26f 100644
--- a/src/main/java/com/zdjizhi/utils/hbase/PullHBaseUtils.java
+++ b/src/main/java/com/zdjizhi/utils/hbase/PullHBaseUtils.java
@@ -3,6 +3,7 @@ package com.zdjizhi.utils.hbase;
 import com.zdjizhi.common.SubscriberConfig;
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
+import com.zdjizhi.utils.exception.SubscriberSyncException;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
@@ -61,10 +62,8 @@ public class PullHBaseUtils {
             logger.warn("PullHBaseUtils get HBase connection,now to getAll().");
         } catch (IOException ioe) {
             logger.error("PullHBaseUtils getHbaseConn() IOException===>{" + ioe + "}<===");
-            ioe.printStackTrace();
-        } catch (Exception e) {
+        } catch (SubscriberSyncException e) {
             logger.error("PullHBaseUtils getHbaseConn() Exception===>{" + e + "}<===");
-            e.printStackTrace();
         }
     }
 
@@ -117,10 +116,8 @@ public class PullHBaseUtils {
             time = endTime;
         } catch (IOException ioe) {
             logger.error("PullHBaseUtils timestampsFilter is IOException===>{" + ioe + "}<===");
-            ioe.printStackTrace();
-        } catch (Exception e) {
+        } catch (SubscriberSyncException e) {
             logger.error("PullHBaseUtils timestampsFilter is Exception===>{" + e + "}<===");
-            e.printStackTrace();
         } finally {
             if (scanner != null) {
                 scanner.close();
@@ -129,7 +126,7 @@ public class PullHBaseUtils {
                 try {
                     table.close();
                 } catch (IOException e) {
-                    e.printStackTrace();
+                    logger.error("HBase Table Close ERROR! Exception message is:" + e);
                 }
             }
         }
diff --git a/src/main/java/com/zdjizhi/utils/hbase/PushHBaseUtils.java b/src/main/java/com/zdjizhi/utils/hbase/PushHBaseUtils.java
index 38b6d95..9167b34 100644
--- a/src/main/java/com/zdjizhi/utils/hbase/PushHBaseUtils.java
+++ b/src/main/java/com/zdjizhi/utils/hbase/PushHBaseUtils.java
@@ -3,6 +3,7 @@ package com.zdjizhi.utils.hbase;
 import com.zdjizhi.common.SubscriberConfig;
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
+import com.zdjizhi.utils.exception.SubscriberSyncException;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.TableName;
@@ -49,10 +50,8 @@ public class PushHBaseUtils {
             logger.warn("PullHBaseUtils get HBase connection,now to getAll().");
         } catch (IOException ioe) {
             logger.error("PullHBaseUtils getHbaseConn() IOException===>{" + ioe + "}<===");
-            ioe.printStackTrace();
-        } catch (Exception e) {
+        } catch (SubscriberSyncException e) {
             logger.error("PullHBaseUtils getHbaseConn() Exception===>{" + e + "}<===");
-            e.printStackTrace();
         }
     }
 
@@ -69,18 +68,16 @@ public class PushHBaseUtils {
         try {
             table = connection.getTable(TableName.valueOf("sub:" + SubscriberConfig.HBASE_TABLE_NAME));
             table.put(putList);
-            logger.warn("同步国家中心HBase增量写入分中心 HBase 成功，更新条数：" + putList.size());
+            logger.warn("Success to synchronize the master HBase incremental write to the local HBase. Update size ：" + putList.size());
         } catch (IOException e) {
-            logger.error("同步国家中心 HBase 增量写入分中心 HBase 失败");
-            e.printStackTrace();
+            logger.error("Failed to synchronize the master HBase incremental write to the local HBase");
         } finally {
             try {
                 if (table != null) {
                     table.close();
                 }
             } catch (IOException e) {
-                logger.error("HBase表关闭异常");
-                e.printStackTrace();
+                logger.error("HBase Table is Close abnormally! Exception message is:" + e);
             }
         }
 
diff --git a/src/main/java/com/zdjizhi/utils/SubscriberConfigurations.java b/src/main/java/com/zdjizhi/utils/system/SubscriberConfigurations.java
index 32fe27b..010d724 100644
--- a/src/main/java/com/zdjizhi/utils/SubscriberConfigurations.java
+++ b/src/main/java/com/zdjizhi/utils/system/SubscriberConfigurations.java
@@ -1,10 +1,20 @@
-package com.zdjizhi.utils;
+package com.zdjizhi.utils.system;
 
-import java.util.Properties;
+import cn.hutool.log.Log;
+import cn.hutool.log.LogFactory;
+import com.zdjizhi.utils.StringUtil;
+import com.zdjizhi.utils.exception.SubscriberSyncException;
 
+import java.io.IOException;
+import java.util.Locale;
+import java.util.Properties;
 
 
+/**
+ * @author qidaijie
+ */
 public final class SubscriberConfigurations {
+    private static final Log logger = LogFactory.get();
 
     private static Properties propCommon = new Properties();
 
@@ -36,7 +46,7 @@ public final class SubscriberConfigurations {
 
     public static Boolean getBooleanProperty(Integer type, String key) {
         if (type == 0) {
-            return "true".equals(propCommon.getProperty(key).toLowerCase().trim());
+            return StringUtil.equals(propCommon.getProperty(key).toLowerCase().trim().toUpperCase(Locale.ENGLISH), "true");
         } else {
             return null;
         }
@@ -45,9 +55,9 @@ public final class SubscriberConfigurations {
     static {
         try {
             propCommon.load(SubscriberConfigurations.class.getClassLoader().getResourceAsStream("subscriber-config.properties"));
-        } catch (Exception e) {
+        } catch (IOException | SubscriberSyncException e) {
+            logger.error("Configuration file failed to load! the Exception information is:" + e);
             propCommon = null;
-            System.err.println("配置加载失败");
         }
     }
 }
diff --git a/src/main/java/com/zdjizhi/utils/TupleUtils.java b/src/main/java/com/zdjizhi/utils/system/TupleUtils.java
index 431f08f..5966a46 100644
--- a/src/main/java/com/zdjizhi/utils/TupleUtils.java
+++ b/src/main/java/com/zdjizhi/utils/system/TupleUtils.java
@@ -1,4 +1,4 @@
-package com.zdjizhi.utils;
+package com.zdjizhi.utils.system;
 
 import org.apache.storm.Constants;
 import org.apache.storm.tuple.Tuple;