Merge remote-tracking branch 'origin/developer' into developer

byit-myth-executor/myth-executor-server/src/main/java/com/byit/service/ScriptExecutorServiceImpl.java

@@ -108,6 +108,11 @@ public class ScriptExecutorServiceImpl implements ScriptExecutorService {
         MythJobProcess mythJobProcess = new MythJobProcess(cmdList, null, null, scriptDto.getLogId(), stringRedisTemplate);
         //保存日志
         String logData = mythJobProcess.call();
+        //成功 是0  失败是其他的   杀死是-100
+        int exitCode = mythJobProcess.getExitCode();
+        if(exitCode == -100){
+            logData = "该任务节点已被强制kill！";
+        }
         byte[] logDataByte = stringToByteArray(logData);
         Map<String,String> fileMateData = new HashMap<String,String>(2);
         fileMateData.put("filename",scriptDto.getRunId()+scriptDto.getRunId()+".log");
@@ -124,9 +129,15 @@ public class ScriptExecutorServiceImpl implements ScriptExecutorService {
             }else{
                 //上传日志文件
                 logPath = fileSystem.uploadFile(logDataByte,"log",fileMateData);
+            }
+
+            if(exitCode == 0){
                 jobRunResultDto.setReturnResult(ReturnResult.SUCCESS);
+            }else{
+                jobRunResultDto.setReturnResult(ReturnResult.FAIL);
             }
 
+
         } catch (ProcessFailureException ignored){
             jobRunResultDto.setReturnResult(ReturnResult.FAIL);
         } catch (IOException | MyException e) {