fix:foundTime值根据common_end_timestamp_ms填写feature/session-split

3 files changed, 10 insertions, 5 deletions

diff --git a/src/main/java/com/zdjizhi/operator/process/DealFileProcess.java b/src/main/java/com/zdjizhi/operator/process/DealFileProcess.java
index 0e2ac5d..948f3d0 100644
--- a/src/main/java/com/zdjizhi/operator/process/DealFileProcess.java
+++ b/src/main/java/com/zdjizhi/operator/process/DealFileProcess.java
@@ -115,7 +115,7 @@ public class DealFileProcess extends ProcessFunction<JSONObject, JSONObject> {
                     sPort = (int) message.get("common_client_port");
                     dIp = (String) message.get("common_server_ip");
                     dPort = (int) message.get("common_server_port");
-                    foundTime = (long) message.get("common_recv_time");
+                    foundTime = (long) message.get("common_end_timestamp_ms");
                     schemaType = (String) message.get("common_schema_type");
                     domain = (String) message.getOrDefault("common_server_domain", "");
                     account = (String) message.getOrDefault("common_subscribe_id", "");
@@ -137,7 +137,6 @@ public class DealFileProcess extends ProcessFunction<JSONObject, JSONObject> {
                         httpRequestCount++;
                     }
                     if (StringUtil.isNotBlank(rpUrlValue)) {
-
                         String fileId = FileEdit.getFileId(rpUrlValue, "_2");
                         message.put("http_response_body", FileEdit.getFileDownloadUrl(fileId,oosArr[i]));
                         SourceList response = new SourceList();
diff --git a/src/main/java/com/zdjizhi/tools/general/FileEdit.java b/src/main/java/com/zdjizhi/tools/general/FileEdit.java
index ba78ed9..7e8e999 100644
--- a/src/main/java/com/zdjizhi/tools/general/FileEdit.java
+++ b/src/main/java/com/zdjizhi/tools/general/FileEdit.java
@@ -1,5 +1,7 @@
 package com.zdjizhi.tools.general;
 
+import com.zdjizhi.tools.ordinary.MD5Utils;
+
 /**
  * 文件字段操作工具
  */
@@ -28,6 +30,7 @@ public class FileEdit {
     }
 
     public static String getFileId(String filename, String fileSuffix) throws Exception {
-        return filename + fileSuffix;
+        String prefix = MD5Utils.md5Encode(filename);
+        return prefix + fileSuffix;
     }
 }
diff --git a/src/test/java/com/zdjizhi/schema/Test.java b/src/test/java/com/zdjizhi/schema/Test.java
index 46f837b..7d6b969 100644
--- a/src/test/java/com/zdjizhi/schema/Test.java
+++ b/src/test/java/com/zdjizhi/schema/Test.java
@@ -1,7 +1,10 @@
 package com.zdjizhi.schema;
 
+import com.zdjizhi.tools.general.FileEdit;
+import com.zdjizhi.tools.ordinary.MD5Utils;
+
 public class Test {
-    public static void main(String[] args) {
-        System.out.println(26286 & 2132321);
+    public static void main(String[] args) throws Exception {
+        System.out.println(FileEdit.getFileId("4856d031-521e-4426-a03a-42ca4bb96028", "_9"));
     }
 }