[Improve][JDK11] Galaxy版本由1.2.3修改为2.0.1 优化MMDB查询，支持JDK11。重命名exmaples模块，分别为cn-udf-exmaple，end-to-end-exmaple。

20 files changed, 34 insertions, 16 deletions

diff --git a/docs/develop-guide.md b/docs/develop-guide.md
index dc8b44f..621616a 100644
--- a/docs/develop-guide.md
+++ b/docs/develop-guide.md
@@ -43,12 +43,12 @@ When throwing an exception with a hint message and ensure that the exception has
 ## Design Principles
 
 1. Package structure: `com.geedgenetworks.[module].[sub-module]`. `groot-stream` is the parent module, and other modules are dependent on it.
-2. Module naming: `groot-[module]`. e.g. `groot-common`, `groot-core`, `groot-connectors`, `groot-bootstrap`, `groot-example`, etc.
+2. Module naming: `groot-[module]`. e.g. `groot-common`, `groot-core`, `groot-connectors`, `groot-bootstrap`, `groot-examples`, etc.
 3. For unchecked exception (RuntimeException) within the 'groot-common' module, a global exception handling class named 'GrootRuntimeException' is defined. 
 
 ## Run a job example
-All examples are in module `groot-stream-example`. You can run the example [ running or debugging a job in IDEA].
-e.g. we use `groot-stream-example/src/main/java/com/geedgenetworks/example/InlineToConsoleExample.java` as the example, when you produce some sample data in `Inline` and you could see the result in console. as follows:
+All examples are in module `end-to-end-examples`-. You can run the example [ running or debugging a job in IDEA].
+e.g. we use `end-to-end-examples/src/main/java/com/geedgenetworks/example/GrootStreamExample.java` as the example, when you produce some sample data in `Inline` and you could see the result in console. as follows:
 ```json
 {"log_id":155652727148914688,"decoded_as":"BASE","recv_time":111,"fqdn_string":"baidu.com","server_ip":"120.233.20.242","additional_field_subdomain":"baidu.com","client_ip":"192.168.0.1"}
 ```
diff --git a/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/SimpleJobTest.java b/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/SimpleJobTest.java
index 721b733..f5d14cc 100644
--- a/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/SimpleJobTest.java
+++ b/groot-bootstrap/src/test/java/com/geedgenetworks/bootstrap/main/simple/SimpleJobTest.java
@@ -43,7 +43,7 @@ public class SimpleJobTest {
     public void testPipeline() throws Exception {
 
 
-        String[] args ={"--target", "remote", "-c", ".\\grootstream_job_test.yaml"};
+        String[] args ={"--target", "remote", "-c", "grootstream_job_test.yaml"};
         ExecuteCommandArgs executeCommandArgs = CommandLineUtils
                 .parse(args, new ExecuteCommandArgs(), EngineType.FLINK13.getShellName(), true);
 
diff --git a/groot-bootstrap/src/main/resources/grootstream_job_test.yaml b/groot-bootstrap/src/test/resources/grootstream_job_test.yaml
index 45c8f56..45c8f56 100644
--- a/groot-bootstrap/src/main/resources/grootstream_job_test.yaml
+++ b/groot-bootstrap/src/test/resources/grootstream_job_test.yaml
diff --git a/groot-core/src/test/java/com/geedgenetworks/core/udf/test/GeoIpLookupFunctionTest.java b/groot-core/src/test/java/com/geedgenetworks/core/udf/test/GeoIpLookupFunctionTest.java
index ae5cc31..faa65f4 100644
--- a/groot-core/src/test/java/com/geedgenetworks/core/udf/test/GeoIpLookupFunctionTest.java
+++ b/groot-core/src/test/java/com/geedgenetworks/core/udf/test/GeoIpLookupFunctionTest.java
@@ -1,5 +1,6 @@
 package com.geedgenetworks.core.udf.test;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.geedgenetworks.common.config.CommonConfig;
 import com.geedgenetworks.common.config.KnowledgeBaseConfig;
 import com.geedgenetworks.common.exception.GrootStreamRuntimeException;
@@ -89,7 +90,7 @@ public class GeoIpLookupFunctionTest {
         String ispLookup  = GeoIpKnowledgeBaseHandler.lookUp("tsg_ip_location","IP_TO_PROVIDER","2600:1015:b002::");
         assertEquals("", ispLookup);
         String infoLookupToJSONString  = GeoIpKnowledgeBaseHandler.lookUp("tsg_ip_location","IP_TO_JSON","2600:1015:b002::");
-        assertEquals("{\"administrativeArea\":\"Unknown\",\"areaCode\":\" \",\"asn\":\" \",\"country\":\"美国\",\"countryCode\":\"\",\"dependentLocality\":\" \",\"doubleDependentLocality\":\" \",\"isp\":\" \",\"latitude\":\"39.9388\",\"locality\":\" \",\"longitude\":\"-86.1137\",\"organization\":\"\",\"privateIP\":false,\"subAdministrativeArea\":\" \",\"superAdministrativeArea\":\"印第安纳州\"}", infoLookupToJSONString);
+        assertEquals(JSONObject.parseObject(infoLookupToJSONString).getString("country"), "美国");
         String country = GeoIpKnowledgeBaseHandler.lookUpObject("tsg_ip_location","2600:1015:b002::").getCountry();
         assertEquals("美国", country);
         assertNull(GeoIpKnowledgeBaseHandler.lookUpObject("tsg_ip_location", "255.255.255.255"));
diff --git a/groot-examples/cn-example/pom.xml b/groot-examples/cn-udf-example/pom.xml
index e428311..38ae4ea 100644
--- a/groot-examples/cn-example/pom.xml
+++ b/groot-examples/cn-udf-example/pom.xml
@@ -9,8 +9,8 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>cn-example</artifactId>
-    <name>Groot : Examples : CN</name>
+    <artifactId>cn-udf-example</artifactId>
+    <name>Groot : Examples : CN-UDF</name>
     <properties>
         <maven.install.skip>true</maven.install.skip>
         <maven.deploy.skip>true</maven.deploy.skip>
diff --git a/groot-examples/cn-example/src/main/java/com/geedgenetworks/example/CnExample.java b/groot-examples/cn-udf-example/src/main/java/com/geedgenetworks/example/CnExample.java
index 2bc91db..2bc91db 100644
--- a/groot-examples/cn-example/src/main/java/com/geedgenetworks/example/CnExample.java
+++ b/groot-examples/cn-udf-example/src/main/java/com/geedgenetworks/example/CnExample.java
diff --git a/groot-examples/cn-example/src/main/resources/example/cn_grootstream_job_local_template.yaml b/groot-examples/cn-udf-example/src/main/resources/example/cn_grootstream_job_local_template.yaml
index 5a8fcb0..5a8fcb0 100644
--- a/groot-examples/cn-example/src/main/resources/example/cn_grootstream_job_local_template.yaml
+++ b/groot-examples/cn-udf-example/src/main/resources/example/cn_grootstream_job_local_template.yaml
diff --git a/groot-examples/cn-example/src/main/resources/example/cn_grootstream_job_template.yaml b/groot-examples/cn-udf-example/src/main/resources/example/cn_grootstream_job_template.yaml
index 7c448f6..7c448f6 100644
--- a/groot-examples/cn-example/src/main/resources/example/cn_grootstream_job_template.yaml
+++ b/groot-examples/cn-udf-example/src/main/resources/example/cn_grootstream_job_template.yaml
diff --git a/groot-examples/cn-example/src/main/resources/grootstream.yaml b/groot-examples/cn-udf-example/src/main/resources/grootstream.yaml
index 558030c..558030c 100644
--- a/groot-examples/cn-example/src/main/resources/grootstream.yaml
+++ b/groot-examples/cn-udf-example/src/main/resources/grootstream.yaml
diff --git a/groot-examples/cn-example/src/main/resources/udf.plugins b/groot-examples/cn-udf-example/src/main/resources/udf.plugins
index 22804f6..22804f6 100644
--- a/groot-examples/cn-example/src/main/resources/udf.plugins
+++ b/groot-examples/cn-udf-example/src/main/resources/udf.plugins
diff --git a/groot-examples/inline-to-print-example/pom.xml b/groot-examples/end-to-end-example/pom.xml
index 10135cd..0839e8e 100644
--- a/groot-examples/inline-to-print-example/pom.xml
+++ b/groot-examples/end-to-end-example/pom.xml
@@ -9,8 +9,8 @@
         <version>${revision}</version>
     </parent>
 
-    <artifactId>inline-to-print-example</artifactId>
-    <name>Groot : Examples : Inline-to-print</name>
+    <artifactId>end-to-end-example</artifactId>
+    <name>Groot : Examples : End-to-end</name>
 
     <properties>
         <maven.install.skip>true</maven.install.skip>
diff --git a/groot-examples/inline-to-print-example/src/main/java/com/geedgenetworks/example/InlineToPrintExample.java b/groot-examples/end-to-end-example/src/main/java/com/geedgenetworks/example/GrootStreamExample.java
index c139879..825f79a 100644
--- a/groot-examples/inline-to-print-example/src/main/java/com/geedgenetworks/example/InlineToPrintExample.java
+++ b/groot-examples/end-to-end-example/src/main/java/com/geedgenetworks/example/GrootStreamExample.java
@@ -11,9 +11,9 @@ import java.net.URL;
 import java.nio.file.Paths;
 
 
-public class InlineToPrintExample {
+public class GrootStreamExample {
     public static void main(String[] args) throws FileNotFoundException, URISyntaxException {
-        String configPath = args.length > 0 ? args[0] : "/examples/inline_to_print_test.yaml";
+        String configPath = args.length > 0 ? args[0] : "/examples/kafka_to_print.yaml";
         String configFile = getTestConfigFile(configPath);
         ExecuteCommandArgs executeCommandArgs = new ExecuteCommandArgs();
         executeCommandArgs.setConfigFile(configFile);
@@ -25,7 +25,8 @@ public class InlineToPrintExample {
 
     public static String getTestConfigFile(String configFile)
             throws FileNotFoundException, URISyntaxException {
-        URL resource = InlineToPrintExample.class.getResource(configFile);
+        URL resource = GrootStreamExample.class.getResource(configFile);
+
         if (resource == null) {
             throw new FileNotFoundException("Can't find config file: " + configFile);
         }
diff --git a/groot-examples/inline-to-print-example/src/main/resources/examples/inline_to_clickhouse.yaml b/groot-examples/end-to-end-example/src/main/resources/examples/inline_to_clickhouse.yaml
index 370b7a8..370b7a8 100644
--- a/groot-examples/inline-to-print-example/src/main/resources/examples/inline_to_clickhouse.yaml
+++ b/groot-examples/end-to-end-example/src/main/resources/examples/inline_to_clickhouse.yaml
diff --git a/groot-examples/inline-to-print-example/src/main/resources/examples/inline_to_kafka.yaml b/groot-examples/end-to-end-example/src/main/resources/examples/inline_to_kafka.yaml
index 44355c7..44355c7 100644
--- a/groot-examples/inline-to-print-example/src/main/resources/examples/inline_to_kafka.yaml
+++ b/groot-examples/end-to-end-example/src/main/resources/examples/inline_to_kafka.yaml
diff --git a/groot-examples/inline-to-print-example/src/main/resources/examples/inline_to_print.yaml b/groot-examples/end-to-end-example/src/main/resources/examples/inline_to_print.yaml
index daf6e32..daf6e32 100644
--- a/groot-examples/inline-to-print-example/src/main/resources/examples/inline_to_print.yaml
+++ b/groot-examples/end-to-end-example/src/main/resources/examples/inline_to_print.yaml
diff --git a/groot-examples/inline-to-print-example/src/main/resources/examples/inline_to_print_test.yaml b/groot-examples/end-to-end-example/src/main/resources/examples/inline_to_print_test.yaml
index d42c05a..d42c05a 100644
--- a/groot-examples/inline-to-print-example/src/main/resources/examples/inline_to_print_test.yaml
+++ b/groot-examples/end-to-end-example/src/main/resources/examples/inline_to_print_test.yaml
diff --git a/groot-examples/inline-to-print-example/src/main/resources/examples/kafka_to_print.yaml b/groot-examples/end-to-end-example/src/main/resources/examples/kafka_to_print.yaml
index 523d529..523d529 100644
--- a/groot-examples/inline-to-print-example/src/main/resources/examples/kafka_to_print.yaml
+++ b/groot-examples/end-to-end-example/src/main/resources/examples/kafka_to_print.yaml
diff --git a/groot-examples/inline-to-print-example/src/main/resources/log4j2.properties b/groot-examples/end-to-end-example/src/main/resources/log4j2.properties
index 2dc1b8c..2dc1b8c 100644
--- a/groot-examples/inline-to-print-example/src/main/resources/log4j2.properties
+++ b/groot-examples/end-to-end-example/src/main/resources/log4j2.properties
diff --git a/groot-examples/pom.xml b/groot-examples/pom.xml
index 2d7ea4d..fc08086 100644
--- a/groot-examples/pom.xml
+++ b/groot-examples/pom.xml
@@ -13,8 +13,8 @@
     <name>Groot : Examples :</name>
     <packaging>pom</packaging>
     <modules>
-        <module>inline-to-print-example</module>
-        <module>cn-example</module>
+        <module>end-to-end-example</module>
+        <module>cn-udf-example</module>
     </modules>
 
     <properties>
@@ -33,10 +33,26 @@
             <version>${revision}</version>
         </dependency>
 
+
+        <dependency>
+            <groupId>com.geedgenetworks</groupId>
+            <artifactId>connector-kafka</artifactId>
+            <version>${revision}</version>
+            <scope>${scope}</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.geedgenetworks</groupId>
-            <artifactId>groot-common</artifactId>
+            <artifactId>connector-clickhouse</artifactId>
             <version>${revision}</version>
+            <scope>${scope}</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.geedgenetworks</groupId>
+            <artifactId>connector-ipfix-collector</artifactId>
+            <version>${revision}</version>
+            <scope>${scope}</scope>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index d26977d..c732e92 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
         <jsonpath.version>2.4.0</jsonpath.version>
         <fastjson2.version>2.0.32</fastjson2.version>
         <hutool.version>5.8.22</hutool.version>
-        <galaxy.version>1.2.3</galaxy.version>
+        <galaxy.version>2.0.1</galaxy.version>
         <guava-retrying.version>2.0.0</guava-retrying.version>
         <ipaddress.version>5.3.3</ipaddress.version>
         <aviator.version>5.2.6</aviator.version>