[fix][module]各个module包路径，增加所属模块名称，以便兼容不同模块相同类名称的情况。

22 files changed, 52 insertions, 49 deletions

diff --git a/groot-common/src/main/java/com/geedgenetworks/config/GrootYamlParser.java b/groot-common/src/main/java/com/geedgenetworks/core/config/GrootYamlParser.java
index 12f7827..e4c6701 100644
--- a/groot-common/src/main/java/com/geedgenetworks/config/GrootYamlParser.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/config/GrootYamlParser.java
@@ -1,4 +1,4 @@
-package com.geedgenetworks.config;
+package com.geedgenetworks.core.config;
 
 import org.yaml.snakeyaml.Yaml;
 
diff --git a/groot-common/src/main/java/com/geedgenetworks/config/commonConfig.java b/groot-common/src/main/java/com/geedgenetworks/core/config/commonConfig.java
index bc57428..0930ab7 100644
--- a/groot-common/src/main/java/com/geedgenetworks/config/commonConfig.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/config/commonConfig.java
@@ -1,11 +1,11 @@
-package com.geedgenetworks.config;
+package com.geedgenetworks.core.config;
 
 import org.yaml.snakeyaml.Yaml;
 
 import java.util.Map;
 
-import static com.geedgenetworks.config.GrootYamlParser.getClassReflect;
-import static com.geedgenetworks.config.GrootYamlParser.loadYaml;
+import static com.geedgenetworks.core.config.GrootYamlParser.getClassReflect;
+import static com.geedgenetworks.core.config.GrootYamlParser.loadYaml;
 
 /** Created by wk on 2021/1/6. */
 public class commonConfig {
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/ColumnUtil.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/ColumnUtil.java
index 1f24828..0a9317d 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/ColumnUtil.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/ColumnUtil.java
@@ -1,4 +1,4 @@
-package com.geedgenetworks.utils;
+package com.geedgenetworks.core.utils;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/CustomException.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/CustomException.java
index 2718241..3018908 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/CustomException.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/CustomException.java
@@ -1,4 +1,4 @@
-package com.geedgenetworks.utils;
+package com.geedgenetworks.core.utils;
 
 public class CustomException extends Exception {
     public CustomException(String message) {
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/DistributedLock.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/DistributedLock.java
index 98f6c0c..b5420e0 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/DistributedLock.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/DistributedLock.java
@@ -1,4 +1,4 @@
-package com.geedgenetworks.utils;
+package com.geedgenetworks.core.utils;
 
 import org.apache.zookeeper.*;
 import org.apache.zookeeper.data.Stat;
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/HadoopUtils.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/HadoopUtils.java
index 1bc5060..9662478 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/HadoopUtils.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/HadoopUtils.java
@@ -1,7 +1,8 @@
-package com.geedgenetworks.utils;
+package com.geedgenetworks.core.utils;
 
-import com.geedgenetworks.config.commonConfig;
+import com.geedgenetworks.core.config.commonConfig;
 
+import com.geedgenetworks.utils.StringUtil;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FSDataOutputStream;
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/HttpClientUtils.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/HttpClientUtils.java
index c381d95..eb0b641 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/HttpClientUtils.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/HttpClientUtils.java
@@ -1,6 +1,7 @@
-package com.geedgenetworks.utils;
+package com.geedgenetworks.core.utils;
 
-import com.geedgenetworks.config.commonConfig;
+import com.geedgenetworks.core.config.commonConfig;
+import com.geedgenetworks.utils.StringUtil;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.*;
 import org.apache.http.client.ClientProtocolException;
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/IPUtils.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/IPUtils.java
index f2f3a3c..1cf835b 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/IPUtils.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/IPUtils.java
@@ -1,11 +1,13 @@
-package com.geedgenetworks.utils;
+package com.geedgenetworks.core.utils;
 
 import com.alibaba.nacos.api.NacosFactory;
 import com.alibaba.nacos.api.PropertyKeyConst;
 import com.alibaba.nacos.api.config.ConfigService;
 import com.alibaba.nacos.api.config.listener.Listener;
 import com.alibaba.nacos.api.exception.NacosException;
-import com.geedgenetworks.config.commonConfig;
+import com.geedgenetworks.core.config.commonConfig;
+import com.geedgenetworks.utils.IpLookupV2;
+import com.geedgenetworks.utils.StringUtil;
 import com.jayway.jsonpath.JsonPath;
 import org.apache.http.Header;
 import org.apache.http.message.BasicHeader;
@@ -17,9 +19,6 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.Executor;
 
-import static com.geedgenetworks.config.commonConfig.KNOWLEDGE_ASNLOOKUP_MAP;
-import static com.geedgenetworks.config.commonConfig.KNOWLEDGE_IPLOOKUP_MAP;
-
 public class IPUtils {
 
     private static final Logger LOG = LoggerFactory.getLogger(IPUtils.class);
@@ -38,8 +37,8 @@ public class IPUtils {
                 "$.[?(@.version=='latest' && @.name in ['ip_v4_built_in','ip_v6_built_in','ip_v4_user_defined','ip_v6_user_defined','asn_v4','asn_v6']  && @.id in ['");
         //    sb.append(commonConfig.ID_ARRAY);
 
-        if (KNOWLEDGE_IPLOOKUP_MAP != null && KNOWLEDGE_IPLOOKUP_MAP.size() > 0) {
-            for (Map.Entry<String, Object> entry : KNOWLEDGE_IPLOOKUP_MAP.entrySet()) {
+        if (commonConfig.KNOWLEDGE_IPLOOKUP_MAP != null && commonConfig.KNOWLEDGE_IPLOOKUP_MAP.size() > 0) {
+            for (Map.Entry<String, Object> entry : commonConfig.KNOWLEDGE_IPLOOKUP_MAP.entrySet()) {
                 Map<String, String> ids = (Map<String, String>) entry.getValue();
                 if (ids != null && ids.size() > 0) {
                     for (Map.Entry<String, String> obj : ids.entrySet()) {
@@ -49,8 +48,8 @@ public class IPUtils {
                 }
             }
         }
-        if (KNOWLEDGE_ASNLOOKUP_MAP != null && KNOWLEDGE_ASNLOOKUP_MAP.size() > 0) {
-            for (Map.Entry<String, Object> entry : KNOWLEDGE_ASNLOOKUP_MAP.entrySet()) {
+        if (commonConfig.KNOWLEDGE_ASNLOOKUP_MAP != null && commonConfig.KNOWLEDGE_ASNLOOKUP_MAP.size() > 0) {
+            for (Map.Entry<String, Object> entry : commonConfig.KNOWLEDGE_ASNLOOKUP_MAP.entrySet()) {
                 Map<String, String> ids = (Map<String, String>) entry.getValue();
                 if (ids != null && ids.size() > 0) {
                     for (Map.Entry<String, String> obj : ids.entrySet()) {
@@ -175,8 +174,8 @@ public class IPUtils {
 
     public static void loadIpLook() throws Exception {
 
-        if (KNOWLEDGE_IPLOOKUP_MAP != null) {
-            for (Map.Entry<String, Object> entry : KNOWLEDGE_IPLOOKUP_MAP.entrySet()) {
+        if (commonConfig.KNOWLEDGE_IPLOOKUP_MAP != null) {
+            for (Map.Entry<String, Object> entry : commonConfig.KNOWLEDGE_IPLOOKUP_MAP.entrySet()) {
                 Map<String, String> ids = (Map<String, String>) entry.getValue();
                 IpLookupV2.Builder ipLookupBuilder = new IpLookupV2.Builder(false);
                 if (ids != null) {
@@ -213,8 +212,8 @@ public class IPUtils {
                 venderWithIpLookup.put(entry.getKey(), ipLookup);
             }
         }
-        if (KNOWLEDGE_ASNLOOKUP_MAP != null) {
-            for (Map.Entry<String, Object> entry : KNOWLEDGE_ASNLOOKUP_MAP.entrySet()) {
+        if (commonConfig.KNOWLEDGE_ASNLOOKUP_MAP != null) {
+            for (Map.Entry<String, Object> entry : commonConfig.KNOWLEDGE_ASNLOOKUP_MAP.entrySet()) {
                 Map<String, String> ids = (Map<String, String>) entry.getValue();
                 IpLookupV2.Builder asnLookupBuilder = new IpLookupV2.Builder(false);
                 if (ids != null) {
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/IpLookupUtils.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/IpLookupUtils.java
index 28123e3..16dc63f 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/IpLookupUtils.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/IpLookupUtils.java
@@ -1,7 +1,9 @@
-package com.geedgenetworks.utils;
+package com.geedgenetworks.core.utils;
 
-import com.geedgenetworks.config.commonConfig;
+import com.geedgenetworks.core.config.commonConfig;
 
+import com.geedgenetworks.utils.IpLookupV2;
+import com.geedgenetworks.utils.StringUtil;
 import org.apache.commons.io.IOUtils;
 
 import cn.hutool.core.io.file.FileReader;
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/JsonPathUtil.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/JsonPathUtil.java
index dafce1f..aa2f0b7 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/JsonPathUtil.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/JsonPathUtil.java
@@ -1,4 +1,4 @@
-package com.geedgenetworks.utils;
+package com.geedgenetworks.core.utils;
 
 import cn.hutool.log.Log;
 import cn.hutool.log.LogFactory;
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/KnowLedgeEntity.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/KnowLedgeEntity.java
index 88339f6..e200d3b 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/KnowLedgeEntity.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/KnowLedgeEntity.java
@@ -1,4 +1,4 @@
-package com.geedgenetworks.utils;
+package com.geedgenetworks.core.utils;
 
 import java.io.InputStream;
 
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/YamlParser.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/YamlParser.java
index df58f57..41781bf 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/YamlParser.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/YamlParser.java
@@ -1,4 +1,4 @@
-package com.geedgenetworks.utils;
+package com.geedgenetworks.core.utils;
 
 import org.yaml.snakeyaml.Yaml;
 
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/HBaseClient.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/HBaseClient.java
index 6001392..cb1aa6b 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/HBaseClient.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/HBaseClient.java
@@ -1,4 +1,4 @@
-package com.geedgenetworks.utils.hbase;
+package com.geedgenetworks.core.utils.hbase;
 
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.*;
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/HbaseConnectBuilder.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/HbaseConnectBuilder.java
index 5883999..8916784 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/HbaseConnectBuilder.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/HbaseConnectBuilder.java
@@ -1,5 +1,6 @@
-package com.geedgenetworks.utils.hbase;
+package com.geedgenetworks.core.utils.hbase;
 
+import com.geedgenetworks.core.config.commonConfig;
 import com.github.rholder.retry.*;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
@@ -12,8 +13,6 @@ import java.io.IOException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import static com.geedgenetworks.config.commonConfig.ZOOKEEPER_QUORUM;
-
 /**
  * A builder class for creating HBase connections. This class provides methods for configuring and
  * building an HBase connection.
@@ -44,7 +43,7 @@ public class HbaseConnectBuilder {
      * @return This HbaseConnectBuilder instance.
      */
     public HbaseConnectBuilder loadDefaultConfig() {
-        this.config.set("hbase.zookeeper.quorum", ZOOKEEPER_QUORUM);
+        this.config.set("hbase.zookeeper.quorum", commonConfig.ZOOKEEPER_QUORUM);
         return this;
     }
 
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/HbaseLookup.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/HbaseLookup.java
index 8593dce..a9ae213 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/HbaseLookup.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/HbaseLookup.java
@@ -1,10 +1,10 @@
-package com.geedgenetworks.utils.hbase;
+package com.geedgenetworks.core.utils.hbase;
 
-import com.geedgenetworks.utils.hbase.async.AsyncQueryExecutor;
-import com.geedgenetworks.utils.hbase.async.Fetcher;
-import com.geedgenetworks.utils.hbase.async.FixedRateFetcher;
-import com.geedgenetworks.utils.hbase.async.state.Cached;
-import com.geedgenetworks.utils.hbase.async.state.HeapCached;
+import com.geedgenetworks.core.utils.hbase.async.AsyncQueryExecutor;
+import com.geedgenetworks.core.utils.hbase.async.Fetcher;
+import com.geedgenetworks.core.utils.hbase.async.FixedRateFetcher;
+import com.geedgenetworks.core.utils.hbase.async.state.Cached;
+import com.geedgenetworks.core.utils.hbase.async.state.HeapCached;
 
 import org.apache.flink.configuration.Configuration;
 import org.apache.hadoop.hbase.client.Connection;
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/async/AsyncQueryExecutor.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/async/AsyncQueryExecutor.java
index 5307898..efb6a8b 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/async/AsyncQueryExecutor.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/async/AsyncQueryExecutor.java
@@ -1,6 +1,6 @@
-package com.geedgenetworks.utils.hbase.async;
+package com.geedgenetworks.core.utils.hbase.async;
 
-import com.geedgenetworks.utils.hbase.async.state.Cached;
+import com.geedgenetworks.core.utils.hbase.async.state.Cached;
 
 /**
  * An abstract class for executing asynchronous queries and caching the results. This class
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/async/Fetcher.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/async/Fetcher.java
index 2202e2f..5468d83 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/async/Fetcher.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/async/Fetcher.java
@@ -1,4 +1,4 @@
-package com.geedgenetworks.utils.hbase.async;
+package com.geedgenetworks.core.utils.hbase.async;
 
 /**
  * An interface for defining a fetcher that performs asynchronous data retrieval. Implementing
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/async/FixedRateFetcher.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/async/FixedRateFetcher.java
index 0bb7be1..704362d 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/async/FixedRateFetcher.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/async/FixedRateFetcher.java
@@ -1,4 +1,4 @@
-package com.geedgenetworks.utils.hbase.async;
+package com.geedgenetworks.core.utils.hbase.async;
 
 import org.apache.flink.api.common.time.Time;
 
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/async/ScheduledSupport.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/async/ScheduledSupport.java
index 03c71ff..12baaea 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/async/ScheduledSupport.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/async/ScheduledSupport.java
@@ -1,4 +1,4 @@
-package com.geedgenetworks.utils.hbase.async;
+package com.geedgenetworks.core.utils.hbase.async;
 
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/async/state/Cached.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/async/state/Cached.java
index 1eb6e66..367bc4e 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/async/state/Cached.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/async/state/Cached.java
@@ -1,4 +1,4 @@
-package com.geedgenetworks.utils.hbase.async.state;
+package com.geedgenetworks.core.utils.hbase.async.state;
 
 import java.io.Closeable;
 
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/async/state/HeapCached.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/async/state/HeapCached.java
index 6c76dd7..b34d4af 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/hbase/async/state/HeapCached.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/hbase/async/state/HeapCached.java
@@ -1,4 +1,4 @@
-package com.geedgenetworks.utils.hbase.async.state;
+package com.geedgenetworks.core.utils.hbase.async.state;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
diff --git a/groot-common/src/main/java/com/geedgenetworks/utils/knowledgeUtil.java b/groot-common/src/main/java/com/geedgenetworks/core/utils/knowledgeUtil.java
index edd9920..e127470 100644
--- a/groot-common/src/main/java/com/geedgenetworks/utils/knowledgeUtil.java
+++ b/groot-common/src/main/java/com/geedgenetworks/core/utils/knowledgeUtil.java
@@ -1,11 +1,12 @@
-package com.geedgenetworks.utils;
+package com.geedgenetworks.core.utils;
 
 import com.alibaba.nacos.api.NacosFactory;
 import com.alibaba.nacos.api.PropertyKeyConst;
 import com.alibaba.nacos.api.config.ConfigService;
 import com.alibaba.nacos.api.config.listener.Listener;
 import com.alibaba.nacos.api.exception.NacosException;
-import com.geedgenetworks.config.commonConfig;
+import com.geedgenetworks.core.config.commonConfig;
+import com.geedgenetworks.utils.StringUtil;
 import com.jayway.jsonpath.JsonPath;
 import org.apache.http.Header;
 import org.apache.http.message.BasicHeader;