refactor: 解决冲突

7b0045d1 · chenjianxing · e40ce931 · bd42309f · 7b0045d1 · 7b0045d1
5 changed file
--- 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> notice = noticeService.queryNotice(testResult.getTestId());
+        List<Notice> 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) {

--- 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 = "<!DOCTYPE html>\n" +
                "<html lang=\"en\">\n" +

--- 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> notice = noticeService.queryNotice(request.getId());
-            mailService.sendHtml(engine.getReportId(), notice, "success", "performance");
+            mailService.sendHtml(engine.getReportId(), notice, "status", "performance");
        }
        return engine.getReportId();
    }

--- 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) {

--- 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