diff --git a/jobs/job.go b/jobs/job.go index 2fc3841..c4201f8 100644 --- a/jobs/job.go +++ b/jobs/job.go @@ -277,18 +277,18 @@ func (j *Job) Run() { if log.Status < 0 && j.task.IsNotify == 1 { if j.task.NotifyUserIds != "0" && j.task.NotifyUserIds != "" { adminInfo := AllAdminInfo(j.task.NotifyUserIds) - phone := make([]string, 0) + phone := make(map[string]string, 0) + dingtalk := make(map[string]string, 0) toEmail := "" - dingtalk := make([]string, 0) for _, v := range adminInfo { if v.Phone != "0" && v.Phone != "" { - phone = append(phone, v.Phone) + phone[v.Phone] = v.Phone } if v.Email != "0" && v.Email != "" { toEmail += v.Email + ";" } if v.Dingtalk != "0" && v.Dingtalk != "" { - dingtalk = append(dingtalk, v.Dingtalk) + dingtalk[v.Dingtalk] = v.Dingtalk } } toEmail = strings.TrimRight(toEmail, ";") diff --git a/notify/dingtalk.go b/notify/dingtalk.go index 43da8fb..4675860 100644 --- a/notify/dingtalk.go +++ b/notify/dingtalk.go @@ -27,7 +27,7 @@ type Text struct { } type Dingtalk struct { - Dingtalks []string + Dingtalks map[string]string Content string } @@ -57,7 +57,7 @@ func init() { } -func SendDingtalkToChan(dingtalks []string, content string) bool { +func SendDingtalkToChan(dingtalks map[string]string, content string) bool { dingTalk := &Dingtalk{ Dingtalks: dingtalks, Content: content, diff --git a/notify/sms.go b/notify/sms.go index 974f39c..16682e6 100644 --- a/notify/sms.go +++ b/notify/sms.go @@ -23,7 +23,7 @@ type AjaxReturn struct { } type Sms struct { - Mobiles []string + Mobiles map[string]string Param map[string]string } @@ -53,7 +53,7 @@ func init() { } -func SendSmsToChan(mobiles []string, param map[string]string) bool { +func SendSmsToChan(mobiles map[string]string, param map[string]string) bool { sms := &Sms{ Mobiles: mobiles, Param: param,