From c8f887019d3fe7dba582a780ad6e6e08445e956b Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Thu, 16 Dec 2021 10:34:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE):=20=E5=A2=9E=E5=8A=A0Quartz=E7=9A=84acquire?=
 =?UTF-8?q?TriggersWithinLock=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加Quartz的acquireTriggersWithinLock配置
---
 .../java/io/metersphere/controller/ScheduleController.java    | 3 ---
 .../main/java/io/metersphere/listener/AppStartListener.java   | 4 ++++
 backend/src/main/resources/application.properties             | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/controller/ScheduleController.java b/backend/src/main/java/io/metersphere/controller/ScheduleController.java
index 0b93ea15a1..5dd90cbf22 100644
--- a/backend/src/main/java/io/metersphere/controller/ScheduleController.java
+++ b/backend/src/main/java/io/metersphere/controller/ScheduleController.java
@@ -2,7 +2,6 @@ package io.metersphere.controller;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import io.metersphere.api.service.ApiAutomationService;
 import io.metersphere.base.domain.Schedule;
 import io.metersphere.controller.request.QueryScheduleRequest;
 import io.metersphere.controller.request.ScheduleRequest;
@@ -18,8 +17,6 @@ import java.util.List;
 public class ScheduleController {
     @Resource
     private ScheduleService scheduleService;
-    @Resource
-    private ApiAutomationService apiAutomationService;
 
     @PostMapping("/list/{goPage}/{pageSize}")
     public List<ScheduleDao> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryScheduleRequest request) {
diff --git a/backend/src/main/java/io/metersphere/listener/AppStartListener.java b/backend/src/main/java/io/metersphere/listener/AppStartListener.java
index f7a9414d58..f9b7efc588 100644
--- a/backend/src/main/java/io/metersphere/listener/AppStartListener.java
+++ b/backend/src/main/java/io/metersphere/listener/AppStartListener.java
@@ -70,6 +70,9 @@ public class AppStartListener implements ApplicationListener<ApplicationReadyEve
     @Value("${jmeter.home}")
     private String jmeterHome;
 
+    @Value("${quartz.properties.org.quartz.jobStore.acquireTriggersWithinLock}")
+    private String acquireTriggersWithinLock;
+
     @Override
     public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) {
 
@@ -94,6 +97,7 @@ public class AppStartListener implements ApplicationListener<ApplicationReadyEve
             e.printStackTrace();
         }
 
+        LogUtil.info("开始启动定时任务。 定时任务 acquireTriggersWithinLock 设置:"+acquireTriggersWithinLock);
         scheduleService.startEnableSchedules();
 
     }
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 4757f780f5..a277884ca9 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -93,6 +93,7 @@ jmeter.home=/opt/jmeter
 quartz.enabled=true
 quartz.scheduler-name=msServerJob
 quartz.thread-count=30
+quartz.properties.org.quartz.jobStore.acquireTriggersWithinLock=true
 # file upload
 spring.servlet.multipart.max-file-size=500MB
 spring.servlet.multipart.max-request-size=500MB