add isValidExpression

zhangchaoxu · Dec 28, 2023 · 67d653f · 67d653f
1 parent 82094a1
commit 67d653f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/job/src/main/java/com/nb6868/onex/job/config/BaseJobConfig.java b/job/src/main/java/com/nb6868/onex/job/config/BaseJobConfig.java
@@ -2,13 +2,15 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.cron.CronUtil;
 import com.nb6868.onex.job.JobConst;
 import com.nb6868.onex.job.entity.JobEntity;
 import com.nb6868.onex.job.service.JobService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.SchedulingConfigurer;
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+import org.springframework.scheduling.support.CronExpression;
 import org.springframework.scheduling.support.CronTrigger;
 
 /**
@@ -18,7 +20,7 @@
 public abstract class BaseJobConfig implements SchedulingConfigurer {
 
     @Autowired
-    private JobService jobService;
+    JobService jobService;
 
     /**
      * 添加trigger
@@ -38,7 +40,8 @@ protected void initTrigger(ScheduledTaskRegistrar taskRegistrar, Long jobId) {
             log.info("TriggerTask next Trigger");
             // 配置参数要再从数据库读一遍，否则不会变更
             JobEntity job = jobService.getById(jobId);
-            if (ObjectUtil.isNotNull(job) && StrUtil.isNotBlank(job.getCron())) {
+            // 加入cron的校验
+            if (ObjectUtil.isNotNull(job) && StrUtil.isNotBlank(job.getCron()) && CronExpression.isValidExpression(job.getCron())) {
                 return new CronTrigger(job.getCron()).nextExecution(triggerContext);
             } else {
                 return null;