Merge branch 'master' of https://github.com/metersphere/metersphere

babysor · Jan 27, 2021 · d1b3208 · d1b3208
2 parents 42273be + 15f4489
commit d1b3208
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java b/backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
@@ -27,6 +27,7 @@
 import io.metersphere.commons.utils.*;
 import io.metersphere.i18n.Translator;
 import io.metersphere.job.sechedule.ApiScenarioTestJob;
+import io.metersphere.job.sechedule.TestPlanTestJob;
 import io.metersphere.service.ScheduleService;
 import io.metersphere.track.dto.TestPlanDTO;
 import io.metersphere.track.request.testcase.ApiCaseRelevanceRequest;
@@ -630,8 +631,14 @@ public void updateSchedule(Schedule request) {
     }
 
     private void addOrUpdateApiScenarioCronJob(Schedule request) {
-        scheduleService.addOrUpdateCronJob(
-                request, ApiScenarioTestJob.getJobKey(request.getResourceId()), ApiScenarioTestJob.getTriggerKey(request.getResourceId()), ApiScenarioTestJob.class);
+        if(StringUtils.equals(request.getGroup(),ScheduleGroup.TEST_PLAN_TEST.name())){
+            scheduleService.addOrUpdateCronJob(
+                    request, TestPlanTestJob.getJobKey(request.getResourceId()), TestPlanTestJob.getTriggerKey(request.getResourceId()), TestPlanTestJob.class);
+        }else{
+            scheduleService.addOrUpdateCronJob(
+                    request, ApiScenarioTestJob.getJobKey(request.getResourceId()), ApiScenarioTestJob.getTriggerKey(request.getResourceId()), ApiScenarioTestJob.class);
+        }
+
     }
 
     public JmxInfoDTO genPerformanceTestJmx(RunScenarioRequest request) throws Exception {

diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack