增加日志采集拦截器

flume-interceptor/src/main/java/com/org/apache/flume/interceptor/interceptor/InterceptorDataFormatUtil.java

@@ -37,6 +37,31 @@ public class InterceptorDataFormatUtil {
 		return arrayList;
 		return arrayList;
 	}
 	}
 	
 	
+	public static List<String> newCollectLogDataFormat(JSONObject jsonObj) {
+		List<String> arrayList = new ArrayList<>();
+		arrayList.add(jsonObj.getString("id"));
+		arrayList.add(jsonObj.getString("device_id"));
+		arrayList.add(jsonObj.getString("uid"));
+		arrayList.add(jsonObj.getString("strategy_group_id"));
+		arrayList.add(jsonObj.getString("strategy_version"));
+		arrayList.add(jsonObj.getString("send_time"));
+		arrayList.add(jsonObj.getString("create_time"));
+		arrayList.add(jsonObj.getString("app_key"));
+		arrayList.add(jsonObj.getString("app_type"));
+		arrayList.add(jsonObj.getString("app_channel"));
+		arrayList.add(jsonObj.getString("zone_code"));
+		arrayList.add(jsonObj.getString("zone_name"));
+		arrayList.add(jsonObj.getString("zone_type"));
+		arrayList.add(jsonObj.getString("sdk_version"));
+		arrayList.add(jsonObj.getString("user_agent"));
+		arrayList.add(jsonObj.getString("other_info"));
+		arrayList.add(jsonObj.getString("device_info"));
+		arrayList.add(jsonObj.getString("env_info"));
+		arrayList.add(jsonObj.getString("user_properties"));
+		arrayList.add(jsonObj.getString("unique_id"));
+		return arrayList;
+	}
+	
 	public static List<String> eventLogDataFormat(JSONObject jsonObj) {
 	public static List<String> eventLogDataFormat(JSONObject jsonObj) {
 		List<String> arrayList = new ArrayList<>();
 		List<String> arrayList = new ArrayList<>();
 		arrayList.add(jsonObj.getString("id"));
 		arrayList.add(jsonObj.getString("id"));

flume-interceptor/src/main/java/com/org/apache/flume/interceptor/interceptor/InterceptorSelector.java

@@ -23,6 +23,8 @@ public class InterceptorSelector {
 			return dataSplit(InterceptorDataFormatUtil.zipperDeviceFingerprintDataFormat(jsonObj));
 			return dataSplit(InterceptorDataFormatUtil.zipperDeviceFingerprintDataFormat(jsonObj));
 		}else if(StringUtils.equals(flume_type, "collectLog")) {
 		}else if(StringUtils.equals(flume_type, "collectLog")) {
 			return dataSplit(InterceptorDataFormatUtil.collectLogDataFormat(jsonObj));
 			return dataSplit(InterceptorDataFormatUtil.collectLogDataFormat(jsonObj));
+		}else if(StringUtils.equals(flume_type, "newCollectLog")) {
+			return dataSplit(InterceptorDataFormatUtil.newCollectLogDataFormat(jsonObj));
 		}else if(StringUtils.equals(flume_type, "eventLog")) {
 		}else if(StringUtils.equals(flume_type, "eventLog")) {
 			return dataSplit(InterceptorDataFormatUtil.eventLogDataFormat(jsonObj));
 			return dataSplit(InterceptorDataFormatUtil.eventLogDataFormat(jsonObj));
 		}else if(StringUtils.equals(flume_type, "deviceIdNode")) {
 		}else if(StringUtils.equals(flume_type, "deviceIdNode")) {