From bc6c85c6c6b6a6252023240b53a55670b8c32ce8 Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Wed, 21 May 2025 10:43:48 +0800 Subject: [PATCH] =?UTF-8?q?update:=E5=A2=9E=E5=8A=A0ws=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E6=97=B6=E9=95=BF=EF=BC=8C=E9=81=BF=E5=85=8Dws=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=BF=87=E7=9F=AD=E5=88=B0=E5=8F=AAconn=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=E9=94=80=E6=AF=81=E4=B8=A2=E5=A4=B1=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/controller/ServerSideManageController.java | 7 ++++--- main/manager-web/src/apis/module/admin.js | 4 ++-- main/xiaozhi-server/core/websocket_server.py | 8 +++++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/ServerSideManageController.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/ServerSideManageController.java index 7ee84d36..a9664ced 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/ServerSideManageController.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/ServerSideManageController.java @@ -89,7 +89,7 @@ public class ServerSideManageController { try (WebSocketClientManager client = new WebSocketClientManager.Builder() .connectTimeout(3, TimeUnit.SECONDS) - .maxSessionDuration(5, TimeUnit.SECONDS) + .maxSessionDuration(120, TimeUnit.SECONDS) .uri(targetWsUri) .headers(headers) .build()) { @@ -104,8 +104,9 @@ public class ServerSideManageController { return false; } try { - return ServerActionResponseDTO - .isSuccess(objectMapper.readValue(jsonText, ServerActionResponseDTO.class)); + ServerActionResponseDTO response = objectMapper.readValue(jsonText, ServerActionResponseDTO.class); + Boolean isSuccess = ServerActionResponseDTO.isSuccess(response); + return isSuccess; } catch (JsonProcessingException e) { return false; } diff --git a/main/manager-web/src/apis/module/admin.js b/main/manager-web/src/apis/module/admin.js index 47cfa9f9..27c1bc3e 100644 --- a/main/manager-web/src/apis/module/admin.js +++ b/main/manager-web/src/apis/module/admin.js @@ -139,7 +139,7 @@ export default { RequestService.clearRequestTime() callback(res) }) - .fail((err) => { + .networkFail((err) => { console.error('获取ws服务端列表失败:', err) RequestService.reAjaxFun(() => { this.getWsServerList(params, callback) @@ -156,7 +156,7 @@ export default { RequestService.clearRequestTime() callback(res) }) - .fail((err) => { + .networkFail((err) => { RequestService.reAjaxFun(() => { this.sendWsServerAction(data, callback) }) diff --git a/main/xiaozhi-server/core/websocket_server.py b/main/xiaozhi-server/core/websocket_server.py index 441fd4e1..3f9e2fd7 100644 --- a/main/xiaozhi-server/core/websocket_server.py +++ b/main/xiaozhi-server/core/websocket_server.py @@ -82,11 +82,13 @@ class WebSocketServer: if new_config is None: self.logger.bind(tag=TAG).error("获取新配置失败") return False - + self.logger.bind(tag=TAG).info(f"获取新配置成功") # 检查 VAD 和 ASR 类型是否需要更新 update_vad = check_vad_update(self.config, new_config) update_asr = check_asr_update(self.config, new_config) - + self.logger.bind(tag=TAG).info( + f"检查VAD和ASR类型是否需要更新: {update_vad} {update_asr}" + ) # 更新配置 self.config = new_config # 重新初始化组件 @@ -114,7 +116,7 @@ class WebSocketServer: self._intent = modules["intent"] if "memory" in modules: self._memory = modules["memory"] - + self.logger.bind(tag=TAG).info(f"更新配置任务执行完毕") return True except Exception as e: self.logger.bind(tag=TAG).error(f"更新服务器配置失败: {str(e)}")