fix(消息通知): 消息通知中的部分变量不能获取

2021-09-24 11:37:22 +08:00 · 2021-09-24 11:37:22 +08:00 · 331747aa08
parent 4b357db20d
commit 331747aa08
10 changed files with 13 additions and 13 deletions
--- a/backend/src/main/resources/mail/ApiFailedNotification.html
+++ b/backend/src/main/resources/mail/ApiFailedNotification.html
@ -12,7 +12,7 @@
    </div>
    <div style="margin-left: 100px">

-        <p>${testName} 接口测试运行失败<br/>
+        <p>${name} 接口测试运行失败<br/>
        <p>执行人:${executor}</p>
        <p>执行环境:${executionEnvironment}</p>
        <p>执行时间:${executionTime}</p>
--- a/backend/src/main/resources/mail/ApiSuccessfulNotification.html
+++ b/backend/src/main/resources/mail/ApiSuccessfulNotification.html
@ -10,7 +10,7 @@
    <p style="margin-left: 60px">您好:
 </div>
 <div style="margin-left: 100px">
-    <p>${testName} 接口测试运行成功<br/>
+    <p>${name} 接口测试运行成功<br/>
    <p>执行人:${executor}</p>
    <p>执行环境:${executionEnvironment}</p>
    <p>执行时间:${executionTime}</p>
--- a/backend/src/main/resources/mail/PerformanceApiSuccessNotification.html
+++ b/backend/src/main/resources/mail/PerformanceApiSuccessNotification.html
@ -10,7 +10,7 @@
    <p style="margin-left: 60px">您好:
 </div>
 <div style="margin-left: 100px">
-    <p>您所执行的 ${testName} 性能测试已完成<br/>
+    <p>您所执行的 ${name} 性能测试已完成<br/>
        请点击下面链接进入测试报告页面</p>
    <a href="${url}/#/${type}/report/view/${id}">${url}/#/${type}/report/view/${id}</a>
 </div>
--- a/backend/src/main/resources/mail/PerformanceFailedNotification.html
+++ b/backend/src/main/resources/mail/PerformanceFailedNotification.html
@ -11,7 +11,7 @@
        <p style="margin-left: 60px">您好:
    </div>
    <div style="margin-left: 100px">
-        <p>您所执行的 ${testName} 启动失败<br/>
+        <p>您所执行的 ${name} 启动失败<br/>
    </div>

 </div>
--- a/backend/src/main/resources/mail/TestPlanFailedNotification.html
+++ b/backend/src/main/resources/mail/TestPlanFailedNotification.html
@ -11,7 +11,7 @@
        <p style="margin-left: 60px">您好:
    </div>
    <div style="margin-left: 100px">
-        <p>您所执行的 ${testName} 测试计划运行失败<br/>
+        <p>您所执行的 ${name} 测试计划运行失败<br/>
            请点击下面链接进入测试报告页面</p>
        <a href="${url}/#/${type}/report/view/${id}">${url}/#/${type}/report/view/${id}</a>
    </div>
--- a/backend/src/main/resources/mail/TestPlanSuccessfulNotification.html
+++ b/backend/src/main/resources/mail/TestPlanSuccessfulNotification.html
@ -10,7 +10,7 @@
    <p style="margin-left: 60px">您好:
 </div>
 <div style="margin-left: 100px">
-    <p>您所执行的 ${testName} 测试计划运行成功<br/>
+    <p>您所执行的 ${name} 测试计划运行成功<br/>
        请点击下面链接进入测试报告页面</p>
    <a href="${url}/#/${type}/report/view/${id}">${url}/#/${type}/report/view/${id}</a>
 </div>
--- a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
+++ b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
@ -168,7 +168,7 @@ export default {
        '        <p style="margin-left: 60px">您好:\n' +
        '    </div>\n' +
        '    <div style="margin-left: 100px">\n' +
-        '        <p>${testName} 接口测试运行失败<br/>\n' +
+        '        <p>${name} 接口测试运行失败<br/>\n' +
        '        <p>执行人:${executor}</p>' +
        '        <p>负责人:${principal}</p>' +
        '        <p>执行环境:${executionEnvironment}</p>' +
@ -183,7 +183,7 @@ export default {
        '</body>\n' +
        '</html>',
      robotTitle:
-        "测试【任务通知】:'${testName} ${type}测试运行${status}\n" +
+        "测试【任务通知】:'${name} ${type}测试运行${status}\n" +
        "执行人:${executor}" + "\n" +
        "负责人:${principal}" + "\n" +
        "测试环境为:${executionEnvironment}\n" +
--- a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue
@ -167,7 +167,7 @@ export default {
        '        <p style="margin-left: 60px">您好:\n' +
        '    </div>\n' +
        '    <div style="margin-left: 100px">\n' +
-        '        <p>${testName} 接口测试运行失败/成功<br/>\n' +
+        '        <p>${name} 接口测试运行失败/成功<br/>\n' +
        '        <p>执行人:${executor}</p>' +
        '        <p>负责人:${principal}</p>' +
        '        <p>执行环境:${executionEnvironment}</p>' +
@ -182,7 +182,7 @@ export default {
        '</body>\n' +
        '</html>',
      robotTitle:
-        "测试【任务通知】:'${testName} ${type}测试运行${status}," + "\n" +
+        "测试【任务通知】:'${name} ${type}测试运行${status}," + "\n" +
        "执行人:${executor}" + "\n" +
        "负责人:${principal}" + "\n" +
        "测试环境为:${executionEnvironment}" + "\n" +
--- a/frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue
+++ b/frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue
@ -184,7 +184,7 @@ export default {
        '        <p style="margin-left: 60px">您好:\n' +
        '    </div>\n' +
        '    <div style="margin-left: 100px">\n' +
-        '        <p>${testName} 接口测试运行失败/成功<br/>\n' +
+        '        <p>${name} 接口测试运行失败/成功<br/>\n' +
        '        <p>执行人:${executor}</p>' +
        '        <p>执行环境:${executionEnvironment}</p>' +
        '        <p>执行时间:${executionTime}</p>' +
@ -198,7 +198,7 @@ export default {
        '</body>\n' +
        '</html>',
      robotTitle:
-        "测试【任务通知】:'${executor}所执行的 ${testName} ${type}测试运行${status}\n" +
+        "测试【任务通知】:'${executor}所执行的 ${name} ${type}测试运行${status}\n" +
        "测试环境为:${executionEnvironment}\n" +
        "执行时间：${executionTime}\n" +
        "请点击下面链接进入测试报告页面\n" +
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@ -1 +1 @@
-Subproject commit 17d46328fd6b0f723f91ea44e55da9a839e3da04
+Subproject commit f26c3b7e5861ad8df645197b866c3f767a01810c