From b828dfec49f596a8b1e3d73db4fe8d9bceb0fc3b Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Tue, 11 Jun 2024 11:34:23 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?= =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E5=88=9D=E5=A7=8B=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/metersphere/system/service/BaseScheduleService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseScheduleService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseScheduleService.java index 5ddcde7746..82e9475bf2 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseScheduleService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseScheduleService.java @@ -1,5 +1,6 @@ package io.metersphere.system.service; +import io.metersphere.sdk.constants.ScheduleResourceType; import io.metersphere.sdk.util.JSON; import io.metersphere.sdk.util.LogUtils; import io.metersphere.system.domain.Schedule; @@ -39,9 +40,14 @@ public class BaseScheduleService { } private void doHandleSchedule(List schedules) { + List resourceTypes = List.of(ScheduleResourceType.API_IMPORT.name(), ScheduleResourceType.API_SCENARIO.name(), ScheduleResourceType.TEST_PLAN.name(), ScheduleResourceType.BUG_SYNC.name()); schedules.forEach(schedule -> { try { if (schedule.getEnable()) { + if (resourceTypes.contains(schedule.getResourceType())) { + // 删除关闭的job + removeJob(schedule); + } LogUtils.info("初始化任务：" + JSON.toJSONString(schedule)); scheduleManager.addOrUpdateCronJob(new JobKey(schedule.getKey(), schedule.getJob()), new TriggerKey(schedule.getKey(), schedule.getJob()), Class.forName(schedule.getJob()), schedule.getValue(),