Merge branch 'main' of https://github.com/joey-zhou/xiaozhi-esp32-server-java-private

Author: joey-zhou

src/main/java/com/xiaozhi/dialogue/llm/tool/mcp/device/DeviceMcpService.java

@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 
 @Service
 public class DeviceMcpService {
@@ -167,7 +168,7 @@ public DeviceMcpMessage sendMcpRequest(ChatSession chatSession, DeviceMcpMessage
         DeviceMcpMessage response = null;
         try {
             // 阻塞并等待异步操作完成
-            response = future.get();//等待2秒，没反应则退出 2, TimeUnit.SECONDS
+            response = future.get(2, TimeUnit.SECONDS);//等待2秒，没反应则退出
         } catch (Exception e) {
             logger.error("SessionId: {}, Error sending MCP request", chatSession.getSessionId(), e);
             chatSession.getDeviceMcpHolder().getMcpPendingRequests().remove(id);

src/main/java/com/xiaozhi/dialogue/service/IotService.java

@@ -288,7 +288,7 @@ private void registerMethodFunctionTools(String sessionId, ToolsSessionHolder to
 
             var toolCallback = FunctionToolCallback
                     .builder(funcName, (Map<String, Object> params, ToolContext toolContext) -> {
-                        String actFuncName = funcName.substring(4); // 原始方法调用，去掉iot_前缀
+                        String actFuncName = funcName.replace("iot_" + iotName + "_", ""); // 原始方法调用，去掉iot_iotName_前缀
                         String response_success = (String) params.get("response_success");
                         params.remove("response_success"); // 移除response_success参数，避免传递给设备
                         boolean result = sendIotMessage(sessionId, iotName, actFuncName, params);