diff --git a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java index ba7836e762..2b765169fe 100644 --- a/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java +++ b/backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java @@ -243,21 +243,23 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl BaseSystemConfigDTO baseSystemConfigDTO = systemParameterService.getBaseInfo(); String url = reportUrl; + String url2 = reportUrl; if (StringUtils.isEmpty(url)) { url = baseSystemConfigDTO.getUrl() + "/#/api/report/view/" + report.getId(); + url2 = baseSystemConfigDTO.getUrl() + "/#/api/automation/report"; } String successContext = ""; String failedContext = ""; String subject = ""; String event = ""; if (StringUtils.equals(ReportTriggerMode.API.name(), report.getTriggerMode())) { - successContext = "接口测试 API任务通知:'" + report.getName() + "'执行成功" + "\n" + "请点击下面链接进入测试报告页面" + "\n" + url; - failedContext = "接口测试 API任务通知:'" + report.getName() + "'执行失败" + "\n" + "请点击下面链接进入测试报告页面" + "\n" + url; + successContext = "接口测试 API任务通知:'" + report.getName() + "'执行成功" + "\n" + "请点击下面链接进入测试报告页面" + "\n" + "旧版接口测试路径" + url + "\n" + "新版接口测试路径" + url2; + failedContext = "接口测试 API任务通知:'" + report.getName() + "'执行失败" + "\n" + "请点击下面链接进入测试报告页面" + "\n" + "旧版接口测试路径" + url + "\n" + "新版接口测试路径" + url2; subject = Translator.get("task_notification_jenkins"); } if (StringUtils.equals(ReportTriggerMode.SCHEDULE.name(), report.getTriggerMode())) { - successContext = "接口测试定时任务通知:'" + report.getName() + "'执行成功" + "\n" + "请点击下面链接进入测试报告页面" + "\n" + url; - failedContext = "接口测试定时任务通知:'" + report.getName() + "'执行失败" + "\n" + "请点击下面链接进入测试报告页面" + "\n" + url; + successContext = "接口测试定时任务通知:'" + report.getName() + "'执行成功" + "\n" + "请点击下面链接进入测试报告页面" + "\n" + "旧版接口测试路径" + url + "\n" + "新版接口测试路径" + url2; + failedContext = "接口测试定时任务通知:'" + report.getName() + "'执行失败" + "\n" + "请点击下面链接进入测试报告页面" + "\n" + "旧版接口测试路径" + url + "\n" + "新版接口测试路径" + url2; subject = Translator.get("task_notification"); } if (StringUtils.equals("Success", report.getStatus())) { diff --git a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue index 074ff9c691..1c1f284b26 100644 --- a/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue +++ b/frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue @@ -6,6 +6,26 @@ @click="handleAddTaskModel"> {{ $t('organization.message.create_new_notification') }} + + + {{ $t('organization.message.mail_template_example') }} + + + + + {{ $t('organization.message.robot_template') }} + + @@ -134,7 +154,35 @@ export default { }, data() { return { - + title: '\n' + + '\n' + + '\n' + + ' \n' + + ' MeterSphere\n' + + '\n' + + '\n' + + '
\n' + + '
\n' + + '

尊敬的用户：

\n' + + '

您好:\n' + + '

\n' + + '
\n' + + '

您所执行的 ${testName} 接口测试运行失败
\n' + + ' 请点击下面链接进入测试报告页面

\n' + + ' ${url}/#/${type}/report/view/${id}\n' + + '

新版接口测试报告路径

\n' + + ' ${url}/#/api/automation\n' + + '
\n' + + '\n' + + '
\n' + + '\n' + + '', + robotTitle: + "测试【任务通知】:'您所执行的 ${testName} ${type}测试运行${status}\n" + + "请点击下面链接进入测试报告页面\n" + + "${url}/#/${type}/report/view/${id}" + + "新版接口测试报告路径\n" + + "${url}/#/api/automation", scheduleTask: [{ taskType: "scheduleTask", event: "", diff --git a/frontend/src/business/components/api/definition/components/import/ApiImport.vue b/frontend/src/business/components/api/definition/components/import/ApiImport.vue index 655fbdde6f..c15783b710 100644 --- a/frontend/src/business/components/api/definition/components/import/ApiImport.vue +++ b/frontend/src/business/components/api/definition/components/import/ApiImport.vue @@ -181,7 +181,7 @@ export default { methods: { scheduleEdit() { if (!this.formData.swaggerUrl) { - this.$warning(this.$t('commons.please_upload')); + this.$warning(this.$t('commons.please_fill_path')); this.swaggerSynchronization = !this.swaggerSynchronization } else { if (this.swaggerSynchronization) { diff --git a/frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue b/frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue index 9443c71359..1375d4ab42 100644 --- a/frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue +++ b/frontend/src/business/components/settings/organization/components/DefectTaskNotification.vue @@ -6,6 +6,26 @@ {{ $t('organization.message.create_new_notification') }} + + + {{ $t('organization.message.mail_template_example') }} + + + + + {{ $t('organization.message.robot_template') }} + + @@ -129,6 +149,19 @@ export default { }, data() { return { + title: "\n" + + "\n" + + "\n" + + " \n" + + " MeterSphere\n" + + "\n" + + "\n" + + "
\n" + + "

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

\n" + + "
\n" + + "\n" + + "", + robotTitle: "【任务通知】:${creator}发起了一个缺陷:${issuesName}，请跟进", defectTask: [{ taskType: "defectTask", event: "", diff --git a/frontend/src/business/components/settings/organization/components/JenkinsNotification.vue b/frontend/src/business/components/settings/organization/components/JenkinsNotification.vue index 82b18b0380..14f8bb6109 100644 --- a/frontend/src/business/components/settings/organization/components/JenkinsNotification.vue +++ b/frontend/src/business/components/settings/organization/components/JenkinsNotification.vue @@ -6,6 +6,28 @@ {{ $t('organization.message.create_new_notification') }} + + + {{ $t('organization.message.mail_template_example') }} + + + + + {{ $t('organization.message.robot_template') }} + + + + @@ -132,6 +154,35 @@ export default { }, data() { return { + title: '\n' + + '\n' + + '\n' + + ' \n' + + ' MeterSphere\n' + + '\n' + + '\n' + + '
\n' + + '
\n' + + '

尊敬的用户：

\n' + + '

您好:\n' + + '

\n' + + '
\n' + + '

您所执行的 ${testName} 接口测试运行失败
\n' + + ' 请点击下面链接进入测试报告页面

\n' + + ' ${url}/#/${type}/report/view/${id}\n' + + '

新版接口测试报告路径

\n' + + ' ${url}/#/api/automation\n' + + '
\n' + + '\n' + + '
\n' + + '\n' + + '', + robotTitle: + "测试【任务通知】:'您所执行的 ${testName} ${type}测试运行${status}\n" + + "请点击下面链接进入测试报告页面\n" + + "${url}/#/${type}/report/view/${id}" + + "新版接口测试报告路径\n" + + "${url}/#/api/automation", jenkinsTask: [{ taskType: "jenkinsTask", event: "", diff --git a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue index 5daf2ba323..43e18163a8 100644 --- a/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue +++ b/frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue @@ -6,6 +6,26 @@ @click="handleAddTaskModel"> {{ $t('organization.message.create_new_notification') }} + + + {{ $t('organization.message.mail_template_example') }} + + + + + {{ $t('organization.message.robot_template') }} + + @@ -135,7 +155,35 @@ export default { }, data() { return { - + title: '\n' + + '\n' + + '\n' + + ' \n' + + ' MeterSphere\n' + + '\n' + + '\n' + + '
\n' + + '
\n' + + '

尊敬的用户：

\n' + + '

您好:\n' + + '

\n' + + '
\n' + + '

您所执行的 ${testName} 接口测试运行失败
\n' + + ' 请点击下面链接进入测试报告页面

\n' + + ' ${url}/#/${type}/report/view/${id}\n' + + '

新版接口测试报告路径

\n' + + ' ${url}/#/api/automation\n' + + '
\n' + + '\n' + + '
\n' + + '\n' + + '', + robotTitle: + "测试【任务通知】:'您所执行的 ${testName} ${type}测试运行${status}\n" + + "请点击下面链接进入测试报告页面\n" + + "${url}/#/${type}/report/view/${id}" + + "新版接口测试报告路径\n" + + "${url}/#/api/automation", scheduleTask: [{ taskType: "scheduleTask", event: "", diff --git a/frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue b/frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue index 07da85f9a4..2708c60379 100644 --- a/frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue +++ b/frontend/src/business/components/settings/organization/components/TestPlanTaskNotification.vue @@ -6,6 +6,26 @@ {{ $t('organization.message.create_new_notification') }} + + + {{ $t('organization.message.mail_template_example') }} + + + + + {{ $t('organization.message.robot_template') }} + + @@ -130,6 +150,27 @@ export default { }, data() { return { + title: "\n" + + "\n" + + "\n" + + " \n" + + " MeterSphere\n" + + "\n" + + "\n" + + "
\n" + + "

${creator} 创建的:
\n" + + " ${testPlanName}
\n" + + " 计划开始时间是:${start}
\n" + + " 计划结束时间为:${end}
\n" + + " 请跟进！
\n" + + " 点击下面链接进入测试计划页面

\n" + + " ${url}/#/track/plan/all\n" + + "
\n" + + "\n" + + "", + robotTitle: + " 【任务通知】:${creator} 创建的:${testPlanName}计划开始时间是:${start}计划结束时间是：${end}请跟进！/ ${status}！" + + "点击下面链接进入测试计划页面${url}/#/track/plan/all", testCasePlanTask: [{ taskType: "testPlanTask", event: "", diff --git a/frontend/src/business/components/settings/organization/components/TestReviewNotification.vue b/frontend/src/business/components/settings/organization/components/TestReviewNotification.vue index 46707c2799..ed89473882 100644 --- a/frontend/src/business/components/settings/organization/components/TestReviewNotification.vue +++ b/frontend/src/business/components/settings/organization/components/TestReviewNotification.vue @@ -6,6 +6,26 @@ {{ $t('organization.message.create_new_notification') }} + + + {{ $t('organization.message.mail_template_example') }} + + + + + {{ $t('organization.message.robot_template') }} + + @@ -130,6 +150,26 @@ export default { }, data() { return { + title: "\n" + + "\n" + + "\n" + + " \n" + + " MeterSphere\n" + + "\n" + + "\n" + + "
\n" + + "

${creator} 创建的:
\n" + + " ${reviewName}待开始
\n" + + " 计划开始时间是:${start}
\n" + + " 计划结束时间为:${end}
\n" + + " 请跟进!/${status}
\n" + + " 点击下面链接进入评审页面进行审核

\n" + + " ${url}/#/track/review/view/${id}\n" + + "
\n" + + "\n" + + "", + robotTitle: "【任务通知】:${creator} 创建的:${reviewName}待开始,计划开始时间是:${start}," + + "计划结束时间是：${end}请跟进！/ ${status}！点击下面链接进入测试评审页面${url}/#/track/review/view/${id}", reviewTask: [{ taskType: "reviewTask", event: "", diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index ecc7f370f6..3c571da5e4 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -123,6 +123,7 @@ export default { required: "{0} is required", millisecond: 'ms', please_upload: 'Please upload file', + please_fill_path: 'Please fill in the path', reference_documentation: "Reference documentation", already_exists: 'The name already exists', modifier: 'Modifier', @@ -250,6 +251,8 @@ export default { test_review_task_notice: 'Test review task notice', defect_task_notification: 'Defect task notification', create_new_notification: 'Create a new notification', + mail_template_example: 'Mail template', + robot_template: 'Robot template', select_events: 'Select event', select_receiving_method: 'Select receiving method', mail: 'mail', diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 85d73e703d..735c2ff041 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -117,6 +117,7 @@ export default { input_login_username: '请输入用户 ID 或 邮箱', input_name: '请输入名称', please_upload: '请上传文件', + please_fill_path: '请填写ur路径', formatErr: '格式错误', please_save: '请先保存', reference_documentation: "参考文档", @@ -250,6 +251,8 @@ export default { test_plan_task_notification: '测试计划任务通知', test_review_task_notice: '测试评审任务通知', create_new_notification: '创建新通知', + mail_template_example: '邮件模版', + robot_template: '机器人模版', select_events: '选择事件', defect_task_notification: '缺陷任务通知', select_receiving_method: '选择接收方式', diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index 47ede5346e..9d0e1184ad 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -117,6 +117,7 @@ export default { input_login_username: '請輸入用戶 ID 或 郵箱', input_name: '請輸入名稱', please_upload: '請上傳文件', + please_fill_path: '請填寫ur路徑', formatErr: '格式錯誤', please_save: '請先保存', reference_documentation: "參考文檔", @@ -250,6 +251,8 @@ export default { test_plan_task_notification: '測試計劃任務通知', test_review_task_notice: '測試評審任務通知', create_new_notification: '創建新通知', + mail_template_example: '郵件範本示例', + robot_template: '機器人模版', select_events: '選擇事件', defect_task_notification: '缺陷任務通知', select_receiving_method: '選擇接收方式',