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

fix(工作台): 修复执行失败就进入工作台待更新列表问题 

https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001019490
https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001018365

--user=郭雨琦
This commit is contained in:
guoyuqi 2022-11-08 13:51:16 +08:00 committed by xiaomeinvG
parent aaeacb0b11
commit f0324e3bdb
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api-test/backend/src/main/java/io/metersphere/service/definition/ApiDefinitionExecResultService.java
View File

@ -237,11 +237,6 @@ public class ApiDefinitionExecResultService {
// 更新用例最后执行结果 // 更新用例最后执行结果
caseWithBLOBs.setLastResultId(reportId); caseWithBLOBs.setLastResultId(reportId);
caseWithBLOBs.setStatus(status); caseWithBLOBs.setStatus(status);
if (status.equals(ApiReportStatus.ERROR.name())) {
caseWithBLOBs.setToBeUpdated(true);
} else {
caseWithBLOBs.setToBeUpdated(false);
}
caseWithBLOBs.setUpdateTime(System.currentTimeMillis()); caseWithBLOBs.setUpdateTime(System.currentTimeMillis());
apiTestCaseMapper.updateByPrimaryKey(caseWithBLOBs); apiTestCaseMapper.updateByPrimaryKey(caseWithBLOBs);

18
api-test/frontend/src/business/definition/components/complete/EditCompleteHTTPApi.vue
View File

@ -517,7 +517,23 @@ export default {
this.batchSyncApiVisible = true; this.batchSyncApiVisible = true;
} }
} }
if (this.apiSyncRuleRelation.showUpdateRule === true && !this.noShowSyncRuleRelation) { if (this.request.authManager && this.beforeRequest.authManager) {
let submitRequestAuthManager = JSON.stringify(this.request.authManager);
let beforeRequestAuthManager = JSON.stringify(this.beforeRequest.authManager);
if ((submitRequestAuthManager !== beforeRequestAuthManager) && !this.noShowSyncRuleRelation) {
this.batchSyncApiVisible = true;
}
}
if (this.request.hashTree && this.beforeRequest.hashTree) {
let submitRequestHashTree = JSON.stringify(this.request.hashTree);
let beforeRequestHashTree = JSON.stringify(this.beforeRequest.hashTree);
if ((submitRequestHashTree !== beforeRequestHashTree) && !this.noShowSyncRuleRelation) {
this.batchSyncApiVisible = true;
}
}
if (((this.request.connectTimeout !== this.beforeRequest.connectTimeout) || (this.request.responseTimeout !== this.beforeRequest.responseTimeout)
|| (this.request.followRedirects !== this.beforeRequest.followRedirects) || (this.request.alias !== this.beforeRequest.alias)
|| this.apiSyncRuleRelation.showUpdateRule === true) && !this.noShowSyncRuleRelation) {
this.batchSyncApiVisible = true; this.batchSyncApiVisible = true;
} }
if (this.batchSyncApiVisible !== true) { if (this.batchSyncApiVisible !== true) {