日志合并

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

@@ -127,8 +127,23 @@ public class JavaFlowFreeTaskCallbackThread implements Runnable {
         List<JobTaskRunLogWithBLOBs> jobTaskRunLogWithBLOBsByFlowIdAndRunId = mythJobTaskRunLogService.findJobTaskRunLogWithBLOBsByFlowIdAndRunId(runRecording.getFlowId(), runRecording.getRunId());
         JobTaskRunLogWithBLOBs jobTaskRunLogWithBLOBs = jobTaskRunLogWithBLOBsByFlowIdAndRunId.stream().filter(log -> log.getNodeName().equals(specialJavaNode.getNodeName())).findFirst().orElse(null);
         if(jobTaskRunLogWithBLOBs != null) {
-            String logPath = mergeLog(jobTaskRunLogWithBLOBs.getLogRemotelyPath(), specialJavaNode.getThisLogUrlPath());
-            jobTaskRunLogWithBLOBs.setLogRemotelyPath(logPath);
+            String logRemotelyPath = jobTaskRunLogWithBLOBs.getLogRemotelyPath();
+            //平台传过来的
+            String thisLogUrlPath = specialJavaNode.getThisLogUrlPath();
+            if(StringUtils.isBlank(logRemotelyPath)) {
+                FileSystem fileSystem = SpringUtil.getBean(FileSystem.class);
+                byte[] sourceLogBytes = fileSystem.downloaderFile(thisLogUrlPath);
+                String runMsg = jobTaskRunLogWithBLOBs.getRunMsg();
+                byte[] bytes = stringToByteArray(runMsg);
+                byte[] mergeFile = mergeFile(sourceLogBytes, bytes);
+                Map<String, String> fileMate = fileSystem.getFileMate(thisLogUrlPath);
+                String logPath = fileSystem.uploadFile(mergeFile, "log", fileMate);
+                jobTaskRunLogWithBLOBs.setLogRemotelyPath(logPath);
+            }else{
+                String logPath = mergeLog(logRemotelyPath, thisLogUrlPath);
+                jobTaskRunLogWithBLOBs.setLogRemotelyPath(logPath);
+            }
+
             return jobTaskRunLogWithBLOBs;
         }
         return null;