单运行命令问题

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

@@ -46,6 +46,10 @@ public class ScriptCommandTaskRunTheLifeCycleCallback implements TaskRunTheLifeC
         String privateParam = runParamWrapped.getPrivateParam();
         ScriptParamAndPlaceholderDto scriptParamAndPlaceholderDto = JSON.parseObject(privateParam, ScriptParamAndPlaceholderDto.class);
         String command = jobTaskSchedule.getRunCommand();
+        if (!command.startsWith(JAVA_TYPE)) {
+            command = command.replaceAll(" ","&&");
+        }
+
         //脚本参数不为空的时候
         if (scriptParamAndPlaceholderDto != null) {
             Map<String, String> param = scriptParamAndPlaceholderDto.getParam();

byit-myth-core/myth-admin-core/src/main/java/com/byit/strategy/task/ScriptParamMergeTaskRunTheLifeCycleCallback.java → byit-myth-core/myth-admin-core/src/main/java/com/byit/strategy/task/ScriptFlowParamMergeTaskRunTheLifeCycleCallback.java

@@ -19,7 +19,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * 脚本参数合并   私有参数与共有参数合并
+ * 脚本参数合并 工作流执行节点下   私有参数与共有参数合并
  *
  * @author huangfu
  * @date 2020年12月14日19:43:30
@@ -27,7 +27,7 @@ import java.util.Map;
 @Component
 @Slf4j
 @MythRankOrder(5)
-public class ScriptParamMergeTaskRunTheLifeCycleCallback implements TaskRunTheLifeCycleCallback {
+public class ScriptFlowParamMergeTaskRunTheLifeCycleCallback implements TaskRunTheLifeCycleCallback {
 
     private final StringRedisTemplate stringRedisTemplate;
     private final RunRecordingService runRecordingService;
@@ -37,7 +37,7 @@ public class ScriptParamMergeTaskRunTheLifeCycleCallback implements TaskRunTheLi
      */
     public static final String SCRIPT = "SCRIPT";
 
-    public ScriptParamMergeTaskRunTheLifeCycleCallback(StringRedisTemplate stringRedisTemplate, RunRecordingService runRecordingService) {
+    public ScriptFlowParamMergeTaskRunTheLifeCycleCallback(StringRedisTemplate stringRedisTemplate, RunRecordingService runRecordingService) {
         this.stringRedisTemplate = stringRedisTemplate;
         this.runRecordingService = runRecordingService;
     }
@@ -122,7 +122,7 @@ public class ScriptParamMergeTaskRunTheLifeCycleCallback implements TaskRunTheLi
             throw new RuntimeException(String.format("调度暂不支持此种类型的任务:%s", jobType));
         }
         boolean equals = typeByCode.getType().equals(SCRIPT);
-        boolean isPlugin =  !(4 == jobTaskSchedule.getScheduleType());
+        boolean isPlugin =  4 != jobTaskSchedule.getScheduleType();
         return equals && isPlugin;
     }
 }