From 04c3d462647bad4d532fe80ebdf370d05716e4e8 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Fri, 17 Dec 2021 19:33:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8DSSL=E8=AE=A4=E8=AF=81=E5=88=AB=E5=90=8D?= =?UTF-8?q?=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiTestEnvironmentController.java | 8 ------ .../request/sampler/MsHTTPSamplerProxy.java | 2 ++ .../api/dto/ssl/KeyStoreConfig.java | 10 +++++++ .../ApiScenarioReportResultService.java | 26 ++++++++++--------- 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java b/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java index 6c27bc4ec7..a5cfc101ff 100644 --- a/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java +++ b/backend/src/main/java/io/metersphere/api/controller/ApiTestEnvironmentController.java @@ -12,7 +12,6 @@ import io.metersphere.commons.utils.PageUtils; import io.metersphere.commons.utils.Pager; import io.metersphere.controller.request.EnvironmentRequest; import io.metersphere.log.annotation.MsAuditLog; -import io.metersphere.service.CheckPermissionService; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -26,13 +25,10 @@ public class ApiTestEnvironmentController { @Resource ApiTestEnvironmentService apiTestEnvironmentService; @Resource - private CheckPermissionService checkPermissionService; - @Resource private CommandService commandService; @GetMapping("/list/{projectId}") public List list(@PathVariable String projectId) { -// checkPermissionService.checkProjectOwner(projectId); return apiTestEnvironmentService.list(projectId); } @@ -46,10 +42,6 @@ public class ApiTestEnvironmentController { */ @PostMapping("/list/{goPage}/{pageSize}") public Pager> listByCondition(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody EnvironmentRequest environmentRequest) { -// List projectIds = environmentRequest.getProjectIds(); -// for (String projectId : projectIds) { -// checkPermissionService.checkProjectOwner(projectId); -// } Page page = PageHelper.startPage(goPage, pageSize, true); return PageUtils.setPageInfo(page, apiTestEnvironmentService.listByConditions(environmentRequest)); } diff --git a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java index 9b4ee6c025..5c4316aa11 100644 --- a/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java +++ b/backend/src/main/java/io/metersphere/api/dto/definition/request/sampler/MsHTTPSamplerProxy.java @@ -551,6 +551,8 @@ public class MsHTTPSamplerProxy extends MsTestElement { } if (StringUtils.isEmpty(this.alias)) { this.alias = sslConfig.getDefaultAlias(); + } else { + this.alias = sslConfig.getAlias(this.alias); } if (StringUtils.isNotEmpty(this.alias)) { diff --git a/backend/src/main/java/io/metersphere/api/dto/ssl/KeyStoreConfig.java b/backend/src/main/java/io/metersphere/api/dto/ssl/KeyStoreConfig.java index b042e0a13b..c74437bbe1 100644 --- a/backend/src/main/java/io/metersphere/api/dto/ssl/KeyStoreConfig.java +++ b/backend/src/main/java/io/metersphere/api/dto/ssl/KeyStoreConfig.java @@ -25,4 +25,14 @@ public class KeyStoreConfig { } return null; } + + public String getAlias(String asName) { + if (CollectionUtils.isNotEmpty(entrys)) { + List entryList = this.entrys.stream().filter(ks -> StringUtils.equals(asName, ks.getNewAsName())).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(entryList) && CollectionUtils.isNotEmpty(files) && files.size() == 1) { + return entryList.get(0).getOriginalAsName(); + } + } + return asName; + } } diff --git a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java index 7bbdd1d1b7..2b8488fd42 100644 --- a/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java +++ b/backend/src/main/java/io/metersphere/api/service/ApiScenarioReportResultService.java @@ -22,18 +22,20 @@ public class ApiScenarioReportResultService { private ApiScenarioReportResultMapper apiScenarioReportResultMapper; public void save(String reportId, List queue) { - queue.forEach(item -> { - // 事物控制器出来的结果特殊处理 - if (StringUtils.isNotEmpty(item.getName()) && item.getName().startsWith("Transaction=") && CollectionUtils.isEmpty(item.getSubRequestResults())) { - LoggerUtil.debug("合并事物请求暂不入库"); - } else if (StringUtils.isNotEmpty(item.getName()) && item.getName().startsWith("Transaction=") && CollectionUtils.isNotEmpty(item.getSubRequestResults())) { - item.getSubRequestResults().forEach(subItem -> { - apiScenarioReportResultMapper.insert(this.newApiScenarioReportResult(reportId, subItem)); - }); - } else { - apiScenarioReportResultMapper.insert(this.newApiScenarioReportResult(reportId, item)); - } - }); + if (CollectionUtils.isNotEmpty(queue)) { + queue.forEach(item -> { + // 事物控制器出来的结果特殊处理 + if (StringUtils.isNotEmpty(item.getName()) && item.getName().startsWith("Transaction=") && CollectionUtils.isEmpty(item.getSubRequestResults())) { + LoggerUtil.debug("合并事物请求暂不入库"); + } else if (StringUtils.isNotEmpty(item.getName()) && item.getName().startsWith("Transaction=") && CollectionUtils.isNotEmpty(item.getSubRequestResults())) { + item.getSubRequestResults().forEach(subItem -> { + apiScenarioReportResultMapper.insert(this.newApiScenarioReportResult(reportId, subItem)); + }); + } else { + apiScenarioReportResultMapper.insert(this.newApiScenarioReportResult(reportId, item)); + } + }); + } } private ApiScenarioReportResult newApiScenarioReportResult(String reportId, RequestResult result) {