From a10d2203beb916f3ac78dabb217a37a927b50847 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Mon, 8 May 2023 16:37:56 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):?= =?UTF-8?q?=20=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E5=8D=95=E6=9D=A1case?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E8=A7=A3=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/metersphere/api/exec/api/ApiExecuteService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java b/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java index b3dd442d6673..216209b891bd 100644 --- a/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java +++ b/backend/src/main/java/io/metersphere/api/exec/api/ApiExecuteService.java @@ -19,6 +19,7 @@ import io.metersphere.api.exec.utils.GenerateHashTreeUtil; import io.metersphere.api.jmeter.JMeterService; import io.metersphere.api.service.ApiTestEnvironmentService; +import io.metersphere.api.service.RedisTemplateService; import io.metersphere.api.service.TcpApiParamService; import io.metersphere.base.domain.*; import io.metersphere.base.mapper.ApiDefinitionExecResultMapper; @@ -70,6 +71,8 @@ public class ApiExecuteService { private ObjectMapper mapper; @Resource private SystemParameterService systemParameterService; + @Resource + private RedisTemplateService redisTemplateService; public MsExecResponseDTO jenkinsRun(RunCaseRequest request) { ApiTestCaseWithBLOBs caseWithBLOBs = null; @@ -213,6 +216,9 @@ public MsExecResponseDTO debug(RunDefinitionRequest request, List BaseSystemConfigDTO baseInfo = systemParameterService.getBaseInfo(); runRequest.setPlatformUrl(GenerateHashTreeUtil.getPlatformUrl(baseInfo, runRequest, null)); } + if (StringUtils.equals(request.getType(), ApiRunMode.API_PLAN.name())) { + redisTemplateService.lock(testId, request.getId()); + } jMeterService.run(runRequest); return new MsExecResponseDTO(runRequest.getTestId(), runRequest.getReportId(), runMode); }