From c46cfb8a19bb912740fc9c7393c060f9302ee4a3 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 30 Jul 2024 16:51:25 +0800 Subject: [PATCH] =?UTF-8?q?perf(X-Pack):=20=E5=AE=9A=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E5=91=8A-=E5=A4=B1=E8=B4=A5=E9=87=8D=E8=AF=95=E7=A6=81?= =?UTF-8?q?=E6=AD=A2=E9=87=8D=E5=A4=8D=E7=94=9F=E6=88=90=E6=88=AA=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/job/schedule/DeTaskExecutor.java | 3 ++- de-xpack | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/job/schedule/DeTaskExecutor.java b/core/core-backend/src/main/java/io/dataease/job/schedule/DeTaskExecutor.java index 80331d11c7..a034f919ad 100644 --- a/core/core-backend/src/main/java/io/dataease/job/schedule/DeTaskExecutor.java +++ b/core/core-backend/src/main/java/io/dataease/job/schedule/DeTaskExecutor.java @@ -49,7 +49,7 @@ public class DeTaskExecutor { scheduleManager.addOrUpdateCronJob(jobKey, triggerKey, DeXpackScheduleJob.class, cron, new Date(startTime), end, jobDataMap); } - public void addRetryTask(Long taskId, Integer retryLimit, Integer retryInterval) { + public void addRetryTask(Long taskId, Integer retryLimit, Integer retryInterval, Object retryParam) { long saltTime = 3000L; long interval = retryInterval == null ? 5L : retryInterval; long intervalMill = interval * 60000L; @@ -65,6 +65,7 @@ public class DeTaskExecutor { JobDataMap jobDataMap = new JobDataMap(); jobDataMap.put("taskId", taskId); jobDataMap.put(IS_RETRY_TASK, true); + jobDataMap.put("retryParam", retryParam); Date end = null; if (ObjectUtils.isNotEmpty(endTime)) end = new Date(endTime); scheduleManager.addOrUpdateCronJob(jobKey, triggerKey, DeXpackScheduleJob.class, cron, new Date(now), end, jobDataMap); diff --git a/de-xpack b/de-xpack index a166443c5d..4ff66b0edc 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit a166443c5df60215573af63186b96638cfaf8008 +Subproject commit 4ff66b0edcbaee440b370dc6054500982300b9b1