fix(测试计划定时任务): 更改定时任务配置以及执行方式

更改定时任务配置以及执行方式

backend/src/main/java/io/metersphere/job/sechedule/TestPlanTestJob.java

@@ -16,22 +16,9 @@ import org.quartz.*;
 public class TestPlanTestJob extends MsScheduleJob {
     private String projectID;
 
-
-    //    private PerformanceTestService performanceTestService;
-//    private TestPlanScenarioCaseService testPlanScenarioCaseService;
-//    private TestPlanApiCaseService testPlanApiCaseService;
-//    private ApiTestCaseService apiTestCaseService;
-//    private TestPlanReportService testPlanReportService;
-//    private TestPlanLoadCaseService testPlanLoadCaseService;
     private TestPlanService testPlanService;
 
     public TestPlanTestJob() {
-//        this.performanceTestService = CommonBeanFactory.getBean(PerformanceTestService.class);
-//        this.testPlanScenarioCaseService = CommonBeanFactory.getBean(TestPlanScenarioCaseService.class);
-//        this.testPlanApiCaseService = CommonBeanFactory.getBean(TestPlanApiCaseService.class);
-//        this.apiTestCaseService = CommonBeanFactory.getBean(ApiTestCaseService.class);
-//        this.testPlanReportService = CommonBeanFactory.getBean(TestPlanReportService.class);
-//        this.testPlanLoadCaseService = CommonBeanFactory.getBean(TestPlanLoadCaseService.class);
         this.testPlanService = CommonBeanFactory.getBean(TestPlanService.class);
 
 
@@ -63,7 +50,16 @@ public class TestPlanTestJob extends MsScheduleJob {
         JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
         String config = jobDataMap.getString("config");
 
-        testPlanService.run(this.resourceId, this.projectID, this.userId, ReportTriggerMode.SCHEDULE.name(),config);
+        String runResourceId = this.resourceId;
+        String runProjectId = this.projectID;
+        String runUserId = this.userId;
+        Thread thread = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                testPlanService.run(runResourceId, runProjectId, runUserId, ReportTriggerMode.SCHEDULE.name(),config);
+            }
+        });
+        thread.run();
     }
 
     public static JobKey getJobKey(String testId) {

backend/src/main/java/io/metersphere/listener/AppStartListener.java

@@ -69,7 +69,8 @@ public class AppStartListener implements ApplicationListener<ApplicationReadyEve
 
     @Value("${jmeter.home}")
     private String jmeterHome;
-
+    @Value("${quartz.properties.org.quartz.jobStore.acquireTriggersWithinLock}")
+    private String acquireTriggersWithinLock;
     @Value("${quartz.enabled}")
     private boolean quartzEnable;
     @Value("${quartz.scheduler-name}")
@@ -101,6 +102,7 @@ public class AppStartListener implements ApplicationListener<ApplicationReadyEve
             e.printStackTrace();
         }
         LogUtil.info("开始启动定时任务。 相关设置：" +
+                "quartz.acquireTriggersWithinLock :" + acquireTriggersWithinLock + "\r\n" +
                 "quartz.enabled :" + quartzEnable + "\r\n" +
                 "quartz.scheduler-name :" + quartzScheduleName + "\r\n" +
                 "quartz.thread-count :" + quartzThreadCount + "\r\n");

backend/src/main/resources/application.properties

@@ -92,7 +92,8 @@ jmeter.home=/opt/jmeter
 # quartz
 quartz.enabled=true
 quartz.scheduler-name=msServerJob
-quartz.thread-count=30
+quartz.thread-count=60
+quartz.properties.org.quartz.jobStore.acquireTriggersWithinLock=true
 # file upload
 spring.servlet.multipart.max-file-size=500MB
 spring.servlet.multipart.max-request-size=500MB