From 1d293244d3484322918d71a9b3ea58ecdeeb1a5b Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Thu, 26 Jun 2025 16:54:26 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=99=BA=E6=8E=A7=E5=8F=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0mcp=E6=8E=A5=E5=85=A5=E7=82=B9=E7=9A=84=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/xiaozhi/common/constant/Constant.java  | 2 +-
 .../src/main/resources/db/changelog/202506261637.sql     | 2 ++
 .../main/resources/db/changelog/db.changelog-master.yaml | 9 ++++++++-
 .../providers/tools/mcp_endpoint/mcp_endpoint_handler.py | 3 +--
 .../core/providers/tools/unified_tool_handler.py         | 6 +++++-
 5 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 main/manager-api/src/main/resources/db/changelog/202506261637.sql

diff --git a/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java b/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java
index 667b9d98..32a121fa 100644
--- a/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java
+++ b/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java
@@ -232,7 +232,7 @@ public interface Constant {
     /**
      * 版本号
      */
-    public static final String VERSION = "0.5.8";
+    public static final String VERSION = "0.6.1";
 
     /**
      * 无效固件URL
diff --git a/main/manager-api/src/main/resources/db/changelog/202506261637.sql b/main/manager-api/src/main/resources/db/changelog/202506261637.sql
new file mode 100644
index 00000000..792e00c2
--- /dev/null
+++ b/main/manager-api/src/main/resources/db/changelog/202506261637.sql
@@ -0,0 +1,2 @@
+delete from `sys_params` where id = 113;
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (113, 'server.mcp_endpoint', 'null', 'string', 1, 'mcp接入点地址');
\ No newline at end of file
diff --git a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
index 1d6f94e3..b60094ef 100755
--- a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -218,4 +218,11 @@ databaseChangeLog:
       changes:
         - sqlFile:
             encoding: utf8
-            path: classpath:db/changelog/202506191643.sql
\ No newline at end of file
+            path: classpath:db/changelog/202506191643.sql
+  - changeSet:
+      id: 202506261637
+      author: hrz
+      changes:
+        - sqlFile:
+            encoding: utf8
+            path: classpath:db/changelog/202506261637.sql
\ No newline at end of file
diff --git a/main/xiaozhi-server/core/providers/tools/mcp_endpoint/mcp_endpoint_handler.py b/main/xiaozhi-server/core/providers/tools/mcp_endpoint/mcp_endpoint_handler.py
index bf3253f0..298f59b7 100644
--- a/main/xiaozhi-server/core/providers/tools/mcp_endpoint/mcp_endpoint_handler.py
+++ b/main/xiaozhi-server/core/providers/tools/mcp_endpoint/mcp_endpoint_handler.py
@@ -15,8 +15,7 @@ logger = setup_logging()
 
 async def connect_mcp_endpoint(mcp_endpoint_url: str) -> MCPEndpointClient:
     """连接到MCP接入点"""
-    if not mcp_endpoint_url:
-        logger.bind(tag=TAG).warning("MCP接入点URL为空，跳过连接")
+    if not mcp_endpoint_url or "你的" in mcp_endpoint_url or mcp_endpoint_url == "null":
         return None
 
     try:
diff --git a/main/xiaozhi-server/core/providers/tools/unified_tool_handler.py b/main/xiaozhi-server/core/providers/tools/unified_tool_handler.py
index e65aa791..999594de 100644
--- a/main/xiaozhi-server/core/providers/tools/unified_tool_handler.py
+++ b/main/xiaozhi-server/core/providers/tools/unified_tool_handler.py
@@ -82,7 +82,11 @@ class UnifiedToolHandler:
             # 从配置中获取MCP接入点URL
             mcp_endpoint_url = self.config.get("mcp_endpoint", "")
 
-            if mcp_endpoint_url and "你的" not in mcp_endpoint_url:
+            if (
+                mcp_endpoint_url
+                and "你的" not in mcp_endpoint_url
+                and mcp_endpoint_url != "null"
+            ):
                 self.logger.info(f"正在初始化MCP接入点: {mcp_endpoint_url}")
                 mcp_endpoint_client = await connect_mcp_endpoint(mcp_endpoint_url)