|
|
@@ -136,16 +136,22 @@ func (robotService *RobotService) SyncIPMessage() {
|
|
|
//}
|
|
|
fmt.Println("ip定时任务")
|
|
|
msg := "# IP异常播报 \n "
|
|
|
+ personMsg := "# IP异常播报 \n "
|
|
|
var syncData task.SyncData
|
|
|
var ipService log.ServiceIpLog
|
|
|
abnormalIpList, _ := ipService.GetAbnormalIp()
|
|
|
+ if len(abnormalIpList) == 0 {
|
|
|
+ return
|
|
|
+ }
|
|
|
var mobile []string
|
|
|
- mpsPerson, _ := syncData.Person.GetUserInfo()
|
|
|
+ mpsPerson, _ := syncData.Person.GetUserInfoData()
|
|
|
+ personMsgData := make(map[string]string, len(mpsPerson))
|
|
|
//fmt.Println(mpsPerson)
|
|
|
- for k,_ := range abnormalIpList{
|
|
|
- mobile = append(mobile, mpsPerson[k])
|
|
|
+ for k, _ := range abnormalIpList {
|
|
|
+ mobile = append(mobile, mpsPerson[k].MobilePhoneNumber)
|
|
|
msg += "# " + k + " " + "\n"
|
|
|
- msg += fmt.Sprintf("<font color=\"warning\">%s</font>", abnormalIpList[k]) + "\n"
|
|
|
+ msg += fmt.Sprintf("<font color=\"warning\">%s</font>", abnormalIpList[k]) + "\n"
|
|
|
+ personMsgData[mpsPerson[k].MobilePhoneNumber] += fmt.Sprintf("<font color=\"warning\">%s</font>", abnormalIpList[k]) + "\n"
|
|
|
}
|
|
|
url := global.GVA_CONFIG.SendUrl.ComputerSendUrl
|
|
|
var sendData SendMsg
|
|
|
@@ -162,5 +168,12 @@ func (robotService *RobotService) SyncIPMessage() {
|
|
|
//global.GVA_LOG.Warn(string(b))
|
|
|
syncData.SendMsgData(url, sendTextData)
|
|
|
}
|
|
|
+ for person, personData := range personMsgData {
|
|
|
+ var sendPersonData SendMsg
|
|
|
+ sendPersonMsg := personMsg + personData
|
|
|
+ sendData.MsgType = "markdown"
|
|
|
+ sendData.Markdown.Content = sendPersonMsg
|
|
|
+ syncData.SendMsgData(mpsPerson[person].Url, sendPersonData)
|
|
|
+ }
|
|
|
return
|
|
|
-}
|
|
|
+}
|