From 0862e1ff39de63b59c4d824fab7115c5335b6eaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E4=BC=9F=E5=AD=98?= <linweicun@southzn.com>
Date: Thu, 30 Nov 2023 14:56:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=E9=92=89?=
 =?UTF-8?q?=E9=92=89=E9=85=8D=E7=BD=AEwebhook=E4=BF=9D=E5=AD=98=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/views/project/ModuleSetting/DingDingSetting/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/views/project/ModuleSetting/DingDingSetting/index.vue b/front/src/views/project/ModuleSetting/DingDingSetting/index.vue
index 0ca5b18c..5a846b0d 100644
--- a/front/src/views/project/ModuleSetting/DingDingSetting/index.vue
+++ b/front/src/views/project/ModuleSetting/DingDingSetting/index.vue
@@ -29,7 +29,7 @@ export default {
     return {
       moduleId: '',
       config: {
-        dingdingWebhookUrl: { configValue: '', description: '钉钉群机器人webhook' }
+        dingdingWebhookUrl: { configKey: 'dingdingWebhookUrl', configValue: '', description: '钉钉群机器人webhook' }
       }
     }
   },
-- 
Gitee


From 8effbeb8f44ffe9c665f08e1aea3f6f2f1cc9d83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E4=BC=9F=E5=AD=98?= <linweicun@southzn.com>
Date: Thu, 30 Nov 2023 14:57:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20:sparkles:=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E5=BE=AE=E4=BF=A1=E7=BE=A4=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E4=BA=BAWebHook=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/src/utils/i18n/languages/en-us.js       |  7 ++
 front/src/utils/i18n/languages/zh-cn.js       |  7 ++
 front/src/views/admin/setting/index.vue       |  6 +-
 .../src/views/project/ModuleSetting/index.vue |  6 +-
 front/src/views/user/UserInfo/index.vue       |  6 +-
 .../upgrade/1.24.1_ddl_user_wecom.txt         |  8 ++
 .../cn/torna/common/bean/EnvironmentKeys.java |  8 ++
 .../torna/common/bean/WeComWebHookBody.java   | 61 ++++++++++++++++
 .../common/enums/MessageNotifyTypeEnum.java   | 37 ++++++++++
 .../util/DingTalkOrWeComWebHookUtil.java      | 73 +++++++++++++++++++
 .../cn/torna/common/util/DingTalkUtil.java    | 49 -------------
 .../cn/torna/dao/entity/UserWeComInfo.java    | 35 +++++++++
 .../torna/dao/mapper/UserWeComInfoMapper.java | 15 ++++
 .../torna/service/DocDiffRecordService.java   | 65 ++++++++++++-----
 .../java/cn/torna/service/DocInfoService.java | 58 +++++++++++----
 .../cn/torna/service/ModuleConfigService.java |  9 +++
 .../torna/service/UserWeComInfoService.java   | 22 ++++++
 .../cn/torna/service/dto/UserInfoDTO.java     |  2 +
 .../controller/user/UserInfoController.java   | 21 +++++-
 .../user/param/UpdateInfoParam.java           |  4 +
 20 files changed, 412 insertions(+), 87 deletions(-)
 create mode 100644 server/boot/src/main/resources/upgrade/1.24.1_ddl_user_wecom.txt
 create mode 100644 server/server-common/src/main/java/cn/torna/common/bean/WeComWebHookBody.java
 create mode 100644 server/server-common/src/main/java/cn/torna/common/enums/MessageNotifyTypeEnum.java
 create mode 100644 server/server-common/src/main/java/cn/torna/common/util/DingTalkOrWeComWebHookUtil.java
 delete mode 100644 server/server-common/src/main/java/cn/torna/common/util/DingTalkUtil.java
 create mode 100644 server/server-dao/src/main/java/cn/torna/dao/entity/UserWeComInfo.java
 create mode 100644 server/server-dao/src/main/java/cn/torna/dao/mapper/UserWeComInfoMapper.java
 create mode 100644 server/server-service/src/main/java/cn/torna/service/UserWeComInfoService.java

diff --git a/front/src/utils/i18n/languages/en-us.js b/front/src/utils/i18n/languages/en-us.js
index b163dcbe..ff3f0614 100644
--- a/front/src/utils/i18n/languages/en-us.js
+++ b/front/src/utils/i18n/languages/en-us.js
@@ -1,4 +1,5 @@
 export default {
+  'weComMobile': 'WeCom Mobile',
   'bindAccount': 'Bind account',
   'dingdingAccount': 'DingDing Account',
   'requestArrayType': 'Request array type',
@@ -516,10 +517,16 @@ export default {
     'dingdingWebhookUrlPlacehoder': 'Input full url with token parameter',
     'dingdingWebhookUrlTip': 'Push message to dingding group when doc is changed'
   },
+  WeComSetting: {
+    'weComWebhookUrl': 'WeCom group robot webhook URL',
+    'weComWebhookUrlPlacehoder': 'Input full url with token parameter',
+    'weComWebhookUrlTip': 'Push message to weCom group when doc is changed'
+  },
   UserInfo: {
     'bindDingDingTip':'Use DingDing app scan the QR to bind account'
   },
   ModuleSetting: {
+    'weComSetting': 'WeCom Setting',
     'dingdingSetting': 'DingTalk Setting',
     'swaggerSetting': 'Swagger Setting',
   },
diff --git a/front/src/utils/i18n/languages/zh-cn.js b/front/src/utils/i18n/languages/zh-cn.js
index 7d789ceb..21ae5311 100644
--- a/front/src/utils/i18n/languages/zh-cn.js
+++ b/front/src/utils/i18n/languages/zh-cn.js
@@ -1,4 +1,5 @@
 export default {
+  'weComMobile': '企业微信手机号码',
   'bindAccount': '绑定账号',
   'dingdingAccount': '钉钉账号',
   'requestArrayType': '请求数组元素类型',
@@ -519,10 +520,16 @@ export default {
     'dingdingWebhookUrlPlacehoder': '输入完整带token参数的url',
     'dingdingWebhookUrlTip': '当文档变更时推送消息到钉钉群。需要创建自定义机器人，添加关键字：文档',
   },
+  WeComSetting: {
+    'weComWebhookUrl': '企业微信群机器人推送URL（Webhook）',
+    'weComWebhookUrlPlacehoder': '输入完整带token参数的url',
+    'weComWebhookUrlTip': '当文档变更时推送消息到企业微信群。需要创建自定义机器人，添加关键字：文档',
+  },
   UserInfo: {
     'bindDingDingTip': '使用钉钉App扫一扫进行账号绑定'
   },
   ModuleSetting: {
+    'weComSetting': '企业微信配置',
     'dingdingSetting': '钉钉配置',
     'swaggerSetting': 'Swagger设置'
   },
diff --git a/front/src/views/admin/setting/index.vue b/front/src/views/admin/setting/index.vue
index 7a81d6db..bc49d78c 100644
--- a/front/src/views/admin/setting/index.vue
+++ b/front/src/views/admin/setting/index.vue
@@ -10,6 +10,9 @@
       <el-tab-pane label="钉钉配置" name="dingding">
         <ding-ding ref="dingding" />
       </el-tab-pane>
+      <el-tab-pane label="企业微信配置" name="weCom">
+        <weCom ref="weCom" />
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -17,10 +20,11 @@
 <script>
 import BaseSetting from './BaseSetting'
 import DingDing from './DingDing'
+import WeCom from './WeCom'
 import I18nSetting from './I18nSetting'
 
 export default {
-  components: { BaseSetting, I18nSetting, DingDing },
+  components: { BaseSetting, I18nSetting, DingDing, WeCom },
   methods: {
     tabChange(tab) {
       const name = tab.name
diff --git a/front/src/views/project/ModuleSetting/index.vue b/front/src/views/project/ModuleSetting/index.vue
index fa57babf..22715ad4 100644
--- a/front/src/views/project/ModuleSetting/index.vue
+++ b/front/src/views/project/ModuleSetting/index.vue
@@ -25,19 +25,23 @@
       <el-tab-pane name="dingdingSetting" :label="$ts('ModuleSetting.dingdingSetting')">
         <ding-ding-setting ref="dingdingSetting" />
       </el-tab-pane>
+      <el-tab-pane name="weComSetting" :label="$ts('ModuleSetting.weComSetting')">
+        <we-com-setting ref="weComSetting" />
+      </el-tab-pane>
     </el-tabs>
 
   </div>
 </template>
 <script>
 import DingDingSetting from './DingDingSetting'
+import WeComSetting from './WeComSetting'
 import PopoverUpdate from '@/components/PopoverUpdate'
 import SwaggerSetting from '@/components/ModuleSetting/SwaggerSetting'
 import EnvSetting from './EnvSetting'
 
 export default {
   name: 'ModuleSetting',
-  components: { DingDingSetting, PopoverUpdate, SwaggerSetting, EnvSetting },
+  components: { WeComSetting, DingDingSetting, PopoverUpdate, SwaggerSetting, EnvSetting },
   props: {
     projectId: {
       type: String,
diff --git a/front/src/views/user/UserInfo/index.vue b/front/src/views/user/UserInfo/index.vue
index 5e4675fb..5e6ee807 100644
--- a/front/src/views/user/UserInfo/index.vue
+++ b/front/src/views/user/UserInfo/index.vue
@@ -28,6 +28,9 @@
           {{ userData.dingdingNick }}
         </span>
       </el-form-item>
+      <el-form-item :label="$ts('weComMobile')" prop="weComMobile">
+        <el-input v-model="userData.weComMobile" show-word-limit maxlength="11" />
+      </el-form-item>
       <el-form-item :label="$ts('nickname')" prop="nickname">
         <el-input v-model="userData.nickname" show-word-limit maxlength="50" />
       </el-form-item>
@@ -61,7 +64,8 @@ export default {
         username: '',
         dingdingUserId: '',
         nickname: '',
-        email: ''
+        email: '',
+        weComMobile: ''
       },
       rules: {
         nickname: [
diff --git a/server/boot/src/main/resources/upgrade/1.24.1_ddl_user_wecom.txt b/server/boot/src/main/resources/upgrade/1.24.1_ddl_user_wecom.txt
new file mode 100644
index 00000000..49948d3d
--- /dev/null
+++ b/server/boot/src/main/resources/upgrade/1.24.1_ddl_user_wecom.txt
@@ -0,0 +1,8 @@
+CREATE TABLE `user_wecom_info`  (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `mobile` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业微信绑定手机号码',
+  `user_info_id` bigint NOT NULL COMMENT 'user_info.id',
+  `gmt_create` datetime NOT NULL,
+  `gmt_modified` datetime NOT NULL,
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB  CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
diff --git a/server/server-common/src/main/java/cn/torna/common/bean/EnvironmentKeys.java b/server/server-common/src/main/java/cn/torna/common/bean/EnvironmentKeys.java
index a39f3200..ed963d06 100644
--- a/server/server-common/src/main/java/cn/torna/common/bean/EnvironmentKeys.java
+++ b/server/server-common/src/main/java/cn/torna/common/bean/EnvironmentKeys.java
@@ -49,6 +49,8 @@ public enum EnvironmentKeys {
 
     /** 推送钉钉webhook */
     PUSH_DINGDING_WEBHOOK_URL("torna.push.dingding-webhook-url"),
+
+    PUSH_DINGDING_WECOM_URL("torna.push.wecom-webhook-url"),
     /** 变更文档内容模板 */
     PUSH_DINGDING_WEBHOOK_CONTENT("torna.push.dingding-webhook-content", "【文档{modifyType}提醒】\n" +
             "【所属应用】： {projectName} - {appName}\n" +
@@ -57,6 +59,12 @@ public enum EnvironmentKeys {
             "【修改时间】：{modifyTime}\n" +
             "【查看地址】：{docViewUrl}\n" +
             "{@user}"),
+    PUSH_WECOM_WEBHOOK_CONTENT("torna.push.wecom-webhook-content", "【文档{modifyType}提醒】\n" +
+            "【所属应用】： {projectName} - {appName}\n" +
+            "【文档名称】：{docName}\n" +
+            "【修改人】：{modifier}\n" +
+            "【修改时间】：{modifyTime}\n" +
+            "【查看地址】：{docViewUrl}"),
     /** 是否打印推送内容，默认false */
     TORNA_PUSH_PRINT_CONTENT("torna.push.print-content", "false"),
     /** 是否允许相同的文件夹，默认：true */
diff --git a/server/server-common/src/main/java/cn/torna/common/bean/WeComWebHookBody.java b/server/server-common/src/main/java/cn/torna/common/bean/WeComWebHookBody.java
new file mode 100644
index 00000000..e8e7bf8e
--- /dev/null
+++ b/server/server-common/src/main/java/cn/torna/common/bean/WeComWebHookBody.java
@@ -0,0 +1,61 @@
+package cn.torna.common.bean;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Copyright © 2021 DHF Info. Tech Ltd. All rights reserved.
+ * <p></p>
+ *
+ * @author lin
+ * @version 1.0.0
+ * @description 企业微信群机器人 Webhook消息体
+ * @date 2023/11/29
+ */
+@Data
+public class WeComWebHookBody {
+    /**
+     * 消息内容。
+     */
+    private Text text;
+
+    /**
+     * 消息类型，此时固定为：text。
+     */
+    @JSONField(name = "msgtype")
+    private String msgType = "text";
+
+
+    public static WeComWebHookBody create(String content, List<String> mentionedMobileList) {
+        WeComWebHookBody weComWebHookBody = new WeComWebHookBody();
+        Text text = new Text();
+        text.setContent(content);
+        text.setMentionedMobileList(mentionedMobileList);
+        weComWebHookBody.setText(text);
+        return weComWebHookBody;
+    }
+
+
+    @Data
+    private static class Text {
+
+        /**
+         * 文本内容，最长不超过2048个字节，必须是utf8编码
+         */
+        private String content;
+
+        /**
+         * userid的列表，提醒群中的指定成员(@某个成员)，@all表示提醒所有人，如果开发者获取不到userid，可以使用mentioned_mobile_list
+         */
+        @JSONField(name = "mentioned_list")
+        private List<String> mentionedList;
+
+        /**
+         * 手机号列表，提醒手机号对应的群成员(@某个成员)，@all表示提醒所有人
+         */
+        @JSONField(name = "mentioned_mobile_list")
+        private List<String> mentionedMobileList;
+    }
+}
diff --git a/server/server-common/src/main/java/cn/torna/common/enums/MessageNotifyTypeEnum.java b/server/server-common/src/main/java/cn/torna/common/enums/MessageNotifyTypeEnum.java
new file mode 100644
index 00000000..71ed70f3
--- /dev/null
+++ b/server/server-common/src/main/java/cn/torna/common/enums/MessageNotifyTypeEnum.java
@@ -0,0 +1,37 @@
+package cn.torna.common.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * webhook 类型
+ *
+ * @author Lin
+ * @version 1.0.0
+ * @since 2023-11-29  16:01:23
+ */
+@Getter
+@RequiredArgsConstructor
+public enum MessageNotifyTypeEnum {
+
+    /**
+     * 企业微信webhook
+     */
+    WECOM_WEBHOOK((byte) 1, "企业微信webhook"),
+
+    /**
+     *钉钉webhook
+     */
+    DING_TALK_WEB_HOOK((byte) 2, "钉钉webhook");
+
+
+
+    /**
+     * 类型code
+     */
+    private final byte type;
+    /**
+     * 描述信息
+     */
+    private final String description;
+}
diff --git a/server/server-common/src/main/java/cn/torna/common/util/DingTalkOrWeComWebHookUtil.java b/server/server-common/src/main/java/cn/torna/common/util/DingTalkOrWeComWebHookUtil.java
new file mode 100644
index 00000000..2b0bc559
--- /dev/null
+++ b/server/server-common/src/main/java/cn/torna/common/util/DingTalkOrWeComWebHookUtil.java
@@ -0,0 +1,73 @@
+package cn.torna.common.util;
+
+import cn.torna.common.bean.DingdingWebHookBody;
+import cn.torna.common.bean.HttpHelper;
+import cn.torna.common.bean.WeComWebHookBody;
+import cn.torna.common.enums.MessageNotifyTypeEnum;
+import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author thc
+ */
+@Slf4j
+public class DingTalkOrWeComWebHookUtil {
+
+    public static final String CODE_SUCCESS = "0";
+
+    /**
+     * 推送钉钉/企业微信机器人消息
+     *
+     * @param url     推送完整url
+     * @param content 推送内容
+     * @param userIds @用户的userId
+     */
+    public static void pushRobotMessage(MessageNotifyTypeEnum notificationType, String url, String content, List<String> userIds) {
+        if (StringUtils.isEmpty(url) || StringUtils.isEmpty(content)) {
+            return;
+        }
+        // 移除双重换行
+        content = content.replace("\r\n", "\n");
+
+        // 推送钉钉机器人
+        if (MessageNotifyTypeEnum.DING_TALK_WEB_HOOK.equals(notificationType)) {
+            DingdingWebHookBody dingdingWebHookBody = DingdingWebHookBody.create(content);
+            dingdingWebHookBody.setAt(new DingdingWebHookBody.At(userIds));
+            try {
+                // 推送钉钉机器人
+                String result = HttpHelper.postJson(url, JSON.toJSONString(dingdingWebHookBody))
+                        .execute()
+                        .asString();
+                String errcode = JSON.parseObject(result).getString("errcode");
+                if (!Objects.equals(errcode, CODE_SUCCESS)) {
+                    log.error("推送钉钉消息异常, result={}, url={}", result, url);
+                }
+            } catch (Exception e) {
+                log.error("推送钉钉失败, url:{}", url, e);
+            }
+        }
+
+        // 推送企业微信群机器人
+        if (MessageNotifyTypeEnum.WECOM_WEBHOOK.equals(notificationType)) {
+            WeComWebHookBody weComWebHookBody = WeComWebHookBody.create(content, userIds);
+            try {
+                // 推送企业微信群机器人
+                String result = HttpHelper.postJson(url, JSON.toJSONString(weComWebHookBody))
+                        .execute()
+                        .asString();
+                // 返回码
+                String errCode = JSON.parseObject(result).getString("errcode");
+                if (!Objects.equals(errCode, CODE_SUCCESS)) {
+                    log.error("推送企业微信群机器人消息异常, result={}, url={}", result, url);
+                }
+            } catch (Exception e) {
+                log.error("推送企业微信群机器人失败, url:{}", url, e);
+            }
+        }
+    }
+
+}
diff --git a/server/server-common/src/main/java/cn/torna/common/util/DingTalkUtil.java b/server/server-common/src/main/java/cn/torna/common/util/DingTalkUtil.java
deleted file mode 100644
index 83b3513d..00000000
--- a/server/server-common/src/main/java/cn/torna/common/util/DingTalkUtil.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package cn.torna.common.util;
-
-import cn.torna.common.bean.DingdingWebHookBody;
-import cn.torna.common.bean.HttpHelper;
-import com.alibaba.fastjson.JSON;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
-import java.util.Objects;
-
-/**
- * @author thc
- */
-@Slf4j
-public class DingTalkUtil {
-
-    public static final String CODE_SUCCESS = "0";
-
-    /**
-     *
-     * 推送钉钉机器人消息
-     * @param url 推送完整url
-     * @param content 推送内容
-     * @param userIds @用户的userId
-     */
-    public static void pushRobotMessage(String url, String content, List<String> userIds) {
-        if (StringUtils.isEmpty(url) || StringUtils.isEmpty(content)) {
-            return;
-        }
-        // 移除双重换行
-        content = content.replace("\r\n", "\n");
-        DingdingWebHookBody dingdingWebHookBody = DingdingWebHookBody.create(content);
-        dingdingWebHookBody.setAt(new DingdingWebHookBody.At(userIds));
-        try {
-            // 推送钉钉机器人
-            String result = HttpHelper.postJson(url, JSON.toJSONString(dingdingWebHookBody))
-                    .execute()
-                    .asString();
-            String errcode = JSON.parseObject(result).getString("errcode");
-            if (!Objects.equals(errcode, CODE_SUCCESS)) {
-                log.error("推送钉钉消息异常, result={}, url={}", result, url);
-            }
-        } catch (Exception e) {
-            log.error("推送钉钉失败, url:{}", url, e);
-        }
-    }
-
-}
diff --git a/server/server-dao/src/main/java/cn/torna/dao/entity/UserWeComInfo.java b/server/server-dao/src/main/java/cn/torna/dao/entity/UserWeComInfo.java
new file mode 100644
index 00000000..dc46f390
--- /dev/null
+++ b/server/server-dao/src/main/java/cn/torna/dao/entity/UserWeComInfo.java
@@ -0,0 +1,35 @@
+package cn.torna.dao.entity;
+
+import com.gitee.fastmybatis.annotation.Pk;
+import com.gitee.fastmybatis.annotation.PkStrategy;
+import com.gitee.fastmybatis.annotation.Table;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 表名：user_wecom_info
+ * 备注：企业微信开放平台用户
+ *
+ * @author Lin
+ * @date 2023-11-29  17:02:14
+ */
+@Table(name = "user_wecom_info", pk = @Pk(name = "id", strategy = PkStrategy.INCREMENT))
+@Data
+public class UserWeComInfo {
+
+    /**  数据库字段：id */
+    private Long id;
+
+    /**  企业微信绑定手机号码：mobile */
+    private String mobile;
+
+    /** user_info.id, 数据库字段：user_info_id */
+    private Long userInfoId;
+
+    /**  数据库字段：gmt_create */
+    private LocalDateTime gmtCreate;
+
+        /**  数据库字段：gmt_modified */
+    private LocalDateTime gmtModified;
+}
diff --git a/server/server-dao/src/main/java/cn/torna/dao/mapper/UserWeComInfoMapper.java b/server/server-dao/src/main/java/cn/torna/dao/mapper/UserWeComInfoMapper.java
new file mode 100644
index 00000000..9e9af4e4
--- /dev/null
+++ b/server/server-dao/src/main/java/cn/torna/dao/mapper/UserWeComInfoMapper.java
@@ -0,0 +1,15 @@
+package cn.torna.dao.mapper;
+
+import cn.torna.dao.entity.UserWeComInfo;
+import com.gitee.fastmybatis.core.mapper.CrudMapper;
+
+/**
+ * 表名：user_wecom_info
+ * 备注：企业微信开放平台用户
+ *
+ * @author Lin
+ * @date 2023-11-29  17:03:14
+ */
+public interface UserWeComInfoMapper extends CrudMapper<UserWeComInfo, Long> {
+	
+}
\ No newline at end of file
diff --git a/server/server-service/src/main/java/cn/torna/service/DocDiffRecordService.java b/server/server-service/src/main/java/cn/torna/service/DocDiffRecordService.java
index 0ecd2876..f597e28f 100644
--- a/server/server-service/src/main/java/cn/torna/service/DocDiffRecordService.java
+++ b/server/server-service/src/main/java/cn/torna/service/DocDiffRecordService.java
@@ -2,11 +2,12 @@ package cn.torna.service;
 
 import cn.torna.common.bean.EnvironmentKeys;
 import cn.torna.common.bean.User;
+import cn.torna.common.enums.MessageNotifyTypeEnum;
 import cn.torna.common.enums.ModifyType;
 import cn.torna.common.enums.ModifySourceEnum;
 import cn.torna.common.support.BaseService;
 import cn.torna.common.util.CopyUtil;
-import cn.torna.common.util.DingTalkUtil;
+import cn.torna.common.util.DingTalkOrWeComWebHookUtil;
 import cn.torna.common.util.IdUtil;
 import cn.torna.dao.entity.DocDiffDetail;
 import cn.torna.dao.entity.DocDiffRecord;
@@ -71,6 +72,7 @@ public class DocDiffRecordService extends BaseService<DocDiffRecord, DocDiffReco
 
     /**
      * 获取修改记录
+     *
      * @param docId 文档id
      * @return
      */
@@ -188,30 +190,46 @@ public class DocDiffRecordService extends BaseService<DocDiffRecord, DocDiffReco
     }
 
     /**
-     * 推送钉钉消息
+     * 推送钉钉/企业微信 消息
+     *
      * @param docInfoDTO
      * @param modifyType
      */
     private void pushMessage(DocInfoDTO docInfoDTO, ModifyType modifyType) {
         try {
             if (modifyType == ModifyType.UPDATE || modifyType == ModifyType.DELETE) {
+                // 钉钉机器人 webhook url
                 String url = moduleConfigService.getDingDingRobotWebhookUrl(docInfoDTO.getModuleId());
-                if (StringUtils.isEmpty(url)) {
-                    return;
+                if (StringUtils.hasText(url)) {
+                    List<String> dingDingUserIds = docInfoService.listSubscribeDocDingDingUserIds(docInfoDTO.getId());
+                    // 如果没有人关注 则跳过
+                    if (!CollectionUtils.isEmpty(dingDingUserIds)) {
+                        String content = buildDingDingMessage(MessageNotifyTypeEnum.DING_TALK_WEB_HOOK, docInfoDTO, modifyType, dingDingUserIds);
+                        if (!StringUtils.hasText(content)) {
+                            return;
+                        }
+                        DingTalkOrWeComWebHookUtil.pushRobotMessage(MessageNotifyTypeEnum.DING_TALK_WEB_HOOK, url, content, dingDingUserIds);
+                    }
+
                 }
-                List<String> dingDingUserIds = docInfoService.listSubscribeDocDingDingUserIds(docInfoDTO.getId());
-                String content = buildDingDingMessage(docInfoDTO, modifyType, dingDingUserIds);
-                if (StringUtils.isEmpty(content)) {
-                    return;
+                // 企业微信webhook url
+                url = moduleConfigService.getWeComWebhookUrl(docInfoDTO.getModuleId());
+                if (StringUtils.hasText(url)) {
+                    // 关注的用户的 企业微信手机号码
+                    List<String> weComUserMobiles = docInfoService.listSubscribeDocWeComUserMobiles(docInfoDTO.getId());
+                    // 如果没有人关注 则跳过
+                    if (!CollectionUtils.isEmpty(weComUserMobiles)) {
+                        String content = buildDingDingMessage(MessageNotifyTypeEnum.WECOM_WEBHOOK, docInfoDTO, modifyType, weComUserMobiles);
+                        DingTalkOrWeComWebHookUtil.pushRobotMessage(MessageNotifyTypeEnum.WECOM_WEBHOOK, url, content, weComUserMobiles);
+                    }
                 }
-                DingTalkUtil.pushRobotMessage(url, content, dingDingUserIds);
             }
         } catch (Exception e) {
-            log.error("推送钉钉消息失败, doc={}", docInfoDTO.getName(), e);
+            log.error("推送钉钉/企业微信消息失败, doc={}", docInfoDTO.getName(), e);
         }
     }
 
-    private String buildDingDingMessage(DocInfoDTO docInfoDTO, ModifyType modifyType, List<String> userIds) {
+    private String buildDingDingMessage(MessageNotifyTypeEnum notificationType, DocInfoDTO docInfoDTO, ModifyType modifyType, List<String> userIds) {
         Project project = projectMapper.getById(docInfoDTO.getProjectId());
         Module module = moduleMapper.getById(docInfoDTO.getModuleId());
         Map<String, String> replaceMap = new HashMap<>(16);
@@ -225,16 +243,22 @@ public class DocDiffRecordService extends BaseService<DocDiffRecord, DocDiffReco
         String frontUrl = EnvironmentKeys.TORNA_FRONT_URL.getValue("http://localhost:7700");
         String docViewUrl = frontUrl + "/#/view/" + IdUtil.encode(docInfoDTO.getId());
         replaceMap.put("{docViewUrl}", docViewUrl);
-        String atUser = "";
-        if (!CollectionUtils.isEmpty(userIds)) {
-            atUser = userIds.stream()
-                    .map(userId -> "@" + userId)
-                    .collect(Collectors.joining(" "));
+        String content = null;
+        // 钉钉
+        if (notificationType.equals(MessageNotifyTypeEnum.DING_TALK_WEB_HOOK)) {
+            String atUser = "";
+            if (!CollectionUtils.isEmpty(userIds)) {
+                atUser = userIds.stream()
+                        .map(userId -> "@" + userId)
+                        .collect(Collectors.joining(" "));
+            }
+            replaceMap.put("{@user}", atUser);
+            content = EnvironmentKeys.PUSH_DINGDING_WEBHOOK_CONTENT.getValue();
         }
-        replaceMap.put("{@user}", atUser);
-
-        String content = EnvironmentKeys.PUSH_DINGDING_WEBHOOK_CONTENT.getValue();
-        if (StringUtils.isEmpty(content)) {
+        if (notificationType.equals(MessageNotifyTypeEnum.WECOM_WEBHOOK)) {
+            content = EnvironmentKeys.PUSH_WECOM_WEBHOOK_CONTENT.getValue();
+        }
+        if (!StringUtils.hasText(content)) {
             return content;
         }
         for (Map.Entry<String, String> entry : replaceMap.entrySet()) {
@@ -260,6 +284,7 @@ public class DocDiffRecordService extends BaseService<DocDiffRecord, DocDiffReco
 
     /**
      * 还原
+     *
      * @param id
      */
     public void restore(Long id, User user) {
diff --git a/server/server-service/src/main/java/cn/torna/service/DocInfoService.java b/server/server-service/src/main/java/cn/torna/service/DocInfoService.java
index 773aaaed..5cbe1687 100755
--- a/server/server-service/src/main/java/cn/torna/service/DocInfoService.java
+++ b/server/server-service/src/main/java/cn/torna/service/DocInfoService.java
@@ -16,15 +16,10 @@ import cn.torna.common.support.BaseService;
 import cn.torna.common.util.CopyUtil;
 import cn.torna.common.util.IdGen;
 import cn.torna.common.util.Markdown2HtmlUtil;
-import cn.torna.dao.entity.DocInfo;
-import cn.torna.dao.entity.DocParam;
-import cn.torna.dao.entity.EnumInfo;
-import cn.torna.dao.entity.Module;
-import cn.torna.dao.entity.ModuleEnvironment;
-import cn.torna.dao.entity.ModuleEnvironmentParam;
-import cn.torna.dao.entity.UserDingtalkInfo;
+import cn.torna.dao.entity.*;
 import cn.torna.dao.mapper.DocInfoMapper;
 import cn.torna.dao.mapper.UserDingtalkInfoMapper;
+import cn.torna.dao.mapper.UserWeComInfoMapper;
 import cn.torna.manager.doc.DataType;
 import cn.torna.service.dto.DocFolderCreateDTO;
 import cn.torna.service.dto.DocInfoDTO;
@@ -111,12 +106,16 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
     @Resource
     private UserDingtalkInfoMapper userDingtalkInfoMapper;
 
+    @Resource
+    private UserWeComInfoMapper userWeComInfoWrapper;
+
     @Autowired
     private UserSubscribeService userSubscribeService;
 
 
     /**
      * 查询模块下的所有文档
+     *
      * @param moduleId 模块id
      * @return 返回文档
      */
@@ -139,7 +138,7 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
             case BY_NAME:
                 comparator = Comparator.comparing(DocInfo::getName).thenComparing(DocInfo::getOrderIndex);
                 break;
-            default:{
+            default: {
                 comparator = Comparator.comparing(DocInfo::getOrderIndex);
             }
         }
@@ -152,6 +151,7 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 查询模块下的所有文档
+     *
      * @param moduleId 模块id
      * @return 返回文档
      */
@@ -168,6 +168,7 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 查询模块下的所有文档
+     *
      * @param moduleId 模块id
      * @return 返回文档
      */
@@ -195,6 +196,7 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 返回文档详情
+     *
      * @param docId 文档id
      * @return 返回文档详情
      */
@@ -208,6 +210,7 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 返回文档详情
+     *
      * @param docId 文档id
      * @return 返回文档详情
      */
@@ -218,6 +221,7 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 返回文档详情
+     *
      * @param docId 文档id
      * @return 返回文档详情
      */
@@ -276,6 +280,7 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 绑定枚举信息
+     *
      * @param docParamDTOS
      */
     private void bindEnumInfo(List<DocParamDTO> docParamDTOS) {
@@ -354,6 +359,7 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 查询模块全局错误码
+     *
      * @param moduleId 模块id
      * @return 返回全局错误码
      */
@@ -363,8 +369,9 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 保存文档信息
+     *
      * @param docInfoDTO 文档内容
-     * @param user 用户
+     * @param user       用户
      */
     @Transactional(rollbackFor = Exception.class)
     public synchronized DocInfo saveDocInfo(DocInfoDTO docInfoDTO, User user) {
@@ -444,6 +451,7 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 修改文档基本信息。参数除外
+     *
      * @param docInfoDTO
      * @param user
      * @return
@@ -547,6 +555,7 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 查询模块下面所有分类
+     *
      * @param moduleId 模块id
      * @return 返回分类
      */
@@ -573,6 +582,7 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 修改分类名称
+     *
      * @param updateDocFolderDTO
      */
     public void updateDocFolderName(UpdateDocFolderDTO updateDocFolderDTO) {
@@ -600,7 +610,8 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 删除文档
-     * @param id 文档注解
+     *
+     * @param id   文档注解
      * @param user 用户
      */
     public void deleteDocInfo(long id, User user) {
@@ -616,12 +627,13 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 创建文档分类，如果已存在，直接返回已存在的
+     *
      * @param folderName 分类名称
-     * @param moduleId 模块id
-     * @param user 操作人
+     * @param moduleId   模块id
+     * @param user       操作人
      */
     public DocInfo createDocFolder(String folderName, long moduleId, User user) {
-        return createDocFolder(folderName,  moduleId, user, 0L);
+        return createDocFolder(folderName, moduleId, user, 0L);
     }
 
     /**
@@ -672,6 +684,7 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 删除模块下所有文档
+     *
      * @param moduleId 模块id
      */
     public void deleteOpenAPIModuleDocs(long moduleId) {
@@ -698,6 +711,7 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 获取指定环境下的header
+     *
      * @param envId 环境id
      * @param docId 文档id
      * @return 返回所有的header，全局+文档
@@ -752,6 +766,7 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 获取文档所有的关注人员的钉钉userid
+     *
      * @param docId
      * @return 返回钉钉的userid
      */
@@ -763,6 +778,22 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
                 .collect(Collectors.toList());
     }
 
+
+    /**
+     * 获取文档所有的关注人员的企业微信用户手机号码
+     *
+     * @param docId 文档id
+     * @return 返回 企业微信用户手机号码
+     */
+    public List<String> listSubscribeDocWeComUserMobiles(long docId) {
+        List<Long> userIds = userSubscribeService.listUserIds(UserSubscribeTypeEnum.DOC, docId);
+        List<UserWeComInfo> userInfoId = userWeComInfoWrapper.listByCollection("user_info_id", userIds);
+        return userInfoId.stream()
+                .map(UserWeComInfo::getMobile)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+    }
+
     public DocRefDTO getDocRefInfo(long docId) {
         DocRefDTO docRefDTO = new DocRefDTO();
         DocInfo docInfo = this.getById(docId);
@@ -775,6 +806,7 @@ public class DocInfoService extends BaseService<DocInfo, DocInfoMapper> {
 
     /**
      * 更新文档状态
+     *
      * @param docId
      * @param status
      * @param user
diff --git a/server/server-service/src/main/java/cn/torna/service/ModuleConfigService.java b/server/server-service/src/main/java/cn/torna/service/ModuleConfigService.java
index 9939dcab..b0a16683 100644
--- a/server/server-service/src/main/java/cn/torna/service/ModuleConfigService.java
+++ b/server/server-service/src/main/java/cn/torna/service/ModuleConfigService.java
@@ -56,6 +56,15 @@ public class ModuleConfigService extends BaseService<ModuleConfig, ModuleConfigM
         return this.getCommonConfigValue(moduleId, "dingdingWebhookUrl", "");
     }
 
+
+    /**
+     * 获取企业微信推送url
+     * @return
+     */
+    public String getWeComWebhookUrl(long moduleId) {
+        return this.getCommonConfigValue(moduleId, "weComWebhookUrl", "");
+    }
+
     /**
      * 根据应用id和配置key查询
      * @param moduleId 应用id
diff --git a/server/server-service/src/main/java/cn/torna/service/UserWeComInfoService.java b/server/server-service/src/main/java/cn/torna/service/UserWeComInfoService.java
new file mode 100644
index 00000000..ff4a229c
--- /dev/null
+++ b/server/server-service/src/main/java/cn/torna/service/UserWeComInfoService.java
@@ -0,0 +1,22 @@
+package cn.torna.service;
+
+import cn.torna.common.support.BaseService;
+import cn.torna.dao.entity.UserDingtalkInfo;
+import cn.torna.dao.entity.UserInfo;
+import cn.torna.dao.entity.UserWeComInfo;
+import cn.torna.dao.mapper.UserDingtalkInfoMapper;
+import cn.torna.dao.mapper.UserWeComInfoMapper;
+import cn.torna.service.dto.DingTalkLoginDTO;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author tanghc
+ */
+@Service
+public class UserWeComInfoService extends BaseService<UserWeComInfo, UserWeComInfoMapper> {
+
+    public UserWeComInfo getByUserId(long userId) {
+        return get("user_info_id", userId);
+    }
+
+}
\ No newline at end of file
diff --git a/server/server-service/src/main/java/cn/torna/service/dto/UserInfoDTO.java b/server/server-service/src/main/java/cn/torna/service/dto/UserInfoDTO.java
index 5de24c39..ce14dd3e 100644
--- a/server/server-service/src/main/java/cn/torna/service/dto/UserInfoDTO.java
+++ b/server/server-service/src/main/java/cn/torna/service/dto/UserInfoDTO.java
@@ -16,6 +16,8 @@ public class UserInfoDTO {
 
     private String dingdingUserId;
 
+    private String weComMobile;
+
     @JSONField(serializeUsing = IdCodec.class, deserializeUsing = IdCodec.class)
     private Long id;
 
diff --git a/server/server-web/src/main/java/cn/torna/web/controller/user/UserInfoController.java b/server/server-web/src/main/java/cn/torna/web/controller/user/UserInfoController.java
index c03a18d6..19b878a7 100644
--- a/server/server-web/src/main/java/cn/torna/web/controller/user/UserInfoController.java
+++ b/server/server-web/src/main/java/cn/torna/web/controller/user/UserInfoController.java
@@ -2,6 +2,8 @@ package cn.torna.web.controller.user;
 
 import cn.torna.common.bean.Result;
 import cn.torna.common.bean.User;
+import cn.torna.dao.entity.UserWeComInfo;
+import cn.torna.service.UserWeComInfoService;
 import cn.torna.web.config.UserContext;
 import cn.torna.common.exception.BizException;
 import cn.torna.common.util.CopyUtil;
@@ -43,6 +45,9 @@ public class UserInfoController {
     @Autowired
     private UserInfoService userInfoService;
 
+    @Autowired
+    private UserWeComInfoService userWeComInfoService;
+
     @PostMapping("/list")
     public Result<List<UserInfoDTO>> pageUser(@RequestBody UserIdParam param) {
         Query query = Query.build(param);
@@ -66,6 +71,10 @@ public class UserInfoController {
             }
             userInfoDTO.setDingdingNick(nick);
         }
+        UserWeComInfo userWeComInfo = userWeComInfoService.getByUserId(userInfo.getId());
+        if (null != userWeComInfo) {
+            userInfoDTO.setWeComMobile(userWeComInfo.getMobile());
+        }
         return Result.ok(userInfoDTO);
     }
 
@@ -75,6 +84,13 @@ public class UserInfoController {
         UserInfo userInfo = userInfoService.getById(user.getUserId());
         CopyUtil.copyPropertiesIgnoreNull(param, userInfo);
         userInfoService.update(userInfo);
+        // 如果企业微信手机号码不为空
+        if(null != param.getWeComMobile()){
+            UserWeComInfo userWeComInfo = new UserWeComInfo();
+            userWeComInfo.setUserInfoId(userInfo.getId());
+            userWeComInfo.setMobile(param.getWeComMobile());
+            userWeComInfoService.saveOrUpdateIgnoreNull(userWeComInfo);
+        }
         return Result.ok();
     }
 
@@ -88,8 +104,8 @@ public class UserInfoController {
             Query query = new Query()
                     .and(q ->
                             q.like("username", username)
-                            .orLike("nickname", username)
-                            .orLike("email", username)
+                                    .orLike("nickname", username)
+                                    .orLike("email", username)
                     ).orderby("id", Sort.DESC);
             list = userInfoService.list(query);
         }
@@ -99,6 +115,7 @@ public class UserInfoController {
 
     /**
      * 修改密码
+     *
      * @param param
      * @return
      */
diff --git a/server/server-web/src/main/java/cn/torna/web/controller/user/param/UpdateInfoParam.java b/server/server-web/src/main/java/cn/torna/web/controller/user/param/UpdateInfoParam.java
index 57c6849c..08315222 100644
--- a/server/server-web/src/main/java/cn/torna/web/controller/user/param/UpdateInfoParam.java
+++ b/server/server-web/src/main/java/cn/torna/web/controller/user/param/UpdateInfoParam.java
@@ -14,5 +14,9 @@ public class UpdateInfoParam {
     private String nickname;
 
     private String email;
+    /**
+     * 企业微信绑定的手机号码
+     */
+    private String weComMobile;
 
 }
-- 
Gitee