diff --git a/backend/src/main/resources/mail/ApiFailedNotification.html b/backend/src/main/resources/mail/ApiFailedNotification.html index 90d282ed72..79f468ffbc 100644 --- a/backend/src/main/resources/mail/ApiFailedNotification.html +++ b/backend/src/main/resources/mail/ApiFailedNotification.html @@ -12,7 +12,7 @@
-

${testName} 接口测试运行失败
+

${name} 接口测试运行失败

执行人:${executor}

执行环境:${executionEnvironment}

执行时间:${executionTime}

diff --git a/backend/src/main/resources/mail/ApiSuccessfulNotification.html b/backend/src/main/resources/mail/ApiSuccessfulNotification.html index e0f141a2a7..7ae2c9cded 100644 --- a/backend/src/main/resources/mail/ApiSuccessfulNotification.html +++ b/backend/src/main/resources/mail/ApiSuccessfulNotification.html @@ -10,7 +10,7 @@

您好:

-

${testName} 接口测试运行成功
+

${name} 接口测试运行成功

执行人:${executor}

执行环境:${executionEnvironment}

执行时间:${executionTime}

diff --git a/backend/src/main/resources/mail/PerformanceApiSuccessNotification.html b/backend/src/main/resources/mail/PerformanceApiSuccessNotification.html index 047ce019c1..04bca545f6 100644 --- a/backend/src/main/resources/mail/PerformanceApiSuccessNotification.html +++ b/backend/src/main/resources/mail/PerformanceApiSuccessNotification.html @@ -10,7 +10,7 @@

您好:

-

您所执行的 ${testName} 性能测试已完成
+

您所执行的 ${name} 性能测试已完成
请点击下面链接进入测试报告页面

${url}/#/${type}/report/view/${id}
diff --git a/backend/src/main/resources/mail/PerformanceFailedNotification.html b/backend/src/main/resources/mail/PerformanceFailedNotification.html index 97ee5ec1fb..41da8c827f 100644 --- a/backend/src/main/resources/mail/PerformanceFailedNotification.html +++ b/backend/src/main/resources/mail/PerformanceFailedNotification.html @@ -11,7 +11,7 @@

您好:

-

您所执行的 ${testName} 启动失败
+

您所执行的 ${name} 启动失败

diff --git a/backend/src/main/resources/mail/TestPlanFailedNotification.html b/backend/src/main/resources/mail/TestPlanFailedNotification.html index f6c3ddb8e7..e279dec167 100644 --- a/backend/src/main/resources/mail/TestPlanFailedNotification.html +++ b/backend/src/main/resources/mail/TestPlanFailedNotification.html @@ -11,7 +11,7 @@

您好:

-

您所执行的 ${testName} 测试计划运行失败
+

您所执行的 ${name} 测试计划运行失败
请点击下面链接进入测试报告页面

${url}/#/${type}/report/view/${id}
diff --git a/backend/src/main/resources/mail/TestPlanSuccessfulNotification.html b/backend/src/main/resources/mail/TestPlanSuccessfulNotification.html index 738087eb37..463751b461 100644 --- a/backend/src/main/resources/mail/TestPlanSuccessfulNotification.html +++ b/backend/src/main/resources/mail/TestPlanSuccessfulNotification.html @@ -10,7 +10,7 @@

您好:

-

您所执行的 ${testName} 测试计划运行成功
+

您所执行的 ${name} 测试计划运行成功
请点击下面链接进入测试报告页面

${url}/#/${type}/report/view/${id}
diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue index 7a40da9c3d..93d49fc6ac 100644 --- 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 { '

您好:\n' + ' \n' + '

\n' + - '

${testName} 接口测试运行失败
\n' + + '

${name} 接口测试运行失败
\n' + '

执行人:${executor}

' + '

负责人:${principal}

' + '

执行环境:${executionEnvironment}

' + @@ -183,7 +183,7 @@ export default { '\n' + '', robotTitle: - "测试【任务通知】:'${testName} ${type}测试运行${status}\n" + + "测试【任务通知】:'${name} ${type}测试运行${status}\n" + "执行人:${executor}" + "\n" + "负责人:${principal}" + "\n" + "测试环境为:${executionEnvironment}\n" + diff --git a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue index a44995fd80..93ddb8ddd6 100644 --- 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 { '

您好:\n' + '

\n' + '
\n' + - '

${testName} 接口测试运行失败/成功
\n' + + '

${name} 接口测试运行失败/成功
\n' + '

执行人:${executor}

' + '

负责人:${principal}

' + '

执行环境:${executionEnvironment}

' + @@ -182,7 +182,7 @@ export default { '\n' + '', robotTitle: - "测试【任务通知】:'${testName} ${type}测试运行${status}," + "\n" + + "测试【任务通知】:'${name} ${type}测试运行${status}," + "\n" + "执行人:${executor}" + "\n" + "负责人:${principal}" + "\n" + "测试环境为:${executionEnvironment}" + "\n" + diff --git a/frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue b/frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue index 36b8d1c353..fee156b78b 100644 --- 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 { '

您好:\n' + '

\n' + '
\n' + - '

${testName} 接口测试运行失败/成功
\n' + + '

${name} 接口测试运行失败/成功
\n' + '

执行人:${executor}

' + '

执行环境:${executionEnvironment}

' + '

执行时间:${executionTime}

' + @@ -198,7 +198,7 @@ export default { '\n' + '', robotTitle: - "测试【任务通知】:'${executor}所执行的 ${testName} ${type}测试运行${status}\n" + + "测试【任务通知】:'${executor}所执行的 ${name} ${type}测试运行${status}\n" + "测试环境为:${executionEnvironment}\n" + "执行时间:${executionTime}\n" + "请点击下面链接进入测试报告页面\n" + diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 17d46328fd..f26c3b7e58 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 17d46328fd6b0f723f91ea44e55da9a839e3da04 +Subproject commit f26c3b7e5861ad8df645197b866c3f767a01810c