diff --git a/server/notification-providers/dingding.js b/server/notification-providers/dingding.js index 795018700..01cd26355 100644 --- a/server/notification-providers/dingding.js +++ b/server/notification-providers/dingding.js @@ -11,13 +11,10 @@ class DingDing extends NotificationProvider { */ async send(notification, msg, monitorJSON = null, heartbeatJSON = null) { const okMsg = "Sent Successfully."; - const mentionAll = notification.mentioning === "everyone" - const mobileList = notification.mentioning === "specify-mobiles" ? notification.mobileList.split(",") : [] - const userList = notification.mentioning === "specify-users" ? notification.userList.split(",") : [] - const mentionStr = [...mobileList || [], ...userList || [] ].map(item => `@${item}`).join(" ") - console.log('mobileList: ',mobileList) - console.log('userList: ',userList) - console.log('mentionStr: ',mentionStr) + const mentionAll = notification.mentioning === "everyone" + const mobileList = notification.mentioning === "specify-mobiles" ? notification.mobileList.split(",") : [] + const userList = notification.mentioning === "specify-users" ? notification.userList.split(",") : [] + const mentionStr = [...mobileList || [], ...userList || []].map(item => `@${item}`).join(" ") try { if (heartbeatJSON != null) { notification.mobileList @@ -25,7 +22,7 @@ class DingDing extends NotificationProvider { msgtype: "markdown", markdown: { title: `[${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]}`, - text: `## [${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]} \n> ${heartbeatJSON["msg"]}\n> Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}${'\n\n'+mentionStr}`, + text: `## [${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]} \n> ${heartbeatJSON["msg"]}\n> Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}${'\n\n' + mentionStr}`, }, at: { isAtAll: mentionAll, @@ -40,7 +37,7 @@ class DingDing extends NotificationProvider { let params = { msgtype: "text", text: { - content: `${msg}${'\n'+mentionStr}` + content: `${msg}${'\n' + mentionStr}` }, at: { isAtAll: mentionAll,