修改脚本运行时的获取方式

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

@@ -5,6 +5,7 @@ import com.byit.dto.executor.DispatchResponseDto;
 import com.byit.dto.executor.JobRunResultDto;
 import com.byit.dto.executor.ScriptDto;
 import com.byit.dto.executor.ScriptParamAndPlaceholderDto;
+import com.byit.enums.PlaceholderEnum;
 import com.byit.executor.api.ScriptExecutorService;
 import com.byit.process.MythJobProcess;
 import com.byit.process.ProcessFailureException;
@@ -95,11 +96,12 @@ public class ScriptExecutorServiceImpl implements ScriptExecutorService {
         if(null != param){
             scriptParamAndPlaceholderDto = JSON.parseObject(param, ScriptParamAndPlaceholderDto.class);
         }
-
-        String scriptPath = byteArrayToFile(remotePath,scriptParamAndPlaceholderDto);
-        log.info("-------------脚本所在路径为：{}-------------",scriptPath);
-        //初始化命令信息
-        command = PlaceholderUtils.initCommand(command,scriptPath);
+        if (null != command && command.contains(PlaceholderEnum.BIZ_SCRIPT_FILE.getName())){
+            String scriptPath = byteArrayToFile(remotePath,scriptParamAndPlaceholderDto);
+            log.info("-------------脚本所在路径为：{}-------------",scriptPath);
+            //初始化命令信息
+            command = PlaceholderUtils.initCommand(command,scriptPath);
+        }
         //开始执行脚本
         if(scriptParamAndPlaceholderDto != null){
             command = PlaceholderUtils.commandReplace(command,scriptParamAndPlaceholderDto.getParam());
@@ -147,7 +149,7 @@ public class ScriptExecutorServiceImpl implements ScriptExecutorService {
             jobRunResultDto.setReturnResult(ReturnResult.FAIL);
             e.printStackTrace();
         }
-        log.info("-----------执行命令，{},{}-----------",command,scriptPath);
+        log.info("-----------执行命令，{}-----------",command);
         //设置结束时间
         jobRunResultDto.setEndTime(new Date());
         jobRunResultDto.setLogId(scriptDto.getLogId());