diff --git a/backend/src/main/resources/mail/ApiFailedNotification.html b/backend/src/main/resources/mail/ApiFailedNotification.html index 79f468ffbc..179c816b4c 100644 --- a/backend/src/main/resources/mail/ApiFailedNotification.html +++ b/backend/src/main/resources/mail/ApiFailedNotification.html @@ -13,7 +13,7 @@

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

执行人:${executor}

+

执行人:${operator}

执行环境:${executionEnvironment}

执行时间:${executionTime}

请点击下面链接进入测试报告页面【接口定义暂无报告路径】
diff --git a/backend/src/main/resources/mail/ApiSuccessfulNotification.html b/backend/src/main/resources/mail/ApiSuccessfulNotification.html index 7ae2c9cded..9ecdcc11a4 100644 --- a/backend/src/main/resources/mail/ApiSuccessfulNotification.html +++ b/backend/src/main/resources/mail/ApiSuccessfulNotification.html @@ -11,7 +11,7 @@

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

执行人:${executor}

+

执行人:${operator}

执行环境:${executionEnvironment}

执行时间:${executionTime}

请点击下面链接进入测试报告页面【接口定义暂无报告路径】
diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue index 5c4745508f..3db82c8d81 100644 --- a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue +++ b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue @@ -169,7 +169,7 @@ export default { '
\n' + '
\n' + '

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

执行人:${executor}

' + + '

执行人:${operator}

' + '

负责人:${principal}

' + '

执行环境:${executionEnvironment}

' + '

执行时间:${executionTime}

' + @@ -184,7 +184,7 @@ export default { '', robotTitle: "测试'${name} ${type}测试运行${status}\n" + - "执行人:${executor}" + "\n" + + "执行人:${operator}" + "\n" + "负责人:${principal}" + "\n" + "测试环境为:${executionEnvironment}\n" + "执行时间:${executionTime}\n" + diff --git a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue index 0c0ee9eed0..5836d34116 100644 --- a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue +++ b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue @@ -168,7 +168,7 @@ export default { '
\n' + '
\n' + '

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

执行人:${executor}

' + + '

执行人:${operator}

' + '

负责人:${principal}

' + '

执行环境:${executionEnvironment}

' + '

执行时间:${executionTime}

' + @@ -183,7 +183,7 @@ export default { '', robotTitle: "测试'${name} ${type}测试运行${status}," + "\n" + - "执行人:${executor}" + "\n" + + "执行人:${operator}" + "\n" + "负责人:${principal}" + "\n" + "测试环境为:${executionEnvironment}" + "\n" + "执行时间:${executionTime}" + "\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 78b109f5b9..fc04426d19 100644 --- a/frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue +++ b/frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue @@ -185,7 +185,7 @@ export default { '
\n' + '
\n' + '

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

执行人:${executor}

' + + '

执行人:${operator}

' + '

执行环境:${executionEnvironment}

' + '

执行时间:${executionTime}

' + ' 请点击下面链接进入测试报告页面

\n' + @@ -198,7 +198,7 @@ export default { '\n' + '', robotTitle: - "测试'${executor}所执行的 ${name} ${type}测试运行${status}\n" + + "测试'${operator}所执行的 ${name} ${type}测试运行${status}\n" + "测试环境为:${executionEnvironment}\n" + "执行时间:${executionTime}\n" + "请点击下面链接进入测试报告页面\n" + diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index e0da1d3ef6..71e705f48d 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit e0da1d3ef611b0901e42520f6d68a04cabec4c08 +Subproject commit 71e705f48da10eb37135b189582ca0c917a2ffb3