From 7961ebdf7546e4908dabb8955572b902fe6f0615 Mon Sep 17 00:00:00 2001
From: liuwei <liuwei@wdtrgf.com.cn>
Date: Tue, 22 Apr 2025 17:00:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B6=88=E6=81=AF=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gewechat/call_back_message/message.py   | 33 +++++++++++++++++++------
 gewechat/client/get_chatroom_members.py | 25 +++++++++++++++++++
 2 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 gewechat/client/get_chatroom_members.py

diff --git a/gewechat/call_back_message/message.py b/gewechat/call_back_message/message.py
index d638e37..f5886bd 100644
--- a/gewechat/call_back_message/message.py
+++ b/gewechat/call_back_message/message.py
@@ -163,24 +163,41 @@ class WxMessage:
         """从JSON数据创建消息对象"""
         data = json_data.get("Data", {})
         to_user = data.get("ToUserName", {}).get("string", "")
+        from_user = data.get("FromUserName", {}).get("string", "")
 
-        # 获取原始内容和发信人
+        # 获取原始内容
         content_str = data.get("Content", {}).get("string", "")
-        sender = data.get("FromUserName", {}).get("string", "")
-
+        
+        # 判断是否是群聊消息
+        is_group_chat = from_user.endswith("@chatroom")
+        
+        # 如果是群聊消息，需要调整发送者和接收者
+        actual_sender = from_user
+        if is_group_chat and content_str:
+            # 从消息内容中提取真正的发送人
+            # 简化逻辑：直接通过冒号分割获取发送人
+            parts = content_str.split(':', 1)  # 只分割第一个冒号
+            if len(parts) > 1:
+                # 提取发送人ID（冒号前的部分）
+                potential_sender = parts[0].strip()
+                if potential_sender:  # 确保发送人ID不为空
+                    actual_sender = potential_sender
+                    # 群聊消息中，接收者是群ID
+                    to_user = from_user
+        
         # 创建MessageContent对象时传入发信人信息
-        message_content = MessageContent(content_str, sender=sender)
+        message_content = MessageContent(content_str, sender=actual_sender)
 
         return cls(
             type_name=json_data.get("TypeName", ""),
             appid=json_data.get("Appid", ""),
             wxid=json_data.get("Wxid", ""),
             msg_id=data.get("MsgId", 0),
-            sender=sender,
-            to_user=to_user,
-            roomid=to_user if to_user.endswith("@chatroom") else "",
+            sender=actual_sender,  # 使用提取出的实际发送人
+            to_user=to_user,  # 群聊时，接收者为群ID
+            roomid=from_user if is_group_chat else "",  # 如果是群聊，roomid就是from_user
             msg_type=MessageType(data.get("MsgType", 0)),
-            content=message_content,  # 使用包含发信人信息的MessageContent
+            content=message_content,
             create_time=data.get("CreateTime", 0),
             push_content=data.get("PushContent"),
             new_msg_id=data.get("NewMsgId", 0),
diff --git a/gewechat/client/get_chatroom_members.py b/gewechat/client/get_chatroom_members.py
new file mode 100644
index 0000000..d7813ea
--- /dev/null
+++ b/gewechat/client/get_chatroom_members.py
@@ -0,0 +1,25 @@
+import requests
+import json
+
+
+def get_chatroom_members():
+    url = "/group/getChatroomMemberList"
+
+    base_url = "http://192.168.2.240:2531/v2/api"
+    payload = json.dumps({
+        "appId": "wx_3BC6eSHGE5xEm_hH3__7c",
+        "chatroomId": "52418238895@chatroom"
+
+    })
+    headers = {
+        'X-GEWE-TOKEN': 'cb43f52db27e4a56bb6ec7da54373582',
+        'Content-Type': 'application/json'
+    }
+
+    response = requests.request("POST", base_url + url, headers=headers, data=payload)
+
+    print(response.text)
+
+
+if __name__ == '__main__':
+    get_chatroom_members()
\ No newline at end of file