Merge pull request #2571 from 6vision/master

update readme and adjust some dependency packages.
update
2026-06-02 09:48:22 +08:00 · 2025-04-11 16:04:55 +08:00 · 2025-04-11 16:03:22 +08:00 · 2025-04-11 15:50:28 +08:00 · 2025-04-11 14:14:55 +08:00 · 2025-04-11 10:23:05 +08:00
57 changed files with 1918 additions and 200 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ tmp
 plugins.json
 itchat.pkl
 *.log
+logs/
 user_datas.pkl
 chatgpt_tool_hub/
 plugins/**/
--- a/README.md
+++ b/README.md
@@ -1,11 +1,19 @@
-# 简介
+<p align="center"><img src= "https://github.com/user-attachments/assets/31fb4eab-3be4-477d-aa76-82cf62bfd12c" alt="Chatgpt-on-Wechat" width="600" /></p>

-> chatgpt-on-wechat（简称CoW）项目是基于大模型的智能对话机器人，支持微信公众号、企业微信应用、飞书、钉钉接入，可选择GPT3.5/GPT4.0/Claude/Gemini/LinkAI/ChatGLM/KIMI/文心一言/讯飞星火/通义千问/LinkAI，能处理文本、语音和图片，通过插件访问操作系统和互联网等外部资源，支持基于自有知识库定制企业AI应用。
+<p align="center">
+   <a href="https://github.com/zhayujie/chatgpt-on-wechat/releases/latest"><img src="https://img.shields.io/github/v/release/zhayujie/chatgpt-on-wechat" alt="Latest release"></a>
+  <a href="https://github.com/zhayujie/chatgpt-on-wechat/blob/master/LICENSE"><img src="https://img.shields.io/github/license/zhayujie/chatgpt-on-wechat" alt="License: MIT"></a>
+  <a href="https://github.com/zhayujie/chatgpt-on-wechat"><img src="https://img.shields.io/github/stars/zhayujie/chatgpt-on-wechat?style=flat-square" alt="Stars"></a> <br/>
+</p>
+
+chatgpt-on-wechat（简称CoW）项目是基于大模型的智能对话机器人，支持微信公众号、企业微信应用、飞书、钉钉接入，可选择GPT3.5/GPT4.0/Claude/Gemini/LinkAI/ChatGLM/KIMI/文心一言/讯飞星火/通义千问/LinkAI/ModelScope，能处理文本、语音和图片，通过插件访问操作系统和互联网等外部资源，支持基于自有知识库定制企业AI应用。
+
+# 简介

 最新版本支持的功能如下：

 -  ✅   **多端部署：** 有多种部署方式可选择且功能完备，目前已支持微信公众号、企业微信应用、飞书、钉钉等部署方式
-  ✅   **基础对话：** 私聊及群聊的消息智能回复，支持多轮会话上下文记忆，支持 GPT-3.5, GPT-4, GPT-4o, Claude-3, Gemini, 文心一言, 讯飞星火, 通义千问，ChatGLM-4，Kimi(月之暗面), MiniMax
+-  ✅   **基础对话：** 私聊及群聊的消息智能回复，支持多轮会话上下文记忆，支持 GPT-3.5, GPT-4o-mini, GPT-4o,  GPT-4, Claude-3.5, Gemini, 文心一言, 讯飞星火, 通义千问，ChatGLM-4，Kimi(月之暗面), MiniMax, GiteeAI, ModelScope(魔搭社区)
 -  ✅   **语音能力：** 可识别语音消息，通过文字或语音回复，支持 azure, baidu, google, openai(whisper/tts) 等多种语音模型
 -  ✅   **图像能力：** 支持图片生成、图片识别、图生图（如照片修复），可选择 Dall-E-3, stable diffusion, replicate, midjourney, CogView-3, vision模型
 -  ✅   **丰富插件：** 支持个性化插件扩展，已实现多角色切换、文字冒险、敏感词过滤、聊天记录总结、文档总结和对话、联网搜索等插件
@@ -18,6 +26,10 @@
 3. 本项目主要接入协同办公平台，推荐使用公众号、企微自建应用、钉钉、飞书等接入通道，其他通道为历史产物已不维护
 4. 任何个人、团队和企业，无论以何种方式使用该项目、对何对象提供服务，所产生的一切后果，本项目均不承担任何责任

+## 演示
+
+DEMO视频：https://cdn.link-ai.tech/doc/cow_demo.mp4
+
 ## 社区

 添加小助手微信加入开源项目交流群：
@@ -36,14 +48,25 @@

 **企业服务和产品咨询** 可联系产品顾问：

-<img width="160" src="https://img-1317903499.cos.ap-guangzhou.myqcloud.com/docs/github-product-consult.png">
+<img width="160" src="https://cdn.link-ai.tech/consultant-s.jpg">

 <br>

 # 🏷 更新日志
+>**2025.04.11：** [1.7.5版本](https://github.com/zhayujie/chatgpt-on-wechat/releases/tag/1.7.5) 新增支持 [wechatferry](https://github.com/zhayujie/chatgpt-on-wechat/pull/2562) 协议、新增 deepseek 模型、新增支持腾讯云语音能力、新增支持 ModelScope 和 Gitee-AI API接口
+
+>**2024.12.13：** [1.7.4版本](https://github.com/zhayujie/chatgpt-on-wechat/releases/tag/1.7.4) 新增 Gemini 2.0 模型、新增web channel、解决内存泄漏问题、解决 `#reloadp` 命令重载不生效问题
+
+>**2024.10.31：** [1.7.3版本](https://github.com/zhayujie/chatgpt-on-wechat/releases/tag/1.7.3) 程序稳定性提升、数据库功能、Claude模型优化、linkai插件优化、离线通知
+
+>**2024.09.26：** [1.7.2版本](https://github.com/zhayujie/chatgpt-on-wechat/releases/tag/1.7.2)  和 [1.7.1版本](https://github.com/zhayujie/chatgpt-on-wechat/releases/tag/1.7.1) 文心，讯飞等模型优化、o1 模型、快速安装和管理脚本
+
+>**2024.08.02：** [1.7.0版本](https://github.com/zhayujie/chatgpt-on-wechat/releases/tag/1.7.0) 新增 讯飞4.0 模型、知识库引用来源展示、相关插件优化
+
+>**2024.07.19：** [1.6.9版本](https://github.com/zhayujie/chatgpt-on-wechat/releases/tag/1.6.9) 新增 gpt-4o-mini 模型、阿里语音识别、企微应用渠道路由优化
+
+>**2024.07.05：** [1.6.8版本](https://github.com/zhayujie/chatgpt-on-wechat/releases/tag/1.6.8) 和 [1.6.7版本](https://github.com/zhayujie/chatgpt-on-wechat/releases/tag/1.6.7)，Claude3.5, Gemini 1.5 Pro, MiniMax模型、工作流图片输入、模型列表完善

->**2024.06.20：** [1.6.7版本](https://github.com/zhayujie/chatgpt-on-wechat/releases/tag/1.6.7)，MiniMax模型、工作流图片输入、模型列表完善
->
 >**2024.06.04：** [1.6.6版本](https://github.com/zhayujie/chatgpt-on-wechat/releases/tag/1.6.6) 和 [1.6.5版本](https://github.com/zhayujie/chatgpt-on-wechat/releases/tag/1.6.5)，gpt-4o模型、钉钉流式卡片、讯飞语音识别/合成

 >**2024.04.26：** [1.6.0版本](https://github.com/zhayujie/chatgpt-on-wechat/releases/tag/1.6.0)，新增 Kimi 接入、gpt-4-turbo版本升级、文件总结和语音识别问题修复
@@ -72,8 +95,13 @@

 # 🚀 快速开始

-快速开始详细文档：[项目搭建文档](https://docs.link-ai.tech/cow/quick-start)
+- 快速开始详细文档：[项目搭建文档](https://docs.link-ai.tech/cow/quick-start)

+- 快速安装脚本，详细使用指导：[一键安装启动脚本](https://github.com/zhayujie/chatgpt-on-wechat/wiki/%E4%B8%80%E9%94%AE%E5%AE%89%E8%A3%85%E5%90%AF%E5%8A%A8%E8%84%9A%E6%9C%AC)
+```bash
+bash <(curl -sS https://cdn.link-ai.tech/code/cow/install.sh)
+```
+- 项目管理脚本，详细使用指导：[项目管理脚本](https://github.com/zhayujie/chatgpt-on-wechat/wiki/%E9%A1%B9%E7%9B%AE%E7%AE%A1%E7%90%86%E8%84%9A%E6%9C%AC)
 ## 一、准备

 ### 1. 账号注册
@@ -128,6 +156,7 @@ pip3 install -r requirements-optional.txt
 {
  "model": "gpt-3.5-turbo",                                   # 模型名称, 支持 gpt-3.5-turbo, gpt-4, gpt-4-turbo, wenxin, xunfei, glm-4, claude-3-haiku, moonshot
  "open_ai_api_key": "YOUR API KEY",                          # 如果使用openAI模型则填入上面创建的 OpenAI API KEY
+  "open_ai_api_base": "https://api.openai.com/v1",            # OpenAI接口代理地址
  "proxy": "",                                                # 代理客户端的ip和端口，国内环境开启代理的需要填写该项，如 "127.0.0.1:7890"
  "single_chat_prefix": ["bot", "@bot"],                      # 私聊时文本需要包含该前缀才能触发机器人回复
  "single_chat_reply_prefix": "[bot] ",                       # 私聊时自动回复的前缀，用于区分真人
@@ -169,7 +198,7 @@ pip3 install -r requirements-optional.txt

 **4.其他配置**

-+ `model`: 模型名称，目前支持 `gpt-3.5-turbo`, `gpt-4o`, `gpt-4-turbo`, `gpt-4`, `wenxin` , `claude` , `gemini`, `glm-4`,  `xunfei`, `moonshot`等，全部模型名称参考[common/const.py](https://github.com/zhayujie/chatgpt-on-wechat/blob/master/common/const.py)文件
+ `model`: 模型名称，目前支持 `gpt-3.5-turbo`, `gpt-4o-mini`, `gpt-4o`, `gpt-4`, `wenxin` , `claude` , `gemini`, `glm-4`,  `xunfei`, `moonshot`等，全部模型名称参考[common/const.py](https://github.com/zhayujie/chatgpt-on-wechat/blob/master/common/const.py)文件
 + `temperature`,`frequency_penalty`,`presence_penalty`: Chat API接口参数，详情参考[OpenAI官方文档。](https://platform.openai.com/docs/api-reference/chat)
 + `proxy`：由于目前 `openai` 接口国内无法访问，需配置代理客户端的地址，详情参考  [#351](https://github.com/zhayujie/chatgpt-on-wechat/issues/351)
 + 对于图像生成，在满足个人或群组触发条件外，还需要额外的关键词前缀来触发，对应配置 `image_create_prefix `
@@ -259,7 +288,7 @@ sudo docker logs -f chatgpt-on-wechat
 volumes:
  - ./config.json:/app/plugins/config.json
 ```
-
+**注**：采用docker方式部署的详细教程可以参考：[docker部署CoW项目](https://www.wangpc.cc/ai/docker-deploy-cow/)
 ### 4. Railway部署

 > Railway 每月提供5刀和最多500小时的免费额度。 (07.11更新: 目前大部分账号已无法免费部署)
--- a/app.py
+++ b/app.py
@@ -27,7 +27,7 @@ def sigterm_handler_wrap(_signo):

 def start_channel(channel_name: str):
    channel = channel_factory.create_channel(channel_name)
-    if channel_name in ["wx", "wxy", "terminal", "wechatmp", "wechatmp_service", "wechatcom_app", "wework",
+    if channel_name in ["wx", "wxy", "terminal", "wechatmp","web", "wechatmp_service", "wechatcom_app", "wework",
                        const.FEISHU, const.DINGTALK]:
        PluginManager().load_plugins()

--- a/bot/baidu/baidu_wenxin.py
+++ b/bot/baidu/baidu_wenxin.py
@@ -19,6 +19,11 @@ class BaiduWenxinBot(Bot):
    def __init__(self):
        super().__init__()
        wenxin_model = conf().get("baidu_wenxin_model")
+        self.prompt_enabled = conf().get("baidu_wenxin_prompt_enabled")
+        if self.prompt_enabled:
+            self.prompt = conf().get("character_desc", "")
+            if self.prompt == "":
+                logger.warn("[BAIDU] Although you enabled model prompt, character_desc is not specified.")
        if wenxin_model is not None:
            wenxin_model = conf().get("baidu_wenxin_model") or "eb-instant"
        else:
@@ -84,7 +89,7 @@ class BaiduWenxinBot(Bot):
            headers = {
                'Content-Type': 'application/json'
            }
-            payload = {'messages': session.messages}
+            payload = {'messages': session.messages, 'system': self.prompt} if self.prompt_enabled else {'messages': session.messages}
            response = requests.request("POST", url, headers=headers, data=json.dumps(payload))
            response_text = json.loads(response.text)
            logger.info(f"[BAIDU] response text={response_text}")
--- a/bot/bot_factory.py
+++ b/bot/bot_factory.py
@@ -68,5 +68,9 @@ def create_bot(bot_type):
        from bot.minimax.minimax_bot import MinimaxBot
        return MinimaxBot()

+    elif bot_type == const.MODELSCOPE:
+        from bot.modelscope.modelscope_bot import ModelScopeBot
+        return ModelScopeBot()
+

    raise RuntimeError
--- a/bot/chatgpt/chat_gpt_bot.py
+++ b/bot/chatgpt/chat_gpt_bot.py
@@ -5,7 +5,7 @@ import time
 import openai
 import openai.error
 import requests
-
+from common import const
 from bot.bot import Bot
 from bot.chatgpt.chat_gpt_session import ChatGPTSession
 from bot.openai.open_ai_image import OpenAIImage
@@ -15,7 +15,7 @@ from bridge.reply import Reply, ReplyType
 from common.log import logger
 from common.token_bucket import TokenBucket
 from config import conf, load_config
-
+from bot.baidu.baidu_wenxin_session import BaiduWenxinSession

 # OpenAI对话模型API (可用)
 class ChatGPTBot(Bot, OpenAIImage):
@@ -30,10 +30,12 @@ class ChatGPTBot(Bot, OpenAIImage):
            openai.proxy = proxy
        if conf().get("rate_limit_chatgpt"):
            self.tb4chatgpt = TokenBucket(conf().get("rate_limit_chatgpt", 20))
-
+        conf_model = conf().get("model") or "gpt-3.5-turbo"
        self.sessions = SessionManager(ChatGPTSession, model=conf().get("model") or "gpt-3.5-turbo")
+        # o1相关模型不支持system prompt，暂时用文心模型的session
+
        self.args = {
-            "model": conf().get("model") or "gpt-3.5-turbo",  # 对话模型的名称
+            "model": conf_model,  # 对话模型的名称
            "temperature": conf().get("temperature", 0.9),  # 值在[0,1]之间，越大表示回复越具有不确定性
            # "max_tokens":4096,  # 回复最大的字符数
            "top_p": conf().get("top_p", 1),
@@ -42,6 +44,12 @@ class ChatGPTBot(Bot, OpenAIImage):
            "request_timeout": conf().get("request_timeout", None),  # 请求超时时间，openai接口默认设置为600，对于难问题一般需要较长时间
            "timeout": conf().get("request_timeout", None),  # 重试超时时间，在这个时间内，将会自动重试
        }
+        # o1相关模型固定了部分参数，暂时去掉
+        if conf_model in [const.O1, const.O1_MINI]:
+            self.sessions = SessionManager(BaiduWenxinSession, model=conf().get("model") or const.O1_MINI)
+            remove_keys = ["temperature", "top_p", "frequency_penalty", "presence_penalty"]
+            for key in remove_keys:
+                self.args.pop(key, None)  # 如果键不存在，使用 None 来避免抛出错误

    def reply(self, query, context=None):
        # acquire reply content
@@ -208,11 +216,33 @@ class AzureChatGPTBot(ChatGPTBot):
            headers = {"api-key": api_key, "Content-Type": "application/json"}
            try:
                body = {"prompt": query, "size": conf().get("image_create_size", "1024x1024"), "quality": conf().get("dalle3_image_quality", "standard")}
-                submission = requests.post(url, headers=headers, json=body)
-                image_url = submission.json()['data'][0]['url']
-                return True, image_url
+                response = requests.post(url, headers=headers, json=body)
+                response.raise_for_status()  # 检查请求是否成功
+                data = response.json()
+
+                # 检查响应中是否包含图像 URL
+                if 'data' in data and len(data['data']) > 0 and 'url' in data['data'][0]:
+                    image_url = data['data'][0]['url']
+                    return True, image_url
+                else:
+                    error_message = "响应中没有图像 URL"
+                    logger.error(error_message)
+                    return False, "图片生成失败"
+
+            except requests.exceptions.RequestException as e:
+                # 捕获所有请求相关的异常
+                try:
+                    error_detail = response.json().get('error', {}).get('message', str(e))
+                except ValueError:
+                    error_detail = str(e)
+                error_message = f"{error_detail}"
+                logger.error(error_message)
+                return False, error_message
+
            except Exception as e:
-                logger.error("create image error: {}".format(e))
+                # 捕获所有其他异常
+                error_message = f"生成图像时发生错误: {e}"
+                logger.error(error_message)
                return False, "图片生成失败"
        else:
            return False, "图片生成失败，未配置text_to_image参数"
--- a/bot/chatgpt/chat_gpt_session.py
+++ b/bot/chatgpt/chat_gpt_session.py
@@ -57,7 +57,7 @@ class ChatGPTSession(Session):
 def num_tokens_from_messages(messages, model):
    """Returns the number of tokens used by a list of messages."""

-    if model in ["wenxin", "xunfei", const.GEMINI]:
+    if model in ["wenxin", "xunfei"] or model.startswith(const.GEMINI):
        return num_tokens_by_character(messages)

    import tiktoken
@@ -67,7 +67,7 @@ def num_tokens_from_messages(messages, model):
    elif model in ["gpt-4-0314", "gpt-4-0613", "gpt-4-32k", "gpt-4-32k-0613", "gpt-3.5-turbo-0613",
                   "gpt-3.5-turbo-16k", "gpt-3.5-turbo-16k-0613", "gpt-35-turbo-16k", "gpt-4-turbo-preview",
                   "gpt-4-1106-preview", const.GPT4_TURBO_PREVIEW, const.GPT4_VISION_PREVIEW, const.GPT4_TURBO_01_25,
-                   const.GPT_4o, const.LINKAI_4o, const.LINKAI_4_TURBO]:
+                   const.GPT_4o, const.GPT_4O_0806, const.GPT_4o_MINI, const.LINKAI_4o, const.LINKAI_4_TURBO]:
        return num_tokens_from_messages(messages, model="gpt-4")
    elif model.startswith("claude-3"):
        return num_tokens_from_messages(messages, model="gpt-3.5-turbo")
@@ -83,7 +83,7 @@ def num_tokens_from_messages(messages, model):
        tokens_per_message = 3
        tokens_per_name = 1
    else:
-        logger.warn(f"num_tokens_from_messages() is not implemented for model {model}. Returning num tokens assuming gpt-3.5-turbo.")
+        logger.debug(f"num_tokens_from_messages() is not implemented for model {model}. Returning num tokens assuming gpt-3.5-turbo.")
        return num_tokens_from_messages(messages, model="gpt-3.5-turbo")
    num_tokens = 0
    for message in messages:
--- a/bot/claudeapi/claude_api_bot.py
+++ b/bot/claudeapi/claude_api_bot.py
@@ -8,12 +8,12 @@ import anthropic

 from bot.bot import Bot
 from bot.openai.open_ai_image import OpenAIImage
-from bot.chatgpt.chat_gpt_session import ChatGPTSession
-from bot.gemini.google_gemini_bot import GoogleGeminiBot
+from bot.baidu.baidu_wenxin_session import BaiduWenxinSession
 from bot.session_manager import SessionManager
 from bridge.context import ContextType
 from bridge.reply import Reply, ReplyType
 from common.log import logger
+from common import const
 from config import conf

 user_session = dict()
@@ -23,17 +23,14 @@ user_session = dict()
 class ClaudeAPIBot(Bot, OpenAIImage):
    def __init__(self):
        super().__init__()
+        proxy = conf().get("proxy", None)
+        base_url = conf().get("open_ai_api_base", None)  # 复用"open_ai_api_base"参数作为base_url
        self.claudeClient = anthropic.Anthropic(
-            api_key=conf().get("claude_api_key")
+            api_key=conf().get("claude_api_key"),
+            proxies=proxy if proxy else None,
+            base_url=base_url if base_url else None
        )
-        openai.api_key = conf().get("open_ai_api_key")
-        if conf().get("open_ai_api_base"):
-            openai.api_base = conf().get("open_ai_api_base")
-        proxy = conf().get("proxy")
-        if proxy:
-            openai.proxy = proxy
-
-        self.sessions = SessionManager(ChatGPTSession, model=conf().get("model") or "text-davinci-003")
+        self.sessions = SessionManager(BaiduWenxinSession, model=conf().get("model") or "text-davinci-003")

    def reply(self, query, context=None):
        # acquire reply content
@@ -76,14 +73,14 @@ class ClaudeAPIBot(Bot, OpenAIImage):
                    reply = Reply(ReplyType.ERROR, retstring)
                return reply

-    def reply_text(self, session: ChatGPTSession, retry_count=0):
+    def reply_text(self, session: BaiduWenxinSession, retry_count=0):
        try:
            actual_model = self._model_mapping(conf().get("model"))
            response = self.claudeClient.messages.create(
                model=actual_model,
-                max_tokens=1024,
-                # system=conf().get("system"),
-                messages=GoogleGeminiBot.filter_messages(session.messages)
+                max_tokens=4096,
+                system=conf().get("character_desc", ""),
+                messages=session.messages
            )
            # response = openai.Completion.create(prompt=str(session), **self.args)
            res_content = response.content[0].text.strip().replace("<|endoftext|>", "")
@@ -97,7 +94,7 @@ class ClaudeAPIBot(Bot, OpenAIImage):
            }
        except Exception as e:
            need_retry = retry_count < 2
-            result = {"completion_tokens": 0, "content": "我现在有点累了，等会再来吧"}
+            result = {"total_tokens": 0, "completion_tokens": 0, "content": "我现在有点累了，等会再来吧"}
            if isinstance(e, openai.error.RateLimitError):
                logger.warn("[CLAUDE_API] RateLimitError: {}".format(e))
                result["content"] = "提问太快啦，请休息一下再问我吧"
@@ -125,9 +122,11 @@ class ClaudeAPIBot(Bot, OpenAIImage):

    def _model_mapping(self, model) -> str:
        if model == "claude-3-opus":
-            return "claude-3-opus-20240229"
+            return const.CLAUDE_3_OPUS
        elif model == "claude-3-sonnet":
-            return "claude-3-sonnet-20240229"
+            return const.CLAUDE_3_SONNET
        elif model == "claude-3-haiku":
-            return "claude-3-haiku-20240307"
+            return const.CLAUDE_3_HAIKU
+        elif model == "claude-3.5-sonnet":
+            return const.CLAUDE_35_SONNET
        return model
--- a/bot/gemini/google_gemini_bot.py
+++ b/bot/gemini/google_gemini_bot.py
@@ -13,7 +13,9 @@ from bridge.context import ContextType, Context
 from bridge.reply import Reply, ReplyType
 from common.log import logger
 from config import conf
+from bot.chatgpt.chat_gpt_session import ChatGPTSession
 from bot.baidu.baidu_wenxin_session import BaiduWenxinSession
+from google.generativeai.types import HarmCategory, HarmBlockThreshold


 # OpenAI对话模型API (可用)
@@ -22,9 +24,11 @@ class GoogleGeminiBot(Bot):
    def __init__(self):
        super().__init__()
        self.api_key = conf().get("gemini_api_key")
-        # 复用文心的token计算方式
-        self.sessions = SessionManager(BaiduWenxinSession, model=conf().get("model") or "gpt-3.5-turbo")
-
+        # 复用chatGPT的token计算方式
+        self.sessions = SessionManager(ChatGPTSession, model=conf().get("model") or "gpt-3.5-turbo")
+        self.model = conf().get("model") or "gemini-pro"
+        if self.model == "gemini":
+            self.model = "gemini-pro"
    def reply(self, query, context: Context = None) -> Reply:
        try:
            if context.type != ContextType.TEXT:
@@ -34,18 +38,44 @@ class GoogleGeminiBot(Bot):
            session_id = context["session_id"]
            session = self.sessions.session_query(query, session_id)
            gemini_messages = self._convert_to_gemini_messages(self.filter_messages(session.messages))
+            logger.debug(f"[Gemini] messages={gemini_messages}")
            genai.configure(api_key=self.api_key)
-            model = genai.GenerativeModel('gemini-pro')
-            response = model.generate_content(gemini_messages)
-            reply_text = response.text
-            self.sessions.session_reply(reply_text, session_id)
-            logger.info(f"[Gemini] reply={reply_text}")
-            return Reply(ReplyType.TEXT, reply_text)
+            model = genai.GenerativeModel(self.model)
+            
+            # 添加安全设置
+            safety_settings = {
+                HarmCategory.HARM_CATEGORY_HATE_SPEECH: HarmBlockThreshold.BLOCK_NONE,
+                HarmCategory.HARM_CATEGORY_HARASSMENT: HarmBlockThreshold.BLOCK_NONE,
+                HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT: HarmBlockThreshold.BLOCK_NONE,
+                HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT: HarmBlockThreshold.BLOCK_NONE,
+            }
+            
+            # 生成回复，包含安全设置
+            response = model.generate_content(
+                gemini_messages,
+                safety_settings=safety_settings
+            )
+            if response.candidates and response.candidates[0].content:
+                reply_text = response.candidates[0].content.parts[0].text
+                logger.info(f"[Gemini] reply={reply_text}")
+                self.sessions.session_reply(reply_text, session_id)
+                return Reply(ReplyType.TEXT, reply_text)
+            else:
+                # 没有有效响应内容，可能内容被屏蔽，输出安全评分
+                logger.warning("[Gemini] No valid response generated. Checking safety ratings.")
+                if hasattr(response, 'candidates') and response.candidates:
+                    for rating in response.candidates[0].safety_ratings:
+                        logger.warning(f"Safety rating: {rating.category} - {rating.probability}")
+                error_message = "No valid response generated due to safety constraints."
+                self.sessions.session_reply(error_message, session_id)
+                return Reply(ReplyType.ERROR, error_message)
+                    
        except Exception as e:
-            logger.error("[Gemini] fetch reply error, may contain unsafe content")
-            logger.error(e)
-            return Reply(ReplyType.ERROR, "invoke [Gemini] api failed!")
-
+            logger.error(f"[Gemini] Error generating response: {str(e)}", exc_info=True)
+            error_message = "Failed to invoke [Gemini] api!"
+            self.sessions.session_reply(error_message, session_id)
+            return Reply(ReplyType.ERROR, error_message)
+            
    def _convert_to_gemini_messages(self, messages: list):
        res = []
        for msg in messages:
@@ -53,6 +83,8 @@ class GoogleGeminiBot(Bot):
                role = "user"
            elif msg.get("role") == "assistant":
                role = "model"
+            elif msg.get("role") == "system":
+                role = "user"
            else:
                continue
            res.append({
@@ -69,7 +101,11 @@ class GoogleGeminiBot(Bot):
            return res
        for i in range(len(messages) - 1, -1, -1):
            message = messages[i]
-            if message.get("role") != turn:
+            role = message.get("role")
+            if role == "system":
+                res.insert(0, message)
+                continue
+            if role != turn:
                continue
            res.insert(0, message)
            if turn == "user":
--- a/bot/linkai/link_ai_bot.py
+++ b/bot/linkai/link_ai_bot.py
@@ -147,9 +147,9 @@ class LinkAIBot(Bot):
                if response["choices"][0].get("img_urls"):
                    thread = threading.Thread(target=self._send_image, args=(context.get("channel"), context, response["choices"][0].get("img_urls")))
                    thread.start()
-                    if response["choices"][0].get("text_content"):
-                        reply_content = response["choices"][0].get("text_content")
-                reply_content = self._process_url(reply_content)
+                    reply_content = response["choices"][0].get("text_content")
+                if reply_content:
+                    reply_content = self._process_url(reply_content)
                return Reply(ReplyType.TEXT, reply_content)

            else:
@@ -399,6 +399,7 @@ class LinkAIBot(Bot):
            return
        max_send_num = conf().get("max_media_send_count")
        send_interval = conf().get("media_send_interval")
+        file_type = (".pdf", ".doc", ".docx", ".csv", ".xls", ".xlsx", ".txt", ".rtf", ".ppt", ".pptx")
        try:
            i = 0
            for url in image_urls:
@@ -407,7 +408,7 @@ class LinkAIBot(Bot):
                i += 1
                if url.endswith(".mp4"):
                    reply_type = ReplyType.VIDEO_URL
-                elif url.endswith(".pdf") or url.endswith(".doc") or url.endswith(".docx") or url.endswith(".csv"):
+                elif url.endswith(file_type):
                    reply_type = ReplyType.FILE
                    url = _download_file(url)
                    if not url:
--- a/bot/modelscope/modelscope_bot.py
+++ b/bot/modelscope/modelscope_bot.py
@@ -0,0 +1,277 @@
+# encoding:utf-8
+
+import time
+import json
+import openai
+import openai.error
+from bot.bot import Bot
+from bot.session_manager import SessionManager
+from bridge.context import ContextType
+from bridge.reply import Reply, ReplyType
+from common.log import logger
+from config import conf, load_config
+from .modelscope_session import ModelScopeSession
+import requests
+
+
+# ModelScope对话模型API
+class ModelScopeBot(Bot):
+    def __init__(self):
+        super().__init__()
+        self.sessions = SessionManager(ModelScopeSession, model=conf().get("model") or "Qwen/Qwen2.5-7B-Instruct")
+        model = conf().get("model") or "Qwen/Qwen2.5-7B-Instruct"
+        if model == "modelscope":
+            model = "Qwen/Qwen2.5-7B-Instruct"
+        self.args = {
+            "model": model,  # 对话模型的名称
+            "temperature": conf().get("temperature", 0.3),  # 如果设置，值域须为 [0, 1] 我们推荐 0.3，以达到较合适的效果。
+            "top_p": conf().get("top_p", 1.0),  # 使用默认值
+        }
+        self.api_key = conf().get("modelscope_api_key")
+        self.base_url = conf().get("modelscope_base_url", "https://api-inference.modelscope.cn/v1/chat/completions")
+        """
+        需要获取ModelScope支持API-inference的模型名称列表，请到魔搭社区官网模型中心查看 https://modelscope.cn/models?filter=inference_type&page=1。
+        或者使用命令 curl https://api-inference.modelscope.cn/v1/models 对模型列表和ID进行获取。查看commend/const.py文件也可以获取模型列表。
+        获取ModelScope的免费API Key，请到魔搭社区官网用户中心查看获取方式 https://modelscope.cn/docs/model-service/API-Inference/intro。
+        """
+    def reply(self, query, context=None):
+        # acquire reply content
+        if context.type == ContextType.TEXT:
+            logger.info("[MODELSCOPE_AI] query={}".format(query))
+
+            session_id = context["session_id"]
+            reply = None
+            clear_memory_commands = conf().get("clear_memory_commands", ["#清除记忆"])
+            if query in clear_memory_commands:
+                self.sessions.clear_session(session_id)
+                reply = Reply(ReplyType.INFO, "记忆已清除")
+            elif query == "#清除所有":
+                self.sessions.clear_all_session()
+                reply = Reply(ReplyType.INFO, "所有人记忆已清除")
+            elif query == "#更新配置":
+                load_config()
+                reply = Reply(ReplyType.INFO, "配置已更新")
+            if reply:
+                return reply
+            session = self.sessions.session_query(query, session_id)
+            logger.debug("[MODELSCOPE_AI] session query={}".format(session.messages))
+
+            model = context.get("modelscope_model")
+            new_args = self.args.copy()
+            if model:
+                new_args["model"] = model
+
+            if new_args["model"] == "Qwen/QwQ-32B":
+                reply_content = self.reply_text_stream(session, args=new_args)
+            else:
+                reply_content = self.reply_text(session, args=new_args)
+
+            logger.debug(
+                "[MODELSCOPE_AI] new_query={}, session_id={}, reply_cont={}, completion_tokens={}".format(
+                    session.messages,
+                    session_id,
+                    reply_content["content"],
+                    reply_content["completion_tokens"],
+                )
+            )
+            if reply_content["completion_tokens"] == 0 and len(reply_content["content"]) > 0:
+                # 只有当 content 为空且 completion_tokens 为 0 时才标记为错误
+                if len(reply_content["content"]) == 0:
+                    reply = Reply(ReplyType.ERROR, reply_content["content"])
+                else:
+                    reply = Reply(ReplyType.TEXT, reply_content["content"])
+            elif reply_content["completion_tokens"] > 0:
+                self.sessions.session_reply(reply_content["content"], session_id, reply_content["total_tokens"])
+                reply = Reply(ReplyType.TEXT, reply_content["content"])
+            else:
+                reply = Reply(ReplyType.ERROR, reply_content["content"])
+                logger.debug("[MODELSCOPE_AI] reply {} used 0 tokens.".format(reply_content))
+            return reply
+        elif context.type == ContextType.IMAGE_CREATE:
+            ok, retstring = self.create_img(query, 0)
+            reply = None
+            if ok:
+                reply = Reply(ReplyType.IMAGE_URL, retstring)
+            else:
+                reply = Reply(ReplyType.ERROR, retstring)
+            return reply
+        else:
+            reply = Reply(ReplyType.ERROR, "Bot不支持处理{}类型的消息".format(context.type))
+            return reply
+
+    def reply_text(self, session: ModelScopeSession, args=None, retry_count=0) -> dict:
+        """
+        call openai's ChatCompletion to get the answer
+        :param session: a conversation session
+        :param session_id: session id
+        :param retry_count: retry count
+        :return: {}
+        """
+        try:
+            headers = {
+                "Content-Type": "application/json",
+                "Authorization": "Bearer " + self.api_key
+            }
+            
+            body = args
+            body["messages"] = session.messages
+            res = requests.post(
+                self.base_url,
+                headers=headers,
+                data=json.dumps(body)
+            )
+
+            if res.status_code == 200:
+                response = res.json()
+                return {
+                    "total_tokens": response["usage"]["total_tokens"],
+                    "completion_tokens": response["usage"]["completion_tokens"],
+                    "content": response["choices"][0]["message"]["content"]
+                }
+            else:
+                response = res.json()
+                if "errors" in response:
+                    error = response.get("errors")
+                elif "error" in response:
+                    error = response.get("error")
+                else:
+                    error = "Unknown error"
+                logger.error(f"[MODELSCOPE_AI] chat failed, status_code={res.status_code}, "
+                             f"msg={error.get('message')}, type={error.get('type')}")
+
+                result = {"completion_tokens": 0, "content": "提问太快啦，请休息一下再问我吧"}
+                need_retry = False
+                if res.status_code >= 500:
+                    # server error, need retry
+                    logger.warn(f"[MODELSCOPE_AI] do retry, times={retry_count}")
+                    need_retry = retry_count < 2
+                elif res.status_code == 401:
+                    result["content"] = "授权失败，请检查API Key是否正确"
+                elif res.status_code == 429:
+                    result["content"] = "请求过于频繁，请稍后再试"
+                    need_retry = retry_count < 2
+                else:
+                    need_retry = False
+
+                if need_retry:
+                    time.sleep(3)
+                    return self.reply_text(session, args, retry_count + 1)
+                else:
+                    return result
+        except Exception as e:
+            logger.exception(e)
+            need_retry = retry_count < 2
+            result = {"completion_tokens": 0, "content": "我现在有点累了，等会再来吧"}
+            if need_retry:
+                return self.reply_text(session, args, retry_count + 1)
+            else:
+                return result
+
+    def reply_text_stream(self, session: ModelScopeSession, args=None, retry_count=0) -> dict:
+        """
+        call ModelScope's ChatCompletion to get the answer with stream response
+        :param session: a conversation session
+        :param session_id: session id
+        :param retry_count: retry count
+        :return: {}
+        """
+        try:
+            headers = {
+                "Content-Type": "application/json",
+                "Authorization": "Bearer " + self.api_key
+            }
+            
+            body = args
+            body["messages"] = session.messages
+            body["stream"] = True  # 启用流式响应
+
+            res = requests.post(
+                self.base_url,
+                headers=headers,
+                data=json.dumps(body),
+                stream=True
+            )
+            if res.status_code == 200:
+                content = ""
+                for line in res.iter_lines():
+                    if line:
+                        decoded_line = line.decode('utf-8')
+                        if decoded_line.startswith("data: "):
+                            try:
+                                json_data = json.loads(decoded_line[6:])
+                                delta_content = json_data.get("choices", [{}])[0].get("delta", {}).get("content", "")
+                                if delta_content:
+                                    content += delta_content
+                            except json.JSONDecodeError as e:
+                                pass
+                return {
+                    "total_tokens": 1,  # 流式响应通常不返回token使用情况
+                    "completion_tokens": 1,
+                    "content": content
+                }
+            else:
+                response = res.json()
+                if "errors" in response:
+                    error = response.get("errors")
+                elif "error" in response:
+                    error = response.get("error")
+                else:
+                    error = "Unknown error"
+                logger.error(f"[MODELSCOPE_AI] chat failed, status_code={res.status_code}, "
+                             f"msg={error.get('message')}, type={error.get('type')}")
+
+                result = {"completion_tokens": 0, "content": "提问太快啦，请休息一下再问我吧"}
+                need_retry = False
+                if res.status_code >= 500:
+                    # server error, need retry
+                    logger.warn(f"[MODELSCOPE_AI] do retry, times={retry_count}")
+                    need_retry = retry_count < 2
+                elif res.status_code == 401:
+                    result["content"] = "授权失败，请检查API Key是否正确"
+                elif res.status_code == 429:
+                    result["content"] = "请求过于频繁，请稍后再试"
+                    need_retry = retry_count < 2
+                else:
+                    need_retry = False
+
+                if need_retry:
+                    time.sleep(3)
+                    return self.reply_text_stream(session, args, retry_count + 1)
+                else:
+                    return result
+        except Exception as e:
+            logger.exception(e)
+            need_retry = retry_count < 2
+            result = {"completion_tokens": 0, "content": "我现在有点累了，等会再来吧"}
+            if need_retry:
+                return self.reply_text_stream(session, args, retry_count + 1)
+            else:
+                return result
+    def create_img(self, query, retry_count=0):
+        try:
+            logger.info("[ModelScopeImage] image_query={}".format(query))
+            headers = {
+                "Content-Type": "application/json; charset=utf-8",  # 明确指定编码
+                "Authorization": f"Bearer {self.api_key}"
+            }
+            payload = {
+                "prompt": query,  # required
+                "n": 1,
+                "model": conf().get("text_to_image"),
+            }
+            url = "https://api-inference.modelscope.cn/v1/images/generations"
+            
+            # 手动序列化并保留中文（禁用 ASCII 转义）
+            json_payload = json.dumps(payload, ensure_ascii=False).encode('utf-8')
+            
+            # 使用 data 参数发送原始字符串（requests 会自动处理编码）
+            res = requests.post(url, headers=headers, data=json_payload)
+            
+            response_data = res.json()
+            image_url = response_data['images'][0]['url']
+            logger.info("[ModelScopeImage] image_url={}".format(image_url))
+            return True, image_url
+
+        except Exception as e:
+            logger.error(format(e))
+            return False, "画图出现问题，请休息一下再问我吧"
--- a/bot/modelscope/modelscope_session.py
+++ b/bot/modelscope/modelscope_session.py
@@ -0,0 +1,51 @@
+from bot.session_manager import Session
+from common.log import logger
+
+
+class ModelScopeSession(Session):
+    def __init__(self, session_id, system_prompt=None, model="Qwen/Qwen2.5-7B-Instruct"):
+        super().__init__(session_id, system_prompt)
+        self.model = model
+        self.reset()
+
+    def discard_exceeding(self, max_tokens, cur_tokens=None):
+        precise = True
+        try:
+            cur_tokens = self.calc_tokens()
+        except Exception as e:
+            precise = False
+            if cur_tokens is None:
+                raise e
+            logger.debug("Exception when counting tokens precisely for query: {}".format(e))
+        while cur_tokens > max_tokens:
+            if len(self.messages) > 2:
+                self.messages.pop(1)
+            elif len(self.messages) == 2 and self.messages[1]["role"] == "assistant":
+                self.messages.pop(1)
+                if precise:
+                    cur_tokens = self.calc_tokens()
+                else:
+                    cur_tokens = cur_tokens - max_tokens
+                break
+            elif len(self.messages) == 2 and self.messages[1]["role"] == "user":
+                logger.warn("user message exceed max_tokens. total_tokens={}".format(cur_tokens))
+                break
+            else:
+                logger.debug("max_tokens={}, total_tokens={}, len(messages)={}".format(max_tokens, cur_tokens,
+                                                                                       len(self.messages)))
+                break
+            if precise:
+                cur_tokens = self.calc_tokens()
+            else:
+                cur_tokens = cur_tokens - max_tokens
+        return cur_tokens
+
+    def calc_tokens(self):
+        return num_tokens_from_messages(self.messages, self.model)
+
+
+def num_tokens_from_messages(messages, model):
+    tokens = 0
+    for msg in messages:
+        tokens += len(msg["content"])
+    return tokens
--- a/bot/moonshot/moonshot_bot.py
+++ b/bot/moonshot/moonshot_bot.py
@@ -19,8 +19,11 @@ class MoonshotBot(Bot):
    def __init__(self):
        super().__init__()
        self.sessions = SessionManager(MoonshotSession, model=conf().get("model") or "moonshot-v1-128k")
+        model = conf().get("model") or "moonshot-v1-128k"
+        if model == "moonshot":
+            model = "moonshot-v1-32k"
        self.args = {
-            "model": conf().get("model") or "moonshot-v1-128k",  # 对话模型的名称
+            "model": model,  # 对话模型的名称
            "temperature": conf().get("temperature", 0.3),  # 如果设置，值域须为 [0, 1] 我们推荐 0.3，以达到较合适的效果。
            "top_p": conf().get("top_p", 1.0),  # 使用默认值
        }
--- a/bot/xunfei/xunfei_spark_bot.py
+++ b/bot/xunfei/xunfei_spark_bot.py
@@ -3,7 +3,7 @@
 import requests, json
 from bot.bot import Bot
 from bot.session_manager import SessionManager
-from bot.baidu.baidu_wenxin_session import BaiduWenxinSession
+from bot.chatgpt.chat_gpt_session import ChatGPTSession
 from bridge.context import ContextType, Context
 from bridge.reply import Reply, ReplyType
 from common.log import logger
@@ -41,18 +41,19 @@ class XunFeiBot(Bot):
        self.api_key = conf().get("xunfei_api_key")
        self.api_secret = conf().get("xunfei_api_secret")
        # 默认使用v2.0版本: "generalv2"
-        # v1.5版本为 "general"
-        # v3.0版本为: "generalv3"
-        self.domain = "generalv3"
-        # 默认使用v2.0版本: "ws://spark-api.xf-yun.com/v2.1/chat"
-        # v1.5版本为: "ws://spark-api.xf-yun.com/v1.1/chat"
-        # v3.0版本为: "ws://spark-api.xf-yun.com/v3.1/chat"
-        # v3.5版本为: "wss://spark-api.xf-yun.com/v3.5/chat"
-        self.spark_url = "wss://spark-api.xf-yun.com/v3.5/chat"
+        # Spark Lite请求地址(spark_url): wss://spark-api.xf-yun.com/v1.1/chat, 对应的domain参数为: "lite"
+        # Spark V2.0请求地址(spark_url): wss://spark-api.xf-yun.com/v2.1/chat, 对应的domain参数为: "generalv2"
+        # Spark Pro 请求地址(spark_url): wss://spark-api.xf-yun.com/v3.1/chat, 对应的domain参数为: "generalv3"
+        # Spark Pro-128K请求地址(spark_url):  wss://spark-api.xf-yun.com/chat/pro-128k, 对应的domain参数为: "pro-128k"
+        # Spark Max 请求地址(spark_url): wss://spark-api.xf-yun.com/v3.5/chat, 对应的domain参数为: "generalv3.5"
+        # Spark4.0 Ultra 请求地址(spark_url): wss://spark-api.xf-yun.com/v4.0/chat, 对应的domain参数为: "4.0Ultra"
+        # 后续模型更新，对应的参数可以参考官网文档获取：https://www.xfyun.cn/doc/spark/Web.html
+        self.domain = conf().get("xunfei_domain", "generalv3.5")
+        self.spark_url = conf().get("xunfei_spark_url", "wss://spark-api.xf-yun.com/v3.5/chat")
        self.host = urlparse(self.spark_url).netloc
        self.path = urlparse(self.spark_url).path
        # 和wenxin使用相同的session机制
-        self.sessions = SessionManager(BaiduWenxinSession, model=const.XUNFEI)
+        self.sessions = SessionManager(ChatGPTSession, model=const.XUNFEI)

    def reply(self, query, context: Context = None) -> Reply:
        if context.type == ContextType.TEXT:
--- a/bridge/bridge.py
+++ b/bridge/bridge.py
@@ -36,9 +36,9 @@ class Bridge(object):
                self.btype["chat"] = const.QWEN
            if model_type in [const.QWEN_TURBO, const.QWEN_PLUS, const.QWEN_MAX]:
                self.btype["chat"] = const.QWEN_DASHSCOPE
-            if model_type in [const.GEMINI]:
+            if model_type and model_type.startswith("gemini"):
                self.btype["chat"] = const.GEMINI
-            if model_type in [const.ZHIPU_AI]:
+            if model_type and model_type.startswith("glm"):
                self.btype["chat"] = const.ZHIPU_AI
            if model_type and model_type.startswith("claude-3"):
                self.btype["chat"] = const.CLAUDEAPI
@@ -46,9 +46,12 @@ class Bridge(object):
            if model_type in ["claude"]:
                self.btype["chat"] = const.CLAUDEAI

-            if model_type in ["moonshot-v1-8k", "moonshot-v1-32k", "moonshot-v1-128k"]:
+            if model_type in [const.MOONSHOT, "moonshot-v1-8k", "moonshot-v1-32k", "moonshot-v1-128k"]:
                self.btype["chat"] = const.MOONSHOT

+            if model_type in [const.MODELSCOPE]:
+                self.btype["chat"] = const.MODELSCOPE
+            
            if model_type in ["abab6.5-chat"]:
                self.btype["chat"] = const.MiniMax

--- a/channel/channel_factory.py
+++ b/channel/channel_factory.py
@@ -18,9 +18,15 @@ def create_channel(channel_type) -> Channel:
    elif channel_type == "wxy":
        from channel.wechat.wechaty_channel import WechatyChannel
        ch = WechatyChannel()
+    elif channel_type == "wcf":
+        from channel.wechat.wcf_channel import WechatfChannel
+        ch = WechatfChannel()
    elif channel_type == "terminal":
        from channel.terminal.terminal_channel import TerminalChannel
        ch = TerminalChannel()
+    elif channel_type == 'web':
+        from channel.web.web_channel import WebChannel
+        ch = WebChannel()
    elif channel_type == "wechatmp":
        from channel.wechatmp.wechatmp_channel import WechatMPChannel
        ch = WechatMPChannel(passive_reply=True)
--- a/channel/chat_channel.py
+++ b/channel/chat_channel.py
@@ -117,6 +117,7 @@ class ChatChannel(Channel):
                        logger.info("[chat_channel]receive group at")
                        if not conf().get("group_at_off", False):
                            flag = True
+                        self.name = self.name if self.name is not None else ""  # 部分渠道self.name可能没有赋值
                        pattern = f"@{re.escape(self.name)}(\u2005|\u0020)"
                        subtract_res = re.sub(pattern, r"", content)
                        if isinstance(context["msg"].at_list, list):
@@ -336,24 +337,27 @@ class ChatChannel(Channel):
        while True:
            with self.lock:
                session_ids = list(self.sessions.keys())
-                for session_id in session_ids:
+            for session_id in session_ids:
+                with self.lock:
                    context_queue, semaphore = self.sessions[session_id]
-                    if semaphore.acquire(blocking=False):  # 等线程处理完毕才能删除
-                        if not context_queue.empty():
-                            context = context_queue.get()
-                            logger.debug("[chat_channel] consume context: {}".format(context))
-                            future: Future = handler_pool.submit(self._handle, context)
-                            future.add_done_callback(self._thread_pool_callback(session_id, context=context))
+                if semaphore.acquire(blocking=False):  # 等线程处理完毕才能删除
+                    if not context_queue.empty():
+                        context = context_queue.get()
+                        logger.debug("[chat_channel] consume context: {}".format(context))
+                        future: Future = handler_pool.submit(self._handle, context)
+                        future.add_done_callback(self._thread_pool_callback(session_id, context=context))
+                        with self.lock:
                            if session_id not in self.futures:
                                self.futures[session_id] = []
                            self.futures[session_id].append(future)
-                        elif semaphore._initial_value == semaphore._value + 1:  # 除了当前，没有任务再申请到信号量，说明所有任务都处理完毕
+                    elif semaphore._initial_value == semaphore._value + 1:  # 除了当前，没有任务再申请到信号量，说明所有任务都处理完毕
+                        with self.lock:
                            self.futures[session_id] = [t for t in self.futures[session_id] if not t.done()]
                            assert len(self.futures[session_id]) == 0, "thread pool error"
                            del self.sessions[session_id]
-                        else:
-                            semaphore.release()
-            time.sleep(0.1)
+                    else:
+                        semaphore.release()
+            time.sleep(0.2)

    # 取消session_id对应的所有任务，只能取消排队的消息和已提交线程池但未执行的任务
    def cancel_session(self, session_id):
--- a/channel/dingtalk/dingtalk_channel.py
+++ b/channel/dingtalk/dingtalk_channel.py
@@ -100,7 +100,7 @@ class DingTalkChanel(ChatChannel, dingtalk_stream.ChatbotHandler):
        super(dingtalk_stream.ChatbotHandler, self).__init__()
        self.logger = self.setup_logger()
        # 历史消息id暂存，用于幂等控制
-        self.receivedMsgs = ExpiredDict(conf().get("expires_in_seconds"))
+        self.receivedMsgs = ExpiredDict(conf().get("expires_in_seconds", 3600))
        logger.info("[DingTalk] client_id={}, client_secret={} ".format(
            self.dingtalk_client_id, self.dingtalk_client_secret))
        # 无需群校验和前缀
@@ -163,7 +163,7 @@ class DingTalkChanel(ChatChannel, dingtalk_stream.ChatbotHandler):
        elif cmsg.ctype == ContextType.PATPAT:
            logger.debug("[DingTalk]receive patpat msg: {}".format(cmsg.content))
        elif cmsg.ctype == ContextType.TEXT:
-            logger.debug("[DingTalk]receive patpat msg: {}".format(cmsg.content))
+            logger.debug("[DingTalk]receive text msg: {}".format(cmsg.content))
        else:
            logger.debug("[DingTalk]receive other msg: {}".format(cmsg.content))
        context = self._compose_context(cmsg.ctype, cmsg.content, isgroup=True, msg=cmsg)
--- a/channel/dingtalk/dingtalk_message.py
+++ b/channel/dingtalk/dingtalk_message.py
@@ -49,6 +49,7 @@ class DingTalkMessage(ChatMessage):
        if self.is_group:
            self.from_user_id = event.conversation_id
            self.actual_user_id = event.sender_id
+            self.is_at = True
        else:
            self.from_user_id = event.sender_id
            self.actual_user_id = event.sender_id
--- a/channel/web/README.md
+++ b/channel/web/README.md
@@ -0,0 +1,7 @@
+# Web channel
+使用SSE（Server-Sent Events，服务器推送事件）实现，提供了一个默认的网页。也可以自己实现加入api
+
+#使用方法
+- 在配置文件中channel_type填入web即可
+- 访问地址 http://localhost:9899/chat
+- port可以在配置项 web_port中设置
--- a/channel/web/chat.html
+++ b/channel/web/chat.html
@@ -0,0 +1,165 @@
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Chat</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            display: flex;
+            flex-direction: column;
+            height: 100vh;  /* 占据所有高度 */
+            margin: 0;
+            /* background-color: #f8f9fa; */
+        }
+        #chat-container {
+            display: flex;
+            flex-direction: column;
+            width: 100%;
+            max-width: 500px;
+            margin: auto;
+            border: 1px solid #ccc;
+            border-radius: 5px;
+            overflow: hidden;
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+            flex: 1;  /* 使聊天容器占据剩余空间 */
+        }
+        #messages {
+            flex-direction: column;
+            display: flex;
+            flex: 1;
+            overflow-y: auto;
+            padding: 10px;
+            overflow-y: auto;
+            border-bottom: 1px solid #ccc;
+            background-color: #ffffff;
+        }
+       
+        .message {
+            margin: 5px 0;                /* 间隔 */
+            padding: 10px 15px;           /* 内边距 */
+            border-radius: 15px;          /* 圆角 */
+            max-width: 80%;               /* 限制最大宽度 */
+            min-width: 80px;              /* 设置最小宽度 */
+            min-height: 40px;             /* 设置最小高度 */
+            word-wrap: break-word;        /* 自动换行 */
+            position: relative;           /* 时间戳定位 */
+            display: inline-block;        /* 内容自适应宽度 */
+            box-sizing: border-box;       /* 包括内边距和边框 */
+            flex-shrink: 0; /* 禁止高度被压缩 */
+            word-wrap: break-word; /* 自动换行，防止单行过长 */
+            white-space: normal; /* 允许正常换行 */
+            overflow: hidden;
+        }
+
+        .bot {
+            background-color: #f1f1f1;    /* 灰色背景 */
+            color: black;                 /* 黑色字体 */
+            align-self: flex-start;       /* 左对齐 */
+            margin-right: auto;           /* 确保消息靠左 */
+            text-align: left;             /* 内容左对齐 */
+        }
+
+        .user {
+            background-color: #2bc840;    /* 蓝色背景 */
+            align-self: flex-end;         /* 右对齐 */
+            margin-left: auto;            /* 确保消息靠右 */
+            text-align: left;             /* 内容左对齐 */
+        }
+        .timestamp {
+            font-size: 0.8em;             /* 时间戳字体大小 */
+            color: rgba(0, 0, 0, 0.5);    /* 半透明黑色 */
+            margin-bottom: 5px;           /* 时间戳下方间距 */
+            display: block;               /* 时间戳独占一行 */
+        }
+        #input-container {
+            display: flex;
+            padding: 10px;
+            background-color: #ffffff;
+            border-top: 1px solid #ccc;
+        }
+        #input {
+            flex: 1;
+            padding: 10px;
+            border: 1px solid #ccc;
+            border-radius: 5px;
+            margin-right: 10px;
+        }
+        #send {
+            padding: 10px;
+            border: none;
+            background-color: #007bff;
+            color: white;
+            border-radius: 5px;
+            cursor: pointer;
+        }
+        #send:hover {
+            background-color: #0056b3;
+        }
+    </style>
+</head>
+<body>
+    <div id="chat-container">
+        <div id="messages"></div>
+        <div id="input-container">
+            <input type="text" id="input" placeholder="输入消息..." />
+            <button id="send">发送</button>
+        </div>
+    </div>
+
+    <script>
+        const messagesDiv = document.getElementById('messages');
+        const input = document.getElementById('input');
+        const sendButton = document.getElementById('send');
+
+        // 生成唯一的 user_id
+        const userId = 'user_' + Math.random().toString(36).substr(2, 9);
+
+        // 连接 SSE
+        const eventSource = new EventSource(`/sse/${userId}`);
+
+        eventSource.onmessage = function(event) {
+            const message = JSON.parse(event.data);
+            const messageDiv = document.createElement('div');
+            messageDiv.className = 'message bot';
+            const timestamp = new Date(message.timestamp).toLocaleTimeString();  // 假设消息中有时间戳
+            messageDiv.innerHTML = `<div class="timestamp">${timestamp}</div>${message.content}`;  // 显示时间
+            messagesDiv.appendChild(messageDiv);
+            messagesDiv.scrollTop = messagesDiv.scrollHeight;  // 滚动到底部
+        };
+
+        sendButton.onclick = function() {
+            sendMessage();
+        };
+
+        input.addEventListener('keypress', function(event) {
+            if (event.key === 'Enter') {
+                sendMessage();
+                event.preventDefault();  // 防止换行
+            }
+        });
+
+        function sendMessage() {
+            const userMessage = input.value;
+            if (userMessage) {
+                const timestamp = new Date().toISOString();  // 获取当前时间戳
+                fetch('/message', {
+                    method: 'POST',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    },
+                    body: JSON.stringify({ user_id: userId, message: userMessage, timestamp: timestamp })  // 发送时间戳
+                });
+                const messageDiv = document.createElement('div');
+                messageDiv.className = 'message user';
+                const userTimestamp = new Date().toLocaleTimeString();  // 获取当前时间
+                messageDiv.innerHTML = `<div class="timestamp">${userTimestamp}</div>${userMessage}`;  // 显示时间
+                messagesDiv.appendChild(messageDiv);
+                messagesDiv.scrollTop = messagesDiv.scrollHeight;  // 滚动到底部
+                input.value = '';  // 清空输入框
+            }
+        }
+    </script>
+</body>
+</html>
--- a/channel/web/web_channel.py
+++ b/channel/web/web_channel.py
@@ -0,0 +1,204 @@
+import sys
+import time
+import web
+import json
+from queue import Queue
+from bridge.context import *
+from bridge.reply import Reply, ReplyType
+from channel.chat_channel import ChatChannel, check_prefix
+from channel.chat_message import ChatMessage
+from common.log import logger
+from common.singleton import singleton
+from config import conf
+import os
+
+
+class WebMessage(ChatMessage):
+    def __init__(
+        self,
+        msg_id,
+        content,
+        ctype=ContextType.TEXT,
+        from_user_id="User",
+        to_user_id="Chatgpt",
+        other_user_id="Chatgpt",
+    ):
+        self.msg_id = msg_id
+        self.ctype = ctype
+        self.content = content
+        self.from_user_id = from_user_id
+        self.to_user_id = to_user_id
+        self.other_user_id = other_user_id
+
+
+@singleton
+class WebChannel(ChatChannel):
+    NOT_SUPPORT_REPLYTYPE = [ReplyType.VOICE]
+    _instance = None
+    
+    # def __new__(cls):
+    #     if cls._instance is None:
+    #         cls._instance = super(WebChannel, cls).__new__(cls)
+    #     return cls._instance
+
+    def __init__(self):
+        super().__init__()
+        self.message_queues = {}  # 为每个用户存储一个消息队列
+        self.msg_id_counter = 0  # 添加消息ID计数器
+
+    def _generate_msg_id(self):
+        """生成唯一的消息ID"""
+        self.msg_id_counter += 1
+        return str(int(time.time())) + str(self.msg_id_counter)
+
+    def send(self, reply: Reply, context: Context):
+        try:
+            if reply.type == ReplyType.IMAGE:
+                from PIL import Image
+
+                image_storage = reply.content
+                image_storage.seek(0)
+                img = Image.open(image_storage)
+                print("<IMAGE>")
+                img.show()
+            elif reply.type == ReplyType.IMAGE_URL:
+                import io
+
+                import requests
+                from PIL import Image
+
+                img_url = reply.content
+                pic_res = requests.get(img_url, stream=True)
+                image_storage = io.BytesIO()
+                for block in pic_res.iter_content(1024):
+                    image_storage.write(block)
+                image_storage.seek(0)
+                img = Image.open(image_storage)
+                print(img_url)
+                img.show()
+            else:
+                print(reply.content)
+
+            # 获取用户ID，如果没有则使用默认值
+            # user_id = getattr(context.get("session", None), "session_id", "default_user")
+            user_id = context["receiver"]
+            # 确保用户有对应的消息队列
+            if user_id not in self.message_queues:
+                self.message_queues[user_id] = Queue()
+                
+            # 将消息放入对应用户的队列
+            message_data = {
+                "type": str(reply.type),
+                "content": reply.content,
+                "timestamp": time.time()
+            }
+            self.message_queues[user_id].put(message_data)
+            logger.debug(f"Message queued for user {user_id}")
+            
+        except Exception as e:
+            logger.error(f"Error in send method: {e}")
+            raise
+
+    def sse_handler(self, user_id):
+        """
+        Handle Server-Sent Events (SSE) for real-time communication.
+        """
+        web.header('Content-Type', 'text/event-stream')
+        web.header('Cache-Control', 'no-cache')
+        web.header('Connection', 'keep-alive')
+        
+        # 确保用户有消息队列
+        if user_id not in self.message_queues:
+            self.message_queues[user_id] = Queue()
+        
+        try:    
+            while True:
+                try:
+                    # 发送心跳
+                    yield f": heartbeat\n\n"
+                    
+                    # 非阻塞方式获取消息
+                    if not self.message_queues[user_id].empty():
+                        message = self.message_queues[user_id].get_nowait()
+                        yield f"data: {json.dumps(message)}\n\n"
+                    time.sleep(0.5)
+                except Exception as e:
+                    logger.error(f"SSE Error: {e}")
+                    break
+        finally:
+            # 清理资源
+            if user_id in self.message_queues:
+                # 只有当队列为空时才删除
+                if self.message_queues[user_id].empty():
+                    del self.message_queues[user_id]
+
+    def post_message(self):
+        """
+        Handle incoming messages from users via POST request.
+        """
+        try:
+            data = web.data()  # 获取原始POST数据
+            json_data = json.loads(data)
+            user_id = json_data.get('user_id', 'default_user')
+            prompt = json_data.get('message', '')
+        except json.JSONDecodeError:
+            return json.dumps({"status": "error", "message": "Invalid JSON"})
+        except Exception as e:
+            return json.dumps({"status": "error", "message": str(e)})
+        
+        if not prompt:
+            return json.dumps({"status": "error", "message": "No message provided"})
+            
+        try:
+            msg_id = self._generate_msg_id()
+            context = self._compose_context(ContextType.TEXT, prompt, msg=WebMessage(msg_id, 
+                                                                                     prompt,
+                                                                                     from_user_id=user_id,
+                                                                                     other_user_id = user_id
+                                                                                     ))
+            context["isgroup"] = False
+            # context["session"] = web.storage(session_id=user_id)
+            
+            if not context:
+                return json.dumps({"status": "error", "message": "Failed to process message"})
+                
+            self.produce(context)
+            return json.dumps({"status": "success", "message": "Message received"})
+            
+        except Exception as e:
+            logger.error(f"Error processing message: {e}")
+            return json.dumps({"status": "error", "message": "Internal server error"})
+
+    def chat_page(self):
+        """Serve the chat HTML page."""
+        file_path = os.path.join(os.path.dirname(__file__), 'chat.html')  # 使用绝对路径
+        with open(file_path, 'r', encoding='utf-8') as f:
+            return f.read()
+
+    def startup(self):
+        logger.setLevel("WARN")
+        print("\nWeb Channel is running, please visit http://localhost:9899/chat")
+        
+        urls = (
+            '/sse/(.+)', 'SSEHandler',  # 修改路由以接收用户ID
+            '/message', 'MessageHandler',
+            '/chat', 'ChatHandler', 
+        )
+        port = conf().get("web_port", 9899)
+        app = web.application(urls, globals(), autoreload=False)
+        web.httpserver.runsimple(app.wsgifunc(), ("0.0.0.0", port))
+
+
+class SSEHandler:
+    def GET(self, user_id):
+        return WebChannel().sse_handler(user_id)
+
+
+class MessageHandler:
+    def POST(self):
+        return WebChannel().post_message()
+
+
+class ChatHandler:
+    def GET(self):
+        return WebChannel().chat_page()
--- a/channel/wechat/wcf_channel.py
+++ b/channel/wechat/wcf_channel.py
@@ -0,0 +1,179 @@
+# encoding:utf-8
+
+"""
+wechat channel
+"""
+
+import io
+import json
+import os
+import threading
+import time
+from queue import Empty
+from typing import Any
+
+from bridge.context import *
+from bridge.reply import *
+from channel.chat_channel import ChatChannel
+from channel.wechat.wcf_message import WechatfMessage
+from common.log import logger
+from common.singleton import singleton
+from common.utils import *
+from config import conf, get_appdata_dir
+from wcferry import Wcf, WxMsg
+
+
+@singleton
+class WechatfChannel(ChatChannel):
+    NOT_SUPPORT_REPLYTYPE = []
+
+    def __init__(self):
+        super().__init__()
+        self.NOT_SUPPORT_REPLYTYPE = []
+        # 使用字典存储最近消息，用于去重
+        self.received_msgs = {}
+        # 初始化wcferry客户端
+        self.wcf = Wcf()
+        self.wxid = None  # 登录后会被设置为当前登录用户的wxid
+
+    def startup(self):
+        """
+        启动通道
+        """
+        try:
+            # wcferry会自动唤起微信并登录
+            self.wxid = self.wcf.get_self_wxid()
+            self.name = self.wcf.get_user_info().get("name")
+            logger.info(f"微信登录成功，当前用户ID: {self.wxid}, 用户名：{self.name}")
+            self.contact_cache = ContactCache(self.wcf)
+            self.contact_cache.update()
+            # 启动消息接收
+            self.wcf.enable_receiving_msg()
+            # 创建消息处理线程
+            t = threading.Thread(target=self._process_messages, name="WeChatThread", daemon=True)
+            t.start()
+
+
+        except Exception as e:
+            logger.error(f"微信通道启动失败: {e}")
+            raise e
+
+    def _process_messages(self):
+        """
+        处理消息队列
+        """
+        while True:
+            try:
+                msg = self.wcf.get_msg()
+                if msg:
+                    self._handle_message(msg)
+            except Empty:
+                continue
+            except Exception as e:
+                logger.error(f"处理消息失败: {e}")
+                continue
+
+    def _handle_message(self, msg: WxMsg):
+        """
+        处理单条消息
+        """
+        try:
+            # 构造消息对象
+            cmsg = WechatfMessage(self, msg)
+            # 消息去重
+            if cmsg.msg_id in self.received_msgs:
+                return
+            self.received_msgs[cmsg.msg_id] = time.time()
+            # 清理过期消息ID
+            self._clean_expired_msgs()
+
+            logger.debug(f"收到消息: {msg}")
+            context = self._compose_context(cmsg.ctype, cmsg.content,
+                                            isgroup=cmsg.is_group,
+                                            msg=cmsg)
+            if context:
+                self.produce(context)
+        except Exception as e:
+            logger.error(f"处理消息失败: {e}")
+
+    def _clean_expired_msgs(self, expire_time: float = 60):
+        """
+        清理过期的消息ID
+        """
+        now = time.time()
+        for msg_id in list(self.received_msgs.keys()):
+            if now - self.received_msgs[msg_id] > expire_time:
+                del self.received_msgs[msg_id]
+
+    def send(self, reply: Reply, context: Context):
+        """
+        发送消息
+        """
+        receiver = context["receiver"]
+        if not receiver:
+            logger.error("receiver is empty")
+            return
+
+        try:
+            if reply.type == ReplyType.TEXT:
+                # 处理@信息
+                at_list = []
+                if context.get("isgroup"):
+                    if context["msg"].actual_user_id:
+                        at_list = [context["msg"].actual_user_id]
+                at_str = ",".join(at_list) if at_list else ""
+                self.wcf.send_text(reply.content, receiver, at_str)
+
+            elif reply.type == ReplyType.ERROR or reply.type == ReplyType.INFO:
+                self.wcf.send_text(reply.content, receiver)
+            else:
+                logger.error(f"暂不支持的消息类型: {reply.type}")
+
+        except Exception as e:
+            logger.error(f"发送消息失败: {e}")
+
+    def close(self):
+        """
+        关闭通道
+        """
+        try:
+            self.wcf.cleanup()
+        except Exception as e:
+            logger.error(f"关闭通道失败: {e}")
+
+
+class ContactCache:
+    def __init__(self, wcf):
+        """
+        wcf: 一个 wcfferry.client.Wcf 实例
+        """
+        self.wcf = wcf
+        self._contact_map = {}  # 形如 {wxid: {完整联系人信息}}
+
+    def update(self):
+        """
+        更新缓存：调用 get_contacts()，
+        再把 wcf.contacts 构建成 {wxid: {完整信息}} 的字典
+        """
+        self.wcf.get_contacts()
+        self._contact_map.clear()
+        for item in self.wcf.contacts:
+            wxid = item.get('wxid')
+            if wxid:  # 确保有 wxid 字段
+                self._contact_map[wxid] = item
+
+    def get_contact(self, wxid: str) -> dict:
+        """
+        返回该 wxid 对应的完整联系人 dict，
+        如果没找到就返回 None
+        """
+        return self._contact_map.get(wxid)
+
+    def get_name_by_wxid(self, wxid: str) -> str:
+        """
+        通过wxid，获取成员/群名称
+        """
+        contact = self.get_contact(wxid)
+        if contact:
+            return contact.get('name', '')
+        return ''
--- a/channel/wechat/wcf_message.py
+++ b/channel/wechat/wcf_message.py
@@ -0,0 +1,58 @@
+# encoding:utf-8
+
+"""
+wechat channel message
+"""
+
+from bridge.context import ContextType
+from channel.chat_message import ChatMessage
+from common.log import logger
+from wcferry import WxMsg
+
+
+class WechatfMessage(ChatMessage):
+    """
+    微信消息封装类
+    """
+
+    def __init__(self, channel, wcf_msg: WxMsg, is_group=False):
+        """
+        初始化消息对象
+        :param wcf_msg: wcferry消息对象
+        :param is_group: 是否是群消息
+        """
+        super().__init__(wcf_msg)
+        self.msg_id = wcf_msg.id
+        self.create_time = wcf_msg.ts  # 使用消息时间戳
+        self.is_group = is_group or wcf_msg._is_group
+        self.wxid = channel.wxid
+        self.name = channel.name
+
+        # 解析消息类型
+        if wcf_msg.is_text():
+            self.ctype = ContextType.TEXT
+            self.content = wcf_msg.content
+        else:
+            raise NotImplementedError(f"Unsupported message type: {wcf_msg.type}")
+
+        # 设置发送者和接收者信息
+        self.from_user_id = self.wxid if wcf_msg.sender == self.wxid else wcf_msg.sender
+        self.from_user_nickname = self.name if wcf_msg.sender == self.wxid else channel.contact_cache.get_name_by_wxid(wcf_msg.sender)
+        self.to_user_id = self.wxid
+        self.to_user_nickname = self.name
+        self.other_user_id = wcf_msg.sender
+        self.other_user_nickname = channel.contact_cache.get_name_by_wxid(wcf_msg.sender)
+
+        # 群消息特殊处理
+        if self.is_group:
+            self.other_user_id = wcf_msg.roomid
+            self.other_user_nickname = channel.contact_cache.get_name_by_wxid(wcf_msg.roomid)
+            self.actual_user_id = wcf_msg.sender
+            self.actual_user_nickname = channel.wcf.get_alias_in_chatroom(wcf_msg.sender, wcf_msg.roomid)
+            if not self.actual_user_nickname:  # 群聊获取不到企微号成员昵称，这里尝试从联系人缓存去获取
+                self.actual_user_nickname = channel.contact_cache.get_name_by_wxid(wcf_msg.sender)
+            self.room_id = wcf_msg.roomid
+            self.is_at = wcf_msg.is_at(self.wxid)  # 是否被@当前登录用户
+
+        # 判断是否是自己发送的消息
+        self.my_msg = wcf_msg.from_self()
--- a/channel/wechat/wechat_channel.py
+++ b/channel/wechat/wechat_channel.py
@@ -9,7 +9,6 @@ import json
 import os
 import threading
 import time
-
 import requests

 from bridge.context import *
@@ -21,6 +20,7 @@ from common.expired_dict import ExpiredDict
 from common.log import logger
 from common.singleton import singleton
 from common.time_check import time_checker
+from common.utils import convert_webp_to_png, remove_markdown_symbol
 from config import conf, get_appdata_dir
 from lib import itchat
 from lib.itchat.content import *
@@ -100,7 +100,10 @@ def qrCallback(uuid, status, qrcode):
        qr = qrcode.QRCode(border=1)
        qr.add_data(url)
        qr.make(fit=True)
-        qr.print_ascii(invert=True)
+        try:
+            qr.print_ascii(invert=True)
+        except UnicodeEncodeError:
+            print("ASCII QR code printing failed due to encoding issues.")


@singleton
@@ -109,28 +112,40 @@ class WechatChannel(ChatChannel):

    def __init__(self):
        super().__init__()
-        self.receivedMsgs = ExpiredDict(conf().get("expires_in_seconds"))
+        self.receivedMsgs = ExpiredDict(conf().get("expires_in_seconds", 3600))
        self.auto_login_times = 0

    def startup(self):
        try:
-            itchat.instance.receivingRetryCount = 600  # 修改断线超时时间
-            # login by scan QRCode
-            hotReload = conf().get("hot_reload", False)
-            status_path = os.path.join(get_appdata_dir(), "itchat.pkl")
-            itchat.auto_login(
-                enableCmdQR=2,
-                hotReload=hotReload,
-                statusStorageDir=status_path,
-                qrCallback=qrCallback,
-                exitCallback=self.exitCallback,
-                loginCallback=self.loginCallback
-            )
-            self.user_id = itchat.instance.storageClass.userName
-            self.name = itchat.instance.storageClass.nickName
-            logger.info("Wechat login success, user_id: {}, nickname: {}".format(self.user_id, self.name))
-            # start message listener
-            itchat.run()
+            time.sleep(3)
+            logger.error("""[WechatChannel] 当前channel暂不可用，目前支持的channel有:
+                1. terminal: 终端
+                2. wechatmp: 个人公众号
+                3. wechatmp_service: 企业公众号
+                4. wechatcom_app: 企微自建应用
+                5. dingtalk: 钉钉
+                6. feishu: 飞书
+                7. web: 网页
+                8. wcf: wechat (需Windows环境，参考 https://github.com/zhayujie/chatgpt-on-wechat/pull/2562 )
+            可修改 config.json 配置文件的 channel_type 字段进行切换""")
+
+            # itchat.instance.receivingRetryCount = 600  # 修改断线超时时间
+            # # login by scan QRCode
+            # hotReload = conf().get("hot_reload", False)
+            # status_path = os.path.join(get_appdata_dir(), "itchat.pkl")
+            # itchat.auto_login(
+            #     enableCmdQR=2,
+            #     hotReload=hotReload,
+            #     statusStorageDir=status_path,
+            #     qrCallback=qrCallback,
+            #     exitCallback=self.exitCallback,
+            #     loginCallback=self.loginCallback
+            # )
+            # self.user_id = itchat.instance.storageClass.userName
+            # self.name = itchat.instance.storageClass.nickName
+            # logger.info("Wechat login success, user_id: {}, nickname: {}".format(self.user_id, self.name))
+            # # start message listener
+            # itchat.run()
        except Exception as e:
            logger.exception(e)

@@ -202,7 +217,7 @@ class WechatChannel(ChatChannel):
            logger.debug(f"[WX]receive attachment msg, file_name={cmsg.content}")
        else:
            logger.debug("[WX]receive group msg: {}".format(cmsg.content))
-        context = self._compose_context(cmsg.ctype, cmsg.content, isgroup=True, msg=cmsg)
+        context = self._compose_context(cmsg.ctype, cmsg.content, isgroup=True, msg=cmsg, no_need_at=conf().get("no_need_at", False))
        if context:
            self.produce(context)

@@ -210,9 +225,11 @@ class WechatChannel(ChatChannel):
    def send(self, reply: Reply, context: Context):
        receiver = context["receiver"]
        if reply.type == ReplyType.TEXT:
+            reply.content = remove_markdown_symbol(reply.content)
            itchat.send(reply.content, toUserName=receiver)
            logger.info("[WX] sendMsg={}, receiver={}".format(reply, receiver))
        elif reply.type == ReplyType.ERROR or reply.type == ReplyType.INFO:
+            reply.content = remove_markdown_symbol(reply.content)
            itchat.send(reply.content, toUserName=receiver)
            logger.info("[WX] sendMsg={}, receiver={}".format(reply, receiver))
        elif reply.type == ReplyType.VOICE:
@@ -229,6 +246,12 @@ class WechatChannel(ChatChannel):
                image_storage.write(block)
            logger.info(f"[WX] download image success, size={size}, img_url={img_url}")
            image_storage.seek(0)
+            if ".webp" in img_url:
+                try:
+                    image_storage = convert_webp_to_png(image_storage)
+                except Exception as e:
+                    logger.error(f"Failed to convert image: {e}")
+                    return
            itchat.send_image(image_storage, toUserName=receiver)
            logger.info("[WX] sendImage url={}, receiver={}".format(img_url, receiver))
        elif reply.type == ReplyType.IMAGE:  # 从文件读取图片
@@ -266,6 +289,7 @@ def _send_login_success():
    except Exception as e:
        pass

+
 def _send_logout():
    try:
        from common.linkai_client import chat_client
@@ -274,6 +298,7 @@ def _send_logout():
    except Exception as e:
        pass

+
 def _send_qr_code(qrcode_list: list):
    try:
        from common.linkai_client import chat_client
@@ -281,3 +306,4 @@ def _send_qr_code(qrcode_list: list):
            chat_client.send_qrcode(qrcode_list)
    except Exception as e:
        pass
+
--- a/channel/wechat/wechat_message.py
+++ b/channel/wechat/wechat_message.py
@@ -14,6 +14,11 @@ class WechatMessage(ChatMessage):
        self.create_time = itchat_msg["CreateTime"]
        self.is_group = is_group

+        notes_join_group = ["加入群聊", "加入了群聊", "invited", "joined"]  # 可通过添加对应语言的加入群聊通知中的关键词适配更多
+        notes_bot_join_group = ["邀请你", "invited you", "You've joined", "你通过扫描"]
+        notes_exit_group = ["移出了群聊", "removed"]  # 可通过添加对应语言的踢出群聊通知中的关键词适配更多
+        notes_patpat = ["拍了拍我", "tickled my", "tickled me"] # 可通过添加对应语言的拍一拍通知中的关键词适配更多
+
        if itchat_msg["Type"] == TEXT:
            self.ctype = ContextType.TEXT
            self.content = itchat_msg["Text"]
@@ -26,30 +31,47 @@ class WechatMessage(ChatMessage):
            self.content = TmpDir().path() + itchat_msg["FileName"]  # content直接存临时目录路径
            self._prepare_fn = lambda: itchat_msg.download(self.content)
        elif itchat_msg["Type"] == NOTE and itchat_msg["MsgType"] == 10000:
-            if is_group and ("加入群聊" in itchat_msg["Content"] or "加入了群聊" in itchat_msg["Content"]):
+            if is_group:
+                if any(note_bot_join_group in itchat_msg["Content"] for note_bot_join_group in notes_bot_join_group):  # 邀请机器人加入群聊
+                    logger.warn("机器人加入群聊消息，不处理~")
+                    pass
+                elif any(note_join_group in itchat_msg["Content"] for note_join_group in notes_join_group): # 若有任何在notes_join_group列表中的字符串出现在NOTE中
                # 这里只能得到nickname， actual_user_id还是机器人的id
-                if "加入了群聊" in itchat_msg["Content"]:
-                    self.ctype = ContextType.JOIN_GROUP
-                    self.content = itchat_msg["Content"]
-                    self.actual_user_nickname = re.findall(r"\"(.*?)\"", itchat_msg["Content"])[-1]
-                elif "加入群聊" in itchat_msg["Content"]:
-                    self.ctype = ContextType.JOIN_GROUP
+                    if "加入群聊" not in itchat_msg["Content"]:
+                        self.ctype = ContextType.JOIN_GROUP
+                        self.content = itchat_msg["Content"]
+                        if "invited" in itchat_msg["Content"]: # 匹配英文信息
+                            self.actual_user_nickname = re.findall(r'invited\s+(.+?)\s+to\s+the\s+group\s+chat', itchat_msg["Content"])[0]
+                        elif "joined" in itchat_msg["Content"]: # 匹配通过二维码加入的英文信息
+                            self.actual_user_nickname = re.findall(r'"(.*?)" joined the group chat via the QR Code shared by', itchat_msg["Content"])[0]
+                        elif "加入了群聊" in itchat_msg["Content"]:
+                            self.actual_user_nickname = re.findall(r"\"(.*?)\"", itchat_msg["Content"])[-1]
+                    elif "加入群聊" in itchat_msg["Content"]:
+                        self.ctype = ContextType.JOIN_GROUP
+                        self.content = itchat_msg["Content"]
+                        self.actual_user_nickname = re.findall(r"\"(.*?)\"", itchat_msg["Content"])[0]
+
+                elif any(note_exit_group in itchat_msg["Content"] for note_exit_group in notes_exit_group):  # 若有任何在notes_exit_group列表中的字符串出现在NOTE中
+                    self.ctype = ContextType.EXIT_GROUP
                    self.content = itchat_msg["Content"]
                    self.actual_user_nickname = re.findall(r"\"(.*?)\"", itchat_msg["Content"])[0]

-            elif is_group and ("移出了群聊" in itchat_msg["Content"]):
-                self.ctype = ContextType.EXIT_GROUP
-                self.content = itchat_msg["Content"]
-                self.actual_user_nickname = re.findall(r"\"(.*?)\"", itchat_msg["Content"])[0]
+                elif any(note_patpat in itchat_msg["Content"] for note_patpat in notes_patpat):  # 若有任何在notes_patpat列表中的字符串出现在NOTE中:
+                    self.ctype = ContextType.PATPAT
+                    self.content = itchat_msg["Content"]
+                    if "拍了拍我" in itchat_msg["Content"]:  # 识别中文
+                        self.actual_user_nickname = re.findall(r"\"(.*?)\"", itchat_msg["Content"])[0]
+                    elif "tickled my" in itchat_msg["Content"] or "tickled me" in itchat_msg["Content"]:
+                        self.actual_user_nickname = re.findall(r'^(.*?)(?:tickled my|tickled me)', itchat_msg["Content"])[0]
+                else:
+                    raise NotImplementedError("Unsupported note message: " + itchat_msg["Content"])
                    
            elif "你已添加了" in itchat_msg["Content"]:  #通过好友请求
                self.ctype = ContextType.ACCEPT_FRIEND
                self.content = itchat_msg["Content"]
-            elif "拍了拍我" in itchat_msg["Content"]:
+            elif any(note_patpat in itchat_msg["Content"] for note_patpat in notes_patpat):  # 若有任何在notes_patpat列表中的字符串出现在NOTE中:
                self.ctype = ContextType.PATPAT
                self.content = itchat_msg["Content"]
-                if is_group:
-                    self.actual_user_nickname = re.findall(r"\"(.*?)\"", itchat_msg["Content"])[0]
            else:
                raise NotImplementedError("Unsupported note message: " + itchat_msg["Content"])
        elif itchat_msg["Type"] == ATTACHMENT:
--- a/channel/wechatcom/wechatcomapp_channel.py
+++ b/channel/wechatcom/wechatcomapp_channel.py
@@ -17,7 +17,7 @@ from channel.wechatcom.wechatcomapp_client import WechatComAppClient
 from channel.wechatcom.wechatcomapp_message import WechatComAppMessage
 from common.log import logger
 from common.singleton import singleton
-from common.utils import compress_imgfile, fsize, split_string_by_utf8_length
+from common.utils import compress_imgfile, fsize, split_string_by_utf8_length, convert_webp_to_png, remove_markdown_symbol
 from config import conf, subscribe_msg
 from voice.audio_convert import any_to_amr, split_audio

@@ -44,7 +44,7 @@ class WechatComAppChannel(ChatChannel):

    def startup(self):
        # start message listener
-        urls = ("/wxcomapp", "channel.wechatcom.wechatcomapp_channel.Query")
+        urls = ("/wxcomapp/?", "channel.wechatcom.wechatcomapp_channel.Query")
        app = web.application(urls, globals(), autoreload=False)
        port = conf().get("wechatcomapp_port", 9898)
        web.httpserver.runsimple(app.wsgifunc(), ("0.0.0.0", port))
@@ -52,7 +52,7 @@ class WechatComAppChannel(ChatChannel):
    def send(self, reply: Reply, context: Context):
        receiver = context["receiver"]
        if reply.type in [ReplyType.TEXT, ReplyType.ERROR, ReplyType.INFO]:
-            reply_text = reply.content
+            reply_text = remove_markdown_symbol(reply.content)
            texts = split_string_by_utf8_length(reply_text, MAX_UTF8_LEN)
            if len(texts) > 1:
                logger.info("[wechatcom] text too long, split into {} parts".format(len(texts)))
@@ -99,6 +99,12 @@ class WechatComAppChannel(ChatChannel):
                image_storage = compress_imgfile(image_storage, 10 * 1024 * 1024 - 1)
                logger.info("[wechatcom] image compressed, sz={}".format(fsize(image_storage)))
            image_storage.seek(0)
+            if ".webp" in img_url:
+                try:
+                    image_storage = convert_webp_to_png(image_storage)
+                except Exception as e:
+                    logger.error(f"Failed to convert image: {e}")
+                    return
            try:
                response = self.client.media.upload("image", image_storage)
                logger.debug("[wechatcom] upload image response: {}".format(response))
@@ -156,11 +162,12 @@ class Query:
        logger.debug("[wechatcom] receive message: {}, msg= {}".format(message, msg))
        if msg.type == "event":
            if msg.event == "subscribe":
-                reply_content = subscribe_msg()
-                if reply_content:
-                    reply = create_reply(reply_content, msg).render()
-                    res = channel.crypto.encrypt_message(reply, nonce, timestamp)
-                    return res
+                pass
+                # reply_content = subscribe_msg()
+                # if reply_content:
+                #     reply = create_reply(reply_content, msg).render()
+                #     res = channel.crypto.encrypt_message(reply, nonce, timestamp)
+                #     return res
        else:
            try:
                wechatcom_msg = WechatComAppMessage(msg, client=channel.client)
--- a/channel/wechatmp/wechatmp_channel.py
+++ b/channel/wechatmp/wechatmp_channel.py
@@ -19,7 +19,7 @@ from channel.wechatmp.common import *
 from channel.wechatmp.wechatmp_client import WechatMPClient
 from common.log import logger
 from common.singleton import singleton
-from common.utils import split_string_by_utf8_length
+from common.utils import split_string_by_utf8_length, remove_markdown_symbol
 from config import conf
 from voice.audio_convert import any_to_mp3, split_audio

@@ -81,7 +81,7 @@ class WechatMPChannel(ChatChannel):
        receiver = context["receiver"]
        if self.passive_reply:
            if reply.type == ReplyType.TEXT or reply.type == ReplyType.INFO or reply.type == ReplyType.ERROR:
-                reply_text = reply.content
+                reply_text = remove_markdown_symbol(reply.content)
                logger.info("[wechatmp] text cached, receiver {}\n{}".format(receiver, reply_text))
                self.cache_dict[receiver].append(("text", reply_text))
            elif reply.type == ReplyType.VOICE:
--- a/common/const.py
+++ b/common/const.py
@@ -11,11 +11,11 @@ QWEN = "qwen"  # 旧版通义模型
 QWEN_DASHSCOPE = "dashscope"  # 通义新版sdk和api key


-GEMINI = "gemini"
+GEMINI = "gemini"  # gemini-1.0-pro
 ZHIPU_AI = "glm-4"
 MOONSHOT = "moonshot"
 MiniMax = "minimax"
-
+MODELSCOPE = "modelscope"

 # model
 CLAUDE3 = "claude-3-opus-20240229"
@@ -24,6 +24,7 @@ GPT35_0125 = "gpt-3.5-turbo-0125"
 GPT35_1106 = "gpt-3.5-turbo-1106"

 GPT_4o = "gpt-4o"
+GPT_4O_0806 = "gpt-4o-2024-08-06"
 GPT4_TURBO = "gpt-4-turbo"
 GPT4_TURBO_PREVIEW = "gpt-4-turbo-preview"
 GPT4_TURBO_04_09 = "gpt-4-turbo-2024-04-09"
@@ -32,10 +33,14 @@ GPT4_TURBO_11_06 = "gpt-4-1106-preview"
 GPT4_VISION_PREVIEW = "gpt-4-vision-preview"

 GPT4 = "gpt-4"
+GPT_4o_MINI = "gpt-4o-mini"
 GPT4_32k = "gpt-4-32k"
 GPT4_06_13 = "gpt-4-0613"
 GPT4_32k_06_13 = "gpt-4-32k-0613"

+O1 = "o1-preview"
+O1_MINI = "o1-mini"
+
 WHISPER_1 = "whisper-1"
 TTS_1 = "tts-1"
 TTS_1_HD = "tts-1-hd"
@@ -51,19 +56,58 @@ LINKAI_35 = "linkai-3.5"
 LINKAI_4_TURBO = "linkai-4-turbo"
 LINKAI_4o = "linkai-4o"

+GEMINI_PRO = "gemini-1.0-pro"
+GEMINI_15_flash = "gemini-1.5-flash"
+GEMINI_15_PRO = "gemini-1.5-pro"
+GEMINI_20_flash_exp = "gemini-2.0-flash-exp"
+
+
+GLM_4 = "glm-4"
+GLM_4_PLUS = "glm-4-plus"
+GLM_4_flash = "glm-4-flash"
+GLM_4_LONG = "glm-4-long"
+GLM_4_ALLTOOLS = "glm-4-alltools"
+GLM_4_0520 = "glm-4-0520"
+GLM_4_AIR = "glm-4-air"
+GLM_4_AIRX = "glm-4-airx"
+
+
+CLAUDE_3_OPUS = "claude-3-opus-latest"
+CLAUDE_3_OPUS_0229 = "claude-3-opus-20240229"
+CLAUDE_35_SONNET = "claude-3-5-sonnet-latest"  # 带 latest 标签的模型名称，会不断更新指向最新发布的模型
+CLAUDE_35_SONNET_1022 = "claude-3-5-sonnet-20241022"  # 带具体日期的模型名称，会固定为该日期发布的模型
+CLAUDE_35_SONNET_0620 = "claude-3-5-sonnet-20240620"
+CLAUDE_3_SONNET = "claude-3-sonnet-20240229"
+CLAUDE_3_HAIKU = "claude-3-haiku-20240307"
+
+DEEPSEEK_CHAT = "deepseek-chat"  # DeepSeek-V3对话模型
+DEEPSEEK_REASONER = "deepseek-reasoner"  # DeepSeek-R1模型
+
+GITEE_AI_MODEL_LIST = ["Yi-34B-Chat", "InternVL2-8B", "deepseek-coder-33B-instruct", "InternVL2.5-26B", "Qwen2-VL-72B", "Qwen2.5-32B-Instruct", "glm-4-9b-chat", "codegeex4-all-9b", "Qwen2.5-Coder-32B-Instruct", "Qwen2.5-72B-Instruct", "Qwen2.5-7B-Instruct", "Qwen2-72B-Instruct", "Qwen2-7B-Instruct", "code-raccoon-v1", "Qwen2.5-14B-Instruct"]
+
+MODELSCOPE_MODEL_LIST = ["LLM-Research/c4ai-command-r-plus-08-2024","mistralai/Mistral-Small-Instruct-2409","mistralai/Ministral-8B-Instruct-2410","mistralai/Mistral-Large-Instruct-2407",
+                          "Qwen/Qwen2.5-Coder-32B-Instruct","Qwen/Qwen2.5-Coder-14B-Instruct","Qwen/Qwen2.5-Coder-7B-Instruct","Qwen/Qwen2.5-72B-Instruct","Qwen/Qwen2.5-32B-Instruct","Qwen/Qwen2.5-14B-Instruct","Qwen/Qwen2.5-7B-Instruct","Qwen/QwQ-32B-Preview",
+                          "LLM-Research/Llama-3.3-70B-Instruct","opencompass/CompassJudger-1-32B-Instruct","Qwen/QVQ-72B-Preview","LLM-Research/Meta-Llama-3.1-405B-Instruct","LLM-Research/Meta-Llama-3.1-8B-Instruct","Qwen/Qwen2-VL-7B-Instruct","LLM-Research/Meta-Llama-3.1-70B-Instruct",
+                          "Qwen/Qwen2.5-14B-Instruct-1M","Qwen/Qwen2.5-7B-Instruct-1M","Qwen/Qwen2.5-VL-3B-Instruct","Qwen/Qwen2.5-VL-7B-Instruct","Qwen/Qwen2.5-VL-72B-Instruct","deepseek-ai/DeepSeek-R1-Distill-Llama-70B","deepseek-ai/DeepSeek-R1-Distill-Llama-8B","deepseek-ai/DeepSeek-R1-Distill-Qwen-32B",
+                          "deepseek-ai/DeepSeek-R1-Distill-Qwen-14B","deepseek-ai/DeepSeek-R1-Distill-Qwen-7B","deepseek-ai/DeepSeek-R1-Distill-Qwen-1.5B","deepseek-ai/DeepSeek-R1","deepseek-ai/DeepSeek-V3","Qwen/QwQ-32B"]

 MODEL_LIST = [
              GPT35, GPT35_0125, GPT35_1106, "gpt-3.5-turbo-16k",
-              GPT_4o, GPT4_TURBO, GPT4_TURBO_PREVIEW, GPT4_TURBO_01_25, GPT4_TURBO_11_06, GPT4, GPT4_32k, GPT4_06_13, GPT4_32k_06_13,
+              O1, O1_MINI, GPT_4o, GPT_4O_0806, GPT_4o_MINI, GPT4_TURBO, GPT4_TURBO_PREVIEW, GPT4_TURBO_01_25, GPT4_TURBO_11_06, GPT4, GPT4_32k, GPT4_06_13, GPT4_32k_06_13,
              WEN_XIN, WEN_XIN_4,
-              XUNFEI, GEMINI, ZHIPU_AI, MOONSHOT,
-              "claude", "claude-3-haiku", "claude-3-sonnet", "claude-3-opus", "claude-3-opus-20240229",
+              XUNFEI,
+              ZHIPU_AI, GLM_4, GLM_4_PLUS, GLM_4_flash, GLM_4_LONG, GLM_4_ALLTOOLS, GLM_4_0520, GLM_4_AIR, GLM_4_AIRX,
+              MOONSHOT, MiniMax,
+              GEMINI, GEMINI_PRO, GEMINI_15_flash, GEMINI_15_PRO,GEMINI_20_flash_exp,
+              CLAUDE_3_OPUS, CLAUDE_3_OPUS_0229, CLAUDE_35_SONNET, CLAUDE_35_SONNET_1022, CLAUDE_35_SONNET_0620, CLAUDE_3_SONNET, CLAUDE_3_HAIKU, "claude", "claude-3-haiku", "claude-3-sonnet", "claude-3-opus", "claude-3.5-sonnet",
              "moonshot-v1-8k", "moonshot-v1-32k", "moonshot-v1-128k",
              QWEN, QWEN_TURBO, QWEN_PLUS, QWEN_MAX,
-              MiniMax,
-              LINKAI_35, LINKAI_4_TURBO, LINKAI_4o
+              LINKAI_35, LINKAI_4_TURBO, LINKAI_4o,
+              DEEPSEEK_CHAT, DEEPSEEK_REASONER,
+              MODELSCOPE
            ]

+MODEL_LIST = MODEL_LIST + GITEE_AI_MODEL_LIST + MODELSCOPE_MODEL_LIST
 # channel
 FEISHU = "feishu"
 DINGTALK = "dingtalk"
--- a/common/linkai_client.py
+++ b/common/linkai_client.py
@@ -2,7 +2,7 @@ from bridge.context import Context, ContextType
 from bridge.reply import Reply, ReplyType
 from common.log import logger
 from linkai import LinkAIClient, PushMsg
-from config import conf, pconf, plugin_config, available_setting
+from config import conf, pconf, plugin_config, available_setting, write_plugin_config
 from plugins import PluginManager
 import time

@@ -42,11 +42,19 @@ class ChatClient(LinkAIClient):
        if reply_voice_mode:
            if reply_voice_mode == "voice_reply_voice":
                local_config["voice_reply_voice"] = True
+                local_config["always_reply_voice"] = False
            elif reply_voice_mode == "always_reply_voice":
                local_config["always_reply_voice"] = True
+                local_config["voice_reply_voice"] = True
+            elif reply_voice_mode == "no_reply_voice":
+                local_config["always_reply_voice"] = False
+                local_config["voice_reply_voice"] = False

-        if config.get("admin_password") and plugin_config.get("Godcmd"):
-            plugin_config["Godcmd"]["password"] = config.get("admin_password")
+        if config.get("admin_password"):
+            if not pconf("Godcmd"):
+                write_plugin_config({"Godcmd": {"password": config.get("admin_password"), "admin_users": []} })
+            else:
+                pconf("Godcmd")["password"] = config.get("admin_password")
            PluginManager().instances["GODCMD"].reload()

        if config.get("group_app_map") and pconf("linkai"):
--- a/common/utils.py
+++ b/common/utils.py
@@ -1,8 +1,9 @@
 import io
 import os
+import re
 from urllib.parse import urlparse
 from PIL import Image
-
+from common.log import logger

 def fsize(file):
    if isinstance(file, io.BytesIO):
@@ -54,3 +55,24 @@ def split_string_by_utf8_length(string, max_length, max_split=0):
 def get_path_suffix(path):
    path = urlparse(path).path
    return os.path.splitext(path)[-1].lstrip('.')
+
+
+def convert_webp_to_png(webp_image):
+    from PIL import Image
+    try:
+        webp_image.seek(0)
+        img = Image.open(webp_image).convert("RGBA")
+        png_image = io.BytesIO()
+        img.save(png_image, format="PNG")
+        png_image.seek(0)
+        return png_image
+    except Exception as e:
+        logger.error(f"Failed to convert WEBP to PNG: {e}")
+        raise
+
+
+def remove_markdown_symbol(text: str):
+    # 移除markdown格式，目前先移除**
+    if not text:
+        return text
+    return re.sub(r'\*\*(.*?)\*\*', r'\1', text)
--- a/config.py
+++ b/config.py
@@ -17,7 +17,7 @@ available_setting = {
    "open_ai_api_base": "https://api.openai.com/v1",
    "proxy": "",  # openai使用的代理
    # chatgpt模型， 当use_azure_chatgpt为true时，其名称为Azure上model deployment名称
-    "model": "gpt-3.5-turbo",  # 支持ChatGPT、Claude、Gemini、文心一言、通义千问、Kimi、讯飞星火、智谱、LinkAI等模型，模型具体名称详见common/const.py文件列出的模型
+    "model": "gpt-3.5-turbo",  # 可选择: gpt-4o, pt-4o-mini, gpt-4-turbo, claude-3-sonnet, wenxin, moonshot, qwen-turbo, xunfei, glm-4, minimax, gemini等模型，全部可选模型详见common/const.py文件
    "bot_type": "",  # 可选配置，使用兼容openai格式的三方服务时候，需填"chatGPT"。bot具体名称详见common/const.py文件列出的bot_type，如不填根据model名称判断，
    "use_azure_chatgpt": False,  # 是否使用azure的chatgpt
    "azure_deployment_id": "",  # azure 模型部署名称
@@ -27,6 +27,7 @@ available_setting = {
    "single_chat_reply_prefix": "[bot] ",  # 私聊时自动回复的前缀，用于区分真人
    "single_chat_reply_suffix": "",  # 私聊时自动回复的后缀，\n 可以换行
    "group_chat_prefix": ["@bot"],  # 群聊时包含该前缀则会触发机器人回复
+    "no_need_at": False,  # 群聊回复时是否不需要艾特
    "group_chat_reply_prefix": "",  # 群聊时自动回复的前缀
    "group_chat_reply_suffix": "",  # 群聊时自动回复的后缀，\n 可以换行
    "group_chat_keyword": [],  # 群聊时包含该关键词则会触发机器人回复
@@ -69,10 +70,13 @@ available_setting = {
    "baidu_wenxin_model": "eb-instant",  # 默认使用ERNIE-Bot-turbo模型
    "baidu_wenxin_api_key": "",  # Baidu api key
    "baidu_wenxin_secret_key": "",  # Baidu secret key
+    "baidu_wenxin_prompt_enabled": False,  # Enable prompt if you are using ernie character model
    # 讯飞星火API
    "xunfei_app_id": "",  # 讯飞应用ID
    "xunfei_api_key": "",  # 讯飞 API key
    "xunfei_api_secret": "",  # 讯飞 API secret
+    "xunfei_domain": "",  # 讯飞模型对应的domain参数，Spark4.0 Ultra为 4.0Ultra，其他模型详见: https://www.xfyun.cn/doc/spark/Web.html
+    "xunfei_spark_url": "",  # 讯飞模型对应的请求地址，Spark4.0 Ultra为 wss://spark-api.xf-yun.com/v4.0/chat，其他模型参考详见: https://www.xfyun.cn/doc/spark/Web.html
    # claude 配置
    "claude_api_cookie": "",
    "claude_uuid": "",
@@ -95,8 +99,8 @@ available_setting = {
    "group_speech_recognition": False,  # 是否开启群组语音识别
    "voice_reply_voice": False,  # 是否使用语音回复语音，需要设置对应语音合成引擎的api key
    "always_reply_voice": False,  # 是否一直使用语音回复
-    "voice_to_text": "openai",  # 语音识别引擎，支持openai,baidu,google,azure
-    "text_to_voice": "openai",  # 语音合成引擎，支持openai,baidu,google,pytts(offline),azure,elevenlabs,edge(online)
+    "voice_to_text": "openai",  # 语音识别引擎，支持openai,baidu,google,azure,xunfei,ali
+    "text_to_voice": "openai",  # 语音合成引擎，支持openai,baidu,google,azure,xunfei,ali,pytts(offline),elevenlabs,edge(online)
    "text_to_voice_model": "tts-1",
    "tts_voice_id": "alloy",
    # baidu 语音api配置， 使用百度语音识别和语音合成时需要
@@ -167,6 +171,9 @@ available_setting = {
    "zhipu_ai_api_base": "https://open.bigmodel.cn/api/paas/v4",
    "moonshot_api_key": "",
    "moonshot_base_url": "https://api.moonshot.cn/v1/chat/completions",
+    #魔搭社区 平台配置
+    "modelscope_api_key": "",
+    "modelscope_base_url": "https://api-inference.modelscope.cn/v1/chat/completions",
    # LinkAI平台配置
    "use_linkai": False,
    "linkai_api_key": "",
@@ -175,6 +182,7 @@ available_setting = {
    "Minimax_api_key": "",
    "Minimax_group_id": "",
    "Minimax_base_url": "",
+    "web_port": 9899,
 }


@@ -242,7 +250,7 @@ def drag_sensitive(config):
            conf_dict_copy = copy.deepcopy(conf_dict)
            for key in conf_dict_copy:
                if "key" in key or "secret" in key:
-                    if isinstance(key, str):
+                    if isinstance(conf_dict_copy[key], str):
                        conf_dict_copy[key] = conf_dict_copy[key][0:3] + "*" * 5 + conf_dict_copy[key][-3:]
            return json.dumps(conf_dict_copy, indent=4)

@@ -250,7 +258,7 @@ def drag_sensitive(config):
            config_copy = copy.deepcopy(config)
            for key in config:
                if "key" in key or "secret" in key:
-                    if isinstance(key, str):
+                    if isinstance(config_copy[key], str):
                        config_copy[key] = config_copy[key][0:3] + "*" * 5 + config_copy[key][-3:]
            return config_copy
    except Exception as e:
@@ -337,6 +345,14 @@ def write_plugin_config(pconf: dict):
    for k in pconf:
        plugin_config[k.lower()] = pconf[k]

+def remove_plugin_config(name: str):
+    """
+    移除待重新加载的插件全局配置
+    :param name: 待重载的插件名
+    """
+    global plugin_config
+    plugin_config.pop(name.lower(), None)
+

 def pconf(plugin_name: str) -> dict:
    """
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -6,6 +6,7 @@ services:
    security_opt:
      - seccomp:unconfined
    environment:
+      TZ: 'Asia/Shanghai'
      OPEN_AI_API_KEY: 'YOUR API KEY'
      MODEL: 'gpt-3.5-turbo'
      PROXY: ''
--- a/plugins/config.json.template
+++ b/plugins/config.json.template
@@ -10,9 +10,7 @@
    },
    "tool": {
        "tools": [
-            "python",
            "url-get",
-            "terminal",
            "meteo-weather"
        ],
        "kwargs": {
--- a/plugins/godcmd/godcmd.py
+++ b/plugins/godcmd/godcmd.py
@@ -313,7 +313,7 @@ class Godcmd(Plugin):
                    except Exception as e:
                        ok, result = False, "你没有设置私有GPT模型"
                elif cmd == "reset":
-                    if bottype in [const.OPEN_AI, const.CHATGPT, const.CHATGPTONAZURE, const.LINKAI, const.BAIDU, const.XUNFEI, const.QWEN, const.GEMINI, const.ZHIPU_AI]:
+                    if bottype in [const.OPEN_AI, const.CHATGPT, const.CHATGPTONAZURE, const.LINKAI, const.BAIDU, const.XUNFEI, const.QWEN, const.GEMINI, const.ZHIPU_AI, const.CLAUDEAPI]:
                        bot.sessions.clear_session(session_id)
                        if Bridge().chat_bots.get(bottype):
                            Bridge().chat_bots.get(bottype).sessions.clear_session(session_id)
@@ -339,7 +339,8 @@ class Godcmd(Plugin):
                            ok, result = True, "配置已重载"
                        elif cmd == "resetall":
                            if bottype in [const.OPEN_AI, const.CHATGPT, const.CHATGPTONAZURE, const.LINKAI,
-                                           const.BAIDU, const.XUNFEI, const.QWEN, const.GEMINI, const.ZHIPU_AI, const.MOONSHOT]:
+                                           const.BAIDU, const.XUNFEI, const.QWEN, const.GEMINI, const.ZHIPU_AI, const.MOONSHOT,
+                                           const.MODELSCOPE]:
                                channel.cancel_all_session()
                                bot.sessions.clear_all_session()
                                ok, result = True, "重置所有会话成功"
@@ -477,7 +478,7 @@ class Godcmd(Plugin):
        return model

    def reload(self):
-        gconf = plugin_config[self.name]
+        gconf = pconf(self.name)
        if gconf:
            if gconf.get("password"):
                self.password = gconf["password"]
--- a/plugins/keyword/keyword.py
+++ b/plugins/keyword/keyword.py
@@ -55,7 +55,7 @@ class Keyword(Plugin):
            reply_text = self.keyword[content]

            # 判断匹配内容的类型
-            if (reply_text.startswith("http://") or reply_text.startswith("https://")) and any(reply_text.endswith(ext) for ext in [".jpg", ".jpeg", ".png", ".gif", ".img"]):
+            if (reply_text.startswith("http://") or reply_text.startswith("https://")) and any(reply_text.endswith(ext) for ext in [".jpg", ".webp", ".jpeg", ".png", ".gif", ".img"]):
            # 如果是以 http:// 或 https:// 开头，且".jpg", ".jpeg", ".png", ".gif", ".img"结尾，则认为是图片 URL。
                reply = Reply()
                reply.type = ReplyType.IMAGE_URL
--- a/plugins/linkai/README.md
+++ b/plugins/linkai/README.md
@@ -98,6 +98,8 @@

 如果不想创建 `plugins/linkai/config.json` 配置，可以直接通过 `$linkai sum open` 指令开启该功能。

+也可以通过私聊(全局 `config.json` 中的 `linkai_app_code`)或者群聊绑定(通过`group_app_map`参数配置)的应用来开启该功能：在LinkAI平台 [应用配置](https://link-ai.tech/console/factory) 里添加并开启**内容总结**插件。
+
 #### 使用

 功能开启后，向机器人发送 **文件**、 **分享链接卡片**、**图片** 即可生成摘要，进一步可以与文件或链接的内容进行多轮对话。如果需要关闭某种类型的内容总结，设置 `summary`配置中的type字段即可。
--- a/plugins/linkai/linkai.py
+++ b/plugins/linkai/linkai.py
@@ -9,7 +9,7 @@ from common.expired_dict import ExpiredDict
 from common import const
 import os
 from .utils import Util
-from config import plugin_config
+from config import plugin_config, conf


@plugins.register(
@@ -28,7 +28,7 @@ class LinkAI(Plugin):
            # 未加载到配置，使用模板中的配置
            self.config = self._load_config_template()
        if self.config:
-            self.mj_bot = MJBot(self.config.get("midjourney"))
+            self.mj_bot = MJBot(self.config.get("midjourney"), self._fetch_group_app_code)
        self.sum_config = {}
        if self.config:
            self.sum_config = self.config.get("summary")
@@ -56,7 +56,8 @@ class LinkAI(Plugin):
                return
            if context.type != ContextType.IMAGE:
                _send_info(e_context, "正在为你加速生成摘要，请稍后")
-            res = LinkSummary().summary_file(file_path)
+            app_code = self._fetch_app_code(context)
+            res = LinkSummary().summary_file(file_path, app_code)
            if not res:
                if context.type != ContextType.IMAGE:
                    _set_reply_text("因为神秘力量无法获取内容，请稍后再试吧", e_context, level=ReplyType.TEXT)
@@ -74,7 +75,8 @@ class LinkAI(Plugin):
            if not LinkSummary().check_url(context.content):
                return
            _send_info(e_context, "正在为你加速生成摘要，请稍后")
-            res = LinkSummary().summary_url(context.content)
+            app_code = self._fetch_app_code(context)
+            res = LinkSummary().summary_url(context.content, app_code)
            if not res:
                _set_reply_text("因为神秘力量无法获取文章内容，请稍后再试吧~", e_context, level=ReplyType.TEXT)
                return
@@ -169,7 +171,7 @@ class LinkAI(Plugin):
            return

        if len(cmd) == 3 and cmd[1] == "sum" and (cmd[2] == "open" or cmd[2] == "close"):
-            # 知识库开关指令
+            # 总结对话开关指令
            if not Util.is_admin(e_context):
                _set_reply_text("需要管理员权限执行", e_context, level=ReplyType.ERROR)
                return
@@ -192,14 +194,36 @@ class LinkAI(Plugin):
        return

    def _is_summary_open(self, context) -> bool:
-        if not self.sum_config or not self.sum_config.get("enabled"):
-            return False
-        if context.kwargs.get("isgroup") and not self.sum_config.get("group_enabled"):
-            return False
-        support_type = self.sum_config.get("type") or ["FILE", "SHARING"]
-        if context.type.name not in support_type and context.type.name != "TEXT":
-            return False
-        return True
+        # 获取远程应用插件状态
+        remote_enabled = False
+        if context.kwargs.get("isgroup"):
+            # 群聊场景只查询群对应的app_code
+            group_name = context.get("msg").from_user_nickname
+            app_code = self._fetch_group_app_code(group_name)
+            if app_code:
+                if context.type.name in ["FILE", "SHARING"]:
+                    remote_enabled = Util.fetch_app_plugin(app_code, "内容总结")
+        else:
+            # 非群聊场景使用全局app_code
+            app_code = conf().get("linkai_app_code")
+            if app_code:
+                if context.type.name in ["FILE", "SHARING"]:
+                    remote_enabled = Util.fetch_app_plugin(app_code, "内容总结")
+
+        # 基础条件：总开关开启且消息类型符合要求
+        base_enabled = (
+                self.sum_config
+                and self.sum_config.get("enabled")
+                and (context.type.name in (
+                    self.sum_config.get("type") or ["FILE", "SHARING"]) or context.type.name == "TEXT")
+        )
+
+        # 群聊：需要满足(总开关和群开关)或远程插件开启
+        if context.kwargs.get("isgroup"):
+            return (base_enabled and self.sum_config.get("group_enabled")) or remote_enabled
+
+        # 非群聊：只需要满足总开关或远程插件开启
+        return base_enabled or remote_enabled

    # LinkAI 对话任务处理
    def _is_chat_task(self, e_context: EventContext):
@@ -230,6 +254,19 @@ class LinkAI(Plugin):
            app_code = group_mapping.get(group_name) or group_mapping.get("ALL_GROUP")
            return app_code

+    def _fetch_app_code(self, context) -> str:
+        """
+        根据主配置或者群聊名称获取对应的应用code,优先获取群聊配置的应用code
+        :param context: 上下文
+        :return: 应用code
+        """
+        app_code = conf().get("linkai_app_code")
+        if context.kwargs.get("isgroup"):
+            # 群聊场景只查询群对应的app_code
+            group_name = context.get("msg").from_user_nickname
+            app_code = self._fetch_group_app_code(group_name)
+        return app_code
+
    def get_help_text(self, verbose=False, **kwargs):
        trigger_prefix = _get_trigger_prefix()
        help_text = "用于集成 LinkAI 提供的知识库、Midjourney绘画、文档总结、联网搜索等能力。\n\n"
@@ -254,7 +291,7 @@ class LinkAI(Plugin):
                    plugin_conf = json.load(f)
                    plugin_conf["midjourney"]["enabled"] = False
                    plugin_conf["summary"]["enabled"] = False
-                    plugin_config["linkai"] = plugin_conf
+                    write_plugin_config({"linkai": plugin_conf})
                    return plugin_conf
        except Exception as e:
            logger.exception(e)
--- a/plugins/linkai/midjourney.py
+++ b/plugins/linkai/midjourney.py
@@ -10,6 +10,7 @@ from bridge.context import ContextType
 from plugins import EventContext, EventAction
 from .utils import Util

+
 INVALID_REQUEST = 410
 NOT_FOUND_ORIGIN_IMAGE = 461
 NOT_FOUND_TASK = 462
@@ -67,10 +68,11 @@ class MJTask:

 # midjourney bot
 class MJBot:
-    def __init__(self, config):
+    def __init__(self, config, fetch_group_app_code):
        self.base_url = conf().get("linkai_api_base", "https://api.link-ai.tech") + "/v1/img/midjourney"
        self.headers = {"Authorization": "Bearer " + conf().get("linkai_api_key")}
        self.config = config
+        self.fetch_group_app_code = fetch_group_app_code
        self.tasks = {}
        self.temp_dict = {}
        self.tasks_lock = threading.Lock()
@@ -98,7 +100,7 @@ class MJBot:
                return TaskType.VARIATION
            elif cmd_list[0].lower() == f"{trigger_prefix}mjr":
                return TaskType.RESET
-        elif context.type == ContextType.IMAGE_CREATE and self.config.get("use_image_create_prefix") and self.config.get("enabled"):
+        elif context.type == ContextType.IMAGE_CREATE and self.config.get("use_image_create_prefix") and self._is_mj_open(context):
            return TaskType.GENERATE

    def process_mj_task(self, mj_type: TaskType, e_context: EventContext):
@@ -129,8 +131,8 @@ class MJBot:
            self._set_reply_text(f"Midjourney绘画已{tips_text}", e_context, level=ReplyType.INFO)
            return

-        if not self.config.get("enabled"):
-            logger.warn("Midjourney绘画未开启，请查看 plugins/linkai/config.json 中的配置")
+        if not self._is_mj_open(context):
+            logger.warn("Midjourney绘画未开启，请查看 plugins/linkai/config.json 中的配置，或者在LinkAI平台 应用中添加/打开”MJ“插件")
            self._set_reply_text(f"Midjourney绘画未开启", e_context, level=ReplyType.INFO)
            return

@@ -409,6 +411,25 @@ class MJBot:
                    result.append(task)
        return result

+    def _is_mj_open(self, context) -> bool:
+        # 获取远程应用插件状态
+        remote_enabled = False
+        if context.kwargs.get("isgroup"):
+            # 群聊场景只查询群对应的app_code
+            group_name = context.get("msg").from_user_nickname
+            app_code = self.fetch_group_app_code(group_name)
+            if app_code:
+                remote_enabled = Util.fetch_app_plugin(app_code, "Midjourney")
+        else:
+            # 非群聊场景使用全局app_code
+            app_code = conf().get("linkai_app_code")
+            if app_code:
+                remote_enabled = Util.fetch_app_plugin(app_code, "Midjourney")
+
+        # 本地配置
+        base_enabled = self.config.get("enabled")
+
+        return base_enabled or remote_enabled

 def _send(channel, reply: Reply, context, retry_cnt=0):
    try:
--- a/plugins/linkai/summary.py
+++ b/plugins/linkai/summary.py
@@ -9,20 +9,26 @@ class LinkSummary:
    def __init__(self):
        pass

-    def summary_file(self, file_path: str):
+    def summary_file(self, file_path: str, app_code: str):
        file_body = {
            "file": open(file_path, "rb"),
-            "name": file_path.split("/")[-1],
+            "name": file_path.split("/")[-1]
+        }
+        body = {
+            "app_code": app_code
        }
        url = self.base_url() + "/v1/summary/file"
-        res = requests.post(url, headers=self.headers(), files=file_body, timeout=(5, 300))
+        logger.info(f"[LinkSum] file summary, app_code={app_code}")
+        res = requests.post(url, headers=self.headers(), files=file_body, data=body, timeout=(5, 300))
        return self._parse_summary_res(res)

-    def summary_url(self, url: str):
+    def summary_url(self, url: str, app_code: str):
        url = html.unescape(url)
        body = {
-            "url": url
+            "url": url,
+            "app_code": app_code
        }
+        logger.info(f"[LinkSum] url summary, app_code={app_code}")
        res = requests.post(url=self.base_url() + "/v1/summary/url", headers=self.headers(), json=body, timeout=(5, 180))
        return self._parse_summary_res(res)

@@ -48,7 +54,7 @@ class LinkSummary:
    def _parse_summary_res(self, res):
        if res.status_code == 200:
            res = res.json()
-            logger.debug(f"[LinkSum] url summary, res={res}")
+            logger.debug(f"[LinkSum] summary result, res={res}")
            if res.get("code") == 200:
                data = res.get("data")
                return {
--- a/plugins/linkai/utils.py
+++ b/plugins/linkai/utils.py
@@ -1,7 +1,9 @@
+import requests
+from common.log import logger
 from config import global_config
 from bridge.reply import Reply, ReplyType
 from plugins.event import EventContext, EventAction
-
+from config import conf

 class Util:
    @staticmethod
@@ -26,3 +28,23 @@ class Util:
        reply = Reply(level, content)
        e_context["reply"] = reply
        e_context.action = EventAction.BREAK_PASS
+
+    @staticmethod
+    def fetch_app_plugin(app_code: str, plugin_name: str) -> bool:
+        try:
+            headers = {"Authorization": "Bearer " + conf().get("linkai_api_key")}
+            # do http request
+            base_url = conf().get("linkai_api_base", "https://api.link-ai.tech")
+            params = {"app_code": app_code}
+            res = requests.get(url=base_url + "/v1/app/info", params=params, headers=headers, timeout=(5, 10))
+            if res.status_code == 200:
+                plugins = res.json().get("data").get("plugins")
+                for plugin in plugins:
+                    if plugin.get("name") and plugin.get("name") == plugin_name:
+                        return True
+                return False
+            else:
+                logger.warning(f"[LinkAI] find app info exception, res={res}")
+                return False
+        except Exception as e:
+            return False
--- a/plugins/plugin.py
+++ b/plugins/plugin.py
@@ -1,6 +1,6 @@
 import os
 import json
-from config import pconf, plugin_config, conf
+from config import pconf, plugin_config, conf, write_plugin_config
 from common.log import logger


@@ -18,18 +18,19 @@ class Plugin:
        if not plugin_conf:
            # 全局配置不存在，则获取插件目录下的配置
            plugin_config_path = os.path.join(self.path, "config.json")
+            logger.debug(f"loading plugin config, plugin_config_path={plugin_config_path}, exist={os.path.exists(plugin_config_path)}")
            if os.path.exists(plugin_config_path):
                with open(plugin_config_path, "r", encoding="utf-8") as f:
                    plugin_conf = json.load(f)

                # 写入全局配置内存
-                plugin_config[self.name] = plugin_conf
+                write_plugin_config({self.name: plugin_conf})
        logger.debug(f"loading plugin config, plugin_name={self.name}, conf={plugin_conf}")
        return plugin_conf

    def save_config(self, config: dict):
        try:
-            plugin_config[self.name] = config
+            write_plugin_config({self.name: config})
            # 写入全局配置
            global_config_path = "./plugins/config.json"
            if os.path.exists(global_config_path):
--- a/plugins/plugin_manager.py
+++ b/plugins/plugin_manager.py
@@ -9,7 +9,7 @@ import sys
 from common.log import logger
 from common.singleton import singleton
 from common.sorted_dict import SortedDict
-from config import conf, write_plugin_config
+from config import conf, remove_plugin_config, write_plugin_config

 from .event import *

@@ -151,6 +151,8 @@ class PluginManager:
                    self.disable_plugin(name)
                    failed_plugins.append(name)
                    continue
+                if name in self.instances:
+                    self.instances[name].handlers.clear()
                self.instances[name] = instance
                for event in instance.handlers:
                    if event not in self.listening_plugins:
@@ -161,10 +163,13 @@ class PluginManager:

    def reload_plugin(self, name: str):
        name = name.upper()
+        remove_plugin_config(name)
        if name in self.instances:
            for event in self.listening_plugins:
                if name in self.listening_plugins[event]:
                    self.listening_plugins[event].remove(name)
+            if name in self.instances:
+                self.instances[name].handlers.clear()
            del self.instances[name]
            self.activate_plugins()
            return True
--- a/plugins/role/role.py
+++ b/plugins/role/role.py
@@ -99,7 +99,8 @@ class Role(Plugin):
        if e_context["context"].type != ContextType.TEXT:
            return
        btype = Bridge().get_bot_type("chat")
-        if btype not in [const.OPEN_AI, const.CHATGPT, const.CHATGPTONAZURE, const.LINKAI]:
+        if btype not in [const.OPEN_AI, const.CHATGPT, const.CHATGPTONAZURE, const.QWEN_DASHSCOPE, const.XUNFEI, const.BAIDU, const.ZHIPU_AI, const.MOONSHOT, const.MiniMax, const.LINKAI,const.MODELSCOPE]:
+            logger.debug(f'不支持的bot: {btype}')
            return
        bot = Bridge().get_bot("chat")
        content = e_context["context"].content[:]
@@ -179,6 +180,7 @@ class Role(Plugin):
            e_context["reply"] = reply
            e_context.action = EventAction.BREAK_PASS
        else:
+            e_context["context"]["generate_breaked_by"] = EventAction.BREAK
            prompt = self.roleplays[sessionid].action(content)
            e_context["context"].type = ContextType.TEXT
            e_context["context"].content = prompt
--- a/plugins/source.json
+++ b/plugins/source.json
@@ -12,17 +12,13 @@
      "url": "https://github.com/lanvent/plugin_summary.git",
      "desc": "总结聊天记录的插件"
    },
-    "timetask": {
-      "url": "https://github.com/haikerapples/timetask.git",
-      "desc": "一款定时任务系统的插件"
-    },
    "Apilot": {
      "url": "https://github.com/6vision/Apilot.git",
      "desc": "通过api直接查询早报、热榜、快递、天气等实用信息的插件"
    },
    "pictureChange": {
      "url": "https://github.com/Yanyutin753/pictureChange.git",
-      "desc": "利用stable-diffusion和百度Ai进行图生图或者画图的插件"
+      "desc": "1. 支持百度AI和Stable Diffusion WebUI进行图像处理，提供多种模型选择，支持图生图、文生图自定义模板。2. 支持Suno音乐AI可将图像和文字转为音乐。3. 支持自定义模型进行文件、图片总结功能。4. 支持管理员控制群聊内容与参数和功能改变。"
    },
    "Blackroom": {
      "url": "https://github.com/dividduang/blackroom.git",
@@ -31,6 +27,14 @@
    "midjourney": {
      "url": "https://github.com/baojingyu/midjourney.git",
      "desc": "利用midjourney实现ai绘图的的插件"
+    },
+    "solitaire": {
+      "url": "https://github.com/Wang-zhechao/solitaire.git",
+      "desc": "机器人微信接龙插件"
+    },
+    "HighSpeedTicket": {
+      "url": "https://github.com/He0607/HighSpeedTicket.git",
+      "desc": "高铁（火车）票查询插件"
    }
  }
 }
--- a/plugins/tool/config.json.template
+++ b/plugins/tool/config.json.template
@@ -1,8 +1,6 @@
 {
  "tools": [
-    "python",
    "url-get",
-    "terminal",
    "meteo"
  ],
  "kwargs": {
--- a/plugins/tool/tool.py
+++ b/plugins/tool/tool.py
@@ -22,11 +22,13 @@ class Tool(Plugin):
    def __init__(self):
        super().__init__()
        self.handlers[Event.ON_HANDLE_CONTEXT] = self.on_handle_context
-
        self.app = self._reset_app()
-
+        if not self.tool_config.get("tools"):
+            logger.warn("[tool] init failed, ignore ")
+            raise Exception("config.json not found")
        logger.info("[tool] inited")

+
    def get_help_text(self, verbose=False, **kwargs):
        help_text = "这是一个能让chatgpt联网，搜索，数字运算的插件，将赋予强大且丰富的扩展能力。"
        trigger_prefix = conf().get("plugin_trigger_prefix", "$")
--- a/requirements-optional.txt
+++ b/requirements-optional.txt
@@ -44,3 +44,6 @@ zhipuai>=2.0.1

 # tongyi qwen new sdk
 dashscope
+
+# tencentcloud sdk
+tencentcloud-sdk-python>=3.0.0
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,11 @@
 openai==0.27.8
 HTMLParser>=0.0.2
-PyQRCode>=1.2.1
-qrcode>=7.4.2
+PyQRCode==1.2.1
+qrcode==7.4.2
 requests>=2.28.2
 chardet>=5.1.0
 Pillow
 pre-commit
 web.py
 linkai>=0.0.6.0
+
--- a/run.sh
+++ b/run.sh
@@ -0,0 +1,192 @@
+#!/usr/bin/env bash
+set -e
+
+# 颜色定义
+RED='\033[0;31m'    # 红色
+GREEN='\033[0;32m'  # 绿色
+YELLOW='\033[0;33m' # 黄色
+BLUE='\033[0;34m'   # 蓝色
+NC='\033[0m'        # 无颜色
+
+# 获取当前脚本的目录
+export BASE_DIR=$(cd "$(dirname "$0")"; pwd)
+echo -e "${GREEN}📁 BASE_DIR: ${BASE_DIR}${NC}"
+
+# 检查 config.json 文件是否存在
+check_config_file() {
+    if [ ! -f "${BASE_DIR}/config.json" ]; then
+        echo -e "${RED}❌ 错误：未找到 config.json 文件。请确保 config.json 存在于当前目录。${NC}"
+        exit 1
+    fi
+}
+
+# 检查 Python 版本是否大于等于 3.7，并检查 pip 是否可用
+check_python_version() {
+    if ! command -v python3 &> /dev/null; then
+        echo -e "${RED}❌ 错误：未找到 Python3。请安装 Python 3.7 或以上版本。${NC}"
+        exit 1
+    fi
+
+    PYTHON_VERSION=$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')
+    PYTHON_MAJOR=$(echo "$PYTHON_VERSION" | cut -d'.' -f1)
+    PYTHON_MINOR=$(echo "$PYTHON_VERSION" | cut -d'.' -f2)
+
+    if (( PYTHON_MAJOR < 3 || (PYTHON_MAJOR == 3 && PYTHON_MINOR < 7) )); then
+        echo -e "${RED}❌ 错误：Python 版本为 ${PYTHON_VERSION}。请安装 Python 3.7 或以上版本。${NC}"
+        exit 1
+    fi
+
+    if ! python3 -m pip --version &> /dev/null; then
+        echo -e "${RED}❌ 错误：未找到 pip。请安装 pip。${NC}"
+        exit 1
+    fi
+}
+
+# 检查并安装缺失的依赖
+install_dependencies() {
+    echo -e "${YELLOW}⏳ 正在安装依赖...${NC}"
+
+    if [ ! -f "${BASE_DIR}/requirements.txt" ]; then
+        echo -e "${RED}❌ 错误：未找到 requirements.txt 文件。${NC}"
+        exit 1
+    fi
+
+    # 安装 requirements.txt 中的依赖，使用清华大学的 PyPI 镜像
+     pip3 install -r "${BASE_DIR}/requirements.txt" -i https://pypi.tuna.tsinghua.edu.cn/simple
+
+    # 处理 requirements-optional.txt（如果存在）
+    if [ -f "${BASE_DIR}/requirements-optional.txt" ]; then
+        echo -e "${YELLOW}⏳ 正在安装可选的依赖...${NC}"
+        pip3 install -r "${BASE_DIR}/requirements-optional.txt" -i https://pypi.tuna.tsinghua.edu.cn/simple
+    fi
+}
+
+# 启动项目
+run_project() {
+    echo -e "${GREEN}🚀 准备启动项目...${NC}"
+    cd "${BASE_DIR}"
+    sleep 2
+
+
+    # 判断操作系统类型
+    OS_TYPE=$(uname)
+
+    if [[ "$OS_TYPE" == "Linux" ]]; then
+        # 在 Linux 上使用 setsid
+        setsid python3 "${BASE_DIR}/app.py" > "${BASE_DIR}/nohup.out" 2>&1 &
+        echo -e "${GREEN}🚀 正在启动 ChatGPT-on-WeChat (Linux)...${NC}"
+    elif [[ "$OS_TYPE" == "Darwin" ]]; then
+        # 在 macOS 上直接运行
+        python3 "${BASE_DIR}/app.py" > "${BASE_DIR}/nohup.out" 2>&1 &
+        echo -e "${GREEN}🚀 正在启动 ChatGPT-on-WeChat (macOS)...${NC}"
+    else
+        echo -e "${RED}❌ 错误：不支持的操作系统 ${OS_TYPE}。${NC}"
+        exit 1
+    fi
+
+    sleep 2
+    # 显示日志输出，供用户扫码
+    tail -n 30 -f "${BASE_DIR}/nohup.out"
+
+}
+# 更新项目
+update_project() {
+    echo -e "${GREEN}🔄 准备更新项目，现在停止项目...${NC}"
+    cd "${BASE_DIR}"
+
+    # 停止项目
+    stop_project
+    echo -e "${GREEN}🔄 开始更新项目...${NC}"
+    # 更新代码，从 git 仓库拉取最新代码
+    if [ -d .git ]; then
+        GIT_PULL_OUTPUT=$(git pull)
+        if [ $? -eq 0 ]; then
+            if [[ "$GIT_PULL_OUTPUT" == *"Already up to date."* ]]; then
+                echo -e "${GREEN}✅ 代码已经是最新的。${NC}"
+            else
+                echo -e "${GREEN}✅ 代码更新完成。${NC}"
+            fi
+        else
+            echo -e "${YELLOW}⚠️ 从 GitHub 更新失败，尝试切换到 Gitee 仓库...${NC}"
+            # 更改远程仓库为 Gitee
+            git remote set-url origin https://gitee.com/zhayujie/chatgpt-on-wechat.git
+            GIT_PULL_OUTPUT=$(git pull)
+            if [ $? -eq 0 ]; then
+                if [[ "$GIT_PULL_OUTPUT" == *"Already up to date."* ]]; then
+                    echo -e "${GREEN}✅ 代码已经是最新的。${NC}"
+                else
+                    echo -e "${GREEN}✅ 从 Gitee 更新成功。${NC}"
+                fi
+            else
+                echo -e "${RED}❌ 错误：从 Gitee 更新仍然失败，请检查网络连接。${NC}"
+                exit 1
+            fi
+        fi
+    else
+        echo -e "${RED}❌ 错误：当前目录不是 git 仓库，无法更新代码。${NC}"
+        exit 1
+    fi
+
+    # 安装依赖
+    install_dependencies
+
+    # 启动项目
+    run_project
+}
+
+# 停止项目
+stop_project() {
+    echo -e "${GREEN}🛑 正在停止项目...${NC}"
+    cd "${BASE_DIR}"
+    pid=$(ps ax | grep -i app.py | grep "${BASE_DIR}" | grep python3 | grep -v grep | awk '{print $1}')
+    if [ -z "$pid" ] ; then
+        echo -e "${YELLOW}⚠️ 未找到正在运行的 ChatGPT-on-WeChat。${NC}"
+        return
+    fi
+
+    echo -e "${GREEN}🛑 正在运行的 ChatGPT-on-WeChat (PID: ${pid})${NC}"
+
+    kill ${pid}
+    sleep 3
+
+    if ps -p $pid > /dev/null; then
+        echo -e "${YELLOW}⚠️ 进程未停止，尝试强制终止...${NC}"
+        kill -9 ${pid}
+    fi
+
+    echo -e "${GREEN}✅ 已停止 ChatGPT-on-WeChat (PID: ${pid})${NC}"
+}
+
+# 主函数，根据用户参数执行操作
+case "$1" in
+    start)
+        check_config_file
+        check_python_version
+        run_project
+        ;;
+    stop)
+        stop_project
+        ;;
+    restart)
+        stop_project
+        check_config_file
+        check_python_version
+        run_project
+        ;;
+    update)
+        check_config_file
+        check_python_version
+        update_project
+        ;;
+    *)
+        echo -e "${YELLOW}=========================================${NC}"
+        echo -e "${YELLOW}用法：${GREEN}$0 ${BLUE}{start|stop|restart|update}${NC}"
+        echo -e "${YELLOW}示例：${NC}"
+        echo -e "  ${GREEN}$0 ${BLUE}start${NC}"
+        echo -e "  ${GREEN}$0 ${BLUE}stop${NC}"
+        echo -e "  ${GREEN}$0 ${BLUE}restart${NC}"
+        echo -e "  ${GREEN}$0 ${BLUE}update${NC}"
+        echo -e "${YELLOW}=========================================${NC}"
+        exit 1
+        ;;
+esac
--- a/voice/ali/ali_api.py
+++ b/voice/ali/ali_api.py
@@ -8,6 +8,7 @@ Description:

 """

+import http.client
 import json
 import time
 import requests
@@ -61,6 +62,69 @@ def text_to_speech_aliyun(url, text, appkey, token):

    return output_file

+def speech_to_text_aliyun(url, audioContent, appkey, token):
+    """
+    使用阿里云的语音识别服务识别音频文件中的语音。
+
+    参数:
+    - url (str): 阿里云语音识别服务的端点URL。
+    - audioContent (byte): pcm音频数据。
+    - appkey (str): 您的阿里云appkey。
+    - token (str): 阿里云API的认证令牌。
+
+    返回值:
+    - str: 成功时输出识别到的文本，否则为None。
+    """
+    format = 'pcm'
+    sample_rate = 16000
+    enablePunctuationPrediction  = True
+    enableInverseTextNormalization = True
+    enableVoiceDetection  = False
+
+    # 设置RESTful请求参数
+    request = url + '?appkey=' + appkey
+    request = request + '&format=' + format
+    request = request + '&sample_rate=' + str(sample_rate)
+
+    if enablePunctuationPrediction :
+        request = request + '&enable_punctuation_prediction=' + 'true'
+
+    if enableInverseTextNormalization :
+        request = request + '&enable_inverse_text_normalization=' + 'true'
+
+    if enableVoiceDetection :
+        request = request + '&enable_voice_detection=' + 'true'
+        
+    host = 'nls-gateway-cn-shanghai.aliyuncs.com'
+
+    # 设置HTTPS请求头部
+    httpHeaders = {
+        'X-NLS-Token': token,
+        'Content-type': 'application/octet-stream',
+        'Content-Length': len(audioContent)
+        }
+
+    conn = http.client.HTTPSConnection(host)
+    conn.request(method='POST', url=request, body=audioContent, headers=httpHeaders)
+
+    response = conn.getresponse()
+    body = response.read()
+    try:
+        body = json.loads(body)
+        status = body['status']
+        if status == 20000000 :
+            result = body['result']
+            if result :
+                logger.info(f"阿里云语音识别到了：{result}")
+            conn.close()
+            return result
+        else :
+            logger.error(f"语音识别失败，状态码: {status}")
+    except ValueError:
+        logger.error(f"语音识别失败，收到非JSON格式的数据: {body}")
+    conn.close()
+    return None
+

 class AliyunTokenGenerator:
    """
--- a/voice/ali/ali_voice.py
+++ b/voice/ali/ali_voice.py
@@ -15,9 +15,9 @@ import time

 from bridge.reply import Reply, ReplyType
 from common.log import logger
+from voice.audio_convert import get_pcm_from_wav
 from voice.voice import Voice
-from voice.ali.ali_api import AliyunTokenGenerator
-from voice.ali.ali_api import text_to_speech_aliyun
+from voice.ali.ali_api import AliyunTokenGenerator, speech_to_text_aliyun, text_to_speech_aliyun
 from config import conf


@@ -34,7 +34,8 @@ class AliVoice(Voice):
            self.token = None
            self.token_expire_time = 0
            # 默认复用阿里云千问的 access_key 和 access_secret
-            self.api_url = config.get("api_url")
+            self.api_url_voice_to_text = config.get("api_url_voice_to_text")
+            self.api_url_text_to_voice = config.get("api_url_text_to_voice")
            self.app_key = config.get("app_key")
            self.access_key_id = conf().get("qwen_access_key_id") or config.get("access_key_id")
            self.access_key_secret = conf().get("qwen_access_key_secret") or config.get("access_key_secret")
@@ -53,7 +54,7 @@ class AliVoice(Voice):
                      r'äöüÄÖÜáéíóúÁÉÍÓÚàèìòùÀÈÌÒÙâêîôûÂÊÎÔÛçÇñÑ，。！？,.]', '', text)
        # 提取有效的token
        token_id = self.get_valid_token()
-        fileName = text_to_speech_aliyun(self.api_url, text, self.app_key, token_id)
+        fileName = text_to_speech_aliyun(self.api_url_text_to_voice, text, self.app_key, token_id)
        if fileName:
            logger.info("[Ali] textToVoice text={} voice file name={}".format(text, fileName))
            reply = Reply(ReplyType.VOICE, fileName)
@@ -61,6 +62,25 @@ class AliVoice(Voice):
            reply = Reply(ReplyType.ERROR, "抱歉，语音合成失败")
        return reply

+    def voiceToText(self, voice_file):
+        """
+        将语音文件转换为文本。
+
+        :param voice_file: 要转换的语音文件。
+        :return: 返回一个Reply对象，其中包含转换得到的文本或错误信息。
+        """
+        # 提取有效的token
+        token_id = self.get_valid_token()
+        logger.debug("[Ali] voice file name={}".format(voice_file))
+        pcm = get_pcm_from_wav(voice_file)
+        text = speech_to_text_aliyun(self.api_url_voice_to_text, pcm, self.app_key, token_id)
+        if text:
+            logger.info("[Ali] VoicetoText = {}".format(text))
+            reply = Reply(ReplyType.TEXT, text)
+        else:
+            reply = Reply(ReplyType.ERROR, "抱歉，语音识别失败")
+        return reply
+
    def get_valid_token(self):
        """
        获取有效的阿里云token。
--- a/voice/ali/config.json.template
+++ b/voice/ali/config.json.template
@@ -1,5 +1,6 @@
 {
-    "api_url": "https://nls-gateway-cn-shanghai.aliyuncs.com/stream/v1/tts",
+    "api_url_text_to_voice": "https://nls-gateway-cn-shanghai.aliyuncs.com/stream/v1/tts",
+    "api_url_voice_to_text": "https://nls-gateway.cn-shanghai.aliyuncs.com/stream/v1/asr",
    "app_key": "",
    "access_key_id": "",
    "access_key_secret": ""
--- a/voice/azure/azure_voice.py
+++ b/voice/azure/azure_voice.py
@@ -65,7 +65,7 @@ class AzureVoice(Voice):
            reply = Reply(ReplyType.TEXT, result.text)
        else:
            cancel_details = result.cancellation_details
-            logger.error("[Azure] voiceToText error, result={}, errordetails={}".format(result, cancel_details.error_details))
+            logger.error("[Azure] voiceToText error, result={}, errordetails={}".format(result, cancel_details))
            reply = Reply(ReplyType.ERROR, "抱歉，语音识别失败")
        return reply

--- a/voice/factory.py
+++ b/voice/factory.py
@@ -50,4 +50,8 @@ def create_voice(voice_type):
        from voice.xunfei.xunfei_voice import XunfeiVoice

        return XunfeiVoice()
+    elif voice_type == "tencent":
+        from voice.tencent.tencent_voice import TencentVoice
+
+        return TencentVoice()
    raise RuntimeError
--- a/voice/tencent/config.json.template
+++ b/voice/tencent/config.json.template
@@ -0,0 +1,5 @@
+{
+    "voice_type": 1003,
+    "secret_id": "YOUR_SECRET_ID",
+    "secret_key": "YOUR_SECRET_KEY"
+}
--- a/voice/tencent/tencent_voice.py
+++ b/voice/tencent/tencent_voice.py
@@ -0,0 +1,119 @@
+import json
+import base64
+import os
+import time
+from voice.voice import Voice
+from common.log import logger
+from tencentcloud.common import credential
+from tencentcloud.asr.v20190614 import asr_client, models as asr_models
+from tencentcloud.tts.v20190823 import tts_client, models as tts_models
+from bridge.reply import Reply, ReplyType
+from common.tmp_dir import TmpDir
+
+class TencentVoice(Voice):
+    def __init__(self):
+        super().__init__()
+        self.secret_id = None
+        self.secret_key = None
+        self.voice_type = 1003
+        self._load_config()
+        
+    def _load_config(self):
+        """
+        从本地配置文件加载配置
+        """
+        try:
+            config_path = os.path.join(os.path.dirname(__file__), 'config.json')
+            with open(config_path, 'r') as f:
+                config = json.load(f)
+            self.secret_id = config.get('secret_id')
+            self.secret_key = config.get('secret_key')
+            self.voice_type = config.get('voice_type', self.voice_type)
+            if not self.secret_id or not self.secret_key:
+                logger.error("[Tencent] Missing credentials in config.json")
+        except Exception as e:
+            logger.error(f"[Tencent] Failed to load config: {e}")
+    
+    def setup(self, config):
+        """
+        设置配置信息（保留此方法用于向后兼容）
+        """
+        pass
+        
+    def voiceToText(self, voice_file):
+        """
+        将语音文件转换为文本
+        """
+        try:
+            # 实例化认证对象
+            cred = credential.Credential(self.secret_id, self.secret_key)
+            
+            # 实例化客户端
+            client = asr_client.AsrClient(cred, "ap-guangzhou")
+            
+            # 读取音频文件
+            with open(voice_file, 'rb') as f:
+                audio_data = f.read()
+            
+            # 进行base64编码
+            base64_audio = base64.b64encode(audio_data).decode('utf-8')
+            
+            # 构造请求对象
+            req = asr_models.SentenceRecognitionRequest()
+            req.ProjectId = 0
+            req.SubServiceType = 2
+            req.EngSerViceType = "16k_zh"
+            req.SourceType = 1
+            req.VoiceFormat = "wav"
+            req.UsrAudioKey = "voice_recognition"
+            req.Data = base64_audio
+            
+            # 发起请求
+            resp = client.SentenceRecognition(req)
+            
+            # 解析结果
+            if resp.Result:
+                logger.info("[Tencent] Voice to text success: {}".format(resp.Result))
+                return Reply(ReplyType.TEXT, resp.Result)
+            else:
+                logger.warning("[Tencent] Voice to text failed")
+                return Reply(ReplyType.ERROR, "腾讯语音识别失败")
+            
+        except Exception as e:
+            logger.error("[Tencent] Voice to text error: {}".format(e))
+            return Reply(ReplyType.ERROR, "腾讯语音识别出错：{}".format(str(e)))
+
+    def textToVoice(self, text):
+        """
+        将文本转换为语音
+        """
+        try:
+            cred = credential.Credential(self.secret_id, self.secret_key)
+            client = tts_client.TtsClient(cred, "ap-guangzhou")
+
+            req = tts_models.TextToVoiceRequest()
+            req.Text = text
+            req.SessionId = str(int(time.time()))
+            req.Volume = 5
+            req.Speed = 0
+            req.ProjectId = 0
+            req.ModelType = 1
+            req.PrimaryLanguage = 1
+            req.SampleRate = 16000
+            req.VoiceType = self.voice_type  # 客服女声
+
+            response = client.TextToVoice(req)
+            
+            if response.Audio:
+                fileName = TmpDir().path() + "reply-" + str(int(time.time())) + "-" + str(hash(text) & 0x7FFFFFFF) + ".mp3"
+                with open(fileName, "wb") as f:
+                    f.write(base64.b64decode(response.Audio))
+                logger.info("[Tencent] textToVoice text={} voice file name={}".format(text, fileName))
+                return Reply(ReplyType.VOICE, fileName)
+            else:
+                logger.error("[Tencent] textToVoice failed")
+                return Reply(ReplyType.ERROR, "腾讯语音合成失败")
+
+        except Exception as e:
+            logger.error("[Tencent] Text to voice error: {}".format(e))
+            return Reply(ReplyType.ERROR, "腾讯语音合成出错：{}".format(str(e)))
Author	SHA1	Message	Date
vision	7167310ccd	Merge pull request #2571 from 6vision/master update readme and adjust some dependency packages.	2025-04-11 16:04:55 +08:00
6vision	263667a2d4	update	2025-04-11 16:03:22 +08:00
6vision	d5cef291f6	update readme and adjust some dependency packages.	2025-04-11 15:50:28 +08:00
vision	c8d166e833	Merge pull request #2544 from wahahage/master 新增腾讯语音	2025-04-11 14:14:55 +08:00
vision	6e25782d8b	docs: Delete channel/wechat/README.md	2025-04-11 10:23:05 +08:00
vision	c3127f7e84	Merge pull request #2562 from josephier/support_wcferry feat: add support for WeChat integration via the wcferry protocol	2025-04-09 18:51:01 +08:00
josephier	e8bc173cd7	doc: Update and rename readme.md to README.md	2025-03-31 19:39:01 +08:00
josephier	4d1cdf5207	doc：update git url	2025-03-30 16:20:04 +08:00
josephier	57a473364e	Merge branch 'zhayujie:master' into master	2025-03-30 15:14:45 +08:00
vision	40b62e9d38	Add support for ModelScope API-Inference Add support for ModelScope API-Inference	2025-03-30 15:12:29 +08:00
gaojia	ead5f9926b	删除funasr	2025-03-27 10:13:38 +08:00
gaojia	814b6753c2	删除配置文件中的注释	2025-03-26 17:33:39 +08:00
gaojia	ce505251f8	修改配置文件及文件夹名称	2025-03-26 10:01:41 +08:00
yrk	5d2a987aaa	Update README.md	2025-03-25 10:38:32 +08:00
yanrk123	4d67e08723	Fix the issue with Chinese description in drawing.	2025-03-18 14:11:22 +08:00
yanrk123	2e71dd5fe2	Fix bug in modelscope_bot.py	2025-03-18 09:47:39 +08:00
yanrk123	c3b9643227	Modify ms_bot.py	2025-03-17 15:46:50 +08:00
josephier	0aad5dc2b7	Update wcferry version Update wcferry version	2025-03-16 19:16:59 +08:00
yanrk123	cec900168f	Modify model list	2025-03-14 13:56:00 +08:00
josephier	f9b1c403d5	docs: Update readme.md	2025-03-12 20:33:35 +08:00
yrk111222	9024b602f5	Update modelscope_bot.py	2025-03-12 16:15:40 +08:00
yanrk123	c139fd9a57	support stream mode for QwQ-32B	2025-03-12 15:45:52 +08:00
yrk111222	e299b68163	Update const.py	2025-03-11 16:48:37 +08:00
yanrk123	7777a53a82	Add supported model list	2025-03-11 16:34:43 +08:00
yanrk123	3e185dbbfe	Add support for ModelScope API	2025-03-11 11:12:57 +08:00
josephier	e8a32af369	docs: add README for wx channel based on wcferry docs: add README for wx channel based on wcferry	2025-03-10 20:36:41 +08:00
josephier	7b0ec6687e	docs：add README for WechatFerry channel	2025-03-10 20:29:37 +08:00
gaojia	ec1c6c7b92	新增腾讯语音	2025-03-04 09:56:26 +08:00
josephier	8dfaa86760	chore: remove incomplete features for wchatferry	2025-02-14 00:41:31 +08:00
josephier	323aebd1be	feat: add support for WeChat integration via the wchatferry	2025-02-14 00:25:09 +08:00
Saboteur7	436c038a2f	fix: temporarily remove unavailable channels	2025-02-05 12:25:30 +08:00
vision	ccd50ec6c0	Merge pull request #2485 from 6vision/master feat: Add support for deepseek-chat and deepseek-reasoner models	2025-02-04 10:29:24 +08:00
6vision	a7541c2c0f	feat: Support #model directive to set model to deepseek-chat and deepseek-reasoner	2025-02-03 21:23:05 +08:00
Saboteur7	c3a57d756c	fix: remove channel restrictions	2025-01-31 00:27:20 +08:00
Saboteur7	aa300a4c98	fix: temporarily close the wx channel to prevent account ban	2025-01-17 17:24:42 +08:00
vision	83ea7352b9	Merge pull request #2430 from PJ-568/master fix: domain type of xunfei lite	2025-01-15 20:03:43 +08:00
Saboteur7	9050712cd8	Update README.md	2024-12-28 16:28:35 +08:00
Saboteur7	8d92fdbb6e	Update README.md	2024-12-28 16:27:31 +08:00
zhayujie	a2442ec1b9	Merge pull request #2435 from 6vision/master fix: resolve display issue for replies containing only image URLs	2024-12-27 00:02:55 +08:00
vision	71662c9cd9	Merge branch 'zhayujie:master' into master	2024-12-26 23:17:21 +08:00
vision	54ff5dbcc2	fix: resolve display issue for replies containing only URLs	2024-12-26 23:16:05 +08:00
zhayujie	4ab7bd3b51	Merge pull request #2431 from 6vision/support-GiteeAI feat: add gitee-ai models that are compatible with openai format	2024-12-24 20:42:17 +08:00
vision	ef3c61a297	update readme	2024-12-24 19:57:26 +08:00
vision	abf79bf60c	add gitee-ai model resources that are compatible with openai format	2024-12-21 17:24:32 +08:00
PJ568	5d3cecd926	fix: domain type of xunfei lite Reference: [Web API 接口说明](https://www.xfyun.cn/doc/spark/Web.html#_1-%E6%8E%A5%E5%8F%A3%E8%AF%B4%E6%98%8E)的 `parameter.chat部分`。	2024-12-20 14:46:25 +08:00
Saboteur7	16324e7283	Merge pull request #2407 from ayasa520/fix_reloadp fix(plugin): fix reloadp command not taking effect	2024-12-13 15:39:33 +08:00
Saboteur7	9f7e2e1572	Merge pull request #2413 from ayasa520/fix-scanp fix: Memory leak caused by scanp command due to handler's reference of plugin instance	2024-12-13 14:57:22 +08:00
vision	857ce1d530	Merge pull request #2398 from stonyz/web-channel 增加web channel	2024-12-13 11:45:01 +08:00
vision	be0d72775d	Merge pull request #2423 from 6vision/reedme_update_docker_deploy update readme	2024-12-13 11:41:17 +08:00
vision	7832a2495b	Merge pull request #2422 from printlndarling/master add: add gemini-2.0-flash-exp model	2024-12-13 11:35:26 +08:00
6vision	0506b7f735	update readme	2024-12-13 11:25:36 +08:00
繁星_逐梦	4c0b7942f0	add: gemini-2.0-flash-exp model	2024-12-12 22:22:14 +08:00
繁星_逐梦	651c840c4a	add: gemini-2.0-flash-exp model	2024-12-12 22:19:13 +08:00
rikka	2a351ca415	fix(reloadp): clear handlers when reloading plugin to avoid memory leaks	2024-12-05 00:33:00 +08:00
rikka	49b7106d71	fix: Memory leak caused by scanp command due to handler's reference to plugin instance. close #2412	2024-12-03 22:39:56 +08:00
zhayujie	8bf633f539	Merge pull request #2408 from 6vision/fix-summary-image 图像识别逻辑优化	2024-12-02 21:53:52 +08:00
6vision	0f8efcb4b0	图像识别逻辑优化	2024-12-02 21:16:59 +08:00
Rikka	c567641c5c	fix(plugin): fix reloadp command not taking effect - Use write_plugin_config() instead of directly modifying plugin_config dict - Add remove_plugin_config() to clear plugin config before reload - Update plugins to use pconf() and write_plugin_config() for better config management	2024-12-02 16:38:21 +08:00
vision	bdc3820382	Merge pull request #2405 from 6vision/role-plugin-linkai Linkai bot is compatible with the role plugin.	2024-12-02 12:16:30 +08:00
6vision	33a69a7907	Linkai bot is compatible with the role plugin.	2024-12-02 12:13:26 +08:00
vision	a4d0e9bbc3	Merge pull request #2401 from 6vision/plugins_source_update 插件列表更新	2024-11-29 11:09:27 +08:00
6vision	afc753e1d2	插件列表更新	2024-11-29 11:07:16 +08:00
zhayujie	e641a41224	Update README.md	2024-11-28 21:48:42 +08:00
vision	79305c0632	Merge pull request #2400 from 6vision/readme_update readme update	2024-11-28 12:59:00 +08:00
6vision	ef2ce3f09d	说明文档更新	2024-11-28 12:41:00 +08:00
Stony	71c18c04fc	增加web channel	2024-11-27 08:53:13 +08:00
Saboteur7	cf84e57f81	fix: add exception handling	2024-11-15 11:58:10 +08:00
vision	9421d44579	Merge pull request #2373 from 6vision/summary_app_code Buy using app code, supports custom summary prompt .	2024-11-07 20:16:53 +08:00
6vision	5cd2ae8cc8	Summary supports app_code	2024-11-06 21:45:03 +08:00
vision	22d67b3a59	Merge pull request #2364 from 6vision/1031 1.7.3 release readme	2024-10-31 14:44:55 +08:00
6vision	e102cbb8c4	1.7.3 release readme	2024-10-31 14:39:11 +08:00
vision	d90eeb7ee4	Merge pull request #2363 from 6vision/linkai_plugin Summary and MJ support can be configured through LinkAI platform app plugins	2024-10-31 11:50:53 +08:00
vision	1989d53031	Merge pull request #2361 from 6vision/claude_model_update Claude model update	2024-10-31 11:50:11 +08:00
6vision	04ef0907b4	Summary and MJ support can be configured through LinkAI platform app plugins.	2024-10-31 11:15:44 +08:00
6vision	517b43561c	Merge branch 'claude_model_update' of git@github.com:6vision/chatgpt-on-wechat.git into claude_model_update	2024-10-28 00:32:46 +08:00
6vision	ccb8c7227f	Support setting base URL and proxy for Claude model. Also support reset command.	2024-10-28 00:32:05 +08:00
vision	9fbfeeb04f	Merge branch 'zhayujie:master' into claude_model_update	2024-10-27 23:43:16 +08:00
6vision	8b753a5a1f	Signed-off-by: 6vision <vision_wangpc@sina.com>	2024-10-27 21:44:06 +08:00
6vision	d25cab0627	Claude model supports system prompts.	2024-10-27 21:37:58 +08:00
6vision	84da0a8a35	feat:update claude-35-sonnet model	2024-10-24 20:57:03 +08:00
vision	6f665cffba	Merge pull request #2354 from 6vision/group_patpat_note fix: group patpat notes	2024-10-24 19:53:18 +08:00
6vision	aea8ac2e97	Signed-off-by: 6vision <vision_wangpc@sina.com>	2024-10-24 19:48:50 +08:00
vision	8418fa7b45	Merge pull request #2344 from 6vision/markdown_format_display Optimize markdown format display	2024-10-21 10:27:03 +08:00
6vision	9cc4d0ee07	Optimize markdown format display	2024-10-21 10:23:39 +08:00
Saboteur7	da60831c44	fix: fixed the version of qrcode dependency	2024-10-19 16:14:49 +08:00
Saboteur7	0773174a20	Merge branch 'master' of github.com:zhayujie/chatgpt-on-wechat	2024-10-19 15:55:04 +08:00
Saboteur7	70e007d8ca	fix: try to solve the unresponsiveness problem	2024-10-19 15:49:57 +08:00
vision	fcc4d02c2f	Merge pull request #2339 from 6vision/master Optimize Gemini model character statistics	2024-10-14 12:19:27 +08:00
vision	f4a5f00593	Merge branch 'zhayujie:master' into master	2024-10-14 12:18:33 +08:00
6vision	1170ed6566	Optimize Gemini model character statistics	2024-10-14 12:17:10 +08:00
zhayujie	883f0d449b	Merge pull request #2317 from 6vision/master feat: add install.sh and run.sh	2024-09-26 16:43:56 +08:00
6vision	f4c62e7844	update install.sh url	2024-09-26 16:43:12 +08:00
6vision	f0d212a9d2	Merge branch 'master' of github.com:6vision/chatgpt-on-wechat	2024-09-26 16:02:19 +08:00
6vision	76a8974034	update run.sh	2024-09-26 16:01:44 +08:00
vision	0614e822f4	Merge branch 'zhayujie:master' into master	2024-09-26 13:07:45 +08:00
vision	6f682c9a2e	Merge pull request #2311 from cmgzn/master fix: gemini doesn't receive system messages...	2024-09-26 13:04:47 +08:00
6vision	a9fdbc31c5	update date	2024-09-26 13:02:38 +08:00
cmgzn	086fdb5856	fix gemini logger	2024-09-26 02:49:52 +01:00
6vision	63c8ef4f17	feat: install.sh and run.sh	2024-09-26 00:34:52 +08:00
zhayujie	736f6523c7	Merge branch 'master' into master	2024-09-25 23:11:13 +08:00
vision	8b0b360d25	Merge pull request #2288 from KuroIVeko/patch-3 Support more models from Zhipu AI	2024-09-25 22:28:16 +08:00
vision	80b84e2ee6	Merge pull request #2277 from KuroIVeko/patch-1 Lower Gemini's safety thresholds	2024-09-25 22:24:20 +08:00
vision	b5b7d86f7b	Merge pull request #2278 from 6vision/moonshoot fix: "model":"mooshoot", which defaults to "moonshot-v1-32k".	2024-09-25 22:10:40 +08:00
cmgzn	f20d704390	fix: gemini doesn't receive system messages; change session to gpt method, add system messages as user messages to the gemini, and logging historical messages	2024-09-20 09:10:21 +01:00
vision	e4e1e2e944	Merge pull request #2306 from 6vision/master fix: Linkai voice configuration	2024-09-18 19:43:41 +08:00
vision	6bc7eeb4cc	Merge branch 'zhayujie:master' into master	2024-09-18 19:41:23 +08:00
6vision	656ed5de7b	fix: LinkAI voice onfiguration	2024-09-18 19:40:51 +08:00
zhayujie	a11d695c78	Merge pull request #2300 from 6vision/master feat: support o1-preview and o1-mini model	2024-09-13 10:50:04 +08:00
6vision	c4f9acd5c5	update	2024-09-13 10:48:51 +08:00
6vision	5ef929dc42	o1 model support #model	2024-09-13 10:21:38 +08:00
6vision	c8cf27b544	feat: support o1-preview and o1-mini model	2024-09-13 10:13:23 +08:00
vision	bb5ecfc398	Merge pull request #2298 from 6vision/error_print_ascii_windows Handle ASCII QR code print error on Windows	2024-09-11 22:35:30 +08:00
6vision	c91e7c35bb	Remove unused imports	2024-09-11 22:34:33 +08:00
6vision	532d56df2d	Handle ASCII QR code print error on Windows	2024-09-11 22:30:25 +08:00
KurolVeko	111ad44029	Update const.py	2024-09-05 11:07:06 +08:00
KurolVeko	6b02bae957	Update bridge.py	2024-09-05 10:59:57 +08:00
vision	6831743416	Merge pull request #2286 from 6vision/gpt feat: support gpt-4o-2024-08-06 model	2024-09-04 18:44:08 +08:00
6vision	63e2f42636	feat: support gpt-4o-2024-08-06 model	2024-09-04 18:39:29 +08:00
6vision	f6e6805453	fix: "model":"mooshoot", which defaults to "moonshot-v1-32k".	2024-08-31 16:09:10 +08:00
KurolVeko	ad77ad8f2b	Lower Gemini's safety thresholds Gemini's default safety thresholds are set too high, resulting in frequent censorship of generated text. I have lowered the thresholds for all four safety categories according to Google's documentation.	2024-08-30 17:00:51 +08:00
Saboteur7	469524e8ae	Merge pull request #2206 from VanJohnPK/master fix azure voice error 修复Azure语音服务报错问题	2024-08-29 11:33:49 +08:00
Saboteur7	f4f55d5dfd	Merge pull request #2247 from byang822/abacusoft-alex wenxin character model supports prompt	2024-08-29 11:31:45 +08:00
Saboteur7	c248d0f3f4	Merge pull request #2262 from 6vision/cancel_wecom_subscribe Cancel subscribe_msg of wechatcomapp channel	2024-08-29 11:31:04 +08:00
Saboteur7	648a04b513	Merge pull request #2265 from 6vision/feat0825 Support configuration whether to be @ in group chat.	2024-08-29 11:30:46 +08:00
vision	bdc86c16ec	Merge pull request #2268 from 6vision/xunfei_system_prompt Xunfei supports system prompt(character_desc).	2024-08-27 20:46:07 +08:00
6vision	21efd17c17	Xunfei supports system prompt(character_desc).	2024-08-25 22:22:29 +08:00
Saboteur7	aaa75e7b62	Merge pull request #2267 from 6vision/master Optimize the welcome message for new members.	2024-08-25 17:16:11 +08:00
6vision	6d0cef3152	Optimize the welcome message for new members.	2024-08-25 17:10:44 +08:00
Saboteur7	c18472289f	Merge pull request #2207 from Abyss-Seeker/master 支持更多语言（英语）的微信客户端	2024-08-25 16:10:33 +08:00
6vision	02b7c70a81	Support configuration whether to be @ in group chat.	2024-08-25 15:13:25 +08:00
6vision	4eaa2b93c6	Cancel subscribe_msg of wechatcomapp channel	2024-08-22 22:03:04 +08:00
darkVinci	d347905373	Merge pull request #1 from zhayujie/master merge 15 commits	2024-08-21 11:21:31 +08:00
vision	f495213b2c	Merge pull request #2237 from 6vision/fix_role Optimize log information printing	2024-08-17 17:01:08 +08:00
Alex Yang	9b125913ae	wenxin character model supports prompt	2024-08-16 14:58:17 +08:00
6vision	da81f05804	Optimize log information printing	2024-08-14 23:03:57 +08:00
Abyss-Seeker	9a371a4d4d	Update wechat_message.py 加入更多英文适配（通过QR code加入群聊）	2024-08-06 23:30:32 +08:00
Abyss-Seeker	1e92828f1a	支持更多语言（英语）加入了notes_join_group,notes_exit_group,notes_patpat列表，可以在加入群聊，退出群聊和拍一拍消息中匹配更多的字符。在此完成了英语(invited, removed, tickled)的匹配，使如果微信语言是英文的话也可以正常识别啦！同时，以后也可以通过加list和判断语句的方式支持更多语言！	2024-08-04 10:14:23 +08:00
Saboteur7	7e724b3fa3	Update README.md	2024-08-02 16:06:25 +08:00
vision	3f5b976a87	Merge pull request #2181 from 6vision/webp_images Support images in webp format.	2024-08-02 13:47:39 +08:00
vision	49f2339cc2	Merge pull request #2203 from 6vision/fix_issues Fix issues	2024-08-02 13:30:14 +08:00
vision	29f1699de8	Merge pull request #2198 from 6vision/update_spark Support Spark4.0 Ultra model, optimize model configuration.	2024-08-02 01:38:15 +08:00
6vision	c415485801	Support Spark4.0 Ultra model, optimize model configuration.	2024-08-01 17:57:48 +08:00
zhayujie	6937673472	Merge pull request #2193 from 6vision/fix_tool Default close tool plugin.	2024-07-31 14:09:33 +08:00
6vision	c4f10fe876	fix: Default close tool plugin.	2024-07-31 00:01:56 +08:00
6vision	55ca652ad8	Default close tool plugin.	2024-07-30 23:14:23 +08:00
Zheng	3effd5afd1	fix azure voice error	2024-07-30 17:10:02 +08:00
Saboteur7	000c2029de	fix: remove some tools	2024-07-30 12:35:12 +08:00
Saboteur7	ab88e3af06	fix: remove some default tools	2024-07-30 12:15:35 +08:00
6vision	b544a4c954	fix: Use default expiration time for ExpiredDict if not set in config	2024-07-29 20:14:41 +08:00
6vision	baff5fafec	Optimization	2024-07-28 00:03:16 +08:00
6vision	1673de73ba	Role plugin supports more bots.	2024-07-25 22:58:57 +08:00
6vision	e68936e36e	Support images in webp format.	2024-07-25 01:19:44 +08:00
6vision	7dbd195e45	Support images in webp format.	2024-07-25 01:12:53 +08:00
vision	3dc22f98bf	Merge pull request #2177 from 6vision/Opti-azure-dalle Optimize error messages when using Azure Dalle	2024-07-24 12:38:13 +08:00
6vision	805e870c18	Optimize error messages when using Azure Dalle	2024-07-24 00:06:18 +08:00
Saboteur7	de2c031797	docs: update readme	2024-07-19 15:46:19 +08:00
Saboteur7	3aa571aa1b	Merge pull request #2163 from 6vision/wechatcom_app Ensure compatibility for /wxcomapp URL with trailing slash	2024-07-19 15:38:20 +08:00
Saboteur7	3e4969efe6	Merge branch 'master' into wechatcom_app	2024-07-19 15:38:08 +08:00
Saboteur7	446e94df76	Merge pull request #2164 from 6vision/mini_bot Support gpt-4o-mini model	2024-07-19 15:37:30 +08:00
Saboteur7	5b26066a4c	Merge pull request #2154 from distiny-cool/ali_api 增加了使用阿里云进行语音识别的引擎	2024-07-19 15:37:05 +08:00
Saboteur7	8a80de5c3f	Merge pull request #2141 from Yanyutin753/new PictureChange插件功能升级	2024-07-19 15:36:02 +08:00
6vision	52a490c87e	Support gpt-4o-mini model	2024-07-19 11:04:45 +08:00
6vision	29490741fd	Ensure compatibility for /wxcomapp URL with trailing slash	2024-07-18 23:21:45 +08:00
kody	f0e416455f	增加了使用阿里云进行语音识别的引擎	2024-07-15 22:03:31 +08:00
vision	f7a2c97943	Merge pull request #2153 from 6vision/update_linkaibot support more file types.	2024-07-15 19:09:05 +08:00
6vision	993853757b	Linkai bot supports more file types.	2024-07-15 18:57:58 +08:00
6vision	a3abfb987d	update	2024-07-15 18:50:38 +08:00
Saboteur7	2711fa1b1b	Merge branch 'master' of github.com:zhayujie/chatgpt-on-wechat	2024-07-08 19:00:03 +08:00
Saboteur7	1f7afaba07	fix: client cmd config bug	2024-07-08 18:57:27 +08:00
Clivia	e02c8bff81	PictureChange插件功能升级	2024-07-08 17:58:59 +08:00
Saboteur7	22391ba1a5	Update README.md	2024-07-05 15:45:54 +08:00
Saboteur7	a05781ec19	Merge pull request #2103 from 6vision/claude-3.5-sonnet feat: support claude-3.5-sonnet model	2024-07-05 14:39:17 +08:00
Saboteur7	f898ed6a2a	Merge branch 'master' into claude-3.5-sonnet	2024-07-05 14:32:45 +08:00
Saboteur7	e6d0a15b54	Merge pull request #2110 from He0607/新增高铁（火车）票查询插件新增高铁（火车）票查询插件	2024-07-05 14:31:15 +08:00
Saboteur7	49cff026e2	Merge pull request #2113 from 6vision/update-0626 Update parameter descriptions for clarity	2024-07-05 14:26:33 +08:00
Saboteur7	08f0023cfd	Merge pull request #2124 from 6vision/update_gemini_model Update gemini 1.5model	2024-07-05 14:26:13 +08:00
Saboteur7	e311466ee6	Merge pull request #2128 from Maroon9/fix-docker-compose fix：在docker-compose.yml文件中增加时区设置	2024-07-05 14:25:56 +08:00
wanxiangze	56789e68d7	fix：在docker-compose.yml文件中增加时区设置	2024-07-05 10:18:21 +08:00
6vision	87525bb383	update gemini model	2024-07-04 01:44:53 +08:00
6vision	bb2880191a	update gemini model	2024-07-04 01:22:55 +08:00
6vision	4f1acf26d6	Merge branch 'update-0626' of https://github.com/6vision/chatgpt-on-wechat into update-0626	2024-06-27 21:11:14 +08:00
6vision	fc2d6b21ac	update	2024-06-27 21:09:54 +08:00
zhayujie	b9e84fefbd	Merge pull request #2114 from 6vision/fix_dingtalk_group_chat fix: dingtalk channel group chat bug	2024-06-27 10:29:51 +08:00
6vision	91f5ffb2d9	Correct the log information	2024-06-26 22:34:35 +08:00
6vision	70ff2341cb	fix:dingtalk channel group chat bug	2024-06-26 22:10:58 +08:00
vision	74eed93497	Merge branch 'zhayujie:master' into update-0626	2024-06-26 15:15:32 +08:00
6vision	d02e26c014	Update parameter descriptions for clarity	2024-06-26 15:14:29 +08:00
Wu_Cool	523cade7c3	新增高铁（火车）票查询插件	2024-06-26 09:13:40 +08:00
Wu_Cool	e22c183ca9	新增高铁（火车）票查询插件	2024-06-26 09:11:04 +08:00
vision	3afd99da30	Merge pull request #2106 from 6vision/fix_sensitive Fix TypeError in config drag_sensitive function	2024-06-24 22:04:56 +08:00
6vision	f44979f983	Fix TypeError in config drag_sensitive function	2024-06-24 21:57:58 +08:00
6vision	095f9cc108	feat: support claude-3.5-sonnet model	2024-06-24 11:20:50 +08:00
zhayujie	1089076fce	Merge pull request #2044 from Wang-zhechao/add-plugins-solitaire 添加微信接龙插件	2024-06-20 20:41:37 +08:00
Wang Zhechao	70344dd214	添加微信接龙插件	2024-06-04 22:39:59 +08:00