diff --git a/jobs/job.go b/jobs/job.go index dfecbed..98a0119 100644 --- a/jobs/job.go +++ b/jobs/job.go @@ -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 != "" { diff --git a/ppgo_job2.sql b/ppgo_job2.sql index 2c80b7e..0bbb118 100644 --- a/ppgo_job2.sql +++ b/ppgo_job2.sql @@ -364,9 +364,9 @@ CREATE TABLE `pp_notify_tpl` ( -- 转存表中的数据 `pp_notify_tpl` -- BEGIN; -INSERT INTO `pp_notify_tpl` VALUES(1, 'system', '默认邮箱通知模板', 0, '定时任务异常：{TaskName}', 'Hello,定时任务出问题了：\r\n

任务执行详情：

\r\n

\r\n任务 ID：{TaskId}
\r\n任务名称：{TaskName}
\r\n执行时间：{CreateTime}
\r\n执行耗时：{ProcessTime}秒
\r\n执行状态：{Status}\r\n

\r\n

任务执行输出

\r\n

\r\n{TaskOut}\r\n

\r\n
\r\n
\r\n

-----------------------------------------------------------------
\r\n本邮件由定时系统自动发出，请勿回复
\r\n如果要取消邮件通知，请登录到系统进行设置
\r\n

', 1, 1550255030, 1, 1550256410, 1); -INSERT INTO `pp_notify_tpl` VALUES(2, 'system', '默认短信通知模板', 1, '', '{\r\n \"task_id\": \"{TaskId}\",\r\n \"task_name\": \"{TaskName}\",\r\n \"status\": \"{Status}\"\r\n}', 1, 1550255030, 1, 1550269363, 1); -INSERT INTO `pp_notify_tpl` VALUES(3, 'system', '默认钉钉通知模板', 2, '', '任务执行异常详情：\r\n任务 ID：{TaskId}\r\n任务名称：{TaskName}\r\n执行时间：{CreateTime}\r\n执行耗时：{ProcessTime}秒\r\n执行状态：{Status}\r\n任务执行输出：\r\n{TaskOut}', 1, 1550255030, 1, 1550269952, 1); +INSERT INTO `pp_notify_tpl` VALUES(1, 'system', '默认邮箱通知模板', 0, '定时任务异常：{{TaskName}}', 'Hello,定时任务出问题了：\r\n

任务执行详情：

\r\n

\r\n任务 ID：{{TaskId}}
\r\n任务名称：{{TaskName}}
\r\n执行时间：{{CreateTime}}
\r\n执行耗时：{{ProcessTime}}秒
\r\n执行状态：{{Status}}\r\n

\r\n

任务执行输出

\r\n

\r\n{{TaskOut}}\r\n

', 1, 1550255030, 1, 1550338305, 1); +INSERT INTO `pp_notify_tpl` VALUES(2, 'system', '默认短信通知模板', 1, '', '{\r\n \"task_id\": \"{{TaskId}}\",\r\n \"task_name\": \"{{TaskName}}\",\r\n \"status\": \"{{Status}}\"\r\n}', 1, 1550255030, 1, 1550338215, 1); +INSERT INTO `pp_notify_tpl` VALUES(3, 'system', '默认钉钉通知模板', 2, '', '任务执行异常详情：\r\n任务 ID：{{TaskId}}\r\n任务名称：{{TaskName}}\r\n执行时间：{{CreateTime}}\r\n执行耗时：{{ProcessTime}}秒\r\n执行状态：{{Status}}\r\n任务执行输出：\r\n{{TaskOut}}', 1, 1550255030, 1, 1550338191, 1); COMMIT; SET FOREIGN_KEY_CHECKS = 1; diff --git a/views/notifytpl/add.html b/views/notifytpl/add.html index f7ecaab..9ab9484 100644 --- a/views/notifytpl/add.html +++ b/views/notifytpl/add.html @@ -38,12 +38,12 @@ 
 
-  任务 ID {TaskId}
-  任务名称 {TaskName}
-  执行时间 {CreateTime}
-  执行耗时 {ProcessTime}
-  执行状态 {Status}
-  任务输出 {TaskOut}
+  {{"任务 ID {{TaskId}}"}}
+  {{"任务名称 {{TaskName}}"}}
+  {{"执行时间 {{CreateTime}}"}}
+  {{"执行耗时 {{ProcessTime}}"}}
+  {{"执行状态 {{Status}}"}}
+  {{"任务输出 {{TaskOut}}"}}
diff --git a/views/notifytpl/edit.html b/views/notifytpl/edit.html index c4a57bb..0ace94d 100644 --- a/views/notifytpl/edit.html +++ b/views/notifytpl/edit.html @@ -39,12 +39,12 @@ 
 
-  任务 ID {TaskId}
-  任务名称 {TaskName}
-  执行时间 {CreateTime}
-  执行耗时 {ProcessTime}
-  执行状态 {Status}
-  任务输出 {TaskOut}
+  {{"任务 ID {{TaskId}}"}}
+  {{"任务名称 {{TaskName}}"}}
+  {{"执行时间 {{CreateTime}}"}}
+  {{"执行耗时 {{ProcessTime}}"}}
+  {{"执行状态 {{Status}}"}}
+  {{"任务输出 {{TaskOut}}"}}