diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java index 0549b16b61..69404f4589 100644 --- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java +++ b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java @@ -120,9 +120,18 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl queue.clear(); super.teardownTest(context); NoticeService noticeService = CommonBeanFactory.getBean(NoticeService.class); - List notice = noticeService.queryNotice(testResult.getTestId()); + List notice = null; + try { + notice = noticeService.queryNotice(testResult.getTestId()); + } catch (Exception e) { + e.printStackTrace(); + } MailService mailService = CommonBeanFactory.getBean(MailService.class); - mailService.sendHtml(report.getId(), notice, report.getStatus(), "api"); + try { + mailService.sendHtml(report.getId(), notice, report.getStatus(), "api"); + } catch (Exception e) { + e.printStackTrace(); + } } private RequestResult getRequestResult(SampleResult result) { diff --git a/backend/src/main/java/io/metersphere/notice/service/MailService.java b/backend/src/main/java/io/metersphere/notice/service/MailService.java index 8a27cd23b3..c423e8e83b 100644 --- a/backend/src/main/java/io/metersphere/notice/service/MailService.java +++ b/backend/src/main/java/io/metersphere/notice/service/MailService.java @@ -65,6 +65,7 @@ public class MailService { } else if (type.equals("performance")) { LoadTestDTO performanceResult = apiAndPerformanceHelper.getPerformance(id); testName = performanceResult.getName(); + status = performanceResult.getStatus(); } String html1 = "\n" + "\n" + diff --git a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java index 75cbb42b16..2c580d4b17 100644 --- a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java +++ b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java @@ -239,7 +239,7 @@ public class PerformanceTestService { startEngine(loadTest, engine, request.getTriggerMode()); if (request.getTriggerMode().equals("SCHEDULE")) { List notice = noticeService.queryNotice(request.getId()); - mailService.sendHtml(engine.getReportId(), notice, "success", "performance"); + mailService.sendHtml(engine.getReportId(), notice, "status", "performance"); } return engine.getReportId(); } diff --git a/frontend/src/business/components/api/test/ApiTestConfig.vue b/frontend/src/business/components/api/test/ApiTestConfig.vue index 9d90a5b12d..d937b9e94d 100644 --- a/frontend/src/business/components/api/test/ApiTestConfig.vue +++ b/frontend/src/business/components/api/test/ApiTestConfig.vue @@ -292,8 +292,7 @@ export default { }); }, cancel() { - console.log(this.test.toJMX().xml) - // this.$router.push('/api/test/list/all'); + this.$router.push('/api/test/list/all'); }, handleCommand(command) { switch (command) { diff --git a/frontend/src/business/components/common/components/search/search-components.js b/frontend/src/business/components/common/components/search/search-components.js index 96e06f9d46..e968367f48 100644 --- a/frontend/src/business/components/common/components/search/search-components.js +++ b/frontend/src/business/components/common/components/search/search-components.js @@ -107,7 +107,8 @@ export const STATUS = { options: [ {label: "Saved", value: "Saved"}, {label: "Starting", value: "Starting"}, {label: "Running", value: "Running"}, {label: "Reporting", value: "Reporting"}, - {label: "Completed", value: "Completed"}, {label: "Error", value: "Error"} + {label: "Completed", value: "Completed"}, {label: "Error", value: "Error"}, + {label: "Success", value: "Success"} ], props: { // 尾部控件的props，一般为element ui控件的props multiple: true