修改立即运行的方式

byit-myth-admin/src/main/java/com/byit/service/impl/ApiNodeServiceImpl.java

@@ -8,6 +8,7 @@ import com.byit.dto.plugin.RunLog;
 import com.byit.dto.plugin.RunNode;
 import com.byit.dto.web.ResponseResult;
 import com.byit.enums.NodePropertyEnum;
+import com.byit.enums.NodeTypeEnum;
 import com.byit.enums.PlaceholderEnum;
 import com.byit.enums.ScheduleTypeEnum;
 import com.byit.job.WorkRoulette;
@@ -109,8 +110,19 @@ public class ApiNodeServiceImpl implements ApiNodeService {
         RunLog runLog = RunLog.builder().isEnd(false).runLog("等待服务器分配资源").build();
         String runKey = "REAL:EXEC:" + logId;
         stringRedisTemplate.opsForList().rightPush(runKey, JSON.toJSONString(runLog, WriteClassName));
+        TimerTask timerTask;
+        if (NodeTypeEnum.JAVA.getCode().equals(runNode.getJobType())) {
+            //构建调度执行器
+            JavaTask javaTask = new JavaTask();
+            javaTask.setTriggerTime(100L);
+            javaTask.setJobName(schedule.getNodeName());
+            javaTask.setTaskName(schedule.getNodeName());
+            javaTask.setParam(schedule.getRunParam());
+            timerTask = new JavaTaskJobTask(javaTask);
+        }else{
+            timerTask = new ScriptExecutorJobTask(schedule);
+        }
 
-        TimerTask timerTask = new ScriptExecutorJobTask(schedule);
         WorkRoulette.addJob(timerTask, triggerTime);
 
         RunLog runLogEnd = RunLog.builder().isEnd(false).runLog("服务器分配资源成功").build();

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

@@ -56,6 +56,8 @@ public class ScheduleThreadRunHelper extends BaseThreadRunHelper {
             log.debug("------排期表查询到有需要存在的节点--------");
             //循环遍历添加任务
             jobTaskSchedules.forEach(mythJobTaskSchedule ->{
+                //除去JAVA任务
+                if(!NodeTypeEnum.JAVA.getCode().equals(mythJobTaskSchedule.getJobType())){
                     if (ScheduleTypeEnum.NORMAL.getCode().equals(mythJobTaskSchedule.getScheduleType())) {
                         mythJobTaskSchedule.setRunParam(PlaceholderUtils.formatParam(mythJobTaskSchedule.getRunParam()));
                     }
@@ -63,6 +65,7 @@ public class ScheduleThreadRunHelper extends BaseThreadRunHelper {
                     assert command != null;
                     command = command.replace("${"+ PlaceholderEnum.DATE_PLACEHOLDER.getName()+"}", DateUtil.dateLessDayStr(new Date(),"yyyyMMdd",1));
                     mythJobTaskSchedule.setRunCommand(command);
+                }
                 Long triggerTime = mythJobTaskSchedule.getTriggerTime();
                 TimerTask timerTask = null;
                 if (NodeTypeEnum.JAVA.getType().equals(mythJobTaskSchedule.getJobType())) {