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

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

@@ -69,7 +69,7 @@ public class ApiNodeServiceImpl implements ApiNodeService {
         ValidationUtil.dataNotBank(runNode.getRunCmd(), "运行命令不允许为空！");
         ValidationUtil.dataNotBank(runNode.getJobType(), "节点类型不允许为空！");
 
-        Long triggerTime = System.currentTimeMillis()+500;
+        Long triggerTime = System.currentTimeMillis();
 
 
         JobTaskSchedule schedule = new JobTaskSchedule();

byit-myth-core/myth-admin-core/src/main/java/com/byit/job/WorkRoulette.java

@@ -24,11 +24,16 @@ public class WorkRoulette {
      * maxPendingTimeouts:最大等待处理超时
      */
     private static final HashedWheelTimer HASHED_WHEEL_TIMER = new HashedWheelTimer(r -> new Thread(r, "HASHED_WHEEL_TIMER" + r.hashCode()), 1, TimeUnit.SECONDS, 8, true, 0);
+    public static final int INT = 500;
 
 
     public static void addJob(TimerTask timerTask,long triggerNextTime) {
-        log.info("-----任务{}毫秒后执行-------",triggerNextTime-System.currentTimeMillis());
-        HASHED_WHEEL_TIMER.newTimeout(timerTask, TimeUnit.MILLISECONDS.toNanos(triggerNextTime-System.currentTimeMillis()), TimeUnit.NANOSECONDS);
+        log.debug("-----任务{}毫秒后执行-------",triggerNextTime-System.currentTimeMillis());
+        long time = triggerNextTime-System.currentTimeMillis();
+        if(time < INT){
+            time = INT;
+        }
+        HASHED_WHEEL_TIMER.newTimeout(timerTask, TimeUnit.MILLISECONDS.toNanos(time), TimeUnit.NANOSECONDS);
     }
 
 }