调度过期策略重构，代码组件化拆分并完善日志；

doc/XXL-JOB官方文档.md

@@ -2579,6 +2579,7 @@ public void execute() {
 - 7、【优化】调度组件日志完善，提升边界情况下问题定位效率；
 - 8、【修复】调度预读任务数量调整，改为调度线程池大小x10，降低事务颗粒度，提升性能及稳定性；
 - 9、【优化】调度不重不漏逻辑优化：调度时间轮单刻度数据去重，避免极端情况下任务重复执行；时间轮转动时校验临近刻度，避免极端情况下遗漏刻度；
+- 10、【重构】调度过期策略重构，代码组件化拆分并完善日志；
 
 - 7、【ING】UI框架重构升级，提升交互体验；
 - 8、【ING】调整资源加载逻辑，移除不必要的拦截器逻辑，提升页面加载效率；

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobInfoController.java

@@ -5,7 +5,7 @@ import com.xxl.job.admin.model.XxlJobGroup;
 import com.xxl.job.admin.model.XxlJobInfo;
 import com.xxl.job.admin.scheduler.exception.XxlJobException;
 import com.xxl.job.admin.scheduler.route.ExecutorRouteStrategyEnum;
-import com.xxl.job.admin.scheduler.enums.MisfireStrategyEnum;
+import com.xxl.job.admin.scheduler.misfire.MisfireStrategyEnum;
 import com.xxl.job.admin.scheduler.enums.ScheduleTypeEnum;
 import com.xxl.job.admin.scheduler.thread.JobScheduleHelper;
 import com.xxl.job.admin.service.XxlJobService;

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/enums/MisfireStrategyEnum.java

@@ -1,39 +0,0 @@
-package com.xxl.job.admin.scheduler.enums;
-
-import com.xxl.job.admin.util.I18nUtil;
-
-/**
- * @author xuxueli 2020-10-29 21:11:23
- */
-public enum MisfireStrategyEnum {
-
-    /**
-     * do nothing
-     */
-    DO_NOTHING(I18nUtil.getString("misfire_strategy_do_nothing")),
-
-    /**
-     * fire once now
-     */
-    FIRE_ONCE_NOW(I18nUtil.getString("misfire_strategy_fire_once_now"));
-
-    private String title;
-
-    MisfireStrategyEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public static MisfireStrategyEnum match(String name, MisfireStrategyEnum defaultItem){
-        for (MisfireStrategyEnum item: MisfireStrategyEnum.values()) {
-            if (item.name().equals(name)) {
-                return item;
-            }
-        }
-        return defaultItem;
-    }
-
-}

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/MisfireHandler.java

@@ -0,0 +1,17 @@
+package com.xxl.job.admin.scheduler.misfire;
+
+/**
+ * Misfire Handler
+ *
+ * @author xuxueli 2020-10-29
+ */
+public abstract class MisfireHandler {
+
+    /**
+     * misfire handle
+     *
+     * @param jobId jobId
+     */
+    public abstract void handle(final int jobId);
+
+}

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/MisfireStrategyEnum.java

@@ -0,0 +1,54 @@
+package com.xxl.job.admin.scheduler.misfire;
+
+import com.xxl.job.admin.scheduler.misfire.strategy.MisfireDoNothing;
+import com.xxl.job.admin.scheduler.misfire.strategy.MisfireFireOnceNow;
+import com.xxl.job.admin.util.I18nUtil;
+
+/**
+ * @author xuxueli 2020-10-29 21:11:23
+ */
+public enum MisfireStrategyEnum {
+
+    /**
+     * do nothing
+     */
+    DO_NOTHING(I18nUtil.getString("misfire_strategy_do_nothing"), new MisfireDoNothing()),
+
+    /**
+     * fire once now
+     */
+    FIRE_ONCE_NOW(I18nUtil.getString("misfire_strategy_fire_once_now"), new MisfireFireOnceNow());
+
+    private final String title;
+    private final MisfireHandler misfireHandler;
+
+    MisfireStrategyEnum(String title, MisfireHandler misfireHandler) {
+        this.title = title;
+        this.misfireHandler = misfireHandler;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public MisfireHandler getMisfireHandler() {
+        return misfireHandler;
+    }
+
+    /**
+     * match misfire strategy
+     *
+     * @param name          name of misfire strategy
+     * @param defaultItem   default misfire strategy
+     * @return misfire strategy
+     */
+    public static MisfireStrategyEnum match(String name, MisfireStrategyEnum defaultItem){
+        for (MisfireStrategyEnum item: MisfireStrategyEnum.values()) {
+            if (item.name().equals(name)) {
+                return item;
+            }
+        }
+        return defaultItem;
+    }
+
+}

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/strategy/MisfireDoNothing.java

@@ -0,0 +1,15 @@
+package com.xxl.job.admin.scheduler.misfire.strategy;
+
+import com.xxl.job.admin.scheduler.misfire.MisfireHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MisfireDoNothing extends MisfireHandler {
+    private static final Logger logger = LoggerFactory.getLogger(MisfireDoNothing.class);
+
+    @Override
+    public void handle(int jobId) {
+        logger.warn(">>>>>>>>>>> xxl-job, schedule MisfireDoNothing: jobId = " + jobId );
+    }
+
+}

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/misfire/strategy/MisfireFireOnceNow.java

@@ -0,0 +1,19 @@
+package com.xxl.job.admin.scheduler.misfire.strategy;
+
+import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap;
+import com.xxl.job.admin.scheduler.misfire.MisfireHandler;
+import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class MisfireFireOnceNow extends MisfireHandler {
+    protected static Logger logger = LoggerFactory.getLogger(MisfireFireOnceNow.class);
+
+    @Override
+    public void handle(int jobId) {
+        // FIRE_ONCE_NOW 》 trigger
+        XxlJobAdminBootstrap.getInstance().getJobTriggerPoolHelper().trigger(jobId, TriggerTypeEnum.MISFIRE, -1, null, null, null);
+        logger.warn(">>>>>>>>>>> xxl-job, schedule MisfireFireOnceNow: jobId = " + jobId );
+    }
+
+}

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/route/ExecutorRouter.java

@@ -16,7 +16,7 @@ public abstract class ExecutorRouter {
     /**
      * route address
      *
-     * @param addressList
+     * @param addressList  executor address list
      * @return  ReturnT.content=address
      */
     public abstract ReturnT<String> route(TriggerParam triggerParam, List<String> addressList);

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobScheduleHelper.java

@@ -3,7 +3,7 @@ package com.xxl.job.admin.scheduler.thread;
 import com.xxl.job.admin.model.XxlJobInfo;
 import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap;
 import com.xxl.job.admin.scheduler.cron.CronExpression;
-import com.xxl.job.admin.scheduler.enums.MisfireStrategyEnum;
+import com.xxl.job.admin.scheduler.misfire.MisfireStrategyEnum;
 import com.xxl.job.admin.scheduler.enums.ScheduleTypeEnum;
 import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum;
 import com.xxl.tool.core.CollectionTool;
@@ -80,15 +80,9 @@ public class JobScheduleHelper {
                                 if (nowTime > jobInfo.getTriggerNextTime() + PRE_READ_MS) {
                                     // 2.1、trigger-expire > 5s：pass && make next-trigger-time
 
-                                    // 1、misfire match
+                                    // 1、misfire handle
                                     MisfireStrategyEnum misfireStrategyEnum = MisfireStrategyEnum.match(jobInfo.getMisfireStrategy(), MisfireStrategyEnum.DO_NOTHING);
-                                    if (MisfireStrategyEnum.FIRE_ONCE_NOW == misfireStrategyEnum) {
+                                    misfireStrategyEnum.getMisfireHandler().handle(jobInfo.getId());
-                                        // FIRE_ONCE_NOW 》 trigger
-                                        XxlJobAdminBootstrap.getInstance().getJobTriggerPoolHelper().trigger(jobInfo.getId(), TriggerTypeEnum.MISFIRE, -1, null, null, null);
-                                        logger.debug(">>>>>>>>>>> xxl-job, schedule misfire, FIRE_ONCE_NOW trigger : jobId = " + jobInfo.getId() );
-                                    } else {
-                                        logger.debug(">>>>>>>>>>> xxl-job, schedule misfire, DO_NOTHING: jobId = " + jobInfo.getId() );
-                                    }
 
                                     // 2、fresh next
                                     refreshNextValidTime(jobInfo, new Date());
@@ -96,7 +90,7 @@ public class JobScheduleHelper {
                                 } else if (nowTime > jobInfo.getTriggerNextTime()) {
                                     // 2.2、trigger-expire < 5s：direct-trigger && make next-trigger-time
 
-                                    // 1、trigger
+                                    // 1、trigger direct
                                     XxlJobAdminBootstrap.getInstance().getJobTriggerPoolHelper().trigger(jobInfo.getId(), TriggerTypeEnum.CRON, -1, null, null, null);
                                     logger.debug(">>>>>>>>>>> xxl-job, schedule expire, direct trigger : jobId = " + jobInfo.getId() );
 
@@ -109,7 +103,7 @@ public class JobScheduleHelper {
                                         // 1、make ring second
                                         int ringSecond = (int)((jobInfo.getTriggerNextTime()/1000)%60);
 
-                                        // 2、push time ring
+                                        // 2、push time ring (pre read)
                                         pushTimeRing(ringSecond, jobInfo.getId());
                                         logger.debug(">>>>>>>>>>> xxl-job, schedule pre-read, push trigger : jobId = " + jobInfo.getId() );
 

xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java

@@ -6,7 +6,7 @@ import com.xxl.job.admin.model.XxlJobInfo;
 import com.xxl.job.admin.model.XxlJobLogReport;
 import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap;
 import com.xxl.job.admin.scheduler.cron.CronExpression;
-import com.xxl.job.admin.scheduler.enums.MisfireStrategyEnum;
+import com.xxl.job.admin.scheduler.misfire.MisfireStrategyEnum;
 import com.xxl.job.admin.scheduler.enums.ScheduleTypeEnum;
 import com.xxl.job.admin.scheduler.route.ExecutorRouteStrategyEnum;
 import com.xxl.job.admin.scheduler.thread.JobScheduleHelper;

xxl-job-admin/src/test/java/com/xxl/job/admin/mapper/XxlJobInfoMapperTest.java

@@ -1,7 +1,7 @@
 package com.xxl.job.admin.mapper;
 
 import com.xxl.job.admin.model.XxlJobInfo;
-import com.xxl.job.admin.scheduler.enums.MisfireStrategyEnum;
+import com.xxl.job.admin.scheduler.misfire.MisfireStrategyEnum;
 import com.xxl.job.admin.scheduler.enums.ScheduleTypeEnum;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.Test;