test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
fit2-zhao 2021-01-27 13:40:07 +08:00
parent 42273bebf0 15f4489cf2
commit d1b32083da
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/io/metersphere/api/service/ApiAutomationService.java
View File

@ -27,6 +27,7 @@ import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.*; import io.metersphere.commons.utils.*;
import io.metersphere.i18n.Translator; import io.metersphere.i18n.Translator;
import io.metersphere.job.sechedule.ApiScenarioTestJob; import io.metersphere.job.sechedule.ApiScenarioTestJob;
import io.metersphere.job.sechedule.TestPlanTestJob;
import io.metersphere.service.ScheduleService; import io.metersphere.service.ScheduleService;
import io.metersphere.track.dto.TestPlanDTO; import io.metersphere.track.dto.TestPlanDTO;
import io.metersphere.track.request.testcase.ApiCaseRelevanceRequest; import io.metersphere.track.request.testcase.ApiCaseRelevanceRequest;
@ -630,10 +631,16 @@ public class ApiAutomationService {
} }
private void addOrUpdateApiScenarioCronJob(Schedule request) { private void addOrUpdateApiScenarioCronJob(Schedule request) {
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( scheduleService.addOrUpdateCronJob(
request, ApiScenarioTestJob.getJobKey(request.getResourceId()), ApiScenarioTestJob.getTriggerKey(request.getResourceId()), ApiScenarioTestJob.class); request, ApiScenarioTestJob.getJobKey(request.getResourceId()), ApiScenarioTestJob.getTriggerKey(request.getResourceId()), ApiScenarioTestJob.class);
} }
}
public JmxInfoDTO genPerformanceTestJmx(RunScenarioRequest request) throws Exception { public JmxInfoDTO genPerformanceTestJmx(RunScenarioRequest request) throws Exception {
List<ApiScenarioWithBLOBs> apiScenarios = null; List<ApiScenarioWithBLOBs> apiScenarios = null;
List<String> ids = request.getScenarioIds(); List<String> ids = request.getScenarioIds();

2
backend/src/main/java/io/metersphere/xpack

@ -1 +1 @@
Subproject commit 792ace0c68d2b4ff42a74d8e6df32ca7f290ca1c Subproject commit bb9c0309161c91bf7d0a9f85cc44bc0eb0fc11ac

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 416645a24d941eb9727c07c19be70422c2e66cc7 Subproject commit 3a3363c7d651f340cc37fca74c1edb92af484915