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

fix: 修复邮件模版不一致的问题 

--bug=1009015 --user=刘瑞斌 【jenkins】邮件默认通知显示不一致 https://www.tapd.cn/55049933/s/1084854
This commit is contained in:
CaptainB 2021-12-22 11:51:25 +08:00 committed by shiziyuan9527
parent 3c4058042f
commit ad5307defd
6 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/api/service/ApiDefinitionExecResultService.java
View File

@ -116,8 +116,8 @@ public class ApiDefinitionExecResultService {
.operator(SessionUtils.getUserId())
.context(context)
.subject("接口用例通知")
.successMailTemplate("api/CaseResult")
.failedMailTemplate("api/CaseResult")
.successMailTemplate("api/CaseResultSuccess")
.failedMailTemplate("api/CaseResultFailed")
.paramMap(paramMap)
.event(event)
.build();

4
backend/src/main/java/io/metersphere/api/service/ApiScenarioReportService.java
View File

@ -437,8 +437,8 @@ public class ApiScenarioReportService {
.operator(userId)
.context(context)
.subject("接口自动化通知")
.successMailTemplate("api/ScenarioResult")
.failedMailTemplate("api/ScenarioResult")
.successMailTemplate("api/ScenarioResultSuccess")
.failedMailTemplate("api/ScenarioResultFailed")
.paramMap(paramMap)
.event(event)
.build();

2
backend/src/main/resources/mail/api/CaseResult.html → backend/src/main/resources/mail/api/CaseResultFailed.html
View File

@ -6,7 +6,7 @@
</head>
<body>
<div>
<p>${operator}执行接口用例: ${name}, 结果: ${status}</p>
<p>${operator}执行接口用例失败: ${name}</p>
</div>
</body>
</html>

2
backend/src/main/resources/mail/api/ScenarioResult.html → backend/src/main/resources/mail/api/CaseResultSuccess.html
View File

@ -6,7 +6,7 @@
</head>
<body>
<div>
<p>${operator}执行接口自动化: ${name}, 结果: ${status}</p>
<p>${operator}执行接口用例成功: ${name}</p>
</div>
</body>
</html>

12
backend/src/main/resources/mail/api/ScenarioResultFailed.html Normal file
View File

@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>MeterSphere</title>
</head>
<body>
<div>
<p>${operator}执行接口自动化失败: ${name}</p>
</div>
</body>
</html>

12
backend/src/main/resources/mail/api/ScenarioResultSuccess.html Normal file
View File

@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>MeterSphere</title>
</head>
<body>
<div>
<p>${operator}执行接口自动化成功: ${name}</p>
</div>
</body>
</html>