From b53d52b5fbd7b03f190d4f8614b081bfcc079c74 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Tue, 11 Apr 2023 09:42:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF--=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E5=BA=93=E8=BD=AC=E5=8F=91=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BussDocumentLibraryEOServiceImpl.java     | 28 ++++++++++++-------
 .../feishu/enums/TemplateInfoEnum2.java       |  2 +-
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 45d144656..29c44d722 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -5669,18 +5669,26 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                         list.add(serialNumber);
                     }
                 });
-                String contentTemp = sysUser.getUsername() + " shared " + StringUtils.join(list, ",") + " with you, please be reminded to check it out.";
-                String contentTempCn = sysUser.getUsername() + "向您分享了" + StringUtils.join(list, ",") + "请查看.";
-                FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
-                feishuMsgVo.setTitle(MessageTypeEnum.PUSH.getNameCn()+"/"+MessageTypeEnum.PUSH.getName());
-                feishuMsgVo.setUrl(encode);
-                feishuMsgVo.setContentEn(contentTemp);
-                feishuMsgVo.setContent(contentTempCn);
-
-                iFeishuService.sendCardMsgTerritory(thirdIdList.toArray(new String[]{}),feishuMsgVo);
+                String contentTemp = sysUser.getUsername() + " shared " + StringUtils.join(list, ",") + " with you, Please be reminded to check it out.";
+                String contentTempCn = sysUser.getUsername() + "向您分享了" + StringUtils.join(list, ",") + "，请查看。";
+//                FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
+//                feishuMsgVo.setTitle(MessageTypeEnum.PUSH.getNameCn()+"/"+MessageTypeEnum.PUSH.getName());
+//                feishuMsgVo.setUrl(encode);
+//                feishuMsgVo.setContentEn(contentTemp);
+//                feishuMsgVo.setContent(contentTempCn);
+//                iFeishuService.sendCardMsgTerritory(thirdIdList.toArray(new String[]{}),feishuMsgVo);
 //                iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentTemp, MessageTypeEnum.PUSH.getName(), encode);
+                //飞书消息（模板-20230410）
+                Map<String,Object> params = new HashMap<>();
+                params.put("contentInfoFeiCn",contentTempCn);
+                params.put("contentInfoFeiEn",contentTemp);
+                params.put("userIdList",userIdList);
+                params.put("back_url",encode);
+                params.put("titleCn",TemplateInfoEnum2.TRANSPOND_PUSH.getNameCn());
+                params.put("titleEn",TemplateInfoEnum2.TRANSPOND_PUSH.getNameEn());
+                iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params);
             }
-        } catch (IOException e) {
+        } catch (Exception e) {
             log.error("飞书推送失败");
         }
         sendWebsocket(documentIds, contentInfo);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java
index d783246d8..f49b4d5a7 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/feishu/enums/TemplateInfoEnum2.java
@@ -75,7 +75,7 @@ public enum TemplateInfoEnum2 {
     /**
      * 转发推送
      */
-    TRANSPOND_PUSH("转发推送","ctp_AArfkau1GRMZ","Share / Forward"),
+    TRANSPOND_PUSH("转发推送","","Share / Forward"),