Hot fix (#1007)

* update:优化代码

* fix:补回server.websocket配置

* update:修正版本号

.gitignore

@@ -158,8 +158,10 @@ my_wakeup_words.mp3
 !main/xiaozhi-server/config/assets/bind_code.wav
 !main/xiaozhi-server/config/assets/bind_not_found.wav
 !main/xiaozhi-server/config/assets/bind_code/*.wav
+!main/xiaozhi-server/config/assets/max_output_size.wav
 main/manager-api/.vscode
 
 # Ignore webpack cache directory
 main/manager-web/.webpack_cache/
 main/xiaozhi-server/mysql
+uploadfile

Dockerfile-web

@@ -23,7 +23,7 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # 配置Nginx
-COPY docs/docker/nginx.conf /etc/nginx/conf.d/default.conf
+COPY docs/docker/nginx.conf /etc/nginx/nginx.conf
 
 # 复制前端构建产物
 COPY --from=web-builder /app/dist /usr/share/nginx/html

README.md

@@ -6,7 +6,7 @@
 <p align="center">
 本项目为开源智能硬件项目
 <a href="https://github.com/78/xiaozhi-esp32">xiaozhi-esp32</a>提供后端服务<br/>
-根据<a href="https://ccnphfhqs21z.feishu.cn/wiki/M0XiwldO9iJwHikpXD5cEx71nKh">小智通信协议</a>使用Python实现<br/>
+根据<a href="https://ccnphfhqs21z.feishu.cn/wiki/M0XiwldO9iJwHikpXD5cEx71nKh">小智通信协议</a>使用Python、Java、Vue实现<br/>
 帮助您快速搭建小智服务器
 </p>
 
@@ -15,7 +15,8 @@
 · 简体中文
 · <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/releases">更新日志</a>
 · <a href="./README.md#%E9%83%A8%E7%BD%B2%E6%96%87%E6%A1%A3">部署文档</a>
-· <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/issues ">反馈问题</a>
+· <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/issues">反馈问题</a>
+· <a href="./docs/FAQ.md">常见问题</a>
 </p>
 <p align="center">
   <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/releases">
@@ -147,14 +148,16 @@ server:
 
 ## 部署文档
 
+![Banners](docs/images/banner2.png)
+
 本项目提供两种部署方式，请根据您的具体需求选择：
 
 #### 🚀 部署方式选择
 
 | 部署方式 | 特点 | 适用场景 | Docker部署文档 | 源码部署文档 |
 |---------|------|---------|---------|---------|
-| **最简化安装** | 智能对话、IOT功能，数据存储在配置文件 | 低配置环境，无需数据库 | [Docker只运行Server](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%B8%80docker%E5%8F%AA%E8%BF%90%E8%A1%8Cserver) | [本地源码只运行Server](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%BA%8C%E6%9C%AC%E5%9C%B0%E6%BA%90%E7%A0%81%E5%8F%AA%E8%BF%90%E8%A1%8Cserver)|
+| **最简化安装** | 智能对话、IOT功能，数据存储在配置文件 | 低配置环境，无需数据库，仅支持虾哥1.6.0及以下固件版本 | [Docker只运行Server](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%B8%80docker%E5%8F%AA%E8%BF%90%E8%A1%8Cserver) | [本地源码只运行Server](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%BA%8C%E6%9C%AC%E5%9C%B0%E6%BA%90%E7%A0%81%E5%8F%AA%E8%BF%90%E8%A1%8Cserver)|
-| **全模块安装** | 智能对话、IOT、OTA、智控台，数据存储在数据库 | 完整功能体验 |[Docker运行全模块](./docs/Deployment_all.md#%E6%96%B9%E5%BC%8F%E4%B8%80docker%E8%BF%90%E8%A1%8C%E5%85%A8%E6%A8%A1%E5%9D%97) | [本地源码运行全模块](./docs/Deployment_all.md#%E6%96%B9%E5%BC%8F%E4%BA%8C%E6%9C%AC%E5%9C%B0%E6%BA%90%E7%A0%81%E8%BF%90%E8%A1%8C%E5%85%A8%E6%A8%A1%E5%9D%97) |
+| **全模块安装** | 智能对话、IOT、OTA、智控台，数据存储在数据库 | 完整功能体验，支持虾哥最新固件 |[Docker运行全模块](./docs/Deployment_all.md#%E6%96%B9%E5%BC%8F%E4%B8%80docker%E8%BF%90%E8%A1%8C%E5%85%A8%E6%A8%A1%E5%9D%97) | [本地源码运行全模块](./docs/Deployment_all.md#%E6%96%B9%E5%BC%8F%E4%BA%8C%E6%9C%AC%E5%9C%B0%E6%BA%90%E7%A0%81%E8%BF%90%E8%A1%8C%E5%85%A8%E6%A8%A1%E5%9D%97) |
 
 > 💡 提示：以下是按最新代码部署后的测试平台，有需要可烧录测试，并发为6个，每天会清空数据
 

docs/Deployment.md

@@ -290,7 +290,7 @@ LLM:
 
 这个信息很有用的，后面`编译esp32固件`需要用到。
 
-接下来，你就可以开始 [编译esp32固件](firmware-build.md)了。
+接下来，你就可以开始 [编译1.6.0版本esp32固件](firmware-build.md)了。
 
 
 以下是一些常见问题，供参考：

docs/Deployment_all.md

@@ -122,11 +122,11 @@ http://localhost:8002/xiaozhi/doc.html
 
 这时，你需要使用浏览器，打开`智控台`，链接：http://127.0.0.1:8002 ，注册第一个用户。第一个用户即是超级管理员，以后的用户都是普通用户。普通用户只能绑定设备和配置智能体;超级管理员可以进行模型管理、用户管理、参数配置等功能。
 
-接下来要做两件重要的事情：
+接下来要做三件重要的事情：
 
 ### 第一件重要的事情
 
-使用超级管理员账号，登录系统，在顶部菜单找到`参数管理`，找到列表中第三条数据，参数编码是`server.secret`，复制它到`参数值`。
+使用超级管理员账号，登录智控台，在顶部菜单找到`参数管理`，找到列表中第一条数据，参数编码是`server.secret`，复制它到`参数值`。
 
 `server.secret`需要说明一下，这个`参数值`很重要，作用是让我们的`Server`端连接`manager-api`。`server.secret`是每次从零部署manager模块时，会自动随机生成的密钥。
 
@@ -138,7 +138,12 @@ manager-api:
   secret: 你的server.secret值
 ```
 1、把你刚才从`智控台`复制过来的`server.secret`的`参数值`复制到`.config.yaml`文件里的`secret`里。
-2、注意，把`url`改成下面的`http://xiaozhi-esp32-server-web:8002/xiaozhi`
+
+2、因为你是docker部署，把`url`改成下面的`http://xiaozhi-esp32-server-web:8002/xiaozhi`
+
+3、因为你是docker部署，把`url`改成下面的`http://xiaozhi-esp32-server-web:8002/xiaozhi`
+
+4、因为你是docker部署，把`url`改成下面的`http://xiaozhi-esp32-server-web:8002/xiaozhi`
 
 类似这样的效果
 ```
@@ -151,7 +156,7 @@ manager-api:
 
 ### 第二件重要的事情
 
-使用超级管理员账号，登录系统，在顶部菜单找到`模型配置`，然后在左侧栏点击`大语言模型`，找到第一条数据`智谱AI`，点击`修改`按钮，
+使用超级管理员账号，登录智控台，在顶部菜单找到`模型配置`，然后在左侧栏点击`大语言模型`，找到第一条数据`智谱AI`，点击`修改`按钮，
 弹出修改框后，将你注册到的`智谱AI`的密钥填写到`API密钥`中。然后点击保存。
 
 ## 5.重启xiaozhi-esp32-server
@@ -182,7 +187,17 @@ Websocket接口：
 ws://你电脑局域网的ip:8000/xiaozhi/v1/
 ```
 
-接下来，你就可以开始 [编译esp32固件](firmware-build.md)了。
+### 第三件重要的事情
+
+使用超级管理员账号，登录智控台，在顶部菜单找到`参数管理`，找到参数编码是`server.websocket`，输入你的`Websocket接口`。
+
+使用超级管理员账号，登录智控台，在顶部菜单找到`参数管理`，找到数编码是`server.ota`，输入你的`OTA接口`。
+
+接下来，你就可以开始操作你的esp32设备了，你可以`自行编译esp32固件`也可以配置使用`虾哥编译好的1.6.1以上版本的固件`。两个任选一个
+
+1、 [编译自己的esp32固件](firmware-build.md)了。
+
+2、 [基于虾哥编译好的固件配置自定义服务器](firmware-setting.md)了。
 
 
 # 方式二：本地源码运行全模块
@@ -278,13 +293,13 @@ npm run serve
 运行成功后，你需要使用浏览器，打开`智控台`，链接：http://127.0.0.1:8001 ，注册第一个用户。第一个用户即是超级管理员，以后的用户都是普通用户。普通用户只能绑定设备和配置智能体;超级管理员可以进行模型管理、用户管理、参数配置等功能。
 
 
-重要：注册成功后，使用超级管理员账号，登录系统，在顶部菜单找到`模型配置`，然后在左侧栏点击`大语言模型`，找到第一条数据`智谱AI`，点击`修改`按钮，
+重要：注册成功后，使用超级管理员账号，登录智控台，在顶部菜单找到`模型配置`，然后在左侧栏点击`大语言模型`，找到第一条数据`智谱AI`，点击`修改`按钮，
 弹出修改框后，将你注册到的`智谱AI`的密钥填写到`API密钥`中。然后点击保存。
 
-重要：注册成功后，使用超级管理员账号，登录系统，在顶部菜单找到`模型配置`，然后在左侧栏点击`大语言模型`，找到第一条数据`智谱AI`，点击`修改`按钮，
+重要：注册成功后，使用超级管理员账号，登录智控台，在顶部菜单找到`模型配置`，然后在左侧栏点击`大语言模型`，找到第一条数据`智谱AI`，点击`修改`按钮，
 弹出修改框后，将你注册到的`智谱AI`的密钥填写到`API密钥`中。然后点击保存。
 
-重要：注册成功后，使用超级管理员账号，登录系统，在顶部菜单找到`模型配置`，然后在左侧栏点击`大语言模型`，找到第一条数据`智谱AI`，点击`修改`按钮，
+重要：注册成功后，使用超级管理员账号，登录智控台，在顶部菜单找到`模型配置`，然后在左侧栏点击`大语言模型`，找到第一条数据`智谱AI`，点击`修改`按钮，
 弹出修改框后，将你注册到的`智谱AI`的密钥填写到`API密钥`中。然后点击保存。
 
 ## 5.安装Python环境
@@ -349,7 +364,7 @@ pip install -r requirements.txt
 
 ## 8.配置项目文件
 
-使用超级管理员账号，登录智控台 http://127.0.0.1:8001 ，在顶部菜单找到`参数管理`，找到列表中第三条数据，参数编码是`server.secret`，复制它到`参数值`。
+使用超级管理员账号，登录智控台 ，在顶部菜单找到`参数管理`，找到列表中第一条数据，参数编码是`server.secret`，复制它到`参数值`。
 
 `server.secret`需要说明一下，这个`参数值`很重要，作用是让我们的`Server`端连接`manager-api`。`server.secret`是每次从零部署manager模块时，会自动随机生成的密钥。
 
@@ -390,7 +405,7 @@ python app.py
 25-02-23 12:01:09[core.websocket_server] - INFO - =======================================================
 ```
 
-由于你是全模块部署，因此你有两个重要的接口需要写入到esp32中。
+由于你是全模块部署，因此你有两个重要的接口。
 
 OTA接口：
 ```
@@ -402,7 +417,18 @@ Websocket接口：
 ws://你电脑局域网的ip:8000/xiaozhi/v1/
 ```
 
-接下来，你就可以开始 [编译esp32固件](firmware-build.md)了。
+请你务必把以上两个接口地址写入到智控台中：他们将会影响websocket地址发放和自动升级功能。
+
+1、使用超级管理员账号，登录智控台，在顶部菜单找到`参数管理`，找到参数编码是`server.websocket`，输入你的`Websocket接口`。
+
+2、使用超级管理员账号，登录智控台，在顶部菜单找到`参数管理`，找到数编码是`server.ota`，输入你的`OTA接口`。
+
+
+接下来，你就可以开始操作你的esp32设备了，你可以`自行编译esp32固件`也可以配置使用`虾哥编译好的1.6.1以上版本的固件`。两个任选一个
+
+1、 [编译自己的esp32固件](firmware-build.md)了。
+
+2、 [基于虾哥编译好的固件配置自定义服务器](firmware-setting.md)了。
 
 # 常见问题
 

docs/FAQ.md

@@ -102,41 +102,7 @@ VAD:
 
 ### 7、我想通过小智控制电灯、空调、远程开关机等操作 💡
 
-本项目，支持以工具调用的方式控制HomeAssistant设备
+参考教程[ESP32设备与HomeAssistant集成指南](./homeassistant-integration.md)
-
-1、首先选择一款支持function call支持的LLM，例如`ChatGLMLLM`。
-
-2、在配置文件中，将 `selected_module.Intent` 设置为 `function_call`。
-
-3、登录`HomeAssistant`，点击`左下角个人`，切换`安全`导航栏，划到底部`长期访问令牌`生成api_key。
-
-在配置文件中，配置好你的home assistant的`devices`（被控制的设备）和`api_key`和`base_url`等信息。例如：
-
-``` yaml 
-plugins
-  home_assistant:
-    devices:
-      - 客厅,玩具灯,switch.cuco_cn_460494544_cp1_on_p_2_1
-      - 卧室,台灯,switch.iot_cn_831898993_socn1_on_p_2_1
-    base_url: http://你的homeassistant地址:8123
-    api_key: 你的home assistant api访问令牌
-```
-
-最后，允许function_call 插件在配置文件中启用`hass_get_state`(必须)、`hass_set_state`(必须)、`hass_play_music`(不想用ha听音乐可以不启动)，例如：
-
-``` yaml 
-Intent:
-  ...
-  function_call:
-    type: nointent
-    functions:
-      - change_role
-      - get_weather
-      - get_news
-      - hass_get_state
-      - hass_set_state
-      - hass_play_music
-```
 
 ### 8、更多问题，可联系我们反馈 💬
 

docs/docker/nginx.conf

@@ -1,26 +1,53 @@
-server {
+user  root;
-    listen 8002;
+worker_processes  4;
-    server_name localhost;
 
-    # 静态资源服务（Vue项目）
+events {
-    location / {
+    worker_connections  1024;
-        root /usr/share/nginx/html;
+}
-        try_files $uri $uri/ /index.html;
-    }
 
-    # API反向代理（Java项目）
+http {
-    location /xiaozhi/ {
+    include       mime.types;
-        proxy_pass http://127.0.0.1:8003;
+    default_type  application/octet-stream;
-        proxy_set_header   Host   $host;
+    sendfile        on;
-        proxy_cookie_path /api/ /;
+    keepalive_timeout  300;
-        proxy_set_header   Referer $http_referer;
+    client_header_timeout 180s;
-        proxy_set_header   Cookie $http_cookie;
+    client_body_timeout 180s;
+    client_max_body_size 1024M;
 
-        proxy_connect_timeout 10;
+    gzip on;
-        proxy_send_timeout 10;
+    gzip_buffers 32 4K;
-        proxy_read_timeout 10;
+    gzip_comp_level 6;
+    gzip_min_length 100;
+    gzip_types application/javascript text/css text/xml image/jpeg image/gif image/png;
+    gzip_disable "MSIE [1-6]\.";
+    gzip_vary on;
 
-        proxy_set_header   X-Real-IP  $remote_addr;
+    server {
-        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        # 无域名访问，就用localhost
+        server_name localhost;
+        # 80端口
+        listen  8002;
+
+        # 转发到编译后到web目录
+        location / {
+			root /usr/share/nginx/html;
+			try_files $uri $uri/ /index.html;
+		}
+
+        # 转发到manager-api
+        location /xiaozhi/ {
+            proxy_pass http://127.0.0.1:8003;
+            proxy_set_header   Host   $host;
+            proxy_cookie_path /manager/ /;
+            proxy_set_header   Referer $http_referer;
+            proxy_set_header   Cookie $http_cookie;
+
+            proxy_connect_timeout 10;
+            proxy_send_timeout 10;
+            proxy_read_timeout 10;
+
+            proxy_set_header   X-Real-IP  $remote_addr;
+            proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
     }
 }

docs/firmware-build-1.6.0.md

@@ -0,0 +1,118 @@
+# 编译1.6.0版本esp32固件
+
+## 第1步 配置环境
+先按照这个教程配置项目环境[《Windows搭建 ESP IDF 5.3.2开发环境以及编译小智》](https://icnynnzcwou8.feishu.cn/wiki/JEYDwTTALi5s2zkGlFGcDiRknXf)
+
+## 第2步 打开配置文件
+配置好编译环境后，下载虾哥iaozhi-esp32项目源码，
+
+
+从这里下载虾哥[xiaozhi-esp32项目1.6.0版本源码](https://github.com/78/xiaozhi-esp32/archive/refs/tags/v1.6.0.zip)。
+
+从这里下载虾哥[xiaozhi-esp32项目1.6.0版本源码](https://github.com/78/xiaozhi-esp32/archive/refs/tags/v1.6.0.zip)。
+
+从这里下载虾哥[xiaozhi-esp32项目1.6.0版本源码](https://github.com/78/xiaozhi-esp32/archive/refs/tags/v1.6.0.zip)。
+
+下载后，解压缩包，打开`xiaozhi-esp32/main/Kconfig.projbuild`文件。
+
+
+## 第3步 修改WEBSOCKET地址
+找到`WEBSOCKET_URL`的`default`的内容，把`wss://api.tenclass.net/xiaozhi/v1/`
+   改成你自己的地址，例如，我的接口地址是`ws://192.168.1.25:8000/xiaozhi/v1/`，就把内容改成这个。
+
+修改前：
+
+```
+config WEBSOCKET_URL
+    depends on CONNECTION_TYPE_WEBSOCKET
+    string "Websocket URL"
+    default "wss://api.tenclass.net/xiaozhi/v1/"
+    help
+        Communication with the server through websocket after wake up.
+```
+
+修改后(示例)：
+
+```
+config WEBSOCKET_URL
+    depends on CONNECTION_TYPE_WEBSOCKET
+    string "Websocket URL"
+    default "ws://192.168.1.25:8000/xiaozhi/v1/"
+    help
+        Communication with the server through websocket after wake up.
+```
+
+注意：你的地址是`ws://`开头，不是`wss://`开头，一定不要写错了。
+
+注意：你的地址是`ws://`开头，不是`wss://`开头，一定不要写错了。
+
+注意：你的地址是`ws://`开头，不是`wss://`开头，一定不要写错了。
+
+## 第4步 设置编译参数
+
+设置编译参数
+
+```
+# 终端命令行进入xiaozhi-esp32的根目录
+cd xiaozhi-esp32
+# 例如我使用的板子是esp32s3，所以设置编译目标为esp32s3，如果你的板子是其他型号，请替换成对应的型号
+idf.py set-target esp32s3
+# 进入菜单配置
+idf.py menuconfig
+```
+
+![图片](images/build_setting01.png)
+
+进入菜单配置后，再进入`Xiaozhi Assistant`，将`CONNECTION_TYPE`设置为`Websocket`
+回退到主菜单，再进入`Xiaozhi Assistant`，将`BOARD_TYPE`设置你板子的具体型号
+保存退出，回到终端命令行。
+
+![图片](images/build_setting02.png)
+
+## 第5步 编译固件
+
+```
+idf.py build
+```
+
+## 第6步 打包bin固件
+
+```
+cd scripts
+python release.py
+```
+
+上面的打包命令执行完成后，会在项目根目录下的`build`目录下生成固件文件`merged-binary.bin`。
+这个`merged-binary.bin`就是要烧录到硬件上的固件文件。
+
+注意：如果执行到第二命令后，报了“zip”相关的错误，请忽略这个错误，只要`build`目录下生成固件文件`merged-binary.bin`
+，对你没有太大影响，请继续。
+
+## 第7步 烧录固件
+   将esp32设备连接电脑，使用chrome浏览器，打开以下网址
+
+```
+https://espressif.github.io/esp-launchpad/
+```
+
+打开这个教程，[Flash工具/Web端烧录固件（无IDF开发环境）](https://ccnphfhqs21z.feishu.cn/wiki/Zpz4wXBtdimBrLk25WdcXzxcnNS)。
+翻到：`方式二：ESP-Launchpad 浏览器WEB端烧录`，从`3. 烧录固件/下载到开发板`开始，按照教程操作。
+
+烧录成功且联网成功后，通过唤醒词唤醒小智，留意server端输出的控制台信息。
+
+## 常见问题
+以下是一些常见问题，供参考：
+
+[1、为什么我说的话，小智识别出来很多韩文、日文、英文](./FAQ.md)
+
+[2、为什么会出现“TTS 任务出错 文件不存在”？](./FAQ.md)
+
+[3、TTS 经常失败，经常超时](./FAQ.md)
+
+[4、使用Wifi能连接自建服务器，但是4G模式却接不上](./FAQ.md)
+
+[5、如何提高小智对话响应速度？](./FAQ.md)
+
+[6、我说话很慢，停顿时小智老是抢话](./FAQ.md)
+
+[7、我想通过小智控制电灯、空调、远程开关机等操作](./FAQ.md)

docs/firmware-build.md

@@ -1,67 +1,62 @@
-# 编译esp32固件
+# esp32固件编译
 
-## 第1步 配置环境
+## 第1步 准备你的ota地址
+如果你按照教程使用的是全模块部署，就应该会有ota地址。
+
+此刻，请你用浏览器打开你的ota地址，例如我的ota地址
+```
+http://192.168.1.25:8002/xiaozhi/ota/
+```
+
+如果显示“OTA接口运行正常，websocket集群数量：X”。那就往下。
+
+如果显示“OTA接口运行不正常”，大概是你还没在`智控台`配置`Websocket`地址。那就：
+
+- 1、使用超级管理员登录智控台
+
+- 2、顶部菜单点击`参数管理`
+
+- 3、在列表中找到`server.websocket`项目，输入你的`Websocket`地址。例如我的就是
+
+```
+ws://192.168.1.25:8000/xiaozhi/v1/
+```
+
+配置完后，再使用浏览器刷新你的ota接口地址，看看是不是正常了。如果还不正常就，就再次确认一下Websocket是否正常启动，是否配置了Websocket地址。
+
+## 第2步 配置环境
 先按照这个教程配置项目环境[《Windows搭建 ESP IDF 5.3.2开发环境以及编译小智》](https://icnynnzcwou8.feishu.cn/wiki/JEYDwTTALi5s2zkGlFGcDiRknXf)
 
-## 第2步 打开配置文件
+## 第3步 打开配置文件
-配置好编译环境后，下载虾哥[xiaozhi-esp32](https://github.com/78/xiaozhi-esp32)项目源码，进入虾哥项目，打开`xiaozhi-esp32/main/Kconfig.projbuild`文件。
+配置好编译环境后，下载虾哥iaozhi-esp32项目源码，
 
-## 第3步 修改WEBSOCKET地址
+从这里下载虾哥[xiaozhi-esp32项目源码](https://github.com/78/xiaozhi-esp32)。
-找到`WEBSOCKET_URL`的`default`的内容，把`wss://api.tenclass.net/xiaozhi/v1/`
-   改成你自己的地址，例如，我的接口地址是`ws://192.168.1.25:8000/xiaozhi/v1/`，就把内容改成这个。
 
-修改前：
+下载后，打开`xiaozhi-esp32/main/Kconfig.projbuild`文件。
-
-```
-config WEBSOCKET_URL
-    depends on CONNECTION_TYPE_WEBSOCKET
-    string "Websocket URL"
-    default "wss://api.tenclass.net/xiaozhi/v1/"
-    help
-        Communication with the server through websocket after wake up.
-```
-
-修改后(示例)：
-
-```
-config WEBSOCKET_URL
-    depends on CONNECTION_TYPE_WEBSOCKET
-    string "Websocket URL"
-    default "ws://192.168.1.25:8000/xiaozhi/v1/"
-    help
-        Communication with the server through websocket after wake up.
-```
-
-注意：你的地址是`ws://`开头，不是`wss://`开头，一定不要写错了。
-
-注意：你的地址是`ws://`开头，不是`wss://`开头，一定不要写错了。
-
-注意：你的地址是`ws://`开头，不是`wss://`开头，一定不要写错了。
 
 ## 第4步 修改OTA地址
-如果你是全模块部署本项目，就修改OTA接口，如果你只是部署了8000端口的xiaozhi-server，可以继续沿用虾哥团队的OTA接口。如果你不修改OTA接口，请直接忽略本第4步，直接看第5步
 
-找到`OTA_VERSION_URL`的`default`的内容，把`https://api.tenclass.net/xiaozhi/ota/`
+找到`OTA_URL`的`default`的内容，把`https://api.tenclass.net/xiaozhi/ota/`
    改成你自己的地址，例如，我的接口地址是`http://192.168.1.25:8002/xiaozhi/ota/`，就把内容改成这个。
 
 修改前：
 ```
-config OTA_VERSION_URL
+config OTA_URL
-    string "OTA Version URL"
+    string "Default OTA URL"
     default "https://api.tenclass.net/xiaozhi/ota/"
     help
-        The application will access this URL to check for updates.
+        The application will access this URL to check for new firmwares and server address.
 ```
 修改后：
 ```
-config OTA_VERSION_URL
+config OTA_URL
-    string "OTA Version URL"
+    string "Default OTA URL"
     default "http://192.168.1.25:8002/xiaozhi/ota/"
     help
-        The application will access this URL to check for updates.
+        The application will access this URL to check for new firmwares and server address.
 ```
 
-## 第5步 设置编译参数
+## 第4步 设置编译参数
 
 设置编译参数
 
@@ -82,32 +77,26 @@ idf.py menuconfig
 
 ![图片](images/build_setting02.png)
 
-## 第6步 编译固件
+## 第5步 编译固件
 
 ```
 idf.py build
 ```
 
-如果是vscode安装的idf可以使用`F1`或者`ctrl+shift+p`,输入idf然后直接选择进行编译
+## 第6步 打包bin固件
-
-还可以直接进行烧录不用接下来的操作
-
-<img src="./images/vscode_idf.png" width="500px"/>
-
-## 第7步 打包bin固件
 
 ```
 cd scripts
 python release.py
 ```
 
-编译成功后，会在项目根目录下的`build`目录下生成固件文件`merged-binary.bin`。
+上面的打包命令执行完成后，会在项目根目录下的`build`目录下生成固件文件`merged-binary.bin`。
 这个`merged-binary.bin`就是要烧录到硬件上的固件文件。
 
 注意：如果执行到第二命令后，报了“zip”相关的错误，请忽略这个错误，只要`build`目录下生成固件文件`merged-binary.bin`
 ，对你没有太大影响，请继续。
 
-## 第8步 烧录固件
+## 第7步 烧录固件
    将esp32设备连接电脑，使用chrome浏览器，打开以下网址
 
 ```

docs/firmware-setting.md

@@ -0,0 +1,53 @@
+# 基于虾哥编译好的固件配置自定义服务器
+
+## 第1步 确认版本
+烧录虾哥已经编译好的1.6.1版本固件
+
+## 第2步 准备你的ota地址
+如果你按照教程使用的是全模块部署，就应该会有ota地址。
+
+此刻，请你用浏览器打开你的ota地址，例如我的ota地址
+```
+https://2662r3426b.vicp.fun/xiaozhi/ota/
+```
+
+如果显示“OTA接口运行正常，websocket集群数量：X”。那就往下。
+
+如果显示“OTA接口运行不正常”，大概是你还没在`智控台`配置`Websocket`地址。那就：
+
+- 1、使用超级管理员登录智控台
+
+- 2、顶部菜单点击`参数管理`
+
+- 3、在列表中找到`server.websocket`项目，输入你的`Websocket`地址。例如我的就是
+
+```
+wss://2662r3426b.vicp.fun/xiaozhi/v1/
+```
+
+配置完后，再使用浏览器刷新你的ota接口地址，看看是不是正常了。如果还不正常就，就再次确认一下Websocket是否正常启动，是否配置了Websocket地址。
+
+## 第3步 进入配网模式
+进入机器的配网模式，在页面顶部，点击“高级选项”，在里面输入你服务器的`ota`地址，点击保存。重启设备
+
+## 第4步 唤醒小智，查看日志输出
+
+唤醒小智，看看日志是不是正常输出。
+
+
+## 常见问题
+以下是一些常见问题，供参考：
+
+[1、为什么我说的话，小智识别出来很多韩文、日文、英文](./FAQ.md)
+
+[2、为什么会出现“TTS 任务出错 文件不存在”？](./FAQ.md)
+
+[3、TTS 经常失败，经常超时](./FAQ.md)
+
+[4、使用Wifi能连接自建服务器，但是4G模式却接不上](./FAQ.md)
+
+[5、如何提高小智对话响应速度？](./FAQ.md)
+
+[6、我说话很慢，停顿时小智老是抢话](./FAQ.md)
+
+[7、我想通过小智控制电灯、空调、远程开关机等操作](./FAQ.md)

docs/homeassistant-integration.md

@@ -0,0 +1,111 @@
+# ESP32设备与HomeAssistant集成指南
+
+## 简介
+
+本文档将指导您如何将ESP32设备与HomeAssistant进行集成。
+
+## 前提条件
+
+- 已安装并配置好`HomeAssistant`
+- 已经在HomeAssistant中集成`Xiaomi Home`，并将米家的设备导入进`HomeAssistant`
+- `xiaozhi-esp32-server智控台`能正常使用
+- 本次我选择的模型是：免费的ChatGLM，它支持functioncall函数调用
+
+## 网络环境
+
+1、我的`HomeAssistant`部署在下面，版本是`2025.3.4`
+```
+http://192.168.4.7:8123
+```
+
+2、我的`xiaozhi-esp32-server智控台`和`HomeAssistant`部署在同一台机器的另一个端口，版本是`0.3.10`
+```
+http://192.168.4.7:8002
+```
+
+
+## 配置步骤
+
+### 1. 登录`HomeAssistant`整理需要控制的设备清单
+
+登录`HomeAssistant`，点击`左下角的设置`，然后进入`设备与服务`，再点击顶部的`实体`。
+
+然后在实体中搜索你相关控制的开关，结果出来后，在列表中，点击其中一个结果，这是会出现一个开关的界面。
+
+在开关的界面，我们尝试点击开关，看看是开发会随着我们的点击开/关。如果能操作，说明是正常联网的。
+
+接着在开关面板找到设置按钮，点击后，可以查看这个开关的`实体标识符`。
+
+我们打开一个记事本，按照这样格式整理一条数据：
+
+位置+英文逗号+设备名称+英文逗号+`实体标识符`+英文分号
+
+例如，我在公司，我有一个玩具灯，他的标识符是switch.cuco_cn_460494544_cp1_on_p_2_1，那么就这个写这一条数据
+
+```
+公司,玩具灯,switch.cuco_cn_460494544_cp1_on_p_2_1;
+```
+
+当然最后我可能要操作两个灯，我的最终的结果是：
+
+```
+公司,玩具灯,switch.cuco_cn_460494544_cp1_on_p_2_1;
+公司,台灯,switch.iot_cn_831898993_socn1_on_p_2_1;
+```
+
+这段字符，我们成为“设备清单字符”需要保存好，等一下有用。
+
+
+### 2. 登录`HomeAssistant`拿到开发密钥
+
+登录`HomeAssistant`，点击`左下角个人`，切换`安全`导航栏，划到底部`长期访问令牌`生成api_key。
+
+
+### 3. 登录`智控台`
+
+使用管理员账号，登录`智控台`。点击顶部菜单`参数管理`，搜索`plugins.home_assistant.`，会有三条结果出来
+
+编辑`plugins.home_assistant.devices`，把刚才整理的设备清单字符粘贴进去。
+
+
+编辑`plugins.home_assistant.base_url`，把你部署的`HomeAssistant`接口地址粘贴进去，我粘贴进去的地址是这样的
+
+```
+http://192.168.4.7:8123
+```
+
+编辑`plugins.home_assistant.api_key`，把你从`HomeAssistant`复制过来的密钥，粘贴进去
+
+
+### 4. 设置`意图识别`函数
+
+在智控台，点击顶部菜单“模型配置”，在左侧栏，找到“意图识别”，找到id为`Intent_function_call`的意图，点击编辑
+
+然后在弹框中，在原来的基础上追加两个函数：“hass_get_state”和“hass_set_state”
+
+修改前
+```
+change_role;get_weather;get_news;play_music
+```
+
+修改后
+
+```
+change_role;get_weather;get_news;play_music;hass_get_state;hass_set_state
+```
+
+### 6. 手动重启xiaozhi-server
+
+重启xiaozhi-server程序
+
+
+### 5. 确认角色配置是否设置了函数意图识别
+
+在智控台，点击顶部菜单“智能体管理”，找到设备所在的智能体，点击“配置角色”
+
+确认意图识别(Intent)，是否选择“函数调用意图识别”
+
+
+### 6. 唤醒设别进行控制
+
+尝试和esp32说，“打开XXX灯”

main/manager-api/src/main/java/xiaozhi/common/config/RestTemplateConfig.java

@@ -0,0 +1,17 @@
+package xiaozhi.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * RestTemplate配置
+ */
+@Configuration
+public class RestTemplateConfig {
+
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+}

main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java

@@ -84,6 +84,16 @@ public interface Constant {
      */
     String SERVER_SECRET = "server.secret";
 
+    /**
+     * websocket地址
+     */
+    String SERVER_WEBSOCKET = "server.websocket";
+
+    /**
+     * ota地址
+     */
+    String SERVER_OTA = "server.ota";
+
     /**
      * 是否允许用户注册
      */
@@ -163,4 +173,9 @@ public interface Constant {
             return value;
         }
     }
+
+    /**
+     * 版本号
+     */
+    public static final String VERSION = "0.3.11";
 }

main/manager-api/src/main/java/xiaozhi/common/redis/RedisKeys.java

@@ -75,4 +75,25 @@ public class RedisKeys {
     public static String getTimbreDetailsKey(String id) {
         return "timbre:details:" + id;
     }
+
+    /**
+     * 获取版本号Key
+     */
+    public static String getVersionKey() {
+        return "sys:version";
+    }
+
+    /**
+     * OTA固件ID的Key
+     */
+    public static String getOtaIdKey(String uuid) {
+        return "ota:id:" + uuid;
+    }
+
+    /**
+     * OTA固件下载次数的Key
+     */
+    public static String getOtaDownloadCountKey(String uuid) {
+        return "ota:download:count:" + uuid;
+    }
 }

main/manager-api/src/main/java/xiaozhi/common/redis/RedisUtils.java

@@ -1,11 +1,14 @@
 package xiaozhi.common.redis;
 
 import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.stereotype.Component;
 
 import jakarta.annotation.Resource;
@@ -27,7 +30,7 @@ public class RedisUtils {
     /**
      * 过期时长为1小时，单位：秒
      */
-    public final static long HOUR_ONE_EXPIRE = 60 * 60 * 1L;
+    public final static long HOUR_ONE_EXPIRE = (long) 60 * 60;
     /**
      * 过期时长为6小时，单位：秒
      */
@@ -124,4 +127,24 @@ public class RedisUtils {
     public Object rightPop(String key) {
         return redisTemplate.opsForList().rightPop(key);
     }
+
+
+    /**
+     * 清空所有 Redis 数据库中的所有键
+     */
+    public void emptyAll() {
+        // Lua 脚本 FLUSHALL是redis清空所有库的命令
+        String luaScript ="redis.call('FLUSHALL')";
+
+        // 创建 DefaultRedisScript 对象
+        DefaultRedisScript<Void> redisScript = new DefaultRedisScript<>();
+        redisScript.setScriptText(luaScript); // 设置 Lua 脚本内容
+        redisScript.setResultType(Void.class); // 设置返回值类型
+
+        // 执行 Lua 脚本
+        List<String> keys = Collections.emptyList(); // 如果脚本不依赖 key，可以传入空列表
+        redisTemplate.execute(redisScript, keys);
+
+    }
+
 }

main/manager-api/src/main/java/xiaozhi/modules/config/init/SystemInitConfig.java

@@ -5,6 +5,9 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
 
 import jakarta.annotation.PostConstruct;
+import xiaozhi.common.constant.Constant;
+import xiaozhi.common.redis.RedisKeys;
+import xiaozhi.common.redis.RedisUtils;
 import xiaozhi.modules.config.service.ConfigService;
 import xiaozhi.modules.sys.service.SysParamsService;
 
@@ -18,8 +21,20 @@ public class SystemInitConfig {
     @Autowired
     private ConfigService configService;
 
+    @Autowired
+    private RedisUtils redisUtils;
+
     @PostConstruct
     public void init() {
+        // 检查版本号
+        String redisVersion = (String) redisUtils.get(RedisKeys.getVersionKey());
+        if (!Constant.VERSION.equals(redisVersion)) {
+            // 如果版本不一致，清空Redis
+            redisUtils.emptyAll();
+            // 存储新版本号
+            redisUtils.set(RedisKeys.getVersionKey(), Constant.VERSION);
+        }
+
         sysParamsService.initServerSecret();
         configService.getConfig(false);
     }

main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java

@@ -91,6 +91,7 @@ public class ConfigServiceImpl implements ConfigService {
             }
             throw new RenException(ErrorCode.OTA_DEVICE_NOT_FOUND, "not found device");
         }
+
         // 获取智能体信息
         AgentEntity agent = agentService.getAgentById(device.getAgentId());
         if (agent == null) {
@@ -104,7 +105,9 @@ public class ConfigServiceImpl implements ConfigService {
         }
         // 构建返回数据
         Map<String, Object> result = new HashMap<>();
-
+        // 获取单台设备每天最多输出字数
+        String deviceMaxOutputSize = sysParamsService.getValue("device_max_output_size", true);
+        result.put("device_max_output_size", deviceMaxOutputSize);
         // 如果客户端已实例化模型，则不返回
         String alreadySelectedVadModelId = (String) selectedModule.get("VAD");
         if (alreadySelectedVadModelId != null && alreadySelectedVadModelId.equals(agent.getVadModelId())) {
@@ -267,6 +270,12 @@ public class ConfigServiceImpl implements ConfigService {
                         if (intentLLMModelId != null && intentLLMModelId.equals(llmModelId)) {
                             intentLLMModelId = null;
                         }
+                    } else if ("function_call".equals(map.get("type"))) {
+                        String functionStr = (String) map.get("functions");
+                        if (StringUtils.isNotBlank(functionStr)) {
+                            String[] functions = functionStr.split("\\;");
+                            map.put("functions", functions);
+                        }
                     }
                 }
                 // 如果是LLM类型，且intentLLMModelId不为空，则添加附加模型
@@ -282,7 +291,7 @@ public class ConfigServiceImpl implements ConfigService {
 
         result.put("selected_module", selectedModule);
         if (StringUtils.isNotBlank(prompt)) {
-            prompt = prompt.replace("{{assistant_name}}", "小智");
+            prompt = prompt.replace("{{assistant_name}}", StringUtils.isBlank(assistantName) ? "小智" : assistantName);
         }
         result.put("prompt", prompt);
     }

main/manager-api/src/main/java/xiaozhi/modules/device/controller/DeviceController.java

@@ -7,6 +7,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -79,4 +80,16 @@ public class DeviceController {
         return new Result<Void>();
     }
 
+    @PutMapping("/enableOta/{id}/{status}")
+    @Operation(summary = "启用/关闭OTA自动升级")
+    @RequiresPermissions("sys:role:normal")
+    public Result<Void> enableOtaUpgrade(@PathVariable String id, @PathVariable Integer status) {
+        DeviceEntity entity = deviceService.selectById(id);
+        if (entity == null) {
+            return new Result<Void>().error("设备不存在");
+        }
+        entity.setAutoUpdate(status);
+        deviceService.updateById(entity);
+        return new Result<Void>();
+    }
 }

main/manager-api/src/main/java/xiaozhi/modules/device/controller/OTAController.java

@@ -15,33 +15,43 @@ import org.springframework.web.bind.annotation.RestController;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import xiaozhi.common.constant.Constant;
 import xiaozhi.modules.device.dto.DeviceReportReqDTO;
 import xiaozhi.modules.device.dto.DeviceReportRespDTO;
+import xiaozhi.modules.device.entity.DeviceEntity;
 import xiaozhi.modules.device.service.DeviceService;
 import xiaozhi.modules.device.utils.NetworkUtil;
+import xiaozhi.modules.sys.service.SysParamsService;
 
 @Tag(name = "设备管理", description = "OTA 相关接口")
+@Slf4j
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/ota/")
 public class OTAController {
     private final DeviceService deviceService;
+    private final SysParamsService sysParamsService;
 
-    @Operation(summary = "检查 OTA 版本和设备激活状态")
+    @Operation(summary = "OTA版本和设备激活状态检查")
     @PostMapping
     public ResponseEntity<String> checkOTAVersion(
             @RequestBody DeviceReportReqDTO deviceReportReqDTO,
             @Parameter(name = "Device-Id", description = "设备唯一标识", required = true, in = ParameterIn.HEADER) @RequestHeader("Device-Id") String deviceId,
-            @Parameter(name = "Client-Id", description = "客户端标识", required = true, in = ParameterIn.HEADER) @RequestHeader("Client-Id") String clientId) {
+            @Parameter(name = "Client-Id", description = "客户端标识", required = false, in = ParameterIn.HEADER) @RequestHeader(value = "Client-Id", required = false) String clientId) {
-        if (StringUtils.isAnyBlank(deviceId, clientId)) {
+        if (StringUtils.isBlank(deviceId)) {
             return createResponse(DeviceReportRespDTO.createError("Device ID is required"));
         }
+        if (StringUtils.isBlank(clientId)) {
+            clientId = deviceId;
+        }
         String macAddress = deviceReportReqDTO.getMacAddress();
         boolean macAddressValid = NetworkUtil.isMacAddressValid(macAddress);
         // 设备Id和Mac地址应是一致的, 并且必须需要application字段
@@ -51,9 +61,33 @@ public class OTAController {
         return createResponse(deviceService.checkDeviceActive(macAddress, clientId, deviceReportReqDTO));
     }
 
+    @Operation(summary = "设备快速检查激活状态")
+    @PostMapping("activate")
+    public ResponseEntity<String> activateDevice(
+            @Parameter(name = "Device-Id", description = "设备唯一标识", required = true, in = ParameterIn.HEADER) @RequestHeader("Device-Id") String deviceId,
+            @Parameter(name = "Client-Id", description = "客户端标识", required = false, in = ParameterIn.HEADER) @RequestHeader(value = "Client-Id", required = false) String clientId) {
+        if (StringUtils.isBlank(deviceId)) {
+            return ResponseEntity.status(202).build();
+        }
+        DeviceEntity device = deviceService.getDeviceByMacAddress(deviceId);
+        if (device == null) {
+            return ResponseEntity.status(202).build();
+        }
+        return ResponseEntity.ok("success");
+    }
+
     @GetMapping
-    public ResponseEntity<String> getOTAPrompt() {
+    @Hidden
-        return createResponse(DeviceReportRespDTO.createError("请提交正确的ota参数"));
+    public ResponseEntity<String> getOTA() {
+        String wsUrl = sysParamsService.getValue(Constant.SERVER_WEBSOCKET, true);
+        if (StringUtils.isBlank(wsUrl) || wsUrl.equals("null")) {
+            return ResponseEntity.ok("OTA接口不正常，缺少websocket地址，请登录智控台，在参数管理找到【server.websocket】配置");
+        }
+        String otaUrl = sysParamsService.getValue(Constant.SERVER_OTA, true);
+        if (StringUtils.isBlank(otaUrl) || otaUrl.equals("null")) {
+            return ResponseEntity.ok("OTA接口不正常，缺少ota地址，请登录智控台，在参数管理找到【server.ota】配置");
+        }
+        return ResponseEntity.ok("OTA接口运行正常，websocket集群数量：" + wsUrl.split(";").length);
     }
 
     @SneakyThrows

main/manager-api/src/main/java/xiaozhi/modules/device/controller/OTAMagController.java

@@ -0,0 +1,291 @@
+package xiaozhi.modules.device.controller;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Map;
+import java.util.UUID;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import xiaozhi.common.constant.Constant;
+import xiaozhi.common.page.PageData;
+import xiaozhi.common.redis.RedisKeys;
+import xiaozhi.common.redis.RedisUtils;
+import xiaozhi.common.utils.Result;
+import xiaozhi.common.validator.ValidatorUtils;
+import xiaozhi.modules.device.entity.OtaEntity;
+import xiaozhi.modules.device.service.OtaService;
+
+@Tag(name = "设备管理", description = "OTA 相关接口")
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/otaMag")
+public class OTAMagController {
+    private static final Logger logger = LoggerFactory.getLogger(OTAController.class);
+    private final OtaService otaService;
+    private final RedisUtils redisUtils;
+
+    @GetMapping
+    @Operation(summary = "分页查询 OTA 固件信息")
+    @Parameters({
+            @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
+            @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true)
+    })
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<PageData<OtaEntity>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params) {
+        ValidatorUtils.validateEntity(params);
+        PageData<OtaEntity> page = otaService.page(params);
+        return new Result<PageData<OtaEntity>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @Operation(summary = "信息 OTA 固件信息")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<OtaEntity> get(@PathVariable("id") String id) {
+        OtaEntity data = otaService.selectById(id);
+        return new Result<OtaEntity>().ok(data);
+    }
+
+    @PostMapping
+    @Operation(summary = "保存 OTA 固件信息")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<Void> save(@RequestBody OtaEntity entity) {
+        if (entity == null) {
+            return new Result<Void>().error("固件信息不能为空");
+        }
+        if (StringUtils.isBlank(entity.getFirmwareName())) {
+            return new Result<Void>().error("固件名称不能为空");
+        }
+        if (StringUtils.isBlank(entity.getType())) {
+            return new Result<Void>().error("固件类型不能为空");
+        }
+        if (StringUtils.isBlank(entity.getVersion())) {
+            return new Result<Void>().error("版本号不能为空");
+        }
+        try {
+            otaService.save(entity);
+            return new Result<Void>();
+        } catch (RuntimeException e) {
+            return new Result<Void>().error(e.getMessage());
+        }
+    }
+
+    @DeleteMapping("/{id}")
+    @Operation(summary = "OTA 删除")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<Void> delete(@PathVariable("id") String[] ids) {
+        if (ids == null || ids.length == 0) {
+            return new Result<Void>().error("删除的固件ID不能为空");
+        }
+        otaService.delete(ids);
+        return new Result<Void>();
+    }
+
+    @PutMapping("/{id}")
+    @Operation(summary = "修改 OTA 固件信息")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<?> update(@PathVariable("id") String id, @RequestBody OtaEntity entity) {
+        if (entity == null) {
+            return new Result<>().error("固件信息不能为空");
+        }
+        entity.setId(id);
+        try {
+            otaService.update(entity);
+            return new Result<>();
+        } catch (RuntimeException e) {
+            return new Result<>().error(e.getMessage());
+        }
+    }
+
+    @GetMapping("/getDownloadUrl/{id}")
+    @Operation(summary = "获取 OTA 固件下载链接")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<String> getDownloadUrl(@PathVariable("id") String id) {
+        String uuid = UUID.randomUUID().toString();
+        redisUtils.set(RedisKeys.getOtaIdKey(uuid), id);
+        return new Result<String>().ok(uuid);
+    }
+
+    @GetMapping("/download/{uuid}")
+    @Operation(summary = "下载固件文件")
+    public ResponseEntity<byte[]> downloadFirmware(@PathVariable("uuid") String uuid) {
+        String id = (String) redisUtils.get(RedisKeys.getOtaIdKey(uuid));
+        if (StringUtils.isBlank(id)) {
+            return ResponseEntity.notFound().build();
+        }
+
+        // 检查下载次数
+        String downloadCountKey = RedisKeys.getOtaDownloadCountKey(uuid);
+        Integer downloadCount = (Integer) redisUtils.get(downloadCountKey);
+        if (downloadCount == null) {
+            downloadCount = 0;
+        }
+
+        // 如果下载次数超过3次，返回404
+        if (downloadCount >= 3) {
+            redisUtils.delete(downloadCountKey);
+            redisUtils.delete(RedisKeys.getOtaIdKey(uuid));
+            logger.warn("Download limit exceeded for UUID: {}", uuid);
+            return ResponseEntity.notFound().build();
+        }
+
+        redisUtils.set(downloadCountKey, downloadCount + 1);
+
+        try {
+            // 获取固件信息
+            OtaEntity otaEntity = otaService.selectById(id);
+            if (otaEntity == null || StringUtils.isBlank(otaEntity.getFirmwarePath())) {
+                logger.warn("Firmware not found or path is empty for ID: {}", id);
+                return ResponseEntity.notFound().build();
+            }
+
+            // 获取文件路径 - 确保路径是绝对路径或正确的相对路径
+            String firmwarePath = otaEntity.getFirmwarePath();
+            Path path;
+
+            // 检查是否是绝对路径
+            if (Paths.get(firmwarePath).isAbsolute()) {
+                path = Paths.get(firmwarePath);
+            } else {
+                // 如果是相对路径，则从当前工作目录解析
+                path = Paths.get(System.getProperty("user.dir"), firmwarePath);
+            }
+
+            logger.info("Attempting to download firmware for ID: {}, DB path: {}, resolved path: {}",
+                    id, firmwarePath, path.toAbsolutePath());
+
+            if (!Files.exists(path) || !Files.isRegularFile(path)) {
+                // 尝试直接从firmware目录下查找文件名
+                String fileName = new File(firmwarePath).getName();
+                Path altPath = Paths.get(System.getProperty("user.dir"), "firmware", fileName);
+
+                logger.info("File not found at primary path, trying alternative path: {}", altPath.toAbsolutePath());
+
+                if (Files.exists(altPath) && Files.isRegularFile(altPath)) {
+                    path = altPath;
+                } else {
+                    logger.error("Firmware file not found at either path: {} or {}",
+                            path.toAbsolutePath(), altPath.toAbsolutePath());
+                    return ResponseEntity.notFound().build();
+                }
+            }
+
+            // 读取文件内容
+            byte[] fileContent = Files.readAllBytes(path);
+
+            // 设置响应头
+            String originalFilename = otaEntity.getType() + "_" + otaEntity.getVersion();
+            if (firmwarePath.contains(".")) {
+                String extension = firmwarePath.substring(firmwarePath.lastIndexOf("."));
+                originalFilename += extension;
+            }
+
+            // 清理文件名，移除不安全字符
+            String safeFilename = originalFilename.replaceAll("[^a-zA-Z0-9._-]", "_");
+
+            logger.info("Providing download for firmware ID: {}, filename: {}, size: {} bytes",
+                    id, safeFilename, fileContent.length);
+
+            return ResponseEntity.ok()
+                    .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                    .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + safeFilename + "\"")
+                    .body(fileContent);
+        } catch (IOException e) {
+            logger.error("Error reading firmware file for ID: {}", id, e);
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+        } catch (Exception e) {
+            logger.error("Unexpected error during firmware download for ID: {}", id, e);
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+        }
+    }
+
+    @PostMapping("/upload")
+    @Operation(summary = "上传固件文件")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<String> uploadFirmware(@RequestParam("file") MultipartFile file) {
+        if (file.isEmpty()) {
+            return new Result<String>().error("上传文件不能为空");
+        }
+
+        // 检查文件扩展名
+        String originalFilename = file.getOriginalFilename();
+        if (originalFilename == null) {
+            return new Result<String>().error("文件名不能为空");
+        }
+
+        String extension = originalFilename.substring(originalFilename.lastIndexOf(".")).toLowerCase();
+        if (!extension.equals(".bin") && !extension.equals(".apk")) {
+            return new Result<String>().error("只允许上传.bin和.apk格式的文件");
+        }
+
+        try {
+            // 计算文件的MD5值
+            String md5 = calculateMD5(file);
+
+            // 设置存储路径
+            String uploadDir = "uploadfile";
+            Path uploadPath = Paths.get(uploadDir);
+
+            // 如果目录不存在，创建目录
+            if (!Files.exists(uploadPath)) {
+                Files.createDirectories(uploadPath);
+            }
+
+            // 使用MD5作为文件名，固定使用.bin扩展名
+            String uniqueFileName = md5 + extension;
+            Path filePath = uploadPath.resolve(uniqueFileName);
+
+            // 检查文件是否已存在
+            if (Files.exists(filePath)) {
+                return new Result<String>().ok(filePath.toString());
+            }
+
+            // 保存文件
+            Files.copy(file.getInputStream(), filePath);
+
+            // 返回文件路径
+            return new Result<String>().ok(filePath.toString());
+        } catch (IOException | NoSuchAlgorithmException e) {
+            return new Result<String>().error("文件上传失败：" + e.getMessage());
+        }
+    }
+
+    private String calculateMD5(MultipartFile file) throws IOException, NoSuchAlgorithmException {
+        MessageDigest md = MessageDigest.getInstance("MD5");
+        byte[] digest = md.digest(file.getBytes());
+        StringBuilder sb = new StringBuilder();
+        for (byte b : digest) {
+            sb.append(String.format("%02x", b));
+        }
+        return sb.toString();
+    }
+}

main/manager-api/src/main/java/xiaozhi/modules/device/dao/OtaDao.java

@@ -0,0 +1,15 @@
+package xiaozhi.modules.device.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import xiaozhi.modules.device.entity.OtaEntity;
+
+/**
+ * OTA固件管理
+ */
+@Mapper
+public interface OtaDao extends BaseMapper<OtaEntity> {
+    
+}

main/manager-api/src/main/java/xiaozhi/modules/device/dto/DeviceReportRespDTO.java

@@ -19,6 +19,9 @@ public class DeviceReportRespDTO {
 
     @Schema(description = "固件版本信息")
     private Firmware firmware;
+    
+    @Schema(description = "WebSocket配置")
+    private Websocket websocket;
 
     @Getter
     @Setter
@@ -44,6 +47,8 @@ public class DeviceReportRespDTO {
         @Schema(description = "激活码信息: 激活地址")
         private String message;
 
+        @Schema(description = "挑战码")
+        private String challenge;
     }
 
     @Getter
@@ -58,4 +63,11 @@ public class DeviceReportRespDTO {
         @Schema(description = "时区偏移量，单位为分钟")
         private Integer timezone_offset;
     }
+    
+    @Getter
+    @Setter
+    public static class Websocket {
+        @Schema(description = "WebSocket服务器地址")
+        private String url;
+    }
 }

main/manager-api/src/main/java/xiaozhi/modules/device/entity/OtaEntity.java

@@ -0,0 +1,61 @@
+package xiaozhi.modules.device.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("ai_ota")
+@Schema(description = "固件信息")
+public class OtaEntity {
+
+    @TableId(type = IdType.ASSIGN_UUID)
+    @Schema(description = "ID")
+    private String id;
+
+    @Schema(description = "固件名称")
+    private String firmwareName;
+
+    @Schema(description = "固件类型")
+    private String type;
+
+    @Schema(description = "版本号")
+    private String version;
+
+    @Schema(description = "文件大小(字节)")
+    private Long size;
+
+    @Schema(description = "备注/说明")
+    private String remark;
+
+    @Schema(description = "固件路径")
+    private String firmwarePath;
+
+    @Schema(description = "排序")
+    private Integer sort;
+
+    @Schema(description = "更新者")
+    @TableField(fill = FieldFill.UPDATE)
+    private Long updater;
+
+    @Schema(description = "更新时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private Date updateDate;
+
+    @Schema(description = "创建者")
+    @TableField(fill = FieldFill.INSERT)
+    private Long creator;
+
+    @Schema(description = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createDate;
+}

main/manager-api/src/main/java/xiaozhi/modules/device/service/DeviceService.java

@@ -3,18 +3,14 @@ package xiaozhi.modules.device.service;
 import java.util.List;
 
 import xiaozhi.common.page.PageData;
+import xiaozhi.common.service.BaseService;
 import xiaozhi.modules.device.dto.DevicePageUserDTO;
 import xiaozhi.modules.device.dto.DeviceReportReqDTO;
 import xiaozhi.modules.device.dto.DeviceReportRespDTO;
 import xiaozhi.modules.device.entity.DeviceEntity;
 import xiaozhi.modules.device.vo.UserShowDeviceListVO;
 
-public interface DeviceService {
+public interface DeviceService extends BaseService<DeviceEntity> {
-
-    /**
-     * 根据Mac地址获取设备信息
-     */
-    DeviceEntity getDeviceById(String macAddress);
 
     /**
      * 检查设备是否激活

main/manager-api/src/main/java/xiaozhi/modules/device/service/OtaService.java

@@ -0,0 +1,22 @@
+package xiaozhi.modules.device.service;
+
+import java.util.Map;
+
+import xiaozhi.common.page.PageData;
+import xiaozhi.common.service.BaseService;
+import xiaozhi.modules.device.entity.OtaEntity;
+
+/**
+ * OTA固件管理
+ */
+public interface OtaService extends BaseService<OtaEntity> {
+    PageData<OtaEntity> page(Map<String, Object> params);
+
+    boolean save(OtaEntity entity);
+
+    void update(OtaEntity entity);
+
+    void delete(String[] ids);
+
+    OtaEntity getLatestOta(String type);
+}

main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/DeviceServiceImpl.java

@@ -6,21 +6,26 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
-import java.util.concurrent.TimeUnit;
+import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import cn.hutool.core.util.RandomUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import xiaozhi.common.constant.Constant;
 import xiaozhi.common.exception.RenException;
 import xiaozhi.common.page.PageData;
+import xiaozhi.common.redis.RedisKeys;
+import xiaozhi.common.redis.RedisUtils;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.user.UserDetail;
 import xiaozhi.common.utils.ConvertUtils;
@@ -30,39 +35,24 @@ import xiaozhi.modules.device.dto.DevicePageUserDTO;
 import xiaozhi.modules.device.dto.DeviceReportReqDTO;
 import xiaozhi.modules.device.dto.DeviceReportRespDTO;
 import xiaozhi.modules.device.entity.DeviceEntity;
+import xiaozhi.modules.device.entity.OtaEntity;
 import xiaozhi.modules.device.service.DeviceService;
+import xiaozhi.modules.device.service.OtaService;
 import xiaozhi.modules.device.vo.UserShowDeviceListVO;
 import xiaozhi.modules.security.user.SecurityUser;
 import xiaozhi.modules.sys.service.SysParamsService;
 import xiaozhi.modules.sys.service.SysUserUtilService;
 
+@Slf4j
 @Service
+@AllArgsConstructor
 public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity> implements DeviceService {
 
     private final DeviceDao deviceDao;
-
     private final SysUserUtilService sysUserUtilService;
-
+    private final SysParamsService sysParamsService;
-    private final String frontedUrl;
+    private final RedisUtils redisUtils;
-
+    private final OtaService otaService;
-    private final RedisTemplate<String, Object> redisTemplate;
-
-    // 添加构造函数来初始化 deviceMapper
-    public DeviceServiceImpl(DeviceDao deviceDao, SysUserUtilService sysUserUtilService,
-            SysParamsService sysParamsService,
-            RedisTemplate<String, Object> redisTemplate) {
-        this.deviceDao = deviceDao;
-        this.sysUserUtilService = sysUserUtilService;
-        this.frontedUrl = sysParamsService.getValue(Constant.SERVER_FRONTED_URL, true);
-        this.redisTemplate = redisTemplate;
-    }
-
-    @Override
-    public DeviceEntity getDeviceById(String deviceId) {
-        LambdaQueryWrapper<DeviceEntity> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(DeviceEntity::getId, deviceId);
-        return deviceDao.selectOne(queryWrapper);
-    }
 
     @Override
     public Boolean deviceActivation(String agentId, String activationCode) {
@@ -70,14 +60,14 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
             throw new RenException("激活码不能为空");
         }
         String deviceKey = "ota:activation:code:" + activationCode;
-        Object cacheDeviceId = redisTemplate.opsForValue().get(deviceKey);
+        Object cacheDeviceId = redisUtils.get(deviceKey);
         if (cacheDeviceId == null) {
             throw new RenException("激活码错误");
         }
         String deviceId = (String) cacheDeviceId;
         String safeDeviceId = deviceId.replace(":", "_").toLowerCase();
         String cacheDeviceKey = String.format("ota:activation:data:%s", safeDeviceId);
-        Map<Object, Object> cacheMap = redisTemplate.opsForHash().entries(cacheDeviceKey);
+        Map<String, Object> cacheMap = (Map<String, Object>) redisUtils.get(cacheDeviceKey);
         if (cacheMap == null) {
             throw new RenException("激活码错误");
         }
@@ -107,6 +97,7 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
         deviceEntity.setMacAddress(macAddress);
         deviceEntity.setUserId(user.getId());
         deviceEntity.setCreator(user.getId());
+        deviceEntity.setAutoUpdate(1);
         deviceEntity.setCreateDate(currentTime);
         deviceEntity.setUpdater(user.getId());
         deviceEntity.setUpdateDate(currentTime);
@@ -114,8 +105,8 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
         deviceDao.insert(deviceEntity);
 
         // 清理redis缓存
-        redisTemplate.delete(cacheDeviceKey);
+        redisUtils.delete(cacheDeviceKey);
-        redisTemplate.delete(deviceKey);
+        redisUtils.delete(deviceKey);
         return true;
     }
 
@@ -124,19 +115,49 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
             DeviceReportReqDTO deviceReport) {
         DeviceReportRespDTO response = new DeviceReportRespDTO();
         response.setServer_time(buildServerTime());
-        // todo: 此处是固件信息，目前是针对固件上传上来的版本号再返回回去
-        // 在未来开发了固件更新功能，需要更换此处代码，
-        // 或写定时任务定期请求虾哥的OTA，获取最新的版本讯息保存到服务内
-        DeviceReportRespDTO.Firmware firmware = new DeviceReportRespDTO.Firmware();
-        firmware.setVersion(deviceReport.getApplication().getVersion());
-        firmware.setUrl("http://localhost:8002/xiaozhi/ota/download");
-        response.setFirmware(firmware);
 
-        DeviceEntity deviceById = getDeviceById(macAddress);
+        DeviceEntity deviceById = getDeviceByMacAddress(macAddress);
-        if (deviceById != null) { // 如果设备存在，则更新上次连接时间
+
+        if (deviceById == null || deviceById.getAutoUpdate() != 0) {
+            String type = deviceReport.getBoard() == null ? null : deviceReport.getBoard().getType();
+            DeviceReportRespDTO.Firmware firmware = buildFirmwareInfo(type,
+                    deviceReport.getApplication() == null ? null : deviceReport.getApplication().getVersion());
+            response.setFirmware(firmware);
+        } else {
+            response.setFirmware(null);
+        }
+
+        // 添加WebSocket配置
+        DeviceReportRespDTO.Websocket websocket = new DeviceReportRespDTO.Websocket();
+        // 从系统参数获取WebSocket URL，如果未配置则使用默认值
+        String wsUrl = sysParamsService.getValue(Constant.SERVER_WEBSOCKET, true);
+        if (StringUtils.isBlank(wsUrl) || wsUrl.equals("null")) {
+            log.error("WebSocket地址未配置，请登录智控台，在参数管理找到【server.websocket】配置");
+            wsUrl = "ws://xiaozhi.server.com:8000/xiaozhi/v1/";
+            websocket.setUrl(wsUrl);
+        } else {
+            String[] wsUrls = wsUrl.split("\\;");
+            if (wsUrls.length > 0) {
+                // 随机选择一个WebSocket URL
+                websocket.setUrl(wsUrls[RandomUtil.randomInt(0, wsUrls.length)]);
+            } else {
+                log.error("WebSocket地址未配置，请登录智控台，在参数管理找到【server.websocket】配置");
+                websocket.setUrl("ws://xiaozhi.server.com:8000/xiaozhi/v1/");
+            }
+        }
+
+        response.setWebsocket(websocket);
+
+        if (deviceById != null) {
+            // 如果设备存在，则更新上次连接时间
             deviceById.setLastConnectedAt(new Date());
+            if (deviceReport.getApplication() != null
+                    && StringUtils.isNotBlank(deviceReport.getApplication().getVersion())) {
+                deviceById.setAppVersion(deviceReport.getApplication().getVersion());
+            }
             deviceDao.updateById(deviceById);
-        } else { // 如果设备不存在，则生成激活码
+        } else {
+            // 如果设备不存在，则生成激活码
             DeviceReportRespDTO.Activation code = buildActivation(macAddress, deviceReport);
             response.setActivation(code);
         }
@@ -229,7 +250,7 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
     public String geCodeByDeviceId(String deviceId) {
         String dataKey = getDeviceCacheKey(deviceId);
 
-        Map<Object, Object> cacheMap = redisTemplate.opsForHash().entries(dataKey);
+        Map<String, Object> cacheMap = (Map<String, Object>) redisUtils.get(dataKey);
         if (cacheMap != null && cacheMap.containsKey("activation_code")) {
             String cachedCode = (String) cacheMap.get("activation_code");
             return cachedCode;
@@ -250,18 +271,23 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
 
         if (StringUtils.isNotBlank(cachedCode)) {
             code.setCode(cachedCode);
+            String frontedUrl = sysParamsService.getValue(Constant.SERVER_FRONTED_URL, true);
             code.setMessage(frontedUrl + "\n" + cachedCode);
+            code.setChallenge(deviceId);
         } else {
             String newCode = RandomUtil.randomNumbers(6);
             code.setCode(newCode);
+            String frontedUrl = sysParamsService.getValue(Constant.SERVER_FRONTED_URL, true);
             code.setMessage(frontedUrl + "\n" + newCode);
+            code.setChallenge(deviceId);
 
             Map<String, Object> dataMap = new HashMap<>();
             dataMap.put("id", deviceId);
             dataMap.put("mac_address", deviceId);
 
-            dataMap.put("board", (deviceReport.getChipModelName() != null) ? deviceReport.getChipModelName()
+            dataMap.put("board", (deviceReport.getBoard() != null && deviceReport.getBoard().getType() != null)
-                    : (deviceReport.getBoard() != null ? deviceReport.getBoard().getType() : "unknown"));
+                    ? deviceReport.getBoard().getType()
+                    : (deviceReport.getChipModelName() != null ? deviceReport.getChipModelName() : "unknown"));
             dataMap.put("app_version", (deviceReport.getApplication() != null)
                     ? deviceReport.getApplication().getVersion()
                     : null);
@@ -271,13 +297,77 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
 
             // 写入主数据 key
             String dataKey = getDeviceCacheKey(deviceId);
-            redisTemplate.opsForHash().putAll(dataKey, dataMap);
+            redisUtils.set(dataKey, dataMap);
-            redisTemplate.expire(dataKey, 24, TimeUnit.HOURS);
 
             // 写入反查激活码 key
             String codeKey = "ota:activation:code:" + newCode;
-            redisTemplate.opsForValue().set(codeKey, deviceId, 24, TimeUnit.HOURS);
+            redisUtils.set(codeKey, deviceId);
         }
         return code;
     }
+
+    private DeviceReportRespDTO.Firmware buildFirmwareInfo(String type, String currentVersion) {
+        if (StringUtils.isBlank(type)) {
+            return null;
+        }
+        if (StringUtils.isBlank(currentVersion)) {
+            currentVersion = "0.0.0";
+        }
+
+        OtaEntity ota = otaService.getLatestOta(type);
+        DeviceReportRespDTO.Firmware firmware = new DeviceReportRespDTO.Firmware();
+        String downloadUrl = null;
+
+        if (ota != null) {
+            // 如果设备没有版本信息，或者OTA版本比设备版本新，则返回下载地址
+            if (compareVersions(ota.getVersion(), currentVersion) > 0) {
+                String otaUrl = sysParamsService.getValue(Constant.SERVER_OTA, true);
+                if (StringUtils.isBlank(otaUrl) || otaUrl.equals("null")) {
+                    log.error("OTA地址未配置，请登录智控台，在参数管理找到【server.ota】配置");
+                    // 尝试从请求中获取
+                    HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder
+                            .getRequestAttributes())
+                            .getRequest();
+                    otaUrl = request.getRequestURL().toString();
+                }
+                // 将URL中的/ota/替换为/otaMag/download/
+                String uuid = UUID.randomUUID().toString();
+                redisUtils.set(RedisKeys.getOtaIdKey(uuid), ota.getId());
+                downloadUrl = otaUrl.replace("/ota/", "/otaMag/download/") + uuid;
+            }
+        }
+
+        firmware.setVersion(ota == null ? currentVersion : ota.getVersion());
+        firmware.setUrl(downloadUrl == null ? "" : downloadUrl);
+        return firmware;
+    }
+
+    /**
+     * 比较两个版本号
+     * 
+     * @param version1 版本1
+     * @param version2 版本2
+     * @return 如果version1 > version2返回1，version1 < version2返回-1，相等返回0
+     */
+    private static int compareVersions(String version1, String version2) {
+        if (version1 == null || version2 == null) {
+            return 0;
+        }
+
+        String[] v1Parts = version1.split("\\.");
+        String[] v2Parts = version2.split("\\.");
+
+        int length = Math.max(v1Parts.length, v2Parts.length);
+        for (int i = 0; i < length; i++) {
+            int v1 = i < v1Parts.length ? Integer.parseInt(v1Parts[i]) : 0;
+            int v2 = i < v2Parts.length ? Integer.parseInt(v2Parts[i]) : 0;
+
+            if (v1 > v2) {
+                return 1;
+            } else if (v1 < v2) {
+                return -1;
+            }
+        }
+        return 0;
+    }
 }

main/manager-api/src/main/java/xiaozhi/modules/device/service/impl/OtaServiceImpl.java

@@ -0,0 +1,85 @@
+package xiaozhi.modules.device.service.impl;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import io.micrometer.common.util.StringUtils;
+import xiaozhi.common.page.PageData;
+import xiaozhi.common.service.impl.BaseServiceImpl;
+import xiaozhi.modules.device.dao.OtaDao;
+import xiaozhi.modules.device.entity.OtaEntity;
+import xiaozhi.modules.device.service.OtaService;
+
+@Service
+public class OtaServiceImpl extends BaseServiceImpl<OtaDao, OtaEntity> implements OtaService {
+
+    @Override
+    public PageData<OtaEntity> page(Map<String, Object> params) {
+        IPage<OtaEntity> page = baseDao.selectPage(
+                getPage(params, "update_date", true),
+                getWrapper(params));
+
+        return new PageData<>(page.getRecords(), page.getTotal());
+    }
+
+    private QueryWrapper<OtaEntity> getWrapper(Map<String, Object> params) {
+        String firmwareName = (String) params.get("firmwareName");
+
+        QueryWrapper<OtaEntity> wrapper = new QueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(firmwareName), "firmware_name", firmwareName);
+
+        return wrapper;
+    }
+
+    @Override
+    public void update(OtaEntity entity) {
+        // 检查是否存在相同类型和版本的固件（排除当前记录）
+        QueryWrapper<OtaEntity> queryWrapper = new QueryWrapper<OtaEntity>()
+                .eq("type", entity.getType())
+                .eq("version", entity.getVersion())
+                .ne("id", entity.getId()); // 排除当前记录
+
+        if (baseDao.selectCount(queryWrapper) > 0) {
+            throw new RuntimeException("已存在相同类型和版本的固件，请修改后重试");
+        }
+
+        entity.setUpdateDate(new Date());
+        baseDao.updateById(entity);
+    }
+
+    @Override
+    public void delete(String[] ids) {
+        baseDao.deleteBatchIds(Arrays.asList(ids));
+    }
+
+    @Override
+    public boolean save(OtaEntity entity) {
+        QueryWrapper<OtaEntity> queryWrapper = new QueryWrapper<OtaEntity>()
+                .eq("type", entity.getType());
+        // 同类固件只保留最新的一条
+        List<OtaEntity> otaList = baseDao.selectList(queryWrapper);
+        if (otaList != null && otaList.size() > 0) {
+            OtaEntity otaBefore = otaList.getFirst();
+            entity.setId(otaBefore.getId());
+            baseDao.updateById(entity);
+            return true;
+        }
+        return baseDao.insert(entity) > 0;
+    }
+
+    @Override
+    public OtaEntity getLatestOta(String type) {
+        QueryWrapper<OtaEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("type", type)
+                .orderByDesc("update_date")
+                .last("LIMIT 1");
+        return baseDao.selectOne(wrapper);
+    }
+}

main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java

@@ -69,6 +69,7 @@ public class ShiroConfig {
          */
         Map<String, String> filterMap = new LinkedHashMap<>();
         filterMap.put("/ota/**", "anon");
+        filterMap.put("/otaMag/download/**", "anon");
         filterMap.put("/webjars/**", "anon");
         filterMap.put("/druid/**", "anon");
         filterMap.put("/v3/api-docs/**", "anon");

main/manager-api/src/main/java/xiaozhi/modules/security/config/WebMvcConfig.java

@@ -33,11 +33,15 @@ public class WebMvcConfig implements WebMvcConfigurer {
 
     @Override
     public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        // 特殊用途的转换器
         converters.add(new ByteArrayHttpMessageConverter());
-        converters.add(new StringHttpMessageConverter());
         converters.add(new ResourceHttpMessageConverter());
-        converters.add(new AllEncompassingFormHttpMessageConverter());
+
+        // 通用转换器
         converters.add(new StringHttpMessageConverter());
+        converters.add(new AllEncompassingFormHttpMessageConverter());
+
+        // JSON 转换器
         converters.add(jackson2HttpMessageConverter());
     }
 

main/manager-api/src/main/java/xiaozhi/modules/security/controller/LoginController.java

@@ -15,6 +15,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
+import xiaozhi.common.constant.Constant;
 import xiaozhi.common.exception.ErrorCode;
 import xiaozhi.common.exception.RenException;
 import xiaozhi.common.page.TokenDTO;
@@ -121,7 +122,7 @@ public class LoginController {
     @Operation(summary = "公共配置")
     public Result<Map<String, Object>> pubConfig() {
         Map<String, Object> config = new HashMap<>();
-        config.put("version", "0.3.4");
+        config.put("version", Constant.VERSION);
         config.put("allowUserRegister", sysUserService.getAllowUserRegister());
         return new Result<Map<String, Object>>().ok(config);
     }

main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysParamsController.java

@@ -2,7 +2,10 @@ package xiaozhi.modules.sys.controller;
 
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -11,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -20,6 +24,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
 import xiaozhi.common.annotation.LogOperation;
 import xiaozhi.common.constant.Constant;
+import xiaozhi.common.exception.RenException;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.utils.Result;
 import xiaozhi.common.validator.AssertUtils;
@@ -30,6 +35,7 @@ import xiaozhi.common.validator.group.UpdateGroup;
 import xiaozhi.modules.config.service.ConfigService;
 import xiaozhi.modules.sys.dto.SysParamsDTO;
 import xiaozhi.modules.sys.service.SysParamsService;
+import xiaozhi.modules.sys.utils.WebSocketValidator;
 
 /**
  * 参数管理
@@ -44,6 +50,7 @@ import xiaozhi.modules.sys.service.SysParamsService;
 public class SysParamsController {
     private final SysParamsService sysParamsService;
     private final ConfigService configService;
+    private final RestTemplate restTemplate;
 
     @GetMapping("page")
     @Operation(summary = "分页")
@@ -91,11 +98,91 @@ public class SysParamsController {
         // 效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
 
+        // 验证WebSocket地址列表
+        validateWebSocketUrls(dto.getParamCode(), dto.getParamValue());
+
+        // 验证OTA地址
+        validateOtaUrl(dto.getParamCode(), dto.getParamValue());
+
         sysParamsService.update(dto);
         configService.getConfig(false);
         return new Result<Void>();
     }
 
+    /**
+     * 验证WebSocket地址列表
+     * 
+     * @param urls WebSocket地址列表，以分号分隔
+     * @return 验证结果
+     */
+    private void validateWebSocketUrls(String paramCode, String urls) {
+        if (!paramCode.equals(Constant.SERVER_WEBSOCKET)) {
+            return;
+        }
+        String[] wsUrls = urls.split("\\;");
+        if (wsUrls.length == 0) {
+            throw new RenException("WebSocket地址列表不能为空");
+        }
+        for (String url : wsUrls) {
+            if (StringUtils.isNotBlank(url)) {
+                // 检查是否包含localhost或127.0.0.1
+                if (url.contains("localhost") || url.contains("127.0.0.1")) {
+                    throw new RenException("WebSocket地址不能使用localhost或127.0.0.1");
+                }
+
+                // 验证WebSocket地址格式
+                if (!WebSocketValidator.validateUrlFormat(url)) {
+                    throw new RenException("WebSocket地址格式不正确: " + url);
+                }
+
+                // 测试WebSocket连接
+                if (!WebSocketValidator.testConnection(url)) {
+                    throw new RenException("WebSocket连接测试失败: " + url);
+                }
+            }
+        }
+    }
+
+    /**
+     * 验证OTA地址
+     */
+    private void validateOtaUrl(String paramCode, String url) {
+        if (!paramCode.equals(Constant.SERVER_OTA)) {
+            return;
+        }
+        if (StringUtils.isBlank(url) || url.equals("null")) {
+            throw new RenException("OTA地址不能为空");
+        }
+
+        // 检查是否包含localhost或127.0.0.1
+        if (url.contains("localhost") || url.contains("127.0.0.1")) {
+            throw new RenException("OTA地址不能使用localhost或127.0.0.1");
+        }
+
+        // 验证URL格式
+        if (!url.toLowerCase().startsWith("http")) {
+            throw new RenException("OTA地址必须以http或https开头");
+        }
+        if (!url.endsWith("/ota/")) {
+            throw new RenException("OTA地址必须以/ota/结尾");
+        }
+
+        try {
+            // 发送GET请求
+            ResponseEntity<String> response = restTemplate.getForEntity(url, String.class);
+            if (response.getStatusCode() != HttpStatus.OK) {
+                throw new RenException("OTA接口访问失败，状态码：" + response.getStatusCode());
+            }
+            // 检查响应内容是否包含OTA相关信息
+            String body = response.getBody();
+            if (body == null || !body.contains("OTA")) {
+                throw new RenException("OTA接口返回内容格式不正确，可能不是一个真实的OTA接口");
+            }
+        } catch (Exception e) {
+            throw new RenException("OTA接口验证失败：" + e.getMessage());
+        }
+    }
+
     @PostMapping("/delete")
     @Operation(summary = "删除")
     @LogOperation("删除")

main/manager-api/src/main/java/xiaozhi/modules/sys/utils/WebSocketTestHandler.java

@@ -0,0 +1,46 @@
+package xiaozhi.modules.sys.utils;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.WebSocketMessage;
+import org.springframework.web.socket.WebSocketSession;
+
+public class WebSocketTestHandler implements WebSocketHandler {
+    private final CompletableFuture<Boolean> future;
+
+    public WebSocketTestHandler(CompletableFuture<Boolean> future) {
+        this.future = future;
+    }
+
+    @Override
+    public void afterConnectionEstablished(WebSocketSession session) {
+        future.complete(true);
+        try {
+            session.close();
+        } catch (Exception e) {
+            // 忽略关闭异常
+        }
+    }
+
+    @Override
+    public void handleMessage(WebSocketSession session, WebSocketMessage<?> message) {
+        // 不需要处理消息
+    }
+
+    @Override
+    public void handleTransportError(WebSocketSession session, Throwable exception) {
+        future.complete(false);
+    }
+
+    @Override
+    public void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) {
+        // 连接关闭时不做任何处理
+    }
+
+    @Override
+    public boolean supportsPartialMessages() {
+        return false;
+    }
+}

main/manager-api/src/main/java/xiaozhi/modules/sys/utils/WebSocketValidator.java

@@ -0,0 +1,58 @@
+package xiaozhi.modules.sys.utils;
+
+import java.net.URI;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.socket.client.WebSocketClient;
+import org.springframework.web.socket.client.standard.StandardWebSocketClient;
+
+public class WebSocketValidator {
+    private static final Logger logger = LoggerFactory.getLogger(WebSocketValidator.class);
+
+    // WebSocket URL正则表达式
+    private static final Pattern WS_URL_PATTERN = Pattern
+            .compile("^wss?://[\\w.-]+(?:\\.[\\w.-]+)*(?::\\d+)?(?:/[\\w.-]*)*$");
+
+    /**
+     * 验证WebSocket地址格式
+     * 
+     * @param url WebSocket地址
+     * @return 是否有效
+     */
+    public static boolean validateUrlFormat(String url) {
+        if (StringUtils.isBlank(url)) {
+            return false;
+        }
+        return WS_URL_PATTERN.matcher(url.trim()).matches();
+    }
+
+    /**
+     * 测试WebSocket连接
+     * 
+     * @param url WebSocket地址
+     * @return 是否可连接
+     */
+    public static boolean testConnection(String url) {
+        if (!validateUrlFormat(url)) {
+            return false;
+        }
+
+        try {
+            WebSocketClient client = new StandardWebSocketClient();
+            CompletableFuture<Boolean> future = new CompletableFuture<>();
+
+            client.doHandshake(new WebSocketTestHandler(future), null, URI.create(url));
+
+            // 等待最多5秒获取连接结果
+            return future.get(5, TimeUnit.SECONDS);
+        } catch (Exception e) {
+            logger.error("WebSocket连接测试失败: {}", url, e);
+            return false;
+        }
+    }
+}

main/manager-api/src/main/java/xiaozhi/modules/timbre/dto/TimbreDataDTO.java

@@ -24,7 +24,6 @@ public class TimbreDataDTO {
     private String name;
 
     @Schema(description = "备注")
-    @NotBlank(message = "{timbre.remark.require}")
     private String remark;
 
     @Schema(description = "排序")
@@ -40,6 +39,5 @@ public class TimbreDataDTO {
     private String ttsVoice;
 
     @Schema(description = "音频播放地址")
-    @NotBlank(message = "{timbre.voiceDemo.require}")
     private String voiceDemo;
 }

main/manager-api/src/main/resources/db/changelog/202504131542.sql

@@ -1,3 +0,0 @@
--- 对0.3.0版本之前的参数进行修改
-update `sys_params` set param_value = '.mp3;.wav;.p3' where  param_code = 'plugins.play_music.music_ext';
-update `ai_model_config` set config_json =  '{\"type\": \"intent_llm\", \"llm\": \"LLM_ChatGLMLLM\"}' where  id = 'Intent_intent_llm';

main/manager-api/src/main/resources/db/changelog/202504181536.sql

@@ -0,0 +1,7 @@
+-- 调整意图识别配置
+delete from `ai_model_config` where id = 'Intent_function_call';
+INSERT INTO `ai_model_config` VALUES ('Intent_function_call', 'Intent', 'function_call', '函数调用意图识别', 0, 1, '{\"type\": \"function_call\", \"functions\": \"change_role;get_weather;get_news;play_music\"}', NULL, NULL, 3, NULL, NULL, NULL, NULL);
+
+-- 增加单台设备每天最多聊天句数
+delete from `sys_params` where  id = 105;
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (105, 'device_max_output_size', '0', 'number', 1, '单台设备每天最多输出字数，0表示不限制');

main/manager-api/src/main/resources/db/changelog/202504221135.sql

@@ -0,0 +1,88 @@
+-- 删除无用模型供应器
+delete from `ai_model_provider` where id = 'SYSTEM_LLM_doubao';
+delete from `ai_model_provider` where id = 'SYSTEM_LLM_chatglm';
+delete from `ai_model_provider` where id = 'SYSTEM_TTS_302ai';
+delete from `ai_model_provider` where id = 'SYSTEM_TTS_gizwits';
+
+-- 添加模型供应器
+delete from `ai_model_provider` where id = 'SYSTEM_ASR_TencentASR';
+INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `fields`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES
+('SYSTEM_ASR_TencentASR', 'ASR', 'tencent', '腾讯语音识别', '[{"key":"appid","label":"应用ID","type":"string"},{"key":"secret_id","label":"Secret ID","type":"string"},{"key":"secret_key","label":"Secret Key","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"}]', 4, 1, NOW(), 1, NOW());
+
+-- 添加腾讯语音合成模型供应器
+delete from `ai_model_provider` where id = 'SYSTEM_TTS_TencentTTS';
+INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `fields`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES
+('SYSTEM_TTS_TencentTTS', 'TTS', 'tencent', '腾讯语音合成', '[{"key":"appid","label":"应用ID","type":"string"},{"key":"secret_id","label":"Secret ID","type":"string"},{"key":"secret_key","label":"Secret Key","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"},{"key":"region","label":"区域","type":"string"},{"key":"voice","label":"音色ID","type":"string"}]', 5, 1, NOW(), 1, NOW());
+
+
+-- 添加edge音色
+delete from `ai_tts_voice` where id in ('TTS_EdgeTTS0001', 'TTS_EdgeTTS0002', 'TTS_EdgeTTS0003', 'TTS_EdgeTTS0004', 'TTS_EdgeTTS0005', 'TTS_EdgeTTS0006', 'TTS_EdgeTTS0007', 'TTS_EdgeTTS0008', 'TTS_EdgeTTS0009', 'TTS_EdgeTTS0010', 'TTS_EdgeTTS0011');
+INSERT INTO `ai_tts_voice` VALUES 
+('TTS_EdgeTTS0001', 'TTS_EdgeTTS', 'EdgeTTS女声-晓晓', 'zh-CN-XiaoxiaoNeural', '普通话', NULL, NULL, 1, NULL, NULL, NULL, NULL),
+('TTS_EdgeTTS0002', 'TTS_EdgeTTS', 'EdgeTTS男声-云扬', 'zh-CN-YunyangNeural', '普通话', NULL, NULL, 1, NULL, NULL, NULL, NULL),
+('TTS_EdgeTTS0003', 'TTS_EdgeTTS', 'EdgeTTS女声-晓伊', 'zh-CN-XiaoyiNeural', '普通话', NULL, NULL, 1, NULL, NULL, NULL, NULL),
+('TTS_EdgeTTS0004', 'TTS_EdgeTTS', 'EdgeTTS男声-云健', 'zh-CN-YunjianNeural', '普通话', NULL, NULL, 1, NULL, NULL, NULL, NULL),
+('TTS_EdgeTTS0005', 'TTS_EdgeTTS', 'EdgeTTS男声-云希', 'zh-CN-YunxiNeural', '普通话', NULL, NULL, 1, NULL, NULL, NULL, NULL),
+('TTS_EdgeTTS0006', 'TTS_EdgeTTS', 'EdgeTTS男声-云夏', 'zh-CN-YunxiaNeural', '普通话', NULL, NULL, 1, NULL, NULL, NULL, NULL),
+('TTS_EdgeTTS0007', 'TTS_EdgeTTS', 'EdgeTTS女声-辽宁小贝', 'zh-CN-liaoning-XiaobeiNeural', '辽宁', NULL, NULL, 1, NULL, NULL, NULL, NULL),
+('TTS_EdgeTTS0008', 'TTS_EdgeTTS', 'EdgeTTS女声-陕西小妮', 'zh-CN-shaanxi-XiaoniNeural', '陕西', NULL, NULL, 1, NULL, NULL, NULL, NULL),
+('TTS_EdgeTTS0009', 'TTS_EdgeTTS', 'EdgeTTS女声-香港海佳', 'zh-HK-HiuGaaiNeural', '粤语', 'General', 'Friendly, Positive', 1, NULL, NULL, NULL, NULL),
+('TTS_EdgeTTS0010', 'TTS_EdgeTTS', 'EdgeTTS女声-香港海曼', 'zh-HK-HiuMaanNeural', '粤语', 'General', 'Friendly, Positive', 1, NULL, NULL, NULL, NULL),
+('TTS_EdgeTTS0011', 'TTS_EdgeTTS', 'EdgeTTS男声-香港万龙', 'zh-HK-WanLungNeural', '粤语', 'General', 'Friendly, Positive', 1, NULL, NULL, NULL, NULL);
+
+-- DoubaoTTS音色
+delete from `ai_tts_voice` where id in ('TTS_DoubaoTTS0001', 'TTS_DoubaoTTS0002', 'TTS_DoubaoTTS0003', 'TTS_DoubaoTTS0004', 'TTS_DoubaoTTS0005');
+INSERT INTO `ai_tts_voice` VALUES ('TTS_DoubaoTTS0001', 'TTS_DoubaoTTS', '通用女声', 'BV001_streaming', '普通话', 'https://lf3-speech.bytetos.com/obj/speech-tts-external/portal/Portal_Demo_BV001.mp3', NULL, 3, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_DoubaoTTS0002', 'TTS_DoubaoTTS', '通用男声', 'BV002_streaming', '普通话', 'https://lf3-speech.bytetos.com/obj/speech-tts-external/portal/Portal_Demo_BV002.mp3', NULL, 2, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_DoubaoTTS0003', 'TTS_DoubaoTTS', '阳光男生', 'BV056_streaming', '普通话', 'https://lf3-speech.bytetos.com/obj/speech-tts-external/portal/Portal_Demo_BV056.mp3', NULL, 4, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_DoubaoTTS0004', 'TTS_DoubaoTTS', '奶气萌娃', 'BV051_streaming', '普通话', 'https://lf3-speech.bytetos.com/obj/speech-tts-external/portal/Portal_Demo_BV051.mp3', NULL, 5, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_DoubaoTTS0005', 'TTS_DoubaoTTS', '湾湾小何', 'zh_female_wanwanxiaohe_moon_bigtts', '普通话', 'https://lf3-static.bytednsdoc.com/obj/eden-cn/lm_hz_ihsph/ljhwZthlaukjlkulzlp/portal/bigtts/%E6%B9%BE%E6%B9%BE%E5%B0%8F%E4%BD%95.mp3', NULL, 6, NULL, NULL, NULL, NULL);
+
+-- 修正CosyVoiceSiliconflow音色
+delete from `ai_tts_voice` where id in ('TTS_CosyVoiceSiliconflow0001', 'TTS_CosyVoiceSiliconflow0002');
+INSERT INTO `ai_tts_voice` VALUES ('TTS_CosyVoiceSiliconflow0001', 'TTS_CosyVoiceSiliconflow', 'CosyVoice男声', 'FunAudioLLM/CosyVoice2-0.5B:alex', '中文', NULL, NULL, 6, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_CosyVoiceSiliconflow0002', 'TTS_CosyVoiceSiliconflow', 'CosyVoice女声', 'FunAudioLLM/CosyVoice2-0.5B:bella', '中文', NULL, NULL, 6, NULL, NULL, NULL, NULL);
+
+-- CozeCnTTS音色
+delete from `ai_tts_voice` where id = 'TTS_CozeCnTTS0001';
+INSERT INTO `ai_tts_voice` VALUES ('TTS_CozeCnTTS0001', 'TTS_CozeCnTTS', 'CozeCn音色', '7426720361733046281', '中文', NULL, NULL, 7, NULL, NULL, NULL, NULL);
+
+-- MinimaxTTS音色
+delete from `ai_tts_voice` where id = 'TTS_MinimaxTTS0001';
+INSERT INTO `ai_tts_voice` VALUES ('TTS_MinimaxTTS0001', 'TTS_MinimaxTTS', 'Minimax少女音', 'female-shaonv', '中文', NULL, NULL, 8, NULL, NULL, NULL, NULL);
+
+-- AliyunTTS音色
+delete from `ai_tts_voice` where id = 'TTS_AliyunTTS0001';
+INSERT INTO `ai_tts_voice` VALUES ('TTS_AliyunTTS0001', 'TTS_AliyunTTS', '阿里云小云', 'xiaoyun', '中文', NULL, NULL, 9, NULL, NULL, NULL, NULL);
+
+-- TTS302AI音色
+delete from `ai_tts_voice` where id = 'TTS_TTS302AI0001';
+INSERT INTO `ai_tts_voice` VALUES ('TTS_TTS302AI0001', 'TTS_TTS302AI', '湾湾小何', 'zh_female_wanwanxiaohe_moon_bigtts', '中文', 'https://lf3-static.bytednsdoc.com/obj/eden-cn/lm_hz_ihsph/ljhwZthlaukjlkulzlp/portal/bigtts/%E6%B9%BE%E6%B9%BE%E5%B0%8F%E4%BD%95.mp3', NULL, 10, NULL, NULL, NULL, NULL);
+
+-- GizwitsTTS音色
+delete from `ai_tts_voice` where id = 'TTS_GizwitsTTS0001';
+INSERT INTO `ai_tts_voice` VALUES ('TTS_GizwitsTTS0001', 'TTS_GizwitsTTS', '机智云湾湾', 'zh_female_wanwanxiaohe_moon_bigtts', '中文', 'https://lf3-static.bytednsdoc.com/obj/eden-cn/lm_hz_ihsph/ljhwZthlaukjlkulzlp/portal/bigtts/%E6%B9%BE%E6%B9%BE%E5%B0%8F%E4%BD%95.mp3', NULL, 11, NULL, NULL, NULL, NULL);
+
+-- ACGNTTS音色
+delete from `ai_tts_voice` where id = 'TTS_ACGNTTS0001';
+INSERT INTO `ai_tts_voice` VALUES ('TTS_ACGNTTS0001', 'TTS_ACGNTTS', 'ACG音色', '1695', '中文', NULL, NULL, 12, NULL, NULL, NULL, NULL);
+
+-- OpenAITTS音色
+delete from `ai_tts_voice` where id = 'TTS_OpenAITTS0001';
+INSERT INTO `ai_tts_voice` VALUES ('TTS_OpenAITTS0001', 'TTS_OpenAITTS', 'OpenAI男声', 'onyx', '中文', NULL, NULL, 13, NULL, NULL, NULL, NULL);
+
+-- 添加腾讯语音合成音色
+delete from `ai_tts_voice` where id = 'TTS_TencentTTS0001';
+INSERT INTO `ai_tts_voice` VALUES ('TTS_TencentTTS0001', 'TTS_TencentTTS', '智瑜', '101001', '中文', NULL, NULL, 1, NULL, NULL, NULL, NULL);
+
+-- 其他音色
+delete from `ai_tts_voice` where id = 'TTS_FishSpeech0000';
+INSERT INTO `ai_tts_voice` VALUES ('TTS_FishSpeech0000', 'TTS_FishSpeech', '', '', '中文', '', NULL, 8, NULL, NULL, NULL, NULL);
+
+delete from `ai_tts_voice` where id = 'TTS_GPT_SOVITS_V20000';
+INSERT INTO `ai_tts_voice` VALUES ('TTS_GPT_SOVITS_V20000', 'TTS_GPT_SOVITS_V2', '', '', '中文', '', NULL, 8, NULL, NULL, NULL, NULL);
+
+delete from `ai_tts_voice` where id in ('TTS_GPT_SOVITS_V30000', 'TTS_CustomTTS0000');
+INSERT INTO `ai_tts_voice` VALUES ('TTS_GPT_SOVITS_V30000', 'TTS_GPT_SOVITS_V3', '', '', '中文', '', NULL, 8, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_CustomTTS0000', 'TTS_CustomTTS', '', '', '中文', '', NULL, 8, NULL, NULL, NULL, NULL);
+

main/manager-api/src/main/resources/db/changelog/202504221555.sql

@@ -0,0 +1,49 @@
+-- 添加火山引擎边缘大模型网关（LLM + TTS）
+INSERT INTO `ai_model_config` VALUES ('LLM_VolcesAiGatewayLLM', 'LLM', 'VolcesAiGatewayTTS', '火山引擎边缘大模型网关', 0, 1, '{\"type\": \"openai\", \"base_url\": \"https://ai-gateway.vei.volces.com/v1\", \"model_name\": \"doubao-pro-32k-functioncall\", \"api_key\": \"你的网关访问密钥\"}', NULL, NULL, 14, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('TTS_VolcesAiGatewayTTS', 'TTS', 'VolcesAiGatewayTTS', '火山引擎边缘大模型网关', 0, 1, '{\"type\": \"openai\", \"api_key\": \"你的网关访问密钥\", \"api_url\": \"https://ai-gateway.vei.volces.com/v1/audio/speech\", \"model\": \"doubao-tts\", \"voice\": \"zh_male_shaonianzixin_moon_bigtts\", \"speed\": 1, \"output_dir\": \"tmp/\"}', NULL, NULL, 15, NULL, NULL, NULL, NULL);
+-- 添加火山引擎边缘大模型网关语音合成音色
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0001', 'TTS_VolcesAiGatewayTTS', '灿灿/Shiny', 'zh_female_cancan_mars_bigtts', '中文、美式英语', NULL, NULL, 1, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0002', 'TTS_VolcesAiGatewayTTS', '清新女声', 'zh_female_qingxinnvsheng_mars_bigtts', '中文', NULL, NULL, 2, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0003', 'TTS_VolcesAiGatewayTTS', '爽快思思/Skye', 'zh_female_shuangkuaisisi_moon_bigtts', '中文、美式英语', NULL, NULL, 3, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0004', 'TTS_VolcesAiGatewayTTS', '温暖阿虎/Alvin', 'zh_male_wennuanahu_moon_bigtts', '中文、美式英语', NULL, NULL, 4, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0005', 'TTS_VolcesAiGatewayTTS', '少年梓辛/Brayan', 'zh_male_shaonianzixin_moon_bigtts', '中文、美式英语', NULL, NULL, 5, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0006', 'TTS_VolcesAiGatewayTTS', '知性女声', 'zh_female_zhixingnvsheng_mars_bigtts', '中文', NULL, NULL, 6, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0007', 'TTS_VolcesAiGatewayTTS', '清爽男大', 'zh_male_qingshuangnanda_mars_bigtts', '中文', NULL, NULL, 7, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0008', 'TTS_VolcesAiGatewayTTS', '邻家女孩', 'zh_female_linjianvhai_moon_bigtts', '中文', NULL, NULL, 8, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0009', 'TTS_VolcesAiGatewayTTS', '渊博小叔', 'zh_male_yuanboxiaoshu_moon_bigtts', '中文', NULL, NULL, 9, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0010', 'TTS_VolcesAiGatewayTTS', '阳光青年', 'zh_male_yangguangqingnian_moon_bigtts', '中文', NULL, NULL, 10, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0011', 'TTS_VolcesAiGatewayTTS', '甜美小源', 'zh_female_tianmeixiaoyuan_moon_bigtts', '中文', NULL, NULL, 11, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0012', 'TTS_VolcesAiGatewayTTS', '清澈梓梓', 'zh_female_qingchezizi_moon_bigtts', '中文', NULL, NULL, 12, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0013', 'TTS_VolcesAiGatewayTTS', '解说小明', 'zh_male_jieshuoxiaoming_moon_bigtts', '中文', NULL, NULL, 13, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0014', 'TTS_VolcesAiGatewayTTS', '开朗姐姐', 'zh_female_kailangjiejie_moon_bigtts', '中文', NULL, NULL, 14, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0015', 'TTS_VolcesAiGatewayTTS', '邻家男孩', 'zh_male_linjiananhai_moon_bigtts', '中文', NULL, NULL, 15, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0016', 'TTS_VolcesAiGatewayTTS', '甜美悦悦', 'zh_female_tianmeiyueyue_moon_bigtts', '中文', NULL, NULL, 16, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0017', 'TTS_VolcesAiGatewayTTS', '心灵鸡汤', 'zh_female_xinlingjitang_moon_bigtts', '中文', NULL, NULL, 17, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0018', 'TTS_VolcesAiGatewayTTS', '知性温婉', 'ICL_zh_female_zhixingwenwan_tob', '中文', NULL, NULL, 18, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0019', 'TTS_VolcesAiGatewayTTS', '暖心体贴', 'ICL_zh_male_nuanxintitie_tob', '中文', NULL, NULL, 19, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0020', 'TTS_VolcesAiGatewayTTS', '温柔文雅', 'ICL_zh_female_wenrouwenya_tob', '中文', NULL, NULL, 20, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0021', 'TTS_VolcesAiGatewayTTS', '开朗轻快', 'ICL_zh_male_kailangqingkuai_tob', '中文', NULL, NULL, 21, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0022', 'TTS_VolcesAiGatewayTTS', '活泼爽朗', 'ICL_zh_male_huoposhuanglang_tob', '中文', NULL, NULL, 22, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0023', 'TTS_VolcesAiGatewayTTS', '率真小伙', 'ICL_zh_male_shuaizhenxiaohuo_tob', '中文', NULL, NULL, 23, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0024', 'TTS_VolcesAiGatewayTTS', '温柔小哥', 'zh_male_wenrouxiaoge_mars_bigtts', '中文', NULL, NULL, 24, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0025', 'TTS_VolcesAiGatewayTTS', 'Smith', 'en_male_smith_mars_bigtts', '英式英语', NULL, NULL, 25, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0026', 'TTS_VolcesAiGatewayTTS', 'Anna', 'en_female_anna_mars_bigtts', '英式英语', NULL, NULL, 26, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0027', 'TTS_VolcesAiGatewayTTS', 'Adam', 'en_male_adam_mars_bigtts', '美式英语', NULL, NULL, 27, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0028', 'TTS_VolcesAiGatewayTTS', 'Sarah', 'en_female_sarah_mars_bigtts', '澳洲英语', NULL, NULL, 28, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0029', 'TTS_VolcesAiGatewayTTS', 'Dryw', 'en_male_dryw_mars_bigtts', '澳洲英语', NULL, NULL, 29, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0030', 'TTS_VolcesAiGatewayTTS', 'かずね（和音）', 'multi_male_jingqiangkanye_moon_bigtts', '日语、西语', NULL, NULL, 30, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0031', 'TTS_VolcesAiGatewayTTS', 'はるこ（晴子）', 'multi_female_shuangkuaisisi_moon_bigtts', '日语、西语', NULL, NULL, 31, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0032', 'TTS_VolcesAiGatewayTTS', 'ひろし（広志）', 'multi_male_wanqudashu_moon_bigtts', '日语、西语', NULL, NULL, 32, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0033', 'TTS_VolcesAiGatewayTTS', 'あけみ（朱美）', 'multi_female_gaolengyujie_moon_bigtts', '日语', NULL, NULL, 33, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0034', 'TTS_VolcesAiGatewayTTS', 'Amanda', 'en_female_amanda_mars_bigtts', '美式英语', NULL, NULL, 34, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0035', 'TTS_VolcesAiGatewayTTS', 'Jackson', 'en_male_jackson_mars_bigtts', '美式英语', NULL, NULL, 35, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0036', 'TTS_VolcesAiGatewayTTS', '京腔侃爷/Harmony', 'zh_male_jingqiangkanye_moon_bigtts', '中文-北京口音、英文', NULL, NULL, 36, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0037', 'TTS_VolcesAiGatewayTTS', '湾湾小何', 'zh_female_wanwanxiaohe_moon_bigtts', '中文-台湾口音', NULL, NULL, 37, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0038', 'TTS_VolcesAiGatewayTTS', '湾区大叔', 'zh_female_wanqudashu_moon_bigtts', '中文-广东口音', NULL, NULL, 38, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0039', 'TTS_VolcesAiGatewayTTS', '呆萌川妹', 'zh_female_daimengchuanmei_moon_bigtts', '中文-四川口音', NULL, NULL, 39, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0040', 'TTS_VolcesAiGatewayTTS', '广州德哥', 'zh_male_guozhoudege_moon_bigtts', '中文-广东口音', NULL, NULL, 40, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0041', 'TTS_VolcesAiGatewayTTS', '北京小爷', 'zh_male_beijingxiaoye_moon_bigtts', '中文-北京口音', NULL, NULL, 41, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0042', 'TTS_VolcesAiGatewayTTS', '浩宇小哥', 'zh_male_haoyuxiaoge_moon_bigtts', '中文-青岛口音', NULL, NULL, 42, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0043', 'TTS_VolcesAiGatewayTTS', '广西远舟', 'zh_male_guangxiyuanzhou_moon_bigtts', '中文-广西口音', NULL, NULL, 43, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0044', 'TTS_VolcesAiGatewayTTS', '妹坨洁儿', 'zh_female_meituojieer_moon_bigtts', '中文-长沙口音', NULL, NULL, 44, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_tts_voice` VALUES ('TTS_VolcesAiGatewayTTS_0045', 'TTS_VolcesAiGatewayTTS', '豫州子轩', 'zh_male_yuzhouzixuan_moon_bigtts', '中文-河南口音', NULL, NULL, 45, NULL, NULL, NULL, NULL);

main/manager-api/src/main/resources/db/changelog/202504251422.sql

@@ -0,0 +1,30 @@
+-- 增加server.ota，用于配置ota地址
+
+delete from `sys_params` where id = 100;
+delete from `sys_params` where id = 101;
+
+delete from `sys_params` where id = 106;
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (106, 'server.websocket', 'null', 'string', 1, 'websocket地址，多个用;分隔');
+
+delete from `sys_params` where id = 107;
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (107, 'server.ota', 'null', 'string', 1, 'ota地址');
+
+
+-- 增加固件信息表
+CREATE TABLE IF NOT EXISTS `ai_ota` (
+  `id` varchar(32) NOT NULL COMMENT 'ID',
+  `firmware_name` varchar(100) DEFAULT NULL COMMENT '固件名称',
+  `type` varchar(50) DEFAULT NULL COMMENT '固件类型',
+  `version` varchar(50) DEFAULT NULL COMMENT '版本号',
+  `size` bigint DEFAULT NULL COMMENT '文件大小(字节)',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注/说明',
+  `firmware_path` varchar(255) DEFAULT NULL COMMENT '固件路径',
+  `sort` int unsigned DEFAULT '0' COMMENT '排序',
+  `updater` bigint DEFAULT NULL COMMENT '更新者',
+  `update_date` datetime DEFAULT NULL COMMENT '更新时间',
+  `creator` bigint DEFAULT NULL COMMENT '创建者',
+  `create_date` datetime DEFAULT NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='固件信息表';
+
+update ai_device set auto_update = 1;

main/manager-api/src/main/resources/db/changelog/2025_tts_voive.sql

@@ -1,44 +0,0 @@
--- 本文件用于初始化音色数据，无需手动执行，在项目启动时会自动执行
--- ----------------------------------------------------
-
--- 初始化音色数据
-DELETE FROM `ai_tts_voice`;
-
--- EdgeTTS音色
-INSERT INTO `ai_tts_voice` VALUES ('TTS_EdgeTTS0001', 'TTS_EdgeTTS', 'EdgeTTS女声', 'zh-CN-XiaoxiaoNeural', '中文', 'https://lf3-static.bytednsdoc.com/obj/eden-cn/lm_hz_ihsph/ljhwZthlaukjlkulzlp/portal/bigtts/EdgeTTS.mp3', NULL, 1, NULL, NULL, NULL, NULL);
-
--- DoubaoTTS音色
-INSERT INTO `ai_tts_voice` VALUES ('TTS_DoubaoTTS0001', 'TTS_DoubaoTTS', '通用女声', 'BV001_streaming', '中文', 'https://lf3-speech.bytetos.com/obj/speech-tts-external/portal/Portal_Demo_BV001.mp3', NULL, 3, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_tts_voice` VALUES ('TTS_DoubaoTTS0002', 'TTS_DoubaoTTS', '通用男声', 'BV002_streaming', '中文', 'https://lf3-speech.bytetos.com/obj/speech-tts-external/portal/Portal_Demo_BV002.mp3', NULL, 2, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_tts_voice` VALUES ('TTS_DoubaoTTS0003', 'TTS_DoubaoTTS', '阳光男生', 'BV056_streaming', '中文', 'https://lf3-speech.bytetos.com/obj/speech-tts-external/portal/Portal_Demo_BV056.mp3', NULL, 4, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_tts_voice` VALUES ('TTS_DoubaoTTS0004', 'TTS_DoubaoTTS', '奶气萌娃', 'BV051_streaming', '中文', 'https://lf3-speech.bytetos.com/obj/speech-tts-external/portal/Portal_Demo_BV051.mp3', NULL, 5, NULL, NULL, NULL, NULL);
-
--- CosyVoiceSiliconflow音色
-INSERT INTO `ai_tts_voice` VALUES ('TTS_CosyVoiceSiliconflow0001', 'TTS_CosyVoiceSiliconflow', 'CosyVoice男声', 'alex', '中文', 'https://example.com/cosyvoice/alex.mp3', NULL, 6, NULL, NULL, NULL, NULL);
-
--- CozeCnTTS音色
-INSERT INTO `ai_tts_voice` VALUES ('TTS_CozeCnTTS0001', 'TTS_CozeCnTTS', 'CozeCn音色', '7426720361733046281', '中文', 'https://example.com/cozecn/voice.mp3', NULL, 7, NULL, NULL, NULL, NULL);
-
--- MinimaxTTS音色
-INSERT INTO `ai_tts_voice` VALUES ('TTS_MinimaxTTS0001', 'TTS_MinimaxTTS', 'Minimax少女音', 'female-shaonv', '中文', 'https://example.com/minimax/female-shaonv.mp3', NULL, 8, NULL, NULL, NULL, NULL);
-
--- AliyunTTS音色
-INSERT INTO `ai_tts_voice` VALUES ('TTS_AliyunTTS0001', 'TTS_AliyunTTS', '阿里云小云', 'xiaoyun', '中文', 'https://example.com/aliyun/xiaoyun.mp3', NULL, 9, NULL, NULL, NULL, NULL);
-
--- TTS302AI音色
-INSERT INTO `ai_tts_voice` VALUES ('TTS_TTS302AI0001', 'TTS_TTS302AI', '湾湾小何', 'zh_female_wanwanxiaohe_moon_bigtts', '中文', 'https://example.com/302ai/wanwanxiaohe.mp3', NULL, 10, NULL, NULL, NULL, NULL);
-
--- GizwitsTTS音色
-INSERT INTO `ai_tts_voice` VALUES ('TTS_GizwitsTTS0001', 'TTS_GizwitsTTS', '机智云湾湾', 'zh_female_wanwanxiaohe_moon_bigtts', '中文', 'https://example.com/gizwits/wanwanxiaohe.mp3', NULL, 11, NULL, NULL, NULL, NULL);
-
--- ACGNTTS音色
-INSERT INTO `ai_tts_voice` VALUES ('TTS_ACGNTTS0001', 'TTS_ACGNTTS', 'ACG音色', '1695', '中文', 'https://example.com/acgn/voice.mp3', NULL, 12, NULL, NULL, NULL, NULL);
-
--- OpenAITTS音色
-INSERT INTO `ai_tts_voice` VALUES ('TTS_OpenAITTS0001', 'TTS_OpenAITTS', 'OpenAI男声', 'onyx', '中文', 'https://example.com/openai/onyx.mp3', NULL, 13, NULL, NULL, NULL, NULL);
-
--- 其他音色
-INSERT INTO `ai_tts_voice` VALUES ('TTS_FishSpeech0000', 'TTS_FishSpeech', '', '', '中文', '', NULL, 8, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_tts_voice` VALUES ('TTS_GPT_SOVITS_V20000', 'TTS_GPT_SOVITS_V2', '', '', '中文', '', NULL, 8, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_tts_voice` VALUES ('TTS_GPT_SOVITS_V30000', 'TTS_GPT_SOVITS_V3', '', '', '中文', '', NULL, 8, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_tts_voice` VALUES ('TTS_CustomTTS0000', 'TTS_CustomTTS', '', '', '中文', '', NULL, 8, NULL, NULL, NULL, NULL);

main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml

@@ -16,13 +16,6 @@ databaseChangeLog:
         - sqlFile:
             encoding: utf8
             path: classpath:db/changelog/202503141346.sql
-  - changeSet:
-      id: 2025_tts_voive
-      author: John
-      changes:
-        - sqlFile:
-            encoding: utf8
-            path: classpath:db/changelog/2025_tts_voive.sql
   - changeSet:
       id: 202504082211
       author: John
@@ -58,3 +51,31 @@ databaseChangeLog:
         - sqlFile:
             encoding: utf8
             path: classpath:db/changelog/202504151206.sql
+  - changeSet:
+      id: 202504181536
+      author: John
+      changes:
+        - sqlFile:
+            encoding: utf8
+            path: classpath:db/changelog/202504181536.sql
+  - changeSet:
+      id: 202504221135
+      author: John
+      changes:
+        - sqlFile:
+            encoding: utf8
+            path: classpath:db/changelog/202504221135.sql
+  - changeSet:
+      id: 202504221555
+      author: John
+      changes:
+        - sqlFile:
+            encoding: utf8
+            path: classpath:db/changelog/202504221555.sql
+  - changeSet:
+      id: 202504251422
+      author: jiangkunyin
+      changes:
+        - sqlFile:
+            encoding: utf8
+            path: classpath:db/changelog/202504251422.sql

main/manager-api/src/main/resources/i18n/validation.properties

@@ -28,10 +28,8 @@ sysuser.uuid.require=\u552F\u4E00\u6807\u8BC6\u4E0D\u80FD\u4E3A\u7A7A
 
 timbre.languages.require=\u97F3\u8272\u7684\u8BED\u8A00\u4E0D\u53EF\u4EE5\u4E3A\u7A7A
 timbre.name.require=\u97F3\u8272\u7684\u540D\u79F0\u4E0D\u53EF\u4EE5\u4E3A\u7A7A
-timbre.remark.require=\u97F3\u8272\u7684\u5907\u6CE8\u4E0D\u53EF\u4EE5\u4E3A\u7A7A
 timbre.ttsModelId.require=\u97F3\u8272\u7684tts\u4E3B\u952E\u4E0D\u53EF\u4EE5\u4E3A\u7A7A
 timbre.ttsVoice.require=\u97F3\u8272\u7684\u7F16\u7801\u4E0D\u53EF\u4EE5\u4E3A\u7A7A
-timbre.voiceDemo.require=\u97F3\u8272\u7684\u64AD\u653EDemo\u4E0D\u53EF\u4EE5\u4E3A\u7A7A
 
 ota.device.not.found=\u8BBE\u5907\u672A\u627E\u5230
 ota.device.need.bind={0}

main/manager-api/src/main/resources/i18n/validation_en_US.properties

@@ -27,10 +27,8 @@ sysuser.uuid.require=The unique identifier cannot be empty
 
 timbre.languages.require=The language of the timbre cannot be empty
 timbre.name.require=The name of the timbre cannot be empty
-timbre.remark.require=The remark of the timbre cannot be empty
 timbre.ttsModelId.require=The TTS model ID of the timbre cannot be empty
 timbre.ttsVoice.require=The TTS voice of the timbre cannot be empty
-timbre.voiceDemo.require=The voice demo of the timbre cannot be empty
 
 ota.device.not.found=Device not found
 ota.device.need.bind={0}

main/manager-api/src/main/resources/i18n/validation_zh_CN.properties

@@ -27,10 +27,8 @@ sysuser.uuid.require=\u552F\u4E00\u6807\u8BC6\u4E0D\u80FD\u4E3A\u7A7A
 
 timbre.languages.require=\u97F3\u8272\u7684\u8A9E\u8A00\u4E0D\u53EF\u4EE5\u70BA\u7A7A
 timbre.name.require=\u97F3\u8272\u7684\u540D\u7A31\u4E0D\u53EF\u4EE5\u70BA\u7A7A
-timbre.remark.require=\u97F3\u8272\u7684\u5099\u6CE8\u4E0D\u53EF\u4EE5\u70BA\u7A7A
 timbre.ttsModelId.require=\u97F3\u8272\u7684tts\u4E3B\u9375\u4E0D\u53EF\u4EE5\u70BA\u7A7A
 timbre.ttsVoice.require=\u97F3\u8272\u7684\u7DE8\u78BC\u4E0D\u53EF\u4EE5\u70BA\u7A7A
-timbre.voiceDemo.require=\u97F3\u8272\u7684\u64AD\u653E\u5730\u5740\u4E0D\u53EF\u4EE5\u70BA\u7A7A
 
 ota.device.not.found=\u8A2D\u5099\u672A\u627E\u5230
 ota.device.need.bind={0}

main/manager-api/src/main/resources/i18n/validation_zh_TW.properties

@@ -27,10 +27,8 @@ sysuser.uuid.require=\u552F\u4E00\u6807\u8BC6\u4E0D\u80FD\u4E3A\u7A7A
 
 timbre.languages.require=\u97F3\u8272\u7684\u8BED\u8A00\u4E0D\u53EF\u4EE5\u4E3A\u7A7A
 timbre.name.require=\u97F3\u8272\u7684\u540D\u79F0\u4E0D\u53EF\u4EE5\u4E3A\u7A7A
-timbre.remark.require=\u97F3\u8272\u7684\u5907\u6CE8\u4E0D\u53EF\u4EE5\u4E3A\u7A7A
 timbre.ttsModelId.require=\u97F3\u8272\u7684tts\u4E3B\u952E\u4E0D\u53EF\u4EE5\u4E3A\u7A7A
 timbre.ttsVoice.require=\u97F3\u8272\u7684\u7F16\u7801\u4E0D\u53EF\u4EE5\u4E3A\u7A7A
-timbre.voiceDemo.require=\u97F3\u8272\u7684\u64AD\u653EDemo\u4E0D\u53EF\u4EE5\u4E3A\u7A7A
 
 ota.device.not.found=\u8A2D\u5099\u672A\u627E\u5230
 ota.device.need.bind={0}

main/manager-web/.env.production

@@ -1,3 +1,4 @@
 VUE_APP_API_BASE_URL=/xiaozhi
+VUE_APP_PUBLIC_PATH=/
 # 是否开启CDN
 VUE_APP_USE_CDN=false

main/manager-web/package.json

@@ -10,6 +10,7 @@
   "dependencies": {
     "core-js": "^3.41.0",
     "cross-env": "^7.0.3",
+    "dotenv": "^16.5.0",
     "element-ui": "^2.15.14",
     "flyio": "^0.6.14",
     "normalize.css": "^8.0.1",

main/manager-web/src/apis/api.js

@@ -5,6 +5,7 @@ import device from './module/device.js'
 import model from './module/model.js'
 import timbre from "./module/timbre.js"
 import user from './module/user.js'
+import ota from './module/ota.js'
 
 /**
  * 接口地址
@@ -31,4 +32,5 @@ export default {
     device,
     model,
     timbre,
+    ota
 }

main/manager-web/src/apis/module/device.js

@@ -51,4 +51,20 @@ export default {
                 });
             }).send();
     },
+    enableOtaUpgrade(id, status, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/device/enableOta/${id}/${status}`)
+            .method('PUT')
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res)
+            })
+            .fail((err) => {
+                console.error('更新OTA状态失败:', err)
+                this.$message.error(err.msg || '更新OTA状态失败')
+                RequestService.reAjaxFun(() => {
+                    this.enableOtaUpgrade(id, status, callback)
+                })
+            }).send()
+    },
 }

main/manager-web/src/apis/module/ota.js

@@ -0,0 +1,123 @@
+import { getServiceUrl } from '../api';
+import RequestService from '../httpRequest';
+
+export default {
+    // 分页查询OTA固件信息
+    getOtaList(params, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/otaMag`)
+            .method('GET')
+            .data(params)
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .fail((err) => {
+                console.error('获取OTA固件列表失败:', err);
+                RequestService.reAjaxFun(() => {
+                    this.getOtaList(params, callback);
+                });
+            }).send();
+    },
+    // 获取单个OTA固件信息
+    getOtaInfo(id, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/otaMag/${id}`)
+            .method('GET')
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .fail((err) => {
+                console.error('获取OTA固件信息失败:', err);
+                RequestService.reAjaxFun(() => {
+                    this.getOtaInfo(id, callback);
+                });
+            }).send();
+    },
+    // 保存OTA固件信息
+    saveOta(entity, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/otaMag`)
+            .method('POST')
+            .data(entity)
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .fail((err) => {
+                console.error('保存OTA固件信息失败:', err);
+                RequestService.reAjaxFun(() => {
+                    this.saveOta(entity, callback);
+                });
+            }).send();
+    },
+    // 更新OTA固件信息
+    updateOta(id, entity, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/otaMag/${id}`)
+            .method('PUT')
+            .data(entity)
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .fail((err) => {
+                console.error('更新OTA固件信息失败:', err);
+                RequestService.reAjaxFun(() => {
+                    this.updateOta(id, entity, callback);
+                });
+            }).send();
+    },
+    // 删除OTA固件
+    deleteOta(id, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/otaMag/${id}`)
+            .method('DELETE')
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .fail((err) => {
+                console.error('删除OTA固件失败:', err);
+                RequestService.reAjaxFun(() => {
+                    this.deleteOta(id, callback);
+                });
+            }).send();
+    },
+    // 上传固件文件
+    uploadFirmware(file, callback) {
+        const formData = new FormData();
+        formData.append('file', file);
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/otaMag/upload`)
+            .method('POST')
+            .data(formData)
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .fail((err) => {
+                console.error('上传固件文件失败:', err);
+                RequestService.reAjaxFun(() => {
+                    this.uploadFirmware(file, callback);
+                });
+            }).send();
+    },
+    // 获取固件下载链接
+    getDownloadUrl(id, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/otaMag/getDownloadUrl/${id}`)
+            .method('GET')
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .fail((err) => {
+                console.error('获取下载链接失败:', err);
+                RequestService.reAjaxFun(() => {
+                    this.getDownloadUrl(id, callback);
+                });
+            }).send();
+    }
+}

main/manager-web/src/components/AddDeviceDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="visible" width="400px" center>
+  <el-dialog :visible="visible" @close="handleClose" width="400px" center>
     <div
       style="margin: 0 10px 10px;display: flex;align-items: center;gap: 10px;font-weight: 700;font-size: 20px;text-align: left;color: #3d4566;">
       <div
@@ -79,7 +79,10 @@ export default {
     cancel() {
       this.$emit('update:visible', false)
       this.deviceCode = ""
-    }
+    },
+    handleClose() {
+      this.$emit('update:visible', false);
+    },
   }
 }
 </script>

main/manager-web/src/components/AddModelDialog.vue

@@ -44,7 +44,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="排序号" prop="sortOrder" style="flex: 1;">
-            <el-input v-model="formData.sort" placeholder="请输入排序号" class="custom-input-bg"></el-input>
+            <el-input v-model="formData.sort" type="number" placeholder="请输入排序号" class="custom-input-bg"></el-input>
           </el-form-item>
         </div>
 
@@ -77,7 +77,12 @@
     </div>
 
     <div style="display: flex;justify-content: center;">
-      <el-button type="primary" @click="confirm" class="save-btn">
+      <el-button
+        type="primary"
+        @click="confirm"
+        class="save-btn"
+        :loading="saving"
+        :disabled="saving">
         保存
       </el-button>
     </div>
@@ -94,6 +99,7 @@ export default {
   },
   data() {
     return {
+      saving: false,
       providers: [],
       dialogVisible: false,
       providersLoaded: false,
@@ -175,6 +181,7 @@ export default {
     },
 
     handleClose() {
+      this.saving = false;
       this.$emit('update:visible', false);
     },
     initDynamicConfig() {
@@ -185,8 +192,11 @@ export default {
       this.formData.configJson = newConfig;
     },
     confirm() {
+      this.saving = true;
+
       if (!this.formData.supplier) {
         this.$message.error('请选择供应器');
+        this.saving = false;
         return;
       }
 
@@ -206,11 +216,18 @@ export default {
         }
       };
 
-      this.$emit('confirm', submitData);
+      try {
-      this.$emit('update:visible', false);
+        this.$emit('confirm', submitData);
-      this.resetForm();
+        this.$emit('update:visible', false);
+        this.resetForm();
+      } catch (e) {
+        console.error(e);
+      } finally {
+        this.saving = false;
+      }
     },
     resetForm() {
+      this.saving = false;
       this.formData = {
         modelName: '',
         modelCode: '',

main/manager-web/src/components/AddWisdomBodyDialog.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="visible" width="400px" center @open="handleOpen">
+  <el-dialog :visible="visible" @close="handleClose"  width="400px" center @open="handleOpen">
     <div
       style="margin: 0 10px 10px;display: flex;align-items: center;gap: 10px;font-weight: 700;font-size: 20px;text-align: left;color: #3d4566;">
       <div
@@ -11,7 +11,7 @@
     <div style="height: 1px;background: #e8f0ff;" />
     <div style="margin: 22px 15px;">
       <div style="font-weight: 400;font-size: 14px;text-align: left;color: #3d4566;">
-        <div style="color: red;display: inline-block;">*</div> 智慧体名称：
+        <div style="color: red;display: inline-block;">*</div> 智能体名称：
       </div>
       <div class="input-46" style="margin-top: 12px;">
         <el-input ref="inputRef" placeholder="请输入智能体名称.." v-model="wisdomBodyName" @keyup.enter.native="confirm" />
@@ -66,7 +66,10 @@ export default {
     cancel() {
       this.$emit('update:visible', false)
       this.wisdomBodyName = ""
-    }
+    },
+    handleClose() {
+      this.$emit('update:visible', false);
+    },
   }
 }
 </script>

main/manager-web/src/components/DeviceItem.vue

@@ -23,12 +23,6 @@
       <div class="settings-btn" @click="handleConfigure">
         配置角色
       </div>
-      <!--      <div class="settings-btn">-->
-      <!--        声纹识别-->
-      <!--      </div>-->
-      <!--      <div class="settings-btn">-->
-      <!--        历史对话-->
-      <!--      </div>-->
       <div class="settings-btn" @click="handleDeviceManage">
         设备管理({{ device.deviceCount }})
       </div>
@@ -80,10 +74,11 @@ export default {
 
 .settings-btn {
   font-weight: 500;
-  font-size: 10px;
+  font-size: 12px;
   color: #5778ff;
   background: #e6ebff;
-  width: 57px;
+  width: auto;
+  padding: 0 12px;
   height: 21px;
   line-height: 21px;
   cursor: pointer;
@@ -94,7 +89,7 @@ export default {
   display: flex;
   justify-content: space-between;
   margin-top: 15px;
-  font-size: 10px;
+  font-size: 12px;
   color: #979db1;
   font-weight: 400;
 }

main/manager-web/src/components/FirmwareDialog.vue

@@ -0,0 +1,215 @@
+<template>
+  <el-dialog :title="title" :visible.sync="visible" width="500px" @close="handleClose" @open="handleOpen">
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form-item label="固件名称" prop="firmwareName">
+        <el-input v-model="form.firmwareName" placeholder="请输入固件名称(板子+版本号)"></el-input>
+      </el-form-item>
+      <el-form-item label="固件类型" prop="type">
+        <el-select v-model="form.type" placeholder="请选择固件类型" style="width: 100%;" filterable :disabled="isTypeDisabled">
+          <el-option v-for="item in firmwareTypes" :key="item.key" :label="item.name" :value="item.key"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="版本号" prop="version">
+        <el-input v-model="form.version" placeholder="请输入版本号(x.x.x格式)"></el-input>
+      </el-form-item>
+      <el-form-item label="固件文件" prop="firmwarePath">
+        <el-upload ref="upload" class="upload-demo" action="#" :http-request="handleUpload"
+          :before-upload="beforeUpload" :accept="'.bin,.apk'" :limit="1" :multiple="false" :auto-upload="true"
+          :on-remove="handleRemove">
+          <el-button size="small" type="primary">点击上传</el-button>
+          <div slot="tip" class="el-upload__tip">只能上传固件文件(.bin/.apk)，且不超过100MB</div>
+        </el-upload>
+        <el-progress v-if="isUploading || uploadStatus === 'success'" :percentage="uploadProgress"
+          :status="uploadStatus"></el-progress>
+        <div class="hint-text">
+          <span>温馨提示：请上传xiaozhi.bin文件，而不是merged-binary.bin文件</span>
+        </div>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input type="textarea" v-model="form.remark" placeholder="请输入备注信息"></el-input>
+      </el-form-item>
+    </el-form>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="handleCancel">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import Api from '@/apis/api';
+import { FIRMWARE_TYPES } from '@/utils';
+
+export default {
+  name: 'FirmwareDialog',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    title: {
+      type: String,
+      default: ''
+    },
+    form: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      firmwareTypes: FIRMWARE_TYPES,
+      uploadProgress: 0,
+      uploadStatus: '',
+      isUploading: false,
+      rules: {
+        firmwareName: [
+          { required: true, message: '请输入固件名称(板子+版本号)', trigger: 'blur' }
+        ],
+        type: [
+          { required: true, message: '请选择固件类型', trigger: 'change' }
+        ],
+        version: [
+          { required: true, message: '请输入版本号', trigger: 'blur' },
+          { pattern: /^\d+\.\d+\.\d+$/, message: '版本号格式不正确，请输入x.x.x格式', trigger: 'blur' }
+        ],
+        firmwarePath: [
+          { required: false, message: '请上传固件文件', trigger: 'change' }
+        ]
+      }
+    }
+  },
+  computed: {
+    isTypeDisabled() {
+      // 如果有id，说明是编辑模式，禁用类型选择
+      return !!this.form.id
+    }
+  },
+  methods: {
+    handleClose() {
+      this.$refs.form.clearValidate();
+      this.$emit('cancel');
+    },
+    handleCancel() {
+      this.$refs.form.clearValidate();
+      this.$emit('cancel');
+    },
+    handleSubmit() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          // 如果是新增模式且没有上传文件，则提示错误
+          if (!this.form.id && !this.form.firmwarePath) {
+            this.$message.error('请上传固件文件')
+            return
+          }
+          // 提交成功后将关闭对话框的逻辑交给父组件处理
+          this.$emit('submit', this.form)
+        }
+      })
+    },
+    beforeUpload(file) {
+      const isValidSize = file.size / 1024 / 1024 < 100
+      const isValidType = ['.bin', '.apk'].some(ext => file.name.toLowerCase().endsWith(ext))
+
+      if (!isValidType) {
+        this.$message.error('只能上传.bin/.apk格式的固件文件!')
+        return false
+      }
+      if (!isValidSize) {
+        this.$message.error('固件文件大小不能超过100MB!')
+        return false
+      }
+      return true
+    },
+    handleUpload(options) {
+      const { file } = options
+      this.uploadProgress = 0
+      this.uploadStatus = ''
+      this.isUploading = true
+
+      // 使用setTimeout实现简单的0-50%过渡
+      const timer = setTimeout(() => {
+        if (this.uploadProgress < 50) {  // 只有当进度小于50%时才设置
+          this.uploadProgress = 50
+        }
+      }, 1000)
+
+      Api.ota.uploadFirmware(file, (res) => {
+        clearTimeout(timer)  // 清除定时器
+        res = res.data
+        if (res.code === 0) {
+          this.form.firmwarePath = res.data
+          this.form.size = file.size
+          this.uploadProgress = 100
+          this.uploadStatus = 'success'
+          this.$message.success('固件文件上传成功')
+          // 延迟2秒后隐藏进度条
+          setTimeout(() => {
+            this.isUploading = false
+          }, 2000)
+        } else {
+          this.uploadStatus = 'exception'
+          this.$message.error(res.msg || '文件上传失败')
+          this.isUploading = false
+        }
+      }, (progressEvent) => {
+        if (progressEvent.total) {
+          const progress = Math.round((progressEvent.loaded * 100) / progressEvent.total)
+          // 只有当进度大于50%时才更新
+          if (progress > 50) {
+            this.uploadProgress = progress
+          }
+          // 如果上传完成但还没收到成功响应，保持进度条显示
+          if (progress === 100) {
+            this.uploadStatus = ''
+          }
+        }
+      })
+    },
+    handleRemove() {
+      this.form.firmwarePath = ''
+      this.form.size = 0
+      this.uploadProgress = 0
+      this.uploadStatus = ''
+      this.isUploading = false
+    },
+    handleOpen() {
+      // 重置上传相关状态
+      this.uploadProgress = 0
+      this.uploadStatus = ''
+      this.isUploading = false
+      // 重置表单中的文件相关字段
+      if (!this.form.id) {  // 只在新增时重置
+        this.form.firmwarePath = ''
+        this.form.size = 0
+        // 重置上传组件
+        this.$nextTick(() => {
+          if (this.$refs.upload) {
+            this.$refs.upload.clearFiles()
+          }
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.upload-demo {
+  text-align: left;
+}
+
+.el-upload__tip {
+  line-height: 1.2;
+  padding-top: 5px;
+  color: #909399;
+}
+
+.hint-text {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  color: #979db1;
+  font-size: 11px;
+}
+</style>

main/manager-web/src/components/HeaderBar.vue

@@ -32,6 +32,12 @@
             :style="{ filter: $route.path === '/params-management' ? 'brightness(0) invert(1)' : 'None' }" />
           参数管理
         </div>
+        <div v-if="isSuperAdmin" class="equipment-management"
+          :class="{ 'active-tab': $route.path === '/ota-management' }" @click="goOtaManagement">
+          <img loading="lazy" alt="" src="@/assets/header/firmware_update.png"
+            :style="{ filter: $route.path === '/ota-management' ? 'brightness(0) invert(1)' : 'None' }" />
+          OTA管理
+        </div>
       </div>
 
       <!-- 右侧元素 -->
@@ -105,6 +111,9 @@ export default {
     goParamManagement() {
       this.$router.push('/params-management')
     },
+    goOtaManagement() {
+      this.$router.push('/ota-management')
+    },
     // 获取用户信息
     fetchUserInfo() {
       userApi.getUserInfo(({ data }) => {
@@ -170,7 +179,7 @@ export default {
 .header {
   background: #f6fcfe66;
   border: 1px solid #fff;
-  height: 53px !important;
+  height: 63px !important;
   min-width: 900px;
   /* 设置最小宽度防止过度压缩 */
   overflow: hidden;
@@ -197,7 +206,7 @@ export default {
 }
 
 .brand-img {
-  height: 18px;
+  height: 20px;
 }
 
 .header-center {
@@ -219,13 +228,13 @@ export default {
 
 .equipment-management {
   padding: 0 9px;
-  width: 82px;
+  width: px;
-  height: 24px;
+  height: 30px;
-  border-radius: 12px;
+  border-radius: 15px;
   background: #deeafe;
   display: flex;
   justify-content: center;
-  font-size: 10px;
+  font-size: 14px;
   font-weight: 500;
   gap: 7px;
   color: #3d4566;
@@ -235,6 +244,7 @@ export default {
   cursor: pointer;
   flex-shrink: 0;
   /* 防止导航按钮被压缩 */
+  padding: 0px 15px;
 }
 
 .equipment-management.active-tab {

main/manager-web/src/components/ModelEditDialog.vue

@@ -76,7 +76,12 @@
     </div>
 
     <div style="display: flex;justify-content: center;">
-      <el-button type="primary" @click="handleSave" class="save-btn">
+      <el-button
+        type="primary"
+        @click="handleSave"
+        class="save-btn"
+        :loading="saving"
+        :disabled="saving">
         保存
       </el-button>
     </div>
@@ -102,6 +107,7 @@ export default {
       dialogVisible: this.visible,
       providers: [],
       providersLoaded: false,
+      saving: false,
       allProvidersData: null,
       pendingProviderType: null,
       pendingModelData: null,
@@ -195,6 +201,8 @@ export default {
       }
     },
     handleSave() {
+      this.saving = true; // 开始保存加载
+
       const provideCode = this.form.configJson.type;
       const formData = {
         id: this.modelData.id,
@@ -209,8 +217,19 @@ export default {
           ...this.form.configJson,
         }
       };
-      this.$emit("save", { provideCode, formData });
+
-      this.dialogVisible = false;
+      this.$emit("save", {
+        provideCode,
+        formData,
+        done: () => {
+          this.saving = false; // 保存完成后回调
+        }
+      });
+
+      // 如果父组件不处理done回调，3秒后自动关闭加载状态
+      setTimeout(() => {
+        this.saving = false;
+      }, 3000);
     },
     loadProviders() {
       if (this.providersLoaded) return;

main/manager-web/src/components/ParamDialog.vue

@@ -40,7 +40,12 @@
       </el-form>
 
       <div class="dialog-footer">
-        <el-button type="primary" @click="submit" class="save-btn">
+        <el-button
+          type="primary"
+          @click="submit"
+          class="save-btn"
+          :loading="saving"
+          :disabled="saving">
           保存
         </el-button>
         <el-button @click="cancel" class="cancel-btn">
@@ -76,6 +81,7 @@ export default {
   data() {
     return {
       dialogKey: Date.now(),
+      saving: false,
       valueTypeOptions: [
         { value: 'string', label: '字符串(string)' },
         { value: 'number', label: '数字(number)' },
@@ -100,11 +106,22 @@ export default {
     submit() {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          this.$emit('submit', this.form);
+          this.saving = true; // 开始加载
+          this.$emit('submit', {
+            form: this.form,
+            done: () => {
+              this.saving = false; // 加载完成
+            }
+          });
+
+          setTimeout(() => {
+            this.saving = false;
+          }, 3000);
         }
       });
     },
     cancel() {
+      this.saving = false; // 取消时重置状态
       this.$emit('cancel');
     }
   },

main/manager-web/src/components/TtsModel.vue

@@ -14,13 +14,16 @@
           class="table-container"
           ref="tableContainer"
           @scroll="handleScroll">
-        <el-table
+          <el-table
-            v-loading="loading"
+              v-loading="loading"
-            :data="filteredTtsModels"
+              :data="filteredTtsModels"
-            style="width: 100%;"
+              style="width: 100%;"
-            class="data-table"
+              class="data-table"
-            header-row-class-name="table-header"
+              header-row-class-name="table-header"
-            :fit="true">
+              :fit="true"
+              element-loading-text="拼命加载中"
+              element-loading-spinner="el-icon-loading"
+              element-loading-background="rgba(0, 0, 0, 0.8)">
           <el-table-column label="选择" width="50" align="center">
             <template slot-scope="scope">
               <el-checkbox v-model="scope.row.selected"></el-checkbox>
@@ -187,28 +190,28 @@ export default {
   },
   methods: {
     loadData() {
+      this.loading = true;
       const params = {
         ttsModelId: this.ttsModelId,
         page: this.currentPage,
         limit: this.pageSize,
         name: this.searchQuery
       };
-
       Api.timbre.getVoiceList(params, (data) => {
         if (data.code === 0) {
           this.ttsModels = data.data.list
-              .map(item => ({
+            .map(item => ({
-                id: item.id || '',
+              id: item.id || '',
-                voiceCode: item.ttsVoice || '',
+              voiceCode: item.ttsVoice || '',
-                voiceName: item.name || '未命名音色',
+              voiceName: item.name || '未命名音色',
-                languageType: item.languages || '',
+              languageType: item.languages || '',
-                remark: item.remark || '',
+              remark: item.remark || '',
-                voiceDemo: item.voiceDemo || '',
+              voiceDemo: item.voiceDemo || '',
-                selected: false,
+              selected: false,
-                editing: false,
+              editing: false,
-                sort: Number(item.sort)
+              sort: Number(item.sort)
-              }))
+            }))
-              .sort((a, b) => a.sort - b.sort);
+            .sort((a, b) => a.sort - b.sort);
           this.total = data.total;
         } else {
           this.$message.error({
@@ -216,12 +219,14 @@ export default {
             showClose: true
           });
         }
+        this.loading = false;
       }, (err) => {
         console.error('加载失败:', err);
         this.$message.error({
           message: '加载音色数据失败',
           showClose: true
         });
+        this.loading = false;
       });
     },
 
@@ -551,28 +556,26 @@ export default {
 
 /* 备注文本 */
 ::v-deep .remark-input .el-textarea__inner {
-  background-color: #f5f5f5;
   border-radius: 4px;
   border: 1px solid #e6e6e6;
   padding: 8px 12px;
   resize: none;
   max-height: 40px !important;
   line-height: 1.5;
-}
+  background-color: transparent !important;
-
-::v-deep .remark-input .el-textarea__inner::placeholder {
-  color: black !important;
-  opacity: 0.7;
-}
-
-::v-deep .remark-input .el-textarea__inner {
-  background-color: #f4f6fa;
 }
 
 ::v-deep .remark-input .el-textarea__inner:focus {
-  background-color: #edeffb;
+  border-color: #409EFF !important;
+  outline: none;
 }
 
+::v-deep .remark-input .el-textarea__inner::placeholder {
+  color: #c0c4cc !important;
+  opacity: 1;
+}
+
+
 /* 滚动容器 */
 .scroll-wrapper {
   display: flex;
@@ -650,6 +653,12 @@ export default {
   bottom: 20px;
   padding-top: 10px;
 }
+
+.action-buttons .el-button {
+  padding: 8px 15px;
+  font-size: 11px;
+}
+
 .edit-btn,
 .delete-btn,
 .save-btn {

main/manager-web/src/router/index.js

@@ -62,13 +62,6 @@ const routes = [
       return import('../views/ModelConfig.vue')
     }
   },
-  {
-    path: '/test',
-    name: 'TestServer',
-    component: function () {
-      return import('../views/test.vue')
-    }
-  },
   {
     path: '/params-management',
     name: 'ParamsManagement',
@@ -80,9 +73,21 @@ const routes = [
       title: '参数管理'
     }
   },
+  {
+    path: '/ota-management',
+    name: 'OtaManagement',
+    component: function () {
+      return import('../views/OtaManagement.vue')
+    },
+    meta: {
+      requiresAuth: true,
+      title: 'OTA管理'
+    }
+  },
 ]
 
 const router = new VueRouter({
+  base: process.env.VUE_APP_PUBLIC_PATH || '/',
   routes
 })
 

main/manager-web/src/utils/format.js

@@ -0,0 +1,21 @@
+// 日期格式化函数
+export function formatDate(date) {
+  if (!date) return '';
+  const d = new Date(date);
+  const year = d.getFullYear();
+  const month = String(d.getMonth() + 1).padStart(2, '0');
+  const day = String(d.getDate()).padStart(2, '0');
+  const hour = String(d.getHours()).padStart(2, '0');
+  const minute = String(d.getMinutes()).padStart(2, '0');
+  const second = String(d.getSeconds()).padStart(2, '0');
+  return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
+}
+
+// 文件大小格式化函数
+export function formatFileSize(bytes) {
+  if (!bytes || bytes === 0) return '0 B';
+  const units = ['B', 'KB', 'MB', 'GB', 'TB'];
+  const k = 1024;
+  const i = Math.floor(Math.log(bytes) / Math.log(k));
+  return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + units[i];
+}

main/manager-web/src/utils/index.js

@@ -136,3 +136,63 @@ export function getUUID() {
     })
 }
 
+/**
+ * 固件类型选项
+ */
+export const FIRMWARE_TYPES = [
+    { "key": "bread-compact-wifi", "name": "面包板新版接线（WiFi）" },
+    { "key": "bread-compact-wifi-lcd", "name": "面包板新版接线（WiFi）+ LCD" },
+    { "key": "bread-compact-ml307", "name": "面包板新版接线（ML307 AT）" },
+    { "key": "bread-compact-esp32", "name": "面包板（WiFi） ESP32 DevKit" },
+    { "key": "bread-compact-esp32-lcd", "name": "面包板（WiFi+ LCD） ESP32 DevKit" },
+    { "key": "df-k10", "name": "DFRobot 行空板 k10" },
+    { "key": "esp32-cgc", "name": "ESP32 CGC" },
+    { "key": "esp-box-3", "name": "ESP BOX 3" },
+    { "key": "esp-box", "name": "ESP BOX" },
+    { "key": "esp-box-lite", "name": "ESP BOX Lite" },
+    { "key": "kevin-box-1", "name": "Kevin Box 1" },
+    { "key": "kevin-box-2", "name": "Kevin Box 2" },
+    { "key": "kevin-c3", "name": "Kevin C3" },
+    { "key": "kevin-sp-v3-dev", "name": "Kevin SP V3开发板" },
+    { "key": "kevin-sp-v4-dev", "name": "Kevin SP V4开发板" },
+    { "key": "kevin-yuying-313lcd", "name": "鱼鹰科技3.13LCD开发板" },
+    { "key": "lichuang-dev", "name": "立创·实战派ESP32-S3开发板" },
+    { "key": "lichuang-c3-dev", "name": "立创·实战派ESP32-C3开发板" },
+    { "key": "magiclick-2p4", "name": "神奇按钮 Magiclick_2.4" },
+    { "key": "magiclick-2p5", "name": "神奇按钮 Magiclick_2.5" },
+    { "key": "magiclick-c3", "name": "神奇按钮 Magiclick_C3" },
+    { "key": "magiclick-c3-v2", "name": "神奇按钮 Magiclick_C3_v2" },
+    { "key": "m5stack-core-s3", "name": "M5Stack CoreS3" },
+    { "key": "atoms3-echo-base", "name": "AtomS3 + Echo Base" },
+    { "key": "atoms3r-echo-base", "name": "AtomS3R + Echo Base" },
+    { "key": "atoms3r-cam-m12-echo-base", "name": "AtomS3R CAM/M12 + Echo Base" },
+    { "key": "atommatrix-echo-base", "name": "AtomMatrix + Echo Base" },
+    { "key": "xmini-c3", "name": "虾哥 Mini C3" },
+    { "key": "esp32s3-korvo2-v3", "name": "ESP32S3_KORVO2_V3开发板" },
+    { "key": "esp-sparkbot", "name": "ESP-SparkBot开发板" },
+    { "key": "esp-spot-s3", "name": "ESP-Spot-S3" },
+    { "key": "esp32-s3-touch-amoled-1.8", "name": "Waveshare ESP32-S3-Touch-AMOLED-1.8" },
+    { "key": "esp32-s3-touch-lcd-1.85c", "name": "Waveshare ESP32-S3-Touch-LCD-1.85C" },
+    { "key": "esp32-s3-touch-lcd-1.85", "name": "Waveshare ESP32-S3-Touch-LCD-1.85" },
+    { "key": "esp32-s3-touch-lcd-1.46", "name": "Waveshare ESP32-S3-Touch-LCD-1.46" },
+    { "key": "esp32-s3-touch-lcd-3.5", "name": "Waveshare ESP32-S3-Touch-LCD-3.5" },
+    { "key": "tudouzi", "name": "土豆子" },
+    { "key": "lilygo-t-circle-s3", "name": "LILYGO T-Circle-S3" },
+    { "key": "lilygo-t-cameraplus-s3", "name": "LILYGO T-CameraPlus-S3" },
+    { "key": "movecall-moji-esp32s3", "name": "Movecall Moji 小智AI衍生版" },
+    { "key": "movecall-cuican-esp32s3", "name": "Movecall CuiCan 璀璨·AI吊坠" },
+    { "key": "atk-dnesp32s3", "name": "正点原子DNESP32S3开发板" },
+    { "key": "atk-dnesp32s3-box", "name": "正点原子DNESP32S3-BOX" },
+    { "key": "du-chatx", "name": "嘟嘟开发板CHATX(wifi)" },
+    { "key": "taiji-pi-s3", "name": "太极小派esp32s3" },
+    { "key": "xingzhi-cube-0.85tft-wifi", "name": "无名科技星智0.85(WIFI)" },
+    { "key": "xingzhi-cube-0.85tft-ml307", "name": "无名科技星智0.85(ML307)" },
+    { "key": "xingzhi-cube-0.96oled-wifi", "name": "无名科技星智0.96(WIFI)" },
+    { "key": "xingzhi-cube-0.96oled-ml307", "name": "无名科技星智0.96(ML307)" },
+    { "key": "xingzhi-cube-1.54tft-wifi", "name": "无名科技星智1.54(WIFI)" },
+    { "key": "xingzhi-cube-1.54tft-ml307", "name": "无名科技星智1.54(ML307)" },
+    { "key": "sensecap-watcher", "name": "SenseCAP Watcher" },
+    { "key": "doit-s3-aibox", "name": "四博智联AI陪伴盒子" },
+    { "key": "mixgo-nova", "name": "元控·青春" }
+]
+

main/manager-web/src/views/DeviceManagement.vue

@@ -5,8 +5,8 @@
     <div class="operation-bar">
       <h2 class="page-title">设备管理</h2>
       <div class="right-operations">
-        <el-input placeholder="请输入设备型号或Mac地址查询" v-model="searchKeyword"
+        <el-input placeholder="请输入设备型号或Mac地址查询" v-model="searchKeyword" class="search-input"
-                 class="search-input" @keyup.enter.native="handleSearch" clearable />
+          @keyup.enter.native="handleSearch" clearable />
         <el-button class="btn-search" @click="handleSearch">搜索</el-button>
       </div>
     </div>
@@ -15,15 +15,20 @@
       <div class="content-panel">
         <div class="content-area">
           <el-card class="device-card" shadow="never">
-            <el-table
+            <el-table ref="deviceTable" :data="paginatedDeviceList" class="transparent-table"
-              ref="deviceTable"
+              :header-cell-class-name="headerCellClassName" v-loading="loading" element-loading-text="拼命加载中"
-              :data="paginatedDeviceList"
+              element-loading-spinner="el-icon-loading" element-loading-background="rgba(255, 255, 255, 0.7)">
-              @selection-change="handleSelectionChange"
+              <el-table-column label="选择" align="center" width="120">
-              class="transparent-table"
+                <template slot-scope="scope">
-              :header-cell-class-name="headerCellClassName">
+                  <el-checkbox v-model="scope.row.selected"></el-checkbox>
-              <el-table-column type="selection" align="center" width="120"></el-table-column>
+                </template>
-              <el-table-column label="设备型号" prop="model" align="center"></el-table-column>
+              </el-table-column>
-              <el-table-column label="固件版本" prop="firmwareVersion" align="center" ></el-table-column>
+              <el-table-column label="设备型号" prop="model" align="center">
+                <template slot-scope="scope">
+                  {{ getFirmwareTypeName(scope.row.model) }}
+                </template>
+              </el-table-column>
+              <el-table-column label="固件版本" prop="firmwareVersion" align="center"></el-table-column>
               <el-table-column label="Mac地址" prop="macAddress" align="center"></el-table-column>
               <el-table-column label="绑定时间" prop="bindTime" align="center"></el-table-column>
               <el-table-column label="最近对话" prop="lastConversation" align="center"></el-table-column>
@@ -32,7 +37,8 @@
                   <el-input v-if="scope.row.isEdit" v-model="scope.row.remark" size="mini"
                     @blur="stopEditRemark(scope.$index)"></el-input>
                   <span v-else>
-                    <i v-if="!scope.row.remark" class="el-icon-edit" @click="startEditRemark(scope.$index, scope.row)"></i>
+                    <i v-if="!scope.row.remark" class="el-icon-edit"
+                      @click="startEditRemark(scope.$index, scope.row)"></i>
                     <span v-else @click="startEditRemark(scope.$index, scope.row)">
                       {{ scope.row.remark }}
                     </span>
@@ -41,8 +47,8 @@
               </el-table-column>
               <el-table-column label="OTA升级" align="center">
                 <template slot-scope="scope">
-                  <el-switch v-model="scope.row.otaSwitch" size="mini" active-color="#13ce66"
+                  <el-switch v-model="scope.row.otaSwitch" size="mini" active-color="#13ce66" inactive-color="#ff4949"
-                    inactive-color="#ff4949"></el-switch>
+                    @change="handleOtaSwitchChange(scope.row)"></el-switch>
                 </template>
               </el-table-column>
               <el-table-column label="操作" align="center">
@@ -56,32 +62,23 @@
 
             <div class="table_bottom">
               <div class="ctrl_btn">
-                <el-button size="mini" type="primary" class="select-all-btn" @click="toggleAllSelection">
+                <el-button size="mini" type="primary" class="select-all-btn" @click="handleSelectAll">
                   {{ isAllSelected ? '取消全选' : '全选' }}
                 </el-button>
                 <el-button type="success" size="mini" class="add-device-btn" @click="handleAddDevice">
                   新增
                 </el-button>
-                <el-button size="mini" type="danger" icon="el-icon-delete"
+                <el-button size="mini" type="danger" icon="el-icon-delete" @click="deleteSelected">解绑</el-button>
-                  @click="deleteSelected">解绑</el-button>
               </div>
               <div class="custom-pagination">
                 <el-select v-model="pageSize" @change="handlePageSizeChange" class="page-size-select">
-                    <el-option
+                  <el-option v-for="item in pageSizeOptions" :key="item" :label="`${item}条/页`" :value="item">
-                        v-for="item in pageSizeOptions"
+                  </el-option>
-                        :key="item"
-                        :label="`${item}条/页`"
-                        :value="item">
-                    </el-option>
                 </el-select>
                 <button class="pagination-btn" :disabled="currentPage === 1" @click="goFirst">首页</button>
                 <button class="pagination-btn" :disabled="currentPage === 1" @click="goPrev">上一页</button>
-                <button
+                <button v-for="page in visiblePages" :key="page" class="pagination-btn"
-                  v-for="page in visiblePages"
+                  :class="{ active: page === currentPage }" @click="goToPage(page)">
-                  :key="page"
-                  class="pagination-btn"
-                  :class="{ active: page === currentPage }"
-                  @click="goToPage(page)">
                   {{ page }}
                 </button>
                 <button class="pagination-btn" :disabled="currentPage === pageCount" @click="goNext">下一页</button>
@@ -103,6 +100,7 @@
 import Api from '@/apis/api';
 import AddDeviceDialog from "@/components/AddDeviceDialog.vue";
 import HeaderBar from "@/components/HeaderBar.vue";
+import { FIRMWARE_TYPES } from "@/utils";
 
 export default {
   components: { HeaderBar, AddDeviceDialog },
@@ -115,12 +113,11 @@ export default {
       activeSearchKeyword: "",
       currentAgentId: this.$route.query.agentId || '',
       currentPage: 1,
-      pageSize: 5,
+      pageSize: 10,
-      pageSizeOptions: [5, 10, 20, 50, 100],
+      pageSizeOptions: [10, 20, 50, 100],
       deviceList: [],
       loading: false,
       userApi: null,
-
     };
   },
   computed: {
@@ -136,7 +133,10 @@ export default {
     paginatedDeviceList() {
       const start = (this.currentPage - 1) * this.pageSize;
       const end = start + this.pageSize;
-      return this.filteredDeviceList.slice(start, end);
+      return this.filteredDeviceList.slice(start, end).map(item => ({
+        ...item,
+        selected: false
+      }));
     },
     pageCount() {
       return Math.ceil(this.filteredDeviceList.length / this.pageSize);
@@ -173,15 +173,16 @@ export default {
       this.currentPage = 1;
     },
 
-    handleSelectionChange(val) {
+    handleSelectAll() {
-      this.selectedDevices = val;
+      this.isAllSelected = !this.isAllSelected;
-      this.isAllSelected = val.length === this.paginatedDeviceList.length;
+      this.paginatedDeviceList.forEach(row => {
-    },
+        row.selected = this.isAllSelected;
-    toggleAllSelection() {
+      });
-      this.$refs.deviceTable.toggleAllSelection();
+      this.selectedDevices = this.paginatedDeviceList.filter(device => device.selected);
     },
 
     deleteSelected() {
+      this.selectedDevices = this.paginatedDeviceList.filter(device => device.selected);
       if (this.selectedDevices.length === 0) {
         this.$message.warning({
           message: '请至少选择一条记录',
@@ -283,20 +284,25 @@ export default {
           this.deviceList = data.data.map(device => {
             const bindDate = new Date(device.createDate);
             const formattedBindTime = `${bindDate.getFullYear()}-${(bindDate.getMonth() + 1).toString().padStart(2, '0')}-${bindDate.getDate().toString().padStart(2, '0')} ${bindDate.getHours().toString().padStart(2, '0')}:${bindDate.getMinutes().toString().padStart(2, '0')}:${bindDate.getSeconds().toString().padStart(2, '0')}`;
+            let formattedLastConversation = '';
+            if (device.lastConnectedAt) {
+              const lastConvoDate = new Date(device.lastConnectedAt);
+              formattedLastConversation = `${lastConvoDate.getFullYear()}-${(lastConvoDate.getMonth() + 1).toString().padStart(2, '0')}-${lastConvoDate.getDate().toString().padStart(2, '0')} ${lastConvoDate.getHours().toString().padStart(2, '0')}:${lastConvoDate.getMinutes().toString().padStart(2, '0')}:${lastConvoDate.getSeconds().toString().padStart(2, '0')}`;
+            }
             return {
               device_id: device.id,
               model: device.board,
               firmwareVersion: device.appVersion,
               macAddress: device.macAddress,
               bindTime: formattedBindTime,
-              lastConversation: device.lastConnectedAt,
+              lastConversation: formattedLastConversation,
               remark: device.alias,
               isEdit: false,
               otaSwitch: device.autoUpdate === 1,
               rawBindTime: new Date(device.createDate).getTime()
             };
           })
-              .sort((a, b) => a.rawBindTime - b.rawBindTime);
+            .sort((a, b) => a.rawBindTime - b.rawBindTime);
           this.activeSearchKeyword = "";
           this.searchKeyword = "";
         } else {
@@ -304,12 +310,26 @@ export default {
         }
       });
     },
-    headerCellClassName({columnIndex}) {
+    headerCellClassName({ columnIndex }) {
       if (columnIndex === 0) {
         return "custom-selection-header";
       }
       return "";
-    }
+    },
+    getFirmwareTypeName(type) {
+      const firmwareType = FIRMWARE_TYPES.find(item => item.key === type);
+      return firmwareType ? firmwareType.name : type;
+    },
+    handleOtaSwitchChange(row) {
+      Api.device.enableOtaUpgrade(row.device_id, row.otaSwitch ? 1 : 0, ({ data }) => {
+        if (data.code === 0) {
+          this.$message.success(row.otaSwitch ? '已设置成自动升级' : '已关闭自动升级')
+        } else {
+          row.otaSwitch = !row.otaSwitch
+          this.$message.error(data.msg || '操作失败')
+        }
+      })
+    },
   }
 };
 </script>
@@ -331,7 +351,7 @@ export default {
 .main-wrapper {
   margin: 5px 22px;
   border-radius: 15px;
-  min-height: calc(100vh - 200px);
+  min-height: calc(100vh - 24vh);
   height: auto;
   max-height: 80vh;
   box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
@@ -378,12 +398,12 @@ export default {
   transition: border-color 0.2s;
 }
 
-::v-deep .page-size-select{
+::v-deep .page-size-select {
   width: 100px;
   margin-right: 8px;
 }
 
-::v-deep .page-size-select .el-input__inner{
+::v-deep .page-size-select .el-input__inner {
   height: 32px;
   line-height: 32px;
   border-radius: 4px;
@@ -392,7 +412,8 @@ export default {
   color: #606266;
   font-size: 14px;
 }
-::v-deep .page-size-select .el-input__suffix{
+
+::v-deep .page-size-select .el-input__suffix {
   right: 6px;
   width: 15px;
   height: 20px;
@@ -403,13 +424,14 @@ export default {
   border-radius: 4px;
 }
 
-::v-deep .page-size-select .el-input__suffix-inner{
+::v-deep .page-size-select .el-input__suffix-inner {
   display: flex;
   align-items: center;
   justify-content: center;
   width: 100%;
 }
-::v-deep .page-size-select .el-icon-arrow-up:before{
+
+::v-deep .page-size-select .el-icon-arrow-up:before {
   content: "";
   display: inline-block;
   border-left: 6px solid transparent;
@@ -455,6 +477,14 @@ export default {
   overflow: hidden;
 }
 
+::v-deep .el-card__body {
+  padding: 15px;
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  overflow: hidden;
+}
+
 .table_bottom {
   display: flex;
   justify-content: space-between;
@@ -463,6 +493,7 @@ export default {
   padding-bottom: 10px;
 }
 
+
 .ctrl_btn {
   display: flex;
   gap: 8px;
@@ -608,13 +639,7 @@ export default {
   display: none !important;
 }
 
-:deep(.custom-selection-header::after) {
+
-  content: "选择";
-  display: inline-block;
-  color: black;
-  font-weight: bold;
-  padding-bottom: 18px;
-}
 
 :deep(.el-table .el-button--text) {
   color: #7079aa;
@@ -628,12 +653,12 @@ export default {
   flex: 1;
   display: flex;
   flex-direction: column;
-  max-height: calc(100vh - 330px);
+  max-height: calc(100vh - 40vh);
 }
 
 :deep(.el-table__body-wrapper) {
   flex: 1;
-  overflow: auto;
+  overflow-y: auto;
   max-height: none !important;
 }
 
@@ -651,4 +676,24 @@ export default {
     padding-bottom: 16px;
   }
 }
+
+:deep(.el-checkbox__inner) {
+  background-color: #eeeeee !important;
+  border-color: #cccccc !important;
+}
+
+:deep(.el-checkbox__inner:hover) {
+  border-color: #cccccc !important;
+}
+
+:deep(.el-checkbox__input.is-checked .el-checkbox__inner) {
+  background-color: #5f70f3 !important;
+  border-color: #5f70f3 !important;
+}
+
+::v-deep .el-table--border::after,
+::v-deep .el-table--group::after,
+::v-deep .el-table::before {
+  display: none !important;
+}
 </style>

main/manager-web/src/views/ModelConfig.vue

@@ -44,12 +44,14 @@
         <!-- 右侧内容 -->
         <div class="content-area">
           <el-card class="model-card" shadow="never">
-            <el-table ref="modelTable" style="width: 100%" :header-cell-style="{ background: 'transparent' }"
+            <el-table ref="modelTable" style="width: 100%" v-loading="loading" element-loading-text="拼命加载中"
-              :data="modelList" class="data-table" header-row-class-name="table-header"
+              element-loading-spinner="el-icon-loading" element-loading-background="rgba(255, 255, 255, 0.7)"
-              :header-cell-class-name="headerCellClassName" @selection-change="handleSelectionChange">
+              :header-cell-style="{ background: 'transparent' }" :data="modelList" class="data-table"
+              header-row-class-name="table-header" :header-cell-class-name="headerCellClassName"
+              @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="55" align="center"></el-table-column>
+              <el-table-column label="模型ID" prop="id" align="center"></el-table-column>
               <el-table-column label="模型名称" prop="modelName" align="center"></el-table-column>
-              <el-table-column label="模型编码" prop="modelCode" align="center"></el-table-column>
               <el-table-column label="提供商" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.configJson.type || '未知' }}
@@ -86,41 +88,37 @@
               </el-table-column>
             </el-table>
             <div class="table-footer">
-            <div class="batch-actions">
+              <div class="batch-actions">
-              <el-button size="mini" type="primary" @click="selectAll">
+                <el-button size="mini" type="primary" @click="selectAll">
-                {{ isAllSelected ?
+                  {{ isAllSelected ?
-                  '取消全选' : '全选' }}
+                    '取消全选' : '全选' }}
-              </el-button>
+                </el-button>
-              <el-button type="success" size="mini" @click="addModel" class="add-btn">
+                <el-button type="success" size="mini" @click="addModel" class="add-btn">
-                新增
+                  新增
-              </el-button>
+                </el-button>
-              <el-button size="mini" type="danger" icon="el-icon-delete" @click="batchDelete">
+                <el-button size="mini" type="danger" icon="el-icon-delete" @click="batchDelete">
-                删除
+                  删除
-              </el-button>
+                </el-button>
-            </div>
+              </div>
-            <div class="custom-pagination">
+              <div class="custom-pagination">
 
-              <el-select v-model="pageSize" @change="handlePageSizeChange" class="page-size-select">
+                <el-select v-model="pageSize" @change="handlePageSizeChange" class="page-size-select">
-                  <el-option
+                  <el-option v-for="item in pageSizeOptions" :key="item" :label="`${item}条/页`" :value="item">
-                    v-for="item in pageSizeOptions"
-                    :key="item"
-                    :label="`${item}条/页`"
-                    :value="item">
                   </el-option>
-              </el-select>
+                </el-select>
 
-              <button class="pagination-btn" :disabled="currentPage === 1" @click="goFirst">首页</button>
+                <button class="pagination-btn" :disabled="currentPage === 1" @click="goFirst">首页</button>
-              <button class="pagination-btn" :disabled="currentPage === 1" @click="goPrev">上一页</button>
+                <button class="pagination-btn" :disabled="currentPage === 1" @click="goPrev">上一页</button>
 
-              <button v-for="page in visiblePages" :key="page" class="pagination-btn"
+                <button v-for="page in visiblePages" :key="page" class="pagination-btn"
-                :class="{ active: page === currentPage }" @click="goToPage(page)">
+                  :class="{ active: page === currentPage }" @click="goToPage(page)">
-                {{ page }}
+                  {{ page }}
-              </button>
+                </button>
 
-              <button class="pagination-btn" :disabled="currentPage === pageCount" @click="goNext">下一页</button>
+                <button class="pagination-btn" :disabled="currentPage === pageCount" @click="goNext">下一页</button>
-              <span class="total-text">共{{ total }}条记录</span>
+                <span class="total-text">共{{ total }}条记录</span>
+              </div>
             </div>
-          </div>
           </el-card>
         </div>
       </div>
@@ -130,6 +128,9 @@
       <TtsModel :visible.sync="ttsDialogVisible" :ttsModelId="selectedTtsModelId" />
       <AddModelDialog :modelType="activeTab" :visible.sync="addDialogVisible" @confirm="handleAddConfirm" />
     </div>
+    <el-footer>
+      <version-footer />
+    </el-footer>
   </div>
 </template>
 
@@ -139,9 +140,9 @@ import AddModelDialog from "@/components/AddModelDialog.vue";
 import HeaderBar from "@/components/HeaderBar.vue";
 import ModelEditDialog from "@/components/ModelEditDialog.vue";
 import TtsModel from "@/components/TtsModel.vue";
-
+import VersionFooter from "@/components/VersionFooter.vue";
 export default {
-  components: { HeaderBar, ModelEditDialog, TtsModel, AddModelDialog },
+  components: { HeaderBar, ModelEditDialog, TtsModel, AddModelDialog, VersionFooter },
   data() {
     return {
       addDialogVisible: false,
@@ -152,12 +153,13 @@ export default {
       ttsDialogVisible: false,
       selectedTtsModelId: '',
       modelList: [],
-      pageSizeOptions: [5, 10, 20, 50, 100],
+      pageSizeOptions: [10, 20, 50, 100],
       currentPage: 1,
       pageSize: 10,
       total: 0,
       selectedModels: [],
-      isAllSelected: false
+      isAllSelected: false,
+      loading: false
     };
   },
 
@@ -301,9 +303,10 @@ export default {
       this.currentPage = page;
       this.$refs.modelTable.clearSelection();
     },
-    handleModelSave({ provideCode, formData }) {
+    handleModelSave({ provideCode, formData, done }) {
       const modelType = this.activeTab;
       const id = formData.id;
+
       Api.model.updateModel(
         { modelType, provideCode, id, formData },
         ({ data }) => {
@@ -314,6 +317,7 @@ export default {
           } else {
             this.$message.error(data.msg || '保存失败');
           }
+          done && done(); // 调用done回调关闭加载状态
         }
       );
     },
@@ -385,6 +389,7 @@ export default {
 
     // 获取模型配置列表
     loadData() {
+      this.loading = true; // 开始加载
       const params = {
         modelType: this.activeTab,
         modelName: this.search,
@@ -393,6 +398,7 @@ export default {
       };
 
       Api.model.getModelList(params, ({ data }) => {
+        this.loading = false; // 结束加载
         if (data.code === 0) {
           this.modelList = data.data.list;
           this.total = data.data.total;
@@ -461,7 +467,7 @@ export default {
 .main-wrapper {
   margin: 5px 22px;
   border-radius: 15px;
-  min-height: calc(100vh - 235px);
+  min-height: calc(100vh - 24vh);
   height: auto;
   max-height: 80vh;
   box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
@@ -509,8 +515,9 @@ export default {
 
 .nav-panel .el-menu-item {
   height: 50px;
+  background: #e9f0ff;
   line-height: 50px;
-  border-radius: 4px;
+  border-radius: 4px 0 0 4px !important;
   transition: all 0.3s;
   display: flex !important;
   justify-content: flex-end;
@@ -521,8 +528,7 @@ export default {
 }
 
 .nav-panel .el-menu-item.is-active {
-  background: #e9f0ff;
+  background: #5778ff;
-  color: #0ba6f4 !important;
   position: relative;
   padding-left: 40px !important;
 }
@@ -535,7 +541,7 @@ export default {
   transform: translateY(-50%);
   width: 13px;
   height: 13px;
-  background: #409EFF;
+  background: #fff;
   border-radius: 50%;
   box-shadow: 0 0 4px rgba(64, 158, 255, 0.5);
 }
@@ -592,12 +598,12 @@ export default {
   transition: border-color 0.2s;
 }
 
-::v-deep .page-size-select{
+::v-deep .page-size-select {
   width: 100px;
   margin-right: 8px;
 }
 
-::v-deep .page-size-select .el-input__inner{
+::v-deep .page-size-select .el-input__inner {
   height: 32px;
   line-height: 32px;
   border-radius: 4px;
@@ -606,7 +612,8 @@ export default {
   color: #606266;
   font-size: 14px;
 }
-::v-deep .page-size-select .el-input__suffix{
+
+::v-deep .page-size-select .el-input__suffix {
   right: 6px;
   width: 15px;
   height: 20px;
@@ -617,13 +624,14 @@ export default {
   border-radius: 4px;
 }
 
-::v-deep .page-size-select .el-input__suffix-inner{
+::v-deep .page-size-select .el-input__suffix-inner {
   display: flex;
   align-items: center;
   justify-content: center;
   width: 100%;
 }
-::v-deep .page-size-select .el-icon-arrow-up:before{
+
+::v-deep .page-size-select .el-icon-arrow-up:before {
   content: "";
   display: inline-block;
   border-left: 6px solid transparent;
@@ -656,7 +664,6 @@ export default {
 }
 
 .table-footer {
-  margin-top: 24px;
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -746,7 +753,7 @@ export default {
 }
 
 ::v-deep .nav-panel .el-menu-item.is-active .menu-text {
-  color: #409EFF !important;
+  color: #fff !important;
 }
 
 ::v-deep .data-table {
@@ -885,7 +892,7 @@ export default {
   }
 }
 
-.model-card{
+.model-card {
   background: white;
   flex: 1;
   display: flex;
@@ -895,7 +902,7 @@ export default {
   overflow: hidden;
 }
 
-.model-card ::v-deep .el-card__body{
+.model-card ::v-deep .el-card__body {
   padding: 0;
   display: flex;
   flex-direction: column;
@@ -904,7 +911,7 @@ export default {
 }
 
 .data-table {
-  --table-max-height: calc(100vh - 450px);
+  --table-max-height: calc(100vh - 45vh);
   max-height: var(--table-max-height);
 }
 
@@ -913,4 +920,23 @@ export default {
   overflow-y: auto;
 }
 
+::v-deep .el-loading-mask {
+  background-color: rgba(255, 255, 255, 0.6) !important;
+  backdrop-filter: blur(2px);
+}
+
+::v-deep .el-loading-spinner .circular {
+  width: 28px;
+  height: 28px;
+}
+
+::v-deep .el-loading-spinner .path {
+  stroke: #6b8cff;
+}
+
+::v-deep .el-loading-text {
+  color: #6b8cff !important;
+  font-size: 14px;
+  margin-top: 8px;
+}
 </style>

main/manager-web/src/views/OtaManagement.vue

@@ -0,0 +1,756 @@
+<template>
+    <div class="welcome">
+        <HeaderBar />
+
+        <div class="operation-bar">
+            <h2 class="page-title">固件管理</h2>
+            <div class="right-operations">
+                <el-input placeholder="请输入固件名称查询" v-model="searchName" class="search-input"
+                    @keyup.enter.native="handleSearch" clearable />
+                <el-button class="btn-search" @click="handleSearch">搜索</el-button>
+            </div>
+        </div>
+
+        <div class="main-wrapper">
+            <div class="content-panel">
+                <div class="content-area">
+                    <el-card class="params-card" shadow="never">
+                        <el-table ref="paramsTable" :data="paramsList" class="transparent-table" v-loading="loading"
+                            element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
+                            element-loading-background="rgba(255, 255, 255, 0.7)"
+                            :header-cell-class-name="headerCellClassName">
+                            <el-table-column label="选择" align="center" width="120">
+                                <template slot-scope="scope">
+                                    <el-checkbox v-model="scope.row.selected"></el-checkbox>
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="固件名称" prop="firmwareName" align="center"></el-table-column>
+                            <el-table-column label="固件类型" prop="type" align="center">
+                                <template slot-scope="scope">
+                                    {{ getFirmwareTypeName(scope.row.type) }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="版本号" prop="version" align="center"></el-table-column>
+                            <el-table-column label="文件大小" prop="size" align="center">
+                                <template slot-scope="scope">
+                                    {{ formatFileSize(scope.row.size) }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="备注" prop="remark" align="center"
+                                show-overflow-tooltip></el-table-column>
+                            <el-table-column label="创建时间" prop="createDate" align="center">
+                                <template slot-scope="scope">
+                                    {{ formatDate(scope.row.createDate) }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="更新时间" prop="updateDate" align="center">
+                                <template slot-scope="scope">
+                                    {{ formatDate(scope.row.updateDate) }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column label="操作" align="center">
+                                <template slot-scope="scope">
+                                    <el-button size="mini" type="text"
+                                        @click="downloadFirmware(scope.row)">下载</el-button>
+                                    <el-button size="mini" type="text" @click="editParam(scope.row)">编辑</el-button>
+                                    <el-button size="mini" type="text" @click="deleteParam(scope.row)">删除</el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+
+                        <div class="table_bottom">
+                            <div class="ctrl_btn">
+                                <el-button size="mini" type="primary" class="select-all-btn" @click="handleSelectAll">
+                                    {{ isAllSelected ? '取消全选' : '全选' }}
+                                </el-button>
+                                <el-button size="mini" type="success" @click="showAddDialog"
+                                    style="background: #5bc98c;border: None;">新增</el-button>
+                                <el-button size="mini" type="danger" icon="el-icon-delete"
+                                    @click="deleteSelectedParams">删除</el-button>
+                            </div>
+                            <div class="custom-pagination">
+                                <el-select v-model="pageSize" @change="handlePageSizeChange" class="page-size-select">
+                                    <el-option v-for="item in pageSizeOptions" :key="item" :label="`${item}条/页`"
+                                        :value="item">
+                                    </el-option>
+                                </el-select>
+                                <button class="pagination-btn" :disabled="currentPage === 1" @click="goFirst">
+                                    首页
+                                </button>
+                                <button class="pagination-btn" :disabled="currentPage === 1" @click="goPrev">
+                                    上一页
+                                </button>
+                                <button v-for="page in visiblePages" :key="page" class="pagination-btn"
+                                    :class="{ active: page === currentPage }" @click="goToPage(page)">
+                                    {{ page }}
+                                </button>
+                                <button class="pagination-btn" :disabled="currentPage === pageCount" @click="goNext">
+                                    下一页
+                                </button>
+                                <span class="total-text">共{{ total }}条记录</span>
+                            </div>
+                        </div>
+                    </el-card>
+                </div>
+            </div>
+        </div>
+
+        <!-- 新增/编辑固件对话框 -->
+        <firmware-dialog :title="dialogTitle" :visible.sync="dialogVisible" :form="firmwareForm" @submit="handleSubmit"
+            @cancel="dialogVisible = false" />
+        <el-footer>
+            <version-footer />
+        </el-footer>
+    </div>
+</template>
+
+<script>
+import Api from "@/apis/api";
+import FirmwareDialog from "@/components/FirmwareDialog.vue";
+import HeaderBar from "@/components/HeaderBar.vue";
+import VersionFooter from "@/components/VersionFooter.vue";
+import { FIRMWARE_TYPES } from "@/utils";
+import { formatDate, formatFileSize } from "@/utils/format";
+
+export default {
+    components: { HeaderBar, FirmwareDialog, VersionFooter },
+    data() {
+        return {
+            searchName: "",
+            loading: false,
+            paramsList: [],
+            firmwareList: [],
+            currentPage: 1,
+            pageSize: 10,
+            pageSizeOptions: [10, 20, 50, 100],
+            total: 0,
+            dialogVisible: false,
+            dialogTitle: "新增固件",
+            isAllSelected: false,
+            firmwareForm: {
+                id: null,
+                firmwareName: "",
+                type: "",
+                version: "",
+                size: 0,
+                remark: "",
+                firmwarePath: ""
+            },
+        };
+    },
+    created() {
+        this.fetchFirmwareList();
+    },
+
+    computed: {
+        pageCount() {
+            return Math.ceil(this.total / this.pageSize);
+        },
+        visiblePages() {
+            const pages = [];
+            const maxVisible = 3;
+            let start = Math.max(1, this.currentPage - 1);
+            let end = Math.min(this.pageCount, start + maxVisible - 1);
+
+            if (end - start + 1 < maxVisible) {
+                start = Math.max(1, end - maxVisible + 1);
+            }
+
+            for (let i = start; i <= end; i++) {
+                pages.push(i);
+            }
+            return pages;
+        },
+    },
+    methods: {
+        handlePageSizeChange(val) {
+            this.pageSize = val;
+            this.currentPage = 1;
+            this.fetchFirmwareList();
+        },
+        fetchFirmwareList() {
+            this.loading = true;
+            const params = {
+                pageNum: this.currentPage,
+                pageSize: this.pageSize,
+                firmwareName: this.searchName || "",
+                orderField: "create_date",
+                order: "desc"
+            };
+            Api.ota.getOtaList(params, (res) => {
+                this.loading = false;
+                res = res.data
+                if (res.code === 0) {
+                    this.firmwareList = res.data.list.map(item => ({
+                        ...item,
+                        selected: false
+                    }));
+                    this.paramsList = this.firmwareList;
+                    this.total = res.data.total || 0;
+                } else {
+                    this.firmwareList = [];
+                    this.paramsList = [];
+                    this.total = 0;
+                    this.$message.error({
+                        message: res?.data?.msg || '获取固件列表失败',
+                        showClose: true
+                    });
+                }
+            });
+        },
+        handleSearch() {
+            this.currentPage = 1;
+            this.fetchFirmwareList();
+        },
+        handleSelectAll() {
+            this.isAllSelected = !this.isAllSelected;
+            this.firmwareList.forEach(row => {
+                row.selected = this.isAllSelected;
+            });
+        },
+        showAddDialog() {
+            this.dialogTitle = "新增固件";
+            // 完全重置表单数据
+            this.firmwareForm = {
+                id: null,
+                firmwareName: "",
+                type: "",
+                version: "",
+                size: 0,
+                remark: "",
+                firmwarePath: ""
+            };
+            this.$nextTick(() => {
+                // 重置表单的校验状态
+                if (this.$refs.firmwareDialog && this.$refs.firmwareDialog.$refs.form) {
+                    this.$refs.firmwareDialog.$refs.form.clearValidate();
+                }
+            });
+            this.dialogVisible = true;
+        },
+        editParam(row) {
+            this.dialogTitle = "编辑固件";
+            this.firmwareForm = { ...row };
+            this.dialogVisible = true;
+        },
+        handleSubmit(form) {
+            if (form.id) {
+                // 编辑
+                Api.ota.updateOta(form.id, form, (res) => {
+                    res = res.data;
+                    if (res.code === 0) {
+                        this.$message.success({
+                            message: "修改成功",
+                            showClose: true
+                        });
+                        this.dialogVisible = false;
+                        this.fetchFirmwareList();
+                    } else {
+                        this.$message.error({
+                            message: res.msg || "修改失败",
+                            showClose: true
+                        });
+                    }
+                });
+            } else {
+                // 新增
+                Api.ota.saveOta(form, (res) => {
+                    res = res.data;
+                    if (res.code === 0) {
+                        this.$message.success({
+                            message: "新增成功",
+                            showClose: true
+                        });
+                        this.dialogVisible = false;
+                        this.fetchFirmwareList();
+                    } else {
+                        this.$message.error({
+                            message: res.msg || "新增失败",
+                            showClose: true
+                        });
+                    }
+                });
+            }
+        },
+
+        deleteSelectedParams() {
+            const selectedRows = this.firmwareList.filter(row => row.selected);
+            if (selectedRows.length === 0) {
+                this.$message.warning({
+                    message: "请先选择需要删除的固件",
+                    showClose: true
+                });
+                return;
+            }
+            this.deleteParam(selectedRows);
+        },
+        deleteParam(row) {
+            // 处理单个参数或参数数组
+            const params = Array.isArray(row) ? row : [row];
+
+            if (Array.isArray(row) && row.length === 0) {
+                this.$message.warning({
+                    message: "请先选择需要删除的参数",
+                    showClose: true
+                });
+                return;
+            }
+
+            const paramCount = params.length;
+            this.$confirm(`确定要删除选中的${paramCount}个固件吗？`, '警告', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+                distinguishCancelAndClose: true
+            }).then(() => {
+                const ids = params.map(param => param.id);
+                if (ids.some(id => !id)) {
+                    this.$message.error({
+                        message: '存在无效的参数ID',
+                        showClose: true
+                    });
+                    return;
+                }
+
+                Api.ota.deleteOta(ids, (res) => {
+                    res = res.data;
+                    if (res.code === 0) {
+                        this.$message.success({
+                            message: `成功删除${paramCount}个固件`,
+                            showClose: true
+                        });
+                        this.fetchFirmwareList();
+                    } else {
+                        this.$message.error({
+                            message: res.msg || '删除失败，请重试',
+                            showClose: true
+                        });
+                    }
+                });
+            }).catch(action => {
+                if (action === 'cancel') {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消删除操作',
+                        duration: 1000
+                    });
+                } else {
+                    this.$message({
+                        type: 'info',
+                        message: '操作已关闭',
+                        duration: 1000
+                    });
+                }
+            });
+        },
+        headerCellClassName({ columnIndex }) {
+            if (columnIndex === 0) {
+                return "custom-selection-header";
+            }
+            return "";
+        },
+        goFirst() {
+            this.currentPage = 1;
+            this.fetchFirmwareList();
+        },
+        goPrev() {
+            if (this.currentPage > 1) {
+                this.currentPage--;
+                this.fetchFirmwareList();
+            }
+        },
+        goNext() {
+            if (this.currentPage < this.pageCount) {
+                this.currentPage++;
+                this.fetchFirmwareList();
+            }
+        },
+        goToPage(page) {
+            this.currentPage = page;
+            this.fetchFirmwareList();
+        },
+        downloadFirmware(firmware) {
+            if (!firmware || !firmware.id) {
+                this.$message.error('固件信息不完整');
+                return;
+            }
+            // 先获取下载链接
+            Api.ota.getDownloadUrl(firmware.id, (res) => {
+                if (res.data.code === 0) {
+                    const uuid = res.data.data;
+                    const baseUrl = process.env.VUE_APP_API_BASE_URL || '';
+                    window.open(`${window.location.origin}${baseUrl}/otaMag/download/${uuid}`);
+                } else {
+                    this.$message.error('获取下载链接失败');
+                }
+            });
+        },
+        formatDate,
+        formatFileSize,
+        getFirmwareTypeName(type) {
+            const firmwareType = FIRMWARE_TYPES.find(item => item.key === type);
+            return firmwareType ? firmwareType.name : type;
+        },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.welcome {
+    min-width: 900px;
+    min-height: 506px;
+    height: 100vh;
+    display: flex;
+    position: relative;
+    flex-direction: column;
+    background-size: cover;
+    background: linear-gradient(to bottom right, #dce8ff, #e4eeff, #e6cbfd) center;
+    -webkit-background-size: cover;
+    -o-background-size: cover;
+    overflow: hidden;
+}
+
+.main-wrapper {
+    margin: 5px 22px;
+    border-radius: 15px;
+    min-height: calc(100vh - 24vh);
+    height: auto;
+    max-height: 80vh;
+    box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+    position: relative;
+    background: rgba(237, 242, 255, 0.5);
+    display: flex;
+    flex-direction: column;
+}
+
+.operation-bar {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 16px 24px;
+}
+
+.page-title {
+    font-size: 24px;
+    margin: 0;
+}
+
+.right-operations {
+    display: flex;
+    gap: 10px;
+    margin-left: auto;
+}
+
+.search-input {
+    width: 240px;
+}
+
+.btn-search {
+    background: linear-gradient(135deg, #6b8cff, #a966ff);
+    border: none;
+    color: white;
+}
+
+.content-panel {
+    flex: 1;
+    display: flex;
+    overflow: hidden;
+    height: 100%;
+    border-radius: 15px;
+    background: transparent;
+    border: 1px solid #fff;
+}
+
+.content-area {
+    flex: 1;
+    height: 100%;
+    min-width: 600px;
+    overflow: auto;
+    background-color: white;
+    display: flex;
+    flex-direction: column;
+}
+
+.params-card {
+    background: white;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    border: none;
+    box-shadow: none;
+    overflow: hidden;
+
+    ::v-deep .el-card__body {
+        padding: 15px;
+        display: flex;
+        flex-direction: column;
+        flex: 1;
+        overflow: hidden;
+    }
+}
+
+.table_bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 10px;
+    padding-bottom: 10px;
+}
+
+.ctrl_btn {
+    display: flex;
+    gap: 8px;
+    padding-left: 26px;
+
+    .el-button {
+        min-width: 72px;
+        height: 32px;
+        padding: 7px 12px 7px 10px;
+        font-size: 12px;
+        border-radius: 4px;
+        line-height: 1;
+        font-weight: 500;
+        border: none;
+        transition: all 0.3s ease;
+        box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
+
+        &:hover {
+            transform: translateY(-1px);
+            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+        }
+    }
+
+    .el-button--primary {
+        background: #5f70f3;
+        color: white;
+    }
+
+    .el-button--danger {
+        background: #fd5b63;
+        color: white;
+    }
+}
+
+.custom-pagination {
+    display: flex;
+    align-items: center;
+    gap: 5px;
+
+    .el-select {
+        margin-right: 8px;
+    }
+
+    .pagination-btn:first-child,
+    .pagination-btn:nth-child(2),
+    .pagination-btn:nth-last-child(2),
+    .pagination-btn:nth-child(3) {
+        min-width: 60px;
+        height: 32px;
+        padding: 0 12px;
+        border-radius: 4px;
+        border: 1px solid #e4e7ed;
+        background: #dee7ff;
+        color: #606266;
+        font-size: 14px;
+        cursor: pointer;
+        transition: all 0.3s ease;
+
+        &:hover {
+            background: #d7dce6;
+        }
+
+        &:disabled {
+            opacity: 0.6;
+            cursor: not-allowed;
+        }
+    }
+
+    .pagination-btn:not(:first-child):not(:nth-child(3)):not(:nth-child(2)):not(:nth-last-child(2)) {
+        min-width: 28px;
+        height: 32px;
+        padding: 0;
+        border-radius: 4px;
+        border: 1px solid transparent;
+        background: transparent;
+        color: #606266;
+        font-size: 14px;
+        cursor: pointer;
+        transition: all 0.3s ease;
+
+        &:hover {
+            background: rgba(245, 247, 250, 0.3);
+        }
+    }
+
+    .pagination-btn.active {
+        background: #5f70f3 !important;
+        color: #ffffff !important;
+        border-color: #5f70f3 !important;
+
+        &:hover {
+            background: #6d7cf5 !important;
+        }
+    }
+}
+
+.total-text {
+    margin-left: 10px;
+    color: #606266;
+    font-size: 14px;
+}
+
+.page-size-select {
+    width: 100px;
+    margin-right: 10px;
+
+    :deep(.el-input__inner) {
+        height: 32px;
+        line-height: 32px;
+        border-radius: 4px;
+        border: 1px solid #e4e7ed;
+        background: #dee7ff;
+        color: #606266;
+        font-size: 14px;
+    }
+
+    :deep(.el-input__suffix) {
+        right: 6px;
+        width: 15px;
+        height: 20px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        top: 6px;
+        border-radius: 4px;
+    }
+
+    :deep(.el-input__suffix-inner) {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+    }
+
+    :deep(.el-icon-arrow-up:before) {
+        content: "";
+        display: inline-block;
+        border-left: 6px solid transparent;
+        border-right: 6px solid transparent;
+        border-top: 9px solid #606266;
+        position: relative;
+        transform: rotate(0deg);
+        transition: transform 0.3s;
+    }
+}
+
+:deep(.transparent-table) {
+    background: white;
+    flex: 1;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+
+    .el-table__body-wrapper {
+        flex: 1;
+        overflow-y: auto;
+        max-height: none !important;
+    }
+
+    .el-table__header-wrapper {
+        flex-shrink: 0;
+    }
+
+    .el-table__header th {
+        background: white !important;
+        color: black;
+        font-weight: 600;
+        height: 40px;
+        padding: 8px 0;
+        font-size: 14px;
+        border-bottom: 1px solid #e4e7ed;
+    }
+
+    .el-table__body tr {
+        background-color: white;
+
+        td {
+            border-top: 1px solid rgba(0, 0, 0, 0.04);
+            border-bottom: 1px solid rgba(0, 0, 0, 0.04);
+            padding: 8px 0;
+            height: 40px;
+            color: #606266;
+            font-size: 14px;
+        }
+    }
+
+    .el-table__row:hover>td {
+        background-color: #f5f7fa !important;
+    }
+
+    &::before {
+        display: none;
+    }
+}
+
+:deep(.el-table .el-button--text) {
+    color: #7079aa !important;
+}
+
+:deep(.el-table .el-button--text:hover) {
+    color: #5a64b5 !important;
+}
+
+:deep(.el-checkbox__inner) {
+    background-color: #eeeeee !important;
+    border-color: #cccccc !important;
+}
+
+:deep(.el-checkbox__inner:hover) {
+    border-color: #cccccc !important;
+}
+
+:deep(.el-checkbox__input.is-checked .el-checkbox__inner) {
+    background-color: #5f70f3 !important;
+    border-color: #5f70f3 !important;
+}
+
+:deep(.el-loading-mask) {
+    background-color: rgba(255, 255, 255, 0.6) !important;
+    backdrop-filter: blur(2px);
+}
+
+:deep(.el-loading-spinner .path) {
+    stroke: #6b8cff;
+}
+
+.el-table {
+    --table-max-height: calc(100vh - 40vh);
+    max-height: var(--table-max-height);
+
+    .el-table__body-wrapper {
+        max-height: calc(var(--table-max-height) - 40px);
+    }
+}
+
+@media (min-width: 1144px) {
+    .table_bottom {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-top: 40px;
+    }
+
+    :deep(.transparent-table) {
+        .el-table__body tr {
+            td {
+                padding-top: 16px;
+                padding-bottom: 16px;
+            }
+
+            &+tr {
+                margin-top: 10px;
+            }
+        }
+    }
+}
+</style>

main/manager-web/src/views/ParamsManagement.vue

@@ -15,7 +15,9 @@
             <div class="content-panel">
                 <div class="content-area">
                     <el-card class="params-card" shadow="never">
-                        <el-table ref="paramsTable" :data="paramsList" class="transparent-table"
+                        <el-table ref="paramsTable" :data="paramsList" class="transparent-table" v-loading="loading"
+                            element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
+                            element-loading-background="rgba(255, 255, 255, 0.7)"
                             :header-cell-class-name="headerCellClassName">
                             <el-table-column label="选择" align="center" width="120">
                                 <template slot-scope="scope">
@@ -41,14 +43,11 @@
                                 </el-button>
                                 <el-button size="mini" type="success" @click="showAddDialog">新增</el-button>
                                 <el-button size="mini" type="danger" icon="el-icon-delete"
-                                     @click="deleteSelectedParams">删除</el-button>
+                                    @click="deleteSelectedParams">删除</el-button>
                             </div>
                             <div class="custom-pagination">
                                 <el-select v-model="pageSize" @change="handlePageSizeChange" class="page-size-select">
-                                    <el-option
+                                    <el-option v-for="item in pageSizeOptions" :key="item" :label="`${item}条/页`"
-                                        v-for="item in pageSizeOptions"
-                                        :key="item"
-                                        :label="`${item}条/页`"
                                         :value="item">
                                     </el-option>
                                 </el-select>
@@ -76,7 +75,9 @@
         <!-- 新增/编辑参数对话框 -->
         <param-dialog :title="dialogTitle" :visible.sync="dialogVisible" :form="paramForm" @submit="handleSubmit"
             @cancel="dialogVisible = false" />
-
+        <el-footer>
+            <version-footer />
+        </el-footer>
     </div>
 </template>
 
@@ -84,16 +85,17 @@
 import Api from "@/apis/api";
 import HeaderBar from "@/components/HeaderBar.vue";
 import ParamDialog from "@/components/ParamDialog.vue";
-
+import VersionFooter from "@/components/VersionFooter.vue";
 export default {
-    components: { HeaderBar, ParamDialog },
+    components: { HeaderBar, ParamDialog, VersionFooter },
     data() {
         return {
             searchCode: "",
             paramsList: [],
             currentPage: 1,
-            pageSize: 5,
+            loading: false,
-            pageSizeOptions: [5, 10, 20, 50, 100],
+            pageSize: 10,
+            pageSizeOptions: [10, 20, 50, 100],
             total: 0,
             dialogVisible: false,
             dialogTitle: "新增参数",
@@ -138,6 +140,7 @@ export default {
             this.fetchParams();
         },
         fetchParams() {
+            this.loading = true;
             Api.admin.getParamsList(
                 {
                     page: this.currentPage,
@@ -145,6 +148,7 @@ export default {
                     paramCode: this.searchCode,
                 },
                 ({ data }) => {
+                    this.loading = false;
                     if (data.code === 0) {
                         this.paramsList = data.data.list.map(item => ({
                             ...item,
@@ -185,30 +189,33 @@ export default {
             this.paramForm = { ...row };
             this.dialogVisible = true;
         },
-        handleSubmit(form) {
+
+        handleSubmit({ form, done }) {
             if (form.id) {
                 // 编辑
                 Api.admin.updateParam(form, ({ data }) => {
                     if (data.code === 0) {
                         this.$message.success({
-                          message:"修改成功",
+                            message: "修改成功",
-                          showClose:true
+                            showClose: true
                         });
                         this.dialogVisible = false;
                         this.fetchParams();
                     }
+                    done && done();
                 });
             } else {
                 // 新增
                 Api.admin.addParam(form, ({ data }) => {
                     if (data.code === 0) {
                         this.$message.success({
-                          message:"新增成功",
+                            message: "新增成功",
-                          showClose:true
+                            showClose: true
                         });
                         this.dialogVisible = false;
                         this.fetchParams();
                     }
+                    done && done();
                 });
             }
         },
@@ -230,8 +237,8 @@ export default {
 
             if (Array.isArray(row) && row.length === 0) {
                 this.$message.warning({
-                  message:"请先选择需要删除的参数",
+                    message: "请先选择需要删除的参数",
-                  showClose:true
+                    showClose: true
                 });
                 return;
             }
@@ -246,8 +253,8 @@ export default {
                 const ids = params.map(param => param.id);
                 if (ids.some(id => isNaN(id))) {
                     this.$message.error({
-                      message:'存在无效的参数ID',
+                        message: '存在无效的参数ID',
-                      showClose: true
+                        showClose: true
                     });
                     return;
                 }
@@ -328,16 +335,16 @@ export default {
 }
 
 .main-wrapper {
-  margin: 5px 22px;
+    margin: 5px 22px;
-  border-radius: 15px;
+    border-radius: 15px;
-  min-height: calc(100vh - 350px);
+    min-height: calc(100vh - 24vh);
-  height: auto;
+    height: auto;
-  max-height: 80vh;
+    max-height: 80vh;
-  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+    box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
-  position: relative;
+    position: relative;
-  background: rgba(237, 242, 255, 0.5);
+    background: rgba(237, 242, 255, 0.5);
-  display: flex;
+    display: flex;
-  flex-direction: column;
+    flex-direction: column;
 }
 
 .operation-bar {
@@ -390,12 +397,20 @@ export default {
 
 .params-card {
     background: white;
-    border: none;
+    flex: 1;
-    box-shadow: none;
     display: flex;
     flex-direction: column;
-    flex: 1;
+    border: none;
+    box-shadow: none;
     overflow: hidden;
+
+    ::v-deep .el-card__body {
+        padding: 15px;
+        display: flex;
+        flex-direction: column;
+        flex: 1;
+        overflow: hidden;
+    }
 }
 
 .table_bottom {
@@ -446,7 +461,7 @@ export default {
     gap: 10px;
 
     .el-select {
-      margin-right: 8px;
+        margin-right: 8px;
     }
 
     .pagination-btn:first-child,
@@ -514,15 +529,17 @@ export default {
     width: 100%;
     display: flex;
     flex-direction: column;
+
     .el-table__body-wrapper {
-      flex: 1;
+        flex: 1;
-      overflow: auto;
+        overflow-y: auto;
-      max-height: none !important;
+        max-height: none !important;
     }
 
     .el-table__header-wrapper {
-      flex-shrink: 0;
+        flex-shrink: 0;
     }
+
     .el-table__header th {
         background: white !important;
         color: black;
@@ -649,11 +666,31 @@ export default {
 }
 
 .el-table {
-  --table-max-height: calc(100vh - 400px);
+    --table-max-height: calc(100vh - 40vh);
-  max-height: var(--table-max-height);
+    max-height: var(--table-max-height);
 
-  .el-table__body-wrapper {
+    .el-table__body-wrapper {
-    max-height: calc(var(--table-max-height) - 40px);
+        max-height: calc(var(--table-max-height) - 40px);
-  }
+    }
+}
+
+:deep(.el-loading-mask) {
+    background-color: rgba(255, 255, 255, 0.6) !important;
+    backdrop-filter: blur(2px);
+}
+
+:deep(.el-loading-spinner .circular) {
+    width: 28px;
+    height: 28px;
+}
+
+:deep(.el-loading-spinner .path) {
+    stroke: #6b8cff;
+}
+
+:deep(.el-loading-text) {
+    color: #6b8cff !important;
+    font-size: 14px;
+    margin-top: 8px;
 }
 </style>

main/manager-web/src/views/UserManagement.vue

@@ -15,11 +15,13 @@
       <div class="content-panel">
         <div class="content-area">
           <el-card class="user-card" shadow="never">
-            <el-table ref="userTable" :data="userList" class="transparent-table">
+            <el-table ref="userTable" :data="userList" class="transparent-table" v-loading="loading"
+              element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
+              element-loading-background="rgba(255, 255, 255, 0.7)">
               <el-table-column label="选择" align="center" width="120">
-                  <template slot-scope="scope">
+                <template slot-scope="scope">
-                      <el-checkbox v-model="scope.row.selected"></el-checkbox>
+                  <el-checkbox v-model="scope.row.selected"></el-checkbox>
-                  </template>
+                </template>
               </el-table-column>
               <el-table-column label="用户Id" prop="userid" align="center"></el-table-column>
               <el-table-column label="手机号码" prop="mobile" align="center"></el-table-column>
@@ -54,11 +56,7 @@
               </div>
               <div class="custom-pagination">
                 <el-select v-model="pageSize" @change="handlePageSizeChange" class="page-size-select">
-                  <el-option
+                  <el-option v-for="item in pageSizeOptions" :key="item" :label="`${item}条/页`" :value="item">
-                    v-for="item in pageSizeOptions"
-                    :key="item"
-                    :label="`${item}条/页`"
-                    :value="item">
                   </el-option>
                 </el-select>
 
@@ -83,27 +81,31 @@
     </div>
 
     <view-password-dialog :visible.sync="showViewPassword" :password="currentPassword" />
+    <el-footer>
+      <version-footer />
+    </el-footer>
   </div>
 </template>
 
 <script>
 import Api from "@/apis/api";
 import HeaderBar from "@/components/HeaderBar.vue";
+import VersionFooter from "@/components/VersionFooter.vue";
 import ViewPasswordDialog from "@/components/ViewPasswordDialog.vue";
-
 export default {
-  components: { HeaderBar, ViewPasswordDialog },
+  components: { HeaderBar, ViewPasswordDialog, VersionFooter },
   data() {
     return {
       showViewPassword: false,
       currentPassword: "",
       searchPhone: "",
       userList: [],
-      pageSizeOptions: [5, 10, 20, 50, 100],
+      pageSizeOptions: [10, 20, 50, 100],
       currentPage: 1,
-      pageSize: 5,
+      pageSize: 10,
       total: 0,
-      isAllSelected: false
+      isAllSelected: false,
+      loading: false,
     };
   },
   created() {
@@ -130,39 +132,41 @@ export default {
     },
   },
   methods: {
-     handlePageSizeChange(val) {
+    handlePageSizeChange(val) {
       this.pageSize = val;
       this.currentPage = 1;
       this.fetchUsers();
     },
 
     fetchUsers() {
-        Api.admin.getUserList(
+      this.loading = true;
-            {
+      Api.admin.getUserList(
-                page: this.currentPage,
+        {
-                limit: this.pageSize,
+          page: this.currentPage,
-                mobile: this.searchPhone,
+          limit: this.pageSize,
-            },
+          mobile: this.searchPhone,
-            ({ data }) => {
+        },
-                if (data.code === 0) {
+        ({ data }) => {
-                    this.userList = data.data.list.map(item => ({
+          this.loading = false; // 结束加载
-                        ...item,
+          if (data.code === 0) {
-                        selected: false
+            this.userList = data.data.list.map(item => ({
-                    }));
+              ...item,
-                    this.total = data.data.total;
+              selected: false
-                }
+            }));
-            }
+            this.total = data.data.total;
-        );
+          }
+        }
+      );
     },
     handleSearch() {
       this.currentPage = 1;
       this.fetchUsers();
     },
     handleSelectAll() {
-        this.isAllSelected = !this.isAllSelected;
+      this.isAllSelected = !this.isAllSelected;
-        this.userList.forEach(row => {
+      this.userList.forEach(row => {
-            row.selected = this.isAllSelected;
+        row.selected = this.isAllSelected;
-        });
+      });
     },
     batchDelete() {
       const selectedUsers = this.userList.filter(user => user.selected);
@@ -230,12 +234,12 @@ export default {
         });
     },
     batchEnable() {
-        const selectedUsers = this.userList.filter(user => user.selected);
+      const selectedUsers = this.userList.filter(user => user.selected);
-        this.handleChangeStatus(selectedUsers, 1);
+      this.handleChangeStatus(selectedUsers, 1);
     },
     batchDisable() {
-        const selectedUsers = this.userList.filter(user => user.selected);
+      const selectedUsers = this.userList.filter(user => user.selected);
-        this.handleChangeStatus(selectedUsers, 0);
+      this.handleChangeStatus(selectedUsers, 0);
     },
     resetPassword(row) {
       this.$confirm("重置后将会生成新密码，是否继续？", "提示", {
@@ -355,7 +359,7 @@ export default {
 .main-wrapper {
   margin: 5px 22px;
   border-radius: 15px;
-  min-height: calc(100vh - 350px);
+  min-height: calc(100vh - 24vh);
   height: auto;
   max-height: 80vh;
   box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
@@ -415,12 +419,20 @@ export default {
 
 .user-card {
   background: white;
-  border: none;
+  flex: 1;
-  box-shadow: none;
   display: flex;
   flex-direction: column;
-  flex: 1;
+  border: none;
+  box-shadow: none;
   overflow: hidden;
+
+  ::v-deep .el-card__body {
+    padding: 15px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: hidden;
+  }
 }
 
 .table_bottom {
@@ -555,9 +567,10 @@ export default {
   width: 100%;
   display: flex;
   flex-direction: column;
+
   .el-table__body-wrapper {
     flex: 1;
-    overflow: auto;
+    overflow-y: auto;
     max-height: none !important;
   }
 
@@ -630,51 +643,51 @@ export default {
 }
 
 .page-size-select {
-    width: 100px;
+  width: 100px;
-    margin-right: 10px;
+  margin-right: 10px;
 
-    :deep(.el-input__inner) {
+  :deep(.el-input__inner) {
-        height: 32px;
+    height: 32px;
-        line-height: 32px;
+    line-height: 32px;
-        border-radius: 4px;
+    border-radius: 4px;
-        border: 1px solid #e4e7ed;
+    border: 1px solid #e4e7ed;
-        background: #dee7ff;
+    background: #dee7ff;
-        color: #606266;
+    color: #606266;
-        font-size: 14px;
+    font-size: 14px;
-    }
+  }
 
-    :deep(.el-input__suffix) {
+  :deep(.el-input__suffix) {
-        right: 6px;
+    right: 6px;
-        width: 15px;
+    width: 15px;
-        height: 20px;
+    height: 20px;
-        display: flex;
+    display: flex;
-        justify-content: center;
+    justify-content: center;
-        align-items: center;
+    align-items: center;
-        top: 6px;
+    top: 6px;
-        border-radius: 4px;
+    border-radius: 4px;
-    }
+  }
 
-    :deep(.el-input__suffix-inner) {
+  :deep(.el-input__suffix-inner) {
-        display: flex;
+    display: flex;
-        align-items: center;
+    align-items: center;
-        justify-content: center;
+    justify-content: center;
-        width: 100%;
+    width: 100%;
-    }
+  }
 
-    :deep(.el-icon-arrow-up:before) {
+  :deep(.el-icon-arrow-up:before) {
-        content: "";
+    content: "";
-        display: inline-block;
+    display: inline-block;
-        border-left: 6px solid transparent;
+    border-left: 6px solid transparent;
-        border-right: 6px solid transparent;
+    border-right: 6px solid transparent;
-        border-top: 9px solid #606266;
+    border-top: 9px solid #606266;
-        position: relative;
+    position: relative;
-        transform: rotate(0deg);
+    transform: rotate(0deg);
-        transition: transform 0.3s;
+    transition: transform 0.3s;
-    }
+  }
 }
 
 .el-table {
-  --table-max-height: calc(100vh - 400px);
+  --table-max-height: calc(100vh - 40vh);
   max-height: var(--table-max-height);
 
   .el-table__body-wrapper {
@@ -682,5 +695,23 @@ export default {
   }
 }
 
+:deep(.el-loading-mask) {
+  background-color: rgba(255, 255, 255, 0.6) !important;
+  backdrop-filter: blur(2px);
+}
 
+:deep(.el-loading-spinner .circular) {
+  width: 28px;
+  height: 28px;
+}
+
+:deep(.el-loading-spinner .path) {
+  stroke: #6b8cff;
+}
+
+:deep(.el-loading-text) {
+  color: #6b8cff !important;
+  font-size: 14px;
+  margin-top: 8px;
+}
 </style>

main/manager-web/src/views/home.vue

@@ -31,8 +31,30 @@
           </div>
         </div>
         <div class="device-list-container">
-          <DeviceItem v-for="(item, index) in devices" :key="index" :device="item" @configure="goToRoleConfig"
+          <template v-if="isLoading">
-            @deviceManage="handleDeviceManage" @delete="handleDeleteAgent" />
+            <div
+              v-for="i in skeletonCount"
+              :key="'skeleton-'+i"
+              class="skeleton-item"
+            >
+              <div class="skeleton-image"></div>
+              <div class="skeleton-content">
+                <div class="skeleton-line"></div>
+                <div class="skeleton-line-short"></div>
+              </div>
+            </div>
+          </template>
+
+          <template v-else>
+            <DeviceItem
+              v-for="(item, index) in devices"
+              :key="index"
+              :device="item"
+              @configure="goToRoleConfig"
+              @deviceManage="handleDeviceManage"
+              @delete="handleDeleteAgent"
+            />
+          </template>
         </div>
       </div>
       <AddWisdomBodyDialog :visible.sync="addDeviceDialogVisible" @confirm="handleWisdomBodyAdded" />
@@ -60,7 +82,9 @@ export default {
       devices: [],
       originalDevices: [],
       isSearching: false,
-      searchRegex: null
+      searchRegex: null,
+      isLoading: true,
+      skeletonCount: localStorage.getItem('skeletonCount') || 8,
     }
   },
 
@@ -109,12 +133,26 @@ export default {
     },
     // 获取智能体列表
     fetchAgentList() {
+      this.isLoading = true;
       Api.agent.getAgentList(({ data }) => {
-        this.originalDevices = data.data.map(item => ({
+        if (data?.data) {
-          ...item,
+          this.originalDevices = data.data.map(item => ({
-          agentId: item.id // 字段映射
+            ...item,
-        }));
+            agentId: item.id
-        this.handleSearchReset(); // 重置搜索状态
+          }));
+
+          // 动态设置骨架屏数量（可选）
+          this.skeletonCount = Math.min(
+            Math.max(this.originalDevices.length, 3), // 最少3个
+            10 // 最多10个
+          );
+
+          this.handleSearchReset();
+        }
+        this.isLoading = false;
+      }, (error) => {
+        console.error('Failed to fetch agent list:', error);
+        this.isLoading = false;
       });
     },
     // 删除智能体
@@ -199,7 +237,7 @@ export default {
 
   .hi-hint {
     font-weight: 400;
-    font-size: 10px;
+    font-size: 12px;
     text-align: left;
     color: #818cae;
     margin-left: 75px;
@@ -220,7 +258,7 @@ export default {
     border-radius: 17px;
     background: #5778ff;
     color: #fff;
-    font-size: 10px;
+    font-size: 14px;
     font-weight: 500;
     text-align: center;
     line-height: 34px;
@@ -262,6 +300,65 @@ export default {
   /* 居中显示 */
 }
 
+/* 骨架屏动画 */
+@keyframes shimmer {
+  100% { transform: translateX(100%); }
+}
 
+.skeleton-item {
+  background: #fff;
+  border-radius: 8px;
+  padding: 20px;
+  height: 120px;
+  position: relative;
+  overflow: hidden;
+  margin-bottom: 20px;
+}
 
+.skeleton-image {
+  width: 80px;
+  height: 80px;
+  background: #f0f2f5;
+  border-radius: 4px;
+  float: left;
+  position: relative;
+  overflow: hidden;
+}
+
+.skeleton-content {
+  margin-left: 100px;
+}
+
+.skeleton-line {
+  height: 16px;
+  background: #f0f2f5;
+  border-radius: 4px;
+  margin-bottom: 12px;
+  width: 70%;
+  position: relative;
+  overflow: hidden;
+}
+
+.skeleton-line-short {
+  height: 12px;
+  background: #f0f2f5;
+  border-radius: 4px;
+  width: 50%;
+}
+
+.skeleton-item::after {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 50%;
+  height: 100%;
+  background: linear-gradient(
+    90deg,
+    rgba(255,255,255,0),
+    rgba(255,255,255,0.3),
+    rgba(255,255,255,0)
+  );
+  animation: shimmer 1.5s infinite;
+}
 </style>

main/manager-web/src/views/register.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="welcome">
+  <div class="welcome" @keyup.enter="register">
     <el-container style="height: 100%;">
       <!-- 保持相同的头部 -->
       <el-header>

main/manager-web/src/views/roleConfig.vue

@@ -1,88 +1,129 @@
 <template>
   <div class="welcome">
-    <HeaderBar />
+    <HeaderBar/>
-    <el-main style="padding: 16px;display: flex;flex-direction: column;">
+
-      <div style="border-radius: 16px;background: #fafcfe; border: 1px solid #e8f0ff;">
+    <div class="operation-bar">
-        <div
+      <h2 class="page-title">角色配置</h2>
-          style="padding: 15px 24px;font-weight: 700;font-size: 19px;text-align: left;color: #3d4566;display: flex;gap: 13px;align-items: center;">
+    </div>
-          <div
+
-            style="width: 37px;height: 37px;background: #5778ff;border-radius: 50%;display: flex;align-items: center;justify-content: center;">
+    <div class="main-wrapper">
-            <img loading="lazy" src="@/assets/home/setting-user.png" alt="" style="width: 19px;height: 19px;" />
+      <div class="content-panel">
-          </div>
+        <div class="content-area">
-          {{ form.agentName }}
+          <el-card class="config-card" shadow="never">
-        </div>
+            <div class="config-header">
-        <div style="height: 1px;background: #e8f0ff;" />
+              <div class="header-icon">
-        <el-form ref="form" :model="form" label-width="72px">
+                <img loading="lazy" src="@/assets/home/setting-user.png" alt="">
-          <div style="padding: 16px 24px;">
-            <div style="display: grid; grid-template-columns: 1fr 1fr; gap: 24px;">
-              <div>
-                <el-form-item label="助手昵称：">
-                  <div class="input-46" style="width: 100%;">
-                    <el-input v-model="form.agentName" />
-                  </div>
-                </el-form-item>
-                <el-form-item label="角色模版：">
-                  <div style="display: flex;gap: 8px;flex-wrap: wrap;">
-                    <div v-for="(template, index) in templates" :key="`template-${index}`" class="template-item"
-                      :class="{ 'template-loading': loadingTemplate }" @click="selectTemplate(template)">
-                      {{ template.agentName }}
-                    </div>
-                  </div>
-                </el-form-item>
-                <el-form-item label="角色介绍：">
-                  <div class="textarea-box">
-                    <el-input type="textarea" rows="5" resize="none" placeholder="请输入内容" v-model="form.systemPrompt"
-                      maxlength="2000" show-word-limit />
-                  </div>
-                </el-form-item>
-                <el-form-item label="语言编码：">
-                  <div class="input-46" style="width: 100%;">
-                    <el-input v-model="form.langCode" placeholder="请输入语言编码，如：zh_CN" maxlength="10" show-word-limit />
-                  </div>
-                </el-form-item>
-                <el-form-item label="交互语种：">
-                  <div class="input-46" style="width: 100%;">
-                    <el-input v-model="form.language" placeholder="请输入交互语种，如：中文" maxlength="10" show-word-limit />
-                  </div>
-                </el-form-item>
-              </div>
-              <div>
-                <el-form-item v-for="(model, index) in models" :key="`model-${index}`" :label="model.label"
-                  class="model-item">
-                  <el-select v-model="form.model[model.key]" filterable placeholder="请选择" class="select-field">
-                    <el-option v-for="(item, optionIndex) in modelOptions[model.type]"
-                      :key="`option-${index}-${optionIndex}`" :label="item.label" :value="item.value" />
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="角色音色：">
-                  <div style="display: flex;gap: 8px;align-items: center;">
-                    <div class="input-46" style="width: 100%;">
-                      <el-select v-model="form.ttsVoiceId" placeholder="请选择" style="width: 100%;">
-                        <el-option v-for="(item, index) in voiceOptions" :key="`voice-${index}`" :label="item.label"
-                          :value="item.value" />
-                      </el-select>
-                    </div>
-                  </div>
-                </el-form-item>
               </div>
+              <span class="header-title">{{ form.agentName }}</span>
+              <button class="custom-close-btn" @click="goToHome">
+                ×
+              </button>
             </div>
-          </div>
+            <div class="divider"></div>
-        </el-form>
+
-        <div style="display: flex;padding: 16px;gap: 8px;align-items: center;">
+            <el-form ref="form" :model="form" label-width="72px">
-          <div class="save-btn" @click="saveConfig">
+              <div class="form-content">
-            保存配置
+                <div class="form-grid">
-          </div>
+                  <div class="form-column">
-          <div class="reset-btn" @click="resetConfig">
+                    <el-form-item label="助手昵称：">
-            重制
+                      <el-input v-model="form.agentName" class="form-input"/>
-          </div>
+                    </el-form-item>
-          <div class="clear-text">
+                    <el-form-item label="角色模版：">
-            <img loading="lazy" src="@/assets/home/red-info.png" alt="" style="width: 19px;height: 19px;" />
+                      <div class="template-container">
-            保存配置后，需要重启设备，新的配置才会生效。
+                        <div
-          </div>
+                            v-for="(template, index) in templates"
+                            :key="`template-${index}`"
+                            class="template-item"
+                            :class="{ 'template-loading': loadingTemplate }"
+                            @click="selectTemplate(template)"
+                        >
+                          {{ template.agentName }}
+                        </div>
+                      </div>
+                    </el-form-item>
+                    <el-form-item label="角色介绍：">
+                      <el-input
+                          type="textarea"
+                          rows="5"
+                          resize="none"
+                          placeholder="请输入内容"
+                          v-model="form.systemPrompt"
+                          maxlength="2000"
+                          show-word-limit
+                          class="form-textarea"
+                      />
+                    </el-form-item>
+                    <el-form-item label="语言编码：">
+                      <el-input
+                          v-model="form.langCode"
+                          placeholder="请输入语言编码，如：zh_CN"
+                          maxlength="10"
+                          show-word-limit
+                          class="form-input"
+                      />
+                    </el-form-item>
+                    <el-form-item label="交互语种：">
+                      <el-input
+                          v-model="form.language"
+                          placeholder="请输入交互语种，如：中文"
+                          maxlength="10"
+                          show-word-limit
+                          class="form-input"
+                      />
+                    </el-form-item>
+                    <div class="action-bar">
+              <el-button type="primary" class="save-btn" @click="saveConfig">保存配置</el-button>
+              <el-button class="reset-btn" @click="resetConfig">重置</el-button>
+              <div class="hint-text">
+                <img loading="lazy" src="@/assets/home/red-info.png" alt="">
+                <span>保存配置后，需要重启设备，新的配置才会生效。</span>
+              </div>
+</div>
+                  </div>
+                  <div class="form-column">
+                    <el-form-item
+                        v-for="(model, index) in models"
+                        :key="`model-${index}`"
+                        :label="model.label"
+                        class="model-item"
+                    >
+                      <el-select
+                          v-model="form.model[model.key]"
+                          filterable
+                          placeholder="请选择"
+                          class="form-select"
+                      >
+                        <el-option
+                            v-for="(item, optionIndex) in modelOptions[model.type]"
+                            :key="`option-${index}-${optionIndex}`"
+                            :label="item.label"
+                            :value="item.value"
+                        />
+                      </el-select>
+                    </el-form-item>
+                    <el-form-item label="角色音色：">
+                      <el-select
+                          v-model="form.ttsVoiceId"
+                          placeholder="请选择"
+                          class="form-select"
+                      >
+                        <el-option
+                            v-for="(item, index) in voiceOptions"
+                            :key="`voice-${index}`"
+                            :label="item.label"
+                            :value="item.value"
+                        />
+                      </el-select>
+                    </el-form-item>
+                  </div>
+                </div>
+              </div>
+            </el-form>
+
+          </el-card>
         </div>
       </div>
-
+    </div>
-    </el-main>
   </div>
 </template>
 
@@ -90,10 +131,9 @@
 import Api from '@/apis/api';
 import HeaderBar from "@/components/HeaderBar.vue";
 
-
 export default {
   name: 'RoleConfigPage',
-  components: { HeaderBar },
+  components: {HeaderBar},
   data() {
     return {
       form: {
@@ -114,12 +154,12 @@ export default {
         }
       },
       models: [
-        { label: '语音活动检测(VAD)', key: 'vadModelId', type: 'VAD' },
+        {label: '语音活动检测(VAD)', key: 'vadModelId', type: 'VAD'},
-        { label: '语音识别(ASR)', key: 'asrModelId', type: 'ASR' },
+        {label: '语音识别(ASR)', key: 'asrModelId', type: 'ASR'},
-        { label: '大语言模型(LLM)', key: 'llmModelId', type: 'LLM' },
+        {label: '大语言模型(LLM)', key: 'llmModelId', type: 'LLM'},
-        { label: '意图识别(Intent)', key: 'intentModelId', type: 'Intent' },
+        {label: '意图识别(Intent)', key: 'intentModelId', type: 'Intent'},
-        { label: '记忆(Memory)', key: 'memModelId', type: 'Memory' },
+        {label: '记忆(Memory)', key: 'memModelId', type: 'Memory'},
-        { label: '语音合成(TTS)', key: 'ttsModelId', type: 'TTS' },
+        {label: '语音合成(TTS)', key: 'ttsModelId', type: 'TTS'},
       ],
       modelOptions: {},
       templates: [],
@@ -128,6 +168,9 @@ export default {
     }
   },
   methods: {
+    goToHome() {
+      this.$router.push('/home');
+    },
     saveConfig() {
       const configData = {
         agentCode: this.form.agentCode,
@@ -144,7 +187,7 @@ export default {
         language: this.form.language,
         sort: this.form.sort
       };
-      Api.agent.updateAgentConfig(this.$route.query.agentId, configData, ({ data }) => {
+      Api.agent.updateAgentConfig(this.$route.query.agentId, configData, ({data}) => {
         if (data.code === 0) {
           this.$message.success({
             message: '配置保存成功',
@@ -164,7 +207,6 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        // 重置表单
         this.form = {
           agentCode: "",
           agentName: "",
@@ -187,10 +229,10 @@ export default {
           showClose: true
         })
       }).catch(() => {
-      })
+      });
     },
     fetchTemplates() {
-      Api.agent.getAgentTemplate(({ data }) => {
+      Api.agent.getAgentTemplate(({data}) => {
         if (data.code === 0) {
           this.templates = data.data;
         } else {
@@ -235,7 +277,7 @@ export default {
       };
     },
     fetchAgentConfig(agentId) {
-      Api.agent.getDeviceConfig(agentId, ({ data }) => {
+      Api.agent.getDeviceConfig(agentId, ({data}) => {
         if (data.code === 0) {
           this.form = {
             ...this.form,
@@ -255,9 +297,8 @@ export default {
       });
     },
     fetchModelOptions() {
-      // 为每个模型类型获取选项
       this.models.forEach(model => {
-        Api.model.getModelNames(model.type, '', ({ data }) => {
+        Api.model.getModelNames(model.type, '', ({data}) => {
           if (data.code === 0) {
             this.$set(this.modelOptions, model.type, data.data.map(item => ({
               value: item.id,
@@ -274,7 +315,7 @@ export default {
         this.voiceOptions = [];
         return;
       }
-      Api.model.getModelVoices(modelId, '', ({ data }) => {
+      Api.model.getModelVoices(modelId, '', ({data}) => {
         if (data.code === 0 && data.data) {
           this.voiceOptions = data.data.map(voice => ({
             value: voice.id,
@@ -289,7 +330,6 @@ export default {
   watch: {
     'form.model.ttsModelId': {
       handler(newVal, oldVal) {
-        console.log('TTS模型变化:', newVal);
         if (oldVal && newVal !== oldVal) {
           this.form.ttsVoiceId = '';
           this.fetchVoiceOptions(newVal);
@@ -325,60 +365,132 @@ export default {
   min-height: 506px;
   height: 100vh;
   display: flex;
+  position: relative;
   flex-direction: column;
-  background: linear-gradient(145deg, #e6eeff, #eff0ff);
+  background: linear-gradient(to bottom right, #dce8ff, #e4eeff, #e6cbfd);
   background-size: cover;
-  /* 确保背景图像覆盖整个元素 */
-  background-position: center;
-  /* 从顶部中心对齐 */
   -webkit-background-size: cover;
-  /* 兼容老版本WebKit浏览器 */
   -o-background-size: cover;
-  /* 兼容老版本Opera浏览器 */
+  overflow: hidden;
 }
 
-.el-form-item ::v-deep .el-form-item__label {
+.operation-bar {
-  font-size: 10px !important;
+  display: flex;
-  color: #3d4566 !important;
+  justify-content: space-between;
-  font-weight: 400;
+  align-items: center;
-  line-height: 22px;
+  padding: 16px 24px;
-  padding-bottom: 2px;
 }
 
-.select-field {
+.page-title {
-  width: 100%;
+  font-size: 24px;
-  max-width: 720px;
+  margin: 0;
-  border: 1px solid #e4e6ef;
+  color: #2c3e50;
-  background: #f6f8fb;
-  border-radius: 8px;
-  height: 36px !important;
 }
 
-.audio-box {
+.main-wrapper {
+  margin: 5px 22px;
+  border-radius: 15px;
+  height: calc(100vh - 24vh);
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+  position: relative;
+  background: rgba(237, 242, 255, 0.5);
+  display: flex;
+  flex-direction: column;
+}
+
+.content-panel {
   flex: 1;
-  height: 37px;
+  display: flex;
-  border-radius: 20px;
+  overflow: hidden;
-  border: 1px solid #e4e6ef;
+  height: 100%;
+  border-radius: 15px;
+  background: transparent;
+  border: 1px solid #fff;
 }
 
-.clear-btn {
+.content-area {
-  width: 48px;
+  flex: 1;
-  height: 19px;
+  height: 100%;
-  background: #fd8383;
+  min-width: 600px;
-  border-radius: 10px;
+  overflow: auto;
-  line-height: 19px;
+  background-color: white;
-  font-size: 11px;
+  display: flex;
-  color: #fff;
+  flex-direction: column;
-  cursor: pointer;
 }
 
-.clear-text {
+.config-card {
-  color: #979db1;
+  background: white;
-  font-size: 11px;
+  border: none;
+  box-shadow: none;
+  display: flex;
+  flex-direction: column;
+  flex: 1;
+  overflow-y: auto;
+}
+
+.config-header {
+  position: relative;
   display: flex;
   align-items: center;
+  gap: 13px;
+  padding: 0 0 5px 0;
+  font-weight: 700;
+  font-size: 19px;
+  color: #3d4566;
+}
+
+.header-icon {
+  width: 37px;
+  height: 37px;
+  background: #5778ff;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.header-icon img {
+  width: 19px;
+  height: 19px;
+}
+
+.divider {
+  height: 1px;
+  background: #e8f0ff;
+}
+
+.form-content {
+  padding: 20px 0;
+}
+
+.form-grid {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 20px;
+}
+
+.form-column {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
+
+.form-input {
+  width: 100%;
+}
+
+.form-select {
+  width: 100%;
+}
+
+.form-textarea {
+  width: 100%;
+}
+
+.template-container {
+  display: flex;
   gap: 8px;
-  margin-left: 16px;
+  flex-wrap: wrap;
 }
 
 .template-item {
@@ -399,47 +511,91 @@ export default {
   background-color: #d0d8ff;
 }
 
-.prompt-bottom {
+.action-bar {
-  margin-bottom: 4px;
   display: flex;
-  justify-content: space-between;
+  flex-wrap: wrap;
-  padding: 0 16px;
+  gap: 8px;
+  margin-top: 20px;
   align-items: center;
 }
 
-.input-46 {
+.action-bar {
-  border: 1px solid #e4e6ef;
+  .el-button.save-btn {
-  background: #f6f8fb;
+    background: #5778ff;
-  border-radius: 8px;
+    color: white;
-  height: 36px !important;
+    border: none;
+    border-radius: 18px;
+    padding: 10px 20px;
+    width: 100px;
+    height: 35px;
+    font-size: 14px;
+  }
+
+  .el-button.reset-btn {
+    background: #e6ebff;
+    color: #5778ff;
+    border: 1px solid #adbdff;
+    border-radius: 18px;
+    padding: 10px 20px;
+  }
 }
 
-.save-btn,
+.hint-text {
-.reset-btn {
+  display: flex;
-  width: 112px;
+  align-items: center;
-  height: 37px;
+  gap: 8px;
-  border-radius: 18px;
+  color: #979db1;
-  line-height: 37px;
+  font-size: 11px;
-  box-sizing: border-box;
+  margin-left: 16px;
+}
+
+.hint-text img {
+  width: 19px;
+  height: 19px;
+}
+
+::v-deep .el-form-item__label {
+  font-size: 10px !important;
+  color: #3d4566 !important;
+  font-weight: 400;
+  line-height: 22px;
+  padding-bottom: 2px;
+}
+
+::v-deep .el-textarea .el-input__count {
+  color: #909399;
+  background: none;
+  position: absolute;
+  font-size: 12px;
+  bottom: -10%;
+  right: 3%;
+}
+
+.custom-close-btn {
+  position: absolute;
+  top: 25%;
+  right: 0;
+  transform: translateY(-50%);
+  width: 35px;
+  height: 35px;
+  border-radius: 50%;
+  border: 2px solid #cfcfcf;
+  background: none;
+  font-size: 30px;
+  font-weight: lighter;
+  color: #cfcfcf;
   cursor: pointer;
-  font-size: 11px
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1;
+  padding: 0;
+  outline: none;
 }
 
-.save-btn {
+.custom-close-btn:hover {
-  border-radius: 18px;
+  color: #409EFF;
-  background: #5778ff;
+  border-color: #409EFF;
-  color: #fff;
 }
 
-.reset-btn {
+</style>
-  border: 1px solid #adbdff;
-  background: #e6ebff;
-  color: #5778ff;
-}
-
-.textarea-box {
-  border: 1px solid #e4e6ef;
-  border-radius: 8px;
-  background: #f6f8fb;
-}
-</style>

main/manager-web/src/views/test.vue

@@ -1,400 +0,0 @@
-<template>
-  <div class="container">
-    <h1 class="title">XiaoZhi ESP32 Server 测试助手</h1>
-    <div class="chat-container" ref="chatContainer">
-      <div v-for="(message, index) in messages" :key="index"
-        :class="['message', message.role === 'user' ? 'user' : 'assistant']">
-        <span>{{ message.content }}</span>
-      </div>
-    </div>
-    <div class="controls">
-      <button @click="toggleRecording" :disabled="wsStatus !== 'connected'" :class="{ recording: isRecording }">
-        {{ isRecording ? '停止录音' : '开始录音' }}
-      </button>
-      <p>WebSocket: {{ wsStatus }}</p>
-    </div>
-  </div>
-</template>
-
-<script>
-import { OpusDecoder } from 'opus-decoder';
-import Recorder from 'opus-recorder';
-
-export default {
-  name: 'TestPage',
-  data() {
-    return {
-      messages: [],
-      wsStatus: 'disconnected',
-      isRecording: false,
-      ws: null,
-      recorder: null,
-      stream: null,
-      audioContext: null,
-      sourceNode: null,
-      audioDecoder: null,
-      audioBufferQueue: [], // 当前句子的音频缓冲区
-      playbackQueue: [], // 播放队列，存储待播放的句子
-      isPlaying: false,
-    }
-  },
-  methods: {
-    connectWebSocket() {
-      this.ws = new WebSocket('ws://192.168.3.97:8000');//修改服务端地址
-      this.ws.binaryType = 'arraybuffer';
-      this.ws.onopen = () => {
-        this.wsStatus = 'connected';
-        console.log('WebSocket 连接成功');
-        this.ws.send(JSON.stringify({ type: 'auth', 'device-id': 'test-device' }));
-        this.audioDecoder = new OpusDecoder({ sampleRate: 16000, channels: 1 });
-      };
-      this.ws.onmessage = async (event) => {
-        if (typeof event.data === 'string') {
-          const msg = JSON.parse(event.data);
-          console.log('收到文本消息:', msg);
-
-          if (msg.type === 'stt') {
-            this.messages.push({ role: 'user', content: msg.text });
-            this.scrollToBottom();
-          } else if (msg.type === 'llm') {
-            this.messages.push({ role: 'assistant', content: msg.text });
-            this.scrollToBottom();
-          } else if (msg.type === 'tts') {
-            if (msg.state === 'sentence_start') {
-              this.audioBufferQueue = [];
-              const lastMessage = this.messages[this.messages.length - 1];
-              if (!lastMessage || lastMessage.content !== msg.text) {
-                this.messages.push({ role: 'assistant', content: msg.text });
-                this.scrollToBottom();
-              }
-            } else if (msg.state === 'sentence_end') {
-              if (this.audioBufferQueue.length > 0) {
-                this.playbackQueue.push([...this.audioBufferQueue]);
-                this.audioBufferQueue = [];
-                this.playNextInQueue();
-              }
-            } else if (msg.state === 'stop') {
-              console.log('TTS 任务结束');
-              if (this.audioBufferQueue.length > 0) {
-                this.playbackQueue.push([...this.audioBufferQueue]);
-                this.audioBufferQueue = [];
-                this.playNextInQueue();
-              }
-            }
-          } else if (msg.type === 'hello') {
-            console.log('收到服务器初始化消息:', msg);
-          }
-        } else if (event.data instanceof ArrayBuffer) {
-          console.log('收到音频帧，大小:', event.data.byteLength, '字节');
-          const opusFrame = new Uint8Array(event.data);
-          const frameHead = Array.from(opusFrame.slice(0, 8))
-            .map(b => b.toString(16).padStart(2, '0'))
-            .join(' ');
-          console.log('音频帧前8字节:', frameHead);
-
-          try {
-            const decoded = this.audioDecoder.decodeFrame(opusFrame);
-            console.log('解码结果:', decoded);
-            if (decoded && decoded.channelData && decoded.channelData[0]) {
-              const pcmData = decoded.channelData[0];
-              if (pcmData.length > 0) {
-                this.audioBufferQueue.push(pcmData);
-                console.log('解码音频帧，PCM 数据长度:', pcmData.length);
-                if (this.audioBufferQueue.length >= 5 && this.playbackQueue.length === 0 && !this.isPlaying) {
-                  this.playbackQueue.push([...this.audioBufferQueue]);
-                  this.audioBufferQueue = [];
-                  this.playNextInQueue();
-                }
-              } else {
-                console.warn('解码成功，但 PCM 数据长度为 0');
-              }
-            } else {
-              console.warn('解码结果无效:', decoded);
-            }
-          } catch (e) {
-            console.error('Opus 解码错误:', e);
-          }
-        }
-      };
-      this.ws.onerror = (error) => {
-        console.error('WebSocket 错误:', error);
-        this.wsStatus = 'error';
-      };
-      this.ws.onclose = () => {
-        this.wsStatus = 'disconnected';
-        console.log('WebSocket 断开');
-        setTimeout(this.connectWebSocket, 1000);
-      };
-    },
-    scrollToBottom() {
-      this.$nextTick(() => {
-        if (this.$refs.chatContainer) {
-          this.$refs.chatContainer.scrollTop = this.$refs.chatContainer.scrollHeight;
-        }
-      });
-    },
-    async playNextInQueue() {
-      if (this.isPlaying || this.playbackQueue.length === 0) {
-        return;
-      }
-      this.isPlaying = true;
-
-      if (!this.audioContext || this.audioContext.state === 'closed') {
-        this.audioContext = new (window.AudioContext || window.webkitAudioContext)({ sampleRate: 16000 });
-      }
-
-      const pcmBuffers = this.playbackQueue.shift();
-      const totalLength = pcmBuffers.reduce((sum, pcm) => sum + pcm.length, 0);
-      if (totalLength === 0) {
-        console.error('音频缓冲区总长度为 0，无法播放');
-        this.isPlaying = false;
-        this.playNextInQueue();
-        return;
-      }
-
-      const mergedPcm = new Float32Array(totalLength);
-      let offset = 0;
-      for (const pcm of pcmBuffers) {
-        mergedPcm.set(pcm, offset);
-        offset += pcm.length;
-      }
-
-      const audioBuffer = this.audioContext.createBuffer(1, totalLength, 16000);
-      audioBuffer.getChannelData(0).set(mergedPcm);
-
-      const source = this.audioContext.createBufferSource();
-      source.buffer = audioBuffer;
-      source.connect(this.audioContext.destination);
-      source.onended = () => {
-        this.isPlaying = false;
-        console.log('音频播放结束');
-        this.playNextInQueue();
-      };
-      source.start();
-      console.log('开始播放音频，总长度:', totalLength);
-    },
-    stripOggContainer(data) {
-      let arrayBuffer;
-      if (data instanceof ArrayBuffer) {
-        arrayBuffer = data;
-      } else if (data.buffer instanceof ArrayBuffer) {
-        arrayBuffer = data.buffer;
-      } else {
-        console.error('输入数据类型不支持:', data);
-        return [data];
-      }
-
-      const dataView = new DataView(arrayBuffer);
-      const frames = [];
-      let offset = 0;
-
-      while (offset < arrayBuffer.byteLength) {
-        if (dataView.getUint32(offset) === 0x4F676753) { // 'OggS'
-          const segmentTableLength = dataView.getUint8(offset + 26);
-          const segmentTableOffset = offset + 27;
-          let segmentOffset = segmentTableOffset + segmentTableLength;
-
-          for (let i = 0; i < segmentTableLength; i++) {
-            const segmentLength = dataView.getUint8(segmentTableOffset + i);
-            const segmentData = arrayBuffer.slice(segmentOffset, segmentOffset + segmentLength);
-            segmentOffset += segmentLength;
-
-            const header = new TextDecoder().decode(segmentData.slice(0, 8));
-            if (header === 'OpusHead' || header === 'OpusTags') {
-              console.log(`跳过 ${header}，大小: ${segmentLength} 字节`);
-            } else if (segmentLength >= 50 && segmentLength <= 300) {
-              frames.push(segmentData);
-            }
-          }
-          offset = segmentOffset;
-        } else {
-          const remainingLength = arrayBuffer.byteLength - offset;
-          if (remainingLength >= 50 && remainingLength <= 300) {
-            frames.push(arrayBuffer.slice(offset));
-          }
-          break;
-        }
-      }
-
-      if (frames.length === 0) {
-        console.warn('未找到有效裸 Opus 帧，返回原始数据');
-        return [arrayBuffer];
-      }
-      console.log('剥离后找到', frames.length, '个裸 Opus 帧');
-      return frames;
-    },
-    async initRecorder() {
-      console.log('开始初始化录音');
-      try {
-        if (this.stream) {
-          this.stream.getTracks().forEach(track => track.stop());
-        }
-        this.stream = await navigator.mediaDevices.getUserMedia({ audio: true });
-        console.log('获取麦克风权限成功，stream:', this.stream);
-
-        if (!this.audioContext || this.audioContext.state === 'closed') {
-          this.audioContext = new (window.AudioContext || window.webkitAudioContext)({ sampleRate: 16000 });
-        }
-        this.sourceNode = this.audioContext.createMediaStreamSource(this.stream);
-
-        this.recorder = new Recorder({
-          encoderPath: '/encoderWorker.min.js',
-          sampleRate: 16000,
-          numberOfChannels: 1,
-          frameSize: 960,
-          encoderApplication: 2048,
-          encoderFrameSize: 60,
-          encoderBitRate: 24000,
-          monitorGain: 0,
-          sourceNode: this.sourceNode,
-          ogg: false,
-          streamPages: false,
-          maxFramesPerPage: 1,
-        });
-
-        this.recorder.ondataavailable = (data) => {
-          console.log('录音数据可用:', data.byteLength, '类型:', data.constructor.name);
-          const frames = this.stripOggContainer(data);
-          frames.forEach((frame, index) => {
-            const frameHead = Array.from(new Uint8Array(frame.slice(0, 8)))
-              .map(b => b.toString(16).padStart(2, '0'))
-              .join(' ');
-            console.log(`帧 ${index} 大小: ${frame.byteLength} 字节，前8字节: ${frameHead}`);
-
-            if (frame.byteLength < 50 || frame.byteLength > 300) {
-              console.warn(`帧 ${index} 大小异常: ${frame.byteLength} 字节，预期 50-300 字节`);
-              return;
-            }
-
-            if (this.ws && this.ws.readyState === WebSocket.OPEN) {
-              this.ws.send(frame);
-              console.log('发送裸 Opus 帧:', frame.byteLength);
-            } else {
-              console.warn('WebSocket 未连接，跳过发送');
-            }
-          });
-        };
-
-        this.recorder.onstart = () => {
-          console.log('录音已启动');
-        };
-
-        this.recorder.onstop = () => {
-          console.log('录音停止');
-          this.stream.getTracks().forEach(track => track.stop());
-          this.stream = null;
-          this.sourceNode = null;
-          this.scrollToBottom();
-        };
-
-        console.log('Recorder 初始化成功');
-      } catch (err) {
-        console.error('初始化录音失败:', err);
-        alert('无法访问麦克风或录音初始化失败，请检查权限');
-      }
-    },
-    async toggleRecording() {
-      console.log('点击 toggleRecording，当前状态:', this.isRecording, 'WebSocket 状态:', this.wsStatus);
-      if (!this.recorder) {
-        await this.initRecorder();
-        if (!this.recorder) {
-          console.error('recorder 初始化失败');
-          return;
-        }
-      }
-      if (this.isRecording) {
-        console.log('停止录音');
-        this.recorder.stop();
-        this.isRecording = false;
-      } else {
-        try {
-          console.log('开始录音');
-          await this.initRecorder();
-          await this.recorder.start();
-          console.log('录音开始后，状态:', this.recorder.state);
-          this.isRecording = true;
-        } catch (err) {
-          console.error('录音启动失败:', err);
-        }
-      }
-    },
-  },
-  mounted() {
-    console.log('组件挂载，初始化 WebSocket');
-    this.connectWebSocket();
-  },
-  destroyed() {
-    if (this.ws) this.ws.close();
-    if (this.stream) this.stream.getTracks().forEach(track => track.stop());
-    if (this.recorder) this.recorder.stop();
-    if (this.audioContext) this.audioContext.close();
-    if (this.audioDecoder) this.audioDecoder.destroy();
-  }
-};
-</script>
-
-<style scoped>
-.container {
-  max-width: 800px;
-  margin: 0 auto;
-  padding: 20px;
-  font-family: Arial, sans-serif;
-}
-
-.title {
-  text-align: center;
-  font-size: 24px;
-  margin-bottom: 20px;
-}
-
-.chat-container {
-  height: 60vh;
-  overflow-y: auto;
-  border: 1px solid #ccc;
-  padding: 10px;
-  background: #f9f9f9;
-  border-radius: 5px;
-}
-
-.message {
-  margin: 10px 0;
-  padding: 8px 12px;
-  border-radius: 5px;
-  max-width: 70%;
-}
-
-.user {
-  background: #007bff;
-  color: white;
-  margin-left: auto;
-}
-
-.assistant {
-  background: #e9ecef;
-  color: black;
-}
-
-.controls {
-  text-align: center;
-  margin-top: 20px;
-}
-
-button {
-  padding: 10px 20px;
-  font-size: 16px;
-  cursor: pointer;
-  background: #007bff;
-  color: white;
-  border: none;
-  border-radius: 5px;
-}
-
-button:disabled {
-  background: #ccc;
-  cursor: not-allowed;
-}
-
-button.recording {
-  background: #dc3545;
-}
-</style>

main/manager-web/vue.config.js

@@ -39,7 +39,7 @@ const cdnResources = {
 const useCDN = process.env.VUE_APP_USE_CDN === 'true';
 
 module.exports = defineConfig({
-  productionSourceMap: process.env.NODE_ENV === 'production' ? false : true, // 生产环境不生成 source map
+  productionSourceMap: process.env.NODE_ENV !=='production', // 生产环境不生成 source map
   devServer: {
     port: 8001, // 指定端口为 8001
     proxy: {
@@ -52,6 +52,7 @@ module.exports = defineConfig({
       overlay: false, // 不显示 webpack 错误覆盖层
     },
   },
+  publicPath: process.env.VUE_APP_PUBLIC_PATH || "/",
   chainWebpack: config => {
 
     // 修改 HTML 插件配置，动态插入 CDN 链接

main/xiaozhi-server/config.yaml

@@ -147,7 +147,7 @@ selected_module:
   Memory: nomem
   # 意图识别模块开启后，可以播放音乐、控制音量、识别退出指令。
   # 不想开通意图识别，就设置成：nointent
-  # 意图识别可使用intent_llm，如果你的LLM是DifyLLM或CozeLLM，建议使用这个。优点：通用性强，缺点：增加串行前置意图识别模块，会增加处理时间，这个意图识别暂时不支持控制音量大小等iot操作
+  # 意图识别可使用intent_llm。优点：通用性强，缺点：增加串行前置意图识别模块，会增加处理时间，这个意图识别暂时不支持控制音量大小等iot操作
   # 意图识别可使用function_call，缺点：需要所选择的LLM支持function_call，优点：按需调用工具、速度快，理论上能全部操作所有iot指令
   # 默认免费的ChatGLMLLM就已经支持function_call，但是如果像追求稳定建议把LLM设置成：DoubaoLLM，使用的具体model_name是：doubao-pro-32k-functioncall-241028
   Intent: function_call
@@ -163,7 +163,7 @@ Intent:
     type: intent_llm
     # 配备意图识别独立的思考模型
     # 如果这里不填，则会默认使用selected_module.LLM的模型作为意图识别的思考模型
-    # 如果你的selected_module.LLM选择了DifyLLM或CozeLLM，这里最好使用独立的LLM作为意图识别，例如使用免费的ChatGLMLLM
+    # 如果你的不想使用selected_module.LLM意图识别，这里最好使用独立的LLM作为意图识别，例如使用免费的ChatGLMLLM
     llm: ChatGLMLLM
   function_call:
     # 不需要动type
@@ -314,6 +314,17 @@ LLM:
     bot_id: "你的bot_id"
     user_id: "你的user_id"
     personal_access_token: 你的coze个人令牌
+  VolcesAiGatewayLLM:
+    # 火山引擎 - 边缘大模型网关
+    # 定义LLM API类型
+    type: openai
+    # 先开通服务，打开以下网址，创建网关访问密钥，搜索并勾选 Doubao-pro-32k-functioncall ，开通
+    # 如果需要使用边缘大模型网关提供的语音合成，一并勾选 Doubao-语音合成 ，另见 TTS.VolcesAiGatewayTTS 配置
+    # https://console.volcengine.com/vei/aigateway/
+    # 开通后，进入这里获取密钥：https://console.volcengine.com/vei/aigateway/tokens-list
+    base_url: https://ai-gateway.vei.volces.com/v1
+    model_name: doubao-pro-32k-functioncall
+    api_key: 你的网关访问密钥
   LMStudioLLM:
     # 定义LLM API类型
     type: openai
@@ -382,6 +393,20 @@ TTS:
     output_dir: tmp/
     access_token: 你的coze web key
     response_format: wav
+  VolcesAiGatewayTTS:
+    type: openai
+    # 火山引擎 - 边缘大模型网关
+    # 先开通服务，打开以下网址，创建网关访问密钥，搜索并勾选 Doubao-语音合成 ，开通
+    # 如果需要使用边缘大模型网关提供的 LLM，一并勾选 Doubao-pro-32k-functioncall ，另见 LLM.VolcesAiGatewayLLM 配置
+    # https://console.volcengine.com/vei/aigateway/
+    # 开通后，进入这里获取密钥：https://console.volcengine.com/vei/aigateway/tokens-list
+    api_key: 你的网关访问密钥
+    api_url: https://ai-gateway.vei.volces.com/v1/audio/speech
+    model: doubao-tts
+    # 音色列表见 https://www.volcengine.com/docs/6561/1257544
+    voice: zh_male_shaonianzixin_moon_bigtts
+    speed: 1
+    output_dir: tmp/
   FishSpeech:
     # 定义TTS API类型
     #启动tts方法：

main/xiaozhi-server/config/config_loader.py

@@ -1,18 +1,7 @@
 import os
 import argparse
-import requests
 import yaml
-import time
+from config.manage_api_client import init_service, get_server_config, get_agent_models
-
-
-class DeviceNotFoundException(Exception):
-    pass
-
-
-class DeviceBindException(Exception):
-    def __init__(self, bind_code):
-        self.bind_code = bind_code
-        super().__init__(f"设备绑定异常，绑定码: {bind_code}")
 
 
 # 添加全局配置缓存
@@ -65,97 +54,32 @@ def get_config_file():
     return config_file
 
 
-def _make_api_request(api_url, secret, endpoint, json_data=None):
-    """执行API请求的通用函数
-
-    Args:
-        api_url: API的基础URL
-        secret: API密钥
-        endpoint: API端点
-        json_data: 请求的JSON数据
-
-    Returns:
-        dict: API返回的数据
-
-    Raises:
-        Exception: 当请求失败时抛出异常
-    """
-    if not api_url or not secret:
-        raise Exception("manager-api的url或secret配置错误")
-
-    if "你" in secret:
-        raise Exception("请先配置manager-api的secret")
-
-    max_retries = 10
-    retry_delay = 2  # 秒
-
-    for attempt in range(max_retries):
-        try:
-            response = requests.post(f"{api_url}{endpoint}", json=json_data)
-            if response.status_code == 200:
-                result = response.json()
-                if result.get("code") == 10041:
-                    raise DeviceNotFoundException(result.get("msg"))
-                elif result.get("code") == 10042:
-                    raise DeviceBindException(result.get("msg"))
-                elif result.get("code") != 0:
-                    raise Exception(f"API返回错误: {result.get('msg', '未知错误')}")
-                return result.get("data")
-
-            error_msg = f"manager-api请求失败，状态码: {response.status_code}"
-            try:
-                error_data = response.json()
-                if "msg" in error_data:
-                    error_msg = f"{error_msg}, 错误信息: {error_data['msg']}"
-            except:
-                error_msg = f"{error_msg}, 响应内容: {response.text}"
-
-            if attempt < max_retries - 1:
-                print(f"请求manager-api失败，正在重试 ({attempt + 1}/{max_retries})...")
-                time.sleep(retry_delay)
-            else:
-                raise Exception(error_msg)
-
-        except requests.exceptions.RequestException as e:
-            if attempt < max_retries - 1:
-                print(f"请求manager-api异常，正在重试 ({attempt + 1}/{max_retries})...")
-                time.sleep(retry_delay)
-            else:
-                raise Exception(f"manager-api请求异常: {str(e)}")
-
-
 def get_config_from_api(config):
     """从Java API获取配置"""
-    api_url = config["manager-api"].get("url", "")
+    # 初始化API客户端
-    secret = config["manager-api"].get("secret", "")
+    init_service(config)
+
+    # 获取服务器配置
+    config_data = get_server_config()
+    if config_data is None:
+        raise Exception("Failed to fetch server config from API")
 
-    config_data = _make_api_request(
-        api_url, secret, "/config/server-base", {"secret": secret}
-    )
     config_data["read_config_from_api"] = True
     config_data["manager-api"] = {
-        "url": api_url,
+        "url": config["manager-api"].get("url", ""),
-        "secret": secret,
+        "secret": config["manager-api"].get("secret", ""),
     }
+    if config.get("server"):
+        config_data["server"] = {
+            "ip": config["server"].get("ip", ""),
+            "port": config["server"].get("port", ""),
+        }
     return config_data
 
 
 def get_private_config_from_api(config, device_id, client_id):
     """从Java API获取私有配置"""
-    api_url = config["manager-api"].get("url", "")
+    return get_agent_models(device_id, client_id, config["selected_module"])
-    secret = config["manager-api"].get("secret", "")
-
-    return _make_api_request(
-        api_url,
-        secret,
-        "/config/agent-models",
-        {
-            "secret": secret,
-            "macAddress": device_id,
-            "clientId": client_id,
-            "selectedModule": config["selected_module"],
-        },
-    )
 
 
 def ensure_directories(config):

main/xiaozhi-server/config/logger.py

@@ -3,7 +3,7 @@ import sys
 from loguru import logger
 from config.config_loader import load_config
 
-SERVER_VERSION = "0.3.4"
+SERVER_VERSION = "0.3.11"
 
 
 def get_module_abbreviation(module_name, module_dict):

main/xiaozhi-server/config/manage_api_client.py

@@ -0,0 +1,154 @@
+import os
+import time
+from typing import Optional, Dict
+
+import httpx
+
+TAG = __name__
+
+
+class DeviceNotFoundException(Exception):
+    pass
+
+
+class DeviceBindException(Exception):
+    def __init__(self, bind_code):
+        self.bind_code = bind_code
+        super().__init__(f"设备绑定异常，绑定码: {bind_code}")
+
+
+class ManageApiClient:
+    _instance = None
+    _client = None
+    _secret = None
+
+    def __new__(cls, config):
+        """单例模式确保全局唯一实例，并支持传入配置参数"""
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+            cls._init_client(config)
+        return cls._instance
+
+    @classmethod
+    def _init_client(cls, config):
+        """初始化持久化连接池"""
+        cls.config = config.get("manager-api")
+
+        if not cls.config:
+            raise Exception("manager-api配置错误")
+
+        if not cls.config.get("url") or not cls.config.get("secret"):
+            raise Exception("manager-api的url或secret配置错误")
+
+        if "你" in cls.config.get("secret"):
+            raise Exception("请先配置manager-api的secret")
+
+        cls._secret = cls.config.get("secret")
+        cls.max_retries = cls.config.get("max_retries", 6)  # 最大重试次数
+        cls.retry_delay = cls.config.get("retry_delay", 10)  # 初始重试延迟(秒)
+        # NOTE(goody): 2025/4/16 http相关资源统一管理，后续可以增加线程池或者超时
+        # 后续也可以统一配置apiToken之类的走通用的Auth
+        cls._client = httpx.Client(
+            base_url=cls.config.get("url"),
+            headers={
+                "User-Agent": f"PythonClient/2.0 (PID:{os.getpid()})",
+                "Accept": "application/json",
+            },
+            timeout=cls.config.get("timeout", 30),  # 默认超时时间30秒
+        )
+
+    @classmethod
+    def _request(cls, method: str, endpoint: str, **kwargs) -> Dict:
+        """发送单次HTTP请求并处理响应"""
+        endpoint = endpoint.lstrip("/")
+        response = cls._client.request(method, endpoint, **kwargs)
+        response.raise_for_status()
+
+        result = response.json()
+
+        # 处理API返回的业务错误
+        if result.get("code") == 10041:
+            raise DeviceNotFoundException(result.get("msg"))
+        elif result.get("code") == 10042:
+            raise DeviceBindException(result.get("msg"))
+        elif result.get("code") != 0:
+            raise Exception(f"API返回错误: {result.get('msg', '未知错误')}")
+
+        # 返回成功数据
+        return result.get("data") if result.get("code") == 0 else None
+
+    @classmethod
+    def _should_retry(cls, exception: Exception) -> bool:
+        """判断异常是否应该重试"""
+        # 网络连接相关错误
+        if isinstance(
+            exception, (httpx.ConnectError, httpx.TimeoutException, httpx.NetworkError)
+        ):
+            return True
+
+        # HTTP状态码错误
+        if isinstance(exception, httpx.HTTPStatusError):
+            status_code = exception.response.status_code
+            return status_code in [408, 429, 500, 502, 503, 504]
+
+        return False
+
+    @classmethod
+    def _execute_request(cls, method: str, endpoint: str, **kwargs) -> Dict:
+        """带重试机制的请求执行器"""
+        retry_count = 0
+
+        while retry_count <= cls.max_retries:
+            try:
+                # 执行请求
+                return cls._request(method, endpoint, **kwargs)
+            except Exception as e:
+                # 判断是否应该重试
+                if retry_count < cls.max_retries and cls._should_retry(e):
+                    retry_count += 1
+                    print(
+                        f"{method} {endpoint} 请求失败，将在 {cls.retry_delay:.1f} 秒后进行第 {retry_count} 次重试"
+                    )
+                    time.sleep(cls.retry_delay)
+                    continue
+                else:
+                    # 不重试，直接抛出异常
+                    raise
+
+    @classmethod
+    def safe_close(cls):
+        """安全关闭连接池"""
+        if cls._client:
+            cls._client.close()
+            cls._instance = None
+
+
+def get_server_config() -> Optional[Dict]:
+    """获取服务器基础配置"""
+    return ManageApiClient._instance._execute_request(
+        "POST", "/config/server-base", json={"secret": ManageApiClient._secret}
+    )
+
+
+def get_agent_models(
+    mac_address: str, client_id: str, selected_module: Dict
+) -> Optional[Dict]:
+    """获取代理模型配置"""
+    return ManageApiClient._instance._execute_request(
+        "POST",
+        "/config/agent-models",
+        json={
+            "secret": ManageApiClient._secret,
+            "macAddress": mac_address,
+            "clientId": client_id,
+            "selectedModule": selected_module,
+        },
+    )
+
+
+def init_service(config):
+    ManageApiClient(config)
+
+
+def manage_api_http_safe_close():
+    ManageApiClient.safe_close()

main/xiaozhi-server/config/settings.py

@@ -43,6 +43,14 @@ def check_config_file():
     missing_keys = find_missing_keys(new_config, old_config)
     read_config_from_api = old_config.get("read_config_from_api", False)
     if read_config_from_api:
+        old_config_origin = read_config(old_config_file)
+        if old_config_origin.get("selected_module") is not None:
+            missing_keys_str = "\n".join(f"- {key}" for key in missing_keys)
+            error_msg = "您的配置文件好像既包含智控台的配置又包含本地配置：\n"
+            error_msg += "\n建议您：\n"
+            error_msg += "1、将根目录的config_from_api.yaml文件复制到data下，重命名为.config.yaml\n"
+            error_msg += "2、按教程配置好接口地址和密钥\n"
+            raise ValueError(error_msg)
         return
 
     if missing_keys:

main/xiaozhi-server/config_from_api.yaml

@@ -5,6 +5,9 @@
 # 先启动manager-api和manager-web，注册一个账号，第一个注册的账号为管理员
 # 使用管理员，进入【参数管理】页面，找到【server.secret】，复制它到参数值，注意每次从零部署，server.secret都会变化
 # 打开本data目录下的.config.yaml文件，修改manager-api.secret为刚才复制出来的server.secret
+server:
+  ip: 0.0.0.0
+  port: 8000
 manager-api:
   # 你的manager-api的地址，最好使用局域网ip
   url: http://127.0.0.1:8002/xiaozhi

main/xiaozhi-server/core/connection.py

@@ -27,11 +27,9 @@ from core.handle.functionHandler import FunctionHandler
 from plugins_func.register import Action, ActionResponse
 from core.auth import AuthMiddleware, AuthenticationError
 from core.mcp.manager import MCPManager
-from config.config_loader import (
+from config.config_loader import get_private_config_from_api
-    get_private_config_from_api,
+from config.manage_api_client import DeviceNotFoundException, DeviceBindException
-    DeviceNotFoundException,
+from core.utils.output_counter import add_device_output
-    DeviceBindException,
-)
 
 TAG = __name__
 
@@ -60,6 +58,7 @@ class ConnectionHandler:
         self.session_id = None
         self.prompt = None
         self.welcome_msg = None
+        self.max_output_size = 0
 
         # 客户端状态相关
         self.client_abort = False
@@ -112,10 +111,36 @@ class ConnectionHandler:
         self.close_after_chat = False  # 是否在聊天结束后关闭连接
         self.use_function_call_mode = False
 
+        self.timeout_task = None
+        self.timeout_seconds = (
+            int(self.config.get("close_connection_no_voice_time", 120)) + 60
+        )  # 在原来第一道关闭的基础上加60秒，进行二道关闭
+
     async def handle_connection(self, ws):
         try:
             # 获取并验证headers
             self.headers = dict(ws.request.headers)
+
+            if self.headers.get("device-id", None) is None:
+                # 尝试从 URL 的查询参数中获取 device-id
+                from urllib.parse import parse_qs, urlparse
+
+                # 从 WebSocket 请求中获取路径
+                request_path = ws.request.path
+                if not request_path:
+                    self.logger.bind(tag=TAG).error("无法获取请求路径")
+                    return
+                parsed_url = urlparse(request_path)
+                query_params = parse_qs(parsed_url.query)
+                if "device-id" in query_params:
+                    self.headers["device-id"] = query_params["device-id"][0]
+                    self.headers["client-id"] = query_params["client-id"][0]
+                else:
+                    self.logger.bind(tag=TAG).error(
+                        "无法从请求头和URL查询参数中获取device-id"
+                    )
+                    return
+
             # 获取客户端ip地址
             self.client_ip = ws.remote_address[0]
             self.logger.bind(tag=TAG).info(
@@ -129,12 +154,17 @@ class ConnectionHandler:
             self.websocket = ws
             self.session_id = str(uuid.uuid4())
 
+            # 启动超时检查任务
+            self.timeout_task = asyncio.create_task(self._check_timeout())
+
             self.welcome_msg = self.config["xiaozhi"]
             self.welcome_msg["session_id"] = self.session_id
             await self.websocket.send(json.dumps(self.welcome_msg))
 
+            # 获取差异化配置
+            private_config = self._initialize_private_config()
             # 异步初始化
-            self.executor.submit(self._initialize_components)
+            self.executor.submit(self._initialize_components, private_config)
             # tts 消化线程
             self.tts_priority_thread = threading.Thread(
                 target=self._tts_priority_thread, daemon=True
@@ -174,45 +204,45 @@ class ConnectionHandler:
 
     async def _route_message(self, message):
         """消息路由"""
+        # 重置超时计时器
+        if self.timeout_task:
+            self.timeout_task.cancel()
+            self.timeout_task = asyncio.create_task(self._check_timeout())
+
         if isinstance(message, str):
             await handleTextMessage(self, message)
         elif isinstance(message, bytes):
             await handleAudioMessage(self, message)
 
-    def _initialize_components(self):
+    def _initialize_components(self, private_config):
         """初始化组件"""
-        self._initialize_models()
+        if private_config is not None:
-
+            self._initialize_models(private_config)
-        """加载提示词"""
+        else:
-        self.prompt = self.config["prompt"]
+            self.prompt = self.config["prompt"]
-        self.dialogue.put(Message(role="system", content=self.prompt))
+            self.change_system_prompt(self.prompt)
-
         """加载记忆"""
         self._initialize_memory()
         """加载意图识别"""
         self._initialize_intent()
-        """加载位置信息"""
-        self.client_ip_info = get_ip_info(self.client_ip, self.logger)
-        if self.client_ip_info is not None and "city" in self.client_ip_info:
-            self.logger.bind(tag=TAG).info(f"Client ip info: {self.client_ip_info}")
-            self.prompt = self.prompt + f"\nuser location:{self.client_ip_info}"
 
-            self.dialogue.update_system_message(self.prompt)
+    def _initialize_private_config(self):
-
-    def _initialize_models(self):
         read_config_from_api = self.config.get("read_config_from_api", False)
         """如果是从配置文件获取，则进行二次实例化"""
         if not read_config_from_api:
             return
         """从接口获取差异化的配置进行二次实例化，非全量重新实例化"""
         try:
+            begin_time = time.time()
             private_config = get_private_config_from_api(
                 self.config,
-                self.headers.get("device-id", None),
+                self.headers.get("device-id"),
-                self.headers.get("client-id", None),
+                self.headers.get("client-id", self.headers.get("device-id")),
             )
             private_config["delete_audio"] = bool(self.config.get("delete_audio", True))
-            self.logger.bind(tag=TAG).info(f"获取差异化配置成功: {private_config}")
+            self.logger.bind(tag=TAG).info(
+                f"{time.time() - begin_time} 秒，获取差异化配置成功: {private_config}"
+            )
         except DeviceNotFoundException as e:
             self.need_bind = True
             private_config = {}
@@ -225,8 +255,37 @@ class ConnectionHandler:
             self.logger.bind(tag=TAG).error(f"获取差异化配置失败: {e}")
             private_config = {}
 
-        init_vad, init_asr, init_llm, init_tts, init_memory, init_intent = (
+        init_tts = False
-            False,
+        if private_config.get("TTS", None) is not None:
+            init_tts = True
+            self.config["TTS"] = private_config["TTS"]
+            self.config["selected_module"]["TTS"] = private_config["selected_module"][
+                "TTS"
+            ]
+
+        try:
+            modules = initialize_modules(
+                self.logger,
+                private_config,
+                False,
+                False,
+                False,
+                init_tts,
+                False,
+                False,
+            )
+        except Exception as e:
+            self.logger.bind(tag=TAG).error(f"初始化组件失败: {e}")
+            modules = {}
+        if modules.get("tts", None) is not None:
+            self.tts = modules["tts"]
+        if modules.get("prompt", None) is not None:
+            self.change_system_prompt(modules["prompt"])
+            private_config["prompt"] = None
+        return private_config
+
+    def _initialize_models(self, private_config):
+        init_vad, init_asr, init_llm, init_memory, init_intent = (
             False,
             False,
             False,
@@ -251,12 +310,6 @@ class ConnectionHandler:
             self.config["selected_module"]["LLM"] = private_config["selected_module"][
                 "LLM"
             ]
-        if private_config.get("TTS", None) is not None:
-            init_tts = True
-            self.config["TTS"] = private_config["TTS"]
-            self.config["selected_module"]["TTS"] = private_config["selected_module"][
-                "TTS"
-            ]
         if private_config.get("Memory", None) is not None:
             init_memory = True
             self.config["Memory"] = private_config["Memory"]
@@ -269,6 +322,8 @@ class ConnectionHandler:
             self.config["selected_module"]["Intent"] = private_config[
                 "selected_module"
             ]["Intent"]
+        if private_config.get("device_max_output_size", None) is not None:
+            self.max_output_size = int(private_config["device_max_output_size"])
         try:
             modules = initialize_modules(
                 self.logger,
@@ -276,7 +331,7 @@ class ConnectionHandler:
                 init_vad,
                 init_asr,
                 init_llm,
-                init_tts,
+                False,
                 init_memory,
                 init_intent,
             )
@@ -287,16 +342,12 @@ class ConnectionHandler:
             self.vad = modules["vad"]
         if modules.get("asr", None) is not None:
             self.asr = modules["asr"]
-        if modules.get("tts", None) is not None:
-            self.tts = modules["tts"]
         if modules.get("llm", None) is not None:
             self.llm = modules["llm"]
         if modules.get("intent", None) is not None:
             self.intent = modules["intent"]
         if modules.get("memory", None) is not None:
             self.memory = modules["memory"]
-        if modules.get("prompt", None) is not None:
-            self.change_system_prompt(modules["prompt"])
 
     def _initialize_memory(self):
         """初始化记忆模块"""
@@ -477,16 +528,19 @@ class ConnectionHandler:
         function_id = None
         function_arguments = ""
         content_arguments = ""
+
         for response in llm_responses:
             content, tools_call = response
+
             if "content" in response:
                 content = response["content"]
                 tools_call = None
             if content is not None and len(content) > 0:
-                if len(response_message) <= 0 and (
+                content_arguments += content
-                    content == "```" or "<tool_call>" in content
+
-                ):
+            if not tool_call_flag and content_arguments.startswith("<tool_call>"):
-                    tool_call_flag = True
+                # print("content_arguments", content_arguments)
+                tool_call_flag = True
 
             if tools_call is not None:
                 tool_call_flag = True
@@ -498,9 +552,7 @@ class ConnectionHandler:
                     function_arguments += tools_call[0].function.arguments
 
             if content is not None and len(content) > 0:
-                if tool_call_flag:
+                if not tool_call_flag:
-                    content_arguments += content
-                else:
                     response_message.append(content)
 
                     if self.client_abort:
@@ -561,10 +613,9 @@ class ConnectionHandler:
                     self.logger.bind(tag=TAG).error(
                         f"function call error: {content_arguments}"
                     )
-                else:
-                    function_arguments = json.loads(function_arguments)
             if not bHasError:
-                self.logger.bind(tag=TAG).info(
+                response_message.clear()
+                self.logger.bind(tag=TAG).debug(
                     f"function_name={function_name}, function_id={function_id}, function_arguments={function_arguments}"
                 )
                 function_call_data = {
@@ -659,7 +710,6 @@ class ConnectionHandler:
             self.tts_queue.put(future)
             self.dialogue.put(Message(role="assistant", content=text))
         elif result.action == Action.REQLLM:  # 调用函数后再请求llm生成回复
-
             text = result.result
             if text is not None and len(text) > 0:
                 function_id = function_call_data["id"]
@@ -686,18 +736,14 @@ class ConnectionHandler:
                     Message(role="tool", tool_call_id=function_id, content=text)
                 )
                 self.chat_with_function_calling(text, tool_call=True)
-        elif result.action == Action.NOTFOUND:
+        elif result.action == Action.NOTFOUND or result.action == Action.ERROR:
             text = result.result
             self.recode_first_last_text(text, text_index)
             future = self.executor.submit(self.speak_and_play, text, text_index)
             self.tts_queue.put(future)
             self.dialogue.put(Message(role="assistant", content=text))
         else:
-            text = result.result
+            pass
-            self.recode_first_last_text(text, text_index)
-            future = self.executor.submit(self.speak_and_play, text, text_index)
-            self.tts_queue.put(future)
-            self.dialogue.put(Message(role="assistant", content=text))
 
     def _tts_priority_thread(self):
         while not self.stop_event.is_set():
@@ -795,6 +841,8 @@ class ConnectionHandler:
             self.logger.bind(tag=TAG).error(f"tts转换失败，{text}")
             return None, text, text_index
         self.logger.bind(tag=TAG).debug(f"TTS 文件生成完毕: {tts_file}")
+        if self.max_output_size > 0:
+            add_device_output(self.headers.get("device-id"), len(text))
         return tts_file, text, text_index
 
     def clearSpeakStatus(self):
@@ -811,6 +859,11 @@ class ConnectionHandler:
 
     async def close(self, ws=None):
         """资源清理方法"""
+        # 取消超时任务
+        if self.timeout_task:
+            self.timeout_task.cancel()
+            self.timeout_task = None
+
         # 清理MCP资源
         if hasattr(self, "mcp_manager") and self.mcp_manager:
             await self.mcp_manager.cleanup_all()
@@ -825,7 +878,7 @@ class ConnectionHandler:
             self.executor = None
 
         # 清空任务队列
-        self._clear_queues()
+        self.clear_queues()
 
         if ws:
             await ws.close()
@@ -833,8 +886,11 @@ class ConnectionHandler:
             await self.websocket.close()
         self.logger.bind(tag=TAG).info("连接资源已释放")
 
-    def _clear_queues(self):
+    def clear_queues(self):
         # 清空所有任务队列
+        self.logger.bind(tag=TAG).info(
+            f"开始清理: TTS队列大小={self.tts_queue.qsize()}, 音频队列大小={self.audio_play_queue.qsize()}"
+        )
         for q in [self.tts_queue, self.audio_play_queue]:
             if not q:
                 continue
@@ -846,6 +902,9 @@ class ConnectionHandler:
             q.queue.clear()
             # 添加毒丸信号到队列，确保线程退出
             # q.queue.put(None)
+        self.logger.bind(tag=TAG).info(
+            f"清理结束: TTS队列大小={self.tts_queue.qsize()}, 音频队列大小={self.audio_play_queue.qsize()}"
+        )
 
     def reset_vad_states(self):
         self.client_audio_buffer = bytearray()
@@ -864,3 +923,15 @@ class ConnectionHandler:
             self.close_after_chat = True
         except Exception as e:
             self.logger.bind(tag=TAG).error(f"Chat and close error: {str(e)}")
+
+    async def _check_timeout(self):
+        """检查连接超时"""
+        try:
+            while not self.stop_event.is_set():
+                await asyncio.sleep(self.timeout_seconds)
+                if not self.stop_event.is_set():
+                    self.logger.bind(tag=TAG).info("连接超时，准备关闭")
+                    await self.close(self.websocket)
+                    break
+        except Exception as e:
+            self.logger.bind(tag=TAG).error(f"超时检查任务出错: {e}")

main/xiaozhi-server/core/handle/abortHandle.py

@@ -10,6 +10,7 @@ async def handleAbortMessage(conn):
     logger.bind(tag=TAG).info("Abort message received")
     # 设置成打断状态，会自动打断llm、tts任务
     conn.client_abort = True
+    conn.clear_queues()
     # 打断客户端说话状态
     await conn.websocket.send(json.dumps({"type": "tts", "state": "stop", "session_id": conn.session_id}))
     conn.clearSpeakStatus()

main/xiaozhi-server/core/handle/functionHandler.py

@@ -79,7 +79,7 @@ class FunctionHandler:
             func = funcItem.func
             arguments = function_call_data["arguments"]
             arguments = json.loads(arguments) if arguments else {}
-            logger.bind(tag=TAG).info(f"调用函数: {function_name}, 参数: {arguments}")
+            logger.bind(tag=TAG).debug(f"调用函数: {function_name}, 参数: {arguments}")
             if (
                 funcItem.type == ToolType.SYSTEM_CTL
                 or funcItem.type == ToolType.IOT_CTL

main/xiaozhi-server/core/handle/helloHandle.py

@@ -81,6 +81,8 @@ async def wakeupWordsResponse(conn):
     """唤醒词响应"""
     wakeup_word = random.choice(WAKEUP_CONFIG["words"])
     result = conn.llm.response_no_stream(conn.config["prompt"], wakeup_word)
+    if result is None or result == "":
+        return
     tts_file = await asyncio.to_thread(conn.tts.to_tts, result)
 
     if tts_file is not None and os.path.exists(tts_file):

main/xiaozhi-server/core/handle/iotHandle.py

@@ -57,7 +57,7 @@ def create_iot_function(device_name, method_name, method_info):
                 response_failure = "操作失败"
 
             # 打印响应参数
-            logger.bind(tag=TAG).info(
+            logger.bind(tag=TAG).debug(
                 f"控制函数接收到的响应参数: success='{response_success}', failure='{response_failure}'"
             )
 
@@ -144,33 +144,34 @@ class IotDescriptor:
         self.methods = []
 
         # 根据描述创建属性
-        for key, value in properties.items():
+        if properties is not None:
-            property_item = globals()[key] = {}
+            for key, value in properties.items():
-            property_item["name"] = key
+                property_item = {}
-            property_item["description"] = value["description"]
+                property_item["name"] = key
-            if value["type"] == "number":
+                property_item["description"] = value["description"]
-                property_item["value"] = 0
+                if value["type"] == "number":
-            elif value["type"] == "boolean":
+                    property_item["value"] = 0
-                property_item["value"] = False
+                elif value["type"] == "boolean":
-            else:
+                    property_item["value"] = False
-                property_item["value"] = ""
+                else:
-            self.properties.append(property_item)
+                    property_item["value"] = ""
+                self.properties.append(property_item)
 
         # 根据描述创建方法
-        for key, value in methods.items():
+        if methods is not None:
-            method = globals()[key] = {}
+            for key, value in methods.items():
-            method["description"] = value["description"]
+                method = {}
-            method["name"] = key
+                method["description"] = value["description"]
-            for k, v in value["parameters"].items():
+                method["name"] = key
-                method[k] = {}
+                # 检查方法是否有参数
-                method[k]["description"] = v["description"]
+                if "parameters" in value:
-                if v["type"] == "number":
+                    method["parameters"] = {}
-                    method[k]["value"] = 0
+                    for k, v in value["parameters"].items():
-                elif v["type"] == "boolean":
+                        method["parameters"][k] = {
-                    method[k]["value"] = False
+                            "description": v["description"],
-                else:
+                            "type": v["type"],
-                    method[k]["value"] = ""
+                        }
-            self.methods.append(method)
+                self.methods.append(method)
 
 
 def register_device_type(descriptor):
@@ -219,13 +220,19 @@ def register_device_type(descriptor):
         func_name = f"{device_name.lower()}_{method_name.lower()}"
 
         # 创建参数字典，添加原有参数
-        parameters = {
+        parameters = {}
-            param_name: {
+        required_params = []
-                "type": param_info["type"],
+
-                "description": param_info["description"],
+        # 如果方法有参数，则添加参数信息
+        if "parameters" in method_info:
+            parameters = {
+                param_name: {
+                    "type": param_info["type"],
+                    "description": param_info["description"],
+                }
+                for param_name, param_info in method_info["parameters"].items()
             }
-            for param_name, param_info in method_info["parameters"].items()
+            required_params = list(method_info["parameters"].keys())
-        }
 
         # 添加响应参数
         parameters.update(
@@ -242,7 +249,6 @@ def register_device_type(descriptor):
         )
 
         # 构建必须参数列表（原有参数 + 响应参数）
-        required_params = list(method_info["parameters"].keys())
         required_params.extend(["response_success", "response_failure"])
 
         func_desc = {
@@ -280,6 +286,25 @@ async def handleIotDescriptors(conn, descriptors):
     functions_changed = False
 
     for descriptor in descriptors:
+
+        # 如果descriptor没有properties和methods，则直接跳过
+        if "properties" not in descriptor and "methods" not in descriptor:
+            continue
+
+        # 处理缺失properties的情况
+        if "properties" not in descriptor:
+            descriptor["properties"] = {}
+            # 从methods中提取所有参数作为properties
+            if "methods" in descriptor:
+                for method_name, method_info in descriptor["methods"].items():
+                    if "parameters" in method_info:
+                        for param_name, param_info in method_info["parameters"].items():
+                            # 将参数信息转换为属性信息
+                            descriptor["properties"][param_name] = {
+                                "description": param_info["description"],
+                                "type": param_info["type"],
+                            }
+
         # 创建IOT设备描述符
         iot_descriptor = IotDescriptor(
             descriptor["name"],
@@ -373,19 +398,17 @@ async def send_iot_conn(conn, name, method_name, parameters):
             for method in value.methods:
                 # 找到了方法
                 if method["name"] == method_name:
-                    await conn.websocket.send(
+                    # 构建命令对象
-                        json.dumps(
+                    command = {
-                            {
+                        "name": name,
-                                "type": "iot",
+                        "method": method_name,
-                                "commands": [
+                    }
-                                    {
+
-                                        "name": name,
+                    # 只有当参数不为空时才添加parameters字段
-                                        "method": method_name,
+                    if parameters:
-                                        "parameters": parameters,
+                        command["parameters"] = parameters
-                                    }
+                    send_message = json.dumps({"type": "iot", "commands": [command]})
-                                ],
+                    await conn.websocket.send(send_message)
-                            }
+                    logger.bind(tag=TAG).info(f"发送物联网指令: {send_message}")
-                        )
-                    )
                     return
     logger.bind(tag=TAG).error(f"未找到方法{method_name}")

main/xiaozhi-server/core/handle/receiveAudioHandle.py

@@ -1,9 +1,9 @@
 from config.logger import setup_logging
 import time
-import asyncio
 from core.utils.util import remove_punctuation_and_length
 from core.handle.sendAudioHandle import send_stt_message
 from core.handle.intentHandler import handle_user_intent
+from core.utils.output_counter import check_device_output_limit
 
 TAG = __name__
 logger = setup_logging()
@@ -51,6 +51,15 @@ async def startToChat(conn, text):
     if conn.need_bind:
         await check_bind_device(conn)
         return
+
+    # 如果当日的输出字数大于限定的字数
+    if conn.max_output_size > 0:
+        if check_device_output_limit(
+            conn.headers.get("device-id"), conn.max_output_size
+        ):
+            await max_out_size(conn)
+            return
+
     # 首先进行意图分析
     intent_handled = await handle_user_intent(conn, text)
 
@@ -89,6 +98,18 @@ async def no_voice_close_connect(conn):
             await startToChat(conn, prompt)
 
 
+async def max_out_size(conn):
+    text = "不好意思，我现在有点事情要忙，明天这个时候我们再聊，约好了哦！明天不见不散，拜拜！"
+    await send_stt_message(conn, text)
+    conn.tts_first_text_index = 0
+    conn.tts_last_text_index = 0
+    conn.llm_finish_task = True
+    file_path = "config/assets/max_output_size.wav"
+    opus_packets, _ = conn.tts.audio_to_opus_data(file_path)
+    conn.audio_play_queue.put((opus_packets, text, 0))
+    conn.close_after_chat = True
+
+
 async def check_bind_device(conn):
     if conn.bind_code:
         # 确保bind_code是6位数字
@@ -115,7 +136,7 @@ async def check_bind_device(conn):
                 digit = conn.bind_code[i]
                 num_path = f"config/assets/bind_code/{digit}.wav"
                 num_packets, _ = conn.tts.audio_to_opus_data(num_path)
-                conn.audio_play_queue.put((num_packets, text, i + 1))
+                conn.audio_play_queue.put((num_packets, None, i + 1))
             except Exception as e:
                 logger.bind(tag=TAG).error(f"播放数字音频失败: {e}")
                 continue

main/xiaozhi-server/core/handle/sendAudioHandle.py

@@ -3,7 +3,6 @@ import json
 import asyncio
 import time
 from core.utils.util import (
-    remove_punctuation_and_length,
     get_string_no_punctuation_or_emoji,
 )
 

main/xiaozhi-server/core/providers/llm/AliBL/AliBL.py

@@ -2,10 +2,12 @@ from config.logger import setup_logging
 from http import HTTPStatus
 from dashscope import Application
 from core.providers.llm.base import LLMProviderBase
+from core.utils.util import check_model_key
 
 TAG = __name__
 logger = setup_logging()
 
+
 class LLMProvider(LLMProviderBase):
     def __init__(self, config):
         self.api_key = config["api_key"]
@@ -13,27 +15,32 @@ class LLMProvider(LLMProviderBase):
         self.base_url = config.get("base_url")
         self.is_No_prompt = config.get("is_no_prompt")
         self.memory_id = config.get("ali_memory_id")
+        check_model_key("AliBLLLM", self.api_key)
 
     def response(self, session_id, dialogue):
         try:
             # 处理dialogue
             if self.is_No_prompt:
                 dialogue.pop(0)
-                logger.bind(tag=TAG).debug(f"【阿里百练API服务】处理后的dialogue: {dialogue}")
+                logger.bind(tag=TAG).debug(
+                    f"【阿里百练API服务】处理后的dialogue: {dialogue}"
+                )
 
             # 构造调用参数
             call_params = {
                 "api_key": self.api_key,
                 "app_id": self.app_id,
                 "session_id": session_id,
-                "messages": dialogue
+                "messages": dialogue,
             }
             if self.memory_id != False:
                 # 百练memory需要prompt参数
                 prompt = dialogue[-1].get("content")
                 call_params["memory_id"] = self.memory_id
                 call_params["prompt"] = prompt
-                logger.bind(tag=TAG).debug(f"【阿里百练API服务】处理后的prompt: {prompt}")
+                logger.bind(tag=TAG).debug(
+                    f"【阿里百练API服务】处理后的prompt: {prompt}"
+                )
 
             responses = Application.call(**call_params)
             if responses.status_code != HTTPStatus.OK:
@@ -44,9 +51,15 @@ class LLMProvider(LLMProviderBase):
                 )
                 yield "【阿里百练API服务响应异常】"
             else:
-                logger.bind(tag=TAG).debug(f"【阿里百练API服务】构造参数: {call_params}")
+                logger.bind(tag=TAG).debug(
+                    f"【阿里百练API服务】构造参数: {call_params}"
+                )
                 yield responses.output.text
 
         except Exception as e:
             logger.bind(tag=TAG).error(f"【阿里百练API服务】响应异常: {e}")
             yield "【LLM服务响应异常】"
+
+    def response_with_functions(self, session_id, dialogue, functions=None):
+        logger.bind(tag=TAG).info(f"阿里百练暂未实现完整的工具调用（function call）")
+        return self.response(session_id, dialogue)

main/xiaozhi-server/core/providers/llm/base.py

@@ -35,4 +35,5 @@ class LLMProviderBase(ABC):
         """
         # For providers that don't support functions, just return regular response
         for token in self.response(session_id, dialogue):
-            yield {"type": "content", "content": token}
+            yield token, None
+

main/xiaozhi-server/core/providers/llm/coze/coze.py

@@ -1,12 +1,17 @@
 from config.logger import setup_logging
-import requests
 import json
-import re
 from core.providers.llm.base import LLMProviderBase
-import os
+
 # official coze sdk for Python [cozepy](https://github.com/coze-dev/coze-py)
 from cozepy import COZE_CN_BASE_URL
-from cozepy import Coze, TokenAuth, Message, ChatStatus, MessageContentType, ChatEventType  # noqa
+from cozepy import (
+    Coze,
+    TokenAuth,
+    Message,
+    ChatEventType,
+)  # noqa
+from core.providers.llm.system_prompt import get_system_prompt_for_function
+from core.utils.util import check_model_key
 
 TAG = __name__
 logger = setup_logging()
@@ -15,25 +20,23 @@ logger = setup_logging()
 class LLMProvider(LLMProviderBase):
     def __init__(self, config):
         self.personal_access_token = config.get("personal_access_token")
-        self.bot_id = config.get("bot_id")
+        self.bot_id = str(config.get("bot_id"))
-        self.user_id = config.get("user_id")
+        self.user_id = str(config.get("user_id"))
         self.session_conversation_map = {}  # 存储session_id和conversation_id的映射
+        check_model_key("CozeLLM", self.personal_access_token)
 
     def response(self, session_id, dialogue):
         coze_api_token = self.personal_access_token
         coze_api_base = COZE_CN_BASE_URL
 
         last_msg = next(m for m in reversed(dialogue) if m["role"] == "user")
-        
+
         coze = Coze(auth=TokenAuth(token=coze_api_token), base_url=coze_api_base)
         conversation_id = self.session_conversation_map.get(session_id)
 
         # 如果没有找到conversation_id，则创建新的对话
         if not conversation_id:
-            conversation = coze.conversations.create(
+            conversation = coze.conversations.create(messages=[])
-                messages=[
-                ]
-            )
             conversation_id = conversation.id
             self.session_conversation_map[session_id] = conversation_id  # 更新映射
 
@@ -47,4 +50,24 @@ class LLMProvider(LLMProviderBase):
         ):
             if event.event == ChatEventType.CONVERSATION_MESSAGE_DELTA:
                 print(event.message.content, end="", flush=True)
-                yield event.message.content
+                yield event.message.content
+
+    def response_with_functions(self, session_id, dialogue, functions=None):
+        if len(dialogue) == 2 and functions is not None and len(functions) > 0:
+            # 第一次调用llm， 取最后一条用户消息，附加tool提示词
+            last_msg = dialogue[-1]["content"]
+            function_str = json.dumps(functions, ensure_ascii=False)
+            modify_msg = get_system_prompt_for_function(function_str) + last_msg
+            dialogue[-1]["content"] = modify_msg
+
+        # 如果最后一个是 role="tool"，附加到user上
+        if len(dialogue) > 1 and dialogue[-1]["role"] == "tool":
+            assistant_msg = "\ntool call result: " + dialogue[-1]["content"] + "\n\n"
+            while len(dialogue) > 1:
+                if dialogue[-1]["role"] == "user":
+                    dialogue[-1]["content"] = assistant_msg + dialogue[-1]["content"]
+                    break
+                dialogue.pop()
+
+        for token in self.response(session_id, dialogue):
+            yield token, None

main/xiaozhi-server/core/providers/llm/dify/dify.py

@@ -2,6 +2,8 @@ import json
 from config.logger import setup_logging
 import requests
 from core.providers.llm.base import LLMProviderBase
+from core.providers.llm.system_prompt import get_system_prompt_for_function
+from core.utils.util import check_model_key
 
 TAG = __name__
 logger = setup_logging()
@@ -13,6 +15,7 @@ class LLMProvider(LLMProviderBase):
         self.mode = config.get("mode", "chat-messages")
         self.base_url = config.get("base_url", "https://api.dify.ai/v1").rstrip("/")
         self.session_conversation_map = {}  # 存储session_id和conversation_id的映射
+        check_model_key("DifyLLM", self.api_key)
 
     def response(self, session_id, dialogue):
         try:
@@ -59,7 +62,9 @@ class LLMProvider(LLMProviderBase):
                                     conversation_id  # 更新映射
                                 )
                             # 过滤 message_replace 事件，此事件会全量推一次
-                            if event.get("event") != "message_replace" and event.get("answer"):
+                            if event.get("event") != "message_replace" and event.get(
+                                "answer"
+                            ):
                                 yield event["answer"]
                 elif self.mode == "workflows/run":
                     for line in r.iter_lines():
@@ -75,9 +80,31 @@ class LLMProvider(LLMProviderBase):
                         if line.startswith(b"data: "):
                             event = json.loads(line[6:])
                             # 过滤 message_replace 事件，此事件会全量推一次
-                            if event.get("event") != "message_replace" and event.get("answer"):
+                            if event.get("event") != "message_replace" and event.get(
+                                "answer"
+                            ):
                                 yield event["answer"]
 
         except Exception as e:
             logger.bind(tag=TAG).error(f"Error in response generation: {e}")
             yield "【服务响应异常】"
+
+    def response_with_functions(self, session_id, dialogue, functions=None):
+        if len(dialogue) == 2 and functions is not None and len(functions) > 0:
+            # 第一次调用llm， 取最后一条用户消息，附加tool提示词
+            last_msg = dialogue[-1]["content"]
+            function_str = json.dumps(functions, ensure_ascii=False)
+            modify_msg = get_system_prompt_for_function(function_str) + last_msg
+            dialogue[-1]["content"] = modify_msg
+
+        # 如果最后一个是 role="tool"，附加到user上
+        if len(dialogue) > 1 and dialogue[-1]["role"] == "tool":
+            assistant_msg = "\ntool call result: " + dialogue[-1]["content"] + "\n\n"
+            while len(dialogue) > 1:
+                if dialogue[-1]["role"] == "user":
+                    dialogue[-1]["content"] = assistant_msg + dialogue[-1]["content"]
+                    break
+                dialogue.pop()
+
+        for token in self.response(session_id, dialogue):
+            yield token, None

main/xiaozhi-server/core/providers/llm/fastgpt/fastgpt.py

@@ -2,6 +2,7 @@ import json
 from config.logger import setup_logging
 import requests
 from core.providers.llm.base import LLMProviderBase
+from core.utils.util import check_model_key
 
 TAG = __name__
 logger = setup_logging()
@@ -13,6 +14,7 @@ class LLMProvider(LLMProviderBase):
         self.base_url = config.get("base_url")
         self.detail = config.get("detail", False)
         self.variables = config.get("variables", {})
+        check_model_key("FastGPTLLM", self.api_key)
 
     def response(self, session_id, dialogue):
         try:
@@ -21,37 +23,36 @@ class LLMProvider(LLMProviderBase):
 
             # 发起流式请求
             with requests.post(
-                    f"{self.base_url}/chat/completions",
+                f"{self.base_url}/chat/completions",
-                    headers={"Authorization": f"Bearer {self.api_key}"},
+                headers={"Authorization": f"Bearer {self.api_key}"},
-                    json={
+                json={
-                        "stream": True,
+                    "stream": True,
-                        "chatId": session_id,
+                    "chatId": session_id,
-                        "detail": self.detail,
+                    "detail": self.detail,
-                        "variables": self.variables,
+                    "variables": self.variables,
-                        "messages": [
+                    "messages": [{"role": "user", "content": last_msg["content"]}],
-                            {
+                },
-                                "role": "user",
+                stream=True,
-                                "content": last_msg["content"]
-                            }
-                        ]
-                    },
-                    stream=True
             ) as r:
                 for line in r.iter_lines():
                     if line:
                         try:
-                            if line.startswith(b'data: '):
+                            if line.startswith(b"data: "):
-                                if line[6:].decode('utf-8') == '[DONE]':
+                                if line[6:].decode("utf-8") == "[DONE]":
                                     break
 
                                 data = json.loads(line[6:])
-                                if 'choices' in data and len(data['choices']) > 0:
+                                if "choices" in data and len(data["choices"]) > 0:
-                                    delta = data['choices'][0].get('delta', {})
+                                    delta = data["choices"][0].get("delta", {})
-                                    if delta and 'content' in delta and delta['content'] is not None:
+                                    if (
-                                        content = delta['content']
+                                        delta
-                                        if '<think>' in content:
+                                        and "content" in delta
+                                        and delta["content"] is not None
+                                    ):
+                                        content = delta["content"]
+                                        if "<think>" in content:
                                             continue
-                                        if '</think>' in content:
+                                        if "</think>" in content:
                                             continue
                                         yield content
 
@@ -62,4 +63,8 @@ class LLMProvider(LLMProviderBase):
 
         except Exception as e:
             logger.bind(tag=TAG).error(f"Error in response generation: {e}")
-            yield "【服务响应异常】"
+            yield "【服务响应异常】"
+
+    def response_with_functions(self, session_id, dialogue, functions=None):
+        logger.bind(tag=TAG).info(f"fastgpt暂未实现完整的工具调用（function call）")
+        return self.response(session_id, dialogue)

main/xiaozhi-server/core/providers/llm/gemini/gemini.py

@@ -134,3 +134,7 @@ class LLMProvider(LLMProviderBase):
             yield f"JSON解码错误：{e}"
         except Exception as e:
             yield f"发生错误：{e}"
+
+    def response_with_functions(self, session_id, dialogue, functions=None):
+        logger.bind(tag=TAG).info(f"gemini暂未实现完整的工具调用（function call）")
+        return self.response(session_id, dialogue)

main/xiaozhi-server/core/providers/llm/ollama/ollama.py

@@ -63,4 +63,4 @@ class LLMProvider(LLMProviderBase):
 
         except Exception as e:
             logger.bind(tag=TAG).error(f"Error in Ollama function call: {e}")
-            yield {"type": "content", "content": f"【Ollama服务响应异常: {str(e)}】"}
+            yield f"【Ollama服务响应异常: {str(e)}】", None

main/xiaozhi-server/core/providers/llm/openai/openai.py

@@ -1,4 +1,5 @@
 import openai
+from openai.types import CompletionUsage
 from config.logger import setup_logging
 from core.utils.util import check_model_key
 from core.providers.llm.base import LLMProviderBase
@@ -70,8 +71,18 @@ class LLMProvider(LLMProviderBase):
             )
 
             for chunk in stream:
-                yield chunk.choices[0].delta.content, chunk.choices[0].delta.tool_calls
+                # 检查是否存在有效的choice且content不为空
+                if getattr(chunk, "choices", None):
+                    yield chunk.choices[0].delta.content, chunk.choices[0].delta.tool_calls
+                # 存在 CompletionUsage 消息时，生成 Token 消耗 log
+                elif isinstance(getattr(chunk, 'usage', None), CompletionUsage):
+                    usage_info = getattr(chunk, 'usage', None)
+                    logger.bind(tag=TAG).info(
+                        f"Token 消耗：输入 {getattr(usage_info, 'prompt_tokens', '未知')}，" 
+                        f"输出 {getattr(usage_info, 'completion_tokens', '未知')}，"
+                        f"共计 {getattr(usage_info, 'total_tokens', '未知')}"
+                    )
 
         except Exception as e:
             logger.bind(tag=TAG).error(f"Error in function call streaming: {e}")
-            yield {"type": "content", "content": f"【OpenAI服务响应异常: {e}】"}
+            yield f"【OpenAI服务响应异常: {e}】", None

main/xiaozhi-server/core/providers/llm/system_prompt.py

@@ -0,0 +1,103 @@
+def get_system_prompt_for_function(functions: str) -> str:
+    """
+    生成系统提示信息
+    :param functions: 可用的函数列表
+    :return: 系统提示信息
+    """
+
+    SYSTEM_PROMPT = f"""
+====
+
+TOOL USE
+
+You have access to a set of tools that are executed upon the user's approval. You can use one tool per message, and will receive the result of that tool use in the user's response. 
+You use tools step-by-step to accomplish a given task, with each tool use informed by the result of the previous tool use.
+
+# Tool Use Formatting
+
+Tool use is formatted using JSON-style tags. The tool name is enclosed in opening and closing tags, and each parameter is similarly enclosed within its own set of tags. 
+Here's the structure:
+
+<tool_call>
+{{
+    "name": "function name",
+    "arguments": {{
+        "param1": "value1",
+        "param2": "value2",
+        // Add more parameters as needed, if parameters are required, you must provide them
+    }}
+}}
+<tool_call>
+
+For example:
+if you got tool as follow
+
+{{
+    "type": "function",
+    "function": {{
+        "name": "handle_exit_intent",
+        "description": "当用户想结束对话或需要退出系统时调用",
+        "parameters": {{
+            "type": "object",
+            "properties": {{
+                "say_goodbye": {{
+                    "type": "string",
+                    "description": "和用户友好结束对话的告别语",
+                }}
+            }},
+            "required": ["say_goodbye"],
+        }},
+    }},
+}}
+
+you should respond with the following format:
+
+<tool_call>
+{{
+    "name": "handle_exit_intent",
+    "arguments": {{
+        "say_goodbye": "再见，祝您生活愉快！"
+    }}
+}}
+</tool_call>
+
+
+Always adhere to this format for the tool use to ensure proper parsing and execution.
+
+# Tools
+
+{functions}
+
+# Tool Use Guidelines
+
+1. Tools must be called in a separate message, Do not add thoughts when calling tools. The message must start with <tool_call> and end with </tool_call>, with the tool invocation JSON data in between. No additional response content is needed.
+2. Choose the most appropriate tool based on the task and the tool descriptions provided. Assess if you need additional information to proceed, and which of the available tools would be most effective for gathering this information. 
+   For example using the list_files tool is more effective than running a command like \`ls\` in the terminal. It's critical that you think about each available tool and use the one that best fits the current step in the task.
+3. If multiple actions are needed, use one tool at a time per message to accomplish the task iteratively, with each tool use being informed by the result of the previous tool use. Do not assume the outcome of any tool use. 
+   Each step must be informed by the previous step's result.
+4. Formulate your tool use using the JSON format specified for each tool.
+5. After each tool use, the user will respond with the result of that tool use. This result will provide you with the necessary information to continue your task or make further decisions. This response may include:
+- Information about whether the tool succeeded or failed, along with any reasons for failure.
+- Linter errors that may have arisen due to the changes you made, which you'll need to address.
+- New terminal output in reaction to the changes, which you may need to consider or act upon.
+- Any other relevant feedback or information related to the tool use.
+6. ALWAYS wait for user confirmation after each tool use before proceeding. Never assume the success of a tool use without explicit confirmation of the result from the user.
+7. Tool calls should contain no extra information. Only after receiving the tool's response should you integrate it into a complete reply.
+
+It is crucial to proceed step-by-step, waiting for the user's message after each tool use before moving forward with the task. This approach allows you to:
+1. Confirm the success of each step before proceeding.
+2. Address any issues or errors that arise immediately.
+3. Adapt your approach based on new information or unexpected results.
+4. Ensure that each action builds correctly on the previous ones.
+
+By waiting for and carefully considering the user's response after each tool use, you can react accordingly and make informed decisions about how to proceed with the task. This iterative process helps ensure the overall success and accuracy of your work.
+
+====
+
+USER CHAT CONTENT
+
+The following additional message is the user's chat message, and should be followed to the best of your ability without interfering with the TOOL USE guidelines.
+
+"""
+
+    return SYSTEM_PROMPT

main/xiaozhi-server/core/providers/tts/base.py

@@ -26,13 +26,19 @@ class TTSProviderBase(ABC):
             max_repeat_time = 5
             text = MarkdownCleaner.clean_markdown(text)
             while not os.path.exists(tmp_file) and max_repeat_time > 0:
-                asyncio.run(self.text_to_speak(text, tmp_file))
+                try:
+                    asyncio.run(self.text_to_speak(text, tmp_file))
+                except Exception as e:
+                    logger.bind(tag=TAG).error(f"语音生成失败: {text}，错误: {e}")
                 if not os.path.exists(tmp_file):
-                    max_repeat_time = max_repeat_time - 1
+                    max_repeat_time -= 1
-                    logger.bind(tag=TAG).error(f"语音生成失败: {text}:{tmp_file}，再试{max_repeat_time}次")
+                    if max_repeat_time > 0:
+                        logger.bind(tag=TAG).error(f"再试{max_repeat_time}次")
 
             if max_repeat_time > 0:
-                logger.bind(tag=TAG).info(f"语音生成成功: {text}:{tmp_file}，重试{5 - max_repeat_time}次")
+                logger.bind(tag=TAG).info(
+                    f"语音生成成功: {text}:{tmp_file}，重试{5 - max_repeat_time}次"
+                )
 
             return tmp_file
         except Exception as e:
@@ -48,9 +54,11 @@ class TTSProviderBase(ABC):
         # 获取文件后缀名
         file_type = os.path.splitext(audio_file_path)[1]
         if file_type:
-            file_type = file_type.lstrip('.')
+            file_type = file_type.lstrip(".")
         # 读取音频文件，-nostdin 参数：不要从标准输入读取数据，否则FFmpeg会阻塞
-        audio = AudioSegment.from_file(audio_file_path, format=file_type, parameters=["-nostdin"])
+        audio = AudioSegment.from_file(
+            audio_file_path, format=file_type, parameters=["-nostdin"]
+        )
 
         # 转换为单声道/16kHz采样率/16位小端编码（确保与编码器匹配）
         audio = audio.set_channels(1).set_frame_rate(16000).set_sample_width(2)
@@ -72,11 +80,11 @@ class TTSProviderBase(ABC):
         # 按帧处理所有音频数据（包括最后一帧可能补零）
         for i in range(0, len(raw_data), frame_size * 2):  # 16bit=2bytes/sample
             # 获取当前帧的二进制数据
-            chunk = raw_data[i:i + frame_size * 2]
+            chunk = raw_data[i : i + frame_size * 2]
 
             # 如果最后一帧不足，补零
             if len(chunk) < frame_size * 2:
-                chunk += b'\x00' * (frame_size * 2 - len(chunk))
+                chunk += b"\x00" * (frame_size * 2 - len(chunk))
 
             # 转换为numpy数组处理
             np_frame = np.frombuffer(chunk, dtype=np.int16)

main/xiaozhi-server/core/providers/tts/doubao.py

@@ -15,7 +15,10 @@ logger = setup_logging()
 class TTSProvider(TTSProviderBase):
     def __init__(self, config, delete_audio_file):
         super().__init__(config, delete_audio_file)
-        self.appid = config.get("appid")
+        if config.get("appid"):
+            self.appid = int(config.get("appid"))
+        else:
+            self.appid = ""
         self.access_token = config.get("access_token")
         self.cluster = config.get("cluster")
 

main/xiaozhi-server/core/providers/tts/fishspeech.py

@@ -8,7 +8,7 @@ from pydantic import BaseModel, Field, conint, model_validator
 from typing_extensions import Annotated
 from datetime import datetime
 from typing import Literal
-from core.utils.util import check_model_key
+from core.utils.util import check_model_key, parse_string_to_list
 from core.providers.tts.base import TTSProviderBase
 from config.logger import setup_logging
 
@@ -86,8 +86,8 @@ class TTSProvider(TTSProviderBase):
         super().__init__(config, delete_audio_file)
 
         self.reference_id = config.get("reference_id")
-        self.reference_audio = config.get("reference_audio", [])
+        self.reference_audio = parse_string_to_list(config.get("reference_audio"))
-        self.reference_text = config.get("reference_text", [])
+        self.reference_text = parse_string_to_list(config.get("reference_text"))
         self.format = config.get("format", "wav")
         self.channels = int(config.get("channels", 1))
         self.rate = int(config.get("rate", 44100))
@@ -101,9 +101,13 @@ class TTSProvider(TTSProviderBase):
         self.top_p = float(config.get("top_p", 0.7))
         self.repetition_penalty = float(config.get("repetition_penalty", 1.2))
         self.temperature = float(config.get("temperature", 0.7))
-        self.streaming = bool(config.get("streaming", False))
+        self.streaming = str(config.get("streaming", False)).lower() in (
+            "true",
+            "1",
+            "yes",
+        )
         self.use_memory_cache = config.get("use_memory_cache", "on")
-        self.seed = config.get("seed")
+        self.seed = config.get("seed") or None
         self.api_url = config.get("api_url", "http://127.0.0.1:8080/v1/tts")
 
     def generate_filename(self, extension=".wav"):