From d5df2c39a4a604c4a11a1dc01d96133d0ce3de69 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 28 Sep 2021 11:31:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5):=20?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E4=B8=AD=E7=9A=84=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=8F=98=E9=87=8F=E4=B8=8D=E8=83=BD=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/mail/ApiFailedNotification.html    | 2 +-
 .../src/main/resources/mail/ApiSuccessfulNotification.html    | 2 +-
 .../api/automation/schedule/ScheduleNotification.vue          | 4 ++--
 .../organization/components/ScheduleTaskNotification.vue      | 4 ++--
 .../organization/components/jenkins/JenkinsNotification.vue   | 4 ++--
 frontend/src/business/components/xpack                        | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

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 @@
     <div style="margin-left: 100px">
 
         <p>${name} 接口测试运行失败<br/>
-        <p>执行人:${executor}</p>
+        <p>执行人:${operator}</p>
         <p>执行环境:${executionEnvironment}</p>
         <p>执行时间:${executionTime}</p>
         请点击下面链接进入测试报告页面【接口定义暂无报告路径】<br/>
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 @@
 </div>
 <div style="margin-left: 100px">
     <p>${name} 接口测试运行成功<br/>
-    <p>执行人:${executor}</p>
+    <p>执行人:${operator}</p>
     <p>执行环境:${executionEnvironment}</p>
     <p>执行时间:${executionTime}</p>
     请点击下面链接进入测试报告页面【接口定义暂无报告路径】<br/>
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 {
         '    </div>\n' +
         '    <div style="margin-left: 100px">\n' +
         '        <p>${name} 接口测试运行失败<br/>\n' +
-        '        <p>执行人:${executor}</p>' +
+        '        <p>执行人:${operator}</p>' +
         '        <p>负责人:${principal}</p>' +
         '        <p>执行环境:${executionEnvironment}</p>' +
         '        <p>执行时间:${executionTime}</p>' +
@@ -184,7 +184,7 @@ export default {
         '</html>',
       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 {
         '    </div>\n' +
         '    <div style="margin-left: 100px">\n' +
         '        <p>${name} 接口测试运行失败/成功<br/>\n' +
-        '        <p>执行人:${executor}</p>' +
+        '        <p>执行人:${operator}</p>' +
         '        <p>负责人:${principal}</p>' +
         '        <p>执行环境:${executionEnvironment}</p>' +
         '        <p>执行时间:${executionTime}</p>' +
@@ -183,7 +183,7 @@ export default {
         '</html>',
       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 {
         '    </div>\n' +
         '    <div style="margin-left: 100px">\n' +
         '        <p>${name} 接口测试运行失败/成功<br/>\n' +
-        '        <p>执行人:${executor}</p>' +
+        '        <p>执行人:${operator}</p>' +
         '        <p>执行环境:${executionEnvironment}</p>' +
         '        <p>执行时间:${executionTime}</p>' +
         '            请点击下面链接进入测试报告页面</p>\n' +
@@ -198,7 +198,7 @@ export default {
         '</body>\n' +
         '</html>',
       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