重大版本调整：gewechat兼容。

gewechat/api/callback.py

@@ -0,0 +1,122 @@
+from fastapi import APIRouter, Request
+from gewechat.call_back_message.message import WxMessage, MessageType, AppMessageType
+import logging
+
+from robot import Robot
+
+router = APIRouter()
+logger = logging.getLogger(__name__)
+
+# 存储Robot实例的字典，以appid为键
+robot_instances = {}
+
+
+def register_robot(appid, robot_instance):
+    """注册Robot实例"""
+    robot_instances[appid] = robot_instance
+    logger.info(f"已注册appid为{appid}的Robot实例")
+
+
+@router.post("/gewechat/callback")
+async def callback(request: Request):
+    """接收微信消息回调"""
+    try:
+        # 获取原始JSON数据
+        json_data = await request.json()
+
+        # 创建消息对象
+        msg = WxMessage.from_json(json_data)
+
+        # 根据消息类型处理
+        if msg.type_name == "AddMsg":
+            await handle_add_message(msg)
+        elif msg.type_name == "ModContacts":
+            await handle_mod_contacts(msg)
+        elif msg.type_name == "DelContacts":
+            await handle_del_contacts(msg)
+        elif msg.type_name == "Offline":
+            await handle_offline(msg)
+
+        return {"code": 0, "message": "success"}
+
+    except Exception as e:
+        logger.error(f"处理回调消息失败: {str(e)}", exc_info=True)
+        return {"code": -1, "message": f"处理失败: {str(e)}"}
+
+
+async def handle_add_message(msg: WxMessage):
+    """处理新消息"""
+    try:
+        # 获取对应的Robot实例
+        robot: Robot = robot_instances.get(msg.appid)
+        if robot:
+            # 调用Robot的onMsg方法处理消息
+            robot.onMsg(msg)
+        else:
+            logger.warning(f"未找到appid为{msg.appid}的Robot实例")
+
+    except Exception as e:
+        logger.error(f"处理新消息失败: {str(e)}", exc_info=True)
+        raise
+
+
+async def handle_mod_contacts(msg: WxMessage):
+    """处理联系人变更"""
+    logger.info(f"联系人信息变更: {msg.raw_data}")
+    # 获取对应的Robot实例并刷新联系人
+    robot = robot_instances.get(msg.appid)
+    if robot:
+        robot.refresh_contacts()
+
+
+async def handle_del_contacts(msg: WxMessage):
+    """处理联系人删除"""
+    logger.info(f"联系人被删除: {msg.raw_data}")
+    # 获取对应的Robot实例并刷新联系人
+    robot = robot_instances.get(msg.appid)
+    if robot:
+        robot.refresh_contacts()
+
+
+async def handle_offline(msg: WxMessage):
+    """处理离线通知"""
+    logger.info(f"账号离线: {msg.wxid}")
+    # 可以在这里处理账号离线逻辑
+
+
+async def handle_text_message(msg: WxMessage):
+    """处理文本消息"""
+    logger.info(f"收到文本消息: {msg.content.raw_content}")
+    # TODO: 实现文本消息处理逻辑
+
+
+async def handle_image_message(msg: WxMessage):
+    """处理图片消息"""
+    image_content = msg.get_image_content()
+    if image_content:
+        logger.info(f"收到图片消息: {image_content.url}")
+    # TODO: 实现图片消息处理逻辑
+
+
+async def handle_app_message(msg: WxMessage):
+    """处理应用消息"""
+    app_type = msg.get_app_message_type()
+    if app_type == AppMessageType.LINK:
+        logger.info("收到链接消息")
+    elif app_type == AppMessageType.FILE:
+        logger.info("收到文件消息")
+    elif app_type == AppMessageType.MINIPROGRAM:
+        logger.info("收到小程序消息")
+    # TODO: 实现应用消息处理逻辑
+
+
+async def handle_system_message(msg: WxMessage):
+    """处理系统消息"""
+    logger.info(f"收到系统消息: {msg.content.raw_content}")
+    # TODO: 实现系统消息处理逻辑
+
+
+async def handle_system_notify(msg: WxMessage):
+    """处理系统通知"""
+    logger.info(f"收到系统通知: {msg.content.raw_content}")
+    # TODO: 实现系统通知处理逻辑

gewechat/api/start_server.py

@@ -0,0 +1,85 @@
+import threading
+import logging
+import socket
+import uvicorn
+from fastapi import FastAPI
+
+from gewechat.api.callback import router as callback_router
+
+# 配置日志
+logger = logging.getLogger(__name__)
+
+def is_port_in_use(port, host='0.0.0.0'):
+    """检查端口是否被占用"""
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        try:
+            s.bind((host, port))
+            return False
+        except socket.error:
+            return True
+
+def start_fastapi_server(host="0.0.0.0", port=8999):
+    """启动FastAPI服务器"""
+    # 检查端口是否被占用
+    if is_port_in_use(port, host):
+        logger.warning(f"端口 {port} 已被占用，尝试使用其他端口")
+        # 尝试其他端口
+        for test_port in range(9000, 9100):
+            if not is_port_in_use(test_port, host):
+                port = test_port
+                break
+        else:
+            logger.error("无法找到可用端口，服务器启动失败")
+            return False
+    
+    try:
+        app = FastAPI()
+        app.include_router(callback_router)
+        
+        # 添加健康检查路由
+        @app.get("/health")
+        async def health_check():
+            return {"status": "ok"}
+        
+        logger.info(f"正在启动FastAPI服务器，地址: http://{host}:{port}")
+        
+        # 使用线程启动uvicorn服务器
+        server_thread = threading.Thread(
+            target=uvicorn.run,
+            args=(app,),
+            kwargs={"host": host, "port": port, "log_level": "info"},
+            daemon=True
+        )
+        server_thread.start()
+        logger.info(f"FastAPI 服务已在 http://{host}:{port} 启动")
+        logger.info(f"回调URL: http://{host}:{port}/gewechat/callback")
+        
+        # 返回启动的端口，以便调用者知道实际使用的端口
+        return port
+    except Exception as e:
+        logger.error(f"启动FastAPI服务器失败: {e}", exc_info=True)
+        return False
+
+if __name__ == '__main__':
+    # 配置日志
+    logging.basicConfig(
+        level=logging.INFO,
+        format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+    )
+    
+    # 启动服务器
+    port = start_fastapi_server()
+    if port:
+        print(f"服务器启动成功，端口: {port}")
+        print(f"回调URL: http://localhost:{port}/gewechat/callback")
+        print(f"健康检查URL: http://localhost:{port}/health")
+        
+        # 保持主线程运行
+        try:
+            import time
+            while True:
+                time.sleep(1)
+        except KeyboardInterrupt:
+            print("服务器已停止")
+    else:
+        print("服务器启动失败")

gewechat/call_back_message/message.py

@@ -0,0 +1,299 @@
+from dataclasses import dataclass
+from typing import Optional, Dict, Any
+from enum import Enum
+import xml.etree.ElementTree as ET
+import json
+
+
+class MessageType(Enum):
+    """消息类型枚举"""
+    TEXT = 1  # 文本消息
+    IMAGE = 3  # 图片消息
+    VOICE = 34  # 语音消息
+    VIDEO = 43  # 视频消息
+    EMOJI = 47  # emoji表情
+    LOCATION = 48  # 地理位置
+    APP = 49  # 应用消息(链接、文件、小程序等)
+    SYSTEM = 10000  # 系统消息
+    SYSTEM_NOTIFY = 10002  # 系统通知
+
+
+class AppMessageType(Enum):
+    """应用消息类型枚举"""
+    LINK = 5  # 链接消息
+    FILE = 6  # 文件消息
+    FILE_NOTICE = 74  # 文件上传通知
+    MINIPROGRAM = 33  # 小程序消息
+    QUOTE = 57  # 引用消息
+    TRANSFER = 2000  # 转账消息
+    RED_PACKET = 2001  # 红包消息
+    CHANNELS = 51  # 视频号消息
+
+
+@dataclass
+class MessageContent:
+    """消息内容"""
+    raw_content: str  # 原始内容
+    xml_content: Optional[ET.Element] = None  # XML内容(如果有)
+
+    def __post_init__(self):
+        """处理XML内容"""
+        if self.raw_content.startswith('<?xml') or self.raw_content.startswith('<msg'):
+            try:
+                self.xml_content = ET.fromstring(self.raw_content)
+            except ET.ParseError:
+                self.xml_content = None
+
+
+@dataclass
+class ImageContent:
+    """图片消息特定内容"""
+    aes_key: str
+    url: str
+    length: int
+    md5: str
+    thumb_base64: Optional[str] = None
+
+
+@dataclass
+class VoiceContent:
+    """语音消息特定内容"""
+    voice_length: int
+    aes_key: str
+    url: str
+    voice_base64: Optional[str] = None
+
+
+@dataclass
+class VideoContent:
+    """视频消息特定内容"""
+    aes_key: str
+    video_url: str
+    thumb_url: str
+    length: int
+    play_length: int
+
+
+@dataclass
+class LocationContent:
+    """地理位置特定内容"""
+    x: float  # 纬度
+    y: float  # 经度
+    label: str  # 地址标签
+    poi_name: Optional[str] = None  # 地点名称
+
+
+@dataclass
+class WxMessage:
+    """消息基础类"""
+    type_name: str
+    appid: str
+    wxid: str
+    msg_id: int
+    sender: str
+    to_user: str
+    roomid: str  # 新增room_id属性
+    msg_type: MessageType
+    content: MessageContent
+    create_time: int
+    push_content: Optional[str]
+    new_msg_id: int
+    msg_seq: int
+    msg_source: str
+    raw_data: Dict[str, Any]  # 原始JSON数据
+
+    @classmethod
+    def from_json(cls, json_data: Dict[str, Any]) -> 'WxMessage':
+        """从JSON数据创建消息对象"""
+        data = json_data.get("Data", {})
+        to_user = data.get("ToUserName", {}).get("string", "")
+
+        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=data.get("FromUserName", {}).get("string", ""),
+            to_user=to_user,
+            roomid=to_user if to_user.endswith("@chatroom") else "",  # 设置room_id
+            msg_type=MessageType(data.get("MsgType", 0)),
+            content=MessageContent(data.get("Content", {}).get("string", "")),
+            create_time=data.get("CreateTime", 0),
+            push_content=data.get("PushContent"),
+            new_msg_id=data.get("NewMsgId", 0),
+            msg_seq=data.get("MsgSeq", 0),
+            msg_source=data.get("MsgSource", ""),
+            raw_data=json_data
+        )
+
+    def __str__(self) -> str:
+        """返回消息的字符串表示，用于打印和日志"""
+        # 获取消息类型的名称
+        msg_type_name = self.msg_type.name if self.msg_type else "UNKNOWN"
+        
+        # 处理不同类型的消息内容
+        content_str = ""
+        if self.msg_type == MessageType.TEXT:
+            # 文本消息直接显示内容
+            content_str = self.content.raw_content
+        elif self.msg_type == MessageType.IMAGE:
+            # 图片消息显示图片信息
+            img_content = self.get_image_content()
+            if img_content:
+                content_str = f"[图片] 大小: {img_content.length}字节, MD5: {img_content.md5}"
+            else:
+                content_str = "[图片]"
+        elif self.msg_type == MessageType.VOICE:
+            # 语音消息显示语音信息
+            voice_content = self.get_voice_content()
+            if voice_content:
+                content_str = f"[语音] 长度: {voice_content.voice_length}ms"
+            else:
+                content_str = "[语音]"
+        elif self.msg_type == MessageType.VIDEO:
+            # 视频消息显示视频信息
+            video_content = self.get_video_content()
+            if video_content:
+                content_str = f"[视频] 长度: {video_content.play_length}ms, 大小: {video_content.length}字节"
+            else:
+                content_str = "[视频]"
+        elif self.msg_type == MessageType.LOCATION:
+            # 位置消息显示位置信息
+            location_content = self.get_location_content()
+            if location_content:
+                content_str = f"[位置] {location_content.label}"
+            else:
+                content_str = "[位置]"
+        elif self.msg_type == MessageType.APP:
+            # 应用消息显示应用类型
+            app_type = self.get_app_message_type()
+            if app_type:
+                content_str = f"[应用消息] 类型: {app_type.name}"
+            else:
+                content_str = "[应用消息]"
+        elif self.msg_type == MessageType.EMOJI:
+            content_str = "[表情]"
+        elif self.msg_type == MessageType.SYSTEM:
+            content_str = f"[系统消息] {self.content.raw_content}"
+        elif self.msg_type == MessageType.SYSTEM_NOTIFY:
+            content_str = f"[系统通知] {self.content.raw_content}"
+        else:
+            # 其他类型消息
+            content_str = f"[未知类型消息] {self.content.raw_content[:30]}..."
+        
+        # 限制内容长度，避免过长
+        if len(content_str) > 100:
+            content_str = content_str[:97] + "..."
+        
+        # 构建基本信息
+        from_info = f"发送者: {self.sender}"
+        to_info = f"接收者: {self.to_user}"
+        
+        # 如果是群消息，添加群信息
+        group_info = ""
+        if self.from_group():
+            group_info = f"群聊: {self.roomid}, "
+        
+        # 构建完整的消息字符串
+        return (f"WxMessage[ID: {self.msg_id}, 类型: {msg_type_name}, "
+                f"{group_info}{from_info}, {to_info}, "
+                f"内容: {content_str}]")
+    
+    def __repr__(self) -> str:
+        """返回消息的详细表示，用于调试"""
+        return self.__str__()
+
+    def from_self(self) -> bool:
+        """判断是否是自己发送的消息"""
+        return self.sender == self.wxid
+
+    def from_group(self) -> bool:
+        return self.to_user.endswith("@chatroom")
+
+    def get_app_message_type(self) -> Optional[AppMessageType]:
+        """获取应用消息类型"""
+        if self.msg_type != MessageType.APP or not self.content.xml_content:
+            return None
+
+        try:
+            appmsg = self.content.xml_content.find('.//appmsg')
+            if appmsg is not None:
+                type_value = int(appmsg.find('type').text)
+                return AppMessageType(type_value)
+        except (AttributeError, ValueError):
+            pass
+        return None
+
+    def get_image_content(self) -> Optional[ImageContent]:
+        """获取图片消息内容"""
+        if self.msg_type != MessageType.IMAGE or not self.content.xml_content:
+            return None
+
+        try:
+            img = self.content.xml_content.find('img')
+            if img is not None:
+                return ImageContent(
+                    aes_key=img.get('aeskey', ''),
+                    url=img.get('cdnthumburl', ''),
+                    length=int(img.get('length', 0)),
+                    md5=img.get('md5', ''),
+                    thumb_base64=self.raw_data.get("Data", {}).get("ImgBuf", {}).get("buffer")
+                )
+        except (AttributeError, ValueError):
+            pass
+        return None
+
+    def get_voice_content(self) -> Optional[VoiceContent]:
+        """获取语音消息内容"""
+        if self.msg_type != MessageType.VOICE or not self.content.xml_content:
+            return None
+
+        try:
+            voice = self.content.xml_content.find('.//voicemsg')
+            if voice is not None:
+                return VoiceContent(
+                    voice_length=int(voice.get('voicelength', 0)),
+                    aes_key=voice.get('aeskey', ''),
+                    url=voice.get('voiceurl', ''),
+                    voice_base64=self.raw_data.get("Data", {}).get("ImgBuf", {}).get("buffer")
+                )
+        except (AttributeError, ValueError):
+            pass
+        return None
+
+    def get_video_content(self) -> Optional[VideoContent]:
+        """获取视频消息内容"""
+        if self.msg_type != MessageType.VIDEO or not self.content.xml_content:
+            return None
+
+        try:
+            video = self.content.xml_content.find('.//videomsg')
+            if video is not None:
+                return VideoContent(
+                    aes_key=video.get('aeskey', ''),
+                    video_url=video.get('cdnvideourl', ''),
+                    thumb_url=video.get('cdnthumburl', ''),
+                    length=int(video.get('length', 0)),
+                    play_length=int(video.get('playlength', 0))
+                )
+        except (AttributeError, ValueError):
+            pass
+        return None
+
+    def get_location_content(self) -> Optional[LocationContent]:
+        """获取地理位置内容"""
+        if self.msg_type != MessageType.LOCATION or not self.content.xml_content:
+            return None
+
+        try:
+            location = self.content.xml_content.find('location')
+            if location is not None:
+                return LocationContent(
+                    x=float(location.get('x', 0)),
+                    y=float(location.get('y', 0)),
+                    label=location.get('label', ''),
+                    poi_name=location.get('poiname')
+                )
+        except (AttributeError, ValueError):
+            pass
+        return None

gewechat/client/get_token.py

@@ -0,0 +1,10 @@
+import requests
+
+url = "/tools/getTokenId"
+
+payload={}
+headers = {}
+base_url="http://192.168.2.240:2531/v2/api"
+response = requests.request("POST",  base_url+url, headers=headers, data=payload)
+
+print(response.text)

gewechat/client/login.py

@@ -0,0 +1,12 @@
+
+import requests
+def login():
+
+    url = "/tools/getTokenId"
+
+    payload = {}
+    headers = {}
+    base_url = "http://192.168.2.240:2531/v2/api"
+    response = requests.request("POST", base_url + url, headers=headers, data=payload)
+
+    print(response.text)