From 4864fcf0d06430172ebd871c662304b302664ffb Mon Sep 17 00:00:00 2001 From: ulleo Date: Mon, 21 Oct 2024 15:46:35 +0800 Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E8=B0=83=E6=95=B4=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E6=8A=A5=E4=B8=8B=E5=8F=91=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/schedule/DeXpackDataFillingScheduleJob.java | 13 +++++++++---- de-xpack | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) 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