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:
chenjianxing 2021-08-20 13:54:06 +08:00 committed by jianxing
parent 8d13d1bd63
commit fe96b6694f
19 changed files with 132 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
backend/src/main/java/io/metersphere/api/service/ShareInfoService.java
View File

@ -5,11 +5,15 @@ import com.alibaba.fastjson.JSONObject;
import io.metersphere.api.dto.share.*;
import io.metersphere.base.domain.ApiDefinitionWithBLOBs;
import io.metersphere.base.domain.ShareInfo;
import io.metersphere.base.domain.TestPlanApiCase;
import io.metersphere.base.domain.TestPlanApiScenario;
import io.metersphere.base.mapper.ShareInfoMapper;
import io.metersphere.base.mapper.ext.ExtShareInfoMapper;
import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.BeanUtils;
import io.metersphere.commons.utils.SessionUtils;
import io.metersphere.service.SystemParameterService;
import io.metersphere.track.service.TestPlanApiCaseService;
import io.metersphere.track.service.TestPlanScenarioCaseService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -31,7 +35,9 @@ public class ShareInfoService {
@Resource
ShareInfoMapper shareInfoMapper;
@Resource
SystemParameterService systemParameterService;
TestPlanApiCaseService testPlanApiCaseService;
@Resource
TestPlanScenarioCaseService testPlanScenarioCaseService;
public List<ApiDocumentInfoDTO> findApiDocumentSimpleInfoByRequest(ApiDocumentRequest request) {
if (this.isParamLegitimacy(request)) {
@ -440,4 +446,33 @@ public class ShareInfoService {
public ShareInfo get(String id) {
return shareInfoMapper.selectByPrimaryKey(id);
}
public void validate(String shareId, String customData) {
ShareInfo shareInfo = shareInfoMapper.selectByPrimaryKey(shareId);
if (shareInfo == null) {
MSException.throwException("shareInfo not exist!");
} else {
if (!StringUtils.equals(customData, shareInfo.getCustomData())) {
MSException.throwException("validate failure!");
}
}
}
public void apiReportValidate(String shareId, String testId) {
ShareInfo shareInfo = shareInfoMapper.selectByPrimaryKey(shareId);
String planId = shareInfo.getCustomData();
TestPlanApiCase testPlanApiCase = testPlanApiCaseService.getById(testId);
if (!StringUtils.equals(planId, testPlanApiCase.getTestPlanId())) {
MSException.throwException("validate failure!");
}
}
public void scenarioReportValidate(String shareId, String reportId) {
ShareInfo shareInfo = shareInfoMapper.selectByPrimaryKey(shareId);
String planId = shareInfo.getCustomData();
TestPlanApiScenario testPlanApiScenario = testPlanScenarioCaseService.selectByReportId(reportId);
if (!StringUtils.equals(planId, testPlanApiScenario.getTestPlanId())) {
MSException.throwException("validate failure!");
}
}
}

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

@ -6,23 +6,20 @@ import io.metersphere.api.dto.automation.TestPlanFailureApiDTO;
import io.metersphere.api.dto.automation.TestPlanFailureScenarioDTO;
import io.metersphere.api.service.ApiDefinitionService;
import io.metersphere.api.service.ApiScenarioReportService;
import io.metersphere.api.service.ShareInfoService;
import io.metersphere.base.domain.IssuesDao;
import io.metersphere.track.dto.TestPlanCaseDTO;
import io.metersphere.track.dto.TestPlanLoadCaseDTO;
import io.metersphere.track.dto.TestPlanSimpleReportDTO;
import io.metersphere.track.service.*;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.util.List;
@Controller
@RestController
@RequestMapping("share")
public class ShareController {
@ -42,60 +39,60 @@ public class ShareController {
TestPlanLoadCaseService testPlanLoadCaseService;
@Resource
IssuesService issuesService;
@Resource
ShareInfoService shareInfoService;
// Todo 鉴权
@ResponseBody
@GetMapping("/issues/plan/get/{planId}")
public List<IssuesDao> getIssuesByPlanoId(@PathVariable String planId) {
@GetMapping("/issues/plan/get/{shareId}/{planId}")
public List<IssuesDao> getIssuesByPlanoId(@PathVariable String shareId, @PathVariable String planId) {
shareInfoService.validate(shareId, planId);
return issuesService.getIssuesByPlanoId(planId);
}
@ResponseBody
@GetMapping("/test/plan/report/{planId}")
public TestPlanSimpleReportDTO getReport(@PathVariable String planId) {
@GetMapping("/test/plan/report/{shareId}/{planId}")
public TestPlanSimpleReportDTO getReport(@PathVariable String shareId, @PathVariable String planId) {
shareInfoService.validate(shareId, planId);
return testPlanService.getReport(planId);
}
@ResponseBody
@GetMapping("/report/export/{planId}")
public void exportHtmlReport(@PathVariable String planId, HttpServletResponse response) throws UnsupportedEncodingException {
@GetMapping("/report/export/{shareId}/{planId}")
public void exportHtmlReport(@PathVariable String shareId, @PathVariable String planId, HttpServletResponse response) throws UnsupportedEncodingException {
shareInfoService.validate(shareId, planId);
testPlanService.exportPlanReport(planId, response);
}
@ResponseBody
@GetMapping("/test/plan/case/list/failure/{planId}")
public List<TestPlanCaseDTO> getFailureCases(@PathVariable String planId) {
@GetMapping("/test/plan/case/list/failure/{shareId}/{planId}")
public List<TestPlanCaseDTO> getFailureCases(@PathVariable String shareId, @PathVariable String planId) {
shareInfoService.validate(shareId, planId);
return testPlanTestCaseService.getFailureCases(planId);
}
@ResponseBody
@GetMapping("/test/plan/load/case/list/failure/{planId}")
public List<TestPlanLoadCaseDTO> getLoadFailureCases(@PathVariable String planId) {
@GetMapping("/test/plan/load/case/list/failure/{shareId}/{planId}")
public List<TestPlanLoadCaseDTO> getLoadFailureCases(@PathVariable String shareId, @PathVariable String planId) {
shareInfoService.validate(shareId, planId);
return testPlanLoadCaseService.getFailureCases(planId);
}
@ResponseBody
@GetMapping("/test/plan/api/case/list/failure/{planId}")
public List<TestPlanFailureApiDTO> getApiFailureList(@PathVariable String planId) {
@GetMapping("/test/plan/api/case/list/failure/{shareId}/{planId}")
public List<TestPlanFailureApiDTO> getApiFailureList(@PathVariable String shareId, @PathVariable String planId) {
shareInfoService.validate(shareId, planId);
return testPlanApiCaseService.getFailureList(planId);
}
@ResponseBody
@GetMapping("/test/plan/scenario/case/list/failure/{planId}")
public List<TestPlanFailureScenarioDTO> getScenarioFailureList(@PathVariable String planId) {
@GetMapping("/test/plan/scenario/case/list/failure/{shareId}/{planId}")
public List<TestPlanFailureScenarioDTO> getScenarioFailureList(@PathVariable String shareId, @PathVariable String planId) {
shareInfoService.validate(shareId, planId);
return testPlanScenarioCaseService.getFailureList(planId);
}
@ResponseBody
@GetMapping("/api/definition/report/getReport/{testId}")
public APIReportResult getApiReport(@PathVariable String testId) {
@GetMapping("/api/definition/report/getReport/{shareId}/{testId}")
public APIReportResult getApiReport(@PathVariable String shareId, @PathVariable String testId) {
shareInfoService.apiReportValidate(shareId, testId);
return apiDefinitionService.getDbResult(testId);
}
@ResponseBody
@GetMapping("/api/scenario/report/get/{reportId}")
public APIScenarioReportResult get(@PathVariable String reportId) {
@GetMapping("/api/scenario/report/get/{shareId}/{reportId}")
public APIScenarioReportResult get(@PathVariable String shareId, @PathVariable String reportId) {
shareInfoService.scenarioReportValidate(shareId, reportId);
return apiScenarioReportService.get(reportId);
}
}

10
backend/src/main/java/io/metersphere/track/service/TestPlanScenarioCaseService.java
View File

@ -441,4 +441,14 @@ public class TestPlanScenarioCaseService {
buildUserInfo(apiTestCases);
return apiTestCases;
}
public TestPlanApiScenario selectByReportId(String reportId) {
TestPlanApiScenarioExample example = new TestPlanApiScenarioExample();
example.createCriteria().andReportIdEqualTo(reportId);
List<TestPlanApiScenario> testPlanApiScenarios = testPlanApiScenarioMapper.selectByExample(example);
if (CollectionUtils.isNotEmpty(testPlanApiScenarios)) {
return testPlanApiScenarios.get(0);
}
return null;
}
}

5
frontend/src/business/components/api/automation/report/ApiReportDetail.vue
View File

@ -79,7 +79,8 @@ export default {
debug: Boolean,
isTemplate: Boolean,
templateReport: Object,
isShare: Boolean
isShare: Boolean,
shareId: String
},
watch: {
reportId() {
@ -241,7 +242,7 @@ export default {
this.report = this.templateReport;
this.buildReport();
} else if (this.isShare) {
getShareScenarioReport(this.reportId, (data) => {
getShareScenarioReport(this.shareId, this.reportId, (data) => {
this.report = data || {};
this.buildReport();
});

4
frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanApiReport.vue
View File

@ -5,7 +5,7 @@
<api-result :api-result="report.apiResult"/>
</el-tab-pane>
<el-tab-pane label="失败用例" name="second">
<api-failure-result :is-share="isShare" :report="report" :is-template="isTemplate" :plan-id="planId"/>
<api-failure-result :share-id="shareId" :is-share="isShare" :report="report" :is-template="isTemplate" :plan-id="planId"/>
</el-tab-pane>
<!-- <el-tab-pane label="所有用例" name="fourth">所有用例</el-tab-pane>-->
@ -28,7 +28,7 @@ export default {
};
},
props: [
'report', 'planId', 'isTemplate', 'isShare'
'report', 'planId', 'isTemplate', 'isShare', 'shareId'
],
methods: {
handleClick(tab, event) {

6
frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanFunctionalReport.vue
View File

@ -5,10 +5,10 @@
<functional-result :function-result="report.functionResult"/>
</el-tab-pane>
<el-tab-pane label="失败用例" name="second">
<functional-failure-result :is-share="isShare" :is-template="isTemplate" :report="report" :plan-id="planId"/>
<functional-failure-result :share-id="shareId" :is-share="isShare" :is-template="isTemplate" :report="report" :plan-id="planId"/>
</el-tab-pane>
<el-tab-pane label="缺陷列表" name="third">
<functional-issue-list :is-share="isShare" :is-template="isTemplate" :report="report" :plan-id="planId"/>
<functional-issue-list :share-id="shareId" :is-share="isShare" :is-template="isTemplate" :report="report" :plan-id="planId"/>
</el-tab-pane>
<!-- <el-tab-pane label="所有用例" name="fourth">所有用例</el-tab-pane>-->
</el-tabs>
@ -33,7 +33,7 @@ export default {
};
},
props: [
'report','planId', 'isTemplate', 'isShare'
'report','planId', 'isTemplate', 'isShare', 'shareId'
],
methods: {
handleClick(tab, event) {

5
frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanLoadReport.vue
View File

@ -5,7 +5,7 @@
<load-result :load-result="report.loadResult"/>
</el-tab-pane>
<el-tab-pane label="失败用例" name="second">
<load-failure-result :is-share="isShare" :is-template="isTemplate" :report="report" :plan-id="planId"/>
<load-failure-result :share-id="shareId" :is-share="isShare" :is-template="isTemplate" :report="report" :plan-id="planId"/>
</el-tab-pane>
<!-- <el-tab-pane label="所有用例" name="fourth">所有用例</el-tab-pane>-->
</el-tabs>
@ -35,7 +35,8 @@ export default {
'report',
'planId',
'isTemplate',
'isShare'
'isShare',
'shareId'
],
methods: {
handleClick(tab, event) {

20
frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportContent.vue
View File

@ -5,18 +5,6 @@
<div v-if="!isTemplate && !isShare" class="head-bar head-right">
<!-- <div style="font-size: 17px">-->
<!-- <el-popover-->
<!-- placement="right"-->
<!-- width="260">-->
<!-- <p>{{shareUrl}}</p>-->
<!-- <div style="text-align: right; margin: 0">-->
<!-- <el-button type="primary" size="mini"-->
<!-- v-clipboard:copy="shareUrl">{{ $t("commons.copy") }}</el-button>-->
<!-- </div>-->
<!-- <i class="el-icon-share" @click="shareApiDocument" slot="reference" style="margin-right: 10px;cursor: pointer"></i>-->
<!-- </el-popover>-->
<!-- </div>-->
<ms-share-button :share-url="shareUrl" @click="shareApiDocument"/>
<el-row>
@ -32,9 +20,9 @@
</div>
<test-plan-report-header :is-template="isTemplate" :is-share="isShare" :report="report" :plan-id="planId"/>
<test-plan-functional-report :is-share="isShare" :is-template="isTemplate" v-if="functionalEnable" :plan-id="planId" :report="report"/>
<test-plan-api-report :is-share="isShare" :is-template="isTemplate" v-if="apiEnable" :report="report" :plan-id="planId"/>
<test-plan-load-report :is-share="isShare" :is-template="isTemplate" v-if="loadEnable" :report="report" :plan-id="planId"/>
<test-plan-functional-report :share-id="shareId" :is-share="isShare" :is-template="isTemplate" v-if="functionalEnable" :plan-id="planId" :report="report"/>
<test-plan-api-report :share-id="shareId" :is-share="isShare" :is-template="isTemplate" v-if="apiEnable" :report="report" :plan-id="planId"/>
<test-plan-load-report :share-id="shareId" :is-share="isShare" :is-template="isTemplate" v-if="loadEnable" :report="report" :plan-id="planId"/>
</el-card>
</el-main>
@ -97,7 +85,7 @@ export default {
if (this.isTemplate) {
this.report = "#report";
} else if (this.isShare) {
this.result = getShareTestPlanReport(this.planId, (data) => {
this.result = getShareTestPlanReport(this.shareId, this.planId, (data) => {
this.report = data;
});
} else {

7
frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiCaseFailureResult.vue
View File

@ -72,7 +72,8 @@ export default {
planId: String,
isTemplate: Boolean,
report: Object,
isShare: Boolean
isShare: Boolean,
shareId: String
},
data() {
return {
@ -92,7 +93,7 @@ export default {
this.rowClick(this.apiCases[0]);
}
} else if (this.isShare) {
this.result = getSharePlanApiFailureCase(this.planId, (data) => {
this.result = getSharePlanApiFailureCase(this.shareId, this.planId, (data) => {
this.apiCases = data;
if (data && data.length > 0) {
this.rowClick(data[0]);
@ -111,7 +112,7 @@ export default {
if (this.isTemplate) {
this.response = JSON.parse(row.response);
} else if (this.isShare) {
getShareApiReport(row.id, (data) => {
getShareApiReport(this.shareId, row.id, (data) => {
this.response = JSON.parse(data.content);
});
} else {

7
frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiFailureResult.vue
View File

@ -2,10 +2,10 @@
<div>
<el-tabs type="card">
<el-tab-pane label="接口用例">
<api-case-failure-result :is-share="isShare" :report="report" :is-template="isTemplate" :plan-id="planId"/>
<api-case-failure-result :share-id="shareId" :is-share="isShare" :report="report" :is-template="isTemplate" :plan-id="planId"/>
</el-tab-pane>
<el-tab-pane label="场景用例">
<api-scenario-failure-result :is-share="isShare" :report="report" :is-template="isTemplate" :plan-id="planId"/>
<api-scenario-failure-result :share-id="shareId" :is-share="isShare" :report="report" :is-template="isTemplate" :plan-id="planId"/>
</el-tab-pane>
</el-tabs>
</div>
@ -29,7 +29,8 @@ export default {
planId: String,
isTemplate: Boolean,
isShare: Boolean,
report: {}
report: {},
shareId: String
},
data() {
return {

7
frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiScenarioFailureResult.vue
View File

@ -45,7 +45,7 @@
</ms-table>
</el-col>
<el-col :span="16" v-if="scenarioCases.length > 0">
<ms-api-report :is-share="isShare" :template-report="response" :is-template="isTemplate" :infoDb="true" :report-id="reportId"/>
<ms-api-report :share-id="shareId" :is-share="isShare" :template-report="response" :is-template="isTemplate" :infoDb="true" :report-id="reportId"/>
</el-col>
</el-row>
</div>
@ -69,7 +69,8 @@ export default {
planId: String,
isTemplate: Boolean,
report: Object,
isShare: Boolean
isShare: Boolean,
shareId: String
},
data() {
return {
@ -90,7 +91,7 @@ export default {
this.rowClick(this.scenarioCases[0]);
}
} else if (this.isShare) {
this.result = getSharePlanScenarioFailureCase(this.planId, (data) => {
this.result = getSharePlanScenarioFailureCase(this.shareId, this.planId, (data) => {
this.scenarioCases = data;
if (data && data.length > 0) {
this.reportId = data[0].reportId;

5
frontend/src/business/components/track/plan/view/comonents/report/detail/component/FunctionalFailureResult.vue
View File

@ -77,7 +77,8 @@ export default {
planId: String,
isTemplate: Boolean,
isShare: Boolean,
report: {}
report: {},
shareId: String
},
data() {
return {
@ -92,7 +93,7 @@ export default {
if (this.isTemplate) {
this.failureTestCases = this.report.failureTestCases;
} else if (this.isShare) {
getSharePlanFunctionFailureCase(this.planId, (data) => {
getSharePlanFunctionFailureCase(this.shareId, this.planId, (data) => {
this.failureTestCases = data;
});
} else {

4
frontend/src/business/components/track/plan/view/comonents/report/detail/component/FunctionalIssueList.vue
View File

@ -67,7 +67,7 @@ export default {
isThirdPart: false
}
},
props: ['planId', 'isTemplate', 'report', 'isShare'],
props: ['planId', 'isTemplate', 'report', 'isShare', 'shareId'],
computed: {
issueStatusMap() {
return ISSUE_STATUS_MAP;
@ -82,7 +82,7 @@ export default {
if (this.isTemplate) {
this.data = this.report.issueList;
} else if (this.isShare) {
this.result = getShareIssuesByPlanId(this.planId, (data) => {
this.result = getShareIssuesByPlanId(this.shareId, this.planId, (data) => {
this.data = data;
});
} else {

5
frontend/src/business/components/track/plan/view/comonents/report/detail/component/LoadFailureResult.vue
View File

@ -48,7 +48,8 @@ export default {
planId: String,
report: Object,
isTemplate: Boolean,
isShare: Boolean
isShare: Boolean,
shareId: String
},
data() {
return {
@ -63,7 +64,7 @@ export default {
if (this.isTemplate) {
this.failureTestCases = this.report.loadFailureTestCases;
} else if (this.isShare) {
getSharePlanLoadFailureCase(this.planId, (data) => {
getSharePlanLoadFailureCase(this.shareId, this.planId, (data) => {
this.failureTestCases = data;
});
} else {

4
frontend/src/network/Issue.js
View File

@ -37,8 +37,8 @@ export function getIssuesByPlanId(planId, callback) {
return planId ? baseGet('/issues/plan/get/' + planId, callback) : {};
}
export function getShareIssuesByPlanId(planId, callback) {
return planId ? baseGet('/share/issues/plan/get/' + planId, callback) : {};
export function getShareIssuesByPlanId(shareId, planId, callback) {
return planId ? baseGet('/share/issues/plan/get/' + shareId + '/' + planId, callback) : {};
}
export function buildPlatformIssue(data) {

8
frontend/src/network/api.js
View File

@ -16,12 +16,12 @@ export function getApiReport(testId, callback) {
return testId ? baseGet('/api/definition/report/getReport/' + testId, callback) : {};
}
export function getShareApiReport(testId, callback) {
return testId ? baseGet('/share/api/definition/report/getReport/' + testId, callback) : {};
export function getShareApiReport(shareId, testId, callback) {
return testId ? baseGet('/share/api/definition/report/getReport/' + shareId + '/' + testId, callback) : {};
}
export function getShareScenarioReport(reportId, callback) {
return reportId ? baseGet('/share/api/scenario/report/get/' + reportId, callback) : {};
export function getShareScenarioReport(shareId, reportId, callback) {
return reportId ? baseGet('/share/api/scenario/report/get/' + shareId + '/' + reportId, callback) : {};
}

20
frontend/src/network/test-plan.js
View File

@ -13,9 +13,9 @@ export function getTestPlanReport(planId, callback) {
}
}
export function getShareTestPlanReport(planId, callback) {
export function getShareTestPlanReport(shareId, planId, callback) {
if (planId) {
return get('/share/test/plan/report/' + planId, (response) => {
return get('/share/test/plan/report/' + shareId + '/' + planId, (response) => {
if (callback) {
callback(response.data);
}
@ -33,30 +33,30 @@ export function getPlanFunctionFailureCase(planId, callback) {
return planId ? baseGet('/test/plan/case/list/failure/' + planId, callback) : {};
}
export function getSharePlanFunctionFailureCase(planId, callback) {
return planId ? baseGet('/share/test/plan/case/list/failure/' + planId, callback) : {};
export function getSharePlanFunctionFailureCase(shareId, planId, callback) {
return planId ? baseGet('/share/test/plan/case/list/failure/' + shareId + '/' + planId, callback) : {};
}
export function getPlanScenarioFailureCase(planId, callback) {
return planId ? baseGet('/test/plan/scenario/case/list/failure/' + planId, callback) : {};
}
export function getSharePlanScenarioFailureCase(planId, callback) {
return planId ? baseGet('/share/test/plan/scenario/case/list/failure/' + planId, callback) : {};
export function getSharePlanScenarioFailureCase(shareId, planId, callback) {
return planId ? baseGet('/share/test/plan/scenario/case/list/failure/' + shareId + '/' + planId, callback) : {};
}
export function getPlanApiFailureCase(planId, callback) {
return planId ? baseGet('/test/plan/api/case/list/failure/' + planId, callback) : {};
}
export function getSharePlanApiFailureCase(planId, callback) {
return planId ? baseGet('/share/test/plan/api/case/list/failure/' + planId, callback) : {};
export function getSharePlanApiFailureCase(shareId, planId, callback) {
return planId ? baseGet('/share/test/plan/api/case/list/failure/' + shareId + '/' + planId, callback) : {};
}
export function getPlanLoadFailureCase(planId, callback) {
return planId ? baseGet('/test/plan/load/case/list/failure/' + planId, callback) : {};
}
export function getSharePlanLoadFailureCase(planId, callback) {
return planId ? baseGet('/share/test/plan/load/case/list/failure/' + planId, callback) : {};
export function getSharePlanLoadFailureCase(shareId, planId, callback) {
return planId ? baseGet('/share/test/plan/load/case/list/failure/' + shareId + '/' + planId, callback) : {};
}

2
frontend/src/template/report/plan/share/SharePlanReportTemplate.vue
View File

@ -1,5 +1,5 @@
<template>
<test-plan-report-content :is-share="true" :plan-id="planId"/>
<test-plan-report-content :share-id="shareId" :is-share="true" :plan-id="planId"/>
</template>
<script>