From fbe43422fd118e84278838527f228a1d11130e97 Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Sun, 26 Sep 2021 16:16:29 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=B6=88=E6=81=AF=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E6=A8=A1=E7=89=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mail/track/TestPlanDelete.html | 2 +- .../api/automation/schedule/ScheduleNotification.vue | 2 +- .../organization/components/ScheduleTaskNotification.vue | 2 +- .../components/api/ApiAutomationNotification.vue | 4 ++-- .../components/api/ApiDefinitionNotification.vue | 4 ++-- .../organization/components/api/ApiHomeNotification.vue | 4 ++-- .../components/api/ApiReportNotification.vue | 4 ++-- .../components/jenkins/JenkinsNotification.vue | 2 +- .../performance/PerformanceReportNotification.vue | 4 ++-- .../performance/PerformanceTestNotification.vue | 4 ++-- .../components/track/DefectTaskNotification.vue | 4 ++-- .../components/track/TestCaseNotification.vue | 4 ++-- .../components/track/TestPlanTaskNotification.vue | 8 +++----- .../components/track/TestReviewNotification.vue | 9 +++------ .../components/track/TrackHomeNotification.vue | 4 ++-- .../components/track/TrackReportNotification.vue | 4 ++-- 16 files changed, 30 insertions(+), 35 deletions(-) diff --git a/backend/src/main/resources/mail/track/TestPlanDelete.html b/backend/src/main/resources/mail/track/TestPlanDelete.html index 3529bd3122..dd3144763c 100644 --- a/backend/src/main/resources/mail/track/TestPlanDelete.html +++ b/backend/src/main/resources/mail/track/TestPlanDelete.html @@ -6,7 +6,7 @@
-

${creator}创建的:
+

${operator}创建的:
${name}
计划开始时间是:${start}
计划结束时间为:${end}
diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue index 93d49fc6ac..5c4745508f 100644 --- a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue +++ b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue @@ -183,7 +183,7 @@ export default { '\n' + '', robotTitle: - "测试【任务通知】:'${name} ${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 93ddb8ddd6..0c0ee9eed0 100644 --- a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue +++ b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue @@ -182,7 +182,7 @@ export default { '\n' + '', robotTitle: - "测试【任务通知】:'${name} ${type}测试运行${status}," + "\n" + + "测试'${name} ${type}测试运行${status}," + "\n" + "执行人:${executor}" + "\n" + "负责人:${principal}" + "\n" + "测试环境为:${executionEnvironment}" + "\n" + diff --git a/frontend/src/business/components/settings/organization/components/api/ApiAutomationNotification.vue b/frontend/src/business/components/settings/organization/components/api/ApiAutomationNotification.vue index 4a49656407..2bf68b00b9 100644 --- a/frontend/src/business/components/settings/organization/components/api/ApiAutomationNotification.vue +++ b/frontend/src/business/components/settings/organization/components/api/ApiAutomationNotification.vue @@ -176,11 +176,11 @@ export default { "\n" + "\n" + "

\n" + - "

${creator}创建了测试用例

\n" + + "

${operator}创建了接口自动化${name}

\n" + "
\n" + "\n" + "", - robotTitle: "【任务通知】:${creator}创建了测试用例", + robotTitle: "${operator}创建了接口自动化${name}", defectTask: [{ taskType: "defectTask", event: "", diff --git a/frontend/src/business/components/settings/organization/components/api/ApiDefinitionNotification.vue b/frontend/src/business/components/settings/organization/components/api/ApiDefinitionNotification.vue index 76ac94c389..d9cd38cc5e 100644 --- a/frontend/src/business/components/settings/organization/components/api/ApiDefinitionNotification.vue +++ b/frontend/src/business/components/settings/organization/components/api/ApiDefinitionNotification.vue @@ -176,11 +176,11 @@ export default { "\n" + "\n" + "
\n" + - "

${creator}创建了测试用例

\n" + + "

${operator}创建了接口定义${name}

\n" + "
\n" + "\n" + "", - robotTitle: "【任务通知】:${creator}创建了测试用例", + robotTitle: "${operator}创建了接口定义${name}", defectTask: [{ taskType: "defectTask", event: "", diff --git a/frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue b/frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue index da49d238ad..5366721461 100644 --- a/frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue +++ b/frontend/src/business/components/settings/organization/components/api/ApiHomeNotification.vue @@ -176,11 +176,11 @@ export default { "\n" + "\n" + "
\n" + - "

${creator}关闭了定时任务

\n" + + "

${operator}关闭了定时任务

\n" + "
\n" + "\n" + "", - robotTitle: "【任务通知】:${creator}发起了一个缺陷:${issuesName}，请跟进", + robotTitle: "${operator}发起了一个缺陷:${issuesName}，请跟进", defectTask: [{ taskType: "defectTask", event: "", diff --git a/frontend/src/business/components/settings/organization/components/api/ApiReportNotification.vue b/frontend/src/business/components/settings/organization/components/api/ApiReportNotification.vue index 5723464228..eab5664d21 100644 --- a/frontend/src/business/components/settings/organization/components/api/ApiReportNotification.vue +++ b/frontend/src/business/components/settings/organization/components/api/ApiReportNotification.vue @@ -176,11 +176,11 @@ export default { "\n" + "\n" + "
\n" + - "

${creator}创建了测试用例

\n" + + "

${operator}删除了测试报告${name}

\n" + "
\n" + "\n" + "", - robotTitle: "【任务通知】:${creator}创建了测试用例", + robotTitle: "${operator}删除了测试报告${name}", defectTask: [{ taskType: "defectTask", event: "", 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 fee156b78b..78b109f5b9 100644 --- a/frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue +++ b/frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue @@ -198,7 +198,7 @@ export default { '\n' + '', robotTitle: - "测试【任务通知】:'${executor}所执行的 ${name} ${type}测试运行${status}\n" + + "测试'${executor}所执行的 ${name} ${type}测试运行${status}\n" + "测试环境为:${executionEnvironment}\n" + "执行时间：${executionTime}\n" + "请点击下面链接进入测试报告页面\n" + diff --git a/frontend/src/business/components/settings/organization/components/performance/PerformanceReportNotification.vue b/frontend/src/business/components/settings/organization/components/performance/PerformanceReportNotification.vue index f3d2075a52..f63ca7d47b 100644 --- a/frontend/src/business/components/settings/organization/components/performance/PerformanceReportNotification.vue +++ b/frontend/src/business/components/settings/organization/components/performance/PerformanceReportNotification.vue @@ -176,11 +176,11 @@ export default { "\n" + "\n" + "
\n" + - "

${creator}创建了测试用例

\n" + + "

${operator}删除了测试报告${name}

\n" + "
\n" + "\n" + "", - robotTitle: "【任务通知】:${creator}创建了测试用例", + robotTitle: "${operator}删除了测试报告${name}", defectTask: [{ taskType: "defectTask", event: "", diff --git a/frontend/src/business/components/settings/organization/components/performance/PerformanceTestNotification.vue b/frontend/src/business/components/settings/organization/components/performance/PerformanceTestNotification.vue index 0a5cbdca7a..56da0b02f7 100644 --- a/frontend/src/business/components/settings/organization/components/performance/PerformanceTestNotification.vue +++ b/frontend/src/business/components/settings/organization/components/performance/PerformanceTestNotification.vue @@ -176,11 +176,11 @@ export default { "\n" + "\n" + "
\n" + - "

${creator}创建了测试用例

\n" + + "

${operator}创建了性能测试${name}

\n" + "
\n" + "\n" + "", - robotTitle: "【任务通知】:${creator}创建了测试用例", + robotTitle: "${operator}创建了性能测试${name}", defectTask: [{ taskType: "defectTask", event: "", diff --git a/frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue b/frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue index 2a06d16450..2785bb3e63 100644 --- a/frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue +++ b/frontend/src/business/components/settings/organization/components/track/DefectTaskNotification.vue @@ -176,11 +176,11 @@ export default { "\n" + "\n" + "
\n" + - "

${creator}发起了一个缺陷:${issuesName}，请跟进

\n" + + "

${operator}发起了一个缺陷:${name}

\n" + "
\n" + "\n" + "", - robotTitle: "【任务通知】:${creator}发起了一个缺陷:${issuesName}，请跟进", + robotTitle: "${operator}发起了一个缺陷:${name}", defectTask: [{ taskType: "defectTask", event: "", diff --git a/frontend/src/business/components/settings/organization/components/track/TestCaseNotification.vue b/frontend/src/business/components/settings/organization/components/track/TestCaseNotification.vue index ad2f30e41d..d9e7f35d79 100644 --- a/frontend/src/business/components/settings/organization/components/track/TestCaseNotification.vue +++ b/frontend/src/business/components/settings/organization/components/track/TestCaseNotification.vue @@ -176,11 +176,11 @@ export default { "\n" + "\n" + "
\n" + - "

${creator}创建了测试用例

\n" + + "

${operator}创建了测试用例:${name}

\n" + "
\n" + "\n" + "", - robotTitle: "【任务通知】:${creator}创建了测试用例", + robotTitle: "${operator}创建了测试用例:${name}", defectTask: [{ taskType: "defectTask", event: "", diff --git a/frontend/src/business/components/settings/organization/components/track/TestPlanTaskNotification.vue b/frontend/src/business/components/settings/organization/components/track/TestPlanTaskNotification.vue index 0c749f8b88..9dc4002aba 100644 --- a/frontend/src/business/components/settings/organization/components/track/TestPlanTaskNotification.vue +++ b/frontend/src/business/components/settings/organization/components/track/TestPlanTaskNotification.vue @@ -175,10 +175,8 @@ export default { "\n" + "\n" + "
\n" + - "

${creator} 创建的:
\n" + - " ${testPlanName}
\n" + - " 计划开始时间是:${start}
\n" + - " 计划结束时间为:${end}
\n" + + "

${operator} 创建测试计划: ${name}
\n" + + "
\n" + " 请跟进！
\n" + " 点击下面链接进入测试计划页面

\n" + " ${url}/#/track/plan/all\n" + @@ -186,7 +184,7 @@ export default { "\n" + "", robotTitle: - " 【任务通知】:${creator} 创建的:${testPlanName}计划开始时间是:${start}计划结束时间是：${end}请跟进！/ ${status}！" + + "${operator} 创建的:${name} " + "点击下面链接进入测试计划页面${url}/#/track/plan/all", testCasePlanTask: [{ taskType: "testPlanTask", diff --git a/frontend/src/business/components/settings/organization/components/track/TestReviewNotification.vue b/frontend/src/business/components/settings/organization/components/track/TestReviewNotification.vue index da9427346a..2f71eaa953 100644 --- a/frontend/src/business/components/settings/organization/components/track/TestReviewNotification.vue +++ b/frontend/src/business/components/settings/organization/components/track/TestReviewNotification.vue @@ -175,18 +175,15 @@ export default { "\n" + "\n" + "
\n" + - "

${creator} 创建的:
\n" + - " ${reviewName}待开始
\n" + - " 计划开始时间是:${start}
\n" + - " 计划结束时间为:${end}
\n" + + "

${operator} 创建的:
\n" + + " ${name}待开始
\n" + " 请跟进!/${status}
\n" + " 点击下面链接进入评审页面进行审核

\n" + " ${url}/#/track/review/view/${id}\n" + "
\n" + "\n" + "", - robotTitle: "【任务通知】:${creator} 创建的:${reviewName}待开始,计划开始时间是:${start}," + - "计划结束时间是：${end}请跟进！/ ${status}！点击下面链接进入测试评审页面${url}/#/track/review/view/${id}", + robotTitle: "${operator} 创建的:${name} 请跟进！/ ${status}！点击下面链接进入测试评审页面${url}/#/track/review/view/${id}", reviewTask: [{ taskType: "reviewTask", event: "", diff --git a/frontend/src/business/components/settings/organization/components/track/TrackHomeNotification.vue b/frontend/src/business/components/settings/organization/components/track/TrackHomeNotification.vue index f55581c0e8..ca834601b5 100644 --- a/frontend/src/business/components/settings/organization/components/track/TrackHomeNotification.vue +++ b/frontend/src/business/components/settings/organization/components/track/TrackHomeNotification.vue @@ -176,11 +176,11 @@ export default { "\n" + "\n" + "
\n" + - "

${operator}关闭了定时任务

\n" + + "

${operator}关闭了定时任务: ${name}

\n" + "
\n" + "\n" + "", - robotTitle: "【任务通知】:${operator}发起了一个缺陷:${name}，请跟进", + robotTitle: "${operator}关闭了定时任务: ${name}", defectTask: [{ taskType: "defectTask", event: "", diff --git a/frontend/src/business/components/settings/organization/components/track/TrackReportNotification.vue b/frontend/src/business/components/settings/organization/components/track/TrackReportNotification.vue index e16c38eff1..4987b9131a 100644 --- a/frontend/src/business/components/settings/organization/components/track/TrackReportNotification.vue +++ b/frontend/src/business/components/settings/organization/components/track/TrackReportNotification.vue @@ -176,11 +176,11 @@ export default { "\n" + "\n" + "
\n" + - "

${creator}关闭了定时任务

\n" + + "

${operator}删除了测试报告${name}

\n" + "
\n" + "\n" + "", - robotTitle: "【任务通知】:${creator}发起了一个缺陷:${issuesName}，请跟进", + robotTitle: "${operator}删除了测试报告${name}", defectTask: [{ taskType: "defectTask", event: "",