From 5bf8d371c5c5d784f792720f7574946c3180753d Mon Sep 17 00:00:00 2001
From: chandler <1915724901@qq.com>
Date: Sat, 3 May 2025 20:14:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(0):=20[wcf-bmc]-=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6open-msg-groups=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=8F=96=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wechat/ferry/service/impl/WeChatMsgServiceImpl.java  | 6 ++++--
 clients/java/wcf-bmc/src/main/resources/application.yml  | 9 +++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/clients/java/wcf-bmc/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java b/clients/java/wcf-bmc/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java
index ff4aa7b..7ea128a 100644
--- a/clients/java/wcf-bmc/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java
+++ b/clients/java/wcf-bmc/src/main/java/com/wechat/ferry/service/impl/WeChatMsgServiceImpl.java
@@ -2,7 +2,7 @@ package com.wechat.ferry.service.impl;
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -45,7 +45,7 @@ public class WeChatMsgServiceImpl implements WeChatMsgService {
         WxPpMsgDTO dto = JSON.parseObject(jsonString, WxPpMsgDTO.class);
         // 有开启的群聊配置
         if (weChatFerryProperties.getOpenMsgGroupSwitch() && !weChatFerryProperties.getOpenMsgGroups().isEmpty()) {
-            Map<String, List<String>> openMsgGroupMap = new HashMap<>();
+            Map<String, List<String>> openMsgGroupMap = new LinkedHashMap<>();
             String allFnNoStr = "";
             List<String> allFnNoList = new ArrayList<>();
             if (weChatFerryProperties.getOpenMsgGroups().containsKey("ALL")) {
@@ -79,6 +79,7 @@ public class WeChatMsgServiceImpl implements WeChatMsgService {
 
             // 指定处理的群聊
             if (!openMsgGroupMap.isEmpty()) {
+                log.debug("[收到消息后处理]-[汇总后的所有功能]-openMsgGroupMap：{}", openMsgGroupMap);
                 List<String> fnNoList = new ArrayList<>();
                 // 先执行所有群都需要执行的
                 if (openMsgGroupMap.containsKey("ALL")) {
@@ -90,6 +91,7 @@ public class WeChatMsgServiceImpl implements WeChatMsgService {
                 }
                 // 需要执行的策略
                 if (!CollectionUtils.isEmpty(fnNoList)) {
+                    log.debug("[收到消息后处理]-[汇总后的单群功能]-fnNoList：{}，群号：{}", fnNoList, dto.getRoomId());
                     for (String no : fnNoList) {
                         // 根据功能号获取对应的策略
                         ReceiveMsgStrategy receiveMsgStrategy = ReceiveMsgFactory.getStrategy(no);
diff --git a/clients/java/wcf-bmc/src/main/resources/application.yml b/clients/java/wcf-bmc/src/main/resources/application.yml
index cfa39ee..82f0c0b 100644
--- a/clients/java/wcf-bmc/src/main/resources/application.yml
+++ b/clients/java/wcf-bmc/src/main/resources/application.yml
@@ -35,12 +35,13 @@ wechat:
     contacts-type-official:
       - weixinguanhaozhushou|微信公众平台
     # 接收消息回调开关
-    open-msg-group-switch: false
+    open-msg-group-switch: true
     # 需要开启消息处理的群
     open-msg-groups:
-      # key:群编号 val:开启的功能号,对应ReceiveMsgChannelEnum枚举中的code
-      ALL: '1'
-      53257911730@chatroom: '1,2'
+      # key:"[群编号]" val:开启的功能号,对应ReceiveMsgChannelEnum枚举中的code
+      "[ALL]": '0,1'
+      "[53257911730@chatroom]": '0,2,3'
+      "[50501762866@chatroom]": '0,3'
     # 接收消息回调开关
     receive-msg-callback-switch: false
     # 接收消息回调地址