1：增加补全程序数据类型ArrayHEADmaster

2：修改版本到21.06.02

7 files changed, 13 insertions, 38 deletions

diff --git a/FlumeDynamicInterceptor/pom.xml b/FlumeDynamicInterceptor/pom.xml
index 3183510..5105072 100644
--- a/FlumeDynamicInterceptor/pom.xml
+++ b/FlumeDynamicInterceptor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dynamic_complement</artifactId>
         <groupId>com.zdjizhi</groupId>
-        <version>v3.21.04.23</version>
+        <version>v3.21.06.02</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
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 e379612..2032000 100644
--- a/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java
+++ b/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/FlumeDynamicApp.java
@@ -181,8 +181,8 @@ public class FlumeDynamicApp implements Interceptor {
                         }
                         break;
                     case "app_match":
-                        if ((int) name != 0 && appendTo == null) {
-                            JsonParseUtil.setValue(object, appendToKeyName, appMatch(appIdHttpUrl, Integer.parseInt(name.toString())));
+                        if (name != null && appendTo == null) {
+                            JsonParseUtil.setValue(object, appendToKeyName, appMatch(appIdHttpUrl, name.toString()));
                         }
                         break;
                     case "geo_ip_country":
@@ -280,11 +280,12 @@ public class FlumeDynamicApp implements Interceptor {
     /**
      * appId与缓存中对应关系补全appName
      *
-     * @param appId id
+     * @param appIds id
      * @return appName
      */
-    private static String appMatch(String appIdHttpUrl, int appId) {
-        String appName = AppUtils.getAppName(appIdHttpUrl, appId);
+    private static String appMatch(String appIdHttpUrl, String appIds) {
+        String appId = appIds.split(FlowWriteConfig.FORMAT_SPLITTER)[0];
+        String appName = AppUtils.getAppName(appIdHttpUrl, Integer.parseInt(appId));
         if (StringUtil.isBlank(appName)) {
             logger.warn("AppMap get appName is null, ID is :{}", appId);
         }
diff --git a/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/common/FlowWriteConfig.java b/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/common/FlowWriteConfig.java
index c31ea2c..a35a457 100644
--- a/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/common/FlowWriteConfig.java
+++ b/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/common/FlowWriteConfig.java
@@ -13,35 +13,6 @@ public class FlowWriteConfig {
     public static final String IS_JSON_KEY_TAG = "$.";
     public static final String IF_CONDITION_SPLITTER = "=";
 
-//    public static final String SEGMENTATION = ",";
-
-    /**
-     * System
-     */
-//    public static final Integer DATA_CENTER_ID_NUM = FlowWriteConfigurations.getIntProperty(0, "data.center.id.num");
-//    public static final String CHECK_IP_SCOPE = FlowWriteConfigurations.getStringProperty(0, "check.ip.scope");
-
-    /**
-     * kafka
-     */
-//    public static final String KAFKA_TOPIC = FlowWriteConfigurations.getStringProperty(0, "kafka.topic");
-
-    /**
-     * zookeeper
-     */
-//    public static final String ZOOKEEPER_SERVERS = FlowWriteConfigurations.getStringProperty(0, "zookeeper.servers");
-    /***
-     * Redis
-     */
-//    public static final String REDIS_IP = "redis.ip";
-//    public static final String REDIS_PORT = "redis.port";
-//    public static final String REDIS_TIMEOUT = "redis.timeout";
-//    public static final String REDIS_POOL_MAXACTIVE = "redis.pool.maxActive";
-//    public static final String REDIS_POOL_MAXIDLE = "redis.pool.maxIdle";
-//    public static final String REDIS_POOL_MAXWAIT = "redis.pool.maxWait";
-//    public static final String REDIS_POOL_TESTONBORROW = "redis.pool.testOnBorrow";
-//    public static final String REDIS_POOL_TESTONRETURN = "redis.pool.testOnReturn";
-
     /**
      * flume使用配置
      */
diff --git a/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/json/JsonParseUtil.java b/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/json/JsonParseUtil.java
index 3ee9f3b..2c4bd81 100644
--- a/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/json/JsonParseUtil.java
+++ b/FlumeDynamicInterceptor/src/main/java/com/zdjizhi/flume/interceptor/utils/json/JsonParseUtil.java
@@ -36,6 +36,9 @@ public class JsonParseUtil {
             case "long":
                 clazz = long.class;
                 break;
+            case "array":
+                clazz = JSONArray.class;
+                break;
             case "Integer":
                 clazz = Integer.class;
                 break;
diff --git a/FlumeRadiusOnOffInterceptor/pom.xml b/FlumeRadiusOnOffInterceptor/pom.xml
index 63a761f..063ffa6 100644
--- a/FlumeRadiusOnOffInterceptor/pom.xml
+++ b/FlumeRadiusOnOffInterceptor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dynamic_complement</artifactId>
         <groupId>com.zdjizhi</groupId>
-        <version>v3.21.04.23</version>
+        <version>v3.21.06.02</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/FlumeSubscriberInterceptor/pom.xml b/FlumeSubscriberInterceptor/pom.xml
index 49d353a..a16c0ab 100644
--- a/FlumeSubscriberInterceptor/pom.xml
+++ b/FlumeSubscriberInterceptor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dynamic_complement</artifactId>
         <groupId>com.zdjizhi</groupId>
-        <version>v3.21.04.23</version>
+        <version>v3.21.06.02</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 951e272..681a0cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.zdjizhi</groupId>
     <artifactId>dynamic_complement</artifactId>
     <packaging>pom</packaging>
-    <version>v3.21.04.23</version>
+    <version>v3.21.06.02</version>
     <modules>
         <module>FlumeDynamicInterceptor</module>
 		<module>FlumeSubscriberInterceptor</module>