red-future/ppgo_job
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

通知模板 变量标签{}改为{{}}

Browse Source 
Signed-off-by: linxiaozhi <linxiaozhi@linxiaozhi.com>
This commit is contained in:
linxiaozhi
2019-02-17 01:37:24 +08:00
parent 33d3291ac9
commit 34a3de6cfd
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
jobs/job.go
View File

@@ -317,21 +317,21 @@ func (j *Job) Run() {
}
if title != "" {
title = strings.Replace(title, "{TaskId}", strconv.Itoa(j.task.Id), -1)
title = strings.Replace(title, "{TaskName}", j.task.TaskName, -1)
title = strings.Replace(title, "{CreateTime}", beego.Date(time.Unix(log.CreateTime, 0), "Y-m-d H:i:s"), -1)
title = strings.Replace(title, "{ProcessTime}", strconv.FormatFloat(float64(log.ProcessTime)/1000, 'f', 6, 64), -1)
title = strings.Replace(title, "{Status}", TextStatus[status], -1)
title = strings.Replace(title, "{TaskOut}", log.Error, -1)
title = strings.Replace(title, "{{TaskId}}", strconv.Itoa(j.task.Id), -1)
title = strings.Replace(title, "{{TaskName}}", j.task.TaskName, -1)
title = strings.Replace(title, "{{CreateTime}}", beego.Date(time.Unix(log.CreateTime, 0), "Y-m-d H:i:s"), -1)
title = strings.Replace(title, "{{ProcessTime}}", strconv.FormatFloat(float64(log.ProcessTime)/1000, 'f', 6, 64), -1)
title = strings.Replace(title, "{{Status}}", TextStatus[status], -1)
title = strings.Replace(title, "{{TaskOut}}", log.Error, -1)
}
if content != "" {
content = strings.Replace(content, "{TaskId}", strconv.Itoa(j.task.Id), -1)
content = strings.Replace(content, "{TaskName}", j.task.TaskName, -1)
content = strings.Replace(content, "{CreateTime}", beego.Date(time.Unix(log.CreateTime, 0), "Y-m-d H:i:s"), -1)
content = strings.Replace(content, "{ProcessTime}", strconv.FormatFloat(float64(log.ProcessTime)/1000, 'f', 6, 64), -1)
content = strings.Replace(content, "{Status}", TextStatus[status], -1)
content = strings.Replace(content, "{TaskOut}", log.Error, -1)
content = strings.Replace(content, "{{TaskId}}", strconv.Itoa(j.task.Id), -1)
content = strings.Replace(content, "{{TaskName}}", j.task.TaskName, -1)
content = strings.Replace(content, "{{CreateTime}}", beego.Date(time.Unix(log.CreateTime, 0), "Y-m-d H:i:s"), -1)
content = strings.Replace(content, "{{ProcessTime}}", strconv.FormatFloat(float64(log.ProcessTime)/1000, 'f', 6, 64), -1)
content = strings.Replace(content, "{{Status}}", TextStatus[status], -1)
content = strings.Replace(content, "{{TaskOut}}", log.Error, -1)
}
if j.task.NotifyType == 0 && toEmail != "" {