度过期策略、调度类型策略逻辑重构，代码组件化拆分并完善日志，提升健壮性及可维护性；

doc/XXL-JOB官方文档.md

@@ -2579,12 +2579,11 @@ public void execute() {
 - 7、【优化】调度组件日志完善，提升边界情况下问题定位效率；
 - 8、【修复】调度预读任务数量调整，改为调度线程池大小x10，降低事务颗粒度，提升性能及稳定性；
 - 9、【优化】调度不重不漏逻辑优化：调度时间轮单刻度数据去重，避免极端情况下任务重复执行；时间轮转动时校验临近刻度，避免极端情况下遗漏刻度；
-- 10、【重构】调度过期策略重构，代码组件化拆分并完善日志；
+- 10、【重构】调度过期策略、调度类型策略逻辑重构，代码组件化拆分并完善日志，提升健壮性及可维护性；
-
+- 11、【ING】UI框架重构升级，提升交互体验；
-- 7、【ING】UI框架重构升级，提升交互体验；
+- 12、【ING】调整资源加载逻辑，移除不必要的拦截器逻辑，提升页面加载效率；
-- 8、【ING】调整资源加载逻辑，移除不必要的拦截器逻辑，提升页面加载效率；
+- 13、【ING】规范API交互协议，通用响应结构体调整为Response；
-- 9、【ING】规范API交互协议，通用响应结构体调整为Response；
+- 14、【ING】Http通讯组件升级，基于接口代理方式重构；
-- 10、【ING】Http通讯组件升级，基于接口代理方式重构；
 
 
 ### TODO LIST

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

@@ -6,8 +6,7 @@ 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.misfire.MisfireStrategyEnum;
-import com.xxl.job.admin.scheduler.enums.ScheduleTypeEnum;
+import com.xxl.job.admin.scheduler.type.ScheduleTypeEnum;
-import com.xxl.job.admin.scheduler.thread.JobScheduleHelper;
 import com.xxl.job.admin.service.XxlJobService;
 import com.xxl.job.admin.util.I18nUtil;
 import com.xxl.job.admin.util.JobGroupPermissionUtil;
@@ -155,7 +154,12 @@ public class JobInfoController {
 		try {
 			Date lastTime = new Date();
 			for (int i = 0; i < 5; i++) {
-				lastTime = JobScheduleHelper.generateNextValidTime(paramXxlJobInfo, lastTime);
+
+				// generate next trigger time
+				ScheduleTypeEnum scheduleTypeEnum = ScheduleTypeEnum.match(paramXxlJobInfo.getScheduleType(), ScheduleTypeEnum.NONE);
+				lastTime = scheduleTypeEnum.getScheduleType().generateNextTriggerTime(paramXxlJobInfo, lastTime);
+
+				// collect data
 				if (lastTime != null) {
 					result.add(DateUtil.formatDateTime(lastTime));
 				} else {

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

@@ -1,46 +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 ScheduleTypeEnum {
-
-    NONE(I18nUtil.getString("schedule_type_none")),
-
-    /**
-     * schedule by cron
-     */
-    CRON(I18nUtil.getString("schedule_type_cron")),
-
-    /**
-     * schedule by fixed rate (in seconds)
-     */
-    FIX_RATE(I18nUtil.getString("schedule_type_fix_rate")),
-
-    /**
-     * schedule by fix delay (in seconds)， after the last time
-     */
-    /*FIX_DELAY(I18nUtil.getString("schedule_type_fix_delay"))*/;
-
-    private String title;
-
-    ScheduleTypeEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public static ScheduleTypeEnum match(String name, ScheduleTypeEnum defaultItem){
-        for (ScheduleTypeEnum item: ScheduleTypeEnum.values()) {
-            if (item.name().equals(name)) {
-                return item;
-            }
-        }
-        return defaultItem;
-    }
-
-}

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

@@ -2,9 +2,8 @@ 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.misfire.MisfireStrategyEnum;
-import com.xxl.job.admin.scheduler.enums.ScheduleTypeEnum;
+import com.xxl.job.admin.scheduler.type.ScheduleTypeEnum;
 import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum;
 import com.xxl.tool.core.CollectionTool;
 import com.xxl.tool.core.MapTool;
@@ -85,7 +84,7 @@ public class JobScheduleHelper {
                                     misfireStrategyEnum.getMisfireHandler().handle(jobInfo.getId());
 
                                     // 2、fresh next
-                                    refreshNextValidTime(jobInfo, new Date());
+                                    refreshNextTriggerTime(jobInfo, new Date());
 
                                 } else if (nowTime > jobInfo.getTriggerNextTime()) {
                                     // 2.2、trigger-expire < 5s：direct-trigger && make next-trigger-time
@@ -95,7 +94,7 @@ public class JobScheduleHelper {
                                     logger.debug(">>>>>>>>>>> xxl-job, schedule expire, direct trigger : jobId = " + jobInfo.getId() );
 
                                     // 2、fresh next
-                                    refreshNextValidTime(jobInfo, new Date());
+                                    refreshNextTriggerTime(jobInfo, new Date());
 
                                     // next-trigger-time in 5s, pre-read again
                                     if (jobInfo.getTriggerStatus()==1 && nowTime + PRE_READ_MS > jobInfo.getTriggerNextTime()) {
@@ -108,7 +107,7 @@ public class JobScheduleHelper {
                                         logger.debug(">>>>>>>>>>> xxl-job, schedule pre-read, push trigger : jobId = " + jobInfo.getId() );
 
                                         // 3、fresh next
-                                        refreshNextValidTime(jobInfo, new Date(jobInfo.getTriggerNextTime()));
+                                        refreshNextTriggerTime(jobInfo, new Date(jobInfo.getTriggerNextTime()));
 
                                     }
 
@@ -123,7 +122,7 @@ public class JobScheduleHelper {
                                     logger.debug(">>>>>>>>>>> xxl-job, schedule normal, push trigger : jobId = " + jobInfo.getId() );
 
                                     // 3、fresh next
-                                    refreshNextValidTime(jobInfo, new Date(jobInfo.getTriggerNextTime()));
+                                    refreshNextTriggerTime(jobInfo, new Date(jobInfo.getTriggerNextTime()));
 
                                 }
 
@@ -234,20 +233,25 @@ public class JobScheduleHelper {
     }
 
     /**
-     * refresh next valid time of job
+     * refresh next trigger time of job
      *
      * @param jobInfo   job info
      * @param fromTime  from time
      */
-    private void refreshNextValidTime(XxlJobInfo jobInfo, Date fromTime) {
+    private void refreshNextTriggerTime(XxlJobInfo jobInfo, Date fromTime) {
         try {
-            Date nextValidTime = generateNextValidTime(jobInfo, fromTime);
+            // generate next trigger time
-            if (nextValidTime != null) {
+            ScheduleTypeEnum scheduleTypeEnum = ScheduleTypeEnum.match(jobInfo.getScheduleType(), ScheduleTypeEnum.NONE);
+            Date nextTriggerTime = scheduleTypeEnum.getScheduleType().generateNextTriggerTime(jobInfo, fromTime);
+
+            // refresh next trigger-time + status
+            if (nextTriggerTime != null) {
+                // generate success
                 jobInfo.setTriggerStatus(-1);                               // pass, may be Inaccurate
                 jobInfo.setTriggerLastTime(jobInfo.getTriggerNextTime());
-                jobInfo.setTriggerNextTime(nextValidTime.getTime());
+                jobInfo.setTriggerNextTime(nextTriggerTime.getTime());
             } else {
-                // generateNextValidTime fail, stop job
+                // generate fail, stop job
                 jobInfo.setTriggerStatus(0);
                 jobInfo.setTriggerLastTime(0);
                 jobInfo.setTriggerNextTime(0);
@@ -255,7 +259,7 @@ public class JobScheduleHelper {
                         jobInfo.getId(), jobInfo.getScheduleType(), jobInfo.getScheduleConf());
             }
         } catch (Throwable e) {
-            // generateNextValidTime error, stop job
+            // generate error, stop job
             jobInfo.setTriggerStatus(0);
             jobInfo.setTriggerLastTime(0);
             jobInfo.setTriggerNextTime(0);
@@ -343,21 +347,4 @@ public class JobScheduleHelper {
         logger.info(">>>>>>>>>>> xxl-job, JobScheduleHelper stop");
     }
 
-
-    // ---------------------- tools ----------------------
-
-    /**
-     * generate next valid time
-     */
-    public static Date generateNextValidTime(XxlJobInfo jobInfo, Date fromTime) throws Exception {
-        ScheduleTypeEnum scheduleTypeEnum = ScheduleTypeEnum.match(jobInfo.getScheduleType(), null);
-        if (ScheduleTypeEnum.CRON == scheduleTypeEnum) {
-            Date nextValidTime = new CronExpression(jobInfo.getScheduleConf()).getNextValidTimeAfter(fromTime);
-            return nextValidTime;
-        } else if (ScheduleTypeEnum.FIX_RATE == scheduleTypeEnum /*|| ScheduleTypeEnum.FIX_DELAY == scheduleTypeEnum*/) {
-            return new Date(fromTime.getTime() + Long.parseLong(jobInfo.getScheduleConf()) * 1000L);
-        }
-        return null;
-    }
-
 }

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/ScheduleType.java

@@ -0,0 +1,22 @@
+package com.xxl.job.admin.scheduler.type;
+
+import com.xxl.job.admin.model.XxlJobInfo;
+
+import java.util.Date;
+
+/**
+ * Schedule Type
+ *
+ * @author xuxueli 2020-10-29
+ */
+public abstract class ScheduleType {
+
+    /**
+     * generate next trigger time
+     *
+     * @param jobInfo       job info
+     * @param fromTime      from time
+     */
+    public abstract Date generateNextTriggerTime(XxlJobInfo jobInfo, Date fromTime) throws Exception;
+
+}

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/ScheduleTypeEnum.java

@@ -0,0 +1,62 @@
+package com.xxl.job.admin.scheduler.type;
+
+import com.xxl.job.admin.scheduler.type.strategy.CronScheduleType;
+import com.xxl.job.admin.scheduler.type.strategy.FixRateScheduleType;
+import com.xxl.job.admin.scheduler.type.strategy.NoneScheduleType;
+import com.xxl.job.admin.util.I18nUtil;
+
+/**
+ * @author xuxueli 2020-10-29 21:11:23
+ */
+public enum ScheduleTypeEnum {
+
+    NONE(I18nUtil.getString("schedule_type_none"), new NoneScheduleType()),
+
+    /**
+     * schedule by cron
+     */
+    CRON(I18nUtil.getString("schedule_type_cron"), new CronScheduleType()),
+
+    /**
+     * schedule by fixed rate (in seconds)
+     */
+    FIX_RATE(I18nUtil.getString("schedule_type_fix_rate"), new FixRateScheduleType()),
+
+    /**
+     * schedule by fix delay (in seconds)， after the last time
+     */
+    /*FIX_DELAY(I18nUtil.getString("schedule_type_fix_delay"))*/;
+
+    private final String title;
+    private final ScheduleType scheduleType;;
+
+    ScheduleTypeEnum(String title, ScheduleType scheduleType) {
+        this.title = title;
+        this.scheduleType = scheduleType;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public ScheduleType getScheduleType() {
+        return scheduleType;
+    }
+
+    /**
+     * match by name
+     *
+     * @param name          name of ScheduleTypeEnum
+     * @param defaultItem   default item
+     * @return ScheduleTypeEnum
+     */
+    public static ScheduleTypeEnum match(String name, ScheduleTypeEnum defaultItem){
+        for (ScheduleTypeEnum item: ScheduleTypeEnum.values()) {
+            if (item.name().equals(name)) {
+                return item;
+            }
+        }
+        return defaultItem;
+    }
+
+}

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/strategy/CronScheduleType.java

@@ -0,0 +1,17 @@
+package com.xxl.job.admin.scheduler.type.strategy;
+
+import com.xxl.job.admin.model.XxlJobInfo;
+import com.xxl.job.admin.scheduler.cron.CronExpression;
+import com.xxl.job.admin.scheduler.type.ScheduleType;
+
+import java.util.Date;
+
+public class CronScheduleType extends ScheduleType {
+
+    @Override
+    public Date generateNextTriggerTime(XxlJobInfo jobInfo, Date fromTime) throws Exception {
+        // generate next trigger time, with cron
+        return new CronExpression(jobInfo.getScheduleConf()).getNextValidTimeAfter(fromTime);
+    }
+
+}

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/strategy/FixRateScheduleType.java

@@ -0,0 +1,16 @@
+package com.xxl.job.admin.scheduler.type.strategy;
+
+import com.xxl.job.admin.model.XxlJobInfo;
+import com.xxl.job.admin.scheduler.type.ScheduleType;
+
+import java.util.Date;
+
+public class FixRateScheduleType extends ScheduleType {
+
+    @Override
+    public Date generateNextTriggerTime(XxlJobInfo jobInfo, Date fromTime) throws Exception {
+        // generate next trigger time, fix rate delay
+        return new Date(fromTime.getTime() + Long.parseLong(jobInfo.getScheduleConf()) * 1000L);
+    }
+
+}

xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/type/strategy/NoneScheduleType.java

@@ -0,0 +1,16 @@
+package com.xxl.job.admin.scheduler.type.strategy;
+
+import com.xxl.job.admin.model.XxlJobInfo;
+import com.xxl.job.admin.scheduler.type.ScheduleType;
+
+import java.util.Date;
+
+public class NoneScheduleType extends ScheduleType {
+
+    @Override
+    public Date generateNextTriggerTime(XxlJobInfo jobInfo, Date fromTime) throws Exception {
+        // generate none trigger-time
+        return null;
+    }
+
+}

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

@@ -7,7 +7,7 @@ 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.misfire.MisfireStrategyEnum;
-import com.xxl.job.admin.scheduler.enums.ScheduleTypeEnum;
+import com.xxl.job.admin.scheduler.type.ScheduleTypeEnum;
 import com.xxl.job.admin.scheduler.route.ExecutorRouteStrategyEnum;
 import com.xxl.job.admin.scheduler.thread.JobScheduleHelper;
 import com.xxl.job.admin.scheduler.trigger.TriggerTypeEnum;
@@ -273,10 +273,12 @@ public class XxlJobServiceImpl implements XxlJobService {
 
 		// next trigger time (5s后生效，避开预读周期)
 		long nextTriggerTime = exists_jobInfo.getTriggerNextTime();
-		boolean scheduleDataNotChanged = jobInfo.getScheduleType().equals(exists_jobInfo.getScheduleType()) && jobInfo.getScheduleConf().equals(exists_jobInfo.getScheduleConf());
+		boolean scheduleDataNotChanged = jobInfo.getScheduleType().equals(exists_jobInfo.getScheduleType())
+				&& jobInfo.getScheduleConf().equals(exists_jobInfo.getScheduleConf());		// 触发配置如果不变，避免重复计算；
 		if (exists_jobInfo.getTriggerStatus() == 1 && !scheduleDataNotChanged) {
 			try {
-				Date nextValidTime = JobScheduleHelper.generateNextValidTime(jobInfo, new Date(System.currentTimeMillis() + JobScheduleHelper.PRE_READ_MS));
+				// generate next trigger time
+				Date nextValidTime = scheduleTypeEnum.getScheduleType().generateNextTriggerTime(jobInfo, new Date(System.currentTimeMillis() + JobScheduleHelper.PRE_READ_MS));
 				if (nextValidTime == null) {
 					return ReturnT.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) );
 				}
@@ -343,7 +345,7 @@ public class XxlJobServiceImpl implements XxlJobService {
 			return ReturnT.ofFail(I18nUtil.getString("system_permission_limit"));
 		}
 
-		// valid
+		// valid ScheduleType: can not be none
 		ScheduleTypeEnum scheduleTypeEnum = ScheduleTypeEnum.match(xxlJobInfo.getScheduleType(), ScheduleTypeEnum.NONE);
 		if (ScheduleTypeEnum.NONE == scheduleTypeEnum) {
 			return ReturnT.ofFail(I18nUtil.getString("schedule_type_none_limit_start"));
@@ -352,7 +354,9 @@ public class XxlJobServiceImpl implements XxlJobService {
 		// next trigger time (5s后生效，避开预读周期)
 		long nextTriggerTime = 0;
 		try {
-			Date nextValidTime = JobScheduleHelper.generateNextValidTime(xxlJobInfo, new Date(System.currentTimeMillis() + JobScheduleHelper.PRE_READ_MS));
+			// generate next trigger time
+			Date nextValidTime = scheduleTypeEnum.getScheduleType().generateNextTriggerTime(xxlJobInfo, new Date(System.currentTimeMillis() + JobScheduleHelper.PRE_READ_MS));
+
 			if (nextValidTime == null) {
 				return ReturnT.ofFail ( (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) );
 			}

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

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