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

fix: 更换jenkins查询测试计划接口

This commit is contained in:
wenyann 2021-01-05 17:32:28 +08:00
parent b824302acf
commit 1a43a1605a
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/track/controller/TestPlanController.java
View File

@ -46,11 +46,11 @@ public class TestPlanController {
/*jenkins测试计划*/ /*jenkins测试计划*/
@GetMapping("/list/all/{projectId}/{workspaceId}") @GetMapping("/list/all/{projectId}/{workspaceId}")
public List<TestPlanDTO> listByProjectId(@PathVariable String projectId, @PathVariable String workspaceId) { public List<TestPlanDTOWithMetric> listByProjectId(@PathVariable String projectId, @PathVariable String workspaceId) {
QueryTestPlanRequest request = new QueryTestPlanRequest(); QueryTestPlanRequest request = new QueryTestPlanRequest();
request.setWorkspaceId(workspaceId); request.setWorkspaceId(workspaceId);
request.setProjectId(projectId); request.setProjectId(projectId);
return testPlanService.listTestPlanByProject(request); return testPlanService.listTestPlan(request);
} }
@PostMapping("/list/all") @PostMapping("/list/all")

1
backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
View File

@ -57,7 +57,6 @@ public class TestPlanTestCaseService {
} }
public List<TestPlanCaseDTO> listByPlanId(QueryTestPlanCaseRequest request) { public List<TestPlanCaseDTO> listByPlanId(QueryTestPlanCaseRequest request) {
List<TestPlanCaseDTO> list = extTestPlanTestCaseMapper.listByPlanId(request); List<TestPlanCaseDTO> list = extTestPlanTestCaseMapper.listByPlanId(request);
return list; return list;
} }

5
frontend/src/business/components/settings/system/EmailSetting.vue
View File

@ -48,15 +48,12 @@
</el-row> </el-row>
<!----> <!---->
<div style="border: 0px;margin-bottom: 20px;margin-top: 20px"> <div style="border: 0px;margin-bottom: 20px">
<el-checkbox v-model="formInline.ssl" :label="$t('system_parameter_setting.SSL')"></el-checkbox> <el-checkbox v-model="formInline.ssl" :label="$t('system_parameter_setting.SSL')"></el-checkbox>
</div> </div>
<div style="border: 0px;margin-bottom: 20px"> <div style="border: 0px;margin-bottom: 20px">
<el-checkbox v-model="formInline.tls" :label="$t('system_parameter_setting.TLS')"></el-checkbox> <el-checkbox v-model="formInline.tls" :label="$t('system_parameter_setting.TLS')"></el-checkbox>
</div> </div>
<!-- <div style="border: 0px;margin-bottom: 20px">
<el-checkbox v-model="formInline.ANON" :label="$t('system_parameter_setting.SMTP')"></el-checkbox>
</div>-->
<template v-slot:footer> <template v-slot:footer>
</template> </template>
</el-form> </el-form>