diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c85e31b..3e13f40 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,12 +2,9 @@ - - - - + @@ -58,24 +55,22 @@ - - + + - - - + - - + + @@ -83,7 +78,7 @@ - + @@ -95,8 +90,8 @@ - - + + @@ -122,8 +117,8 @@ - - + + @@ -136,10 +131,10 @@ @@ -166,7 +161,17 @@ - + + + + + + + + + + + - - @@ -350,14 +394,15 @@ 1591958573741 + - - + @@ -366,23 +411,23 @@ - + - + - + - + @@ -392,34 +437,34 @@ - - - - + + - + + - + - - + + + + + - - - + - + @@ -429,6 +474,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -481,17 +581,28 @@ - + + + - - + + + + + + + + + + + + - - + @@ -501,12 +612,18 @@ - - + + + + + + + + + - @@ -514,29 +631,10 @@ - - - - - - - - - - - - - - - - - - - - - + + diff --git a/FlumeDynamicInterceptor/dependency-reduced-pom.xml b/FlumeDynamicInterceptor/dependency-reduced-pom.xml new file mode 100644 index 0000000..ff88a66 --- /dev/null +++ b/FlumeDynamicInterceptor/dependency-reduced-pom.xml @@ -0,0 +1,135 @@ + + + + dynamic_complement + com.zdjizhi + 1.0 + + 4.0.0 + FlumeDynamicInterceptor + + + + properties + + **/*.properties + **/*.xml + + + + + + maven-shade-plugin + 2.4.1 + + + package + + shade + + + + + + com.zdjizhi.flume.interceptor.FlumeDynamicApp + + + META-INF/spring.handlers + + + META-INF/spring.schemas + + + + + + + true + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + + exec + + + + + java + true + false + compile + com.zdjizhi.flume.interceptor.FlumeDynamicApp + + + + maven-compiler-plugin + 2.3.2 + + 1.8 + 1.8 + + + + + + + nexus + Team Nexus Repository + http://192.168.40.125:8099/content/groups/public + + + ebi + www.ebi.ac.uk + http://www.ebi.ac.uk/intact/maven/nexus/content/groups/public/ + + + + + org.apache.flume + flume-ng-core + 1.9.0 + provided + + + flume-ng-sdk + org.apache.flume + + + flume-ng-configuration + org.apache.flume + + + flume-ng-auth + org.apache.flume + + + avro-ipc + org.apache.avro + + + jetty-jmx + org.eclipse.jetty + + + libthrift + org.apache.thrift + + + mina-core + org.apache.mina + + + + + + 2.2.1 + 1.9.0 + UTF-8 + + + diff --git a/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java b/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java index 13c7efe..55423ec 100644 --- a/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java +++ b/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java @@ -61,9 +61,10 @@ public class FlumeDynamicApp implements Interceptor { /** * v1.0.3-com.zdjizhi.galaxy */ - .loadDataFile(ipDatPath + "all_ip_info_v4.mmdb") - .loadDataFilePrivateV4(ipDatPath + "ip_private.mmdb") - .loadDataFilePrivateV6(ipDatPath + "ip_private.mmdb") + .loadDataFileV4(ipDatPath + "ip_v4.mmdb") + .loadDataFileV6(ipDatPath + "ip_v6.mmdb") + .loadDataFilePrivateV4(ipDatPath + "ip_private_v4.mmdb") + .loadDataFilePrivateV6(ipDatPath + "ip_private_v6.mmdb") .loadAsnDataFile(ipDatPath + "asn_v4.mmdb") .loadAsnDataFileV6(ipDatPath + "asn_v6.mmdb") .build(); diff --git a/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/hbase/HBaseUtils.java b/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/hbase/HBaseUtils.java index 65681c4..85abf73 100644 --- a/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/hbase/HBaseUtils.java +++ b/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/hbase/HBaseUtils.java @@ -24,7 +24,7 @@ import java.util.TimerTask; public class HBaseUtils { private final static Logger logger = Logger.getLogger(HBaseUtils.class); - private static Map subIdMap = new HashMap<>(333334); + private static Map subIdMap = new HashMap<>(128); private static Connection connection; private static Long time;