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

refactor: 处理分享报告查询资源池的返回信息

This commit is contained in:
CaptainB 2023-05-05 18:12:43 +08:00 committed by 刘瑞斌
parent fa423b272b
commit 9bc880e486
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
backend/src/main/java/io/metersphere/controller/ShareController.java
View File

@ -1,5 +1,7 @@
package io.metersphere.controller; package io.metersphere.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import io.metersphere.api.dto.APIReportResult; import io.metersphere.api.dto.APIReportResult;
@ -11,6 +13,7 @@ import io.metersphere.api.service.ApiScenarioReportService;
import io.metersphere.api.service.ShareInfoService; import io.metersphere.api.service.ShareInfoService;
import io.metersphere.base.domain.IssuesDao; import io.metersphere.base.domain.IssuesDao;
import io.metersphere.base.domain.LoadTestReportLog; import io.metersphere.base.domain.LoadTestReportLog;
import io.metersphere.commons.constants.ResourcePoolTypeEnum;
import io.metersphere.commons.constants.ResourceStatusEnum; import io.metersphere.commons.constants.ResourceStatusEnum;
import io.metersphere.commons.utils.PageUtils; import io.metersphere.commons.utils.PageUtils;
import io.metersphere.commons.utils.Pager; import io.metersphere.commons.utils.Pager;
@ -32,6 +35,7 @@ import io.metersphere.track.dto.TestPlanLoadCaseDTO;
import io.metersphere.track.dto.TestPlanSimpleReportDTO; import io.metersphere.track.dto.TestPlanSimpleReportDTO;
import io.metersphere.track.request.testplan.LoadCaseReportRequest; import io.metersphere.track.request.testplan.LoadCaseReportRequest;
import io.metersphere.track.service.*; import io.metersphere.track.service.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -309,7 +313,29 @@ public class ShareController {
public List<TestResourcePoolDTO> getTestResourcePools() { public List<TestResourcePoolDTO> getTestResourcePools() {
QueryResourcePoolRequest resourcePoolRequest = new QueryResourcePoolRequest(); QueryResourcePoolRequest resourcePoolRequest = new QueryResourcePoolRequest();
resourcePoolRequest.setStatus(ResourceStatusEnum.VALID.name()); resourcePoolRequest.setStatus(ResourceStatusEnum.VALID.name());
return testResourcePoolService.listResourcePools(resourcePoolRequest); // 数据脱敏
// 仅对k8s操作
List<TestResourcePoolDTO> testResourcePoolDTOS = testResourcePoolService.listResourcePools(resourcePoolRequest);
testResourcePoolDTOS.stream()
.filter(testResourcePoolDTO -> StringUtils.equals(ResourcePoolTypeEnum.K8S.name(), testResourcePoolDTO.getType()))
.forEach(pool -> pool.getResources().forEach(resource -> {
String configuration = resource.getConfiguration();
JSONObject map = JSON.parseObject(configuration);
if (map.containsKey("token")) {
map.put("token", "******");
}
if (map.containsKey("masterUrl")) {
map.put("masterUrl", "******");
}
if (map.containsKey("jobTemplate")) {
map.put("jobTemplate", "******");
}
if (map.containsKey("namespace")) {
map.put("namespace", "******");
}
resource.setConfiguration(JSON.toJSONString(map));
}));
return testResourcePoolDTOS;
} }
@GetMapping("/{shareId}/scenario/report/selectReportContent/{stepId}") @GetMapping("/{shareId}/scenario/report/selectReportContent/{stepId}")