jinql
/
gocron
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added remark for notify

master
solar 2020-07-03 11:58:22 +08:00 committed by qiang.ou
parent ac2f01f144
commit c59f8b730a
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
go.mod
View File

@ -27,6 +27,7 @@ require (
github.com/urfave/cli v1.20.0 github.com/urfave/cli v1.20.0
golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 // indirect golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 // indirect
golang.org/x/net v0.0.0-20190522155817-f3200d17e092 golang.org/x/net v0.0.0-20190522155817-f3200d17e092
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect
golang.org/x/text v0.3.2 // indirect golang.org/x/text v0.3.2 // indirect
google.golang.org/genproto v0.0.0-20190530194941-fb225487d101 // indirect google.golang.org/genproto v0.0.0-20190530194941-fb225487d101 // indirect
google.golang.org/grpc v1.21.0 google.golang.org/grpc v1.21.0

5
internal/models/setting.go
View File

@ -16,19 +16,22 @@ const slackTemplate = `
任务名称: {{.TaskName}} 任务名称: {{.TaskName}}
状态: {{.Status}} 状态: {{.Status}}
执行结果: {{.Result}} 执行结果: {{.Result}}
备注: {{.Remark}}
` `
const emailTemplate = ` const emailTemplate = `
任务ID: {{.TaskId}} 任务ID: {{.TaskId}}
任务名称: {{.TaskName}} 任务名称: {{.TaskName}}
状态: {{.Status}} 状态: {{.Status}}
执行结果: {{.Result}} 执行结果: {{.Result}}
备注: {{.Remark}}
` `
const webhookTemplate = ` const webhookTemplate = `
{ {
"task_id": "{{.TaskId}}", "task_id": "{{.TaskId}}",
"task_name": "{{.TaskName}}", "task_name": "{{.TaskName}}",
"status": "{{.Status}}", "status": "{{.Status}}",
"result": "{{.Result}}" "result": "{{.Result}}",
"remark": "{{.Remark}}"
} }
` `

1
internal/modules/notify/notify.go
View File

@ -69,6 +69,7 @@ func parseNotifyTemplate(notifyTemplate string, msg Message) string {
"TaskName": msg["name"], "TaskName": msg["name"],
"Status": msg["status"], "Status": msg["status"],
"Result": msg["output"], "Result": msg["output"],
"Remark": msg["remark"],
}) })
return buf.String() return buf.String()

1
internal/service/task.go
View File

@ -456,6 +456,7 @@ func SendNotification(taskModel models.Task, taskResult TaskResult) {
"output": taskResult.Result, "output": taskResult.Result,
"status": statusName, "status": statusName,
"task_id": taskModel.Id, "task_id": taskModel.Id,
"remark": taskModel.Remark,
} }
notify.Push(msg) notify.Push(msg)
} }