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 != "" { if title != "" {
title = strings.Replace(title, "{TaskId}", strconv.Itoa(j.task.Id), -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, "{{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, "{{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, "{{ProcessTime}}", strconv.FormatFloat(float64(log.ProcessTime)/1000, 'f', 6, 64), -1)
title = strings.Replace(title, "{Status}", TextStatus[status], -1) title = strings.Replace(title, "{{Status}}", TextStatus[status], -1)
title = strings.Replace(title, "{TaskOut}", log.Error, -1) title = strings.Replace(title, "{{TaskOut}}", log.Error, -1)
} }
if content != "" { if content != "" {
content = strings.Replace(content, "{TaskId}", strconv.Itoa(j.task.Id), -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, "{{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, "{{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, "{{ProcessTime}}", strconv.FormatFloat(float64(log.ProcessTime)/1000, 'f', 6, 64), -1)
content = strings.Replace(content, "{Status}", TextStatus[status], -1) content = strings.Replace(content, "{{Status}}", TextStatus[status], -1)
content = strings.Replace(content, "{TaskOut}", log.Error, -1) content = strings.Replace(content, "{{TaskOut}}", log.Error, -1)
} }
if j.task.NotifyType == 0 && toEmail != "" { if j.task.NotifyType == 0 && toEmail != "" {

6
ppgo_job2.sql
View File

@@ -364,9 +364,9 @@ CREATE TABLE `pp_notify_tpl` (
-- 转存表中的数据 `pp_notify_tpl` -- 转存表中的数据 `pp_notify_tpl`
-- --
BEGIN; BEGIN;
INSERT INTO `pp_notify_tpl` VALUES(1, 'system', '默认邮箱通知模板', 0, '定时任务异常：{TaskName}', 'Hello,定时任务出问题了：\r\n<p style=\"font-size:16px;\">任务执行详情：</p>\r\n<p style=\"display:block; padding:10px; background:#efefef;border:1px solid #e4e4e4\">\r\n任务 ID：{TaskId}<br/>\r\n任务名称：{TaskName}<br/>\r\n执行时间：{CreateTime}<br/>\r\n执行耗时：{ProcessTime}秒<br/>\r\n执行状态：{Status}\r\n</p>\r\n<p style=\"font-size:16px;\">任务执行输出</p>\r\n<p style=\"display:block; padding:10px; background:#efefef;border:1px solid #e4e4e4\">\r\n{TaskOut}\r\n</p>\r\n<br/>\r\n<br/>\r\n<p>-----------------------------------------------------------------<br />\r\n本邮件由定时系统自动发出，请勿回复<br />\r\n如果要取消邮件通知，请登录到系统进行设置<br />\r\n</p>', 1, 1550255030, 1, 1550256410, 1); INSERT INTO `pp_notify_tpl` VALUES(1, 'system', '默认邮箱通知模板', 0, '定时任务异常：{{TaskName}}', 'Hello,定时任务出问题了：\r\n<p style=\"font-size:16px;\">任务执行详情：</p>\r\n<p style=\"display:block; padding:10px; background:#efefef;border:1px solid #e4e4e4\">\r\n任务 ID：{{TaskId}}<br/>\r\n任务名称：{{TaskName}}<br/>\r\n执行时间：{{CreateTime}}<br/>\r\n执行耗时：{{ProcessTime}}秒<br/>\r\n执行状态：{{Status}}\r\n</p>\r\n<p style=\"font-size:16px;\">任务执行输出</p>\r\n<p style=\"display:block; padding:10px; background:#efefef;border:1px solid #e4e4e4\">\r\n{{TaskOut}}\r\n</p>', 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, 1550269363, 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, 1550269952, 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; COMMIT;
SET FOREIGN_KEY_CHECKS = 1; SET FOREIGN_KEY_CHECKS = 1;

12
views/notifytpl/add.html
View File

@@ -38,12 +38,12 @@
<div class="layui-form-mid layui-word-aux" style="padding: 0px 0px !important;"> <div class="layui-form-mid layui-word-aux" style="padding: 0px 0px !important;">
<pre class="layui-code" style="margin: 0;"> <pre class="layui-code" style="margin: 0;">
任务 ID {TaskId} {{"任务 ID {{TaskId}}"}}
任务名称 {TaskName} {{"任务名称 {{TaskName}}"}}
执行时间 {CreateTime} {{"执行时间 {{CreateTime}}"}}
执行耗时 {ProcessTime} {{"执行耗时 {{ProcessTime}}"}}
执行状态 {Status} {{"执行状态 {{Status}}"}}
任务输出 {TaskOut} {{"任务输出 {{TaskOut}}"}}
</pre> </pre>
</div> </div>

12
views/notifytpl/edit.html
View File

@@ -39,12 +39,12 @@
<div class="layui-form-mid layui-word-aux" style="padding: 0px 0px !important;"> <div class="layui-form-mid layui-word-aux" style="padding: 0px 0px !important;">
<pre class="layui-code" style="margin: 0;"> <pre class="layui-code" style="margin: 0;">
任务 ID {TaskId} {{"任务 ID {{TaskId}}"}}
任务名称 {TaskName} {{"任务名称 {{TaskName}}"}}
执行时间 {CreateTime} {{"执行时间 {{CreateTime}}"}}
执行耗时 {ProcessTime} {{"执行耗时 {{ProcessTime}}"}}
执行状态 {Status} {{"执行状态 {{Status}}"}}
任务输出 {TaskOut} {{"任务输出 {{TaskOut}}"}}
</pre> </pre>
</div> </div>