diff --git a/core/core-backend/src/main/java/io/dataease/job/schedule/DeXpackDataFillingScheduleJob.java b/core/core-backend/src/main/java/io/dataease/job/schedule/DeXpackDataFillingScheduleJob.java index bc5e69f15b..ef91ebb7b9 100644 --- a/core/core-backend/src/main/java/io/dataease/job/schedule/DeXpackDataFillingScheduleJob.java +++ b/core/core-backend/src/main/java/io/dataease/job/schedule/DeXpackDataFillingScheduleJob.java @@ -2,6 +2,7 @@ package io.dataease.job.schedule; import io.dataease.license.utils.LicenseUtil; import io.dataease.utils.CommonBeanFactory; +import io.dataease.utils.LogUtil; import org.quartz.*; import org.springframework.stereotype.Component; @@ -18,10 +19,14 @@ public class DeXpackDataFillingScheduleJob implements Job { JobDataMap jobDataMap = jobExecutionContext.getJobDetail().getJobDataMap(); DeDataFillingTaskExecutor deTaskExecutor = CommonBeanFactory.getBean(DeDataFillingTaskExecutor.class); assert deTaskExecutor != null; - LicenseUtil.validate(); - boolean taskLoaded = deTaskExecutor.execute(jobDataMap); - if (!taskLoaded) { - Objects.requireNonNull(CommonBeanFactory.getBean(ScheduleManager.class)).removeJob(jobKey, trigger.getKey()); + try { + LicenseUtil.validate(); + boolean taskLoaded = deTaskExecutor.execute(jobDataMap); + if (!taskLoaded) { + Objects.requireNonNull(CommonBeanFactory.getBean(ScheduleManager.class)).removeJob(jobKey, trigger.getKey()); + } + } catch (Exception e) { + LogUtil.error(e.getMessage(), e.getCause()); } } } diff --git a/de-xpack b/de-xpack index 5c5f302b17..61d379a734 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 5c5f302b178affd3c301efb48df66ce1ceb0de57 +Subproject commit 61d379a73420e736d18e44f2cc3b1d196baca7f3