修复EAL4版本v3.21.03.16-eal4

11 files changed, 54 insertions, 39 deletions

diff --git a/pom.xml b/pom.xml
index c716e84..b41200b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
                             <transformers>
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>cn.ac.iie.topology.RadiusLogClearTopology</mainClass>
+                                    <mainClass>com.zdjizhi.topology.RadiusLogClearTopology</mainClass>
                                 </transformer>
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
@@ -170,5 +170,11 @@
             </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/bean/Knowledge.java b/src/main/java/com/zdjizhi/bean/Knowledge.java
index 2bf06b9..4ed79ea 100644
--- a/src/main/java/cn/ac/iie/bean/Knowledge.java
+++ b/src/main/java/com/zdjizhi/bean/Knowledge.java
@@ -1,9 +1,10 @@
-package cn.ac.iie.bean;
+package com.zdjizhi.bean;
 
 /**
  * @author qidaijie
  */
 public class Knowledge {
+
     private String framed_ip;
     private String account;
     private String acct_session_id;
diff --git a/src/main/java/cn/ac/iie/bolt/RadiusCleanBolt.java b/src/main/java/com/zdjizhi/bolt/RadiusCleanBolt.java
index d356dc1..e051e90 100644
--- a/src/main/java/cn/ac/iie/bolt/RadiusCleanBolt.java
+++ b/src/main/java/com/zdjizhi/bolt/RadiusCleanBolt.java
@@ -1,12 +1,13 @@
-package cn.ac.iie.bolt;
+package com.zdjizhi.bolt;
 
-import cn.ac.iie.bean.Knowledge;
-import cn.ac.iie.common.KnowledgeConfig;
-import cn.ac.iie.utils.LogToKafka;
-import cn.ac.iie.utils.TupleUtils;
+import com.zdjizhi.bean.Knowledge;
+import com.zdjizhi.common.KnowledgeConfig;
+import com.zdjizhi.utils.kafka.LogToKafka;
+import com.zdjizhi.utils.system.TupleUtils;
+import cn.hutool.log.Log;
+import cn.hutool.log.LogFactory;
 import com.alibaba.fastjson.JSONObject;
 import com.zdjizhi.utils.StringUtil;
-import org.apache.log4j.Logger;
 import org.apache.storm.task.TopologyContext;
 import org.apache.storm.topology.BasicOutputCollector;
 import org.apache.storm.topology.OutputFieldsDeclarer;
@@ -25,7 +26,7 @@ public class RadiusCleanBolt extends BaseBasicBolt {
     private static final long serialVersionUID = -7099293750085572832L;
     private List<String> list;
     private LogToKafka logToKafka;
-    private static Logger logger = Logger.getLogger(RadiusCleanBolt.class);
+    private static final Log logger = LogFactory.get();
 
     @Override
     public void prepare(Map stormConf, TopologyContext context) {
diff --git a/src/main/java/cn/ac/iie/common/KnowledgeConfig.java b/src/main/java/com/zdjizhi/common/KnowledgeConfig.java
index 4322f2c..2d670a4 100644
--- a/src/main/java/cn/ac/iie/common/KnowledgeConfig.java
+++ b/src/main/java/com/zdjizhi/common/KnowledgeConfig.java
@@ -1,6 +1,6 @@
-package cn.ac.iie.common;
+package com.zdjizhi.common;
 
-import cn.ac.iie.utils.KnowledgeConfigurations;
+import com.zdjizhi.utils.system.KnowledgeConfigurations;
 
 import java.io.Serializable;
 
@@ -10,6 +10,8 @@ import java.io.Serializable;
 public class KnowledgeConfig implements Serializable {
     private static final long serialVersionUID = -8326385159484059324L;
 
+    public static final String MODEL = "remote";
+
     public static final String SEGMENTATION = ",";
     /**
      * 4- Accounting-Request(账户授权)
diff --git a/src/main/java/cn/ac/iie/spout/CustomizedKafkaSpout.java b/src/main/java/com/zdjizhi/spout/CustomizedKafkaSpout.java
index 93c88a4..8d5221e 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.KnowledgeConfig;
+import com.zdjizhi.common.KnowledgeConfig;
+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;
@@ -24,7 +25,7 @@ public class CustomizedKafkaSpout extends BaseRichSpout {
     private KafkaConsumer<String, String> consumer;
     private SpoutOutputCollector collector = null;
     private TopologyContext context = null;
-    private final static Logger logger = Logger.getLogger(CustomizedKafkaSpout.class);
+    private static final Log logger = LogFactory.get();
 
 
     private static Properties createConsumerConfig() {
diff --git a/src/main/java/cn/ac/iie/topology/RadiusLogClearTopology.java b/src/main/java/com/zdjizhi/topology/RadiusLogClearTopology.java
index 07a4218..2506012 100644
--- a/src/main/java/cn/ac/iie/topology/RadiusLogClearTopology.java
+++ b/src/main/java/com/zdjizhi/topology/RadiusLogClearTopology.java
@@ -1,21 +1,21 @@
-package cn.ac.iie.topology;
+package com.zdjizhi.topology;
 
-import cn.ac.iie.bolt.RadiusCleanBolt;
-import cn.ac.iie.common.KnowledgeConfig;
-import cn.ac.iie.spout.CustomizedKafkaSpout;
+import com.zdjizhi.bolt.RadiusCleanBolt;
+import com.zdjizhi.common.KnowledgeConfig;
+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 RadiusLogClearTopology {
-    private static final Logger logger = LoggerFactory.getLogger(RadiusLogClearTopology.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 RadiusLogClearTopology {
     }
 
     public static void main(String[] args) throws Exception {
-        RadiusLogClearTopology csst = null;
+        RadiusLogClearTopology radiusLogClearTopology;
         boolean runLocally = true;
-        if (args.length >= 2 && "remote".equalsIgnoreCase(args[1])) {
+        if (args.length >= 2 && KnowledgeConfig.MODEL.equalsIgnoreCase(args[1])) {
             runLocally = false;
-            csst = new RadiusLogClearTopology(args[0]);
+            radiusLogClearTopology = new RadiusLogClearTopology(args[0]);
         } else {
-            csst = new RadiusLogClearTopology();
+            radiusLogClearTopology = new RadiusLogClearTopology();
         }
-        csst.buildTopology();
+        radiusLogClearTopology.buildTopology();
 
         if (runLocally) {
             logger.info("执行本地模式...");
-            csst.runLocally();
+            radiusLogClearTopology.runLocally();
         } else {
             logger.info("执行远程部署模式...");
-            csst.runRemotely();
+            radiusLogClearTopology.runRemotely();
         }
     }
 }
diff --git a/src/main/java/cn/ac/iie/topology/StormRunner.java b/src/main/java/com/zdjizhi/topology/StormRunner.java
index d2d4ab9..47cdf64 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/LogToKafka.java b/src/main/java/com/zdjizhi/utils/kafka/LogToKafka.java
index 6f08e60..69485d3 100644
--- a/src/main/java/cn/ac/iie/utils/LogToKafka.java
+++ b/src/main/java/com/zdjizhi/utils/kafka/LogToKafka.java
@@ -1,8 +1,9 @@
-package cn.ac.iie.utils;
+package com.zdjizhi.utils.kafka;
 
-import cn.ac.iie.common.KnowledgeConfig;
+import com.zdjizhi.common.KnowledgeConfig;
+import cn.hutool.log.Log;
+import cn.hutool.log.LogFactory;
 import org.apache.kafka.clients.producer.*;
-import org.apache.log4j.Logger;
 
 import java.util.List;
 import java.util.Properties;
@@ -15,7 +16,7 @@ import java.util.Properties;
  */
 
 public class LogToKafka {
-    private static Logger logger = Logger.getLogger(LogToKafka.class);
+    private static final Log logger = LogFactory.get();
 
     /**
      * kafka生产者，用于向kafka中发送消息
diff --git a/src/main/java/cn/ac/iie/utils/KnowledgeConfigurations.java b/src/main/java/com/zdjizhi/utils/system/KnowledgeConfigurations.java
index dbaf58d..a748dd0 100644
--- a/src/main/java/cn/ac/iie/utils/KnowledgeConfigurations.java
+++ b/src/main/java/com/zdjizhi/utils/system/KnowledgeConfigurations.java
@@ -1,4 +1,7 @@
-package cn.ac.iie.utils;
+package com.zdjizhi.utils.system;
+
+import cn.hutool.log.Log;
+import cn.hutool.log.LogFactory;
 
 import java.util.Properties;
 
@@ -6,7 +9,7 @@ import java.util.Properties;
  * @author qidaijie
  */
 public final class KnowledgeConfigurations {
-
+    private static final Log logger = LogFactory.get();
     private static Properties propCommon = new Properties();
 
     public static String getStringProperty(Integer type, String key) {
@@ -47,7 +50,7 @@ public final class KnowledgeConfigurations {
             propCommon.load(KnowledgeConfigurations.class.getClassLoader().getResourceAsStream("knowledge_config.properties"));
         } catch (Exception e) {
             propCommon = null;
-            System.err.println("配置加载失败");
+            logger.error("配置加载失败" + e);
         }
     }
 }
diff --git a/src/main/java/cn/ac/iie/utils/TupleUtils.java b/src/main/java/com/zdjizhi/utils/system/TupleUtils.java
index c0dc410..5966a46 100644
--- a/src/main/java/cn/ac/iie/utils/TupleUtils.java
+++ b/src/main/java/com/zdjizhi/utils/system/TupleUtils.java
@@ -1,4 +1,4 @@
-package cn.ac.iie.utils;
+package com.zdjizhi.utils.system;
 
 import org.apache.storm.Constants;
 import org.apache.storm.tuple.Tuple;
diff --git a/src/test/java/cn/ac/iie/test/JsonTest.java b/src/test/java/com/zdjizhi/test/JsonTest.java
index 35224c1..f57bf82 100644
--- a/src/test/java/cn/ac/iie/test/JsonTest.java
+++ b/src/test/java/com/zdjizhi/test/JsonTest.java
@@ -1,4 +1,4 @@
-package cn.ac.iie.test;
+package com.zdjizhi.test;
 
 import org.junit.Test;