diff --git a/pom.xml b/pom.xml
index 08db21b..3222397 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.zdjizhi
log-stream-doublewrite
- 22.04
+ 22.04-v3
log-stream-doublewrite
http://www.example.com
@@ -39,7 +39,7 @@
2.2.3
1.2.0
1.0.8
-
+ provided
diff --git a/properties/service_flow_config.properties b/properties/service_flow_config.properties
index 241d28c..06a33b3 100644
--- a/properties/service_flow_config.properties
+++ b/properties/service_flow_config.properties
@@ -1,35 +1,35 @@
#--------------------------------地址配置------------------------------#
#管理kafka地址
-source.kafka.servers=10.3.60.3:9094
+source.kafka.servers=192.168.44.12:9094
#百分点输出kafka地址
-percent.sink.kafka.servers=10.3.45.126:6667,10.3.45.127:6667,10.3.45.128:6667
+percent.sink.kafka.servers=192.168.44.12:9094
#文件源数据topic输出kafka地址
-file.data.sink.kafka.servers=10.3.60.3:9094
+file.data.sink.kafka.servers=192.168.44.12:9094
#zookeeper 地址 用于配置log_id
-zookeeper.servers=10.3.60.3:2181
+zookeeper.servers=192.168.44.12:2181
#hbase zookeeper地址 用于连接HBase
-hbase.zookeeper.servers=10.3.60.3:2181
+hbase.zookeeper.servers=192.168.44.12:2181
#--------------------------------HTTP/定位库------------------------------#
#定位库地址
-tools.library=/opt/dat/
+tools.library=C:\\workspace\\dat\\
#--------------------------------nacos配置------------------------------#
#nacos 地址
-nacos.server=10.3.60.3:8848
+nacos.server=192.168.44.12:8848
#nacos namespace
-nacos.schema.namespace=prod
+nacos.schema.namespace=P19
#nacos topology_common_config.properties namespace
-nacos.common.namespace=prod
+nacos.common.namespace=P19
#nacos data id
-nacos.data.id=session_record.json
+nacos.data.id=security_event.json
#------------------------------------OOS配置------------------------------------#
#oos地址
@@ -38,10 +38,10 @@ oos.servers=10.3.45.100:8057
#--------------------------------Kafka消费/生产配置------------------------------#
#kafka 接收数据topic
-source.kafka.topic=SESSION-RECORD
+source.kafka.topic=test
#百分点对应的topic
-percent.kafka.topic=SESSION-RECORD
+percent.kafka.topic=PERCENT-RECORD
#文件源数据topic
file.data.kafka.topic=test-file-data
diff --git a/src/main/java/com/zdjizhi/bean/FileMeta.java b/src/main/java/com/zdjizhi/bean/FileMeta.java
index e24e0b4..96a18ea 100644
--- a/src/main/java/com/zdjizhi/bean/FileMeta.java
+++ b/src/main/java/com/zdjizhi/bean/FileMeta.java
@@ -6,7 +6,7 @@ public class FileMeta {
private long common_log_id;
protected int common_recv_time;
private String common_schema_type;
- private JSONArray sourceList;
+ private JSONArray source_list;
private int processing_time;
public long getCommon_log_id() {
@@ -33,12 +33,12 @@ public class FileMeta {
this.common_schema_type = common_schema_type;
}
- public JSONArray getSourceList() {
- return sourceList;
+ public JSONArray getSource_list() {
+ return source_list;
}
- public void setSourceList(JSONArray sourceList) {
- this.sourceList = sourceList;
+ public void setSource_list(JSONArray source_list) {
+ this.source_list = source_list;
}
public int getProcessing_time() {
diff --git a/src/main/java/com/zdjizhi/utils/functions/DealFileProcessFunction.java b/src/main/java/com/zdjizhi/utils/functions/DealFileProcessFunction.java
index a90f2f2..bec1fe5 100644
--- a/src/main/java/com/zdjizhi/utils/functions/DealFileProcessFunction.java
+++ b/src/main/java/com/zdjizhi/utils/functions/DealFileProcessFunction.java
@@ -10,7 +10,6 @@ import com.zdjizhi.bean.SourceList;
import com.zdjizhi.utils.JsonMapper;
import com.zdjizhi.utils.StringUtil;
import com.zdjizhi.utils.general.FileEdit;
-import com.zdjizhi.utils.json.JsonTypeUtil;
import org.apache.flink.streaming.api.functions.ProcessFunction;
import org.apache.flink.util.Collector;
@@ -53,56 +52,50 @@ public class DealFileProcessFunction extends ProcessFunction