From 0190fd1db79a15f3c9c7fbc2988b7f60cda94576 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Wed, 27 Oct 2021 17:25:54 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=E6=89=B9=E9=87=8F=E6=89=A7=E8=A1=8C=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20--bug=3D1007516=20--user=3D=E8=B5=B5=E5=8B=87=20=E3=80=90?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E3=80=91-=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=B9=B6=E8=A1=8C+local=E8=B5=84=E6=BA=90=E6=B1=A0?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=20https://www.tapd.cn/55049933/s/1059992?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiAutomationController.java | 10 +++-- .../metersphere/api/jmeter/JMeterService.java | 7 +-- .../ApiDefinitionExecResultService.java | 13 +++--- .../api/service/ApiTestCaseService.java | 3 +- .../metersphere/task/service/TaskService.java | 1 + .../track/service/TestPlanApiCaseService.java | 45 ++++++++++--------- 6 files changed, 43 insertions(+), 36 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java index 202f85b695..fcddac01cc 100644 --- a/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java +++ b/backend/src/main/java/io/metersphere/api/controller/ApiAutomationController.java @@ -7,6 +7,7 @@ import io.metersphere.api.dto.automation.*; import io.metersphere.api.dto.automation.parse.ScenarioImport; import io.metersphere.api.dto.definition.RunDefinitionRequest; import io.metersphere.api.jmeter.LocalRunner; +import io.metersphere.api.jmeter.MessageCache; import io.metersphere.api.service.ApiAutomationService; import io.metersphere.base.domain.ApiScenario; import io.metersphere.base.domain.ApiScenarioWithBLOBs; @@ -97,7 +98,7 @@ public class ApiAutomationController { @PostMapping(value = "/create") @MsAuditLog(module = "api_automation", type = OperLogConstants.CREATE, title = "#request.name", content = "#msClass.getLogDetails(#request.id)", msClass = ApiAutomationService.class) - @RequiresPermissions(value={PermissionConstants.PROJECT_API_SCENARIO_READ_CREATE, PermissionConstants.PROJECT_API_SCENARIO_READ_COPY}, logical = Logical.OR) + @RequiresPermissions(value = {PermissionConstants.PROJECT_API_SCENARIO_READ_CREATE, PermissionConstants.PROJECT_API_SCENARIO_READ_COPY}, logical = Logical.OR) @SendNotice(taskType = NoticeConstants.TaskType.API_AUTOMATION_TASK, event = NoticeConstants.Event.CREATE, mailTemplate = "api/AutomationCreate", subject = "接口自动化通知") public ApiScenario create(@RequestPart("request") SaveApiScenarioRequest request, @RequestPart(value = "bodyFiles", required = false) List bodyFiles, @RequestPart(value = "scenarioFiles", required = false) List scenarioFiles) { @@ -106,7 +107,7 @@ public class ApiAutomationController { @PostMapping(value = "/update") @MsAuditLog(module = "api_automation", type = OperLogConstants.UPDATE, beforeEvent = "#msClass.getLogDetails(#request.id)", title = "#request.name", content = "#msClass.getLogDetails(#request.id)", msClass = ApiAutomationService.class) - @RequiresPermissions(value={PermissionConstants.PROJECT_API_SCENARIO_READ_EDIT, PermissionConstants.PROJECT_API_SCENARIO_READ_COPY}, logical = Logical.OR) + @RequiresPermissions(value = {PermissionConstants.PROJECT_API_SCENARIO_READ_EDIT, PermissionConstants.PROJECT_API_SCENARIO_READ_COPY}, logical = Logical.OR) @SendNotice(taskType = NoticeConstants.TaskType.API_AUTOMATION_TASK, event = NoticeConstants.Event.UPDATE, mailTemplate = "api/AutomationUpdate", subject = "接口自动化通知") public ApiScenario update(@RequestPart("request") SaveApiScenarioRequest request, @RequestPart(value = "bodyFiles", required = false) List bodyFiles, @RequestPart(value = "scenarioFiles", required = false) List scenarioFiles) { @@ -323,7 +324,10 @@ public class ApiAutomationController { @GetMapping(value = "/stop/{reportId}") public void stop(@PathVariable String reportId) { - new LocalRunner().stop(reportId); + if (StringUtils.isNotEmpty(reportId)) { + MessageCache.batchTestCases.remove(reportId); + new LocalRunner().stop(reportId); + } } @PostMapping(value = "/stop/batch") diff --git a/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java b/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java index 7ca6157c75..445397e32a 100644 --- a/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java +++ b/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java @@ -174,11 +174,6 @@ public class JMeterService { } } else { try { -// SendResult result = kafkaTemplate.send(KafkaConfig.EXEC_TOPIC, JSON.toJSONString(runRequest)).get(); -// if (result != null) { -// LogUtil.debug("获取ack 结果：" + result.getRecordMetadata()); -// } -// kafkaTemplate.flush(); this.send(runRequest, config, reportId); } catch (Exception e) { e.printStackTrace(); @@ -186,6 +181,7 @@ public class JMeterService { && MessageCache.cache.get(config.getAmassReport()).getReportIds() != null) { MessageCache.cache.get(config.getAmassReport()).getReportIds().remove(reportId); } + MessageCache.batchTestCases.remove(reportId); } } } @@ -216,6 +212,7 @@ public class JMeterService { && MessageCache.cache.get(config.getAmassReport()).getReportIds() != null) { MessageCache.cache.get(config.getAmassReport()).getReportIds().remove(reportId); } + MessageCache.batchTestCases.remove(reportId); } } } diff --git a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java index 71964954dc..49e9004fa9 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java @@ -25,9 +25,6 @@ import io.metersphere.track.service.TestPlanService; import org.apache.commons.beanutils.BeanMap; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.session.ExecutorType; -import org.apache.ibatis.session.SqlSession; -import org.apache.ibatis.session.SqlSessionFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -73,7 +70,7 @@ public class ApiDefinitionExecResultService { result.getScenarios().forEach(scenarioResult -> { if (scenarioResult != null && CollectionUtils.isNotEmpty(scenarioResult.getRequestResults())) { scenarioResult.getRequestResults().forEach(item -> { - if(!StringUtils.startsWithAny(item.getName(),"PRE_PROCESSOR_ENV_","POST_PROCESSOR_ENV_")){ + if (!StringUtils.startsWithAny(item.getName(), "PRE_PROCESSOR_ENV_", "POST_PROCESSOR_ENV_")) { ApiDefinitionExecResult saveResult = MessageCache.batchTestCases.get(result.getTestId()); if (saveResult == null) { saveResult = apiDefinitionExecResultMapper.selectByPrimaryKey(result.getTestId()); @@ -96,10 +93,13 @@ public class ApiDefinitionExecResultService { if (StringUtils.isNotEmpty(result.getUserId())) { saveResult.setUserId(result.getUserId()); } else { - saveResult.setUserId(Objects.requireNonNull(SessionUtils.getUser()).getId()); + if (SessionUtils.getUser() != null) { + saveResult.setUserId(SessionUtils.getUser().getId()); + } } saved = false; } + String status = item.isSuccess() ? "success" : "error"; saveResult.setName(getName(type, item.getName(), status, saveResult.getCreateTime(), saveResult.getId())); saveResult.setStatus(status); @@ -124,6 +124,9 @@ public class ApiDefinitionExecResultService { apiDefinitionExecResultMapper.updateByPrimaryKeyWithBLOBs(saveResult); } apiDefinitionService.removeCache(result.getTestId()); + if (StringUtils.isNotEmpty(result.getTestId())) { + MessageCache.batchTestCases.remove(result.getTestId()); + } // 发送通知 sendNotice(saveResult); } diff --git a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java index 07d530cd9f..8028a2e26a 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java @@ -783,7 +783,8 @@ public class ApiTestCaseService { batchMapper.insert(report); executeQueue.add(runCaseRequest); } - sqlSession.flushStatements(); + sqlSession.commit(); + for (RunCaseRequest runCaseRequest : executeQueue) { run(runCaseRequest); MessageCache.batchTestCases.put(runCaseRequest.getReportId(), runCaseRequest.getReport()); diff --git a/backend/src/main/java/io/metersphere/task/service/TaskService.java b/backend/src/main/java/io/metersphere/task/service/TaskService.java index 2f62445cc8..bbe9fe2bb8 100644 --- a/backend/src/main/java/io/metersphere/task/service/TaskService.java +++ b/backend/src/main/java/io/metersphere/task/service/TaskService.java @@ -108,6 +108,7 @@ public class TaskService { result.setStatus("STOP"); apiDefinitionExecResultMapper.updateByPrimaryKeySelective(result); actuator = result.getActuator(); + MessageCache.batchTestCases.remove(result.getId()); } } else if (StringUtils.equals(request.getType(), "SCENARIO")) { ApiScenarioReport report = apiScenarioReportMapper.selectByPrimaryKey(request.getReportId()); diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java index 8dbaabbf84..2d872d0d7e 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestPlanApiCaseService.java @@ -380,7 +380,9 @@ public class TestPlanApiCaseService { if (request.getConfig() != null && StringUtils.isNotEmpty(request.getConfig().getResourcePoolId())) { apiResult.setActuator(request.getConfig().getResourcePoolId()); } - apiResult.setUserId(Objects.requireNonNull(SessionUtils.getUser()).getId()); + if (SessionUtils.getUser() != null) { + apiResult.setUserId(SessionUtils.getUser().getId()); + } apiResult.setResourceId(key.getApiCaseId()); apiResult.setStartTime(System.currentTimeMillis()); apiResult.setType(ApiRunMode.API_PLAN.name()); @@ -413,7 +415,7 @@ public class TestPlanApiCaseService { ApiDefinitionExecResult report = addResult(request, testPlanApiCase, APITestStatus.Waiting.name(), batchMapper); executeQueue.put(testPlanApiCase, report); }); - sqlSession.flushStatements(); + sqlSession.commit(); List reportIds = new LinkedList<>(); // 开始串行执行 Thread thread = new Thread(new Runnable() { @@ -421,7 +423,7 @@ public class TestPlanApiCaseService { public void run() { for (TestPlanApiCase testPlanApiCase : executeQueue.keySet()) { try { - if (executeQueue.get(testPlanApiCase)!=null && MessageCache.terminationOrderDeque.contains(executeQueue.get(testPlanApiCase).getId())) { + if (executeQueue.get(testPlanApiCase) != null && MessageCache.terminationOrderDeque.contains(executeQueue.get(testPlanApiCase).getId())) { MessageCache.terminationOrderDeque.remove(executeQueue.get(testPlanApiCase).getId()); break; } @@ -467,25 +469,23 @@ public class TestPlanApiCaseService { }); thread.start(); } else { + Map executeQueue = new HashMap<>(); + planApiCases.forEach(testPlanApiCase -> { + ApiDefinitionExecResult report = addResult(request, testPlanApiCase, APITestStatus.Running.name(), batchMapper); + executeQueue.put(report.getId(), testPlanApiCase); + MessageCache.batchTestCases.put(report.getId(), report); + }); + sqlSession.commit(); + // 开始并发执行 - for (TestPlanApiCase key : planApiCases) { - RunModeDataDTO modeDataDTO = null; - if (StringUtils.isNotBlank(request.getConfig().getResourcePoolId())) { - modeDataDTO = new RunModeDataDTO(key.getId(), UUID.randomUUID().toString()); - } else { - // 生成报告和HashTree - HashTree hashTree = generateHashTree(key.getId()); - modeDataDTO = new RunModeDataDTO(hashTree, UUID.randomUUID().toString()); - } - ApiDefinitionExecResult report = addResult(request, key, APITestStatus.Running.name(), batchMapper); - modeDataDTO.setApiCaseId(report.getId()); + for (String reportId : executeQueue.keySet()) { if (request.getConfig() != null && StringUtils.isNotEmpty(request.getConfig().getResourcePoolId())) { - jMeterService.runTest(report.getId(), modeDataDTO.getApiCaseId(), ApiRunMode.API_PLAN.name(), null, request.getConfig()); + jMeterService.runTest(executeQueue.get(reportId).getId(), reportId, ApiRunMode.API_PLAN.name(), null, request.getConfig()); } else { - jMeterService.runLocal(report.getId(), modeDataDTO.getHashTree(), TriggerMode.BATCH.name() , ApiRunMode.API_PLAN.name()); + HashTree hashTree = generateHashTree(executeQueue.get(reportId).getId()); + jMeterService.runLocal(reportId, hashTree, TriggerMode.BATCH.name(), ApiRunMode.API_PLAN.name()); } } - sqlSession.flushStatements(); } return request.getId(); } @@ -566,7 +566,7 @@ public class TestPlanApiCaseService { } public ApiTestCaseWithBLOBs getApiTestCaseById(String testPlanApiCaseId) { - return extTestPlanApiCaseMapper.getApiTestCaseById(testPlanApiCaseId); + return extTestPlanApiCaseMapper.getApiTestCaseById(testPlanApiCaseId); } public void calculatePlanReport(String planId, TestPlanSimpleReportDTO report) { @@ -593,11 +593,11 @@ public class TestPlanApiCaseService { return buildCases(apiTestCases); } - public List getAllCases(Collection caseIdList,String planId,String status) { - if(caseIdList.isEmpty()){ - return new ArrayList<>(); + public List getAllCases(Collection caseIdList, String planId, String status) { + if (caseIdList.isEmpty()) { + return new ArrayList<>(); } - List apiTestCases = extTestPlanApiCaseMapper.getFailureListByIds(caseIdList,planId, status); + List apiTestCases = extTestPlanApiCaseMapper.getFailureListByIds(caseIdList, planId, status); return buildCases(apiTestCases); } @@ -617,6 +617,7 @@ public class TestPlanApiCaseService { /** * 用例自定义排序 + * * @param request */ public void updateOrder(ResetOrderRequest request) {