解决参数不替换的BUG

byit-myth-core/myth-admin-core/src/main/java/com/byit/task/ScriptExecutorJobTask.java

@@ -11,20 +11,15 @@ import com.byit.dto.plugin.RunLog;
 import com.byit.enums.*;
 import com.byit.enums.task.RunResultEnum;
 import com.byit.enums.task.RunTypeEnum;
-import com.byit.factory.PluginClientFactory;
-import com.byit.factory.PluginSpringClientFactory;
-import com.byit.job.utils.DateUtil;
 import com.byit.job.utils.PlaceholderUtils;
 import com.byit.model.JobTaskRunLogWithBLOBs;
 import com.byit.model.JobTaskSchedule;
-import com.byit.registry.PluginServiceRegistry;
 import com.byit.service.FastRunLogService;
 import com.byit.service.FlowStatusService;
 import com.byit.service.RunScriptService;
 import com.byit.service.impl.JobTaskRunLogServiceImpl;
 import com.byit.job.utils.MythLogUtils;
 import com.byit.util.GetRegConfig;
-import com.byit.util.ServiceInfoUtil;
 import com.byit.util.SpringUtil;
 import io.netty.util.Timeout;
 import io.netty.util.TimerTask;
@@ -88,7 +83,7 @@ public class ScriptExecutorJobTask implements TimerTask {
         return bean.checkFlowStatusIsKill(flowId,runId);
     }
 
-    private String commandBuild(JobTaskSchedule mythJobTaskSchedule){
+    private void paramBuild(JobTaskSchedule mythJobTaskSchedule){
         //获取运行时参数
         String runParam = mythJobTaskSchedule.getRunParam();
         //获取命令
@@ -122,9 +117,8 @@ public class ScriptExecutorJobTask implements TimerTask {
             if(CollectionUtil.isNotEmpty(publicParam)) {
                 command = PlaceholderUtils.commandReplace(command,publicParam );
             }
-
+            mythJobTaskSchedule.setRunCommand(command);
         }
-        return command;
     }
 
     /**
@@ -134,7 +128,8 @@ public class ScriptExecutorJobTask implements TimerTask {
     private void runJob(JobTaskSchedule mythJobTaskSchedule) {
         DispatchResponseDto dispatchResponseDto = new DispatchResponseDto();
         try{
-            mythJobTaskSchedule.setRunCommand(commandBuild(mythJobTaskSchedule));
+            paramBuild(mythJobTaskSchedule);
+            mythJobTaskSchedule.setRunCommand(mythJobTaskSchedule.getRunCommand());
             RunScriptService runScriptService = SpringUtil.getBean(RunScriptService.class);
             JobTaskRunLogServiceImpl jobTaskRunLogService = SpringUtil.getBean(JobTaskRunLogServiceImpl.class);
             log.info("--------------logid:{}----------",mythJobTaskSchedule.getLogId());