diff --git a/go.mod b/go.mod index 4410f8a..194c679 100644 --- a/go.mod +++ b/go.mod @@ -27,6 +27,7 @@ require ( github.com/urfave/cli v1.20.0 golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 // indirect 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 google.golang.org/genproto v0.0.0-20190530194941-fb225487d101 // indirect google.golang.org/grpc v1.21.0 diff --git a/internal/models/setting.go b/internal/models/setting.go index 709c9d7..d9a6c6e 100644 --- a/internal/models/setting.go +++ b/internal/models/setting.go @@ -16,19 +16,22 @@ const slackTemplate = ` 任务名称: {{.TaskName}} 状态: {{.Status}} 执行结果: {{.Result}} +备注: {{.Remark}} ` const emailTemplate = ` 任务ID: {{.TaskId}} 任务名称: {{.TaskName}} 状态: {{.Status}} 执行结果: {{.Result}} +备注: {{.Remark}} ` const webhookTemplate = ` { "task_id": "{{.TaskId}}", "task_name": "{{.TaskName}}", "status": "{{.Status}}", - "result": "{{.Result}}" + "result": "{{.Result}}", + "remark": "{{.Remark}}" } ` diff --git a/internal/modules/notify/notify.go b/internal/modules/notify/notify.go index 143e374..2835fab 100644 --- a/internal/modules/notify/notify.go +++ b/internal/modules/notify/notify.go @@ -69,6 +69,7 @@ func parseNotifyTemplate(notifyTemplate string, msg Message) string { "TaskName": msg["name"], "Status": msg["status"], "Result": msg["output"], + "Remark": msg["remark"], }) return buf.String() diff --git a/internal/service/task.go b/internal/service/task.go index c9d330d..2680931 100644 --- a/internal/service/task.go +++ b/internal/service/task.go @@ -456,6 +456,7 @@ func SendNotification(taskModel models.Task, taskResult TaskResult) { "output": taskResult.Result, "status": statusName, "task_id": taskModel.Id, + "remark": taskModel.Remark, } notify.Push(msg) }