短信/钉钉 hash手机号与钉钉token防止出现重复通知情况
This commit is contained in:
@@ -277,18 +277,18 @@ func (j *Job) Run() {
|
|||||||
if log.Status < 0 && j.task.IsNotify == 1 {
|
if log.Status < 0 && j.task.IsNotify == 1 {
|
||||||
if j.task.NotifyUserIds != "0" && j.task.NotifyUserIds != "" {
|
if j.task.NotifyUserIds != "0" && j.task.NotifyUserIds != "" {
|
||||||
adminInfo := AllAdminInfo(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 := ""
|
toEmail := ""
|
||||||
dingtalk := make([]string, 0)
|
|
||||||
for _, v := range adminInfo {
|
for _, v := range adminInfo {
|
||||||
if v.Phone != "0" && v.Phone != "" {
|
if v.Phone != "0" && v.Phone != "" {
|
||||||
phone = append(phone, v.Phone)
|
phone[v.Phone] = v.Phone
|
||||||
}
|
}
|
||||||
if v.Email != "0" && v.Email != "" {
|
if v.Email != "0" && v.Email != "" {
|
||||||
toEmail += v.Email + ";"
|
toEmail += v.Email + ";"
|
||||||
}
|
}
|
||||||
if v.Dingtalk != "0" && v.Dingtalk != "" {
|
if v.Dingtalk != "0" && v.Dingtalk != "" {
|
||||||
dingtalk = append(dingtalk, v.Dingtalk)
|
dingtalk[v.Dingtalk] = v.Dingtalk
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
toEmail = strings.TrimRight(toEmail, ";")
|
toEmail = strings.TrimRight(toEmail, ";")
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ type Text struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type Dingtalk struct {
|
type Dingtalk struct {
|
||||||
Dingtalks []string
|
Dingtalks map[string]string
|
||||||
Content 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{
|
dingTalk := &Dingtalk{
|
||||||
Dingtalks: dingtalks,
|
Dingtalks: dingtalks,
|
||||||
Content: content,
|
Content: content,
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ type AjaxReturn struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type Sms struct {
|
type Sms struct {
|
||||||
Mobiles []string
|
Mobiles map[string]string
|
||||||
Param 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{
|
sms := &Sms{
|
||||||
Mobiles: mobiles,
|
Mobiles: mobiles,
|
||||||
Param: param,
|
Param: param,
|
||||||
|
|||||||
Reference in New Issue
Block a user