From f0ad527813076f566830d6e47d7fcf8980115c4d Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Sun, 21 Mar 2021 23:02:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A=E4=B8=8D?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/jmeter/APIBackendListenerClient.java   | 18 +++++++-----------
 .../resources/mail/ApiFailedNotification.html  | 10 +++++++---
 .../mail/ApiSuccessfulNotification.html        |  7 ++++---
 3 files changed, 18 insertions(+), 17 deletions(-)

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 b34067ab89..cf82dc8ea1 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
@@ -247,26 +247,22 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
         NoticeSendService noticeSendService = CommonBeanFactory.getBean(NoticeSendService.class);
         assert systemParameterService != null;
         assert noticeSendService != null;
-
         BaseSystemConfigDTO baseSystemConfigDTO = systemParameterService.getBaseInfo();
-        String url = reportUrl;
-        String url2 = reportUrl;
-        if (StringUtils.isEmpty(url)) {
-            url = baseSystemConfigDTO.getUrl() + "/#/api/report/view/" + report.getId();
-            url2 = baseSystemConfigDTO.getUrl() + "/#/api/automation/report/view/" + report.getId();
-        }
+        String url = baseSystemConfigDTO.getUrl() + "/#/api/report/view/" + report.getId();
+        String url2 = baseSystemConfigDTO.getUrl() + "/#/api/automation/report/view/" + report.getId();
+
         String successContext = "";
         String failedContext = "";
         String subject = "";
         String event = "";
         if (StringUtils.equals(ReportTriggerMode.API.name(), report.getTriggerMode())) {
-            successContext = "接口测试 API任务通知:'" + report.getName() + "'执行成功" + "\n" + "请点击下面链接进入测试报告页面" + "\n" + "旧版接口测试路径" + url + "\n" + "新版接口测试路径" + url2;
-            failedContext = "接口测试 API任务通知:'" + report.getName() + "'执行失败" + "\n" + "请点击下面链接进入测试报告页面" + "\n" + "旧版接口测试路径" + url + "\n" + "新版接口测试路径" + url2;
+            successContext = "接口测试 API任务通知:'" + report.getName() + "'执行成功" + "\n" + "【接口定义暂无报告链接】" + "\n" + "请点击下面链接进入测试报告页面" + "\n" + "（旧版）接口测）路径" + url + "\n" + "（新版）接口测试路径" + url2;
+            failedContext = "接口测试 API任务通知:'" + report.getName() + "'执行失败" + "\n" + "【接口定义暂无报告链接】" + "\n" + "请点击下面链接进入测试报告页面" + "\n" + "（旧版）接口测试路径" + url + "\n" + "（新版）接口测试路径" + url2;
             subject = Translator.get("task_notification_jenkins");
         }
         if (StringUtils.equals(ReportTriggerMode.SCHEDULE.name(), report.getTriggerMode())) {
-            successContext = "接口测试定时任务通知:'" + report.getName() + "'执行成功" + "\n" + "请点击下面链接进入测试报告页面" + "\n" + "旧版接口测试路径" + url + "\n" + "新版接口测试路径" + url2;
-            failedContext = "接口测试定时任务通知:'" + report.getName() + "'执行失败" + "\n" + "请点击下面链接进入测试报告页面" + "\n" + "旧版接口测试路径" + url + "\n" + "新版接口测试路径" + url2;
+            successContext = "接口测试定时任务通知:'" + report.getName() + "'执行成功" + "\n" + "【接口定义暂无报告链接】" + "\n" + "请点击下面链接进入测试报告页面" + "\n" + "（旧版）接口测试路径" + url + "\n" + "（新版）接口测试路径" + url2;
+            failedContext = "接口测试定时任务通知:'" + report.getName() + "'执行失败" + "\n" + "【接口定义暂无报告链接】" + "\n" + "请点击下面链接进入测试报告页面" + "\n" + "（旧版）接口测试路径" + url + "\n" + "（新版）接口测试路径" + url2;
             subject = Translator.get("task_notification");
         }
         if (StringUtils.equals("Success", report.getStatus())) {
diff --git a/backend/src/main/resources/mail/ApiFailedNotification.html b/backend/src/main/resources/mail/ApiFailedNotification.html
index dded07b788..19911bbdf8 100644
--- a/backend/src/main/resources/mail/ApiFailedNotification.html
+++ b/backend/src/main/resources/mail/ApiFailedNotification.html
@@ -11,11 +11,15 @@
         <p style="margin-left: 60px">您好:
     </div>
     <div style="margin-left: 100px">
+        successContext = "接口测试定时任务通知:'" + report.getName() + "'执行成功" + "\n" + "【接口定义暂无报告链接】"+"\n" +"请点击下面链接进入测试报告页面" +
+        "\n" + "（旧版）接口测试路径" + url + "\n" + "（新版）接口测试路径" + url2;
+
         <p>您所执行的 ${testName} 接口测试运行失败<br/>
-            请点击下面链接进入测试报告页面</p>
+            请点击下面链接进入测试报告页面【接口定义暂无报告路径】<br/>
+            【旧版接口测试报告路径】</p>
         <a href="${url}/#/${type}/report/view/${id}">${url}/#/${type}/report/view/${id}</a>
-        <p>新版接口测试报告路径</p>
-        <a href="${url}/#/api/automation">${url}/#/api/automation</a>
+        <p>【新版接口测试报告路径】</p>
+        <a href="${url}/#/api/automation/report/view/${id}">${url}/#/api/automation/report/view/${id}</a>
     </div>
 
 </div>
diff --git a/backend/src/main/resources/mail/ApiSuccessfulNotification.html b/backend/src/main/resources/mail/ApiSuccessfulNotification.html
index 11dc44ebc3..a3399e770b 100644
--- a/backend/src/main/resources/mail/ApiSuccessfulNotification.html
+++ b/backend/src/main/resources/mail/ApiSuccessfulNotification.html
@@ -11,10 +11,11 @@
 </div>
 <div style="margin-left: 100px">
     <p>您所执行的 ${testName} 接口测试运行成功<br/>
-        请点击下面链接进入测试报告页面</p>
+        请点击下面链接进入测试报告页面【接口定义暂无报告路径】<br/>
+        【旧版接口测试报告路径】</p>
     <a href="${url}/#/${type}/report/view/${id}">${url}/#/${type}/report/view/${id}</a>
-    <p>新版接口测试报告路径</p>
-    <a href="${url}/#/api/automation">${url}/#/api/automation</a>
+    <p>【新版接口测试报告路径】</p>
+    <a href="${url}/#/api/automation/report/view/${id}">${url}/#/api/automation/report/view/${id}</a>
 </div>
 </body>
 </html>
\ No newline at end of file