innov
/
nightingale1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

rdb support wechat_robot and dingtalk_robot

This commit is contained in:
Ulric Qin 2020-10-11 08:33:30 +08:00
parent e84d7f8741
commit 0baa06cee0
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
control
View File

@ -1,7 +1,7 @@
#!/bin/bash
# release version
version=3.0.1
version=3.1.0
CWD=$(cd $(dirname $0)/; pwd)
cd $CWD

33
src/modules/rdb/cron/sender_im.go
View File

@ -116,23 +116,30 @@ func sendImByWeChatRobot(message *dataobj.Message) {
return
}
set := make(map[string]struct{}, cnt)
for i := 0; i < cnt; i++ {
toUser := strings.TrimSpace(message.Tos[i])
if toUser == "" {
continue
}
if _, ok := set[toUser]; !ok {
set[toUser] = struct{}{}
}
}
for tokenUser := range set {
mess := wechat.Message{
ToUser: toUser,
ToUser: tokenUser,
MsgType: "text",
Text: wechat.Content{Content: message.Content},
}
err := wechat.RobotSend(mess)
if err != nil {
logger.Warningf("im wechat_robot send to %s fail: %v", message.Tos[i], err)
logger.Warningf("im wechat_robot send to %s fail: %v", tokenUser, err)
} else {
logger.Infof("im wechat_robot send to %s succ", message.Tos[i])
logger.Infof("im wechat_robot send to %s succ", tokenUser)
}
}
}
@ -144,26 +151,24 @@ func sendImByDingTalkRobot(message *dataobj.Message) {
return
}
nodupDingCluster := make(map[string]bool, cnt)
set := make(map[string]struct{}, cnt)
for i := 0; i < cnt; i++ {
toUser := strings.TrimSpace(message.Tos[i])
if toUser == "" {
continue
}
if _, ok := nodupDingCluster[toUser]; !ok {
nodupDingCluster[toUser] = true
if _, ok := set[toUser]; !ok {
set[toUser] = struct{}{}
}
}
for tokenUser, ok := range nodupDingCluster {
if ok {
err := dingtalk.RobotSend(tokenUser, message.Content)
if err != nil {
logger.Warningf("im dingtalk_robot send to %s fail: %v", tokenUser, err)
} else {
logger.Infof("im dingtalk_robot send to %s succ", tokenUser)
}
for tokenUser := range set {
err := dingtalk.RobotSend(tokenUser, message.Content)
if err != nil {
logger.Warningf("im dingtalk_robot send to %s fail: %v", tokenUser, err)
} else {
logger.Infof("im dingtalk_robot send to %s succ", tokenUser)
}
}
}