test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(消息通知): 消息通知中的部分变量不能获取

This commit is contained in:
Captain.B 2021-09-28 11:31:04 +08:00 committed by 刘瑞斌
parent 2b9bd90e25
commit d5df2c39a4
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/resources/mail/ApiFailedNotification.html
View File

@ -13,7 +13,7 @@
<div style="margin-left: 100px"> <div style="margin-left: 100px">
<p>${name} 接口测试运行失败<br/> <p>${name} 接口测试运行失败<br/>
<p>执行人:${executor}</p> <p>执行人:${operator}</p>
<p>执行环境:${executionEnvironment}</p> <p>执行环境:${executionEnvironment}</p>
<p>执行时间:${executionTime}</p> <p>执行时间:${executionTime}</p>
请点击下面链接进入测试报告页面【接口定义暂无报告路径】<br/> 请点击下面链接进入测试报告页面【接口定义暂无报告路径】<br/>

2
backend/src/main/resources/mail/ApiSuccessfulNotification.html
View File

@ -11,7 +11,7 @@
</div> </div>
<div style="margin-left: 100px"> <div style="margin-left: 100px">
<p>${name} 接口测试运行成功<br/> <p>${name} 接口测试运行成功<br/>
<p>执行人:${executor}</p> <p>执行人:${operator}</p>
<p>执行环境:${executionEnvironment}</p> <p>执行环境:${executionEnvironment}</p>
<p>执行时间:${executionTime}</p> <p>执行时间:${executionTime}</p>
请点击下面链接进入测试报告页面【接口定义暂无报告路径】<br/> 请点击下面链接进入测试报告页面【接口定义暂无报告路径】<br/>

4
frontend/src/business/components/api/automation/schedule/ScheduleNotification.vue
View File

@ -169,7 +169,7 @@ export default {
' </div>\n' + ' </div>\n' +
' <div style="margin-left: 100px">\n' + ' <div style="margin-left: 100px">\n' +
' <p>${name} 接口测试运行失败<br/>\n' + ' <p>${name} 接口测试运行失败<br/>\n' +
' <p>执行人:${executor}</p>' + ' <p>执行人:${operator}</p>' +
' <p>负责人:${principal}</p>' + ' <p>负责人:${principal}</p>' +
' <p>执行环境:${executionEnvironment}</p>' + ' <p>执行环境:${executionEnvironment}</p>' +
' <p>执行时间:${executionTime}</p>' + ' <p>执行时间:${executionTime}</p>' +
@ -184,7 +184,7 @@ export default {
'</html>', '</html>',
robotTitle: robotTitle:
"测试'${name} ${type}测试运行${status}\n" + "测试'${name} ${type}测试运行${status}\n" +
"执行人:${executor}" + "\n" + "执行人:${operator}" + "\n" +
"负责人:${principal}" + "\n" + "负责人:${principal}" + "\n" +
"测试环境为:${executionEnvironment}\n" + "测试环境为:${executionEnvironment}\n" +
"执行时间：${executionTime}\n" + "执行时间：${executionTime}\n" +

4
frontend/src/business/components/settings/organization/components/ScheduleTaskNotification.vue
View File

@ -168,7 +168,7 @@ export default {
' </div>\n' + ' </div>\n' +
' <div style="margin-left: 100px">\n' + ' <div style="margin-left: 100px">\n' +
' <p>${name} 接口测试运行失败/成功<br/>\n' + ' <p>${name} 接口测试运行失败/成功<br/>\n' +
' <p>执行人:${executor}</p>' + ' <p>执行人:${operator}</p>' +
' <p>负责人:${principal}</p>' + ' <p>负责人:${principal}</p>' +
' <p>执行环境:${executionEnvironment}</p>' + ' <p>执行环境:${executionEnvironment}</p>' +
' <p>执行时间:${executionTime}</p>' + ' <p>执行时间:${executionTime}</p>' +
@ -183,7 +183,7 @@ export default {
'</html>', '</html>',
robotTitle: robotTitle:
"测试'${name} ${type}测试运行${status}," + "\n" + "测试'${name} ${type}测试运行${status}," + "\n" +
"执行人:${executor}" + "\n" + "执行人:${operator}" + "\n" +
"负责人:${principal}" + "\n" + "负责人:${principal}" + "\n" +
"测试环境为:${executionEnvironment}" + "\n" + "测试环境为:${executionEnvironment}" + "\n" +
"执行时间：${executionTime}" + "\n" + "执行时间：${executionTime}" + "\n" +

4
frontend/src/business/components/settings/organization/components/jenkins/JenkinsNotification.vue
View File

@ -185,7 +185,7 @@ export default {
' </div>\n' + ' </div>\n' +
' <div style="margin-left: 100px">\n' + ' <div style="margin-left: 100px">\n' +
' <p>${name} 接口测试运行失败/成功<br/>\n' + ' <p>${name} 接口测试运行失败/成功<br/>\n' +
' <p>执行人:${executor}</p>' + ' <p>执行人:${operator}</p>' +
' <p>执行环境:${executionEnvironment}</p>' + ' <p>执行环境:${executionEnvironment}</p>' +
' <p>执行时间:${executionTime}</p>' + ' <p>执行时间:${executionTime}</p>' +
' 请点击下面链接进入测试报告页面</p>\n' + ' 请点击下面链接进入测试报告页面</p>\n' +
@ -198,7 +198,7 @@ export default {
'</body>\n' + '</body>\n' +
'</html>', '</html>',
robotTitle: robotTitle:
"测试'${executor}所执行的 ${name} ${type}测试运行${status}\n" + "测试'${operator}所执行的 ${name} ${type}测试运行${status}\n" +
"测试环境为:${executionEnvironment}\n" + "测试环境为:${executionEnvironment}\n" +
"执行时间：${executionTime}\n" + "执行时间：${executionTime}\n" +
"请点击下面链接进入测试报告页面\n" + "请点击下面链接进入测试报告页面\n" +

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit e0da1d3ef611b0901e42520f6d68a04cabec4c08 Subproject commit 71e705f48da10eb37135b189582ca0c917a2ffb3