From 7add28ebd98e9fac584c0c131f6c0dd07d73a55b Mon Sep 17 00:00:00 2001
From: xx <xx@123.com>
Date: Sat, 21 Dec 2024 14:42:34 +0800
Subject: [PATCH] feat: improve dingtalk webhook mention add mention specify

---
 server/notification-providers/dingding.js | 24 ++++++++++++++++++-----
 src/components/notifications/DingDing.vue | 10 ++++++++++
 src/lang/en.json                          |  4 ++++
 src/lang/zh-CN.json                       |  4 ++++
 src/lang/zh-HK.json                       |  8 +++++++-
 src/lang/zh-TW.json                       |  4 ++++
 6 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/server/notification-providers/dingding.js b/server/notification-providers/dingding.js
index c66f270a7..795018700 100644
--- a/server/notification-providers/dingding.js
+++ b/server/notification-providers/dingding.js
@@ -11,17 +11,26 @@ 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)
         try {
             if (heartbeatJSON != null) {
+                notification.mobileList
                 let params = {
                     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"]}`,
+                        text: `## [${this.statusToString(heartbeatJSON["status"])}] ${monitorJSON["name"]} \n> ${heartbeatJSON["msg"]}\n> Time (${heartbeatJSON["timezone"]}): ${heartbeatJSON["localDateTime"]}${'\n\n'+mentionStr}`,
                     },
-                    "at": {
-                        "isAtAll": notification.mentioning === "everyone"
+                    at: {
+                        isAtAll: mentionAll,
+                        atUserIds: userList,
+                        atMobiles: mobileList
                     }
                 };
                 if (await this.sendToDingDing(notification, params)) {
@@ -31,7 +40,12 @@ class DingDing extends NotificationProvider {
                 let params = {
                     msgtype: "text",
                     text: {
-                        content: msg
+                        content: `${msg}${'\n'+mentionStr}`
+                    },
+                    at: {
+                        isAtAll: mentionAll,
+                        atUserIds: userList,
+                        atMobiles: mobileList
                     }
                 };
                 if (await this.sendToDingDing(notification, params)) {
diff --git a/src/components/notifications/DingDing.vue b/src/components/notifications/DingDing.vue
index 710677fd7..3ed974d6e 100644
--- a/src/components/notifications/DingDing.vue
+++ b/src/components/notifications/DingDing.vue
@@ -19,8 +19,18 @@
         <select id="mentioning" v-model="$parent.notification.mentioning" class="form-select" required>
             <option value="nobody">{{ $t("Don't mention people") }}</option>
             <option value="everyone">{{ $t("Mention group", { group: "@everyone" }) }}</option>
+            <option value="specify-mobiles">{{ $t("Mention Mobile List") }}</option>
+            <option value="specify-users">{{ $t("Mention User List") }}</option>
         </select>
     </div>
+    <div class="mb-3" v-if="$parent.notification.mentioning === 'specify-mobiles'">
+        <label for="mobileList" class="form-label">{{ $t("Dingtalk Mobile List") }}<span style="color: red;"><sup>*</sup></span></label>
+        <input id="mobileList" v-model="$parent.notification.mobileList" type="list" class="form-control" required>
+    </div>
+    <div class="mb-3" v-if="$parent.notification.mentioning === 'specify-users'">
+        <label for="userList" class="form-label">{{ $t("Dingtalk User List") }}<span style="color: red;"><sup>*</sup></span></label>
+        <input id="userList" v-model="$parent.notification.userList" type="list" class="form-control" required>
+    </div>
 </template>
 
 <script lang="ts">
diff --git a/src/lang/en.json b/src/lang/en.json
index e215f1031..641dae02e 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -687,6 +687,10 @@
     "Mentioning": "Mentioning",
     "Don't mention people": "Don't mention people",
     "Mention group": "Mention {group}",
+    "Mention Mobile List": "Mention mobile list",
+    "Mention User List": "Mention user ID List",
+    "Dingtalk Mobile List": "Mobile List (use comma separator)",
+    "Dingtalk User List": "User List (use comma separator)",
     "Device Token": "Device Token",
     "Platform": "Platform",
     "Huawei": "Huawei",
diff --git a/src/lang/zh-CN.json b/src/lang/zh-CN.json
index ac9ebbeca..2a70bc6b1 100644
--- a/src/lang/zh-CN.json
+++ b/src/lang/zh-CN.json
@@ -949,6 +949,10 @@
     "Mentioning": "是否提及成员",
     "Don't mention people": "不提及任何人",
     "Mention group": "提及 {group}",
+    "Mention Mobile List": "提及指定手机号列表",
+    "Mention User List": "提及指定用户ID列表",
+    "Dingtalk Mobile List": "手机号列表(使用逗号分隔多个手机号)",
+    "Dingtalk User List": "用户ID列表(使用逗号分隔多个用户ID)",
     "senderSevenIO": "发信人号码或名称",
     "wayToGetSevenIOApiKey": "访问 app.seven.io > 开发人员 > api 密钥 > 绿色添加按钮下的仪表板",
     "receiverInfoSevenIO": "如果接收号码不在德国，您必须在号码前面添加国家代码（例如，对于来自美国的国家代码 1，请使用 117612121212 而不是 017612121212）",
diff --git a/src/lang/zh-HK.json b/src/lang/zh-HK.json
index 570ca3a20..3cc9b6c53 100644
--- a/src/lang/zh-HK.json
+++ b/src/lang/zh-HK.json
@@ -760,5 +760,11 @@
     "locally configured mail transfer agent": "本機設定的郵件傳輸代理",
     "now": "現在",
     "time ago": "{0} 之前",
-    "ignoreTLSErrorGeneral": "忽略連接中的TLS/SSL錯誤"
+    "ignoreTLSErrorGeneral": "忽略連接中的TLS/SSL錯誤",
+    "Don't mention people": "不提及任何人",
+    "Mention group": "提及 {group}",
+    "Mention Mobile List": "提及指定手機號",
+    "Mention User List": "提及指定用戶ID",
+    "Dingtalk Mobile List": "手機號列表(使用逗號分割多个手機號)",
+    "Dingtalk User List": "用戶ID列表(使用逗號分割多個用戶ID)"
 }
diff --git a/src/lang/zh-TW.json b/src/lang/zh-TW.json
index 9f38eb73a..e3317b19b 100644
--- a/src/lang/zh-TW.json
+++ b/src/lang/zh-TW.json
@@ -956,6 +956,10 @@
     "wayToGetDiscordThreadId": "取得主題 / 論壇文章 ID 與取得頻道 ID 類似。詳細了解如何取得 ID {0}",
     "Don't mention people": "不要提及他人",
     "Mention group": "提及 {group}",
+    "Mention Mobile List": "提及指定手機號",
+    "Mention User List": "提及指定用戶ID",
+    "Dingtalk Mobile List": "手機號列表(使用逗號分割多个手機號)",
+    "Dingtalk User List": "用戶ID列表(使用逗號分割多個用戶ID)",
     "smspartnerSenderNameInfo": "必須介於 3..=11 個字元之間",
     "cacheBusterParam": "新增 {0} 參數",
     "cacheBusterParamDescription": "隨機生成參數以跳過快取。",