diff --git a/backend/src/main/java/io/metersphere/service/ProjectService.java b/backend/src/main/java/io/metersphere/service/ProjectService.java index 08587ef17a..f1057a0fad 100644 --- a/backend/src/main/java/io/metersphere/service/ProjectService.java +++ b/backend/src/main/java/io/metersphere/service/ProjectService.java @@ -194,7 +194,11 @@ public class ProjectService { deleteProjectUserGroup(projectId); //关闭TCP - this.closeMockTcp(projectId); + try { + //捕获关闭失败的异常,使其不影响删除 + this.closeMockTcp(projectId); + }catch (Exception e){} + // delete project projectMapper.deleteByPrimaryKey(projectId); diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java index 8286425c79..637294ad1d 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestPlanService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestPlanService.java @@ -990,7 +990,6 @@ public class TestPlanService { @Transactional(propagation = Propagation.NOT_SUPPORTED) public String run(String testPlanID, String projectID, String userId, String triggerMode, String apiRunConfig) { - triggerMode = ReportTriggerMode.SCHEDULE.name(); //创建测试报告,然后返回的ID重新赋值为resourceID,作为后续的参数 TestPlanScheduleReportInfoDTO reportInfoDTO = testPlanReportService.genTestPlanReportBySchedule(projectID, testPlanID, userId, triggerMode); @@ -1647,6 +1646,7 @@ public class TestPlanService { buildApiReport(report, config, executeInfo, planId, saveResponse); buildLoadReport(report, config, executeInfo, planId, saveResponse); + report.setEndTime(System.currentTimeMillis()); return report; }else { return null; diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiCaseFailureResult.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiCaseFailureResult.vue index 47f649c04a..d6c3632fb2 100644 --- a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiCaseFailureResult.vue +++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/ApiCaseFailureResult.vue @@ -98,6 +98,8 @@ export default { apiCases() { if (this.apiCases) { this.$emit('setSize', this.apiCases.length); + } else { + this.apiCases = []; } } },