日志合并

byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/JavaFlowFreeTaskCallbackThread.java

@@ -6,6 +6,7 @@ import com.byit.dto.web.ReturnResult;
 import com.byit.enums.JobResultEnum;
 import com.byit.enums.task.RunResultEnum;
 import com.byit.filesystem.FileSystem;
+import com.byit.job.utils.DateUtil;
 import com.byit.model.JobTaskRunLogWithBLOBs;
 import com.byit.model.RunRecording;
 import com.byit.model.Workspace;
@@ -133,9 +134,15 @@ public class JavaFlowFreeTaskCallbackThread implements Runnable {
             if(StringUtils.isBlank(logRemotelyPath)) {
                 FileSystem fileSystem = SpringUtil.getBean(FileSystem.class);
                 byte[] sourceLogBytes = fileSystem.downloaderFile(thisLogUrlPath);
+                //间隔日志
+                String interval = "\n\n\n 游离节点日志,时间："+ DateUtil.dateFormat(new Date(),"yyyy-MM-dd HH:mm:ss")+"\n";
+                byte[] intervalByte = stringToByteArray(interval);
+                byte[] intervalByteMergeFile = mergeFile(intervalByte,sourceLogBytes);
+                //间隔日志
+
                 String runMsg = jobTaskRunLogWithBLOBs.getRunMsg();
                 byte[] bytes = stringToByteArray(runMsg);
-                byte[] mergeFile = mergeFile(sourceLogBytes, bytes);
+                byte[] mergeFile = mergeFile(intervalByteMergeFile, bytes);
                 Map<String, String> fileMate = fileSystem.getFileMate(thisLogUrlPath);
                 String logPath = fileSystem.uploadFile(mergeFile, "log", fileMate);
                 jobTaskRunLogWithBLOBs.setLogRemotelyPath(logPath);
@@ -152,7 +159,7 @@ public class JavaFlowFreeTaskCallbackThread implements Runnable {
     public String mergeLog(String sourceLogPath,String targetLogPath) throws IOException {
         FileSystem fileSystem = SpringUtil.getBean(FileSystem.class);
         byte[] sourceLogBytes = fileSystem.downloaderFile(sourceLogPath);
-        String interval = "\n\n\n 游离节点日志：\n";
+        String interval = "\n\n\n 游离节点日志,时间："+ DateUtil.dateFormat(new Date(),"yyyy-MM-dd HH:mm:ss")+"\n";
         byte[] intervalByte = stringToByteArray(interval);
         sourceLogBytes = mergeFile(sourceLogBytes, intervalByte);
         byte[] targetLogBytes = fileSystem.downloaderFile(targetLogPath);