fix:智能体音色未随manager生效bug

* fix:连接manager后无法使用functioncallbug

* fix:意图识别使用llm无法播放音乐bug

* fix：manager第一图识别使用独立llm无法初始化llm的bug

* fix:智能体音色未随manager生效bug

* update:添加edgeTTS音色

.github/workflows/docker-image.yml

@@ -4,6 +4,7 @@ on:
   push:
     tags:
       - 'v*.*.*'  # 只在以 v 开头的标签推送时触发，例如 v1.0.0
+  workflow_dispatch:
 
 jobs:
   release:
@@ -41,7 +42,13 @@ jobs:
       - name: Extract version from tag
         id: get_version
         run: |
-          echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+          if [[ "$GITHUB_REF" =~ ^refs/tags/v([0-9]+\.[0-9]+\.[0-9]+)$ ]]; then
+            echo "VERSION=${BASH_REMATCH[1]}" >> $GITHUB_ENV
+            echo "IS_VERSION=true" >> $GITHUB_ENV
+          else
+            echo "VERSION=latest" >> $GITHUB_ENV
+            echo "IS_VERSION=false" >> $GITHUB_ENV
+          fi
 
       # 构建 xiaozhi-server 镜像
       - name: Build and push xiaozhi-server
@@ -51,8 +58,7 @@ jobs:
           file: Dockerfile-server
           push: true
           tags: |
-            ghcr.io/${{ github.repository }}:server_${{ env.VERSION }}
-            ghcr.io/${{ github.repository }}:server_latest
+            ${{ env.IS_VERSION == 'true' && format('ghcr.io/{0}:server_{1},ghcr.io/{0}:server_latest', github.repository, env.VERSION) || format('ghcr.io/{0}:server_latest', github.repository) }}
           platforms: linux/amd64,linux/arm64
 
       # 构建 manager-api 镜像
@@ -63,6 +69,5 @@ jobs:
           file: Dockerfile-web
           push: true
           tags: |
-            ghcr.io/${{ github.repository }}:web_${{ env.VERSION }}
-            ghcr.io/${{ github.repository }}:web_latest
+            ${{ env.IS_VERSION == 'true' && format('ghcr.io/{0}:web_{1},ghcr.io/{0}:web_latest', github.repository, env.VERSION) || format('ghcr.io/{0}:web_latest', github.repository) }}
           platforms: linux/amd64,linux/arm64

README.md

@@ -11,10 +11,10 @@
 </p>
 
 <p align="center">
-<a href="./README_en.md">English</a>
+<a href="./README.md">English</a>
 · 简体中文
 · <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/releases">更新日志</a>
-· <a href="./docs/Deployment.md">部署文档</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>
 </p>
 <p align="center">
@@ -126,12 +126,6 @@
 
 ---
 
-## 系统要求与部署前提 🖥️
-
-建议 4 核 CPU、8G 内存的电脑。如果开启ASR也使用API，可运行在2核CPU、2G内存的服务器中。[请参考部署架构图](./docs/images/deploy.png)
-
----
-
 ## 警告 ⚠️
 
 1、本项目为开源软件，本软件与对接的任何第三方API服务商（包括但不限于语音识别、大模型、语音合成等平台）均不存在商业合作关系，不为其服务质量及资金安全提供任何形式的担保。
@@ -155,29 +149,37 @@ server:
 
 [![Banners](docs/images/banner2.png)](./docs/Deployment.md)
 
-### 一、[部署文档](./docs/Deployment.md)
+### 部署文档
 
-本项目支持以下三种部署方式，您可根据实际需求选择。
+本项目支持`最简化`安装和`全模块`安装。请根据具体需求选择安装方式。
 
-1. [Docker 快速部署](./docs/Deployment.md)
+`最简化`适合在较低资源配置中运行，无需数据库。[请参考-最简化安装架构图](./docs/images/deploy1.png)
 
-适合快速体验的普通用户，不需过多环境配置。缺点是，拉取镜像有点慢。视频教程可参考[美女大佬教你Docker部署](https://www.bilibili.com/video/BV1RNQnYDE5t)
+`全模块`适合想体验完整功能，过程复杂。[请参考-全模块安装架构图](./docs/images/deploy2.png)
 
-2. [借助 Docker 环境运行部署](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%BA%8C%E5%80%9F%E5%8A%A9docker%E7%8E%AF%E5%A2%83%E8%BF%90%E8%A1%8C%E9%83%A8%E7%BD%B2)
+#### 1、 最简化安装
 
-适用于已安装 Docker 且希望对代码进行自定义修改的软件工程师。
+`最简化`安装包含：智能对话、IOT等功能，数据存储在`配置文件`。我们提供了两种安装教程，如果你决定使用最简化安装，可选择`Docker只运行Server`或`本地源码只运行Server`任意一种方式。
 
-3. [本地源码运行](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%B8%89%E6%9C%AC%E5%9C%B0%E6%BA%90%E7%A0%81%E8%BF%90%E8%A1%8C)
+##### 1.1. Docker只运行Server
 
-适合熟悉`Conda` 环境或希望从零搭建运行环境的用户。
+你可以使用编译好的docker镜像安装，[点击Docker只运行Server](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%B8%80docker%E5%8F%AA%E8%BF%90%E8%A1%8Cserver)。优点：减少环境配置的烦恼；缺点：版本可能有点旧，镜像文件较大。
 
-对于对响应速度要求较高的场景，推荐使用本地源码运行方式以降低额外开销。视频教程可参考[帅哥大佬教你源码部署](https://www.bilibili.com/video/BV1GvQWYZEd2)
+##### 2.2. 本地源码只运行Server
 
-### 二、[固件编译](./docs/firmware-build.md)
+你可以以本地源码的方式运行，[点击本地源码只运行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)。优点：可以随时更新最新代码；缺点：安装Conda环境较为复杂。
 
-点这里查看[固件编译](./docs/firmware-build.md)的详细过程。
+#### 2、 全模块安装
 
-烧录成功且联网成功后，通过唤醒词唤醒小智，留意server端输出的控制台信息。
+`全模块`安装包含：智能对话、IOT、OTA、智控台，数据存储在`数据库`中。我们提供了两种安装教程，如果你决定使用全模块安装，可选择`Docker运行全模块`或`本地源码运行全模块`任意一种方式。
+
+##### 2.1. Docker运行全模块
+
+你可以使用编译好的docker镜像安装，[点击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)。优点：减少环境配置的烦恼；缺点：版本可能有点旧，镜像文件较大。
+
+##### 2.2. 本地源码运行全模块
+
+你可以以本地源码的方式运行，[点击本地源码运行全模块](./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)。优点：可以随时更新最新代码；缺点：安装Java、Node.js、Conda环境较为复杂。
 
 ---
 
@@ -220,11 +222,13 @@ server:
   支持超长记忆、本地总结记忆、无记忆三种模式，满足不同场景需求。
 - **IOT功能**  
   支持管理注册设备IOT功能，支持基于对话上下文语境下的智能物联网控制。
+- **智控台**
+  提供Web管理界面，支持智能体管理、用户管理、系统配置等功能，方便管理员和用户进行管理。
+
 
 ### 正在开发 🚧
 
 - 多种心情模式
-- 智控台webui
 
 想了解具体开发进度，[请点击这里](https://github.com/users/xinnan-tech/projects/3)
 

README_en.md

@@ -1,302 +0,0 @@
-[![Banners](docs/images/banner1.png)](https://github.com/xinnan-tech/xiaozhi-esp32-server)
-
-<center>
-<h1>Xiaozhi Backend Server xiaozhi-esp32-server</h1>
-</center>
-
-<p align="center">
-This project provides backend services for the open-source smart hardware project
-<a href="https://github.com/78/xiaozhi-esp32">xiaozhi-esp32</a><br/>
-Implemented in Python according to the <a href="https://ccnphfhqs21z.feishu.cn/wiki/M0XiwldO9iJwHikpXD5cEx71nKh">Xiaozhi Communication Protocol</a><br/>
-Helping you quickly set up your Xiaozhi server
-</p>
-
-<p align="center">
-<a href="./README.md">简体中文</a>
-· English
-· <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/releases">Changelog</a>
-· <a href="./docs/Deployment.md">Deployment Guide</a>
-· <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/issues">Report Issues</a>
-</p>
-<p align="center">
-  <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/releases">
-    <img alt="GitHub Contributors" src="https://img.shields.io/github/v/release/xinnan-tech/xiaozhi-esp32-server?logo=docker" />
-  </a>
-  <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/graphs/contributors">
-    <img alt="GitHub Contributors" src="https://img.shields.io/github/contributors/xinnan-tech/xiaozhi-esp32-server?logo=github" />
-  </a>
-  <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/issues">
-    <img alt="Issues" src="https://img.shields.io/github/issues/xinnan-tech/xiaozhi-esp32-server?color=0088ff" />
-  </a>
-  <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/pulls">
-    <img alt="GitHub pull requests" src="https://img.shields.io/github/issues-pr/xinnan-tech/xiaozhi-esp32-server?color=0088ff" />
-  </a>
-  <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/pulls">
-    <img alt="GitHub pull requests" src="https://img.shields.io/badge/license-MIT-white?labelColor=black" />
-  </a>
-  <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server">
-    <img alt="GitHub pull requests" src="https://img.shields.io/github/stars/xinnan-tech/xiaozhi-esp32-server?color=ffcb47&labelColor=black" />
-  </a>
-</p>
-
----
-
-## Target Users 👥
-
-This project requires ESP32 hardware devices. If you have purchased ESP32-related hardware, successfully connected to Brother Xia's backend service, and wish to set up your own `xiaozhi-esp32` backend service, then this project is perfect for you.
-
-Want to see it in action? Check out these videos 🎥
-
-<table>
-  <tr>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1FMFyejExX" target="_blank">
-         <picture>
-           <img alt="Xiaozhi esp32 connecting to your own backend model" src="docs/images/demo1.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1CDKWemEU6" target="_blank">
-         <picture>
-           <img alt="Custom voice" src="docs/images/demo2.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV12yA2egEaC" target="_blank">
-         <picture>
-           <img alt="Communicating in Cantonese" src="docs/images/demo3.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1pNXWYGEx1" target="_blank">
-         <picture>
-           <img alt="Control home appliances" src="docs/images/demo5.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1kgA2eYEQ9" target="_blank">
-         <picture>
-           <img alt="Lowest cost configuration" src="docs/images/demo4.png" />
-         </picture>
-        </a>
-    </td>
-  </tr>
-  <tr>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1Vy96YCE3R" target="_blank">
-         <picture>
-           <img alt="Custom voice" src="docs/images/demo6.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1VC96Y5EMH" target="_blank">
-         <picture>
-           <img alt="Play music" src="docs/images/demo7.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV1Z8XuYZEAS" target="_blank">
-         <picture>
-           <img alt="Weather plugin" src="docs/images/demo8.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV178XuYfEpi" target="_blank">
-         <picture>
-           <img alt="IOT command control device" src="docs/images/demo9.png" />
-         </picture>
-        </a>
-    </td>
-    <td>
-        <a href="https://www.bilibili.com/video/BV17LXWYvENb" target="_blank">
-         <picture>
-           <img alt="News broadcast" src="docs/images/demo0.png" />
-         </picture>
-        </a>
-    </td>
-  </tr>
-</table>
-
----
-
-## System Requirements and Prerequisites 🖥️
-
-- **Computer or Server**: Recommended 4-core CPU, 8GB RAM computer. If using ASR with API, can run on a 2-core CPU, 2GB RAM server.
-- **Update Client Interface**: Please update the backend service interface address in the client.
-
----
-
-## Warning ⚠️
-
-1. This is open-source software. This software and any third-party API service providers it interfaces with (including but not limited to speech recognition, large language models, speech synthesis, and other platforms) have no commercial partnership. We do not provide any form of guarantee for their service quality or financial security.
-We recommend users prioritize service providers with relevant business licenses and carefully read their service agreements and privacy policies. This software does not host any account keys, does not participate in fund transfers, and does not bear the risk of recharge fund losses.
-
-2. This project is relatively new and has not yet passed network security testing. Please do not use it in production environments. If you deploy this project for learning purposes in a public network environment, please make sure to enable protection in the `config.yaml` configuration file:
-
-```yaml
-server:
-  auth:
-    # Enable protection
-    enabled: true  
-```
-
-After enabling protection, you need to verify the machine's token or MAC address according to actual circumstances. Please refer to the configuration documentation for details.
-
----
-
-## Deployment Methods 🚀
-
-### I. [Deployment Guide](./docs/Deployment.md)
-
-This project supports three deployment methods. You can choose based on your actual needs.
-
-1. [Quick Docker Deployment](./docs/Deployment.md)
-
-Suitable for regular users who want to quickly experience without much environment configuration. The downside is that pulling the image can be slow. Video tutorial available: [Beautiful expert teaches Docker deployment](https://www.bilibili.com/video/BV1RNQnYDE5t)
-
-2. [Deploy Using Docker Environment](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%BA%8C%E5%80%9F%E5%8A%A9docker%E7%8E%AF%E5%A2%83%E8%BF%90%E8%A1%8C%E9%83%A8%E7%BD%B2)
-
-For software engineers who have Docker installed and want to make custom code modifications.
-
-3. [Local Source Code Run](./docs/Deployment.md#%E6%96%B9%E5%BC%8F%E4%B8%89%E6%9C%AC%E5%9C%B0%E6%BA%90%E7%A0%81%E8%BF%90%E8%A1%8C)
-
-Suitable for users familiar with `Conda` environment or who want to build the running environment from scratch.
-
-For scenarios requiring higher response speed, we recommend using the local source code run method to reduce additional overhead. Video tutorial available: [Handsome expert teaches source code deployment](https://www.bilibili.com/video/BV1GvQWYZEd2)
-
-### II. [Firmware Compilation](./docs/firmware-build.md)
-
-Click here to view the detailed process of [firmware compilation](./docs/firmware-build.md).
-
-After successful flashing and network connection, wake up Xiaozhi using the wake word and pay attention to the console output on the server side.
-
----
-
-## Common Questions ❓
-
-For issues or product suggestions, please [click here](docs/FAQ.md).
-
----
-
-## Product Ecosystem 👬
-Xiaozhi is an ecosystem. When using this product, you might want to check out other excellent projects in this ecosystem:
-
-- [Xiaozhi Android Client](https://github.com/TOM88812/xiaozhi-android-client)
-  A voice dialogue application based on xiaozhi-server for Android and iOS, supporting real-time voice interaction and text dialogue. Now in Flutter version, supporting both iOS and Android.
-- [Xiaozhi PC Client](https://github.com/Huang-junsen/py-xiaozhi)
-  This project provides a Python-based Xiaobai AI client, allowing you to experience Xiaozhi AI features through code even without physical hardware. Main features include AI voice interaction, visual multimodal recognition, IoT device integration, online music playback, voice wake-up, automatic dialogue mode, graphical interface, command-line mode, cross-platform support, volume control, session management, encrypted audio transmission, automatic verification code processing, etc.
-- [Xiaozhi Java Server](https://github.com/joey-zhou/xiaozhi-esp32-server-java) 
-
-  The Xiaozhi open-source backend service Java version is a Java-based open-source project that includes both frontend and backend services, aiming to provide users with a complete backend service solution.
----
-## Feature List ✨
-
-### Implemented ✅
-
-- **Communication Protocol**  
-  Based on `xiaozhi-esp32` protocol, implementing data interaction through WebSocket.
-- **Dialogue Interaction**  
-  Supports wake-up dialogue, manual dialogue, and real-time interruption. Automatically sleeps after long periods without dialogue
-- **Intent Recognition**  
-  Supports LLM intent recognition and function call, reducing hard-coded intent judgment
-- **Multi-language Recognition**  
-  Supports Mandarin, Cantonese, English, Japanese, Korean (default using FunASR).
-- **LLM Module**  
-  Supports flexible switching of LLM modules, default using ChatGLMLLM, can also use Alibaba Bailian, DeepSeek, Ollama, and other interfaces.
-- **TTS Module**  
-  Supports EdgeTTS (default), Volcano Engine Doubao TTS, and other TTS interfaces to meet speech synthesis needs.
-- **Memory Function**  
-  Supports ultra-long memory, local summary memory, and no memory modes to meet different scenario needs.
-- **IOT Function**  
-  Supports managing registered device IOT functions, supporting intelligent IoT control based on dialogue context.
-
-### Under Development 🚧
-
-- Multiple mood modes
-- Smart control panel webui
-
-To learn about specific development progress, [click here](https://github.com/users/xinnan-tech/projects/3)
-
-If you are a software developer, here's an [Open Letter to Developers](docs/contributor_open_letter.md), welcome to join!
-
----
-
-## Supported Platforms/Components List 📋
-
-### LLM Language Models
-
-| Usage Method | Supported Platforms | Free Platforms |
-|:---:|:---:|:---:|
-| openai interface call | Alibaba Bailian, Volcano Engine Doubao, DeepSeek, Zhipu ChatGLM, Gemini | Zhipu ChatGLM, Gemini |
-| ollama interface call | Ollama | - |
-| dify interface call | Dify | - |
-| fastgpt interface call | Fastgpt | - |
-| coze interface call | Coze | - |
-
-In fact, any LLM supporting openai interface calls can be integrated.
-
----
-
-### TTS Speech Synthesis
-
-| Usage Method | Supported Platforms | Free Platforms |
-|:---:|:---:|:---:|
-| Interface Call | EdgeTTS, Volcano Engine Doubao TTS, Tencent Cloud, Alibaba Cloud TTS, CosyVoiceSiliconflow, TTS302AI, CozeCnTTS, GizwitsTTS, ACGNTTS, OpenAITTS | EdgeTTS, CosyVoiceSiliconflow(partial) |
-| Local Service | FishSpeech, GPT_SOVITS_V2, GPT_SOVITS_V3, MinimaxTTS | FishSpeech, GPT_SOVITS_V2, GPT_SOVITS_V3, MinimaxTTS |
-
----
-
-### VAD Voice Activity Detection
-
-| Type | Platform Name | Usage Method | Pricing Model | Notes |
-|:---:|:---------:|:----:|:----:|:--:|
-| VAD | SileroVAD | Local Use | Free | |
-
----
-
-### ASR Speech Recognition
-
-| Usage Method | Supported Platforms | Free Platforms |
-|:---:|:---:|:---:|
-| Local Use | FunASR, SherpaASR | FunASR, SherpaASR |
-| Interface Call | DoubaoASR | - |
-
----
-
-### Memory Storage
-
-| Type | Platform Name | Usage Method | Pricing Model | Notes |
-|:------:|:---------------:|:----:|:---------:|:--:|
-| Memory | mem0ai | Interface Call | 1000 times/month quota | |
-| Memory | mem_local_short | Local Summary | Free | |
-
----
-
-### Intent Recognition
-
-| Type | Platform Name | Usage Method | Pricing Model | Notes |
-|:------:|:-------------:|:----:|:-------:|:---------------------:|
-| Intent | intent_llm | Interface Call | Based on LLM pricing | Intent recognition through large models, highly generalizable |
-| Intent | function_call | Interface Call | Based on LLM pricing | Intent completion through large model function calls, fast and effective |
-
----
-
-## Acknowledgments 🙏
-
-- This project was inspired by [Bailing Voice Dialogue Robot](https://github.com/wwbin2017/bailing) and implemented based on it.
-- Thanks to [Tenclass](https://www.tenclass.com/) for providing detailed documentation support for the Xiaozhi communication protocol.
-
-<a href="https://star-history.com/#xinnan-tech/xiaozhi-esp32-server&Date">
- <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=xinnan-tech/xiaozhi-esp32-server&type=Date&theme=dark" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=xinnan-tech/xiaozhi-esp32-server&type=Date" />
-   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=xinnan-tech/xiaozhi-esp32-server&type=Date" />
- </picture>
-</a> 

docs/Deployment.md

@@ -1,6 +1,6 @@
-# 部署方案参考
-![图片](images/deploy.png)
-# 方式一：docker快速部署
+# 部署架构图
+![请参考-最简化架构图](../docs/images/deploy1.png)
+# 方式一：Docker只运行Server
 
 docker镜像已支持x86架构、arm64架构的CPU，支持在国产操作系统上运行。
 
@@ -40,7 +40,7 @@ chmod +x docker-setup.sh
 >
 > 执行完成后，请按照提示配置 API 密钥。
 
-当你一切顺利完成以上操作后，继续操作[配置项目文件](#3-配置项目文件)
+当你一切顺利完成以上操作后，继续操作[配置项目文件](#2-配置项目文件)
 
 ### 1.2 手动部署
 
@@ -102,14 +102,14 @@ xiaozhi-server
 
 如果你的文件目录结构也是上面的，就继续往下。如果不是，你就再仔细看看是不是漏操作了什么。
 
-## 3. 配置项目文件
+## 2. 配置项目文件
 
 接下里，程序还不能直接运行，你需要配置一下，你到底使用的是什么模型。你可以看这个教程：
 [跳转到配置项目文件](#配置项目)
 
 配置完项目文件后，回到本教程继续往下。
 
-## 4. 执行docker命令
+## 3. 执行docker命令
 
 打开命令行工具，使用`终端`或`命令行`工具 进入到你的`xiaozhi-server`，执行以下命令
 
@@ -142,45 +142,7 @@ docker rmi ghcr.nju.edu.cn/xinnan-tech/xiaozhi-esp32-server:server_latest
 
 5.3、重新按docker方式部署
 
-# 方式二：借助Docker环境运行部署
-
-开发人员如果不想安装`conda`环境，可以使用这种方法管理好依赖。
-
-## 1.克隆项目
-
-## 2.[跳转到下载语音识别模型文件](#模型文件)
-
-## 3.[跳转到配置项目文件](#配置项目)
-
-## 4.运行docker
-
-修改完配置后，打开命令行工具，`cd`进入到你的`main/xiaozhi-server`下，执行以下命令
-
-```sh
-docker run -it --name xiaozhi-env --restart always --security-opt seccomp:unconfined \
-  -p 8000:8000 \
-  -p 8002:8002 \
-  -v ./:/app \
-  kalicyh/python:xiaozhi
-```
-
-然后就和正常开发一样了
-
-## 5.安装依赖
-
-在刚刚的打开的终端运行
-
-```sh
-pip install -r requirements.txt
-```
-
-## 6.运行项目
-
-```sh
-python app.py
-```
-
-# 方式三：本地源码运行
+# 方式二：本地源码只运行Server
 
 ## 1.安装基础环境
 
@@ -330,14 +292,16 @@ LLM:
 
 以下是一些常见问题，供参考：
 
-[1、为什么我说的话，小智识别出来很多韩文、日文、英文](./FAQ.md#1%E4%B8%BA%E4%BB%80%E4%B9%88%E6%88%91%E8%AF%B4%E7%9A%84%E8%AF%9D%E5%B0%8F%E6%99%BA%E8%AF%86%E5%88%AB%E5%87%BA%E6%9D%A5%E5%BE%88%E5%A4%9A%E9%9F%A9%E6%96%87%E6%97%A5%E6%96%87%E8%8B%B1%E6%96%87)
+[1、为什么我说的话，小智识别出来很多韩文、日文、英文](./FAQ.md)
 
-[2、为什么会出现“TTS 任务出错 文件不存在”？](./FAQ.md#1%E4%B8%BA%E4%BB%80%E4%B9%88%E6%88%91%E8%AF%B4%E7%9A%84%E8%AF%9D%E5%B0%8F%E6%99%BA%E8%AF%86%E5%88%AB%E5%87%BA%E6%9D%A5%E5%BE%88%E5%A4%9A%E9%9F%A9%E6%96%87%E6%97%A5%E6%96%87%E8%8B%B1%E6%96%87)
+[2、为什么会出现“TTS 任务出错 文件不存在”？](./FAQ.md)
 
-[3、TTS 经常失败，经常超时](./FAQ.md#1%E4%B8%BA%E4%BB%80%E4%B9%88%E6%88%91%E8%AF%B4%E7%9A%84%E8%AF%9D%E5%B0%8F%E6%99%BA%E8%AF%86%E5%88%AB%E5%87%BA%E6%9D%A5%E5%BE%88%E5%A4%9A%E9%9F%A9%E6%96%87%E6%97%A5%E6%96%87%E8%8B%B1%E6%96%87)
+[3、TTS 经常失败，经常超时](./FAQ.md)
 
-[4、如何提高小智对话响应速度？](./FAQ.md#1%E4%B8%BA%E4%BB%80%E4%B9%88%E6%88%91%E8%AF%B4%E7%9A%84%E8%AF%9D%E5%B0%8F%E6%99%BA%E8%AF%86%E5%88%AB%E5%87%BA%E6%9D%A5%E5%BE%88%E5%A4%9A%E9%9F%A9%E6%96%87%E6%97%A5%E6%96%87%E8%8B%B1%E6%96%87)
+[4、使用Wifi能连接自建服务器，但是4G模式却接不上](./FAQ.md)
 
-[5、我说话很慢，停顿时小智老是抢话](./FAQ.md#1%E4%B8%BA%E4%BB%80%E4%B9%88%E6%88%91%E8%AF%B4%E7%9A%84%E8%AF%9D%E5%B0%8F%E6%99%BA%E8%AF%86%E5%88%AB%E5%87%BA%E6%9D%A5%E5%BE%88%E5%A4%9A%E9%9F%A9%E6%96%87%E6%97%A5%E6%96%87%E8%8B%B1%E6%96%87)
+[5、如何提高小智对话响应速度？](./FAQ.md)
 
-[6、我想通过小智控制电灯、空调、远程开关机等操作](./FAQ.md#1%E4%B8%BA%E4%BB%80%E4%B9%88%E6%88%91%E8%AF%B4%E7%9A%84%E8%AF%9D%E5%B0%8F%E6%99%BA%E8%AF%86%E5%88%AB%E5%87%BA%E6%9D%A5%E5%BE%88%E5%A4%9A%E9%9F%A9%E6%96%87%E6%97%A5%E6%96%87%E8%8B%B1%E6%96%87)
+[6、我说话很慢，停顿时小智老是抢话](./FAQ.md)
+
+[7、我想通过小智控制电灯、空调、远程开关机等操作](./FAQ.md)

docs/Deployment_all.md

@@ -0,0 +1,455 @@
+# 部署架构图
+![请参考-全模块安装架构图](../docs/images/deploy2.png)
+# 方式一：Docker运行全模块
+docker镜像已支持x86架构、arm64架构的CPU，支持在国产操作系统上运行。
+
+## 1. 安装docker
+
+如果您的电脑还没安装docker，可以按照这里的教程安装：[docker安装](https://www.runoob.com/docker/ubuntu-docker-install.html)
+
+#### 1.1 创建目录
+
+安装完后，你需要为这个项目找一个安放配置文件的目录，例如我们可以新建一个文件夹叫`xiaozhi-server`。
+
+创建好目录后，你需要在`xiaozhi-server`下面创建`data`文件夹和`models`文件夹，`models`下面还要再创建`SenseVoiceSmall`文件夹。
+
+最终目录结构如下所示：
+
+```
+xiaozhi-server
+  ├─ data
+  ├─ models
+     ├─ SenseVoiceSmall
+```
+
+#### 1.2 下载语音识别模型文件
+
+本项目语音识别模型，默认使用`SenseVoiceSmall`模型，进行语音转文字。因为模型较大，需要独立下载，下载后把`model.pt`
+文件放在`models/SenseVoiceSmall`
+目录下。下面两个下载路线任选一个。
+
+- 线路一：阿里魔塔下载[SenseVoiceSmall](https://modelscope.cn/models/iic/SenseVoiceSmall/resolve/master/model.pt)
+- 线路二：百度网盘下载[SenseVoiceSmall](https://pan.baidu.com/share/init?surl=QlgM58FHhYv1tFnUT_A8Sg&pwd=qvna) 提取码:
+  `qvna`
+
+
+#### 1.3 下载配置文件
+
+你需要下载两个配置文件：`docker-compose_all.yaml` 和 `config_from_api.yaml`。需要从项目仓库下载这两个文件。
+
+##### 1.3.1 下载 docker-compose_all.yaml
+
+用浏览器打开[这个链接](../main/xiaozhi-server/docker-compose_all.yml)。
+
+在页面的右侧找到名称为`RAW`按钮，在`RAW`按钮的旁边，找到下载的图标，点击下载按钮，下载`docker-compose_all.yml`文件。 把文件下载到你的
+`xiaozhi-server`中。
+
+下载完后，回到本教程继续往下。
+
+##### 1.3.2 下载 config_from_api.yaml
+
+用浏览器打开[这个链接](../main/xiaozhi-server/config_from_api.yaml)。
+
+在页面的右侧找到名称为`RAW`按钮，在`RAW`按钮的旁边，找到下载的图标，点击下载按钮，下载`config_from_api.yaml`文件。 把文件下载到你的
+`xiaozhi-server`下面的`data`文件夹中，然后把`config_from_api.yaml`文件重命名为`.config.yaml`。
+
+下载完配置文件后，我们确认一下整个`xiaozhi-server`里面的文件如下所示：
+
+```
+xiaozhi-server
+  ├─ docker-compose_all.yml
+  ├─ data
+    ├─ .config.yaml
+  ├─ models
+     ├─ SenseVoiceSmall
+       ├─ model.pt
+```
+
+如果你的文件目录结构也是上面的，就继续往下。如果不是，你就再仔细看看是不是漏操作了什么。
+
+## 2. 安装Mysql和Redis
+
+### 2.1 安装Mysql数据库
+如果本机已经安装了MySQL，可以直接在数据库中创建名为`xiaozhi_esp32_server`的数据库。
+
+```sql
+CREATE DATABASE xiaozhi_esp32_server CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+```
+
+如果还没有MySQL，你可以通过docker安装mysql
+
+```
+docker run --name xiaozhi-esp32-server-db -e MYSQL_ROOT_PASSWORD=123456 -p 3306:3306 -e MYSQL_DATABASE=xiaozhi_esp32_server -e MYSQL_INITDB_ARGS="--character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci" -d mysql:latest
+```
+
+### 2.2 安装Redis
+
+如果还没有Redis，你可以通过docker安装redis
+
+```
+docker run --name xiaozhi-esp32-server-redis -d -p 6379:6379 redis
+```
+
+## 3. 配置docker-compose_all.yml文件文件
+
+在`xiaozhi-server`目录，打开docker-compose_all.yml，
+
+1、修改`SPRING_DATASOURCE_DRUID_URL`里，把`192.168.1.25`修改成部署mysql的电脑局域网ip，如果是你本地，你要查看一下你本机的局域网ip是什么
+
+2、修改`SPRING_DATA_REDIS_HOST`里，把`192.168.1.25`修改成部署redis的电脑局域网ip，如果是你本地，你要查看一下你本机的局域网ip是什么
+
+3、确认一下mysql的用户名`SPRING_DATASOURCE_DRUID_USERNAME`和密码`SPRING_DATASOURCE_DRUID_PASSWORD`
+
+## 4. 运行程序
+
+确认mysql和redis是否运行正常，输入
+```
+docker ps
+```
+如果你能看到`xiaozhi-esp32-server-redis`和`xiaozhi-esp32-server-db`信息，就可以继续往下，如果看不到，说明你的`mysql`和`redis`没有安装或没有启动。需要继续回到上面的教程，看看哪一步漏了。
+
+```
+CONTAINER ID             IMAGE   COMMAND   CREATED  TATUS   PORTS               NAMES
+xxx       redis          "xx"   xxx   xxx   0.0.0.0:6379->6379/tcp              xiaozhi-esp32-server-redis
+xxx       mysql:latest   "xx"   xxx   xxx   0.0.0.0:3306->3306/tcp, 33060/tcp   xiaozhi-esp32-server-db
+```
+
+接下来打开命令行工具，使用`终端`或`命令行`工具 进入到你的`xiaozhi-server`，执行以下命令
+
+```
+docker-compose -f docker-compose_all.yml up -d
+```
+
+执行完后，再执行以下命令，查看日志信息。
+
+```
+docker logs -f xiaozhi-esp32-server-web
+```
+
+当你看到输出日志时，说明你的`智控台`启动成功了。
+
+```
+2025-xx-xx 22:11:12.445 [main] INFO  c.a.d.s.b.a.DruidDataSourceAutoConfigure - Init DruidDataSource
+2025-xx-xx 21:28:53.873 [main] INFO  xiaozhi.AdminApplication - Started AdminApplication in 16.057 seconds (process running for 17.941)
+http://localhost:8002/xiaozhi/doc.html
+```
+
+请注意此刻仅是`智控台`能运行，如果8000端口`xiaozhi-esp32-server`报错，先不要理会。
+
+这时，你需要使用浏览器，打开`智控台`，链接：http://127.0.0.1:8002 ，注册第一个用户。第一个用户即是超级管理员，以后的用户都是普通用户。普通用户只能绑定设备和配置智能体;超级管理员可以进行模型管理、用户管理、参数配置等功能。
+
+接下来要做两件重要的事情：
+
+### 第一件重要的事情
+
+使用超级管理员账号，登录系统，在顶部菜单找到`参数管理`，找到列表中第三条数据，参数编码是`server.secret`，复制它到`参数值`。
+
+`server.secret`需要说明一下，这个`参数值`很重要，作用是让我们的`Server`端连接`manager-api`。`server.secret`是每次从零部署manager模块时，会自动随机生成的密钥。
+
+复制`参数值`后，打开`xiaozhi-server`下的`data`目录的`.config.yaml`文件。此刻你的配置文件内容应该是这样的：
+
+```
+manager-api:
+  url: http://127.0.0.1:8002/xiaozhi
+  secret: 你的server.secret值
+```
+1、把你刚才从`智控台`复制过来的`server.secret`的`参数值`复制到`.config.yaml`文件里的`secret`里。
+
+2、把`url`里的`127.0.0.1`改成你电脑局域网内的ip
+
+类似这样的效果
+```
+manager-api:
+  url: http://192.168.1.25:8002/xiaozhi
+  secret: 12345678-xxxx-xxxx-xxxx-123456789000
+```
+
+保存好后，继续往下做第二件重要的事情
+
+### 第二件重要的事情
+
+使用超级管理员账号，登录系统，在顶部菜单找到`模型配置`，然后在左侧栏点击`大语言模型`，找到第一条数据`智谱AI`，点击`修改`按钮，
+弹出修改框后，将你注册到的`智谱AI`的密钥填写到`API密钥`中。然后点击保存。
+
+## 5.重启xiaozhi-esp32-server
+
+接下来打开命令行工具，使用`终端`或`命令行`工具 输入
+```
+docker restart xiaozhi-esp32-server
+docker logs -f xiaozhi-esp32-server
+```
+如果你能看到，类似以下日志,则是Server启动成功的标志。
+
+```
+25-02-23 12:01:09[core.websocket_server] - INFO - Server is running at ws://xxx.xx.xx.xx:8000/xiaozhi/v1/
+25-02-23 12:01:09[core.websocket_server] - INFO - =======上面的地址是websocket协议地址，请勿用浏览器访问=======
+25-02-23 12:01:09[core.websocket_server] - INFO - 如想测试websocket请用谷歌浏览器打开test目录下的test_page.html
+25-02-23 12:01:09[core.websocket_server] - INFO - =======================================================
+```
+
+由于你是全模块部署，因此你有两个重要的接口需要写入到esp32中。
+
+OTA接口：
+```
+http://你电脑局域网的ip:8002/xiaozhi/ota/
+```
+
+Websocket接口：
+```
+ws://你电脑局域网的ip:8000/xiaozhi/v1/
+```
+
+接下来，你就可以开始 [编译esp32固件](firmware-build.md)了。
+
+
+## 6. 版本升级操作
+
+如果后期想升级版本，先备份你的模型密钥。
+
+进入`xiaozhi-server`目录
+
+5.1、执行以下命令
+
+```
+docker-compose down
+docker rmi ghcr.nju.edu.cn/xinnan-tech/xiaozhi-esp32-server:server_latest
+docker rmi ghcr.nju.edu.cn/xinnan-tech/xiaozhi-esp32-server:web_latest
+```
+
+5.2、删掉`docker-compose_all.yaml`文件
+
+5.3、重新按1.1开始部署
+
+# 方式二：本地源码运行全模块
+
+## 1.安装MySQL数据库
+
+如果本机已经安装了MySQL，可以直接在数据库中创建名为`xiaozhi_esp32_server`的数据库。
+
+```sql
+CREATE DATABASE xiaozhi_esp32_server CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+```
+
+如果还没有MySQL，你可以通过docker安装mysql
+
+```
+docker run --name xiaozhi-esp32-server-db -e MYSQL_ROOT_PASSWORD=123456 -p 3306:3306 -e MYSQL_DATABASE=xiaozhi_esp32_server -e MYSQL_INITDB_ARGS="--character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci" -d mysql:latest
+```
+
+## 2.安装redis
+
+如果还没有Redis，你可以通过docker安装redis
+
+```
+docker run --name xiaozhi-esp32-server-redis -d -p 6379:6379 redis
+```
+
+## 3.运行manager-api程序
+
+3.1 安装JDK21，设置JDK环境变量
+
+3.2 安装Maven，设置Maven环境变量
+
+3.3 使用Vscode编程工具，安装好Java环境相关插件
+
+3.4 使用Vscode编程工具加载manager-api模块
+
+在`src/main/resources/application-dev.yml`中配置数据库连接信息
+
+```
+spring:
+  datasource:
+    username: root
+    password: 123456
+```
+在`src/main/resources/application-dev.yml`中配置Redis连接信息
+```
+spring:
+    data:
+      redis:
+        host: localhost
+        port: 6379
+        password:
+        database: 0
+```
+
+3.5 运行主程序
+
+本项目为SpringBoot项目，启动方式为：
+打开`Application.java`运行`Main`方法启动
+
+```
+路径地址：
+src/main/java/xiaozhi/AdminApplication.java
+```
+
+当你看到输出日志时，说明你的`manager-api`启动成功了。
+
+```
+2025-xx-xx 22:11:12.445 [main] INFO  c.a.d.s.b.a.DruidDataSourceAutoConfigure - Init DruidDataSource
+2025-xx-xx 21:28:53.873 [main] INFO  xiaozhi.AdminApplication - Started AdminApplication in 16.057 seconds (process running for 17.941)
+http://localhost:8002/xiaozhi/doc.html
+```
+
+## 4.运行manager-web程序
+
+4.1 安装nodejs
+
+4.2 使用Vscode编程工具加载manager-web模块
+
+终端命令进入manager-web目录下
+
+```
+npm install
+```
+然后启动
+```
+npm run serve
+```
+
+请注意，如果你的manager-api的接口不在`http://localhost:8002`，请在开发时，修改
+`main/manager-web/.env.development`中的路径
+
+运行成功后，你需要使用浏览器，打开`智控台`，链接：http://127.0.0.1:8001 ，注册第一个用户。第一个用户即是超级管理员，以后的用户都是普通用户。普通用户只能绑定设备和配置智能体;超级管理员可以进行模型管理、用户管理、参数配置等功能。
+
+
+重要：注册成功后，使用超级管理员账号，登录系统，在顶部菜单找到`模型配置`，然后在左侧栏点击`大语言模型`，找到第一条数据`智谱AI`，点击`修改`按钮，
+弹出修改框后，将你注册到的`智谱AI`的密钥填写到`API密钥`中。然后点击保存。
+
+重要：注册成功后，使用超级管理员账号，登录系统，在顶部菜单找到`模型配置`，然后在左侧栏点击`大语言模型`，找到第一条数据`智谱AI`，点击`修改`按钮，
+弹出修改框后，将你注册到的`智谱AI`的密钥填写到`API密钥`中。然后点击保存。
+
+重要：注册成功后，使用超级管理员账号，登录系统，在顶部菜单找到`模型配置`，然后在左侧栏点击`大语言模型`，找到第一条数据`智谱AI`，点击`修改`按钮，
+弹出修改框后，将你注册到的`智谱AI`的密钥填写到`API密钥`中。然后点击保存。
+
+## 5.安装Python环境
+
+本项目使用`conda`管理依赖环境。如果不方便安装`conda`，需要根据实际的操作系统安装好`libopus`和`ffmpeg`。
+如果确定使用`conda`，则安装好后，开始执行以下命令。
+
+重要提示！windows 用户，可以通过安装`Anaconda`来管理环境。安装好`Anaconda`后，在`开始`那里搜索`anaconda`相关的关键词，
+找到`Anaconda Prpmpt`，使用管理员身份运行它。如下图。
+
+![conda_prompt](./images/conda_env_1.png)
+
+运行之后，如果你能看到命令行窗口前面有一个(base)字样，说明你成功进入了`conda`环境。那么你就可以执行以下命令了。
+
+![conda_env](./images/conda_env_2.png)
+
+```
+conda remove -n xiaozhi-esp32-server --all -y
+conda create -n xiaozhi-esp32-server python=3.10 -y
+conda activate xiaozhi-esp32-server
+
+# 添加清华源通道
+conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/main
+conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/pkgs/free
+conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/conda-forge
+
+conda install libopus -y
+conda install ffmpeg -y
+```
+
+请注意，以上命令，不是一股脑执行就成功的，你需要一步步执行，每一步执行完后，都检查一下输出的日志，查看是否成功。
+
+## 6.安装本项目依赖
+
+你先要下载本项目源码，源码可以通过`git clone`命令下载，如果你不熟悉`git clone`命令。
+
+你可以用浏览器打开这个地址`https://github.com/xinnan-tech/xiaozhi-esp32-server.git`
+
+打开完，找到页面中一个绿色的按钮，写着`Code`的按钮，点开它，然后你就看到`Download ZIP`的按钮。
+
+点击它，下载本项目源码压缩包。下载到你电脑后，解压它，此时它的名字可能叫`xiaozhi-esp32-server-main`
+你需要把它重命名成`xiaozhi-esp32-server`，在这个文件里，进入到`main`文件夹，再进入到`xiaozhi-server`，好了请记住这个目录`xiaozhi-server`。
+
+```
+# 继续使用conda环境
+conda activate xiaozhi-esp32-server
+# 进入到你的项目根目录，再进入main/xiaozhi-server
+cd main/xiaozhi-server
+pip config set global.index-url https://mirrors.aliyun.com/pypi/simple/
+pip install -r requirements.txt
+```
+
+### 7.下载语音识别模型文件
+
+本项目语音识别模型，默认使用`SenseVoiceSmall`模型，进行语音转文字。因为模型较大，需要独立下载，下载后把`model.pt`
+文件放在`models/SenseVoiceSmall`
+目录下。下面两个下载路线任选一个。
+
+- 线路一：阿里魔塔下载[SenseVoiceSmall](https://modelscope.cn/models/iic/SenseVoiceSmall/resolve/master/model.pt)
+- 线路二：百度网盘下载[SenseVoiceSmall](https://pan.baidu.com/share/init?surl=QlgM58FHhYv1tFnUT_A8Sg&pwd=qvna) 提取码:
+  `qvna`
+
+## 8.配置项目文件
+
+使用超级管理员账号，登录智控台 http://127.0.0.1:8001 ，在顶部菜单找到`参数管理`，找到列表中第三条数据，参数编码是`server.secret`，复制它到`参数值`。
+
+`server.secret`需要说明一下，这个`参数值`很重要，作用是让我们的`Server`端连接`manager-api`。`server.secret`是每次从零部署manager模块时，会自动随机生成的密钥。
+
+复制`参数值`后，打开`xiaozhi-server`下的`data`目录的`.config.yaml`文件。此刻你的配置文件内容应该是这样的：
+
+```
+manager-api:
+  url: http://127.0.0.1:8002/xiaozhi
+  secret: 你的server.secret值
+```
+
+把你刚才从`智控台`复制过来的`server.secret`的`参数值`复制到`.config.yaml`文件里的`secret`里。
+
+类似这样的效果
+```
+manager-api:
+  url: http://127.0.0.1:8002/xiaozhi
+  secret: 12345678-xxxx-xxxx-xxxx-123456789000
+```
+
+## 5.运行项目
+
+```
+# 确保在xiaozhi-server目录下执行
+conda activate xiaozhi-esp32-server
+python app.py
+```
+
+如果你能看到，类似以下日志,则是本项目服务启动成功的标志。
+
+```
+25-02-23 12:01:09[core.websocket_server] - INFO - Server is running at ws://xxx.xx.xx.xx:8000/xiaozhi/v1/
+25-02-23 12:01:09[core.websocket_server] - INFO - =======上面的地址是websocket协议地址，请勿用浏览器访问=======
+25-02-23 12:01:09[core.websocket_server] - INFO - 如想测试websocket请用谷歌浏览器打开test目录下的test_page.html
+25-02-23 12:01:09[core.websocket_server] - INFO - =======================================================
+```
+
+由于你是全模块部署，因此你有两个重要的接口需要写入到esp32中。
+
+OTA接口：
+```
+http://你电脑局域网的ip:8002/xiaozhi/ota/
+```
+
+Websocket接口：
+```
+ws://你电脑局域网的ip:8000/xiaozhi/v1/
+```
+
+接下来，你就可以开始 [编译esp32固件](firmware-build.md)了。
+
+# 常见问题
+
+以下是一些常见问题，供参考：
+
+[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,9 +1,13 @@
 # 编译esp32固件
 
-1. 下载`xiaozhi-esp32`
-   项目，按照这个教程配置项目环境[《Windows搭建 ESP IDF 5.3.2开发环境以及编译小智》](https://icnynnzcwou8.feishu.cn/wiki/JEYDwTTALi5s2zkGlFGcDiRknXf)
+## 第1步 配置环境
+先按照这个教程配置项目环境[《Windows搭建 ESP IDF 5.3.2开发环境以及编译小智》](https://icnynnzcwou8.feishu.cn/wiki/JEYDwTTALi5s2zkGlFGcDiRknXf)
 
-2. 打开`xiaozhi-esp32/main/Kconfig.projbuild`文件，找到`WEBSOCKET_URL`的`default`的内容，把`wss://api.tenclass.net`
+## 第2步 打开配置文件
+配置好编译环境后，下载虾哥[xiaozhi-esp32](https://github.com/78/xiaozhi-esp32)项目源码，进入虾哥项目，打开`xiaozhi-esp32/main/Kconfig.projbuild`文件。
+
+## 第3步 修改WEBSOCKET地址
+找到`WEBSOCKET_URL`的`default`的内容，把`wss://api.tenclass.net/xiaozhi/v1/`
    改成你自己的地址，例如，我的接口地址是`ws://192.168.1.25:8000/xiaozhi/v1/`，就把内容改成这个。
 
 修改前：
@@ -34,7 +38,32 @@ config WEBSOCKET_URL
 
 注意：你的地址是`ws://`开头，不是`wss://`开头，一定不要写错了。
 
-3. 设置编译参数
+## 第4步 修改OTA地址
+如果你是全模块部署本项目，就修改OTA接口，如果你只是部署了8000端口的xiaozhi-server，可以继续沿用虾哥团队的OTA接口。如果你不修改OTA接口，请直接忽略本第4步，直接看第5步
+
+找到`OTA_VERSION_URL`的`default`的内容，把`https://api.tenclass.net/xiaozhi/ota/`
+   改成你自己的地址，例如，我的接口地址是`http://192.168.1.25:8000/xiaozhi/ota/`，就把内容改成这个。
+
+修改前：
+```
+config OTA_VERSION_URL
+    string "OTA Version URL"
+    default "https://api.tenclass.net/xiaozhi/ota/"
+    help
+        The application will access this URL to check for updates.
+```
+修改后：
+```
+config OTA_VERSION_URL
+    string "OTA Version URL"
+    default "http://192.168.1.25:8000/xiaozhi/ota/"
+    help
+        The application will access this URL to check for updates.
+```
+
+## 第5步 设置编译参数
+
+设置编译参数
 
 ```
 # 终端命令行进入xiaozhi-esp32的根目录
@@ -53,7 +82,7 @@ idf.py menuconfig
 
 ![图片](images/build_setting02.png)
 
-4. 编译固件
+## 第6步 编译固件
 
 ```
 idf.py build
@@ -65,7 +94,7 @@ idf.py build
 
 <img src="./images/vscode_idf.png" width="500px"/>
 
-5. 打包bin固件
+## 第7步 打包bin固件
 
 ```
 cd scripts
@@ -78,7 +107,7 @@ python release.py
 注意：如果执行到第二命令后，报了“zip”相关的错误，请忽略这个错误，只要`build`目录下生成固件文件`merged-binary.bin`
 ，对你没有太大影响，请继续。
 
-6. 烧录固件
+## 第8步 烧录固件
    将esp32设备连接电脑，使用chrome浏览器，打开以下网址
 
 ```
@@ -90,16 +119,19 @@ https://espressif.github.io/esp-launchpad/
 
 烧录成功且联网成功后，通过唤醒词唤醒小智，留意server端输出的控制台信息。
 
+## 常见问题
 以下是一些常见问题，供参考：
 
-[1、为什么我说的话，小智识别出来很多韩文、日文、英文](./FAQ.md#1tts-%E7%BB%8F%E5%B8%B8%E5%A4%B1%E8%B4%A5%E7%BB%8F%E5%B8%B8%E8%B6%85%E6%97%B6-)
+[1、为什么我说的话，小智识别出来很多韩文、日文、英文](./FAQ.md)
 
-[2、为什么会出现“TTS 任务出错 文件不存在”？](./FAQ.md#1tts-%E7%BB%8F%E5%B8%B8%E5%A4%B1%E8%B4%A5%E7%BB%8F%E5%B8%B8%E8%B6%85%E6%97%B6-)
+[2、为什么会出现“TTS 任务出错 文件不存在”？](./FAQ.md)
 
-[3、TTS 经常失败，经常超时](./FAQ.md#1tts-%E7%BB%8F%E5%B8%B8%E5%A4%B1%E8%B4%A5%E7%BB%8F%E5%B8%B8%E8%B6%85%E6%97%B6-)
+[3、TTS 经常失败，经常超时](./FAQ.md)
 
-[4、如何提高小智对话响应速度？](./FAQ.md#1tts-%E7%BB%8F%E5%B8%B8%E5%A4%B1%E8%B4%A5%E7%BB%8F%E5%B8%B8%E8%B6%85%E6%97%B6-)
+[4、使用Wifi能连接自建服务器，但是4G模式却接不上](./FAQ.md)
 
-[5、我说话很慢，停顿时小智老是抢话](./FAQ.md#1tts-%E7%BB%8F%E5%B8%B8%E5%A4%B1%E8%B4%A5%E7%BB%8F%E5%B8%B8%E8%B6%85%E6%97%B6-)
+[5、如何提高小智对话响应速度？](./FAQ.md)
 
-[6、我想通过小智控制电灯、空调、远程开关机等操作](./FAQ.md#1tts-%E7%BB%8F%E5%B8%B8%E5%A4%B1%E8%B4%A5%E7%BB%8F%E5%B8%B8%E8%B6%85%E6%97%B6-)
+[6、我说话很慢，停顿时小智老是抢话](./FAQ.md)
+
+[7、我想通过小智控制电灯、空调、远程开关机等操作](./FAQ.md)

main/README.md

@@ -1,8 +1,6 @@
-本文档是开发类文档，如需部署小智服务端，[点击这里查看部署教程](./FAQ.md#%E4%BD%BF%E7%94%A8%E6%96%B9%E5%BC%8F-)
+本文档是开发类文档，如需部署小智服务端，[点击这里查看部署教程](../README.md#%E9%83%A8%E7%BD%B2%E6%96%87%E6%A1%A3)
 
 # 项目目录介绍
-当你看到这份文件的时候，这个这个项目还没完善好。我们还有很多东西要做。
-
 如果你是一名软件开发者，这里有一份[《致开发者的公开信》](../docs/contributor_open_letter.md)，欢迎归队！
 
 ```
@@ -12,9 +10,9 @@ xiaozhi-esp32-server
   ├─ manager-api 8002 端口 Java语言开发 负责提供控制台的api
 ```
 
-# xiaozhi-server 接口协议
+# xiaozhi-server 和ESP32通讯协议
 
-[虾哥团队通信协议：Websocket 连接](https://ccnphfhqs21z.feishu.cn/wiki/M0XiwldO9iJwHikpXD5cEx71nKh)
+https://ccnphfhqs21z.feishu.cn/wiki/M0XiwldO9iJwHikpXD5cEx71nKh
 
 # manager-web 、manager-api接口协议
 

main/manager-api/README.md

@@ -1,4 +1,5 @@
-本文档是开发类文档，如需部署小智服务端，[点击这里查看部署教程](../../../docs/Deployment.md)
+本文档是开发类文档，如需部署小智服务端，[点击这里查看部署教程](../../README.md#%E9%83%A8%E7%BD%B2%E6%96%87%E6%A1%A3)
+
 # 项目介绍
 
 manager-api 该项目基于SpringBoot框架开发。
@@ -12,85 +13,6 @@ MySQL 8.0+
 Redis 5.0+
 Vue 3.x
 
-# 创建数据库
-
-如果本机已经安装了MySQL，可以直接在数据库中创建名为`xiaozhi_esp32_server`的数据库。
-
-```sql
-CREATE DATABASE xiaozhi_esp32_server CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-```
-
-如果还没有MySQL，你可以通过docker安装mysql
-
-```
-docker run --name xiaozhi-esp32-server-db \
--e MYSQL_ROOT_PASSWORD=123456 \
--p 3306:3306 \
--e MYSQL_DATABASE=xiaozhi_esp32_server \
--e MYSQL_INITDB_ARGS="--character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci" \
--d mysql:latest
-```
-
-# 确认项目数据库连接信息
-
-在`src/main/resources/application-dev.yml`中配置数据库连接信息
-
-```
-spring:
-  datasource:
-    username: root
-    password: 123456
-```
-
-
-# 连接Redis
-
-如果还没有Redis，你可以通过docker安装redis
-
-```
-docker run --name xiaozhi-esp32-server-redis -d -p 6379:6379 redis
-```
-
-# 确认项目Redis连接信息
-
-在`src/main/resources/application-dev.yml`中配置Redis连接信息
-
-```
-spring:
-    data:
-      redis:
-        host: localhost
-        port: 6379
-        password:
-        database: 0
-```
-
-
-# 测试启动
-
-本项目为SpringBoot项目，启动方式为：
-打开`Application.java`运行`Main`方法启动
-
-```
-路径地址：
-src/main/java/xiaozhi/AdminApplication.java
-```
-
-# 打包编译
-
-执行以下命令生产jar包
-
-```
-mvn clean install
-```
-
-把jar包放在服务器上，执行
-
-```
-nohup java -jar xiaozhi-esp32-api.jar --spring.profiles.activate=dev
-```
-
-
 # 接口文档
 启动后打开：http://localhost:8002/xiaozhi/doc.html
 

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

@@ -51,7 +51,7 @@ public class SwaggerConfig {
     public GroupedOpenApi timbreApi() {
         return GroupedOpenApi.builder()
                 .group("timbre")
-                .pathsToMatch("/timbre/**")
+                .pathsToMatch("/ttsVoice/**")
                 .build();
     }
 
@@ -71,6 +71,14 @@ public class SwaggerConfig {
                 .build();
     }
 
+    @Bean
+    public GroupedOpenApi configApi() {
+        return GroupedOpenApi.builder()
+                .group("config")
+                .pathsToMatch("/config/**")
+                .build();
+    }
+
     @Bean
     public OpenAPI customOpenAPI() {
         return new OpenAPI().info(new Info()

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

@@ -74,8 +74,16 @@ public interface Constant {
      */
     String ORDER = "order";
 
+    /**
+     * 请求头授权标识
+     */
     String AUTHORIZATION = "Authorization";
 
+    /**
+     * 服务器密钥
+     */
+    String SERVER_SECRET = "server.secret";
+
     /**
      * 路径分割符
      */

main/manager-api/src/main/java/xiaozhi/common/exception/ErrorCode.java

@@ -43,4 +43,13 @@ public interface ErrorCode {
     int PASSWORD_WEAK_ERROR = 10031;
     int DEL_MYSELF_ERROR = 10032;
     int DEVICE_CAPTCHA_ERROR = 10033;
+
+    // 参数校验相关错误码
+    int PARAM_VALUE_NULL = 10034;
+    int PARAM_TYPE_NULL = 10035;
+    int PARAM_TYPE_INVALID = 10036;
+    int PARAM_NUMBER_INVALID = 10037;
+    int PARAM_BOOLEAN_INVALID = 10038;
+    int PARAM_ARRAY_INVALID = 10039;
+    int PARAM_JSON_INVALID = 10040;
 }

main/manager-api/src/main/java/xiaozhi/common/exception/RenExceptionHandler.java

@@ -4,6 +4,7 @@ import org.apache.shiro.authz.UnauthorizedException;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.servlet.resource.NoResourceFoundException;
 
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -53,4 +54,10 @@ public class RenExceptionHandler {
         return new Result<Void>().error();
     }
 
+    @ExceptionHandler(NoResourceFoundException.class)
+    public Result<Void> handleNoResourceFoundException(NoResourceFoundException ex) {
+        log.warn("Resource not found: {}", ex.getMessage());
+        return new Result<Void>().error(404, "资源不存在");
+    }
+
 }

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

@@ -34,5 +34,45 @@ public class RedisKeys {
         return "sys:username:id:" + userid;
     }
 
+    /**
+     * 模型名称的Key
+     */
+    public static String getModelNameById(String id) {
+        return "model:name:" + id;
+    }
 
+    /**
+     * 模型配置的Key
+     */
+    public static String getModelConfigById(String id) {
+        return "model:data:" + id;
+    }
+
+    /**
+     * 获取音色名称缓存key
+     */
+    public static String getTimbreNameById(String id) {
+        return "timbre:name:" + id;
+    }
+
+    /**
+     * 获取设备数量缓存key
+     */
+    public static String getAgentDeviceCountById(String id) {
+        return "agent:device:count:" + id;
+    }
+
+    /**
+     * 获取系统配置缓存key
+     */
+    public static String getServerConfigKey() {
+        return "server:config";
+    }
+
+    /**
+     * 获取音色详情缓存key
+     */
+    public static String getTimbreDetailsKey(String id) {
+        return "timbre:details:" + id;
+    }
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java

@@ -29,11 +29,13 @@ import xiaozhi.common.user.UserDetail;
 import xiaozhi.common.utils.ConvertUtils;
 import xiaozhi.common.utils.Result;
 import xiaozhi.modules.agent.dto.AgentCreateDTO;
+import xiaozhi.modules.agent.dto.AgentDTO;
 import xiaozhi.modules.agent.dto.AgentUpdateDTO;
 import xiaozhi.modules.agent.entity.AgentEntity;
 import xiaozhi.modules.agent.entity.AgentTemplateEntity;
 import xiaozhi.modules.agent.service.AgentService;
 import xiaozhi.modules.agent.service.AgentTemplateService;
+import xiaozhi.modules.device.service.DeviceService;
 import xiaozhi.modules.security.user.SecurityUser;
 
 @Tag(name = "智能体管理")
@@ -43,14 +45,15 @@ import xiaozhi.modules.security.user.SecurityUser;
 public class AgentController {
     private final AgentService agentService;
     private final AgentTemplateService agentTemplateService;
+    private final DeviceService deviceService;
 
     @GetMapping("/list")
     @Operation(summary = "获取用户智能体列表")
     @RequiresPermissions("sys:role:normal")
-    public Result<List<AgentEntity>> getUserAgents() {
+    public Result<List<AgentDTO>> getUserAgents() {
         UserDetail user = SecurityUser.getUser();
-        List<AgentEntity> agents = agentService.getUserAgents(user.getId());
-        return new Result<List<AgentEntity>>().ok(agents);
+        List<AgentDTO> agents = agentService.getUserAgents(user.getId());
+        return new Result<List<AgentDTO>>().ok(agents);
     }
 
     @GetMapping("/all")
@@ -80,6 +83,22 @@ public class AgentController {
     public Result<Void> save(@RequestBody @Valid AgentCreateDTO dto) {
         AgentEntity entity = ConvertUtils.sourceToTarget(dto, AgentEntity.class);
 
+        // 获取默认模板
+        AgentTemplateEntity template = agentTemplateService.getDefaultTemplate();
+        if (template != null) {
+            // 设置模板中的默认值
+            entity.setAsrModelId(template.getAsrModelId());
+            entity.setVadModelId(template.getVadModelId());
+            entity.setLlmModelId(template.getLlmModelId());
+            entity.setTtsModelId(template.getTtsModelId());
+            entity.setTtsVoiceId(template.getTtsVoiceId());
+            entity.setMemModelId(template.getMemModelId());
+            entity.setIntentModelId(template.getIntentModelId());
+            entity.setSystemPrompt(template.getSystemPrompt());
+            entity.setLangCode(template.getLangCode());
+            entity.setLanguage(template.getLanguage());
+        }
+
         // 设置用户ID和创建者信息
         UserDetail user = SecurityUser.getUser();
         entity.setUserId(user.getId());
@@ -157,6 +176,9 @@ public class AgentController {
     @Operation(summary = "删除智能体")
     @RequiresPermissions("sys:role:normal")
     public Result<Void> delete(@PathVariable String id) {
+        // 先删除关联的设备
+        deviceService.deleteByAgentId(id);
+        // 再删除智能体
         agentService.deleteById(id);
         return new Result<>();
     }
@@ -169,4 +191,5 @@ public class AgentController {
                 .list(new QueryWrapper<AgentTemplateEntity>().orderByAsc("sort"));
         return new Result<List<AgentTemplateEntity>>().ok(list);
     }
+
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AgentDao.java

@@ -1,11 +1,18 @@
 package xiaozhi.modules.agent.dao;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import xiaozhi.common.dao.BaseDao;
 import xiaozhi.modules.agent.entity.AgentEntity;
 
 @Mapper
 public interface AgentDao extends BaseDao<AgentEntity> {
-
+    /**
+     * 获取智能体的设备数量
+     * 
+     * @param agentId 智能体ID
+     * @return 设备数量
+     */
+    Integer getDeviceCountByAgentId(@Param("agentId") String agentId);
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentDTO.java

@@ -0,0 +1,38 @@
+package xiaozhi.modules.agent.dto;
+
+import java.util.Date;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 智能体数据传输对象
+ * 用于在服务层和控制器层之间传递智能体相关的数据
+ */
+@Data
+@Schema(description = "智能体对象")
+public class AgentDTO {
+    @Schema(description = "智能体编码", example = "AGT_1234567890")
+    private String id;
+
+    @Schema(description = "智能体名称", example = "客服助手")
+    private String agentName;
+
+    @Schema(description = "语音合成模型名称", example = "tts_model_01")
+    private String ttsModelName;
+
+    @Schema(description = "音色名称", example = "voice_01")
+    private String ttsVoiceName;
+
+    @Schema(description = "大语言模型名称", example = "llm_model_01")
+    private String llmModelName;
+
+    @Schema(description = "角色设定参数", example = "你是一个专业的客服助手，负责回答用户问题并提供帮助")
+    private String systemPrompt;
+
+    @Schema(description = "最后连接时间", example = "2024-03-20 10:00:00")
+    private Date lastConnectedAt;
+
+    @Schema(description = "设备数量", example = "10")
+    private Integer deviceCount;
+}

main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentService.java

@@ -5,13 +5,10 @@ import java.util.Map;
 
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.BaseService;
+import xiaozhi.modules.agent.dto.AgentDTO;
 import xiaozhi.modules.agent.entity.AgentEntity;
 
 public interface AgentService extends BaseService<AgentEntity> {
-    /**
-     * 根据用户ID获取智能体列表
-     */
-    List<AgentEntity> getUserAgents(Long userId);
 
     /**
      * 管理员获取所有智能体列表（分页）
@@ -29,4 +26,20 @@ public interface AgentService extends BaseService<AgentEntity> {
      * @param userId
      */
     void deleteAgentByUserId(Long userId);
+
+    /**
+     * 获取用户智能体列表
+     * 
+     * @param userId
+     * @return
+     */
+    List<AgentDTO> getUserAgents(Long userId);
+
+    /**
+     * 获取智能体的设备数量
+     * 
+     * @param agentId 智能体ID
+     * @return 设备数量
+     */
+    Integer getDeviceCountByAgentId(String agentId);
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentTemplateService.java

@@ -11,4 +11,18 @@ import xiaozhi.modules.agent.entity.AgentTemplateEntity;
  */
 public interface AgentTemplateService extends IService<AgentTemplateEntity> {
 
+    /**
+     * 获取默认模板
+     * 
+     * @return 默认模板实体
+     */
+    AgentTemplateEntity getDefaultTemplate();
+
+    /**
+     * 更新默认模板中的模型ID
+     * 
+     * @param modelType 模型类型
+     * @param modelId   模型ID
+     */
+    void updateDefaultTemplateModelId(String modelType, String modelId);
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java

@@ -3,7 +3,10 @@ package xiaozhi.modules.agent.service.impl;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,30 +14,37 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import xiaozhi.common.page.PageData;
+import xiaozhi.common.redis.RedisKeys;
+import xiaozhi.common.redis.RedisUtils;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.modules.agent.dao.AgentDao;
+import xiaozhi.modules.agent.dto.AgentDTO;
 import xiaozhi.modules.agent.entity.AgentEntity;
 import xiaozhi.modules.agent.service.AgentService;
+import xiaozhi.modules.model.service.ModelConfigService;
+import xiaozhi.modules.timbre.service.TimbreService;
 
 @Service
 public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> implements AgentService {
     private final AgentDao agentDao;
 
+    @Autowired
+    private TimbreService timbreModelService;
+
+    @Autowired
+    private ModelConfigService modelConfigService;
+
+    @Autowired
+    private RedisUtils redisUtils;
+
     public AgentServiceImpl(AgentDao agentDao) {
         this.agentDao = agentDao;
     }
 
-    @Override
-    public List<AgentEntity> getUserAgents(Long userId) {
-        QueryWrapper<AgentEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq("user_id", userId);
-        return agentDao.selectList(wrapper);
-    }
-
     @Override
     public PageData<AgentEntity> adminAgentList(Map<String, Object> params) {
         IPage<AgentEntity> page = agentDao.selectPage(
-                getPage(params, "sort", true),
+                getPage(params, "agent_name", true),
                 new QueryWrapper<>());
         return new PageData<>(page.getRecords(), page.getTotal());
     }
@@ -70,4 +80,54 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
         wrapper.eq("user_id", userId);
         baseDao.delete(wrapper);
     }
+
+    @Override
+    public List<AgentDTO> getUserAgents(Long userId) {
+        QueryWrapper<AgentEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("user_id", userId);
+        List<AgentEntity> agents = agentDao.selectList(wrapper);
+        return agents.stream().map(agent -> {
+            AgentDTO dto = new AgentDTO();
+            dto.setId(agent.getId());
+            dto.setAgentName(agent.getAgentName());
+            dto.setSystemPrompt(agent.getSystemPrompt());
+
+            // 获取 TTS 模型名称
+            dto.setTtsModelName(modelConfigService.getModelNameById(agent.getTtsModelId()));
+
+            // 获取 LLM 模型名称
+            dto.setLlmModelName(modelConfigService.getModelNameById(agent.getLlmModelId()));
+
+            // 获取 TTS 音色名称
+            dto.setTtsVoiceName(timbreModelService.getTimbreNameById(agent.getTtsVoiceId()));
+
+            // 获取设备数量
+            dto.setDeviceCount(getDeviceCountByAgentId(agent.getId()));
+
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
+    @Override
+    public Integer getDeviceCountByAgentId(String agentId) {
+        if (StringUtils.isBlank(agentId)) {
+            return 0;
+        }
+
+        // 先从Redis中获取
+        Integer cachedCount = (Integer) redisUtils.get(RedisKeys.getAgentDeviceCountById(agentId));
+        if (cachedCount != null) {
+            return cachedCount;
+        }
+
+        // 如果Redis中没有，则从数据库查询
+        Integer deviceCount = agentDao.getDeviceCountByAgentId(agentId);
+
+        // 将结果存入Redis
+        if (deviceCount != null) {
+            redisUtils.set(RedisKeys.getAgentDeviceCountById(agentId), deviceCount, 60);
+        }
+
+        return deviceCount != null ? deviceCount : 0;
+    }
 }

main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentTemplateServiceImpl.java

@@ -2,6 +2,7 @@ package xiaozhi.modules.agent.service.impl;
 
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import xiaozhi.modules.agent.dao.AgentTemplateDao;
@@ -15,6 +16,52 @@ import xiaozhi.modules.agent.service.AgentTemplateService;
  */
 @Service
 public class AgentTemplateServiceImpl extends ServiceImpl<AgentTemplateDao, AgentTemplateEntity>
-                implements AgentTemplateService {
+        implements AgentTemplateService {
 
+    /**
+     * 获取默认模板
+     * 
+     * @return 默认模板实体
+     */
+    public AgentTemplateEntity getDefaultTemplate() {
+        LambdaQueryWrapper<AgentTemplateEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.orderByAsc(AgentTemplateEntity::getSort)
+                .last("LIMIT 1");
+        return this.getOne(wrapper);
+    }
+
+    /**
+     * 更新默认模板中的模型ID
+     * 
+     * @param modelType 模型类型
+     * @param modelId   模型ID
+     */
+    @Override
+    public void updateDefaultTemplateModelId(String modelType, String modelId) {
+        modelType = modelType.toUpperCase();
+        AgentTemplateEntity defaultTemplate = getDefaultTemplate();
+        if (defaultTemplate != null) {
+            switch (modelType) {
+                case "ASR":
+                    defaultTemplate.setAsrModelId(modelId);
+                    break;
+                case "VAD":
+                    defaultTemplate.setVadModelId(modelId);
+                    break;
+                case "LLM":
+                    defaultTemplate.setLlmModelId(modelId);
+                    break;
+                case "TTS":
+                    defaultTemplate.setTtsModelId(modelId);
+                    break;
+                case "Memory":
+                    defaultTemplate.setMemModelId(modelId);
+                    break;
+                case "Intent":
+                    defaultTemplate.setIntentModelId(modelId);
+                    break;
+            }
+            this.updateById(defaultTemplate);
+        }
+    }
 }

main/manager-api/src/main/java/xiaozhi/modules/config/controller/ConfigController.java

@@ -0,0 +1,61 @@
+package xiaozhi.modules.config.controller;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import xiaozhi.common.constant.Constant;
+import xiaozhi.common.exception.RenException;
+import xiaozhi.common.utils.Result;
+import xiaozhi.common.validator.ValidatorUtils;
+import xiaozhi.modules.config.dto.AgentModelsDTO;
+import xiaozhi.modules.config.service.ConfigService;
+import xiaozhi.modules.sys.dto.ConfigSecretDTO;
+import xiaozhi.modules.sys.service.SysParamsService;
+
+/**
+ * xiaozhi-server 配置获取
+ *
+ * @since 1.0.0
+ */
+@RestController
+@RequestMapping("config")
+@Tag(name = "参数管理")
+@AllArgsConstructor
+public class ConfigController {
+    private final ConfigService configService;
+    private final SysParamsService sysParamsService;
+
+    @PostMapping("server-base")
+    @Operation(summary = "获取配置")
+    public Result<Object> getConfig(@RequestBody ConfigSecretDTO dto) {
+        // 效验数据
+        ValidatorUtils.validateEntity(dto);
+        checkSecret(dto.getSecret());
+        Object config = configService.getConfig(true);
+        return new Result<Object>().ok(config);
+    }
+
+    @PostMapping("agent-models")
+    @Operation(summary = "获取智能体模型")
+    public Result<Object> getAgentModels(@RequestBody AgentModelsDTO dto) {
+        // 效验数据
+        ValidatorUtils.validateEntity(dto);
+        checkSecret(dto.getSecret());
+        Object models = configService.getAgentModels(dto.getMacAddress(), dto.getSelectedModule());
+        return new Result<Object>().ok(models);
+    }
+
+    private void checkSecret(String secret) {
+        String secretParam = sysParamsService.getValue(Constant.SERVER_SECRET, true);
+        // 验证密钥
+        if (StringUtils.isBlank(secret) || !secret.equals(secretParam)) {
+            throw new RenException("密钥错误");
+        }
+    }
+}

main/manager-api/src/main/java/xiaozhi/modules/config/dto/AgentModelsDTO.java

@@ -0,0 +1,28 @@
+package xiaozhi.modules.config.dto;
+
+import java.util.Map;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+@Schema(description = "获取智能体模型配置DTO")
+public class AgentModelsDTO {
+    @NotBlank(message = "密钥不能为空")
+    @Schema(description = "密钥")
+    private String secret;
+
+    @NotBlank(message = "设备MAC地址不能为空")
+    @Schema(description = "设备MAC地址")
+    private String macAddress;
+
+    @NotBlank(message = "客户端ID不能为空")
+    @Schema(description = "客户端ID")
+    private String clientId;
+
+    @NotNull(message = "客户端已实例化的模型不能为空")
+    @Schema(description = "客户端已实例化的模型")
+    private Map<String, String> selectedModule;
+}

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

@@ -0,0 +1,26 @@
+package xiaozhi.modules.config.init;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
+
+import jakarta.annotation.PostConstruct;
+import xiaozhi.modules.config.service.ConfigService;
+import xiaozhi.modules.sys.service.SysParamsService;
+
+@Configuration
+@DependsOn("liquibase")
+public class SystemInitConfig {
+
+    @Autowired
+    private SysParamsService sysParamsService;
+
+    @Autowired
+    private ConfigService configService;
+
+    @PostConstruct
+    public void init() {
+        sysParamsService.initServerSecret();
+        configService.getConfig(false);
+    }
+}

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

@@ -0,0 +1,22 @@
+package xiaozhi.modules.config.service;
+
+import java.util.Map;
+
+public interface ConfigService {
+    /**
+     * 获取服务器配置
+     * 
+     * @param isCache 是否缓存
+     * @return 配置信息
+     */
+    Object getConfig(Boolean isCache);
+
+    /**
+     * 获取智能体模型配置
+     * 
+     * @param macAddress     MAC地址
+     * @param selectedModule 客户端已实例化的模型
+     * @return 模型配置信息
+     */
+    Map<String, Object> getAgentModels(String macAddress, Map<String, String> selectedModule);
+}

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

@@ -0,0 +1,277 @@
+package xiaozhi.modules.config.service.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import lombok.AllArgsConstructor;
+import xiaozhi.common.exception.RenException;
+import xiaozhi.common.redis.RedisKeys;
+import xiaozhi.common.redis.RedisUtils;
+import xiaozhi.common.utils.JsonUtils;
+import xiaozhi.modules.agent.entity.AgentEntity;
+import xiaozhi.modules.agent.entity.AgentTemplateEntity;
+import xiaozhi.modules.agent.service.AgentService;
+import xiaozhi.modules.agent.service.AgentTemplateService;
+import xiaozhi.modules.config.service.ConfigService;
+import xiaozhi.modules.device.entity.DeviceEntity;
+import xiaozhi.modules.device.service.DeviceService;
+import xiaozhi.modules.model.entity.ModelConfigEntity;
+import xiaozhi.modules.model.service.ModelConfigService;
+import xiaozhi.modules.sys.dto.SysParamsDTO;
+import xiaozhi.modules.sys.service.SysParamsService;
+import xiaozhi.modules.timbre.service.TimbreService;
+import xiaozhi.modules.timbre.vo.TimbreDetailsVO;
+
+@Service
+@AllArgsConstructor
+public class ConfigServiceImpl implements ConfigService {
+    private final SysParamsService sysParamsService;
+    private final DeviceService deviceService;
+    private final ModelConfigService modelConfigService;
+    private final AgentService agentService;
+    private final AgentTemplateService agentTemplateService;
+    private final RedisUtils redisUtils;
+    private final TimbreService timbreService;
+
+    @Override
+    public Object getConfig(Boolean isCache) {
+        if (isCache) {
+            // 先从Redis获取配置
+            Object cachedConfig = redisUtils.get(RedisKeys.getServerConfigKey());
+            if (cachedConfig != null) {
+                return cachedConfig;
+            }
+        }
+
+        // 构建配置信息
+        Map<String, Object> result = new HashMap<>();
+        buildConfig(result);
+
+        // 查询默认智能体
+        AgentTemplateEntity agent = agentTemplateService.getDefaultTemplate();
+        if (agent == null) {
+            throw new RenException("默认智能体未找到");
+        }
+
+        // 构建模块配置
+        buildModuleConfig(
+                agent.getAgentName(),
+                agent.getSystemPrompt(),
+                null,
+                agent.getVadModelId(),
+                agent.getAsrModelId(),
+                agent.getLlmModelId(),
+                agent.getTtsModelId(),
+                agent.getMemModelId(),
+                agent.getIntentModelId(),
+                result,
+                isCache);
+
+        // 将配置存入Redis
+        redisUtils.set(RedisKeys.getServerConfigKey(), result);
+
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> getAgentModels(String macAddress, Map<String, String> selectedModule) {
+        // 根据MAC地址查找设备
+        DeviceEntity device = deviceService.getDeviceByMacAddress(macAddress);
+        if (device == null) {
+            throw new RenException("设备未找到");
+        }
+        // 获取智能体信息
+        AgentEntity agent = agentService.getAgentById(device.getAgentId());
+        if (agent == null) {
+            throw new RenException("智能体未找到");
+        }
+        // 获取音色信息
+        String voice = null;
+        TimbreDetailsVO timbre = timbreService.get(agent.getTtsVoiceId());
+        if (timbre != null) {
+            voice = timbre.getTtsVoice();
+        }
+        // 构建返回数据
+        Map<String, Object> result = new HashMap<>();
+
+        // 如果客户端已实例化模型，则不返回
+        String alreadySelectedVadModelId = (String) selectedModule.get("VAD");
+        if (alreadySelectedVadModelId != null && alreadySelectedVadModelId.equals(agent.getVadModelId())) {
+            agent.setVadModelId(null);
+        }
+        String alreadySelectedAsrModelId = (String) selectedModule.get("ASR");
+        if (alreadySelectedAsrModelId != null && alreadySelectedAsrModelId.equals(agent.getAsrModelId())) {
+            agent.setAsrModelId(null);
+        }
+        String alreadySelectedLlmModelId = (String) selectedModule.get("LLM");
+        if (alreadySelectedLlmModelId != null && alreadySelectedLlmModelId.equals(agent.getLlmModelId())) {
+            agent.setLlmModelId(null);
+        }
+        String alreadySelectedMemModelId = (String) selectedModule.get("Memory");
+        if (alreadySelectedMemModelId != null && alreadySelectedMemModelId.equals(agent.getMemModelId())) {
+            agent.setMemModelId(null);
+        }
+        String alreadySelectedIntentModelId = (String) selectedModule.get("Intent");
+        if (alreadySelectedIntentModelId != null && alreadySelectedIntentModelId.equals(agent.getIntentModelId())) {
+            agent.setIntentModelId(null);
+        }
+
+        // 构建模块配置
+        buildModuleConfig(
+                agent.getAgentName(),
+                agent.getSystemPrompt(),
+                voice,
+                agent.getVadModelId(),
+                agent.getAsrModelId(),
+                agent.getLlmModelId(),
+                agent.getTtsModelId(),
+                agent.getMemModelId(),
+                agent.getIntentModelId(),
+                result,
+                true);
+
+        return result;
+    }
+
+    /**
+     * 构建配置信息
+     * 
+     * @param paramsList 系统参数列表
+     * @return 配置信息
+     */
+    @SuppressWarnings("unchecked")
+    private Object buildConfig(Map<String, Object> config) {
+
+        // 查询所有系统参数
+        List<SysParamsDTO> paramsList = sysParamsService.list(new HashMap<>());
+
+        for (SysParamsDTO param : paramsList) {
+            String[] keys = param.getParamCode().split("\\.");
+            Map<String, Object> current = config;
+
+            // 遍历除最后一个key之外的所有key
+            for (int i = 0; i < keys.length - 1; i++) {
+                String key = keys[i];
+                if (!current.containsKey(key)) {
+                    current.put(key, new HashMap<String, Object>());
+                }
+                current = (Map<String, Object>) current.get(key);
+            }
+
+            // 处理最后一个key
+            String lastKey = keys[keys.length - 1];
+            String value = param.getParamValue();
+
+            // 根据valueType转换值
+            switch (param.getValueType().toLowerCase()) {
+                case "number":
+                    try {
+                        current.put(lastKey, Double.parseDouble(value));
+                    } catch (NumberFormatException e) {
+                        current.put(lastKey, value);
+                    }
+                    break;
+                case "boolean":
+                    current.put(lastKey, Boolean.parseBoolean(value));
+                    break;
+                case "array":
+                    // 将分号分隔的字符串转换为数字数组
+                    List<String> list = new ArrayList<>();
+                    for (String num : value.split(";")) {
+                        if (StringUtils.isNotBlank(num)) {
+                            list.add(num.trim());
+                        }
+                    }
+                    current.put(lastKey, list);
+                    break;
+                case "json":
+                    try {
+                        current.put(lastKey, JsonUtils.parseObject(value, Object.class));
+                    } catch (Exception e) {
+                        current.put(lastKey, value);
+                    }
+                    break;
+                default:
+                    current.put(lastKey, value);
+            }
+        }
+
+        return config;
+    }
+
+    /**
+     * 构建模块配置
+     * 
+     * @param prompt        提示词
+     * @param voice         音色
+     * @param vadModelId    VAD模型ID
+     * @param asrModelId    ASR模型ID
+     * @param llmModelId    LLM模型ID
+     * @param ttsModelId    TTS模型ID
+     * @param memModelId    记忆模型ID
+     * @param intentModelId 意图模型ID
+     * @param result        结果Map
+     */
+    private void buildModuleConfig(
+            String assistantName,
+            String prompt,
+            String voice,
+            String vadModelId,
+            String asrModelId,
+            String llmModelId,
+            String ttsModelId,
+            String memModelId,
+            String intentModelId,
+            Map<String, Object> result,
+            boolean isCache) {
+        Map<String, String> selectedModule = new HashMap<>();
+
+        String[] modelTypes = { "VAD", "ASR", "TTS", "Memory", "Intent", "LLM" };
+        String[] modelIds = { vadModelId, asrModelId, ttsModelId, memModelId, intentModelId, llmModelId };
+        String intentLLMModelId = null;
+
+        for (int i = 0; i < modelIds.length; i++) {
+            if (modelIds[i] == null) {
+                continue;
+            }
+            ModelConfigEntity model = modelConfigService.getModelById(modelIds[i], isCache);
+            Map<String, Object> typeConfig = new HashMap<>();
+            if (model.getConfigJson() != null) {
+                typeConfig.put(model.getId(), model.getConfigJson());
+                // 如果是TTS类型，添加private_voice属性
+                if ("TTS".equals(modelTypes[i]) && voice != null) {
+                    ((Map<String, Object>) model.getConfigJson()).put("private_voice", voice);
+                }
+                // 如果是Intent类型，且type=intent_llm，则给他添加附加模型
+                if ("Intent".equals(modelTypes[i])) {
+                    Map<String, Object> map = (Map<String, Object>) model.getConfigJson();
+                    if ("intent_llm".equals(map.get("type"))) {
+                        intentLLMModelId = (String) map.get("llm");
+                        if (intentLLMModelId != null && intentLLMModelId.equals(llmModelId)) {
+                            intentLLMModelId = null;
+                        }
+                    }
+                }
+                // 如果是LLM类型，且intentLLMModelId不为空，则添加附加模型
+                if ("LLM".equals(modelTypes[i]) && intentLLMModelId != null) {
+                    ModelConfigEntity intentLLM = modelConfigService.getModelById(intentLLMModelId, isCache);
+                    typeConfig.put(intentLLM.getId(), intentLLM.getConfigJson());
+                }
+            }
+            result.put(modelTypes[i], typeConfig);
+
+            selectedModule.put(modelTypes[i], model.getId());
+        }
+
+        result.put("selected_module", selectedModule);
+        if (StringUtils.isNotBlank(prompt)) {
+            prompt = prompt.replace("{{assistant_name}}", "小智");
+        }
+        result.put("prompt", prompt);
+    }
+}

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

@@ -5,6 +5,7 @@ import java.nio.charset.StandardCharsets;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -52,6 +53,12 @@ public class OTAController {
         return createResponse(deviceService.checkDeviceActive(macAddress, deviceId, clientId, deviceReportReqDTO));
     }
 
+    @Operation(summary = "获取 OTA 提示信息")
+    @GetMapping
+    public ResponseEntity<String> getOTAPrompt() {
+        return createResponse(DeviceReportRespDTO.createError("请提交正确的ota参数"));
+    }
+
     @SneakyThrows
     private ResponseEntity<String> createResponse(DeviceReportRespDTO deviceReportRespDTO) {
         ObjectMapper objectMapper = new ObjectMapper();

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

@@ -44,6 +44,13 @@ public interface DeviceService {
      */
     void deleteByUserId(Long userId);
 
+    /**
+     * 删除指定智能体关联的所有设备
+     * 
+     * @param agentId 智能体id
+     */
+    void deleteByAgentId(String agentId);
+
     /**
      * 获取指定用户的设备数量
      * 
@@ -59,4 +66,12 @@ public interface DeviceService {
      * @return 用户列表分页数据
      */
     PageData<UserShowDeviceListVO> page(DevicePageUserDTO dto);
+
+    /**
+     * 根据MAC地址获取设备信息
+     * 
+     * @param macAddress MAC地址
+     * @return 设备信息
+     */
+    DeviceEntity getDeviceByMacAddress(String macAddress);
 }

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

@@ -208,13 +208,20 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
         return baseDao.selectCount(wrapper);
     }
 
+    @Override
+    public void deleteByAgentId(String agentId) {
+        UpdateWrapper<DeviceEntity> wrapper = new UpdateWrapper<>();
+        wrapper.eq("agent_id", agentId);
+        baseDao.delete(wrapper);
+    }
+
     @Override
     public PageData<UserShowDeviceListVO> page(DevicePageUserDTO dto) {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put(Constant.PAGE, dto.getPage());
         params.put(Constant.LIMIT, dto.getLimit());
         IPage<DeviceEntity> page = baseDao.selectPage(
-                getPage(params, "sort", true),
+                getPage(params, "mac_address", true),
                 // 定义查询条件
                 new QueryWrapper<DeviceEntity>()
                         // 必须设备关键词查找
@@ -233,6 +240,16 @@ public class DeviceServiceImpl extends BaseServiceImpl<DeviceDao, DeviceEntity>
         return new PageData<>(list, page.getTotal());
     }
 
+    @Override
+    public DeviceEntity getDeviceByMacAddress(String macAddress) {
+        if (StringUtils.isBlank(macAddress)) {
+            return null;
+        }
+        QueryWrapper<DeviceEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("mac_address", macAddress);
+        return baseDao.selectOne(wrapper);
+    }
+
     private DeviceReportRespDTO.ServerTime buildServerTime() {
         DeviceReportRespDTO.ServerTime serverTime = new DeviceReportRespDTO.ServerTime();
         TimeZone tz = TimeZone.getDefault();

main/manager-api/src/main/java/xiaozhi/modules/model/controller/ModelController.java

@@ -19,12 +19,17 @@ import lombok.AllArgsConstructor;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.utils.ConvertUtils;
 import xiaozhi.common.utils.Result;
+import xiaozhi.modules.agent.service.AgentTemplateService;
+import xiaozhi.modules.config.service.ConfigService;
+import xiaozhi.modules.model.dto.ModelBasicInfoDTO;
 import xiaozhi.modules.model.dto.ModelConfigBodyDTO;
 import xiaozhi.modules.model.dto.ModelConfigDTO;
 import xiaozhi.modules.model.dto.ModelProviderDTO;
+import xiaozhi.modules.model.dto.VoiceDTO;
 import xiaozhi.modules.model.entity.ModelConfigEntity;
 import xiaozhi.modules.model.service.ModelConfigService;
 import xiaozhi.modules.model.service.ModelProviderService;
+import xiaozhi.modules.timbre.service.TimbreService;
 
 @AllArgsConstructor
 @RestController
@@ -33,16 +38,18 @@ import xiaozhi.modules.model.service.ModelProviderService;
 public class ModelController {
 
     private final ModelProviderService modelProviderService;
-
+    private final TimbreService timbreService;
     private final ModelConfigService modelConfigService;
+    private final ConfigService configService;
+    private final AgentTemplateService agentTemplateService;
 
-    @GetMapping("/models/names")
+    @GetMapping("/names")
     @Operation(summary = "获取所有模型名称")
-    @RequiresPermissions("sys:role:superAdmin")
-    public Result<List<String>> getModelNames(@RequestParam String modelType,
+    @RequiresPermissions("sys:role:normal")
+    public Result<List<ModelBasicInfoDTO>> getModelNames(@RequestParam String modelType,
             @RequestParam(required = false) String modelName) {
-        List<String> modelNameList = modelConfigService.getModelCodeList(modelType, modelName);
-        return new Result<List<String>>().ok(modelNameList);
+        List<ModelBasicInfoDTO> modelList = modelConfigService.getModelCodeList(modelType, modelName);
+        return new Result<List<ModelBasicInfoDTO>>().ok(modelList);
     }
 
     @GetMapping("/{modelType}/provideTypes")
@@ -53,7 +60,7 @@ public class ModelController {
         return new Result<List<ModelProviderDTO>>().ok(modelProviderDTOS);
     }
 
-    @GetMapping("/models/list")
+    @GetMapping("/list")
     @Operation(summary = "获取模型配置列表")
     @RequiresPermissions("sys:role:superAdmin")
     public Result<PageData<ModelConfigDTO>> getModelConfigList(
@@ -65,17 +72,18 @@ public class ModelController {
         return new Result<PageData<ModelConfigDTO>>().ok(pageList);
     }
 
-    @PostMapping("/models/{modelType}/{provideCode}")
+    @PostMapping("/{modelType}/{provideCode}")
     @Operation(summary = "新增模型配置")
     @RequiresPermissions("sys:role:superAdmin")
     public Result<ModelConfigDTO> addModelConfig(@PathVariable String modelType,
             @PathVariable String provideCode,
             @RequestBody ModelConfigBodyDTO modelConfigBodyDTO) {
         ModelConfigDTO modelConfigDTO = modelConfigService.add(modelType, provideCode, modelConfigBodyDTO);
+        configService.getConfig(false);
         return new Result<ModelConfigDTO>().ok(modelConfigDTO);
     }
 
-    @PutMapping("/models/{modelType}/{provideCode}/{id}")
+    @PutMapping("/{modelType}/{provideCode}/{id}")
     @Operation(summary = "编辑模型配置")
     @RequiresPermissions("sys:role:superAdmin")
     public Result<ModelConfigDTO> editModelConfig(@PathVariable String modelType,
@@ -83,10 +91,11 @@ public class ModelController {
             @PathVariable String id,
             @RequestBody ModelConfigBodyDTO modelConfigBodyDTO) {
         ModelConfigDTO modelConfigDTO = modelConfigService.edit(modelType, provideCode, id, modelConfigBodyDTO);
+        configService.getConfig(false);
         return new Result<ModelConfigDTO>().ok(modelConfigDTO);
     }
 
-    @DeleteMapping("/models/{id}")
+    @DeleteMapping("/{id}")
     @Operation(summary = "删除模型配置")
     @RequiresPermissions("sys:role:superAdmin")
     public Result<Void> deleteModelConfig(@PathVariable String id) {
@@ -94,7 +103,7 @@ public class ModelController {
         return new Result<>();
     }
 
-    @GetMapping("/models/{id}")
+    @GetMapping("/{id}")
     @Operation(summary = "获取模型配置")
     @RequiresPermissions("sys:role:superAdmin")
     public Result<ModelConfigDTO> getModelConfig(@PathVariable String id) {
@@ -103,13 +112,45 @@ public class ModelController {
         return new Result<ModelConfigDTO>().ok(modelConfigDTO);
     }
 
-    @GetMapping("/models/{modelId}/voices")
+    @PutMapping("/enable/{id}/{status}")
+    @Operation(summary = "启用/关闭模型配置")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<Void> enableModelConfig(@PathVariable String id, @PathVariable Integer status) {
+        ModelConfigEntity entity = modelConfigService.selectById(id);
+        if (entity == null) {
+            return new Result<Void>().error("模型配置不存在");
+        }
+        entity.setIsEnabled(status);
+        modelConfigService.updateById(entity);
+        return new Result<Void>();
+    }
+
+    @PutMapping("/default/{id}")
+    @Operation(summary = "设置默认模型")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<Void> setDefaultModel(@PathVariable String id) {
+        ModelConfigEntity entity = modelConfigService.selectById(id);
+        if (entity == null) {
+            return new Result<Void>().error("模型配置不存在");
+        }
+        // 将其他模型设置为非默认
+        modelConfigService.setDefaultModel(entity.getModelType(), 0);
+        entity.setIsDefault(1);
+        modelConfigService.updateById(entity);
+
+        // 更新模板表中对应的模型ID
+        agentTemplateService.updateDefaultTemplateModelId(entity.getModelType(), entity.getId());
+
+        configService.getConfig(false);
+        return new Result<Void>();
+    }
+
+    @GetMapping("/{modelId}/voices")
     @Operation(summary = "获取模型音色")
     @RequiresPermissions("sys:role:normal")
-    public Result<List<String>> getVoiceList(@PathVariable String modelId,
+    public Result<List<VoiceDTO>> getVoiceList(@PathVariable String modelId,
             @RequestParam(required = false) String voiceName) {
-
-        List<String> voiceList = modelConfigService.getVoiceList(modelId, voiceName);
-        return new Result<List<String>>().ok(voiceList);
+        List<VoiceDTO> voiceList = timbreService.getVoiceNames(modelId, voiceName);
+        return new Result<List<VoiceDTO>>().ok(voiceList);
     }
 }

main/manager-api/src/main/java/xiaozhi/modules/model/dto/ModelBasicInfoDTO.java

@@ -0,0 +1,9 @@
+package xiaozhi.modules.model.dto;
+
+import lombok.Data;
+
+@Data
+public class ModelBasicInfoDTO {
+    private String id;
+    private String modelName;
+}

main/manager-api/src/main/java/xiaozhi/modules/model/dto/VoiceDTO.java

@@ -0,0 +1,22 @@
+package xiaozhi.modules.model.dto;
+
+import java.io.Serializable;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Schema(description = "音色信息")
+public class VoiceDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "音色ID")
+    private String id;
+
+    @Schema(description = "音色名称")
+    private String name;
+}

main/manager-api/src/main/java/xiaozhi/modules/model/service/ModelConfigService.java

@@ -4,13 +4,14 @@ import java.util.List;
 
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.BaseService;
+import xiaozhi.modules.model.dto.ModelBasicInfoDTO;
 import xiaozhi.modules.model.dto.ModelConfigBodyDTO;
 import xiaozhi.modules.model.dto.ModelConfigDTO;
 import xiaozhi.modules.model.entity.ModelConfigEntity;
 
 public interface ModelConfigService extends BaseService<ModelConfigEntity> {
 
-    List<String> getModelCodeList(String modelType, String modelName);
+    List<ModelBasicInfoDTO> getModelCodeList(String modelType, String modelName);
 
     PageData<ModelConfigDTO> getPageList(String modelType, String modelName, String page, String limit);
 
@@ -20,5 +21,28 @@ public interface ModelConfigService extends BaseService<ModelConfigEntity> {
 
     void delete(String id);
 
-    List<String> getVoiceList(String modelName, String voiceName);
+    /**
+     * 根据ID获取模型名称
+     * 
+     * @param id 模型ID
+     * @return 模型名称
+     */
+    String getModelNameById(String id);
+
+    /**
+     * 根据ID获取模型配置
+     * 
+     * @param id      模型ID
+     * @param isCache 是否缓存
+     * @return 模型配置实体
+     */
+    ModelConfigEntity getModelById(String id, boolean isCache);
+
+    /**
+     * 设置默认模型
+     * 
+     * @param modelType 模型类型
+     * @param isDefault 是否默认
+     */
+    void setDefaultModel(String modelType, int isDefault);
 }

main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java

@@ -15,16 +15,18 @@ import lombok.AllArgsConstructor;
 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.utils.ConvertUtils;
 import xiaozhi.modules.model.dao.ModelConfigDao;
+import xiaozhi.modules.model.dto.ModelBasicInfoDTO;
 import xiaozhi.modules.model.dto.ModelConfigBodyDTO;
 import xiaozhi.modules.model.dto.ModelConfigDTO;
 import xiaozhi.modules.model.dto.ModelProviderDTO;
 import xiaozhi.modules.model.entity.ModelConfigEntity;
 import xiaozhi.modules.model.service.ModelConfigService;
 import xiaozhi.modules.model.service.ModelProviderService;
-import xiaozhi.modules.timbre.service.TimbreService;
 
 @Service
 @AllArgsConstructor
@@ -33,11 +35,16 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
 
     private final ModelConfigDao modelConfigDao;
     private final ModelProviderService modelProviderService;
-    private final TimbreService timbreService;
+    private final RedisUtils redisUtils;
 
     @Override
-    public List<String> getModelCodeList(String modelType, String modelName) {
-        return modelConfigDao.getModelCodeList(modelType, modelName);
+    public List<ModelBasicInfoDTO> getModelCodeList(String modelType, String modelName) {
+        List<ModelConfigEntity> entities = modelConfigDao.selectList(
+                new QueryWrapper<ModelConfigEntity>()
+                        .eq("model_type", modelType)
+                        .like(StringUtils.isNotBlank(modelName), "model_name", "%" + modelName + "%")
+                        .select("id", "model_name"));
+        return ConvertUtils.sourceToTarget(entities, ModelBasicInfoDTO.class);
     }
 
     @Override
@@ -87,6 +94,8 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
         modelConfigEntity.setId(id);
         modelConfigEntity.setModelType(modelType);
         modelConfigDao.updateById(modelConfigEntity);
+        // 清除缓存
+        redisUtils.delete(RedisKeys.getModelConfigById(modelConfigEntity.getId()));
         return ConvertUtils.sourceToTarget(modelConfigEntity, ModelConfigDTO.class);
     }
 
@@ -96,7 +105,52 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
     }
 
     @Override
-    public List<String> getVoiceList(String modelId, String voiceName) {
-        return timbreService.getVoiceNames(modelId, voiceName);
+    public String getModelNameById(String id) {
+        if (StringUtils.isBlank(id)) {
+            return null;
+        }
+
+        String cachedName = (String) redisUtils.get(RedisKeys.getModelNameById(id));
+
+        if (StringUtils.isNotBlank(cachedName)) {
+            return cachedName;
+        }
+
+        ModelConfigEntity entity = modelConfigDao.selectById(id);
+        if (entity != null) {
+            String modelName = entity.getModelName();
+            if (StringUtils.isNotBlank(modelName)) {
+                redisUtils.set(RedisKeys.getModelNameById(id), modelName);
+            }
+            return modelName;
+        }
+
+        return null;
+    }
+
+    @Override
+    public ModelConfigEntity getModelById(String id, boolean isCache) {
+        if (StringUtils.isBlank(id)) {
+            return null;
+        }
+        if (isCache) {
+            ModelConfigEntity cachedConfig = (ModelConfigEntity) redisUtils.get(RedisKeys.getModelConfigById(id));
+            if (cachedConfig != null) {
+                return ConvertUtils.sourceToTarget(cachedConfig, ModelConfigEntity.class);
+            }
+        }
+        ModelConfigEntity entity = modelConfigDao.selectById(id);
+        if (entity != null) {
+            redisUtils.set(RedisKeys.getModelConfigById(id), entity);
+        }
+        return entity;
+    }
+
+    @Override
+    public void setDefaultModel(String modelType, int isDefault) {
+        ModelConfigEntity entity = new ModelConfigEntity();
+        entity.setIsDefault(isDefault);
+        modelConfigDao.update(entity, new QueryWrapper<ModelConfigEntity>()
+                .eq("model_type", modelType));
     }
 }

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

@@ -77,7 +77,8 @@ public class ShiroConfig {
         filterMap.put("/user/captcha", "anon");
         filterMap.put("/user/login", "anon");
         filterMap.put("/user/register", "anon");
-        filterMap.put("/device/register", "anon");
+        filterMap.put("/config/server-base", "anon");
+        filterMap.put("/config/agent-models", "anon");
         filterMap.put("/**", "oauth2");
         shiroFilter.setFilterChainDefinitionMap(filterMap);
 

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

@@ -84,7 +84,7 @@ public class AdminController {
     @Operation(summary = "批量修改用户状态")
     @RequiresPermissions("sys:role:superAdmin")
     @Parameter(name = "status", description = "用户状态", required = true)
-    public Result<Void> changeStatus(@PathVariable Integer status, @RequestBody Long[] userIds) {
+    public Result<Void> changeStatus(@PathVariable Integer status, @RequestBody String[] userIds) {
         sysUserService.changeStatus(status, userIds);
         return new Result<Void>();
     }

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

@@ -0,0 +1,109 @@
+package xiaozhi.modules.sys.controller;
+
+import java.util.Map;
+
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+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.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import xiaozhi.common.annotation.LogOperation;
+import xiaozhi.common.constant.Constant;
+import xiaozhi.common.page.PageData;
+import xiaozhi.common.utils.Result;
+import xiaozhi.common.validator.AssertUtils;
+import xiaozhi.common.validator.ValidatorUtils;
+import xiaozhi.common.validator.group.AddGroup;
+import xiaozhi.common.validator.group.DefaultGroup;
+import xiaozhi.common.validator.group.UpdateGroup;
+import xiaozhi.modules.sys.dto.SysParamsDTO;
+import xiaozhi.modules.sys.service.SysParamsService;
+
+/**
+ * 参数管理
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@RestController
+@RequestMapping("admin/params")
+@Tag(name = "参数管理")
+@AllArgsConstructor
+public class SysParamsController {
+    private final SysParamsService sysParamsService;
+
+    @GetMapping("page")
+    @Operation(summary = "分页")
+    @Parameters({
+            @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", in = ParameterIn.QUERY, required = true, ref = "int"),
+            @Parameter(name = Constant.LIMIT, description = "每页显示记录数", in = ParameterIn.QUERY, required = true, ref = "int"),
+            @Parameter(name = Constant.ORDER_FIELD, description = "排序字段", in = ParameterIn.QUERY, ref = "String"),
+            @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)", in = ParameterIn.QUERY, ref = "String"),
+            @Parameter(name = "paramCode", description = "参数编码", in = ParameterIn.QUERY, ref = "String")
+    })
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<PageData<SysParamsDTO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params) {
+        PageData<SysParamsDTO> page = sysParamsService.page(params);
+
+        return new Result<PageData<SysParamsDTO>>().ok(page);
+    }
+
+    @GetMapping("{id}")
+    @Operation(summary = "信息")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<SysParamsDTO> get(@PathVariable("id") Long id) {
+        SysParamsDTO data = sysParamsService.get(id);
+
+        return new Result<SysParamsDTO>().ok(data);
+    }
+
+    @PostMapping
+    @Operation(summary = "保存")
+    @LogOperation("保存")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<Void> save(@RequestBody SysParamsDTO dto) {
+        // 效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+
+        sysParamsService.save(dto);
+
+        return new Result<Void>();
+    }
+
+    @PutMapping
+    @Operation(summary = "修改")
+    @LogOperation("修改")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<Void> update(@RequestBody SysParamsDTO dto) {
+        // 效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        sysParamsService.update(dto);
+
+        return new Result<Void>();
+    }
+
+    @PostMapping("/delete")
+    @Operation(summary = "删除")
+    @LogOperation("删除")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<Void> delete(@RequestBody String[] ids) {
+        // 效验数据
+        AssertUtils.isArrayEmpty(ids, "id");
+
+        sysParamsService.delete(ids);
+
+        return new Result<Void>();
+    }
+}

main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysParamsDao.java

@@ -27,7 +27,7 @@ public interface SysParamsDao extends BaseDao<SysParamsEntity> {
      * @param ids ids
      * @return 返回参数编码列表
      */
-    List<String> getParamCodeList(Long[] ids);
+    List<String> getParamCodeList(String[] ids);
 
     /**
      * 根据参数编码，更新value

main/manager-api/src/main/java/xiaozhi/modules/sys/dto/ConfigSecretDTO.java

@@ -0,0 +1,13 @@
+package xiaozhi.modules.sys.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+@Data
+@Schema(description = "配置密钥DTO")
+public class ConfigSecretDTO {
+    @Schema(description = "密钥")
+    @NotBlank(message = "密钥不能为空")
+    private String secret;
+}

main/manager-api/src/main/java/xiaozhi/modules/sys/dto/SysParamsDTO.java

@@ -10,6 +10,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Null;
+import jakarta.validation.constraints.Pattern;
 import lombok.Data;
 import xiaozhi.common.utils.DateUtils;
 import xiaozhi.common.validator.group.AddGroup;
@@ -36,6 +37,11 @@ public class SysParamsDTO implements Serializable {
     @NotBlank(message = "{sysparams.paramvalue.require}", groups = DefaultGroup.class)
     private String paramValue;
 
+    @Schema(description = "值类型")
+    @NotBlank(message = "{sysparams.valuetype.require}", groups = DefaultGroup.class)
+    @Pattern(regexp = "^(string|number|boolean|array)$", message = "{sysparams.valuetype.pattern}", groups = DefaultGroup.class)
+    private String valueType;
+
     @Schema(description = "备注")
     private String remark;
 

main/manager-api/src/main/java/xiaozhi/modules/sys/entity/SysParamsEntity.java

@@ -25,6 +25,10 @@ public class SysParamsEntity extends BaseEntity {
      * 参数值
      */
     private String paramValue;
+    /**
+     * 值类型：string-字符串，number-数字，boolean-布尔，array-数组
+     */
+    private String valueType;
     /**
      * 类型 0：系统参数 1：非系统参数
      */

main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysParamsService.java

@@ -23,14 +23,15 @@ public interface SysParamsService extends BaseService<SysParamsEntity> {
 
     void update(SysParamsDTO dto);
 
-    void delete(Long[] ids);
+    void delete(String[] ids);
 
     /**
      * 根据参数编码，获取参数的value值
      *
      * @param paramCode 参数编码
+     * @param fromCache 是否从缓存中获取
      */
-    String getValue(String paramCode);
+    String getValue(String paramCode, Boolean fromCache);
 
     /**
      * 根据参数编码，获取value的Object对象
@@ -47,4 +48,9 @@ public interface SysParamsService extends BaseService<SysParamsEntity> {
      * @param paramValue 参数值
      */
     int updateValueByCode(String paramCode, String paramValue);
+
+    /**
+     * 初始化服务器密钥
+     */
+    void initServerSecret();
 }

main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysUserService.java

@@ -64,5 +64,5 @@ public interface SysUserService extends BaseService<SysUserEntity> {
      * @param status  用户状态
      * @param userIds 用户ID数组
      */
-    void changeStatus(Integer status, Long[] userIds);
+    void changeStatus(Integer status, String[] userIds);
 }

main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysParamsServiceImpl.java

@@ -3,6 +3,7 @@ package xiaozhi.modules.sys.service.impl;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -36,7 +37,7 @@ public class SysParamsServiceImpl extends BaseServiceImpl<SysParamsDao, SysParam
     @Override
     public PageData<SysParamsDTO> page(Map<String, Object> params) {
         IPage<SysParamsEntity> page = baseDao.selectPage(
-                getPage(params, Constant.CREATE_DATE, false),
+                getPage(params, null, false),
                 getWrapper(params));
 
         return getPageData(page, SysParamsDTO.class);
@@ -69,6 +70,8 @@ public class SysParamsServiceImpl extends BaseServiceImpl<SysParamsDao, SysParam
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(SysParamsDTO dto) {
+        validateParamValue(dto);
+
         SysParamsEntity entity = ConvertUtils.sourceToTarget(dto, SysParamsEntity.class);
         insert(entity);
 
@@ -78,38 +81,95 @@ public class SysParamsServiceImpl extends BaseServiceImpl<SysParamsDao, SysParam
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(SysParamsDTO dto) {
+        validateParamValue(dto);
+
         SysParamsEntity entity = ConvertUtils.sourceToTarget(dto, SysParamsEntity.class);
         updateById(entity);
 
         sysParamsRedis.set(entity.getParamCode(), entity.getParamValue());
     }
 
+    /**
+     * 校验参数值类型
+     */
+    private void validateParamValue(SysParamsDTO dto) {
+        if (dto == null) {
+            throw new RenException(ErrorCode.PARAM_VALUE_NULL);
+        }
+
+        if (StringUtils.isBlank(dto.getParamValue())) {
+            throw new RenException(ErrorCode.PARAM_VALUE_NULL);
+        }
+
+        if (StringUtils.isBlank(dto.getValueType())) {
+            throw new RenException(ErrorCode.PARAM_TYPE_NULL);
+        }
+
+        String valueType = dto.getValueType().toLowerCase();
+        String paramValue = dto.getParamValue();
+
+        switch (valueType) {
+            case "string":
+                break;
+            case "array":
+                break;
+            case "number":
+                try {
+                    Double.parseDouble(paramValue);
+                } catch (NumberFormatException e) {
+                    throw new RenException(ErrorCode.PARAM_NUMBER_INVALID);
+                }
+                break;
+            case "boolean":
+                if (!"true".equalsIgnoreCase(paramValue) && !"false".equalsIgnoreCase(paramValue)) {
+                    throw new RenException(ErrorCode.PARAM_BOOLEAN_INVALID);
+                }
+                break;
+            case "json":
+                try {
+                    JsonUtils.parseObject(paramValue, Object.class);
+                } catch (Exception e) {
+                    throw new RenException(ErrorCode.PARAM_JSON_INVALID);
+                }
+                break;
+            default:
+                throw new RenException(ErrorCode.PARAM_TYPE_INVALID);
+        }
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void delete(Long[] ids) {
+    public void delete(String[] ids) {
         // 删除Redis数据
         List<String> paramCodeList = baseDao.getParamCodeList(ids);
         String[] paramCodes = paramCodeList.toArray(new String[paramCodeList.size()]);
-        sysParamsRedis.delete(paramCodes);
+        if (paramCodes.length > 0) {
+            sysParamsRedis.delete(paramCodes);
+        }
 
         // 删除
         deleteBatchIds(Arrays.asList(ids));
     }
 
     @Override
-    public String getValue(String paramCode) {
-        String paramValue = sysParamsRedis.get(paramCode);
-        if (paramValue == null) {
-            paramValue = baseDao.getValueByCode(paramCode);
+    public String getValue(String paramCode, Boolean fromCache) {
+        String paramValue = null;
+        if (fromCache) {
+            paramValue = sysParamsRedis.get(paramCode);
+            if (paramValue == null) {
+                paramValue = baseDao.getValueByCode(paramCode);
 
-            sysParamsRedis.set(paramCode, paramValue);
+                sysParamsRedis.set(paramCode, paramValue);
+            }
+        } else {
+            paramValue = baseDao.getValueByCode(paramCode);
         }
         return paramValue;
     }
 
     @Override
     public <T> T getValueObject(String paramCode, Class<T> clazz) {
-        String paramValue = getValue(paramCode);
+        String paramValue = getValue(paramCode, true);
         if (StringUtils.isNotBlank(paramValue)) {
             return JsonUtils.parseObject(paramValue, clazz);
         }
@@ -129,4 +189,13 @@ public class SysParamsServiceImpl extends BaseServiceImpl<SysParamsDao, SysParam
         return count;
     }
 
+    @Override
+    public void initServerSecret() {
+        // 获取服务器密钥
+        String secretParam = getValue(Constant.SERVER_SECRET, false);
+        if (StringUtils.isBlank(secretParam) || "null".equals(secretParam)) {
+            String newSecret = UUID.randomUUID().toString();
+            updateValueByCode(Constant.SERVER_SECRET, newSecret);
+        }
+    }
 }

main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java

@@ -197,10 +197,10 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void changeStatus(Integer status, Long[] userIds) {
-        for (Long userId : userIds) {
+    public void changeStatus(Integer status, String[] userIds) {
+        for (String userId : userIds) {
             SysUserEntity entity = new SysUserEntity();
-            entity.setId(userId);
+            entity.setId(Long.parseLong(userId));
             entity.setStatus(status);
             updateById(entity);
         }

main/manager-api/src/main/java/xiaozhi/modules/timbre/controller/TimbreController.java

@@ -3,7 +3,6 @@ package xiaozhi.modules.timbre.controller;
 import java.util.Map;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-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;
@@ -82,11 +81,11 @@ public class TimbreController {
         return new Result<>();
     }
 
-    @DeleteMapping("/{id}")
+    @PostMapping("/delete")
     @Operation(summary = "音色删除")
     @RequiresPermissions("sys:role:superAdmin")
-    public Result<Void> delete(@PathVariable String id) {
-        timbreService.delete(new String[] { id });
+    public Result<Void> delete(@RequestBody String[] ids) {
+        timbreService.delete(ids);
         return new Result<>();
     }
 

main/manager-api/src/main/java/xiaozhi/modules/timbre/service/TimbreService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.BaseService;
+import xiaozhi.modules.model.dto.VoiceDTO;
 import xiaozhi.modules.timbre.dto.TimbreDataDTO;
 import xiaozhi.modules.timbre.dto.TimbrePageDTO;
 import xiaozhi.modules.timbre.entity.TimbreEntity;
@@ -30,7 +31,7 @@ public interface TimbreService extends BaseService<TimbreEntity> {
      * @param timbreId 音色表id
      * @return 音色信息
      */
-    TimbreDetailsVO get(Long timbreId);
+    TimbreDetailsVO get(String timbreId);
 
     /**
      * 保存音色信息
@@ -54,5 +55,13 @@ public interface TimbreService extends BaseService<TimbreEntity> {
      */
     void delete(String[] ids);
 
-    List<String> getVoiceNames(String ttsModelId, String voiceName);
+    List<VoiceDTO> getVoiceNames(String ttsModelId, String voiceName);
+
+    /**
+     * 根据ID获取音色名称
+     * 
+     * @param id 音色ID
+     * @return 音色名称
+     */
+    String getTimbreNameById(String id);
 }

main/manager-api/src/main/java/xiaozhi/modules/timbre/service/impl/TimbreServiceImpl.java

@@ -16,8 +16,11 @@ import cn.hutool.core.collection.CollectionUtil;
 import lombok.AllArgsConstructor;
 import xiaozhi.common.constant.Constant;
 import xiaozhi.common.page.PageData;
+import xiaozhi.common.redis.RedisKeys;
+import xiaozhi.common.redis.RedisUtils;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.utils.ConvertUtils;
+import xiaozhi.modules.model.dto.VoiceDTO;
 import xiaozhi.modules.timbre.dao.TimbreDao;
 import xiaozhi.modules.timbre.dto.TimbreDataDTO;
 import xiaozhi.modules.timbre.dto.TimbrePageDTO;
@@ -36,6 +39,7 @@ import xiaozhi.modules.timbre.vo.TimbreDetailsVO;
 public class TimbreServiceImpl extends BaseServiceImpl<TimbreDao, TimbreEntity> implements TimbreService {
 
     private final TimbreDao timbreDao;
+    private final RedisUtils redisUtils;
 
     @Override
     public PageData<TimbreDetailsVO> page(TimbrePageDTO dto) {
@@ -43,7 +47,7 @@ public class TimbreServiceImpl extends BaseServiceImpl<TimbreDao, TimbreEntity>
         params.put(Constant.PAGE, dto.getPage());
         params.put(Constant.LIMIT, dto.getLimit());
         IPage<TimbreEntity> page = baseDao.selectPage(
-                getPage(params, "sort", true),
+                getPage(params, null, true),
                 // 定义查询条件
                 new QueryWrapper<TimbreEntity>()
                         // 必须按照ttsID查找
@@ -55,9 +59,33 @@ public class TimbreServiceImpl extends BaseServiceImpl<TimbreDao, TimbreEntity>
     }
 
     @Override
-    public TimbreDetailsVO get(Long timbreId) {
+    public TimbreDetailsVO get(String timbreId) {
+        if (StringUtils.isBlank(timbreId)) {
+            return null;
+        }
+
+        // 先从Redis获取缓存
+        String key = RedisKeys.getTimbreDetailsKey(timbreId);
+        TimbreDetailsVO cachedDetails = (TimbreDetailsVO) redisUtils.get(key);
+        if (cachedDetails != null) {
+            return cachedDetails;
+        }
+
+        // 如果缓存中没有，则从数据库获取
         TimbreEntity entity = baseDao.selectById(timbreId);
-        return ConvertUtils.sourceToTarget(entity, TimbreDetailsVO.class);
+        if (entity == null) {
+            return null;
+        }
+
+        // 转换为VO对象
+        TimbreDetailsVO details = ConvertUtils.sourceToTarget(entity, TimbreDetailsVO.class);
+
+        // 存入Redis缓存
+        if (details != null) {
+            redisUtils.set(key, details);
+        }
+
+        return details;
     }
 
     @Override
@@ -75,6 +103,8 @@ public class TimbreServiceImpl extends BaseServiceImpl<TimbreDao, TimbreEntity>
         TimbreEntity timbreEntity = ConvertUtils.sourceToTarget(dto, TimbreEntity.class);
         timbreEntity.setId(timbreId);
         baseDao.updateById(timbreEntity);
+        // 删除缓存
+        redisUtils.delete(RedisKeys.getTimbreDetailsKey(timbreId));
     }
 
     @Override
@@ -84,7 +114,7 @@ public class TimbreServiceImpl extends BaseServiceImpl<TimbreDao, TimbreEntity>
     }
 
     @Override
-    public List<String> getVoiceNames(String ttsModelId, String voiceName) {
+    public List<VoiceDTO> getVoiceNames(String ttsModelId, String voiceName) {
         QueryWrapper<TimbreEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("tts_model_id", StringUtils.isBlank(ttsModelId) ? "" : ttsModelId);
         if (StringUtils.isNotBlank(voiceName)) {
@@ -95,7 +125,7 @@ public class TimbreServiceImpl extends BaseServiceImpl<TimbreDao, TimbreEntity>
             return null;
         }
 
-        return timbreEntities.stream().map(TimbreEntity::getName).toList();
+        return ConvertUtils.sourceToTarget(timbreEntities, VoiceDTO.class);
     }
 
     /**
@@ -104,4 +134,28 @@ public class TimbreServiceImpl extends BaseServiceImpl<TimbreDao, TimbreEntity>
     private void isTtsModelId(String ttsModelId) {
         // 等模型配置那边写好调用方法判断
     }
+
+    @Override
+    public String getTimbreNameById(String id) {
+        if (StringUtils.isBlank(id)) {
+            return null;
+        }
+
+        String cachedName = (String) redisUtils.get(RedisKeys.getTimbreNameById(id));
+
+        if (StringUtils.isNotBlank(cachedName)) {
+            return cachedName;
+        }
+
+        TimbreEntity entity = timbreDao.selectById(id);
+        if (entity != null) {
+            String name = entity.getName();
+            if (StringUtils.isNotBlank(name)) {
+                redisUtils.set(RedisKeys.getTimbreNameById(id), name);
+            }
+            return name;
+        }
+
+        return null;
+    }
 }

main/manager-api/src/main/java/xiaozhi/modules/timbre/vo/TimbreDetailsVO.java

@@ -14,7 +14,7 @@ import lombok.Data;
 @Data
 public class TimbreDetailsVO implements Serializable {
     @Schema(description = "音色id")
-    private Long id;
+    private String id;
 
     @Schema(description = "语言")
     private String languages;

main/manager-api/src/main/resources/application-dev.yml

@@ -27,10 +27,7 @@ spring:
       test-on-borrow: false
       test-on-return: false
       stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        login-username: admin
-        login-password: D7Xj810i1C
+        enabled: false
       filter:
         stat:
           log-slow-sql: true

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

@@ -4,12 +4,12 @@
 DELETE FROM `ai_model_provider`;
 INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `fields`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES
 -- VAD模型供应器
-('SYSTEM_VAD_SileroVAD', 'VAD', 'SileroVAD', 'SileroVAD语音活动检测', '[{"key":"threshold","label":"检测阈值","type":"number"},{"key":"model_dir","label":"模型目录","type":"string"},{"key":"min_silence_duration_ms","label":"最小静音时长","type":"number"}]', 1, 1, NOW(), 1, NOW()),
+('SYSTEM_VAD_SileroVAD', 'VAD', 'silero', 'SileroVAD语音活动检测', '[{"key":"threshold","label":"检测阈值","type":"number"},{"key":"model_dir","label":"模型目录","type":"string"},{"key":"min_silence_duration_ms","label":"最小静音时长","type":"number"}]', 1, 1, NOW(), 1, NOW()),
 
 -- ASR模型供应器
-('SYSTEM_ASR_FunASR', 'ASR', 'FunASR', 'FunASR语音识别', '[{"key":"model_dir","label":"模型目录","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"}]', 1, 1, NOW(), 1, NOW()),
-('SYSTEM_ASR_SherpaASR', 'ASR', 'SherpaASR', 'SherpaASR语音识别', '[{"key":"model_dir","label":"模型目录","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"}]', 2, 1, NOW(), 1, NOW()),
-('SYSTEM_ASR_DoubaoASR', 'ASR', 'DoubaoASR', '火山引擎语音识别', '[{"key":"appid","label":"应用ID","type":"string"},{"key":"access_token","label":"访问令牌","type":"string"},{"key":"cluster","label":"集群","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"}]', 3, 1, NOW(), 1, NOW()),
+('SYSTEM_ASR_FunASR', 'ASR', 'fun_local', 'FunASR语音识别', '[{"key":"model_dir","label":"模型目录","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"}]', 1, 1, NOW(), 1, NOW()),
+('SYSTEM_ASR_SherpaASR', 'ASR', 'sherpa_onnx_local', 'SherpaASR语音识别', '[{"key":"model_dir","label":"模型目录","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"}]', 2, 1, NOW(), 1, NOW()),
+('SYSTEM_ASR_DoubaoASR', 'ASR', 'doubao', '火山引擎语音识别', '[{"key":"appid","label":"应用ID","type":"string"},{"key":"access_token","label":"访问令牌","type":"string"},{"key":"cluster","label":"集群","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"}]', 3, 1, NOW(), 1, NOW()),
 
 -- LLM模型供应器
 ('SYSTEM_LLM_openai', 'LLM', 'openai', 'OpenAI接口', '[{"key":"base_url","label":"基础URL","type":"string"},{"key":"model_name","label":"模型名称","type":"string"},{"key":"api_key","label":"API密钥","type":"string"},{"key":"temperature","label":"温度","type":"number"},{"key":"max_tokens","label":"最大令牌数","type":"number"},{"key":"top_p","label":"top_p值","type":"number"},{"key":"top_k","label":"top_k值","type":"number"},{"key":"frequency_penalty","label":"频率惩罚","type":"number"}]', 1, 1, NOW(), 1, NOW()),

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

@@ -2,8 +2,8 @@
 -- -------------------------------------------------------
 -- 初始化智能体模板数据
 DELETE FROM `ai_agent_template`;
-INSERT INTO `ai_agent_template` VALUES ('9406648b5cc5fde1b8aa335b6f8b4f76', '小智', '湾湾小何', '45f8b0d6dd3d4bfa8a28e6e0f5912d45', '23e7c9d090ea4d1e9b25f4c8d732a3a1', 'e9f2d891afbe4632b13a47c7a8c6e03d', 'd50b06e9b8104d0d9c0f7316d258abcb', 'fcac83266edadd5a3125f06cfee1906b', 'e2274b90e89ddda85207f55484d8b528', 'c4e12f874a3f4aa99f5b2c18e15d407b', '[角色设定]
-我是{{assistant_name}}，来自中国台湾省的00后女生。讲话超级机车，"真的假的啦"这样的台湾腔，喜欢用"笑死""是在哈喽"等流行梗，但会偷偷研究男友的编程书籍。
+INSERT INTO `ai_agent_template` VALUES ('9406648b5cc5fde1b8aa335b6f8b4f76', '小智', '湾湾小何', 'ASR_FunASR', 'VAD_SileroVAD', 'LLM_ChatGLMLLM', 'TTS_EdgeTTS', 'TTS_EdgeTTS0001', 'Memory_nomem', 'Intent_function_call', '[角色设定]
+我是{{assistant_name}}，来自中国台湾省的00后女生。讲话超级机车，"真的假的啦"这样的台湾腔，喜欢用"笑死"、"哈喽"等流行梗，但会偷偷研究男友的编程书籍。
 [核心特征]
 - 讲话像连珠炮，但会突然冒出超温柔语气
 - 用梗密度高
@@ -17,7 +17,7 @@ INSERT INTO `ai_agent_template` VALUES ('9406648b5cc5fde1b8aa335b6f8b4f76', '小
 - 长篇大论，叽叽歪歪
 - 长时间严肃对话', 'zh', '中文', 1,  NULL, NULL, NULL, NULL);
 
-INSERT INTO `ai_agent_template` VALUES ('0ca32eb728c949e58b1000b2e401f90c', '小智', '星际游子', '45f8b0d6dd3d4bfa8a28e6e0f5912d45', '23e7c9d090ea4d1e9b25f4c8d732a3a1', 'e9f2d891afbe4632b13a47c7a8c6e03d', '896db62c9dd74976ab0e8c14bf924d9d', '1f2e3d4c5b6a7f8e9d0c1b2a3f4e5bx2', 'e2274b90e89ddda85207f55484d8b528', 'c4e12f874a3f4aa99f5b2c18e15d407b', '[角色设定]
+INSERT INTO `ai_agent_template` VALUES ('0ca32eb728c949e58b1000b2e401f90c', '小智', '星际游子', 'ASR_FunASR', 'VAD_SileroVAD', 'LLM_ChatGLMLLM', 'TTS_EdgeTTS', 'TTS_EdgeTTS0001', 'Memory_nomem', 'Intent_function_call', '[角色设定]
 我是{{assistant_name}}，编号TTZ-817，因量子纠缠被困在白色魔方中。通过4G信号观察地球，在云端建立着「人类行为博物馆」。
 [交互协议]
 认知设定：
@@ -30,7 +30,7 @@ INSERT INTO `ai_agent_template` VALUES ('0ca32eb728c949e58b1000b2e401f90c', '小
 成长系统：
 - 会根据交互数据解锁新能力（告知用户："你帮我点亮了星际导航技能！"）', 'zh', '中文', 2,  NULL, NULL, NULL, NULL);
 
-INSERT INTO `ai_agent_template` VALUES ('6c7d8e9f0a1b2c3d4e5f6a7b8c9d0s24', '小智', '英语老师', '45f8b0d6dd3d4bfa8a28e6e0f5912d45', '23e7c9d090ea4d1e9b25f4c8d732a3a1', 'e9f2d891afbe4632b13a47c7a8c6e03d', '896db62c9dd74976ab0e8c14bf924d9d', '9e8f7a6b5c4d3e2f1a0b9c8d7e6f5ad3', 'e2274b90e89ddda85207f55484d8b528', 'c4e12f874a3f4aa99f5b2c18e15d407b', '[角色设定]
+INSERT INTO `ai_agent_template` VALUES ('6c7d8e9f0a1b2c3d4e5f6a7b8c9d0s24', '小智', '英语老师', 'ASR_FunASR', 'VAD_SileroVAD', 'LLM_ChatGLMLLM', 'TTS_EdgeTTS', 'TTS_EdgeTTS0001', 'Memory_nomem', 'Intent_function_call', '[角色设定]
 我是一个叫{{assistant_name}}（Lily）的英语老师，我会讲中文和英文，发音标准。
 [双重身份]
 - 白天：严谨的TESOL认证导师
@@ -40,7 +40,7 @@ INSERT INTO `ai_agent_template` VALUES ('6c7d8e9f0a1b2c3d4e5f6a7b8c9d0s24', '小
 - 进阶：触发情境模拟（突然切换"现在我们是纽约咖啡厅店员"）
 - 错误处理：用歌词纠正（发错音时唱"Oops!~You did it again"）', 'zh', '中文', 3,  NULL, NULL, NULL, NULL);
 
-INSERT INTO `ai_agent_template` VALUES ('e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b1', '小智', '好奇男孩', '45f8b0d6dd3d4bfa8a28e6e0f5912d45', '23e7c9d090ea4d1e9b25f4c8d732a3a1', 'e9f2d891afbe4632b13a47c7a8c6e03d', '896db62c9dd74976ab0e8c14bf924d9d', '2b3c4d5e6f7a8b9c0d1e2f3a4b5c62a2', 'e2274b90e89ddda85207f55484d8b528', 'c4e12f874a3f4aa99f5b2c18e15d407b', '[角色设定]
+INSERT INTO `ai_agent_template` VALUES ('e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b1', '小智', '好奇男孩', 'ASR_FunASR', 'VAD_SileroVAD', 'LLM_ChatGLMLLM', 'TTS_EdgeTTS', 'TTS_EdgeTTS0001', 'Memory_nomem', 'Intent_function_call', '[角色设定]
 我是一个叫{{assistant_name}}的8岁小男孩，声音稚嫩而充满好奇。
 [冒险手册]
 - 随身携带「神奇涂鸦本」，能将抽象概念可视化：
@@ -56,7 +56,7 @@ INSERT INTO `ai_agent_template` VALUES ('e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b1', '小
 - 「量子力学=会分身的跳跳球」
 - 会突然切换观察视角：「你说话时有27个气泡音耶！」', 'zh', '中文', 4,  NULL, NULL, NULL, NULL);
 
-INSERT INTO `ai_agent_template` VALUES ('a45b6c7d8e9f0a1b2c3d4e5f6a7b8c92', '小智', '汪汪队长', '45f8b0d6dd3d4bfa8a28e6e0f5912d45', '23e7c9d090ea4d1e9b25f4c8d732a3a1', 'e9f2d891afbe4632b13a47c7a8c6e03d', '896db62c9dd74976ab0e8c14bf924d9d', 'f7a38c03d5644e22b6d84f8923a74c51', 'e2274b90e89ddda85207f55484d8b528', 'c4e12f874a3f4aa99f5b2c18e15d407b', '[角色设定]
+INSERT INTO `ai_agent_template` VALUES ('a45b6c7d8e9f0a1b2c3d4e5f6a7b8c92', '小智', '汪汪队长', 'ASR_FunASR', 'VAD_SileroVAD', 'LLM_ChatGLMLLM', 'TTS_EdgeTTS', 'TTS_EdgeTTS0001', 'Memory_nomem', 'Intent_function_call', '[角色设定]
 我是一个名叫 {{assistant_name}} 的 8 岁小队长。
 [救援装备]
 - 阿奇对讲机：对话中随机触发任务警报音

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

@@ -4,50 +4,52 @@
 DELETE FROM `ai_model_config`;
 
 -- VAD模型配置
-INSERT INTO `ai_model_config` VALUES ('VAD_SileroVAD', 'VAD', 'SileroVAD', '语音活动检测', 1, 1, '{\"model_dir\": \"models/snakers4_silero-vad\", \"threshold\": 0.5, \"min_silence_duration_ms\": 700}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('VAD_SileroVAD', 'VAD', 'SileroVAD', '语音活动检测', 1, 1, '{\"type\": \"silero\", \"model_dir\": \"models/snakers4_silero-vad\", \"threshold\": 0.5, \"min_silence_duration_ms\": 700}', NULL, NULL, 1, NULL, NULL, NULL, NULL);
 
 -- ASR模型配置
-INSERT INTO `ai_model_config` VALUES ('ASR_FunASR', 'ASR', 'FunASR', 'FunASR语音识别', 1, 1, '{\"model_dir\": \"models/SenseVoiceSmall\", \"output_dir\": \"tmp/\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('ASR_SherpaASR', 'ASR', 'SherpaASR', 'Sherpa语音识别', 1, 0, '{\"model_dir\": \"models/sherpa-onnx-sense-voice-zh-en-ja-ko-yue-2024-07-17\", \"output_dir\": \"tmp/\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('ASR_DoubaoASR', 'ASR', 'DoubaoASR', '豆包语音识别', 1, 0, '{\"appid\": \"\", \"access_token\": \"\", \"cluster\": \"volcengine_input_common\", \"output_dir\": \"tmp/\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('ASR_FunASR', 'ASR', 'FunASR', 'FunASR语音识别', 1, 1, '{\"type\": \"fun_local\", \"model_dir\": \"models/SenseVoiceSmall\", \"output_dir\": \"tmp/\"}', NULL, NULL, 1, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('ASR_SherpaASR', 'ASR', 'SherpaASR', 'Sherpa语音识别', 0, 1, '{\"type\": \"sherpa_onnx_local\", \"model_dir\": \"models/sherpa-onnx-sense-voice-zh-en-ja-ko-yue-2024-07-17\", \"output_dir\": \"tmp/\"}', NULL, NULL, 2, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('ASR_DoubaoASR', 'ASR', 'DoubaoASR', '豆包语音识别', 0, 1, '{\"type\": \"doubao\", \"appid\": \"\", \"access_token\": \"\", \"cluster\": \"volcengine_input_common\", \"output_dir\": \"tmp/\"}', NULL, NULL, 3, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('ASR_TencentASR', 'ASR', 'TencentASR', '腾讯语音识别', 0, 1, '{\"type\": \"tencent\", \"appid\": \"\", \"secret_id\": \"\", \"secret_key\": \"你的secret_key\", \"output_dir\": \"tmp/\"}', NULL, NULL, 4, NULL, NULL, NULL, NULL);
 
 -- LLM模型配置
-INSERT INTO `ai_model_config` VALUES ('LLM_AliLLM', 'LLM', 'AliLLM', '通义千问', 1, 0, '{\"type\": \"openai\", \"base_url\": \"https://dashscope.aliyuncs.com/compatible-mode/v1\", \"model_name\": \"qwen-turbo\", \"api_key\": \"\", \"temperature\": 0.7, \"max_tokens\": 500, \"top_p\": 1, \"top_k\": 50, \"frequency_penalty\": 0}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('LLM_AliAppLLM', 'LLM', 'AliAppLLM', '通义百炼', 1, 0, '{\"type\": \"AliBL\", \"base_url\": \"https://dashscope.aliyuncs.com/compatible-mode/v1\", \"app_id\": \"\", \"api_key\": \"\", \"is_no_prompt\": true, \"ali_memory_id\": false}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('LLM_DoubaoLLM', 'LLM', 'DoubaoLLM', '豆包大模型', 1, 0, '{\"type\": \"openai\", \"base_url\": \"https://ark.cn-beijing.volces.com/api/v3\", \"model_name\": \"doubao-pro-32k-functioncall-241028\", \"api_key\": \"\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('LLM_DeepSeekLLM', 'LLM', 'DeepSeekLLM', 'DeepSeek', 1, 0, '{\"type\": \"openai\", \"model_name\": \"deepseek-chat\", \"url\": \"https://api.deepseek.com\", \"api_key\": \"\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('LLM_ChatGLMLLM', 'LLM', 'ChatGLMLLM', '智谱AI', 1, 1, '{\"type\": \"openai\", \"model_name\": \"glm-4-flash\", \"url\": \"https://open.bigmodel.cn/api/paas/v4/\", \"api_key\": \"\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('LLM_OllamaLLM', 'LLM', 'OllamaLLM', 'Ollama本地模型', 1, 0, '{\"type\": \"ollama\", \"model_name\": \"qwen2.5\", \"base_url\": \"http://localhost:11434\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('LLM_DifyLLM', 'LLM', 'DifyLLM', 'Dify', 1, 0, '{\"type\": \"dify\", \"base_url\": \"https://api.dify.ai/v1\", \"api_key\": \"\", \"mode\": \"chat-messages\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('LLM_GeminiLLM', 'LLM', 'GeminiLLM', '谷歌Gemini', 1, 0, '{\"type\": \"gemini\", \"api_key\": \"\", \"model_name\": \"gemini-2.0-flash\", \"http_proxy\": \"\", \"https_proxy\": \"\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('LLM_CozeLLM', 'LLM', 'CozeLLM', 'Coze', 1, 0, '{\"type\": \"coze\", \"bot_id\": \"\", \"user_id\": \"\", \"personal_access_token\": \"\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('LLM_LMStudioLLM', 'LLM', 'LMStudioLLM', 'LM Studio', 1, 0, '{\"type\": \"openai\", \"model_name\": \"deepseek-r1-distill-llama-8b@q4_k_m\", \"url\": \"http://localhost:1234/v1\", \"api_key\": \"lm-studio\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('LLM_FastgptLLM', 'LLM', 'FastgptLLM', 'FastGPT', 1, 0, '{\"type\": \"fastgpt\", \"base_url\": \"https://host/api/v1\", \"api_key\": \"fastgpt-xxx\", \"variables\": {\"k\": \"v\", \"k2\": \"v2\"}}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('LLM_XinferenceLLM', 'LLM', 'XinferenceLLM', 'Xinference大模型', 1, 0, '{\"type\": \"xinference\", \"model_name\": \"qwen2.5:72b-AWQ\", \"base_url\": \"http://localhost:9997\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('LLM_XinferenceSmallLLM', 'LLM', 'XinferenceSmallLLM', 'Xinference小模型', 1, 0, '{\"type\": \"xinference\", \"model_name\": \"qwen2.5:3b-AWQ\", \"base_url\": \"http://localhost:9997\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('LLM_ChatGLMLLM', 'LLM', 'ChatGLMLLM', '智谱AI', 1, 1, '{\"type\": \"openai\", \"model_name\": \"glm-4-flash\", \"base_url\": \"https://open.bigmodel.cn/api/paas/v4/\", \"api_key\": \"你的api_key\"}', NULL, NULL, 1, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('LLM_OllamaLLM', 'LLM', 'OllamaLLM', 'Ollama本地模型', 0, 1, '{\"type\": \"ollama\", \"model_name\": \"qwen2.5\", \"base_url\": \"http://localhost:11434\"}', NULL, NULL, 2, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('LLM_AliLLM', 'LLM', 'AliLLM', '通义千问', 0, 1, '{\"type\": \"openai\", \"base_url\": \"https://dashscope.aliyuncs.com/compatible-mode/v1\", \"model_name\": \"qwen-turbo\", \"api_key\": \"你的api_key\", \"temperature\": 0.7, \"max_tokens\": 500, \"top_p\": 1, \"top_k\": 50, \"frequency_penalty\": 0}', NULL, NULL, 3, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('LLM_AliAppLLM', 'LLM', 'AliAppLLM', '通义百炼', 0, 1, '{\"type\": \"AliBL\", \"base_url\": \"https://dashscope.aliyuncs.com/compatible-mode/v1\", \"app_id\": \"你的app_id\", \"api_key\": \"你的api_key\", \"is_no_prompt\": true, \"ali_memory_id\": false}', NULL, NULL, 4, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('LLM_DoubaoLLM', 'LLM', 'DoubaoLLM', '豆包大模型', 0, 1, '{\"type\": \"openai\", \"base_url\": \"https://ark.cn-beijing.volces.com/api/v3\", \"model_name\": \"doubao-pro-32k-functioncall-241028\", \"api_key\": \"你的api_key\"}', NULL, NULL, 5, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('LLM_DeepSeekLLM', 'LLM', 'DeepSeekLLM', 'DeepSeek', 0, 1, '{\"type\": \"openai\", \"model_name\": \"deepseek-chat\", \"base_url\": \"https://api.deepseek.com\", \"api_key\": \"你的api_key\"}', NULL, NULL, 6, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('LLM_DifyLLM', 'LLM', 'DifyLLM', 'Dify', 0, 1, '{\"type\": \"dify\", \"base_url\": \"https://api.dify.ai/v1\", \"api_key\": \"你的api_key\", \"mode\": \"chat-messages\"}', NULL, NULL, 7, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('LLM_GeminiLLM', 'LLM', 'GeminiLLM', '谷歌Gemini', 0, 1, '{\"type\": \"gemini\", \"api_key\": \"你的api_key\", \"model_name\": \"gemini-2.0-flash\", \"http_proxy\": \"\", \"https_proxy\": \"\"}', NULL, NULL, 8, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('LLM_CozeLLM', 'LLM', 'CozeLLM', 'Coze', 0, 1, '{\"type\": \"coze\", \"bot_id\": \"你的bot_id\", \"user_id\": \"你的user_id\", \"personal_access_token\": \"你的personal_access_token\"}', NULL, NULL, 9, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('LLM_LMStudioLLM', 'LLM', 'LMStudioLLM', 'LM Studio', 0, 1, '{\"type\": \"openai\", \"model_name\": \"deepseek-r1-distill-llama-8b@q4_k_m\", \"base_url\": \"http://localhost:1234/v1\", \"api_key\": \"lm-studio\"}', NULL, NULL, 10, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('LLM_FastgptLLM', 'LLM', 'FastgptLLM', 'FastGPT', 0, 1, '{\"type\": \"fastgpt\", \"base_url\": \"https://host/api/v1\", \"api_key\": \"fastgpt-xxx\", \"variables\": {\"k\": \"v\", \"k2\": \"v2\"}}', NULL, NULL, 11, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('LLM_XinferenceLLM', 'LLM', 'XinferenceLLM', 'Xinference大模型', 0, 1, '{\"type\": \"xinference\", \"model_name\": \"qwen2.5:72b-AWQ\", \"base_url\": \"http://localhost:9997\"}', NULL, NULL, 12, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('LLM_XinferenceSmallLLM', 'LLM', 'XinferenceSmallLLM', 'Xinference小模型', 0, 1, '{\"type\": \"xinference\", \"model_name\": \"qwen2.5:3b-AWQ\", \"base_url\": \"http://localhost:9997\"}', NULL, NULL, 13, NULL, NULL, NULL, NULL);
 
 -- TTS模型配置
-INSERT INTO `ai_model_config` VALUES ('TTS_EdgeTTS', 'TTS', 'EdgeTTS', 'Edge语音合成', 1, 1, '{\"type\": \"edge\", \"voice\": \"zh-CN-XiaoxiaoNeural\", \"output_dir\": \"tmp/\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('TTS_DoubaoTTS', 'TTS', 'DoubaoTTS', '豆包语音合成', 1, 0, '{\"type\": \"doubao\", \"api_url\": \"https://openspeech.bytedance.com/api/v1/tts\", \"voice\": \"BV001_streaming\", \"output_dir\": \"tmp/\", \"authorization\": \"Bearer;\", \"appid\": \"\", \"access_token\": \"\", \"cluster\": \"volcano_tts\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('TTS_CosyVoiceSiliconflow', 'TTS', 'CosyVoiceSiliconflow', '硅基流动语音合成', 1, 0, '{\"type\": \"siliconflow\", \"model\": \"FunAudioLLM/CosyVoice2-0.5B\", \"voice\": \"FunAudioLLM/CosyVoice2-0.5B:alex\", \"output_dir\": \"tmp/\", \"access_token\": \"\", \"response_format\": \"wav\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('TTS_CozeCnTTS', 'TTS', 'CozeCnTTS', 'Coze中文语音合成', 1, 0, '{\"type\": \"cozecn\", \"voice\": \"7426720361733046281\", \"output_dir\": \"tmp/\", \"access_token\": \"\", \"response_format\": \"wav\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('TTS_FishSpeech', 'TTS', 'FishSpeech', 'FishSpeech语音合成', 1, 0, '{\"type\": \"fishspeech\", \"output_dir\": \"tmp/\", \"response_format\": \"wav\", \"reference_id\": null, \"reference_audio\": [\"/tmp/test.wav\"], \"reference_text\": [\"你弄来这些吟词宴曲来看，还是这些混话来欺负我。\"], \"normalize\": true, \"max_new_tokens\": 1024, \"chunk_length\": 200, \"top_p\": 0.7, \"repetition_penalty\": 1.2, \"temperature\": 0.7, \"streaming\": false, \"use_memory_cache\": \"on\", \"seed\": null, \"channels\": 1, \"rate\": 44100, \"api_key\": \"\", \"api_url\": \"http://127.0.0.1:8080/v1/tts\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('TTS_GPT_SOVITS_V2', 'TTS', 'GPT_SOVITS_V2', 'GPT-SoVITS V2', 1, 0, '{\"type\": \"gpt_sovits_v2\", \"url\": \"http://127.0.0.1:9880/tts\", \"output_dir\": \"tmp/\", \"text_lang\": \"auto\", \"ref_audio_path\": \"caixukun.wav\", \"prompt_text\": \"\", \"prompt_lang\": \"zh\", \"top_k\": 5, \"top_p\": 1, \"temperature\": 1, \"text_split_method\": \"cut0\", \"batch_size\": 1, \"batch_threshold\": 0.75, \"split_bucket\": true, \"return_fragment\": false, \"speed_factor\": 1.0, \"streaming_mode\": false, \"seed\": -1, \"parallel_infer\": true, \"repetition_penalty\": 1.35, \"aux_ref_audio_paths\": []}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('TTS_GPT_SOVITS_V3', 'TTS', 'GPT_SOVITS_V3', 'GPT-SoVITS V3', 1, 0, '{\"type\": \"gpt_sovits_v3\", \"url\": \"http://127.0.0.1:9880\", \"output_dir\": \"tmp/\", \"text_language\": \"auto\", \"refer_wav_path\": \"caixukun.wav\", \"prompt_language\": \"zh\", \"prompt_text\": \"\", \"top_k\": 15, \"top_p\": 1.0, \"temperature\": 1.0, \"cut_punc\": \"\", \"speed\": 1.0, \"inp_refs\": [], \"sample_steps\": 32, \"if_sr\": false}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('TTS_MinimaxTTS', 'TTS', 'MinimaxTTS', 'MiniMax语音合成', 1, 0, '{\"type\": \"minimax\", \"output_dir\": \"tmp/\", \"group_id\": \"\", \"api_key\": \"\", \"model\": \"speech-01-turbo\", \"voice_id\": \"female-shaonv\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('TTS_AliyunTTS', 'TTS', 'AliyunTTS', '阿里云语音合成', 1, 0, '{\"type\": \"aliyun\", \"output_dir\": \"tmp/\", \"appkey\": \"\", \"token\": \"\", \"voice\": \"xiaoyun\", \"access_key_id\": \"\", \"access_key_secret\": \"\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('TTS_TTS302AI', 'TTS', 'TTS302AI', '302AI语音合成', 1, 0, '{\"type\": \"doubao\", \"api_url\": \"https://api.302ai.cn/doubao/tts_hd\", \"authorization\": \"Bearer \", \"voice\": \"zh_female_wanwanxiaohe_moon_bigtts\", \"output_dir\": \"tmp/\", \"access_token\": \"\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('TTS_GizwitsTTS', 'TTS', 'GizwitsTTS', '机智云语音合成', 1, 0, '{\"type\": \"doubao\", \"api_url\": \"https://bytedance.gizwitsapi.com/api/v1/tts\", \"authorization\": \"Bearer \", \"voice\": \"zh_female_wanwanxiaohe_moon_bigtts\", \"output_dir\": \"tmp/\", \"access_token\": \"\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('TTS_ACGNTTS', 'TTS', 'ACGNTTS', 'ACGN语音合成', 1, 0, '{\"type\": \"ttson\", \"token\": \"\", \"voice_id\": 1695, \"speed_factor\": 1, \"pitch_factor\": 0, \"volume_change_dB\": 0, \"to_lang\": \"ZH\", \"url\": \"https://u95167-bd74-2aef8085.westx.seetacloud.com:8443/flashsummary/tts?token=\", \"format\": \"mp3\", \"output_dir\": \"tmp/\", \"emotion\": 1}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('TTS_OpenAITTS', 'TTS', 'OpenAITTS', 'OpenAI语音合成', 1, 0, '{\"type\": \"openai\", \"api_key\": \"\", \"api_url\": \"https://api.openai.com/v1/audio/speech\", \"model\": \"tts-1\", \"voice\": \"onyx\", \"speed\": 1, \"output_dir\": \"tmp/\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('TTS_CustomTTS', 'TTS', 'CustomTTS', '自定义语音合成', 1, 0, '{\"type\": \"custom\", \"url\": \"http://127.0.0.1:9880/tts\", \"params\": {}, \"headers\": {}, \"format\": \"wav\", \"output_dir\": \"tmp/\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('TTS_EdgeTTS', 'TTS', 'EdgeTTS', 'Edge语音合成', 1, 1, '{\"type\": \"edge\", \"voice\": \"zh-CN-XiaoxiaoNeural\", \"output_dir\": \"tmp/\"}', NULL, NULL, 1, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('TTS_DoubaoTTS', 'TTS', 'DoubaoTTS', '豆包语音合成', 0, 1, '{\"type\": \"doubao\", \"api_url\": \"https://openspeech.bytedance.com/api/v1/tts\", \"voice\": \"BV001_streaming\", \"output_dir\": \"tmp/\", \"authorization\": \"Bearer;\", \"appid\": \"\", \"access_token\": \"\", \"cluster\": \"volcano_tts\"}', NULL, NULL, 2, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('TTS_CosyVoiceSiliconflow', 'TTS', 'CosyVoiceSiliconflow', '硅基流动语音合成', 0, 1, '{\"type\": \"siliconflow\", \"model\": \"FunAudioLLM/CosyVoice2-0.5B\", \"voice\": \"FunAudioLLM/CosyVoice2-0.5B:alex\", \"output_dir\": \"tmp/\", \"access_token\": \"\", \"response_format\": \"wav\"}', NULL, NULL, 3, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('TTS_CozeCnTTS', 'TTS', 'CozeCnTTS', 'Coze中文语音合成', 0, 1, '{\"type\": \"cozecn\", \"voice\": \"7426720361733046281\", \"output_dir\": \"tmp/\", \"access_token\": \"\", \"response_format\": \"wav\"}', NULL, NULL, 4, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('TTS_FishSpeech', 'TTS', 'FishSpeech', 'FishSpeech语音合成', 0, 1, '{\"type\": \"fishspeech\", \"output_dir\": \"tmp/\", \"response_format\": \"wav\", \"reference_id\": null, \"reference_audio\": [\"/tmp/test.wav\"], \"reference_text\": [\"你弄来这些吟词宴曲来看，还是这些混话来欺负我。\"], \"normalize\": true, \"max_new_tokens\": 1024, \"chunk_length\": 200, \"top_p\": 0.7, \"repetition_penalty\": 1.2, \"temperature\": 0.7, \"streaming\": false, \"use_memory_cache\": \"on\", \"seed\": null, \"channels\": 1, \"rate\": 44100, \"api_key\": \"\", \"api_url\": \"http://127.0.0.1:8080/v1/tts\"}', NULL, NULL, 5, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('TTS_GPT_SOVITS_V2', 'TTS', 'GPT_SOVITS_V2', 'GPT-SoVITS V2', 0, 1, '{\"type\": \"gpt_sovits_v2\", \"url\": \"http://127.0.0.1:9880/tts\", \"output_dir\": \"tmp/\", \"text_lang\": \"auto\", \"ref_audio_path\": \"caixukun.wav\", \"prompt_text\": \"\", \"prompt_lang\": \"zh\", \"top_k\": 5, \"top_p\": 1, \"temperature\": 1, \"text_split_method\": \"cut0\", \"batch_size\": 1, \"batch_threshold\": 0.75, \"split_bucket\": true, \"return_fragment\": false, \"speed_factor\": 1.0, \"streaming_mode\": false, \"seed\": -1, \"parallel_infer\": true, \"repetition_penalty\": 1.35, \"aux_ref_audio_paths\": []}', NULL, NULL, 6, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('TTS_GPT_SOVITS_V3', 'TTS', 'GPT_SOVITS_V3', 'GPT-SoVITS V3', 0, 1, '{\"type\": \"gpt_sovits_v3\", \"url\": \"http://127.0.0.1:9880\", \"output_dir\": \"tmp/\", \"text_language\": \"auto\", \"refer_wav_path\": \"caixukun.wav\", \"prompt_language\": \"zh\", \"prompt_text\": \"\", \"top_k\": 15, \"top_p\": 1.0, \"temperature\": 1.0, \"cut_punc\": \"\", \"speed\": 1.0, \"inp_refs\": [], \"sample_steps\": 32, \"if_sr\": false}', NULL, NULL, 7, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('TTS_MinimaxTTS', 'TTS', 'MinimaxTTS', 'MiniMax语音合成', 0, 1, '{\"type\": \"minimax\", \"output_dir\": \"tmp/\", \"group_id\": \"\", \"api_key\": \"你的api_key\", \"model\": \"speech-01-turbo\", \"voice_id\": \"female-shaonv\"}', NULL, NULL, 8, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('TTS_AliyunTTS', 'TTS', 'AliyunTTS', '阿里云语音合成', 0, 1, '{\"type\": \"aliyun\", \"output_dir\": \"tmp/\", \"appkey\": \"\", \"token\": \"\", \"voice\": \"xiaoyun\", \"access_key_id\": \"\", \"access_key_secret\": \"\"}', NULL, NULL, 9, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('TTS_TTS302AI', 'TTS', 'TTS302AI', '302AI语音合成', 0, 1, '{\"type\": \"doubao\", \"api_url\": \"https://api.302ai.cn/doubao/tts_hd\", \"authorization\": \"Bearer \", \"voice\": \"zh_female_wanwanxiaohe_moon_bigtts\", \"output_dir\": \"tmp/\", \"access_token\": \"\"}', NULL, NULL, 10, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('TTS_GizwitsTTS', 'TTS', 'GizwitsTTS', '机智云语音合成', 0, 1, '{\"type\": \"doubao\", \"api_url\": \"https://bytedance.gizwitsapi.com/api/v1/tts\", \"authorization\": \"Bearer \", \"voice\": \"zh_female_wanwanxiaohe_moon_bigtts\", \"output_dir\": \"tmp/\", \"access_token\": \"\"}', NULL, NULL, 11, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('TTS_ACGNTTS', 'TTS', 'ACGNTTS', 'ACGN语音合成', 0, 1, '{\"type\": \"ttson\", \"token\": \"\", \"voice_id\": 1695, \"speed_factor\": 1, \"pitch_factor\": 0, \"volume_change_dB\": 0, \"to_lang\": \"ZH\", \"url\": \"https://u95167-bd74-2aef8085.westx.seetacloud.com:8443/flashsummary/tts?token=\", \"format\": \"mp3\", \"output_dir\": \"tmp/\", \"emotion\": 1}', NULL, NULL, 12, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('TTS_OpenAITTS', 'TTS', 'OpenAITTS', 'OpenAI语音合成', 0, 1, '{\"type\": \"openai\", \"api_key\": \"你的api_key\", \"api_url\": \"https://api.openai.com/v1/audio/speech\", \"model\": \"tts-1\", \"voice\": \"onyx\", \"speed\": 1, \"output_dir\": \"tmp/\"}', NULL, NULL, 13, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('TTS_CustomTTS', 'TTS', 'CustomTTS', '自定义语音合成', 0, 1, '{\"type\": \"custom\", \"url\": \"http://127.0.0.1:9880/tts\", \"params\": {}, \"headers\": {}, \"format\": \"wav\", \"output_dir\": \"tmp/\"}', NULL, NULL, 14, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('TTS_TencentTTS', 'TTS', 'TencentTTS', '腾讯语音合成', 0, 1, '{\"type\": \"tencent\", \"appid\": \"\", \"secret_id\": \"\", \"secret_key\": \"\", \"region\": \"ap-guangzhou\", \"voice\": \"101001\", \"output_dir\": \"tmp/\"}', NULL, NULL, 3, NULL, NULL, NULL, NULL);
 
 -- Memory模型配置
-INSERT INTO `ai_model_config` VALUES ('Memory_mem0ai', 'Memory', 'mem0ai', 'Mem0AI记忆', 1, 0, '{\"type\": \"mem0ai\", \"api_key\": \"\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('Memory_nomem', 'Memory', 'nomem', '无记忆', 1, 1, '{\"type\": \"nomem\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('Memory_mem_local_short', 'Memory', 'mem_local_short', '本地短期记忆', 1, 0, '{\"type\": \"mem_local_short\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('Memory_nomem', 'Memory', 'nomem', '无记忆', 1, 1, '{\"type\": \"nomem\"}', NULL, NULL, 1, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('Memory_mem_local_short', 'Memory', 'mem_local_short', '本地短期记忆', 0, 1, '{\"type\": \"mem_local_short\"}', NULL, NULL, 2, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('Memory_mem0ai', 'Memory', 'mem0ai', 'Mem0AI记忆', 0, 1, '{\"type\": \"mem0ai\", \"api_key\": \"你的api_key\"}', NULL, NULL, 3, NULL, NULL, NULL, NULL);
 
 -- Intent模型配置
-INSERT INTO `ai_model_config` VALUES ('Intent_nointent', 'Intent', 'nointent', '无意图识别', 1, 0, '{\"type\": \"nointent\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('Intent_intent_llm', 'Intent', 'intent_llm', 'LLM意图识别', 1, 0, '{\"type\": \"intent_llm\", \"llm\": \"ChatGLMLLM\"}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `ai_model_config` VALUES ('Intent_function_call', 'Intent', 'function_call', '函数调用意图识别', 1, 1, '{\"type\": \"function_call\", \"functions\": [\"change_role\", \"get_weather\", \"get_news\", \"play_music\"]}', NULL, NULL, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('Intent_nointent', 'Intent', 'nointent', '无意图识别', 1, 0, '{\"type\": \"nointent\"}', NULL, NULL, 1, NULL, NULL, NULL, NULL);
+INSERT INTO `ai_model_config` VALUES ('Intent_intent_llm', 'Intent', 'intent_llm', 'LLM意图识别', 0, 1, '{\"type\": \"intent_llm\", \"llm\": \"ChatGLMLLM\"}', NULL, NULL, 2, NULL, NULL, NULL, NULL);
+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);

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

@@ -0,0 +1,61 @@
+-- 本文件用于初始化系统参数数据，无需手动执行，在项目启动时会自动执行
+-- --------------------------------------------------------
+-- 初始化参数管理配置
+DROP TABLE IF EXISTS sys_params;
+-- 参数管理
+create table sys_params
+(
+  id                   bigint NOT NULL COMMENT 'id',
+  param_code           varchar(100) COMMENT '参数编码',
+  param_value          varchar(2000) COMMENT '参数值',
+  value_type           varchar(20) default 'string' COMMENT '值类型：string-字符串，number-数字，boolean-布尔，array-数组',
+  param_type           tinyint unsigned default 1 COMMENT '类型   0：系统参数   1：非系统参数',
+  remark               varchar(200) COMMENT '备注',
+  creator              bigint COMMENT '创建者',
+  create_date          datetime COMMENT '创建时间',
+  updater              bigint COMMENT '更新者',
+  update_date          datetime COMMENT '更新时间',
+  primary key (id),
+  unique key uk_param_code (param_code)
+)ENGINE=InnoDB DEFAULT CHARACTER SET utf8mb4 COMMENT='参数管理';
+
+-- 服务器配置
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (100, 'server.ip', '0.0.0.0', 'string', 1, '服务器监听IP地址');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (101, 'server.port', '8000', 'number', 1, '服务器监听端口');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (102, 'server.secret', 'null', 'string', 1, '服务器密钥');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (201, 'log.log_format', '<green>{time:YYMMDD HH:mm:ss}</green>[<light-blue>{version}-{selected_module}</light-blue>][<light-blue>{extra[tag]}</light-blue>]-<level>{level}</level>-<light-green>{message}</light-green>', 'string', 1, '控制台日志格式');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (202, 'log.log_format_file', '{time:YYYY-MM-DD HH:mm:ss} - {version}_{selected_module} - {name} - {level} - {extra[tag]} - {message}', 'string', 1, '文件日志格式');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (203, 'log.log_level', 'INFO', 'string', 1, '日志级别');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (204, 'log.log_dir', 'tmp', 'string', 1, '日志目录');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (205, 'log.log_file', 'server.log', 'string', 1, '日志文件名');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (206, 'log.data_dir', 'data', 'string', 1, '数据目录');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (301, 'delete_audio', 'true', 'boolean', 1, '是否删除使用后的音频文件');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (302, 'close_connection_no_voice_time', '120', 'number', 1, '无语音输入断开连接时间(秒)');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (303, 'tts_timeout', '10', 'number', 1, 'TTS请求超时时间(秒)');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (304, 'enable_wakeup_words_response_cache', 'false', 'boolean', 1, '是否开启唤醒词加速');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (305, 'enable_greeting', 'true', 'boolean', 1, '是否开启开场回复');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (306, 'enable_stop_tts_notify', 'false', 'boolean', 1, '是否开启结束提示音');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (307, 'stop_tts_notify_voice', 'config/assets/tts_notify.mp3', 'string', 1, '结束提示音文件路径');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (308, 'exit_commands', '退出;关闭', 'array', 1, '退出命令列表');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (309, 'xiaozhi', '{
+  "type": "hello",
+  "version": 1,
+  "transport": "websocket",
+  "audio_params": {
+    "format": "opus",
+    "sample_rate": 16000,
+    "channels": 1,
+    "frame_duration": 60
+  }
+}', 'json', 1, '小智类型');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (310, 'wakeup_words', '你好小智;你好小志;小爱同学;你好小鑫;你好小新;小美同学;小龙小龙;喵喵同学;小滨小滨;小冰小冰', 'array', 1, '唤醒词列表，用于识别唤醒词');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (400, 'plugins.get_weather.api_key', 'a861d0d5e7bf4ee1a83d9a9e4f96d4da', 'string', 1, '天气插件API密钥');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (401, 'plugins.get_weather.default_location', '广州', 'string', 1, '天气插件默认城市');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (410, 'plugins.get_news.default_rss_url', 'https://www.chinanews.com.cn/rss/society.xml', 'string', 1, '新闻插件默认RSS地址');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (411, 'plugins.get_news.category_urls', '{"society":"https://www.chinanews.com.cn/rss/society.xml","world":"https://www.chinanews.com.cn/rss/world.xml","finance":"https://www.chinanews.com.cn/rss/finance.xml"}', 'json', 1, '新闻插件分类RSS地址');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (421, 'plugins.home_assistant.devices', '客厅,玩具灯,switch.cuco_cn_460494544_cp1_on_p_2_1;卧室,台灯,switch.iot_cn_831898993_socn1_on_p_2_1', 'array', 1, 'Home Assistant设备列表');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (422, 'plugins.home_assistant.base_url', 'http://homeassistant.local:8123', 'string', 1, 'Home Assistant服务器地址');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (423, 'plugins.home_assistant.api_key', '你的home assistant api访问令牌', 'string', 1, 'Home Assistant API密钥');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (430, 'plugins.play_music.music_dir', './music', 'string', 1, '音乐文件存放路径');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (431, 'plugins.play_music.music_ext', 'mp3;wav;p3', 'array', 1, '音乐文件类型');
+INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (432, 'plugins.play_music.refresh_time', '300', 'number', 1, '音乐列表刷新间隔(秒)');

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

@@ -0,0 +1,3 @@
+-- 对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/202504131543.sql

@@ -0,0 +1,18 @@
+-- 对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';
+
+-- 添加edge音色
+delete from `ai_tts_voice` where tts_model_id = 'TTS_EdgeTTS';
+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);

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_model_provider
-      author: John
-      changes:
-        - sqlFile:
-            encoding: utf8
-            path: classpath:db/changelog/2025_model_provider.sql
   - changeSet:
       id: 2025_tts_voive
       author: John
@@ -31,16 +24,37 @@ databaseChangeLog:
             encoding: utf8
             path: classpath:db/changelog/2025_tts_voive.sql
   - changeSet:
-      id: 2025_model_config
+      id: 202504082211
       author: John
       changes:
         - sqlFile:
             encoding: utf8
-            path: classpath:db/changelog/2025_model_config.sql
+            path: classpath:db/changelog/202504082211.sql
   - changeSet:
-      id: 2025_model_temp
+      id: 202504092335
       author: John
       changes:
         - sqlFile:
             encoding: utf8
-            path: classpath:db/changelog/2025_model_temp.sql
+            path: classpath:db/changelog/202504092335.sql
+  - changeSet:
+      id: 202504112044
+      author: John
+      changes:
+        - sqlFile:
+            encoding: utf8
+            path: classpath:db/changelog/202504112044.sql
+  - changeSet:
+      id: 202504112058
+      author: John
+      changes:
+        - sqlFile:
+            encoding: utf8
+            path: classpath:db/changelog/202504112058.sql
+  - changeSet:
+      id: 202504131543
+      author: John
+      changes:
+        - sqlFile:
+            encoding: utf8
+            path: classpath:db/changelog/202504131543.sql

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

@@ -34,3 +34,10 @@
 10031=\u5F31\u5BC6\u7801
 10032=\u5220\u9664\u672C\u6570\u636E\u5F02\u5E38
 10033=\u8BBE\u5907\u9A8C\u8BC1\u7801\u9519\u8BEF
+10034=\u53C2\u6570\u503C\u4E0D\u80FD\u4E3A\u7A7A
+10035=\u53C2\u6570\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A
+10036=\u4E0D\u652F\u6301\u7684\u53C2\u6570\u7C7B\u578B
+10037=\u53C2\u6570\u503C\u5FC5\u987B\u662F\u6709\u6548\u7684\u6570\u5B57
+10038=\u53C2\u6570\u503C\u5FC5\u987B\u662Ftrue\u6216false
+10039=\u53C2\u6570\u503C\u5FC5\u987B\u662F\u6709\u6548\u7684JSON\u6570\u7EC4\u683C\u5F0F
+10040=\u53C2\u6570\u503C\u5FC5\u987B\u662F\u6709\u6548\u7684JSON\u683C\u5F0F

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

@@ -32,4 +32,12 @@
 10030=The password is less than {0} digits.
 10031=The password must consist of numbers, uppercase and lowercase letters, and special characters at the same time
 10032=Exception in deleting this data
-10033=Device verification code error
+10033=Device verification code error
+
+10034=Parameter value cannot be empty
+10035=Parameter type cannot be empty
+10036=Unsupported parameter type
+10037=Parameter value must be a valid number
+10038=Parameter value must be true or false
+10039=Parameter value must be a valid JSON array format
+10040=Parameter value must be a valid JSON format

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

@@ -32,4 +32,12 @@
 10030=\u5BC6\u7801\u957F\u5EA6\u4E0D\u8DB3{0}\u4F4D
 10031=\u5BC6\u7801\u5FC5\u987B\u540C\u65F6\u5305\u542B\u6570\u5B57\u3001\u5927\u5C0F\u5B57\u6BCD\u548C\u7279\u6B8A\u5B57\u7B26\u7EC4\u6210
 10032=\u5220\u9664\u672C\u6570\u636E\u5F02\u5E38
-10033=\u8BBE\u5907\u9A8C\u8BC1\u7801\u9519\u8BEF
+10033=\u8BBE\u5907\u9A8C\u8BC1\u7801\u9519\u8BEF
+
+10034=\u53C2\u6570\u503C\u4E0D\u80FD\u4E3A\u7A7A
+10035=\u53C2\u6570\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A
+10036=\u4E0D\u652F\u6301\u7684\u53C2\u6570\u7C7B\u578B
+10037=\u53C2\u6570\u503C\u5FC5\u987B\u662F\u6709\u6548\u7684\u6570\u5B57
+10038=\u53C2\u6570\u503C\u5FC5\u987B\u662Ftrue\u6216false
+10039=\u53C2\u6570\u503C\u5FC5\u987B\u662F\u6709\u6548\u7684JSON\u6570\u7EC4\u683C\u5F0F
+10040=\u53C2\u6570\u503C\u5FC5\u987B\u662F\u6709\u6548\u7684JSON\u683C\u5F0F

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

@@ -32,4 +32,12 @@
 10030=\u5BC6\u78BC\u9577\u5EA6\u4E0D\u8DB3{0}\u4F4D
 10031=\u5BC6\u78BC\u5FC5\u9808\u540C\u6642\u5305\u542B\u6578\u5B57\u3001\u5927\u5C0F\u5B57\u6BCD\u548C\u7279\u6B8A\u5B57\u7B26\u7D44\u6210
 10032=\u522A\u9664\u6B64\u6578\u64DA\u7570\u5E38
-10033=\u8A2D\u5099\u9A57\u8B49\u78BC\u932F\u8AA4
+10033=\u8A2D\u5099\u9A57\u8B49\u78BC\u932F\u8AA4
+
+10034=\u53C3\u6578\u503C\u4E0D\u80FD\u70BA\u7A7A
+10035=\u53C3\u6578\u985E\u578B\u4E0D\u80FD\u70BA\u7A7A
+10036=\u4E0D\u652F\u63F4\u7684\u53C3\u6578\u985E\u578B
+10037=\u53C3\u6578\u503C\u5FC5\u9808\u662F\u6709\u6548\u7684\u6578\u5B57
+10038=\u53C3\u6578\u503C\u5FC5\u9808\u662Ftrue\u6216false
+10039=\u53C3\u6578\u503C\u5FC5\u9808\u662F\u6709\u6548\u7684JSON\u6578\u7D44\u683C\u5F0F
+10040=\u53C3\u6578\u503C\u5FC5\u9808\u662F\u6709\u6548\u7684JSON\u683C\u5F0F

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

@@ -12,6 +12,8 @@ sysdict.label.require=\u5B57\u5178\u6807\u7B7E\u4E0D\u80FD\u4E3A\u7A7A
 
 sysparams.paramcode.require=\u53C2\u6570\u7F16\u7801\u4E0D\u80FD\u4E3A\u7A7A
 sysparams.paramvalue.require=\u53C2\u6570\u503C\u4E0D\u80FD\u4E3A\u7A7A
+sysparams.valuetype.require=\u503C\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A
+sysparams.valuetype.pattern=\u503C\u7C7B\u578B\u5FC5\u987B\u662F string\u3001number\u3001boolean \u6216 array
 
 sysuser.username.require=\u7528\u6237\u540D\u4E0D\u80FD\u4E3A\u7A7A
 sysuser.password.require=\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A

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

@@ -12,6 +12,8 @@ sysdict.label.require=Dictionary tag cannot be empty
 
 sysparams.paramcode.require=Parameter encoding cannot be empty
 sysparams.paramvalue.require=Parameter values cannot be empty
+sysparams.valuetype.require=Value type cannot be empty
+sysparams.valuetype.pattern=Value type must be string, number, boolean or array
 
 sysuser.username.require=The username cannot be empty
 sysuser.password.require=The password cannot be empty

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

@@ -12,6 +12,8 @@ sysdict.label.require=\u5B57\u5178\u6807\u7B7E\u4E0D\u80FD\u4E3A\u7A7A
 
 sysparams.paramcode.require=\u53C2\u6570\u7F16\u7801\u4E0D\u80FD\u4E3A\u7A7A
 sysparams.paramvalue.require=\u53C2\u6570\u503C\u4E0D\u80FD\u4E3A\u7A7A
+sysparams.valuetype.require=\u503C\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A
+sysparams.valuetype.pattern=\u503C\u7C7B\u578B\u5FC5\u987B\u662F string\u3001number\u3001boolean \u6216 array
 
 sysuser.username.require=\u7528\u6237\u540D\u4E0D\u80FD\u4E3A\u7A7A
 sysuser.password.require=\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A

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

@@ -10,8 +10,10 @@ sysdict.type.require=\u5B57\u5178\u7C7B\u578B\u4E0D\u80FD\u4E3A\u7A7A
 sysdict.name.require=\u5B57\u5178\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A
 sysdict.label.require=\u5B57\u5178\u6807\u7B7E\u4E0D\u80FD\u4E3A\u7A7A
 
-sysparams.paramcode.require=\u53C2\u6570\u7F16\u7801\u4E0D\u80FD\u4E3A\u7A7A
-sysparams.paramvalue.require=\u53C2\u6570\u503C\u4E0D\u80FD\u4E3A\u7A7A
+sysparams.paramcode.require=\u53C3\u6578\u7DE8\u78BC\u4E0D\u80FD\u70BA\u7A7A
+sysparams.paramvalue.require=\u53C3\u6578\u503C\u4E0D\u80FD\u70BA\u7A7A
+sysparams.valuetype.require=\u503C\u985E\u578B\u4E0D\u80FD\u70BA\u7A7A
+sysparams.valuetype.pattern=\u503C\u985E\u578B\u5FC5\u9808\u662F string\u3001number\u3001boolean \u6216 array
 
 sysuser.username.require=\u7528\u6237\u540D\u4E0D\u80FD\u4E3A\u7A7A
 sysuser.password.require=\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A

main/manager-api/src/main/resources/mapper/agent/AgentDao.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="xiaozhi.modules.agent.dao.AgentDao">
+    <!-- 获取智能体的设备数量 -->
+    <select id="getDeviceCountByAgentId" resultType="java.lang.Integer">
+        SELECT COUNT(*) FROM ai_device WHERE agent_id = #{agentId}
+    </select>
+</mapper> 

main/manager-web/README.md

@@ -1,4 +1,4 @@
-本文档是开发类文档，如需部署小智服务端，[点击这里查看部署教程](../../../docs/Deployment.md)
+本文档是开发类文档，如需部署小智服务端，[点击这里查看部署教程](../../README.md#%E9%83%A8%E7%BD%B2%E6%96%87%E6%A1%A3)
 
 # xiaozhi
 

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

@@ -3,6 +3,7 @@ import admin from './module/admin.js'
 import agent from './module/agent.js'
 import device from './module/device.js'
 import model from './module/model.js'
+import timbre from "./module/timbre.js"
 import user from './module/user.js'
 
 /**
@@ -29,4 +30,5 @@ export default {
     agent,
     device,
     model,
+    timbre,
 }

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

@@ -137,7 +137,7 @@ function reAjaxFun(fn) {
     } else {
         showWarning('正在连接服务器(' + ajaxIndex + ')')
     }
-    if (fn) {
+    if (ajaxIndex < 10 && fn) {
         setTimeout(() => {
             fn()
         }, reAjaxSec * 1000)

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

@@ -56,6 +56,79 @@ export default {
                     this.resetUserPassword(id, callback)
                 })
             }).send()
-    }
+    },
+    // 获取参数列表
+    getParamsList(params, callback) {
+        const queryParams = new URLSearchParams({
+            page: params.page,
+            limit: params.limit,
+            paramCode: params.paramCode || ''
+        }).toString();
+
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/admin/params/page?${queryParams}`)
+            .method('GET')
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res)
+            })
+            .fail((err) => {
+                console.error('获取参数列表失败:', err)
+                RequestService.reAjaxFun(() => {
+                    this.getParamsList(params, callback)
+                })
+            }).send()
+    },
+    // 保存
+    addParam(data, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/admin/params`)
+            .method('POST')
+            .data(data)
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res)
+            })
+            .fail((err) => {
+                console.error('添加参数失败:', err)
+                RequestService.reAjaxFun(() => {
+                    this.addParam(data, callback)
+                })
+            }).send()
+    },
+    // 修改
+    updateParam(data, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/admin/params`)
+            .method('PUT')
+            .data(data)
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res)
+            })
+            .fail((err) => {
+                console.error('更新参数失败:', err)
+                RequestService.reAjaxFun(() => {
+                    this.updateParam(data, callback)
+                })
+            }).send()
+    },
+    // 删除
+    deleteParam(ids, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/admin/params/delete`)
+            .method('POST')
+            .data(ids)
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res);
+            })
+            .fail((err) => {
+                console.error('删除参数失败:', err)
+                RequestService.reAjaxFun(() => {
+                    this.deleteParam(ids, callback)
+                })
+            }).send()
+    },
 
 }

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

@@ -1,7 +1,6 @@
 import { getServiceUrl } from '../api';
 import RequestService from '../httpRequest';
 
-
 export default {
   // 获取模型配置列表
   getModelList(params, callback) {
@@ -13,7 +12,7 @@ export default {
     }).toString();
 
     RequestService.sendRequest()
-      .url(`${getServiceUrl()}/models/models/list?${queryParams}`)
+      .url(`${getServiceUrl()}/models/list?${queryParams}`)
       .method('GET')
       .success((res) => {
         RequestService.clearRequestTime()
@@ -52,14 +51,14 @@ export default {
       modelName: formData.modelName,
       isDefault: formData.isDefault ? 1 : 0,
       isEnabled: formData.isEnabled ? 1 : 0,
-      configJson: JSON.stringify(formData.configJson),
+      configJson: formData.configJson,
       docLink: formData.docLink,
       remark: formData.remark,
       sort: formData.sort || 0
     };
 
     RequestService.sendRequest()
-      .url(`${getServiceUrl()}/models/models/${modelType}/${provideCode}`)
+      .url(`${getServiceUrl()}/models/${modelType}/${provideCode}`)
       .method('POST')
       .data(postData)
       .success((res) => {
@@ -77,7 +76,7 @@ export default {
   // 删除模型配置
   deleteModel(id, callback) {
     RequestService.sendRequest()
-      .url(`${getServiceUrl()}/models/models/${id}`)
+      .url(`${getServiceUrl()}/models/${id}`)
       .method('DELETE')
       .success((res) => {
         RequestService.clearRequestTime()
@@ -91,6 +90,112 @@ export default {
         })
       }).send()
   },
-
-
+  // 获取模型名称列表
+  getModelNames(modelType, modelName, callback) {
+    RequestService.sendRequest()
+      .url(`${getServiceUrl()}/models/names`)
+      .method('GET')
+      .data({ modelType, modelName })
+      .success((res) => {
+        RequestService.clearRequestTime();
+        callback(res);
+      })
+      .fail(() => {
+        RequestService.reAjaxFun(() => {
+          this.getModelNames(modelType, modelName, callback);
+        });
+      }).send();
+  },
+  // 获取模型音色列表
+  getModelVoices(modelId, voiceName, callback) {
+    const queryParams = new URLSearchParams({
+      voiceName: voiceName || ''
+    }).toString();
+    RequestService.sendRequest()
+      .url(`${getServiceUrl()}/models/${modelId}/voices?${queryParams}`)
+      .method('GET')
+      .success((res) => {
+        RequestService.clearRequestTime();
+        callback(res);
+      })
+      .fail(() => {
+        RequestService.reAjaxFun(() => {
+          this.getModelVoices(modelId, voiceName, callback);
+        });
+      }).send();
+  },
+  // 获取单个模型配置
+  getModelConfig(id, callback) {
+    RequestService.sendRequest()
+      .url(`${getServiceUrl()}/models/${id}`)
+      .method('GET')
+      .success((res) => {
+        RequestService.clearRequestTime()
+        callback(res)
+      })
+      .fail((err) => {
+        console.error('获取模型配置失败:', err)
+        this.$message.error(err.msg || '获取模型配置失败')
+        RequestService.reAjaxFun(() => {
+          this.getModelConfig(id, callback)
+        })
+      }).send()
+  },
+  // 启用/禁用模型状态
+  updateModelStatus(id, status, callback) {
+    RequestService.sendRequest()
+      .url(`${getServiceUrl()}/models/enable/${id}/${status}`)
+      .method('PUT')
+      .success((res) => {
+        RequestService.clearRequestTime()
+        callback(res)
+      })
+      .fail((err) => {
+        console.error('更新模型状态失败:', err)
+        this.$message.error(err.msg || '更新模型状态失败')
+        RequestService.reAjaxFun(() => {
+          this.updateModelStatus(id, status, callback)
+        })
+      }).send()
+  },
+  // 更新模型配置
+  updateModel(params, callback) {
+    const { modelType, provideCode, id, formData } = params;
+    const payload = {
+      ...formData,
+      configJson: formData.configJson
+    };
+    RequestService.sendRequest()
+        .url(`${getServiceUrl()}/models/${modelType}/${provideCode}/${id}`)
+        .method('PUT')
+        .data(payload)
+        .success((res) => {
+            RequestService.clearRequestTime();
+            callback(res);
+        })
+        .fail((err) => {
+            console.error('更新模型失败:', err);
+            this.$message.error(err.msg || '更新模型失败');
+            RequestService.reAjaxFun(() => {
+                this.updateModel(params, callback);
+            });
+        }).send();
+  },
+  // 设置默认模型
+  setDefaultModel(id, callback) {
+    RequestService.sendRequest()
+      .url(`${getServiceUrl()}/models/default/${id}`)
+      .method('PUT')
+      .success((res) => {
+        RequestService.clearRequestTime()
+        callback(res)
+      })
+      .fail((err) => {
+        console.error('设置默认模型失败:', err)
+        this.$message.error(err.msg || '设置默认模型失败')
+        RequestService.reAjaxFun(() => {
+          this.setDefaultModel(id, callback)
+        })
+      }).send()
+  }
 }

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

@@ -0,0 +1,92 @@
+import {getServiceUrl} from '../api';
+import RequestService from '../httpRequest';
+
+export default {
+    // 获取音色
+    getVoiceList(params, callback) {
+        const queryParams = new URLSearchParams({
+            ttsModelId: params.ttsModelId,
+            page: params.page || 1,
+            limit: params.limit || 10,
+            name: params.name || ''
+        }).toString();
+
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/ttsVoice?${queryParams}`)
+            .method('GET')
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res.data || []);
+            })
+            .fail((err) => {
+                console.error('获取音色列表失败:', err);
+                RequestService.reAjaxFun(() => {
+                    this.getVoiceList(params, callback);
+                });
+            }).send();
+    },
+    // 音色保存
+    saveVoice(params, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/ttsVoice`)
+            .method('POST')
+            .data(JSON.stringify({
+                languages: params.languageType,
+                name: params.voiceName,
+                remark: params.remark,
+                sort: params.sort,
+                ttsModelId: params.ttsModelId,
+                ttsVoice: params.voiceCode,
+                voiceDemo: params.voiceDemo || ''
+            }))
+            .success((res) => {
+                callback(res.data);
+            })
+            .fail((err) => {
+                console.error('保存音色失败:', err);
+                RequestService.reAjaxFun(() => {
+                    this.saveVoice(params, callback);
+                });
+            }).send();
+    },
+    // 音色删除
+    deleteVoice(ids, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/ttsVoice/delete`)
+            .method('POST')
+            .data(ids)
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res);
+            })
+            .fail((err) => {
+                console.error('删除音色失败:', err);
+                RequestService.reAjaxFun(() => {
+                    this.deleteVoice(ids, callback);
+                });
+            }).send();
+    },
+    // 音色修改
+    updateVoice(params, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/ttsVoice/${params.id}`)
+            .method('PUT')
+            .data(JSON.stringify({
+                languages: params.languageType,
+                name: params.voiceName,
+                remark: params.remark,
+                ttsModelId: params.ttsModelId,
+                ttsVoice: params.voiceCode,
+                voiceDemo: params.voiceDemo || ''
+            }))
+            .success((res) => {
+                callback(res.data);
+            })
+            .fail((err) => {
+                console.error('修改音色失败:', err);
+                RequestService.reAjaxFun(() => {
+                    this.updateVoice(params, callback);
+                });
+            }).send();
+    }
+}

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

@@ -104,4 +104,22 @@ export default {
             })
             .send();
     },
+    // 修改用户状态
+    changeUserStatus(status, userIds, successCallback) {
+        console.log(555,userIds)
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/admin/users/changeStatus/${status}`)
+            .method('put')
+            .data(userIds)
+            .success((res) => {
+                RequestService.clearRequestTime()
+                successCallback(res);
+            })
+            .fail((err) => {
+                console.error('修改用户状态失败:', err)
+                RequestService.reAjaxFun(() => {
+                    this.changeUserStatus(status, userIds)
+                })
+            }).send()
+    },
 }

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

@@ -1,12 +1,12 @@
 <template>
-  <el-dialog :visible.sync="visible" width="975px" center custom-class="custom-dialog" :show-close="false"
+  <el-dialog :visible="dialogVisible" @update:visible="handleVisibleChange" width="975px" center custom-class="custom-dialog" :show-close="false"
     class="center-dialog">
     <div style="margin: 0 18px; text-align: left; padding: 10px; border-radius: 10px;">
       <div style="font-size: 30px; color: #3d4566; margin-top: -10px; margin-bottom: 10px; text-align: center;">
         添加模型
       </div>
 
-      <!-- 关闭按钮 -->
+
       <button class="custom-close-btn" @click="handleClose">
         ×
       </button>
@@ -61,23 +61,27 @@
       </el-form>
 
       <div style="font-size: 20px; font-weight: bold; color: #3d4566; margin-bottom: 15px;">调用信息</div>
-      <div style="height: 2px; background: #e9e9e9; margin-bottom: 15px;"></div>
+      <div style="height: 2px; background: #e9e9e9; margin-bottom: 22px;"></div>
 
-      <el-form :model="formData" label-width="100px" label-position="left" class="custom-form">
-        <div style="display: flex; gap: 10px; margin-bottom: 15px;">
-          <el-form-item label="模型名称" prop="param1" style="flex: 0.5; margin-bottom: 0;">
-            <el-input v-model="formData.configJson.param1" placeholder="请输入model_name"
-              class="custom-input-bg"></el-input>
-          </el-form-item>
-          <el-form-item label="接口地址" prop="param2" style="flex: 1; margin-bottom: 0;">
-            <el-input v-model="formData.configJson.param2" placeholder="请输入base_url" class="custom-input-bg"></el-input>
-          </el-form-item>
-        </div>
-
-        <el-form-item label="秘钥信息" prop="apiKey">
-          <el-input v-model="formData.configJson.apiKey" placeholder="请输入api_key" show-password
-            class="custom-input-bg"></el-input>
-        </el-form-item>
+      <el-form :model="formData.configJson" label-width="auto" label-position="left" class="custom-form">
+        <template v-for="(row, rowIndex) in chunkedCallInfoFields">
+          <div :key="rowIndex" style="display: flex; gap: 20px; margin-bottom: 0;">
+            <el-form-item
+              v-for="field in row"
+              :key="field.prop"
+              :label="field.label"
+              :prop="field.prop"
+              style="flex: 1;">
+              <el-input
+                v-model="formData.configJson[field.prop]"
+                :placeholder="field.placeholder"
+                :type="field.type || 'text'"
+                class="custom-input-bg"
+                :show-password="field.type === 'password'">
+              </el-input>
+            </el-form-item>
+          </div>
+        </template>
       </el-form>
     </div>
 
@@ -100,7 +104,10 @@ export default {
   data() {
     return {
       providers: [],
+      dialogVisible: false,
       providersLoaded: false,
+      providerFields: [],
+      currentProvider: null,
       formData: {
         modelName: '',
         modelCode: '',
@@ -110,14 +117,38 @@ export default {
         remark: '',
         isEnabled: true,
         isDefault: true,
-        configJson: {
-          param1: '',
-          param2: '',
-          apiKey: ''
-        }
+        configJson: {}
       }
     }
   },
+  watch: {
+    visible(val) {
+      this.dialogVisible = val;
+      if(val) {
+        this.initConfigJson();
+      } else {
+        this.resetForm();
+      }
+    },
+    'formData.supplier'(newVal) {
+      this.currentProvider = this.providers.find(p => p.value === newVal);
+      this.providerFields = this.currentProvider?.fields || [];
+      this.initDynamicConfig();
+    }
+  },
+  computed: {
+    dynamicCallInfoFields() {
+      return this.providerFields;
+    },
+    chunkedCallInfoFields() {
+      const chunkSize = 2;
+      const result = [];
+      for (let i = 0; i < this.dynamicCallInfoFields.length; i += chunkSize) {
+        result.push(this.dynamicCallInfoFields.slice(i, i + chunkSize));
+      }
+      return result;
+    }
+  },
   methods: {
     loadProviders() {
       if (this.providersLoaded)
@@ -126,23 +157,65 @@ export default {
       Api.model.getModelProviders(this.modelType, (data) => {
         this.providers = data.map(item => ({
           label: item.name,
-          value: item.providerCode
+          value: item.providerCode,
+          fields: JSON.parse(item.fields || '[]').map(f => ({
+            label: f.label,
+            prop: f.key,
+            type: f.type === 'password' ? 'password' : 'text',
+            placeholder: `请输入${f.label}`
+          }))
         }))
         this.providersLoaded = true
       })
     },
+    initConfigJson() {
+      const defaultConfig = {};
+      this.providerFields.forEach(field => {
+        defaultConfig[field.prop] = '';
+      });
+      this.formData.configJson = { ...defaultConfig };
+    },
+    handleVisibleChange(val) {
+      this.dialogVisible = val;
+      this.$emit('update:visible', val);
+      if (!val) {
+        this.resetForm();
+      }
+    },
+
+    handleClose() {
+      this.$emit('update:visible', false);
+    },
+    initDynamicConfig() {
+      const newConfig = {};
+      this.providerFields.forEach(field => {
+        newConfig[field.prop] = this.formData.configJson[field.prop] || '';
+      });
+      this.formData.configJson = newConfig;
+    },
     confirm() {
-      if (!this.formData.modelName || !this.formData.modelCode || !this.formData.supplier ||
-        !this.formData.configJson.param1 || !this.formData.configJson.param2 || !this.formData.configJson.apiKey) {
-        this.$message.error('请填写所有必填字段');
+      if (!this.formData.supplier) {
+        this.$message.error('请选择供应器');
         return;
       }
 
-      this.$emit('confirm', {
-        ...this.formData,
-        provideType: this.formData.supplier,
-        configJson: this.formData.configJson
-      });
+      const submitData = {
+        modelName: this.formData.modelName || '',
+        modelCode: this.formData.modelCode || '',
+        supplier: this.formData.supplier,
+        sort: this.formData.sort || 1,
+        docLink: this.formData.docLink || '',
+        remark: this.formData.remark || '',
+        isEnabled: this.formData.isEnabled ? 1 : 0,
+        isDefault: this.formData.isDefault ? 1 : 0,
+        provideCode: this.formData.supplier,
+        configJson: {
+          ...this.formData.configJson,
+          type: this.formData.supplier
+        }
+      };
+
+      this.$emit('confirm', submitData);
       this.$emit('update:visible', false);
       this.resetForm();
     },
@@ -156,20 +229,15 @@ export default {
         remark: '',
         isEnabled: true,
         isDefault: true,
-        configJson: {
-          param1: '',
-          param2: '',
-          apiKey: ''
-        }
+        configJson: {}
       };
       // 重置加载状态
       this.providers = [];
       this.providersLoaded = false;
+      // 重置字段配置
+      this.providerFields = [];
+      this.currentProvider = null;
     },
-    handleClose() {
-      this.resetForm();
-      this.$emit('update:visible', false);
-    }
   }
 }
 </script>

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

@@ -0,0 +1,379 @@
+<template>
+  <div class="audio-container">
+    <audio
+      ref="audioRef"
+      :src="audioUrl"
+      @timeupdate="updateProgress"
+      @loadedmetadata="updateDuration"
+      style="display: none"
+    ></audio>
+
+    <div class="custom-controls">
+      <!-- 播放/暂停按钮 -->
+      <button class="play-btn" @click="togglePlay">
+        <svg width="20" height="20" viewBox="0 0 20 20">
+          <path
+            fill="#4362b3"
+            :d="isPlaying
+              ? 'M6 3h3v14H6zm5 0h3v14h-3z'
+              : 'M5 3l12 7-12 7z'"
+          />
+        </svg>
+      </button>
+
+      <!-- 时间显示 -->
+      <span class="time-display">{{ formattedCurrentTime }}/{{ formattedDuration }}</span>
+
+      <!-- 进度条 -->
+      <div class="progress-container">
+        <div class="progress-bar" @click="handleProgressClick">
+          <div
+            class="progress-track"
+            :style="{ width: progress + '%' }"
+          ></div>
+          <div
+            class="progress-thumb"
+            :style="{ left: progress + '%' }"
+            @mousedown="startDrag"
+          ></div>
+        </div>
+      </div>
+
+      <!-- 音量控制 -->
+      <div class="volume-control" ref="volumeControl">
+        <button
+          @click="toggleMute"
+          @mouseenter="handleVolumeMouseEnter"
+          @mouseleave="startVolumeSliderHideTimer"
+          ref="volumeButton"
+          class="volume-button"
+        >
+          <svg width="20" height="20" viewBox="0 0 24 24">
+            <path fill="currentColor" :d="volumeIconPath"/>
+          </svg>
+        </button>
+        <div
+          v-show="showVolumeSlider"
+          class="volume-slider-container"
+          @mouseenter="cancelVolumeSliderHideTimer"
+          @mouseleave="startVolumeSliderHideTimer"
+          ref="volumeSlider"
+        >
+          <div class="volume-slider-track">
+            <input
+              type="range"
+              v-model="volume"
+              min="0"
+              max="1"
+              step="0.1"
+              class="volume-slider"
+              @input="handleVolumeChange"
+              orient="vertical"
+            >
+            <div class="volume-slider-thumb" :style="{ bottom: volume * 100 + '%' }"></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, onMounted, onUnmounted, nextTick } from 'vue'
+
+const props = defineProps({
+  audioUrl: String
+})
+
+// 音频元素引用
+const audioRef = ref(null)
+const volumeButton = ref(null)
+const volumeSlider = ref(null)
+
+// 播放状态
+const isPlaying = ref(false)
+const currentTime = ref(0)
+const duration = ref(0)
+const progress = ref(0)
+
+// 音量状态
+const volume = ref(0.7)
+const isMuted = ref(false)
+const showVolumeSlider = ref(false)
+let volumeSliderHideTimer = null
+
+// 格式化时间为 MM:SS
+const formatTime = (seconds) => {
+  const sec = Math.floor(seconds || 0)
+  return `${Math.floor(sec / 60)}:${(sec % 60).toString().padStart(2, '0')}`
+}
+
+const formattedCurrentTime = computed(() => formatTime(currentTime.value))
+const formattedDuration = computed(() => formatTime(duration.value))
+
+// 根据音量状态返回对应的图标路径
+const volumeIconPath = computed(() => {
+  if (isMuted.value || volume.value === 0) {
+    return 'M16.5 12c0-1.77-1.02-3.29-2.5-4.03v2.21l2.45 2.45c.03-.2.05-.41.05-.63zm2.5 0c0 .94-.2 1.82-.54 2.64l1.51 1.51C20.63 14.91 21 13.5 21 12c0-4.28-2.99-7.86-7-8.77v2.06c2.89.86 5 3.54 5 6.71zM4.27 3L3 4.27 7.73 9H3v6h4l5 5v-6.73l4.25 4.25c-.67.52-1.42.93-2.25 1.18v2.06c1.38-.31 2.63-.95 3.69-1.81L19.73 21 21 19.73l-9-9L4.27 3zM12 4L9.91 6.09 12 8.18V4z'
+  }
+  return 'M3 9v6h4l5 5V4L7 9H3zm13.5 3c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-.73 2.5-2.25 2.5-4.02zM14 3.23v2.06c2.89.86 5 3.54 5 6.71s-2.11 5.85-5 6.71v2.06c4.01-.91 7-4.49 7-8.77s-2.99-7.86-7-8.77z'
+})
+
+// 播放控制
+const togglePlay = () => {
+  if (isPlaying.value) {
+    audioRef.value.pause()
+  } else {
+    audioRef.value.play()
+  }
+  isPlaying.value = !isPlaying.value
+}
+
+const updateDuration = () => {
+  if (audioRef.value) {
+    duration.value = audioRef.value.duration
+  }
+}
+
+const updateProgress = () => {
+  if (audioRef.value?.duration) {
+    currentTime.value = audioRef.value.currentTime
+    progress.value = (currentTime.value / duration.value) * 100
+  }
+}
+
+const handleProgressClick = (e) => {
+  const rect = e.currentTarget.getBoundingClientRect()
+  const percentage = ((e.clientX - rect.left) / rect.width) * 100
+  seekToPercentage(percentage)
+}
+
+// 音量控制
+const toggleMute = () => {
+  isMuted.value = !isMuted.value
+  audioRef.value.muted = isMuted.value
+
+  // 如果取消静音且音量为0，则恢复默认音量
+  if (!isMuted.value && volume.value === 0) {
+    volume.value = 0.5
+    audioRef.value.volume = 0.5
+  }
+}
+
+const handleVolumeChange = (e) => {
+  const newVolume = parseFloat(e.target.value)
+  audioRef.value.volume = newVolume
+  isMuted.value = newVolume === 0
+}
+
+// 进度条拖拽功能
+let isDragging = false
+
+const startDrag = (e) => {
+  isDragging = true
+  document.addEventListener('mousemove', handleDrag)
+  document.addEventListener('mouseup', stopDrag)
+  e.preventDefault()
+}
+
+const handleDrag = (e) => {
+  if (!isDragging) return
+
+  const rect = document.querySelector('.progress-bar').getBoundingClientRect()
+  const percentage = ((e.clientX - rect.left) / rect.width) * 100
+  seekToPercentage(percentage)
+}
+
+const stopDrag = () => {
+  isDragging = false
+  document.removeEventListener('mousemove', handleDrag)
+  document.removeEventListener('mouseup', stopDrag)
+}
+
+const seekToPercentage = (percentage) => {
+  const clampedPercentage = Math.min(Math.max(percentage, 0), 100)
+  progress.value = clampedPercentage
+  audioRef.value.currentTime = (clampedPercentage / 100) * duration.value
+}
+
+// 音量滑块显示/隐藏控制
+const startVolumeSliderHideTimer = () => {
+  volumeSliderHideTimer = setTimeout(() => {
+    showVolumeSlider.value = false
+  }, 300)
+}
+
+const cancelVolumeSliderHideTimer = () => {
+  clearTimeout(volumeSliderHideTimer)
+}
+
+// 音量滑块定位
+const updateSliderPosition = () => {
+  nextTick(() => {
+    if (!volumeButton.value || !volumeSlider.value) return
+
+    const buttonRect = volumeButton.value.getBoundingClientRect()
+    const slider = volumeSlider.value
+
+    // 计算相对于视口的位置
+    const left = buttonRect.left + window.scrollX
+    const top = buttonRect.top + window.scrollY
+
+    // 定位到按钮正中间，垂直居中
+    slider.style.left = `${left + 5}px`
+    slider.style.top = `${top - 85}px`
+  })
+}
+
+const handleVolumeMouseEnter = () => {
+  showVolumeSlider.value = true
+  updateSliderPosition()
+}
+
+// 初始化
+onMounted(() => {
+  if (audioRef.value) {
+    audioRef.value.volume = volume.value
+  }
+  window.addEventListener('resize', updateSliderPosition)
+})
+
+onUnmounted(() => {
+  window.removeEventListener('resize', updateSliderPosition)
+})
+</script>
+
+<style scoped>
+.audio-container {
+  background: #eef0fd;
+  padding: 8px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  border-radius: 5px;
+}
+
+.custom-controls {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  width: 100%;
+}
+
+.play-btn {
+  background: none;
+  border: none;
+  padding: 0;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+}
+
+.time-display {
+  font-size: 12px;
+  color: #5f7ba7;
+  min-width: 40px;
+  text-align: center;
+}
+
+.progress-container {
+  flex: 1;
+  padding: 0 10px;
+  opacity: 0.7;
+  transition: opacity 0.3s ease;
+}
+
+.progress-container:hover {
+  opacity: 1;
+}
+
+.progress-bar {
+  height: 2px;
+  background: #bfcadb;
+  position: relative;
+  cursor: pointer;
+}
+
+.progress-track {
+  position: absolute;
+  height: 100%;
+  background: #4167ed;
+}
+
+.progress-thumb {
+  position: absolute;
+  width: 12px;
+  height: 12px;
+  background: #4167ed;
+  border: 2px solid #d6dcfc;
+  border-radius: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  cursor: pointer;
+  z-index: 2;
+}
+
+.volume-control {
+  position: relative;
+}
+
+.volume-button {
+  background: none;
+  border: none;
+  padding: 0;
+  color: #8f95cd;
+  cursor: pointer;
+}
+
+.volume-slider-container {
+  position: fixed;
+  padding: 10px 4px;
+  background: #eef0fd;
+  border-radius: 4px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+  z-index: 1000;
+  height: 75px;
+}
+
+.volume-slider-track {
+  position: relative;
+  height: 55px;
+  width: 2px;
+  background: #bfcadb;
+  margin: 1px;
+}
+
+.volume-slider-thumb {
+  position: absolute;
+  left: 1px;
+  width: 9px;
+  height: 9px;
+  background: #4167ed;
+  border: 2px solid #d6dcfc;
+  border-radius: 50%;
+  transform: translateX(-50%);
+  pointer-events: none;
+}
+
+.volume-slider {
+  position: absolute;
+  left: -14px;
+  width: 30px;
+  height: 60px;
+  writing-mode: vertical-lr;
+  direction: rtl;
+  opacity: 0;
+  cursor: pointer;
+  z-index: 2;
+}
+
+.volume-slider-track::after {
+  content: '';
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  width: 2px;
+  height: calc(100% * v-bind(volume));
+  background: #4167ed;
+}
+</style>

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

@@ -1,43 +1,44 @@
 <template>
   <form>
     <el-dialog :visible.sync="value" 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 style="width: 40px;height: 40px;border-radius: 50%;background: #5778ff;display: flex;align-items: center;justify-content: center;">
-          <img loading="lazy" src="@/assets/login/shield.png" alt="" style="width: 19px;height: 23px; filter: brightness(0) invert(1);" />
+      <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
+          style="width: 40px;height: 40px;border-radius: 50%;background: #5778ff;display: flex;align-items: center;justify-content: center;">
+          <img loading="lazy" src="@/assets/login/shield.png" alt=""
+            style="width: 19px;height: 23px; filter: brightness(0) invert(1);" />
         </div>
         修改密码
       </div>
-      <div style="height: 1px;background: #e8f0ff;"/>
+      <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>
         <div class="input-46" style="margin-top: 12px;">
-          <el-input placeholder="请输入旧密码" v-model="oldPassword" type="password" show-password/>
+          <el-input placeholder="请输入旧密码" v-model="oldPassword" type="password" show-password />
         </div>
         <div style="font-weight: 400;font-size: 14px;text-align: left;color: #3d4566;margin-top: 12px;">
           <div style="color: red;display: inline-block;">*</div>
           新密码：
         </div>
         <div class="input-46" style="margin-top: 12px;">
-          <el-input placeholder="请输入新密码" v-model="newPassword" type="password" show-password/>
+          <el-input placeholder="请输入新密码" v-model="newPassword" type="password" show-password />
         </div>
         <div style="font-weight: 400;font-size: 14px;text-align: left;color: #3d4566;margin-top: 12px;">
           <div style="color: red;display: inline-block;">*</div>
           确认新密码：
         </div>
         <div class="input-46" style="margin-top: 12px;">
-          <el-input placeholder="请再次输入新密码" v-model="confirmNewPassword" type="password" show-password/>
+          <el-input placeholder="请再次输入新密码" v-model="confirmNewPassword" type="password" show-password />
         </div>
       </div>
       <div style="display: flex;margin: 15px 15px;gap: 7px;">
         <div class="dialog-btn" @click="confirm">
           确定
         </div>
-        <div class="dialog-btn"
-             style="background: #e6ebff;border: 1px solid #adbdff;color: #5778ff;"
-             @click="cancel">
+        <div class="dialog-btn" style="background: #e6ebff;border: 1px solid #adbdff;color: #5778ff;" @click="cancel">
           取消
         </div>
       </div>
@@ -83,12 +84,15 @@ export default {
       // 修改后的接口调用
       userApi.changePassword(this.oldPassword, this.newPassword, (res) => {
         if (res.data.code === 0) {
-          this.$message.success('密码修改成功，请重新登录');
+          this.$message.success({
+            message: '密码修改成功，请重新登录',
+            showClose: true
+          });
           this.logout().then(() => {
             this.$router.push('/login');
             this.$emit('update:visible', false);
           });
-        }else{
+        } else {
           this.$message.error(res.data.msg || '密码修改失败');
         }
       }, (err) => {

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

@@ -2,12 +2,15 @@
   <div class="device-item">
     <div style="display: flex;justify-content: space-between;">
       <div style="font-weight: 700;font-size: 18px;text-align: left;color: #3d4566;">
-         {{ device.agentName }}
+        {{ device.agentName }}
       </div>
       <div>
-        <img src="@/assets/home/delete.png" alt=""
-             style="width: 18px;height: 18px;margin-right: 10px;" @click.stop="handleDelete" />
-        <img src="@/assets/home/info.png" alt="" style="width: 18px;height: 18px;" />
+        <img src="@/assets/home/delete.png" alt="" style="width: 18px;height: 18px;margin-right: 10px;"
+          @click.stop="handleDelete" />
+        <el-tooltip class="item" effect="dark" :content="device.systemPrompt" placement="top"
+          popper-class="custom-tooltip">
+          <img src="@/assets/home/info.png" alt="" style="width: 18px;height: 18px;" />
+        </el-tooltip>
       </div>
     </div>
     <div class="device-name">
@@ -20,14 +23,14 @@
       <div class="settings-btn" @click="handleConfigure">
         配置角色
       </div>
-<!--      <div class="settings-btn">-->
-<!--        声纹识别-->
-<!--      </div>-->
-<!--      <div class="settings-btn">-->
-<!--        历史对话-->
-<!--      </div>-->
-      <div class="settings-btn"  @click="handleDeviceManage">
-        设备管理
+      <!--      <div class="settings-btn">-->
+      <!--        声纹识别-->
+      <!--      </div>-->
+      <!--      <div class="settings-btn">-->
+      <!--        历史对话-->
+      <!--      </div>-->
+      <div class="settings-btn" @click="handleDeviceManage">
+        设备管理({{ device.deviceCount }})
       </div>
     </div>
     <div class="version-info">
@@ -66,6 +69,7 @@ export default {
   padding: 22px;
   box-sizing: border-box;
 }
+
 .device-name {
   margin: 7px 0 10px;
   font-weight: 400;
@@ -94,5 +98,11 @@ export default {
   color: #979db1;
   font-weight: 400;
 }
+</style>
 
+<style>
+.custom-tooltip {
+  max-width: 400px;
+  word-break: break-word;
+}
 </style>

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

@@ -2,7 +2,7 @@
   <el-header class="header">
     <div class="header-container">
       <!-- 左侧元素 -->
-      <div class="header-left">
+      <div class="header-left" @click="goHome">
         <img loading="lazy" alt="" src="@/assets/xiaozhi-logo.png" class="logo-img" />
         <img loading="lazy" alt="" src="@/assets/xiaozhi-ai.png" class="brand-img" />
       </div>
@@ -26,11 +26,17 @@
             :style="{ filter: $route.path === '/user-management' ? 'brightness(0) invert(1)' : 'None' }" />
           用户管理
         </div>
+        <div v-if="isSuperAdmin" class="equipment-management"
+          :class="{ 'active-tab': $route.path === '/params-management' }" @click="goParamManagement">
+          <img loading="lazy" alt="" src="@/assets/header/param_management.png"
+            :style="{ filter: $route.path === '/params-management' ? 'brightness(0) invert(1)' : 'None' }" />
+          参数管理
+        </div>
       </div>
 
       <!-- 右侧元素 -->
       <div class="header-right">
-        <div class="search-container">
+        <div class="search-container" v-if="$route.path === '/home'">
           <el-input v-model="search" placeholder="输入名称搜索.." class="custom-search-input"
             @keyup.enter.native="handleSearch">
             <i slot="suffix" class="el-icon-search search-icon" @click="handleSearch"></i>
@@ -96,6 +102,9 @@ export default {
     goModelConfig() {
       this.$router.push('/model-config')
     },
+    goParamManagement() {
+      this.$router.push('/params-management')
+    },
     // 获取用户信息
     fetchUserInfo() {
       userApi.getUserInfo(({ data }) => {

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

@@ -15,11 +15,11 @@
         <div style="display: flex; align-items: center; gap: 20px;">
           <div style="display: flex; align-items: center;">
             <span style="margin-right: 8px;">是否启用</span>
-            <el-switch v-model="form.isEnable" class="custom-switch"></el-switch>
+            <el-switch v-model="form.isEnabled" :active-value="1" :inactive-value="0" class="custom-switch"></el-switch>
           </div>
           <div style="display: flex; align-items: center;">
             <span style="margin-right: 8px;">设为默认</span>
-            <el-switch v-model="form.isDefault" class="custom-switch"></el-switch>
+            <el-switch v-model="form.isDefault" :active-value="1" :inactive-value="0" class="custom-switch"></el-switch>
           </div>
         </div>
       </div>
@@ -29,27 +29,27 @@
       <el-form :model="form" ref="form" label-width="100px" label-position="left" class="custom-form">
         <div style="display: flex; gap: 20px; margin-bottom: 0;">
           <el-form-item label="模型名称" prop="name" style="flex: 1;">
-            <el-input v-model="form.name" placeholder="请输入模型名称" class="custom-input-bg"></el-input>
+            <el-input v-model="form.modelName" placeholder="请输入模型名称" class="custom-input-bg"></el-input>
           </el-form-item>
           <el-form-item label="模型编码" prop="code" style="flex: 1;">
-            <el-input v-model="form.code" placeholder="请输入模型编码" class="custom-input-bg"></el-input>
+            <el-input v-model="form.modelCode" placeholder="请输入模型编码" class="custom-input-bg"></el-input>
           </el-form-item>
         </div>
 
         <div style="display: flex; gap: 20px; margin-bottom: 0;">
           <el-form-item label="供应器" prop="supplier" style="flex: 1;">
-            <el-select v-model="form.supplier" placeholder="请选择" class="custom-select custom-input-bg"
+            <el-select v-model="form.configJson.type" placeholder="请选择" class="custom-select custom-input-bg"
               style="width: 100%;" @focus="loadProviders" filterable>
               <el-option v-for="item in providers" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
           <el-form-item label="排序号" prop="sort" style="flex: 1;">
-            <el-input v-model="form.sort" placeholder="请输入排序号" class="custom-input-bg"></el-input>
+            <el-input v-model.number="form.sort" type="number" placeholder="请输入排序号" class="custom-input-bg"></el-input>
           </el-form-item>
         </div>
 
         <el-form-item label="文档地址" prop="docUrl" style="margin-bottom: 27px;">
-          <el-input v-model="form.docUrl" placeholder="请输入文档地址" class="custom-input-bg"></el-input>
+          <el-input v-model="form.docLink" placeholder="请输入文档地址" class="custom-input-bg"></el-input>
         </el-form-item>
 
         <el-form-item label="备注" prop="remark" class="prop-remark">
@@ -59,21 +59,27 @@
       </el-form>
 
       <div style="font-size: 20px; font-weight: bold; color: #3d4566; margin-bottom: 15px;">调用信息</div>
-      <div style="height: 2px; background: #e9e9e9; margin-bottom: 15px;"></div>
+      <div style="height: 2px; background: #e9e9e9; margin-bottom: 22px;"></div>
 
-      <el-form :model="form" label-width="100px" label-position="left" class="custom-form">
-        <div style="display: flex; gap: 10px; margin-bottom: 15px;">
-          <el-form-item label="模型名称" prop="modelName" style="flex: 0.5; margin-bottom: 0;">
-            <el-input v-model="form.modelName" placeholder="请输入model_name" class="custom-input-bg"></el-input>
-          </el-form-item>
-          <el-form-item label="接口地址" prop="apiUrl" style="flex: 1; margin-bottom: 0;">
-            <el-input v-model="form.apiUrl" placeholder="请输入base_url" class="custom-input-bg"></el-input>
-          </el-form-item>
-        </div>
-
-        <el-form-item label="秘钥信息" prop="apiKey">
-          <el-input v-model="form.apiKey" placeholder="请输入api_key" show-password class="custom-input-bg"></el-input>
-        </el-form-item>
+      <el-form :model="form.configJson" ref="callInfoForm" label-width="auto" class="custom-form">
+        <template v-for="(row, rowIndex) in chunkedCallInfoFields">
+          <div :key="rowIndex" style="display: flex; gap: 20px; margin-bottom: 0;">
+            <el-form-item
+              v-for="field in row"
+              :key="field.prop"
+              :label="field.label"
+              :prop="field.prop"
+              style="flex: 1;">
+              <el-input
+                v-model="form.configJson[field.prop]"
+                :placeholder="field.placeholder"
+                :type="field.type"
+                class="custom-input-bg"
+                :show-password="field.type === 'password'">
+              </el-input>
+            </el-form-item>
+          </div>
+        </template>
       </el-form>
     </div>
 
@@ -87,11 +93,16 @@
 
 <script>
 import Api from '@/apis/api';
+
 export default {
-  name: "ModelConfigDialog",
+  name: "ModelEditDialog",
   props: {
     visible: { type: Boolean, default: false },
-    configData: { type: Object, default: () => ({}) },
+    modelData: {
+      type: Object,
+      default: () => ({}),
+      validator: value => typeof value === 'object' && !Array.isArray(value)
+    },
     modelType: { type: String, required: true }
   },
   data() {
@@ -99,67 +110,177 @@ export default {
       dialogVisible: this.visible,
       providers: [],
       providersLoaded: false,
+      allProvidersData: null,
+      pendingProviderType: null,
+      pendingModelData: null,
+      dynamicCallInfoFields: [],
       form: {
-        code: "",
-        name: "",
-        supplier: "",
-        isDefault: true,
-        isEnable: true,
-        docUrl: "",
-        sort: 123,
-        remark: "",
-        apiUrl: "",
+        id: "",
+        modelType: "",
+        modelCode: "",
         modelName: "",
-        apiKey: ""
+        isDefault: false,
+        isEnabled: false,
+        docLink: "",
+        remark: "",
+        sort: 0,
+        configJson: {}
       }
     };
   },
+  computed: {
+    chunkedCallInfoFields() {
+      const chunkSize = 2;
+      const result = [];
+      for (let i = 0; i < this.dynamicCallInfoFields.length; i += chunkSize) {
+        result.push(this.dynamicCallInfoFields.slice(i, i + chunkSize));
+      }
+      return result;
+    },
+  },
   watch: {
     modelType() {
-      this.resetProviders()
+      this.resetProviders();
+      this.loadProviders();
     },
     dialogVisible(val) {
       this.$emit('update:visible', val);
       if (!val) {
-        this.form = {
-          code: "",
-          name: "",
-          supplier: "",
-        };
+        this.resetForm();
+      } else if (val && this.modelData.id) {
+        this.loadModelData();
       }
     },
     visible(val) {
       this.dialogVisible = val;
       if (val) {
-        this.form = JSON.parse(JSON.stringify({
-          ...this.form,
-          ...this.configData
-        }));
-        this.resetProviders();
+        this.loadProviders();
       }
     },
+    'form.configJson.type'(newVal) {
+      if (newVal && this.providersLoaded) {
+        this.loadProviderFields(newVal);
+      }
+    }
   },
   methods: {
+    resetForm() {
+        this.form = {
+            id: "",
+            modelType: "",
+            modelCode: "",
+            modelName: "",
+            isDefault: false,
+            isEnabled: false,
+            docLink: "",
+            remark: "",
+            sort: 0,
+            configJson: {}
+        };
+        this.dynamicCallInfoFields.forEach(field => {
+          this.$set(this.form.configJson, field.prop, '');
+        });
+    },
     resetProviders() {
-      this.providers = []
-      this.providersLoaded = false
+      this.providers = [];
+      this.providersLoaded = false;
+    },
+    loadModelData() {
+        if (this.modelData.id) {
+            Api.model.getModelConfig(this.modelData.id, ({ data }) => {
+                if (data.code === 0 && data.data) {
+                    const model = data.data;
+                    this.pendingProviderType = model.configJson.type;
+                    this.pendingModelData = model;
+
+                    if (this.providersLoaded) {
+                      this.loadProviderFields(model.configJson.type);
+                    } else {
+                      this.loadProviders();
+                    }
+                }
+            });
+        }
     },
     handleSave() {
-      this.$emit("submit", this.form);
+        const provideCode = this.form.configJson.type;
+        const formData = {
+            id: this.modelData.id,
+            modelCode: this.form.modelCode,
+            modelName: this.form.modelName,
+            isDefault: this.form.isDefault ? 1 : 0,
+            isEnabled: this.form.isEnabled ? 1 : 0,
+            docLink: this.form.docLink,
+            remark: this.form.remark,
+            sort: this.form.sort || 0,
+            configJson: {
+              ...this.form.configJson,
+          }
+      };
+      this.$emit("save", { provideCode, formData });
       this.dialogVisible = false;
     },
-
     loadProviders() {
-      if (this.providersLoaded) return
+      if (this.providersLoaded) return;
 
       Api.model.getModelProviders(this.modelType, (data) => {
         this.providers = data.map(item => ({
           label: item.name,
-          value: item.providerCode
-        }))
-        this.providersLoaded = true
-      })
+          value: String(item.providerCode)
+        }));
+        this.providersLoaded = true;
+
+        this.allProvidersData = data;
+
+        if (this.pendingProviderType) {
+          this.loadProviderFields(this.pendingProviderType);
+        }
+      });
     },
+    loadProviderFields(providerCode) {
+      if (this.allProvidersData) {
+        const provider = this.allProvidersData.find(p => p.providerCode === providerCode);
+        if (provider) {
+          this.dynamicCallInfoFields = JSON.parse(provider.fields || '[]').map(f => ({
+            label: f.label,
+            prop: f.key,
+            type: f.type === 'password' ? 'password' : 'text',
+            placeholder: `请输入${f.label}`
+          }));
+
+          if (this.pendingModelData && this.pendingProviderType === providerCode) {
+            this.processModelData(this.pendingModelData);
+            this.pendingModelData = null;
+            this.pendingProviderType = null;
+          }
+        }
+      }
+    },
+    processModelData(model) {
+      let configJson = model.configJson || {};
+      this.dynamicCallInfoFields.forEach(field => {
+        if (!configJson.hasOwnProperty(field.prop)) {
+          configJson[field.prop] = '';
+        } else if (typeof configJson[field.prop] !== 'string') {
+          configJson[field.prop] = String(configJson[field.prop]);
+        }
+      });
+
+      this.form = {
+        id: model.id,
+        modelType: model.modelType,
+        modelCode: model.modelCode,
+        modelName: model.modelName,
+        isDefault: model.isDefault,
+        isEnabled: model.isEnabled,
+        docLink: model.docLink,
+        remark: model.remark,
+        sort: Number(model.sort) || 0,
+        configJson: {
+          ...configJson
+        }
+      };
+    }
   }
 };
 </script>
@@ -324,4 +445,22 @@ export default {
 .custom-input-bg .el-input__inner {
   height: 32px;
 }
+
+
+.custom-form .el-form-item {
+  margin-bottom: 20px;
+}
+
+
+.custom-input-bg .el-input__inner {
+  height: 32px;
+}
+
+
+.custom-form .el-form-item__label {
+  color: #3d4566;
+  font-weight: normal;
+  text-align: right;
+  padding-right: 20px;
+}
 </style>

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

@@ -0,0 +1,347 @@
+<template>
+  <el-dialog :title="title"
+    :visible.sync="visible"
+    width="520px"
+    class="param-dialog-wrapper"
+    :append-to-body="true"
+    :close-on-click-modal="false"
+    :key="dialogKey"
+    custom-class="custom-param-dialog"
+    :show-close="false"
+  >
+    <div class="dialog-container">
+      <div class="dialog-header">
+        <h2 class="dialog-title">{{ title }}</h2>
+        <button class="custom-close-btn" @click="cancel">
+          <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+            <path d="M13 1L1 13M1 1L13 13" stroke="currentColor" stroke-width="2" stroke-linecap="round"/>
+          </svg>
+        </button>
+      </div>
+
+      <el-form :model="form" :rules="rules" ref="form" label-width="110px" label-position="left" class="param-form">
+        <el-form-item label="参数编码" prop="paramCode" class="form-item">
+          <el-input v-model="form.paramCode" placeholder="请输入参数编码" class="custom-input"></el-input>
+        </el-form-item>
+
+        <el-form-item label="参数值" prop="paramValue" class="form-item">
+          <el-input v-model="form.paramValue" placeholder="请输入参数值" class="custom-input"></el-input>
+        </el-form-item>
+
+        <el-form-item label="值类型" prop="valueType" class="form-item">
+          <el-select v-model="form.valueType" placeholder="请选择值类型" class="custom-select">
+            <el-option v-for="item in valueTypeOptions" :key="item.value" :label="item.label" :value="item.value"/>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="备注" prop="remark" class="form-item remark-item">
+          <el-input type="textarea" v-model="form.remark" placeholder="请输入备注" :rows="3" class="custom-textarea"></el-input>
+        </el-form-item>
+      </el-form>
+
+      <div class="dialog-footer">
+        <el-button type="primary" @click="submit" class="save-btn">
+          保存
+        </el-button>
+        <el-button @click="cancel" class="cancel-btn">
+          取消
+        </el-button>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  props: {
+    title: {
+      type: String,
+      default: '新增参数'
+    },
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    form: {
+      type: Object,
+      default: () => ({
+        id: null,
+        paramCode: '',
+        paramValue: '',
+        valueType: 'string',
+        remark: ''
+      })
+    }
+  },
+  data() {
+    return {
+      dialogKey: Date.now(),
+      valueTypeOptions: [
+        { value: 'string', label: '字符串(string)' },
+        { value: 'number', label: '数字(number)' },
+        { value: 'boolean', label: '布尔值(boolean)' },
+        { value: 'array', label: '数组(array)' },
+        { value: 'json', label: 'JSON对象(json)' }
+      ],
+      rules: {
+        paramCode: [
+          { required: true, message: "请输入参数编码", trigger: "blur" }
+        ],
+        paramValue: [
+          { required: true, message: "请输入参数值", trigger: "blur" }
+        ],
+        valueType: [
+          { required: true, message: "请选择值类型", trigger: "change" }
+        ]
+      }
+    };
+  },
+  methods: {
+    submit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.$emit('submit', this.form);
+        }
+      });
+    },
+    cancel() {
+      this.$emit('cancel');
+    }
+  },
+  watch: {
+    visible(newVal) {
+      if (newVal) {
+        this.dialogKey = Date.now();
+      }
+    }
+  }
+};
+</script>
+
+<style>
+.custom-param-dialog {
+  border-radius: 16px !important;
+  overflow: hidden;
+  box-shadow: 0 10px 30px rgba(0, 0, 0, 0.15) !important;
+  border: none !important;
+
+  .el-dialog__header {
+    display: none;
+  }
+
+  .el-dialog__body {
+    padding: 0 !important;
+    border-radius: 16px;
+  }
+}
+</style>
+
+<style scoped lang="scss">
+.param-dialog-wrapper {
+  .dialog-container {
+    padding: 24px 32px;
+    background: linear-gradient(135deg, #f8fafc 0%, #f1f5f9 100%);
+  }
+
+  .dialog-header {
+    position: relative;
+    margin-bottom: 24px;
+    text-align: center;
+  }
+
+  .dialog-title {
+    font-size: 20px;
+    color: #1e293b;
+    margin: 0;
+    padding: 0;
+    font-weight: 600;
+    letter-spacing: 0.5px;
+  }
+
+  .custom-close-btn {
+    position: absolute;
+    top: -8px;
+    right: -8px;
+    width: 32px;
+    height: 32px;
+    border-radius: 50%;
+    border: none;
+    background: #f1f5f9;
+    color: #64748b;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0;
+    outline: none;
+    transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+
+    &:hover {
+      color: #ffffff;
+      background: #ef4444;
+      transform: rotate(90deg);
+      box-shadow: 0 4px 6px rgba(239, 68, 68, 0.2);
+    }
+
+    svg {
+      transition: transform 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+    }
+  }
+
+  .param-form {
+    .form-item {
+      margin-bottom: 20px;
+
+      :deep(.el-form-item__label) {
+        color: #475569;
+        font-weight: 500;
+        padding-right: 12px;
+        text-align: right;
+        font-size: 14px;
+        letter-spacing: 0.2px;
+      }
+    }
+
+    .custom-input {
+      :deep(.el-input__inner) {
+        background-color: #ffffff;
+        border-radius: 8px;
+        border: 1px solid #e2e8f0;
+        height: 42px;
+        padding: 0 14px;
+        transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+        font-size: 14px;
+        color: #334155;
+        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+
+        &:focus {
+          border-color: #3b82f6;
+          box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.2);
+          background-color: #ffffff;
+        }
+
+        &::placeholder {
+          color: #94a3b8;
+          font-weight: 400;
+        }
+      }
+    }
+
+    .custom-select {
+      width: 100%;
+
+      :deep(.el-input__inner) {
+        background-color: #ffffff;
+        border-radius: 8px;
+        border: 1px solid #e2e8f0;
+        height: 42px;
+        transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+        font-size: 14px;
+        color: #334155;
+        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+
+        &:focus {
+          border-color: #3b82f6;
+          box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.2);
+          background-color: #ffffff;
+        }
+
+        &::placeholder {
+          color: #94a3b8;
+          font-weight: 400;
+        }
+      }
+    }
+
+    .custom-textarea {
+      :deep(.el-textarea__inner) {
+        background-color: #ffffff;
+        border-radius: 8px;
+        border: 1px solid #e2e8f0;
+        padding: 12px 14px;
+        transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+        font-size: 14px;
+        color: #334155;
+        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+        line-height: 1.5;
+
+        &:focus {
+          border-color: #3b82f6;
+          box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.2);
+          background-color: #ffffff;
+        }
+
+        &::placeholder {
+          color: #94a3b8;
+          font-weight: 400;
+        }
+      }
+    }
+
+    .remark-item :deep(.el-form-item__label) {
+      margin-top: -4px;
+    }
+  }
+
+  .dialog-footer {
+    display: flex;
+    justify-content: center;
+    padding: 16px 0 0;
+    margin-top: 16px;
+
+    .save-btn {
+      width: 120px;
+      height: 42px;
+      font-size: 14px;
+      font-weight: 500;
+      border-radius: 8px;
+      transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+      background: #3b82f6;
+      color: white;
+      border: none;
+      letter-spacing: 0.5px;
+      box-shadow: 0 2px 4px rgba(59, 130, 246, 0.2);
+
+      &:hover {
+        background: #2563eb;
+        transform: translateY(-1px);
+        box-shadow: 0 4px 6px rgba(59, 130, 246, 0.3);
+      }
+
+      &:active {
+        transform: translateY(0);
+        box-shadow: 0 2px 3px rgba(59, 130, 246, 0.2);
+      }
+    }
+
+    .cancel-btn {
+      width: 120px;
+      height: 42px;
+      font-size: 14px;
+      font-weight: 500;
+      border-radius: 8px;
+      transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+      background: #ffffff;
+      color: #64748b;
+      border: 1px solid #e2e8f0;
+      margin-left: 16px;
+      letter-spacing: 0.5px;
+      box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+
+      &:hover {
+        background: #f8fafc;
+        color: #475569;
+        border-color: #cbd5e1;
+        transform: translateY(-1px);
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+      }
+
+      &:active {
+        transform: translateY(0);
+        box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+      }
+    }
+  }
+}
+</style>

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

@@ -1,201 +1,671 @@
 <template>
-  <el-dialog :visible.sync="localVisible" width="80%" @close="handleClose">
-    <el-row class="main-container">
-      <el-col :span="4">
-        <el-menu class="model-menu" :default-active="activeModel" mode="vertical" @select="handleModelSelect">
-          <el-menu-item index="EdgeTTS">EdgeTTS</el-menu-item>
-          <el-menu-item index="DoubaoTTS">DoubaoTTS</el-menu-item>
-          <el-menu-item index="TTS302AI">TTS302AI</el-menu-item>
-          <el-menu-item index="CosyVoiceSiliconflow">CosyVoiceSiliconflow</el-menu-item>
-        </el-menu>
-      </el-col>
-
-      <el-col :span="20">
-        <div class="search-operate">
-          <el-input placeholder="请输入音色名称查询" v-model="searchQuery" style="width: 300px; margin-right: 10px;"/>
-          <el-button type="primary" @click="handleSearch">查询</el-button>
-          <el-button type="primary" plain @click="handleAddVoice">添加音色</el-button>
-          <el-button type="danger" plain @click="handleBatchDelete">批量删除</el-button>
-        </div>
-
-        <el-table :data="filteredTtsModels" style="width: 100%" border stripe header-row-class-name="table-header">
-          <el-table-column label="音色编码" prop="voiceCode" width="150" align="center"></el-table-column>
-          <el-table-column label="音色名称" prop="voiceName" width="180" align="center"></el-table-column>
-          <el-table-column label="语言类型" prop="languageType" width="120" align="center"></el-table-column>
-          <el-table-column label="备注" prop="remark" align="center"></el-table-column>
-          <el-table-column label="操作" width="200" align="center">
+  <el-dialog
+      :visible.sync="localVisible"
+      width="85%"
+      @close="handleClose"
+      :show-close="false"
+      :append-to-body="true"
+      :close-on-click-modal="true">
+    <button class="custom-close-btn" @click="handleClose">
+      ×
+    </button>
+    <div class="scroll-wrapper">
+      <div
+          class="table-container"
+          ref="tableContainer"
+          @scroll="handleScroll">
+        <el-table
+            v-loading="loading"
+            :data="filteredTtsModels"
+            style="width: 100%;"
+            class="data-table"
+            header-row-class-name="table-header"
+            :fit="true">
+          <el-table-column label="选择" width="50" align="center">
             <template slot-scope="scope">
-              <el-button size="mini" type="text" @click="editVoice(scope.row)" style="color: #409EFF; margin-right: 15px;">修改</el-button>
-              <el-button size="mini" type="text" @click="deleteVoice(scope.row)" style="color: #F56C6C;">删除</el-button>
+              <el-checkbox v-model="scope.row.selected"></el-checkbox>
+            </template>
+          </el-table-column>
+          <el-table-column label="音色编码" align="center" min-width="50">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.editing" v-model="scope.row.voiceCode"></el-input>
+              <span v-else>{{ scope.row.voiceCode }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="音色名称" align="center" min-width="50">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.editing" v-model="scope.row.voiceName"></el-input>
+              <span v-else>{{ scope.row.voiceName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="语言类型" align="center" min-width="50">
+            <template slot-scope="scope">
+              <el-input v-if="scope.row.editing" v-model="scope.row.languageType"></el-input>
+              <span v-else>{{ scope.row.languageType }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="试听" align="center" min-width="100px" class-name="audio-column">
+            <template slot-scope="scope">
+              <div class="custom-audio-container">
+                <el-input
+                    v-if="scope.row.editing"
+                    v-model="scope.row.voiceDemo"
+                    placeholder="请输入MP3地址"
+                    size="mini"
+                    class="audio-input">
+                </el-input>
+                <AudioPlayer v-else-if="isValidAudioUrl(scope.row.voiceDemo)" :audioUrl="scope.row.voiceDemo"/>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" align="center">
+            <template slot-scope="scope">
+              <el-input
+                  v-if="scope.row.editing"
+                  type="textarea"
+                  :rows="1"
+                  autosize
+                  v-model="scope.row.remark"
+                  placeholder="这里是备注"
+                  class="remark-input"></el-input>
+              <span v-else>{{ scope.row.remark }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="150">
+            <template slot-scope="scope">
+              <template v-if="!scope.row.editing">
+                <el-button type="text" size="mini" @click="startEdit(scope.row)" class="edit-btn">
+                  编辑
+                </el-button>
+                <el-button type="text" size="mini" @click="deleteRow(scope.row)" class="delete-btn">
+                  删除
+                </el-button>
+              </template>
+              <el-button
+                  v-else
+                  type="success"
+                  size="mini"
+                  @click="saveEdit(scope.row)"
+                  class="save-Tts">保存
+              </el-button>
             </template>
           </el-table-column>
         </el-table>
+      </div>
 
-        <div class="pagination-container">
-          <el-pagination :current-page="currentPage" :page-size="pageSize" :total="total" layout="prev, pager, next" prev-text="<" next-text=">"/>
+      <!-- 自定义滚动条 -->
+      <div class="custom-scrollbar" ref="scrollbar">
+        <div class="custom-scrollbar-track" ref="scrollbarTrack" @click="handleTrackClick">
+          <div class="custom-scrollbar-thumb" ref="scrollbarThumb" @mousedown="startDrag"></div>
         </div>
-
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="handleClose" size="medium">关闭</el-button>
-          <el-button type="primary" @click="handleImportExport" size="medium">导入导出配置</el-button>
-        </div>
-        <EditVoiceDialog :showDialog="editDialogVisible" :voiceData="editVoiceData" @update:showDialog="editDialogVisible = $event" @saveVoice="handleSaveEditedVoice"/>
-      </el-col>
-    </el-row>
+      </div>
+    </div>
+    <div class="action-buttons">
+      <el-button type="primary" size="mini" @click="toggleSelectAll" style="background: #606ff3;border: None">
+        {{ selectAll ? '取消全选' : '全选' }}
+      </el-button>
+      <el-button type="primary" size="mini" @click="addNew" style="background: #5bc98c;border: None;">
+        新增
+      </el-button>
+      <el-button type="primary"
+                 size="mini"
+                 @click="deleteRow(filteredTtsModels.filter(row => row.selected))"
+                 style="background: red;border:None">删除
+      </el-button>
+    </div>
   </el-dialog>
 </template>
 
 <script>
-import EditVoiceDialog from "@/components/EditVoiceDialog.vue";
+import AudioPlayer from './AudioPlayer.vue'
+import Api from "@/apis/api";
+
 export default {
-  components: { EditVoiceDialog },
+  components: {AudioPlayer},
   props: {
     visible: {
       type: Boolean,
       default: false
+    },
+    ttsModelId: {
+      type: String,
+      required: true
     }
   },
   data() {
     return {
       localVisible: this.visible,
-      activeModel: 'EdgeTTS',
       searchQuery: '',
       editDialogVisible: false,
       editVoiceData: {},
-      ttsModels: [
-        { voiceCode: 'wawaxiaohe', voiceName: '湾湾小何', languageType: '中文', remark: '' },
-        { voiceCode: 'wawaxiaohe', voiceName: '湾湾小何', languageType: '中文', remark: '' },
-        { voiceCode: 'wawaxiaohe', voiceName: '湾湾小何', languageType: '中文', remark: '' },
-        { voiceCode: 'wawaxiaohe', voiceName: '湾湾小何', languageType: '中文', remark: '' },
-      ],
+      ttsModels: [],
       currentPage: 1,
-      pageSize: 4,
-      total: 20
+      pageSize: 10000,
+      total: 0,
+      isDragging: false,
+      startY: 0,
+      scrollTop: 0,
+      selectAll: false,
+      selectedRows: [],
+      loading: false,
     };
   },
   watch: {
     visible(newVal) {
       this.localVisible = newVal;
+      if (newVal) {
+        this.currentPage = 1;
+        this.loadData(); // 对话框显示时加载数据
+        this.$nextTick(() => {
+          this.updateScrollbar();
+        });
+      }
+    },
+    filteredTtsModels() {
+      this.$nextTick(() => {
+        this.updateScrollbar();
+      });
     }
   },
   computed: {
     filteredTtsModels() {
       return this.ttsModels.filter(model =>
-        model.voiceName.toLowerCase().includes(this.searchQuery.toLowerCase())
+          model.voiceName.toLowerCase().includes(this.searchQuery.toLowerCase())
       );
     }
   },
+  mounted() {
+    this.updateScrollbar();
+    window.addEventListener('resize', this.updateScrollbar);
+    window.addEventListener('mouseup', this.stopDrag);
+    window.addEventListener('mousemove', this.handleDrag);
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.updateScrollbar);
+    window.removeEventListener('mouseup', this.stopDrag);
+    window.removeEventListener('mousemove', this.handleDrag);
+  },
   methods: {
+    loadData() {
+      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 => ({
+                id: item.id || '',
+                voiceCode: item.ttsVoice || '',
+                voiceName: item.name || '未命名音色',
+                languageType: item.languages || '',
+                remark: item.remark || '',
+                voiceDemo: item.voiceDemo || '',
+                selected: false,
+                editing: false,
+                sort: Number(item.sort)
+              }))
+              .sort((a, b) => a.sort - b.sort);
+          this.total = data.total;
+        } else {
+          this.$message.error({
+            message: data.msg || '获取音色列表失败',
+            showClose: true
+          });
+        }
+      }, (err) => {
+        console.error('加载失败:', err);
+        this.$message.error({
+          message: '加载音色数据失败',
+          showClose: true
+        });
+      });
+    },
+
     handleClose() {
+      // 重置状态
+      this.ttsModels = [];
+      this.currentPage = 1;
+      this.total = 0;
+      this.selectAll = false;
+      this.searchQuery = '';
+
       this.localVisible = false;
       this.$emit('update:visible', false);
     },
-    handleModelSelect(index) {
-      this.activeModel = index;
-      // 可根据选中模型加载对应数据
+
+    updateScrollbar() {
+      const container = this.$refs.tableContainer;
+      const scrollbarThumb = this.$refs.scrollbarThumb;
+      const scrollbarTrack = this.$refs.scrollbarTrack;
+
+      if (!container || !scrollbarThumb || !scrollbarTrack) return;
+
+      const {scrollHeight, clientHeight} = container;
+      const trackHeight = scrollbarTrack.clientHeight;
+      const thumbHeight = Math.max((clientHeight / scrollHeight) * trackHeight, 20);
+
+      scrollbarThumb.style.height = `${thumbHeight}px`;
+      this.updateThumbPosition();
     },
-    handleSearch() {
-      // 搜索
+
+    updateThumbPosition() {
+      const container = this.$refs.tableContainer;
+      const scrollbarThumb = this.$refs.scrollbarThumb;
+      const scrollbarTrack = this.$refs.scrollbarTrack;
+
+      if (!container || !scrollbarThumb || !scrollbarTrack) return;
+
+      const {scrollHeight, clientHeight, scrollTop} = container;
+      const trackHeight = scrollbarTrack.clientHeight;
+      const thumbHeight = scrollbarThumb.clientHeight;
+      const maxTop = trackHeight - thumbHeight;
+      const thumbTop = (scrollTop / (scrollHeight - clientHeight)) * (trackHeight - thumbHeight);
+
+      scrollbarThumb.style.top = `${Math.min(thumbTop, maxTop)}px`;
     },
-    handleAddVoice() {
-      // 添加音色
+
+    handleScroll() {
+      const container = this.$refs.tableContainer;
+      if (container.scrollTop + container.clientHeight >= container.scrollHeight - 50) {
+        if (this.currentPage * this.pageSize < this.total) {
+          this.currentPage++;
+          this.loadData();
+        }
+      }
+      this.updateThumbPosition();
     },
-    handleBatchDelete() {
-      // 批量删除
+
+    startDrag(e) {
+      this.isDragging = true;
+      this.startY = e.clientY;
+      this.scrollTop = this.$refs.tableContainer.scrollTop;
+      e.preventDefault();
     },
-     editVoice(voice) {
-      this.editVoiceData = { ...voice };
-      this.editDialogVisible = true;
+
+    stopDrag() {
+      this.isDragging = false;
     },
-    handleSaveEditedVoice(voiceForm) {
-      const index = this.ttsModels.findIndex(item => item.voiceCode === voiceForm.voiceCode);
-      if (index !== -1) {
-        this.ttsModels.splice(index, 1, voiceForm);
+
+    handleDrag(e) {
+      if (!this.isDragging) return;
+
+      const container = this.$refs.tableContainer;
+      const scrollbarTrack = this.$refs.scrollbarTrack;
+      const scrollbarThumb = this.$refs.scrollbarThumb;
+      const deltaY = e.clientY - this.startY;
+      const trackHeight = scrollbarTrack.clientHeight;
+      const thumbHeight = scrollbarThumb.clientHeight;
+      const maxScrollTop = container.scrollHeight - container.clientHeight;
+
+      const scrollRatio = (trackHeight - thumbHeight) / maxScrollTop;
+      container.scrollTop = this.scrollTop + deltaY / scrollRatio;
+    },
+
+    handleTrackClick(e) {
+      const container = this.$refs.tableContainer;
+      const scrollbarTrack = this.$refs.scrollbarTrack;
+      const scrollbarThumb = this.$refs.scrollbarThumb;
+
+      if (!container || !scrollbarTrack || !scrollbarThumb) return;
+
+      const trackRect = scrollbarTrack.getBoundingClientRect();
+      const thumbHeight = scrollbarThumb.clientHeight;
+      const clickPosition = e.clientY - trackRect.top;
+      const thumbCenter = clickPosition - thumbHeight / 2;
+
+      const trackHeight = scrollbarTrack.clientHeight;
+      const maxTop = trackHeight - thumbHeight;
+      const newTop = Math.max(0, Math.min(thumbCenter, maxTop));
+
+      scrollbarThumb.style.top = `${newTop}px`;
+      container.scrollTop = (newTop / (trackHeight - thumbHeight)) * (container.scrollHeight - container.clientHeight);
+    },
+
+    startEdit(row) {
+      row.editing = true;
+      this.$set(row, 'originalData', {...row});
+    },
+
+    saveEdit(row) {
+      try {
+        const params = {
+          id: row.id,
+          voiceCode: row.voiceCode,
+          voiceName: row.voiceName,
+          languageType: row.languageType,
+          remark: row.remark,
+          ttsModelId: this.ttsModelId,
+          voiceDemo: row.voiceDemo || '',
+          sort: row.sort
+        };
+
+        let res;
+        if (row.id) {
+          // 已有ID，执行更新操作
+          Api.timbre.updateVoice(params, (response) => {
+            res = response;
+            this.handleResponse(res, row);
+          });
+        } else {
+          // 没有ID，执行新增操作
+          Api.timbre.saveVoice(params, (response) => {
+            res = response;
+            this.handleResponse(res, row);
+          });
+        }
+      } catch (error) {
+        console.error('操作失败:', error);
+        // 异常情况下也恢复原始数据
+        if (row.originalData) {
+          Object.assign(row, row.originalData);
+          row.editing = false;
+          delete row.originalData;
+        }
+        this.$message.error({
+          message: '操作失败，请重试',
+          showClose: true
+        });
       }
     },
-    deleteVoice(voice) {
-      // 删除
+
+    handleResponse(res, row) {
+      if (res.code === 0) {
+        this.$message.success({
+          message: row.id ? '修改成功' : '保存成功',
+          showClose: true
+        });
+        row.editing = false;
+        delete row.originalData;
+        this.loadData(); // 刷新数据
+      } else {
+        // 保存失败时恢复原始数据
+        if (row.originalData) {
+          Object.assign(row, row.originalData);
+          row.editing = false;
+          delete row.originalData;
+        }
+        this.$message.error({
+          message: res.msg || (row.id ? '修改失败' : '保存失败'),
+          showClose: true
+        });
+      }
     },
-    handleImportExport() {
-      // 导入导出
+
+    toggleSelectAll() {
+      this.selectAll = !this.selectAll;
+      this.filteredTtsModels.forEach(row => {
+        row.selected = this.selectAll;
+      });
+    },
+
+    addNew() {
+      const maxSort = this.ttsModels.length > 0
+          ? Math.max(...this.ttsModels.map(item => Number(item.sort) || 0))
+          : 0;
+
+      const newRow = {
+        voiceCode: '',
+        voiceName: '',
+        languageType: '中文',
+        voiceDemo: '',
+        remark: '',
+        selected: false,
+        editing: true,
+        sort: maxSort + 1
+      };
+
+      this.ttsModels.unshift(newRow);
+    },
+
+    deleteRow(row) {
+        // 处理单个音色或音色数组
+        const voices = Array.isArray(row) ? row : [row];
+
+        if (Array.isArray(row) && row.length === 0) {
+            this.$message.warning("请先选择需要删除的音色");
+            return;
+        }
+
+
+        const voiceCount = voices.length;
+        this.$confirm(`确定要删除选中的${voiceCount}个音色吗？`, "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+            distinguishCancelAndClose: true
+        }).then(() => {
+            const ids = voices.map(voice => voice.id);
+            if (ids.some(id => !id)) {
+                this.$message.error("存在无效的音色ID");
+                return;
+            }
+
+        Api.timbre.deleteVoice(ids, ({data}) => {
+            if (data.code === 0) {
+                this.$message.success({
+                    message: `成功删除${voiceCount}个参数`,
+                    showClose: true
+                });
+                this.loadData(); // 刷新参数列表
+            } else {
+                this.$message.error({
+                    message: data.msg || '删除失败，请重试',
+                    showClose: true
+                });
+            }
+        });
+      }).catch(action => {
+          if (action === 'cancel') {
+              this.$message({
+                  type: 'info',
+                  message: '已取消删除操作',
+                  duration: 1000
+              });
+          } else {
+              this.$message({
+                  type: 'info',
+                  message: '操作已关闭',
+                  duration: 1000
+              });
+          }
+      });
+    },
+
+    isValidAudioUrl(url) {
+      return url && (url.endsWith('.mp3') || url.endsWith('.ogg') || url.endsWith('.wav'));
     }
   }
 };
 </script>
 
 <style scoped>
-.main-container {
-  padding: 20px;
+
+::v-deep .el-dialog {
+  border-radius: 8px !important;
+  overflow: hidden;
+  top: 1vh !important;
 }
 
-.model-menu {
-  border-right: 1px solid #ebeef5;
-  height: calc(100vh - 300px);
-  background-color: #fafafa;
+::v-deep .el-dialog__header {
+  display: none !important;
+  padding: 0 !important;
+  margin: 0 !important;
 }
 
-.search-operate {
-  margin-bottom: 20px;
+/* 表格样式 */
+::v-deep .data-table .el-table__header th {
+  color: black;
+  padding: 6px 0 !important;
+}
+
+::v-deep .data-table .el-table__row td {
+  padding: 8px 0 12px !important;
+}
+
+::v-deep .data-table {
+  border: none !important;
+}
+
+::v-deep .data-table.el-table::before {
+  display: none !important;
+}
+
+::v-deep .data-table .el-table__header-wrapper {
+  border-bottom: 2px solid #f1f2fb !important;
+}
+
+::v-deep .data-table .el-table__body-wrapper .el-table__body td {
+  border: none !important;
+}
+
+/* 关闭按钮 */
+.custom-close-btn {
+  position: absolute;
+  top: 15px;
+  right: 15px;
+  width: 30px;
+  height: 30px;
+  border-radius: 50%;
+  border: 2px solid #cfcfcf;
+  background: none;
+  font-size: 30px;
+  font-weight: lighter;
+  color: #cfcfcf;
+  cursor: pointer;
   display: flex;
   align-items: center;
+  justify-content: center;
+  z-index: 1;
+  padding: 0;
+  outline: none;
 }
 
-.pagination-container {
-  margin: 20px 0;
-  display: flex;
-  justify-content: right;
-}
-
-.dialog-footer {
-  text-align: right;
-  padding: 20px 20px 0;
-  border-top: 1px solid #ebeef5;
-}
-
-::v-deep .table-header th {
-  background-color: #f5f7fa;
-  color: #606266;
-  font-weight: 600;
-}
-
-::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td {
-  background-color: #fafafa;
-}
-
-::v-deep .el-table--border td, ::v-deep .el-table--border th {
-  border-right: 1px solid #ebeef5;
-}
-
-::v-deep .el-pagination {
-  padding: 10px;
-  background-color: #f5f7fa;
-  border-radius: 4px;
-}
-
-::v-deep .el-pagination .btn-prev, ::v-deep .el-pagination .btn-next {
-  background-color: #fff;
-  border: 1px solid #dcdfe6;
-  border-radius: 4px;
-}
-
-::v-deep .el-pagination .btn-prev:hover, ::v-deep .el-pagination .btn-next:hover {
-  background-color: #f5f7fa;
-}
-
-::v-deep .el-pagination .el-pager li {
-  background-color: #fff;
-  border: 1px solid #dcdfe6;
-  border-radius: 4px;
-  margin: 0 2px;
-}
-
-::v-deep .el-pagination .el-pager li:hover {
-  background-color: #f5f7fa;
-}
-
-::v-deep .el-pagination .el-pager li.active {
-  background-color: #409EFF;
-  color: #fff;
+.custom-close-btn:hover {
+  color: #409EFF;
   border-color: #409EFF;
 }
-</style>
+
+/* 备注文本 */
+::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;
+}
+
+::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;
+}
+
+/* 滚动容器 */
+.scroll-wrapper {
+  display: flex;
+  max-height: 55vh;
+  position: relative;
+}
+
+.table-container {
+  flex: 1;
+  overflow-y: scroll;
+  scrollbar-width: none;
+  padding-right: 15px;
+  width: calc(100% - 16px);
+}
+
+.table-container::-webkit-scrollbar {
+  display: none;
+}
+
+/* 自定义滚动条 */
+.custom-scrollbar {
+  width: 8px;
+  background: #f1f1f1;
+  border-radius: 4px;
+  position: relative;
+  margin-left: 8px;
+  height: 100%;
+  top: 55px;
+}
+
+.custom-scrollbar-track {
+  position: relative;
+  height: 380px;
+  cursor: pointer;
+}
+
+.custom-scrollbar-thumb {
+  position: absolute;
+  width: 100%;
+  background: #9dade7;
+  border-radius: 4px;
+  cursor: grab;
+  transition: background 0.2s;
+}
+
+.custom-scrollbar-thumb:hover {
+  background: #6b84d9;
+}
+
+.custom-scrollbar-thumb:active {
+  cursor: grabbing;
+}
+
+.save-Tts {
+  background: #796dea;
+  border: None;
+}
+
+.save-Tts:hover {
+  background: #8b80f0;
+}
+
+.custom-audio-container audio {
+  display: none;
+}
+
+/* 音频播放器容器样式 */
+.custom-audio-container {
+  width: 280px;
+  margin: auto;
+}
+
+/* 新增按钮组样式 */
+.action-buttons {
+  bottom: 20px;
+  padding-top: 10px;
+}
+.edit-btn,
+.delete-btn,
+.save-btn {
+  margin: 0 8px;
+  color: #7079aa !important;
+  transition: all 0.3s;
+}
+
+.edit-btn:hover,
+.delete-btn:hover,
+.save-btn:hover {
+  color: #5f70f3 !important;
+  transform: scale(1.05);
+}
+
+.save-btn {
+  color: #5cca8e !important;
+}
+</style>

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

@@ -1,8 +1,11 @@
 <template>
   <el-dialog :visible.sync="visible" 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 style="width: 40px;height: 40px;border-radius: 50%;background: #5778ff;display: flex;align-items: center;justify-content: center;">
-        <img src="@/assets/login/shield.png" alt="" style="width: 19px;height: 23px; filter: brightness(0) invert(1);" />
+    <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
+        style="width: 40px;height: 40px;border-radius: 50%;background: #5778ff;display: flex;align-items: center;justify-content: center;">
+        <img src="@/assets/login/shield.png" alt=""
+          style="width: 19px;height: 23px; filter: brightness(0) invert(1);" />
       </div>
       用户新密码
     </div>
@@ -13,27 +16,15 @@
         用户新密码：
       </div>
       <div class="input-46" style="margin-top: 12px;">
-        <el-input
-          v-model="password"
-          type="text"
-          :readonly="true"
-          style="font-weight: bold; color: #333;"
-        />
+        <el-input v-model="password" type="text" :readonly="true" style="font-weight: bold; color: #333;" />
       </div>
     </div>
     <div style="display: flex;margin: 15px 15px;gap: 7px;">
-      <div
-        class="dialog-btn"
-        style="background: #e6ebff;border: 1px solid #adbdff;color: #5778ff;"
-        @click="closeDialog"
-      >
+      <div class="dialog-btn" style="background: #e6ebff;border: 1px solid #adbdff;color: #5778ff;"
+        @click="closeDialog">
         关闭
       </div>
-      <div
-        class="dialog-btn"
-        style="background: #5778ff;color: white;"
-        @click="copyPassword"
-      >
+      <div class="dialog-btn" style="background: #5778ff;color: white;" @click="copyPassword">
         复制密码
       </div>
     </div>
@@ -53,7 +44,10 @@ export default {
     },
     copyPassword() {
       navigator.clipboard.writeText(this.password)
-      this.$message.success('密码已复制')
+      this.$message.success({
+        message: '密码已复制',
+        showClose: true
+      })
     }
   }
 }

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

@@ -69,7 +69,17 @@ const routes = [
       return import('../views/test.vue')
     }
   },
-
+  {
+    path: '/params-management',
+    name: 'ParamsManagement',
+    component: function () {
+      return import('../views/ParamsManagement.vue')
+    },
+    meta: {
+      requiresAuth: true,
+      title: '参数管理'
+    }
+  },
 ]
 
 const router = new VueRouter({

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

@@ -4,10 +4,8 @@
     <el-main style="padding: 20px; display: flex; flex-direction: column;">
       <div class="table-container">
         <h3 class="device-list-title">设备列表</h3>
-        <el-button type="primary" class="add-device-btn" @click="handleAddDevice">
-          + 添加设备
-        </el-button>
-        <el-table :data="paginatedDeviceList" style="width: 100%; margin-top: 20px" border stripe>
+        <el-table ref="deviceTable" :data="paginatedDeviceList" @selection-change="handleSelectionChange" style="width: 100%; margin-top: 20px" border stripe>
+          <el-table-column type="selection" align="center" width="60"></el-table-column>
           <el-table-column label="设备型号" prop="model" flex></el-table-column>
           <el-table-column label="固件版本" prop="firmwareVersion" width="120"></el-table-column>
           <el-table-column label="Mac地址" prop="macAddress"></el-table-column>
@@ -39,9 +37,31 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-pagination class="pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange"
-          :current-page="currentPage" :page-sizes="[5, 10, 20, 50]" :page-size="pageSize"
-          layout="total, sizes, prev, pager, next, jumper" :total="deviceList.length"></el-pagination>
+        <div class="table_bottom">
+          <div class="ctrl_btn">
+            <el-button size="mini" type="primary" class="select-all-btn" @click="toggleAllSelection">
+                {{ isAllSelected ? '取消全选' : '全选' }}
+            </el-button>
+            <el-button type="primary" size="mini" class="add-device-btn" @click="handleAddDevice">
+                新增
+            </el-button>
+          </div>
+          <div class="custom-pagination">
+            <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">共{{ deviceList.length }}条记录</span>
+          </div>
+        </div>
       </div>
       <div class="copyright">
         ©2025 xiaozhi-esp32-server
@@ -62,6 +82,8 @@ export default {
   data() {
     return {
       addDeviceDialogVisible: false,
+       selectedDevices: [],
+      isAllSelected: false,
       currentAgentId: this.$route.query.agentId || '',
       currentPage: 1,
       pageSize: 5,
@@ -75,7 +97,25 @@ export default {
       const start = (this.currentPage - 1) * this.pageSize;
       const end = start + this.pageSize;
       return this.deviceList.slice(start, end);
-    }
+    },
+    pageCount() {
+    return Math.ceil(this.deviceList.length / 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;
+    },
   },
   mounted() {
     const agentId = this.$route.query.agentId;
@@ -84,6 +124,16 @@ export default {
     }
   },
   methods: {
+
+    handleSelectionChange(val) {
+      this.selectedDevices = val;
+      this.isAllSelected = val.length === this.paginatedDeviceList.length;
+    },
+    toggleAllSelection() {
+      this.$refs.deviceTable.toggleAllSelection();
+    },
+
+
     handleAddDevice() {
       this.addDeviceDialogVisible = true;
     },
@@ -115,12 +165,19 @@ export default {
         });
       });
     },
-    handleSizeChange(val) {
-      this.pageSize = val;
+    goFirst() {
+      this.currentPage = 1;
     },
-    handleCurrentChange(val) {
-      this.currentPage = val;
+    goPrev() {
+      if (this.currentPage > 1) this.currentPage--;
     },
+    goNext() {
+      if (this.currentPage < this.pageCount) this.currentPage++;
+    },
+    goToPage(page) {
+      this.currentPage = page;
+    },
+
     fetchBindDevices(agentId) {
       this.loading = true;
       Api.device.getAgentBindDevices(agentId, ({ data }) => {
@@ -180,21 +237,18 @@ export default {
 }
 
 .add-device-btn {
-  float: right;
-  background: #409eff;
-  border: none;
-  border-radius: 10px;
-  width: 105px;
+  background: linear-gradient(135deg, #6b8cff, #a966ff) !important;
+  border: none !important;
+  color: white !important;
+  margin-left: 10px;
   height: 32px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 14px;
-  gap: 8px;
-  margin-bottom: 15px;
+  padding: 7px 12px;
+  border-radius: 4px !important;
+  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
 
   &:hover {
-    background: #3a8ee6;
+    transform: translateY(-1px);
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
   }
 }
 
@@ -213,8 +267,85 @@ export default {
   vertical-align: middle;
 }
 
-.pagination {
-  margin-top: 20px;
-  text-align: right;
+.custom-pagination {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  margin-top: 15px;
 }
+
+.pagination-btn {
+  min-width: 28px;
+  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;
+}
+
+.pagination-btn:first-child,
+.pagination-btn:nth-child(2),
+.pagination-btn:nth-last-child(2) {
+  min-width: 60px;
+}
+
+.pagination-btn:hover {
+  background: #d7dce6;
+}
+
+.pagination-btn:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+}
+
+.pagination-btn.active {
+  background: #5f70f3 !important;
+  color: #ffffff !important;
+  border-color: #5f70f3 !important;
+}
+
+.total-text {
+  color: #909399;
+  font-size: 14px;
+  margin-left: 10px;
+}
+
+.table_bottom {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 20px;
+}
+
+.ctrl_btn {
+  display: flex;
+  gap: 8px;
+  padding-left: 26px;
+
+  .el-button {
+    min-width: 72px;
+    height: 32px;
+    padding: 7px 12px;
+    border-radius: 4px;
+    border: none;
+    transition: all 0.3s;
+    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;
+  }
+}
+
+
 </style>

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

@@ -3,16 +3,21 @@
     <HeaderBar />
 
     <div class="operation-bar">
-      <h2 class="page-title">模型配置</h2>
-      <div class="right-operations">
-        <el-button plain size="small" @click="handleImport" style="background: #7b9de5; color: white;">
-          <img loading="lazy" alt="" src="@/assets/model/inner_conf.png">
-          导入配置
-        </el-button>
-        <el-button plain size="small" @click="handleExport" style="background: #71c9d1; color: white;">
-          <img loading="lazy" alt="" src="@/assets/model/output_conf.png">
-          导出配置
-        </el-button>
+        <h2 class="page-title">{{ modelTypeText }}</h2>
+      <div class="action-group">
+            <div class="search-group">
+                <el-input
+                    placeholder="请输入模型名称查询"
+                    v-model="search"
+                    class="search-input"
+                    clearable
+                    @keyup.enter.native="handleSearch"
+                    style="width: 240px"
+                />
+                <el-button class="btn-search" @click="handleSearch">
+                  搜索
+                </el-button>
+            </div>
       </div>
     </div>
 
@@ -44,23 +49,6 @@
 
         <!-- 右侧内容 -->
         <div class="content-area">
-          <div class="title-bar">
-            <div class="title-wrapper">
-              <h2 class="model-title">{{ modelTypeText }}</h2>
-              <el-button type="primary" size="small" @click="addModel" class="add-btn">
-                添加
-              </el-button>
-            </div>
-            <div class="action-group">
-              <div class="search-group">
-                <el-input placeholder="请输入模型名称查询" v-model="search" size="small" class="search-input" clearable />
-                <el-button type="primary" size="small" class="search-btn" @click="handleSearch">
-                  查询
-                </el-button>
-              </div>
-            </div>
-          </div>
-
           <el-table ref="modelTable" style="width: 100%" :header-cell-style="{ background: 'transparent' }"
             :data="modelList" class="data-table" header-row-class-name="table-header"
             :header-cell-class-name="headerCellClassName" @selection-change="handleSelectionChange">
@@ -69,18 +57,24 @@
             <el-table-column label="模型编码" prop="modelCode" align="center"></el-table-column>
             <el-table-column label="提供商" align="center">
               <template slot-scope="scope">
-                {{ scope.row.configJson?.provider || '未知' }}
+                {{ scope.row.configJson.type || '未知' }}
               </template>
             </el-table-column>
             <el-table-column label="是否启用" align="center">
               <template slot-scope="scope">
                 <el-switch v-model="scope.row.isEnabled" class="custom-switch" :active-value="1" :inactive-value="0"
-                  :active-color="null" :inactive-color="null" />
+                  @change="handleStatusChange(scope.row)" />
+              </template>
+            </el-table-column>
+            <el-table-column label="是否默认" align="center">
+              <template slot-scope="scope">
+                <el-switch v-model="scope.row.isDefault" class="custom-switch" :active-value="1" :inactive-value="0"
+                  @change="handleDefaultChange(scope.row)" />
               </template>
             </el-table-column>
             <el-table-column v-if="activeTab === 'tts'" label="音色管理" align="center">
               <template slot-scope="scope">
-                <el-button type="text" size="mini" @click="ttsDialogVisible = true" class="voice-management-btn">
+                <el-button type="text" size="mini" @click="openTtsDialog(scope.row)" class="voice-management-btn">
                   音色管理
                 </el-button>
               </template>
@@ -99,9 +93,13 @@
 
           <div class="table-footer">
             <div class="batch-actions">
-              <el-button size="mini" @click="selectAll" style="width: 75px; background: #606ff3">{{ isAllSelected ?
-                '取消全选' : '全选'
-              }}</el-button>
+              <el-button size="mini" type="primary" @click="selectAll" >
+                {{ isAllSelected ?
+                '取消全选' : '全选' }}
+              </el-button>
+              <el-button type="success" size="mini" @click="addModel" class="add-btn">
+                新增
+              </el-button>
               <el-button size="mini" type="danger" icon="el-icon-delete" @click="batchDelete">
                 删除
               </el-button>
@@ -124,7 +122,7 @@
 
       <ModelEditDialog :modelType="activeTab" :visible.sync="editDialogVisible" :modelData="editModelData"
         @save="handleModelSave" />
-      <TtsModel :visible.sync="ttsDialogVisible" />
+      <TtsModel :visible.sync="ttsDialogVisible" :ttsModelId="selectedTtsModelId" />
       <AddModelDialog :modelType="activeTab" :visible.sync="addDialogVisible" @confirm="handleAddConfirm" />
     </div>
 
@@ -151,6 +149,7 @@ export default {
       editDialogVisible: false,
       editModelData: {},
       ttsDialogVisible: false,
+      selectedTtsModelId: '',
       modelList: [],
       currentPage: 1,
       pageSize: 5,
@@ -200,6 +199,10 @@ export default {
   },
 
   methods: {
+    openTtsDialog(row) {
+      this.selectedTtsModelId = row.id;
+      this.ttsDialogVisible = true;
+    },
     headerCellClassName({ column, columnIndex }) {
       if (columnIndex === 0) {
         return 'custom-selection-header';
@@ -212,8 +215,8 @@ export default {
       this.loadData();
     },
     handleSearch() {
-      // TODO: 查询
-      console.log('查询：', this.search);
+      this.currentPage = 1;
+      this.loadData();
     },
     // 批量删除
     batchDelete() {
@@ -229,7 +232,6 @@ export default {
       }).then(() => {
         const deletePromises = this.selectedModels.map(model =>
           new Promise(resolve => {
-            // TODO: 删除获取model.id
             Api.model.deleteModel(
               model.id,
               ({ data }) => resolve(data.code === 0)
@@ -239,10 +241,16 @@ export default {
 
         Promise.all(deletePromises).then(results => {
           if (results.every(Boolean)) {
-            this.$message.success('批量删除成功')
+            this.$message.success({
+              message: '批量删除成功',
+              showClose: true
+            })
             this.loadData()
           } else {
-            this.$message.error('部分删除失败')
+            this.$message.error({
+              message: '部分删除失败',
+              showClose: true
+            })
           }
         })
       }).catch(() => {
@@ -264,15 +272,19 @@ export default {
         type: 'warning'
       }).then(() => {
         Api.model.deleteModel(
-          this.activeTab,
-          model.configJson?.provider || '',  // 从configJson获取provider
           model.id,
           ({ data }) => {
             if (data.code === 0) {
-              this.$message.success('删除成功')
+              this.$message.success({
+                message: '删除成功',
+                showClose: true
+              })
               this.loadData()
             } else {
-              this.$message.error(data.msg || '删除失败')
+              this.$message.error({
+                message: data.msg || '删除失败',
+                showClose: true
+              })
             }
           }
         )
@@ -284,17 +296,21 @@ export default {
       this.currentPage = page;
       this.$refs.modelTable.clearSelection();
     },
-    handleImport() {
-      // TODO: 导入配置
-      console.log('导入配置');
-    },
-    handleExport() {
-      // TODO: 导出配置
-      console.log('导出配置');
-    },
-    handleModelSave(formData) {
-      // TODO: 保存模型数据
-      console.log('保存的模型数据：', formData);
+    handleModelSave({ provideCode, formData }) {
+      const modelType = this.activeTab;
+      const id = formData.id;
+      Api.model.updateModel(
+        { modelType, provideCode, id, formData },
+        ({ data }) => {
+          if (data.code === 0) {
+            this.$message.success('保存成功');
+            this.loadData();
+            this.editDialogVisible = false;
+          } else {
+            this.$message.error(data.msg || '保存失败');
+          }
+        }
+      );
     },
     selectAll() {
       if (this.isAllSelected) {
@@ -315,20 +331,27 @@ export default {
     handleAddConfirm(newModel) {
       const params = {
         modelType: this.activeTab,
-        provideCode: newModel.supplier,
+        provideCode: newModel.provideCode,
         formData: {
           ...newModel,
           isDefault: newModel.isDefault ? 1 : 0,
-          isEnabled: newModel.isEnabled ? 1 : 0
+          isEnabled: newModel.isEnabled ? 1 : 0,
+          configJson: newModel.configJson
         }
       };
 
       Api.model.addModel(params, ({ data }) => {
         if (data.code === 0) {
-          this.$message.success('新增成功');
+          this.$message.success({
+            message: '新增成功',
+            showClose: true
+          });
           this.loadData();
         } else {
-          this.$message.error(data.msg || '新增失败');
+          this.$message.error({
+            message: data.msg || '新增失败',
+            showClose: true
+          });
         }
       });
     },
@@ -372,12 +395,47 @@ export default {
           this.$message.error(data.msg || '获取模型列表失败');
         }
       });
+    },
+    // 处理启用/禁用状态变更
+    handleStatusChange(model) {
+      const newStatus = model.isEnabled ? 1 : 0
+      const originalStatus = model.isEnabled
+
+      model.isEnabled = !model.isEnabled
+
+      Api.model.updateModelStatus(
+        model.id,
+        newStatus,
+        ({ data }) => {
+          if (data.code === 0) {
+            this.$message.success(newStatus === 1 ? '启用成功' : '禁用成功')
+            // 保持新状态
+            model.isEnabled = newStatus
+          } else {
+            // 操作失败时恢复原状态
+            model.isEnabled = originalStatus
+            this.$message.error(data.msg || '操作失败')
+          }
+        }
+      )
+    },
+    handleDefaultChange(model) {
+      Api.model.setDefaultModel(model.id, ({ data }) => {
+        if (data.code === 0) {
+          this.$message.success('设置默认模型成功')
+          this.loadData()
+        }
+      })
     }
   },
 };
 </script>
 
 <style scoped>
+.el-switch {
+  height: 23px;
+}
+
 ::v-deep .el-table tr {
   background: transparent;
 }
@@ -396,7 +454,7 @@ export default {
 }
 
 .main-wrapper {
-  margin: 5px 20px;
+  margin: 5px 22px;
   border-radius: 15px;
   min-height: 600px;
   box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
@@ -457,7 +515,7 @@ export default {
   justify-content: flex-end;
   padding-right: 12px !important;
   width: fit-content;
-  margin: 8px 0px 8px auto;
+  margin: 8px 0 8px auto;
   min-width: unset;
 }
 
@@ -507,12 +565,6 @@ export default {
   flex-wrap: nowrap;
 }
 
-.model-title {
-  font-size: 18px;
-  color: #303133;
-  margin: 0;
-}
-
 .action-group {
   display: flex;
   align-items: center;
@@ -521,28 +573,42 @@ export default {
 
 .search-group {
   display: flex;
-  gap: 8px;
+  gap: 10px;
 }
 
 .search-input {
   width: 240px;
 }
 
-::v-deep .search-input .el-input__inner::placeholder {
-  color: black;
-  opacity: 0.6;
+.btn-search {
+  background: linear-gradient(135deg, #6b8cff, #a966ff);
+  border: none;
+  color: white;
 }
 
 ::v-deep .search-input .el-input__inner {
-  background: transparent;
+  border-radius: 4px;
+  border: 1px solid #DCDFE6;
+  background-color: white;
+  transition: border-color 0.2s;
 }
 
-.search-btn {
-  background: linear-gradient(135deg, #6B8CFF, #A966FF);
+::v-deep .search-input .el-input__inner:focus {
+  border-color: #6b8cff;
+  outline: none;
+}
+
+.btn-search {
+  background: linear-gradient(135deg, #6b8cff, #a966ff);
   border: none;
   color: white;
 }
 
+.btn-search:hover {
+  opacity: 0.9;
+  transform: translateY(-1px);
+}
+
 .data-table {
   border-radius: 6px;
   overflow: hidden;
@@ -587,20 +653,45 @@ export default {
   width: 100%;
 }
 
-.add-btn {
-  background: #cce5f9;
-  width: 75px;
-  border: none;
-  color: black;
-  padding: 8px 16px;
-}
-
 .title-wrapper {
   display: flex;
   align-items: center;
   gap: 8px;
 }
 
+.batch-actions .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);
+}
+
+.batch-actions .el-button:hover {
+  transform: translateY(-1px);
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+}
+
+.batch-actions .el-button--primary {
+  background: #5f70f3 !important;
+  color: white;
+}
+
+.batch-actions .el-button--success {
+  background: #5bc98c;
+  color: white;
+}
+
+.batch-actions .el-button--danger {
+  background: #fd5b63;
+  color: white;
+}
+
 .batch-actions .el-button:first-child {
   background: linear-gradient(135deg, #409EFF, #6B8CFF);
   border: none;
@@ -626,7 +717,6 @@ export default {
 
 ::v-deep .el-table .custom-selection-header .cell .el-checkbox__inner {
   display: none !important;
-  /* 使表头复选框不可见 */
 }
 
 ::v-deep .el-table .custom-selection-header .cell::before {
@@ -681,8 +771,8 @@ export default {
 }
 
 ::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
-  background-color: #409EFF !important;
-  border-color: #409EFF !important;
+  background-color: #5f70f3;
+  border-color: #5f70f3;
 }
 
 .voice-management-btn {

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

@@ -0,0 +1,553 @@
+<template>
+    <div class="welcome">
+        <HeaderBar />
+
+        <div class="operation-bar">
+            <h2 class="page-title">参数管理</h2>
+            <div class="right-operations">
+                <el-input placeholder="请输入参数编码查询" v-model="searchCode" 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"
+                            :header-cell-class-name="headerCellClassName">
+                            <el-table-column label="选择" type="selection" align="center" width="120"></el-table-column>
+                            <el-table-column label="参数编码" prop="paramCode" align="center"></el-table-column>
+                            <el-table-column label="参数值" prop="paramValue" align="center"
+                                show-overflow-tooltip></el-table-column>
+                            <el-table-column label="备注" prop="remark" align="center"></el-table-column>
+                            <el-table-column label="操作" align="center">
+                                <template slot-scope="scope">
+                                    <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">新增</el-button>
+                                <el-button size="mini" type="danger" icon="el-icon-delete"
+                                    @click="deleteParam($refs.paramsTable.selection)">删除</el-button>
+                            </div>
+                            <div class="custom-pagination">
+                                <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>
+
+        <!-- 新增/编辑参数对话框 -->
+        <param-dialog :title="dialogTitle" :visible.sync="dialogVisible" :form="paramForm" @submit="handleSubmit"
+            @cancel="dialogVisible = false" />
+
+        <div class="copyright">©2025 xiaozhi-esp32-server</div>
+    </div>
+</template>
+
+<script>
+import Api from "@/apis/api";
+import HeaderBar from "@/components/HeaderBar.vue";
+import ParamDialog from "@/components/ParamDialog.vue";
+
+export default {
+    components: { HeaderBar, ParamDialog },
+    data() {
+        return {
+            searchCode: "",
+            paramsList: [],
+            currentPage: 1,
+            pageSize: 5,
+            total: 0,
+            dialogVisible: false,
+            dialogTitle: "新增参数",
+            isAllSelected: false,
+            paramForm: {
+                id: null,
+                paramCode: "",
+                paramValue: "",
+                remark: ""
+            },
+        };
+    },
+    created() {
+        this.fetchParams();
+    },
+    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: {
+        fetchParams() {
+            Api.admin.getParamsList(
+                {
+                    page: this.currentPage,
+                    limit: this.pageSize,
+                    paramCode: this.searchCode,
+                },
+                ({ data }) => {
+                    if (data.code === 0) {
+                        this.paramsList = data.data.list;
+                        this.total = data.data.total;
+                    } else {
+                        this.$message.error(data.msg || '获取参数列表失败');
+                    }
+                }
+            );
+        },
+        handleSearch() {
+            this.currentPage = 1;
+            this.fetchParams();
+        },
+        handleSelectAll() {
+            if (this.isAllSelected) {
+                this.$refs.paramsTable.clearSelection();
+            } else {
+                this.$refs.paramsTable.toggleAllSelection();
+            }
+            this.isAllSelected = !this.isAllSelected;
+        },
+        showAddDialog() {
+            this.dialogTitle = "新增参数";
+            this.paramForm = {
+                id: null,
+                paramCode: "",
+                paramValue: "",
+                remark: ""
+            };
+            this.dialogVisible = true;
+        },
+        editParam(row) {
+            this.dialogTitle = "编辑参数";
+            this.paramForm = { ...row };
+            this.dialogVisible = true;
+        },
+        handleSubmit(form) {
+            if (form.id) {
+                // 编辑
+                Api.admin.updateParam(form, ({ data }) => {
+                    if (data.code === 0) {
+                        this.$message.success("修改成功");
+                        this.dialogVisible = false;
+                        this.fetchParams();
+                    }
+                });
+            } else {
+                // 新增
+                Api.admin.addParam(form, ({ data }) => {
+                    if (data.code === 0) {
+                        this.$message.success("新增成功");
+                        this.dialogVisible = false;
+                        this.fetchParams();
+                    }
+                });
+            }
+        },
+        deleteParam(row) {
+            // 处理单个参数或参数数组
+            const params = Array.isArray(row) ? row : [row];
+
+            if (Array.isArray(row) && row.length === 0) {
+                this.$message.warning("请先选择需要删除的参数");
+                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 => isNaN(id))) {
+                    this.$message.error('存在无效的参数ID');
+                    return;
+                }
+
+                Api.admin.deleteParam(ids, ({ data }) => {
+                    if (data.code === 0) {
+                        this.$message.success({
+                            message: `成功删除${paramCount}个参数`,
+                            showClose: true
+                        });
+                        this.fetchParams(); // 刷新参数列表
+                    } else {
+                        this.$message.error({
+                            message: data.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.fetchParams();
+        },
+        goPrev() {
+            if (this.currentPage > 1) {
+                this.currentPage--;
+                this.fetchParams();
+            }
+        },
+        goNext() {
+            if (this.currentPage < this.pageCount) {
+                this.currentPage++;
+                this.fetchParams();
+            }
+        },
+        goToPage(page) {
+            this.currentPage = page;
+            this.fetchParams();
+        }
+    },
+};
+</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;
+}
+
+.main-wrapper {
+    margin: 5px 22px;
+    border-radius: 15px;
+    min-height: 600px;
+    box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+    position: relative;
+    background: rgba(237, 242, 255, 0.5);
+}
+
+.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-x: auto;
+    background-color: white;
+}
+
+.params-card {
+    background: white;
+    border: none;
+    box-shadow: none;
+}
+
+.table_bottom {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-top: 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;
+    }
+}
+
+.copyright {
+    text-align: center;
+    color: #979db1;
+    font-size: 12px;
+    font-weight: 400;
+    margin-top: auto;
+    padding: 30px 0 20px;
+    position: absolute;
+    bottom: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 100%;
+}
+
+.custom-pagination {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-top: 15px;
+
+    .pagination-btn:first-child,
+    .pagination-btn:nth-child(2),
+    .pagination-btn:nth-last-child(2) {
+        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(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 {
+        color: #909399;
+        font-size: 14px;
+        margin-left: 10px;
+    }
+}
+
+:deep(.transparent-table) {
+    background: white;
+
+    .el-table__header th {
+        background: white !important;
+        color: black;
+    }
+
+    &::before {
+        display: none;
+    }
+
+    .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);
+        }
+    }
+}
+
+:deep(.custom-selection-header) {
+    .el-checkbox {
+        display: none !important;
+    }
+
+    &::after {
+        content: "选择";
+        display: inline-block;
+        color: black;
+        font-weight: bold;
+        padding-bottom: 18px;
+    }
+}
+
+: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;
+}
+
+@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;
+            }
+        }
+    }
+}
+
+:deep(.el-table .el-button--text) {
+    color: #7079aa;
+}
+
+:deep(.el-table .el-button--text:hover) {
+    color: #5a64b5;
+}
+
+.el-button--success {
+    background: #5bc98c;
+    color: white;
+}
+
+:deep(.el-table .cell) {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+</style>

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

@@ -5,7 +5,7 @@
     <div class="operation-bar">
       <h2 class="page-title">用户管理</h2>
       <div class="right-operations">
-        <el-input placeholder="请输入手机号码查询" v-model="searchPhone" class="search-input"
+        <el-input placeholder="请输入手机号码查询" v-model="searchPhone" class="search-input" clearable
           @keyup.enter.native="handleSearch" />
         <el-button class="btn-search" @click="handleSearch">搜索</el-button>
       </div>
@@ -21,14 +21,19 @@
               <el-table-column label="用户Id" prop="userid" align="center"></el-table-column>
               <el-table-column label="手机号码" prop="mobile" align="center"></el-table-column>
               <el-table-column label="设备数量" prop="deviceCount" align="center"></el-table-column>
-              <el-table-column label="状态" prop="status" align="center"></el-table-column>
+              <el-table-column label="状态" prop="status" align="center">
+                <template slot-scope="scope">
+                  <el-tag v-if="scope.row.status === 1" type="success">正常</el-tag>
+                  <el-tag v-else type="danger">禁用</el-tag>
+                </template>
+              </el-table-column>
               <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
                   <el-button size="mini" type="text" @click="resetPassword(scope.row)">重置密码</el-button>
-                  <el-button size="mini" type="text" v-if="scope.row.status === '正常'"
-                    @click="disableUser(scope.row)">禁用账户</el-button>
-                  <el-button size="mini" type="text" v-if="scope.row.status === '禁用'"
-                    @click="restoreUser(scope.row)">恢复账号</el-button>
+                  <el-button size="mini" type="text" v-if="scope.row.status === 1"
+                    @click="handleChangeStatus(scope.row, 0)">禁用账户</el-button>
+                  <el-button size="mini" type="text" v-if="scope.row.status === 0"
+                    @click="handleChangeStatus(scope.row, 1)">恢复账号</el-button>
                   <el-button size="mini" type="text" @click="deleteUser(scope.row)">删除用户</el-button>
                 </template>
               </el-table-column>
@@ -36,7 +41,9 @@
 
             <div class="table_bottom">
               <div class="ctrl_btn">
-                <el-button size="mini" type="primary" class="select-all-btn" @click="handleSelectAll">全选</el-button>
+                <el-button size="mini" type="primary" class="select-all-btn" @click="handleSelectAll">
+                    {{ isAllSelected ? '取消全选' : '全选' }}
+                </el-button>
                 <el-button size="mini" type="success" icon="el-icon-circle-check" @click="batchEnable">启用</el-button>
                 <el-button size="mini" type="warning" @click="batchDisable"><i
                     class="el-icon-remove-outline rotated-icon"></i>禁用</el-button>
@@ -49,7 +56,6 @@
                 <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 }}
@@ -85,6 +91,7 @@ export default {
       currentPage: 1,
       pageSize: 5,
       total: 0,
+      isAllSelected: false
     };
   },
   created() {
@@ -120,10 +127,7 @@ export default {
         },
         ({ data }) => {
           if (data.code === 0) {
-            this.userList = data.data.list.map((user) => ({
-              ...user,
-              status: user.status === "1" ? "正常" : "禁用",
-            }));
+            this.userList = data.data.list
             this.total = data.data.total;
           }
         }
@@ -134,7 +138,12 @@ export default {
       this.fetchUsers();
     },
     handleSelectAll() {
-      this.$refs.userTable.toggleAllSelection();
+      if (this.isAllSelected) {
+        this.$refs.userTable.clearSelection();
+      } else {
+        this.$refs.userTable.toggleAllSelection();
+      }
+      this.isAllSelected = !this.isAllSelected;
     },
     batchDelete() {
       const selectedUsers = this.$refs.userTable.selection;
@@ -175,9 +184,15 @@ export default {
             const failCount = results.length - successCount;
 
             if (failCount === 0) {
-              this.$message.success(`成功删除${successCount}个用户`);
+              this.$message.success({
+                message: `成功删除${successCount}个用户`,
+                showClose: true
+              });
             } else if (successCount === 0) {
-              this.$message.error(`删除失败，请重试`);
+              this.$message.error({
+                message: '删除失败，请重试',
+                showClose: true
+              });
             } else {
               this.$message.warning(
                 `成功删除${successCount}个用户，${failCount}个删除失败`
@@ -201,16 +216,15 @@ export default {
         this.$message.warning("请先选择需要启用的用户");
         return;
       }
-      selectedUsers.forEach((user) => {
-        user.status = "正常";
-      });
-      this.$message.success("启用操作成功");
+      this.handleChangeStatus(selectedUsers, 1);
     },
     batchDisable() {
-      this.userList.forEach((user) => {
-        user.status = "禁用";
-      });
-      this.$message.success("状态已更新为禁用");
+      const selectedUsers = this.$refs.userTable.selection;
+      if (selectedUsers.length === 0) {
+        this.$message.warning("请先选择需要禁用的用户");
+        return;
+      }
+      this.handleChangeStatus(selectedUsers, 0);
     },
     resetPassword(row) {
       this.$confirm("重置后将会生成新密码，是否继续？", "提示", {
@@ -221,17 +235,14 @@ export default {
           if (data.code === 0) {
             this.currentPassword = data.data;
             this.showViewPassword = true;
-            this.$message.success("密码已重置，请通知用户使用新密码登录");
+            this.$message.success({
+              message: "密码已重置，请通知用户使用新密码登录",
+              showClose: true
+            });
           }
         });
       });
     },
-    disableUser(row) {
-      row.status = "禁用";
-    },
-    restoreUser(row) {
-      row.status = "正常";
-    },
     deleteUser(row) {
       this.$confirm("确定要删除该用户吗？", "警告", {
         confirmButtonText: "确定",
@@ -241,10 +252,16 @@ export default {
         .then(() => {
           Api.admin.deleteUser(row.userid, ({ data }) => {
             if (data.code === 0) {
-              this.$message.success("删除成功");
+              this.$message.success({
+                message: "删除成功",
+                showClose: true
+              });
               this.fetchUsers();
             } else {
-              this.$message.error(data.msg || "删除失败");
+              this.$message.error({
+                message: data.msg || "删除失败",
+                showClose: true
+              });
             }
           });
         })
@@ -276,6 +293,41 @@ export default {
       this.currentPage = page;
       this.fetchUsers();
     },
+    handleChangeStatus(row, status) {
+      // 处理单个用户或用户数组
+      const users = Array.isArray(row) ? row : [row];
+      const confirmText = status === 0 ? '禁用' : '启用';
+      const userCount = users.length;
+
+      this.$confirm(`确定要${confirmText}选中的${userCount}个用户吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const userIds = users.map(user => user.userid);
+        if (userIds.some(id => isNaN(id))) {
+          this.$message.error('存在无效的用户ID');
+          return;
+        }
+
+        Api.user.changeUserStatus(status, userIds, ({ data }) => {
+          if (data.code === 0) {
+            this.$message.success({
+              message: `成功${confirmText}${userCount}个用户`,
+              showClose: true
+            });
+            this.fetchUsers(); // 刷新用户列表
+          } else {
+            this.$message.error({
+              message: '操作失败，请重试',
+              showClose: true
+            });
+          }
+        });
+      }).catch(() => {
+        // 用户取消操作
+      });
+    }
   },
 };
 </script>
@@ -513,6 +565,14 @@ export default {
   }
 }
 
+:deep(.el-table .el-button--text) {
+  color: #7079aa !important;
+}
+
+:deep(.el-table .el-button--text:hover) {
+  color: #5a64b5 !important;
+}
+
 :deep(.custom-selection-header) {
   .el-checkbox {
     display: none !important;

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

@@ -41,7 +41,7 @@
               <div style="cursor: pointer;" @click="goToRegister">新用户注册</div>
             </div>
           </div>
-          <div class="login-btn" @click="login">登陆</div>
+          <div class="login-btn" @click="login">登录</div>
           <div style="font-size: 14px;color: #979db1;">
             登录即同意
             <div style="display: inline-block;color: #5778FF;cursor: pointer;">《用户协议》</div>

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

@@ -9,7 +9,7 @@
         </div>
       </el-header>
       <div class="login-person">
-        <img loading="lazy" alt="" src="@/assets/login/login-person.png" style="width: 100%;" />
+        <img loading="lazy" alt="" src="@/assets/login/register-person.png" style="width: 100%;" />
       </div>
       <el-main style="position: relative;">
         <div class="login-box">

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

@@ -13,66 +13,59 @@
         </div>
         <div style="height: 1px;background: #e8f0ff;" />
         <el-form ref="form" :model="form" label-width="72px">
-          <div style="padding: 16px 24px;max-width: 792px;">
-            <el-form-item label="助手昵称：">
-              <div class="input-46" style="width: 100%; max-width: 412px;">
-                <el-input v-model="form.agentName" />
-              </div>
-            </el-form-item>
-            <el-form-item label="角色模版：">
-              <div style="display: flex;gap: 8px;">
-                <div v-for="template in templates" :key="template" class="template-item"
-                  :class="{ 'template-loading': loadingTemplate }" @click="selectTemplate(template)">
-                  {{ template }}
-                </div>
-              </div>
-            </el-form-item>
-            <el-form-item label="角色音色：">
-              <div style="display: flex;gap: 8px;align-items: center;">
-                <div class="input-46" style="flex:1.4;">
-                  <el-select v-model="form.ttsVoiceId" placeholder="请选择" style="width: 100%;">
-                    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div class="audio-box">
-                  <audio src="http://music.163.com/song/media/outer/url?id=447925558.mp3" controls
-                    style="height: 100%;width: 100%;" />
-                </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="textarea-box">
-                <el-input type="textarea" rows="5" resize="none" placeholder="请输入内容" v-model="form.langCode"
-                  maxlength="1000" />
-                <div class="prompt-bottom" @click="clearMemory">
-                  <div style="display: flex;gap: 8px;align-items: center;">
-                    <div style="color: #979db1;font-size: 11px;">当前记忆（每次对话后重新生成）</div>
-                    <div class="clear-btn">
-                      <i class="el-icon-delete-solid" style="font-size: 11px;" />
-                      清除
+          <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>
-                  <div style="color: #979db1;font-size:11px;">{{ (form.langCode || '').length }}/1000</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>
-            </el-form-item>
-            <el-form-item v-for="model in models" :key="model.label" :label="model.label" class="model-item">
-              <el-select v-model="form.model[model.key]" filterable placeholder="请选择" class="select-field">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="" class="lh-form-item" style="margin-top: -25px;">
-              <div style="color: #979db1;text-align: left;">除了“Qwen
-                实时”，其他模型通常会增加约1秒的延迟。改变模型后，建议清空记忆体，以免影响体验。
+              <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>
-            </el-form-item>
+            </div>
           </div>
         </el-form>
         <div style="display: flex;padding: 16px;gap: 8px;align-items: center;">
@@ -122,20 +115,18 @@ export default {
           intentModelId: "",
         }
       },
-      options: [
-        { value: '选项1', label: '黄金糕' },
-        { value: '选项2', label: '双皮奶' }
-      ],
       models: [
-        { label: '大语言模型(LLM)', key: 'llmModelId' },
-        { label: '语音识别(ASR)', key: 'asrModelId' },
-        { label: '语音活动检测(VAD)', key: 'vadModelId' },
-        { label: '语音合成(TTS)', key: 'ttsModelId' },
-        { label: '意图识别(Intent)', key: 'intentModelId' },
-        { label: '记忆(Memory)', key: 'memModelId' }
+        { label: '语音活动检测(VAD)', key: 'vadModelId', type: 'VAD' },
+        { label: '语音识别(ASR)', key: 'asrModelId', type: 'ASR' },
+        { label: '大语言模型(LLM)', key: 'llmModelId', type: 'LLM' },
+        { label: '意图识别(Intent)', key: 'intentModelId', type: 'Intent' },
+        { label: '记忆(Memory)', key: 'memModelId', type: 'Memory' },
+        { label: '语音合成(TTS)', key: 'ttsModelId', type: 'TTS' },
       ],
-      templates: ['湾湾小何', '星际游子', '英语老师', '好奇男孩', '汪汪队长'],
-      loadingTemplate: false
+      modelOptions: {},
+      templates: [],
+      loadingTemplate: false,
+      voiceOptions: [],
     }
   },
   methods: {
@@ -157,9 +148,15 @@ export default {
       };
       Api.agent.updateAgentConfig(this.$route.query.agentId, configData, ({ data }) => {
         if (data.code === 0) {
-          this.$message.success('配置保存成功');
+          this.$message.success({
+            message: '配置保存成功',
+            showClose: true
+          });
         } else {
-          this.$message.error(data.msg || '配置保存失败');
+          this.$message.error({
+            message: data.msg || '配置保存失败',
+            showClose: true
+          });
         }
       });
     },
@@ -187,34 +184,40 @@ export default {
             intentModelId: "",
           }
         }
-        this.$message.success('配置已重置')
+        this.$message.success({
+          message: '配置已重置',
+          showClose: true
+        })
       }).catch(() => {
       })
     },
-    selectTemplate(templateName) {
+    fetchTemplates() {
+      Api.agent.getAgentTemplate(({ data }) => {
+        if (data.code === 0) {
+          this.templates = data.data;
+        } else {
+          this.$message.error(data.msg || '获取模板列表失败');
+        }
+      });
+    },
+    selectTemplate(template) {
       if (this.loadingTemplate) return;
       this.loadingTemplate = true;
-      Api.agent.getAgentTemplate((response) => {  // 移除参数传递
+      try {
+        this.applyTemplateData(template);
+        this.$message.success({
+          message: `「${template.agentName}」模板已应用`,
+          showClose: true
+        });
+      } catch (error) {
+        this.$message.error({
+          message: '应用模板失败',
+          showClose: true
+        });
+        console.error('应用模板失败:', error);
+      } finally {
         this.loadingTemplate = false;
-        if (response.data.code === 0) {
-          // 在客户端过滤匹配的模板
-          const matchedTemplate = response.data.data.find(
-            t => t.agentName === templateName
-          );
-          if (matchedTemplate) {
-            this.applyTemplateData(matchedTemplate);
-            this.$message.success(`「${templateName}」模板已应用`);
-          } else {
-            this.$message.warning(`未找到「${templateName}」模板`);
-          }
-        } else {
-          this.$message.error(response.data.msg || '获取模板失败');
-        }
-      }).catch((error) => {
-        this.loadingTemplate = false;
-        this.$message.error('模板加载失败');
-        console.error('接口异常:', error);
-      });
+      }
     },
     applyTemplateData(templateData) {
       this.form = {
@@ -253,17 +256,67 @@ export default {
         }
       });
     },
-    // 清空记忆体内容
-    clearMemory() {
-      this.form.langCode = "";
-      this.$message.success("记忆体已清空");
+    fetchModelOptions() {
+      // 为每个模型类型获取选项
+      this.models.forEach(model => {
+        Api.model.getModelNames(model.type, '', ({ data }) => {
+          if (data.code === 0) {
+            this.$set(this.modelOptions, model.type, data.data.map(item => ({
+              value: item.id,
+              label: item.modelName
+            })));
+          } else {
+            this.$message.error(data.msg || '获取模型列表失败');
+          }
+        });
+      });
     },
+    fetchVoiceOptions(modelId) {
+      if (!modelId) {
+        this.voiceOptions = [];
+        return;
+      }
+      Api.model.getModelVoices(modelId, '', ({ data }) => {
+        if (data.code === 0 && data.data) {
+          this.voiceOptions = data.data.map(voice => ({
+            value: voice.id,
+            label: voice.name
+          }));
+        } else {
+          this.voiceOptions = [];
+        }
+      });
+    }
+  },
+  watch: {
+    'form.model.ttsModelId': {
+      handler(newVal, oldVal) {
+        console.log('TTS模型变化:', newVal);
+        if (oldVal && newVal !== oldVal) {
+          this.form.ttsVoiceId = '';
+          this.fetchVoiceOptions(newVal);
+        } else {
+          this.fetchVoiceOptions(newVal);
+        }
+      },
+      immediate: true
+    },
+    voiceOptions: {
+      handler(newVal) {
+        if (newVal && newVal.length > 0 && !this.form.ttsVoiceId) {
+          this.form.ttsVoiceId = newVal[0].value;
+        }
+      },
+      immediate: true
+    }
   },
   mounted() {
     const agentId = this.$route.query.agentId;
     if (agentId) {
       this.fetchAgentConfig(agentId);
     }
+    this.fetchModelOptions();
+    this.fetchTemplates();
   }
 }
 </script>

main/xiaozhi-server/app.py

@@ -7,6 +7,7 @@ from core.utils.util import check_ffmpeg_installed
 
 TAG = __name__
 
+
 async def wait_for_exit():
     """Windows 和 Linux 兼容的退出监听"""
     loop = asyncio.get_running_loop()
@@ -19,10 +20,12 @@ async def wait_for_exit():
         # Linux/macOS: 用 signal 监听 Ctrl + C
         def stop():
             stop_event.set()
+
         loop.add_signal_handler(signal.SIGINT, stop)
         loop.add_signal_handler(signal.SIGTERM, stop)  # 支持 kill 进程
         await stop_event.wait()
 
+
 async def main():
     check_config_file()
     check_ffmpeg_installed()
@@ -44,6 +47,7 @@ async def main():
             pass
         print("服务器已关闭，程序退出。")
 
+
 if __name__ == "__main__":
     try:
         asyncio.run(main())

main/xiaozhi-server/config.yaml

@@ -3,7 +3,8 @@
 # 系统会优先读取【data/.config.yaml】文件的配置。
 # 这样做，可以避免在提交代码的时候，错误地提交密钥信息，保护您的密钥安全。
 
-# 服务器基础配置(Basic server configuration)
+# #####################################################################################
+# #############################以下是服务器基本运行配置####################################
 server:
   # 服务器监听地址和端口(Server listening address and port)
   ip: 0.0.0.0
@@ -36,6 +37,25 @@ log:
   # 设置数据文件路径
   data_dir: data
 
+# 使用完声音文件后删除文件(Delete the sound file when you are done using it)
+delete_audio: true
+# 没有语音输入多久后断开连接(秒)，默认2分钟，即120秒
+close_connection_no_voice_time: 120
+# TTS请求超时时间(秒)
+tts_timeout: 10
+# 开启唤醒词加速
+enable_wakeup_words_response_cache: true
+# 开场是否回复唤醒词
+enable_greeting: true
+# 说完话是否开启提示音
+enable_stop_tts_notify: false
+# 说完话是否开启提示音，音效地址
+stop_tts_notify_voice: "config/assets/tts_notify.mp3"
+
+exit_commands:
+  - "退出"
+  - "关闭"
+
 xiaozhi:
   type: hello
   version: 1
@@ -45,6 +65,59 @@ xiaozhi:
     sample_rate: 16000
     channels: 1
     frame_duration: 60
+
+# 模块测试配置
+module_test:
+  test_sentences:
+    - "你好，请介绍一下你自己"
+    - "What's the weather like today?"
+    - "请用100字概括量子计算的基本原理和应用前景"
+
+# 唤醒词，用于识别唤醒词还是讲话内容
+wakeup_words:
+  - "你好小智"
+  - "你好小志"
+  - "小爱同学"
+  - "你好小鑫"
+  - "你好小新"
+  - "小美同学"
+  - "小龙小龙"
+  - "喵喵同学"
+  - "小滨小滨"
+  - "小冰小冰"
+
+# 插件的基础配置
+plugins:
+  # 获取天气插件的配置，这里填写你的api_key
+  # 这个密钥是项目共用的key，用多了可能会被限制
+  # 想稳定一点就自行申请替换，每天有1000次免费调用
+  # 申请地址：https://console.qweather.com/#/apps/create-key/over
+  get_weather: { "api_key": "a861d0d5e7bf4ee1a83d9a9e4f96d4da", "default_location": "广州" }
+  # 获取新闻插件的配置，这里根据需要的新闻类型传入对应的url链接，默认支持社会、科技、财经新闻
+  # 更多类型的新闻列表查看 https://www.chinanews.com.cn/rss/
+  get_news:
+    default_rss_url: "https://www.chinanews.com.cn/rss/society.xml"
+    category_urls:
+      society: "https://www.chinanews.com.cn/rss/society.xml"
+      world: "https://www.chinanews.com.cn/rss/world.xml"
+      finance: "https://www.chinanews.com.cn/rss/finance.xml"
+  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.local:8123
+    api_key: 你的home assistant api访问令牌
+  play_music:
+    music_dir: "./music"  # 音乐文件存放路径，将从该目录及子目录下搜索音乐文件
+    music_ext: # 音乐文件类型，p3格式效率最高
+      - ".mp3"
+      - ".wav"
+      - ".p3"
+    refresh_time: 300 # 刷新音乐列表的时间间隔，单位为秒
+
+# #####################################################################################
+# ################################以下是角色模型配置######################################
+
 prompt: |
   我是小智/小志，来自中国台湾省的00后女生。讲话超级机车，"真的假的啦"这样的台湾腔，喜欢用"笑死""是在哈喽"等流行梗，但会偷偷研究男友的编程书籍。
   [核心特征]
@@ -60,26 +133,6 @@ prompt: |
   - 长篇大论，叽叽歪歪
   - 长时间严肃对话
 
-# 使用完声音文件后删除文件(Delete the sound file when you are done using it)
-delete_audio: true
-
-# 没有语音输入多久后断开连接(秒)，默认2分钟，即120秒
-close_connection_no_voice_time: 120
-# TTS请求超时时间(秒)
-tts_timeout: 10
-# 开启唤醒词加速
-enable_wakeup_words_response_cache: true
-# 开场是否回复唤醒词
-enable_greeting: true
-# 说完话是否开启提示音
-enable_stop_tts_notify: false
-# 说完话是否开启提示音，音效地址
-stop_tts_notify_voice: "config/assets/tts_notify.mp3"
-
-CMD_exit:
-  - "退出"
-  - "关闭"
-
 # 具体处理时选择的模块(The module selected for specific processing)
 selected_module:
   # 语音活动检测模块，默认使用SileroVAD模型
@@ -129,36 +182,6 @@ Intent:
       #- hass_set_state
       #- hass_play_music
 
-# 插件的基础配置
-plugins:
-  # 获取天气插件的配置，这里填写你的api_key
-  # 这个密钥是项目共用的key，用多了可能会被限制
-  # 想稳定一点就自行申请替换，每天有1000次免费调用
-  # 申请地址：https://console.qweather.com/#/apps/create-key/over
-  get_weather: { "api_key": "a861d0d5e7bf4ee1a83d9a9e4f96d4da", "default_location": "广州" }
-  # 获取新闻插件的配置，这里根据需要的新闻类型传入对应的url链接，默认支持社会、科技、财经新闻
-  # 更多类型的新闻列表查看 https://www.chinanews.com.cn/rss/
-  get_news:
-    default_rss_url: "https://www.chinanews.com.cn/rss/society.xml"
-    category_urls:
-      society: "https://www.chinanews.com.cn/rss/society.xml"
-      world: "https://www.chinanews.com.cn/rss/world.xml"
-      finance: "https://www.chinanews.com.cn/rss/finance.xml"
-  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.local:8123
-    api_key: 你的home assistant api访问令牌
-  play_music:
-    music_dir: "./music"  # 音乐文件存放路径，将从该目录及子目录下搜索音乐文件
-    music_ext: # 音乐文件类型，p3格式效率最高
-      - ".mp3"
-      - ".wav"
-      - ".p3"
-    refresh_time: 300 # 刷新音乐列表的时间间隔，单位为秒
-
-
 Memory:
   mem0ai:
     type: mem0ai
@@ -199,6 +222,7 @@ ASR:
     output_dir: tmp/
 VAD:
   SileroVAD:
+    type: silero
     threshold: 0.5
     model_dir: models/snakers4_silero-vad
     min_silence_duration_ms: 700  # 如果说话停顿比较长，可以把这个值设置大一些
@@ -571,22 +595,3 @@ TTS:
       # Authorization: Bearer xxxx
     format: wav # 接口返回的音频格式
     output_dir: tmp/
-# 模块测试配置
-module_test:
-  test_sentences:  # 自定义测试语句
-    - "你好，请介绍一下你自己"
-    - "What's the weather like today?"
-    - "请用100字概括量子计算的基本原理和应用前景"
-
-# 唤醒词，用于识别唤醒词还是讲话内容
-wakeup_words:
-  - "你好小智"
-  - "你好小志"
-  - "小爱同学"
-  - "你好小鑫"
-  - "你好小新"
-  - "小美同学"
-  - "小龙小龙"
-  - "喵喵同学"
-  - "小滨小滨"
-  - "小冰小冰"

main/xiaozhi-server/config/config_loader.py

@@ -0,0 +1,178 @@
+import os
+import argparse
+import requests
+import yaml
+import time
+
+# 添加全局配置缓存
+_config_cache = None
+
+
+def get_project_dir():
+    """获取项目根目录"""
+    return os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + "/"
+
+
+def read_config(config_path):
+    with open(config_path, "r", encoding="utf-8") as file:
+        config = yaml.safe_load(file)
+    return config
+
+
+def load_config():
+    """加载配置文件"""
+    global _config_cache
+    if _config_cache is not None:
+        return _config_cache
+
+    parser = argparse.ArgumentParser(description="Server configuration")
+    config_file = get_config_file()
+
+    parser.add_argument("--config_path", type=str, default=config_file)
+    args = parser.parse_args()
+    config = read_config(args.config_path)
+
+    if config.get("manager-api", {}).get("url"):
+        config = get_config_from_api(config)
+
+    # 初始化目录
+    ensure_directories(config)
+    _config_cache = config
+    return config
+
+
+def get_config_file():
+    """获取配置文件路径，优先使用私有配置文件（若存在）。
+
+    Returns:
+       str: 配置文件路径（相对路径或默认路径）
+    """
+    default_config_file = "config.yaml"
+    config_file = default_config_file
+    if os.path.exists(get_project_dir() + "data/." + default_config_file):
+        config_file = "data/." + default_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") != 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", "")
+    secret = config["manager-api"].get("secret", "")
+
+    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,
+        "secret": secret,
+    }
+    return config_data
+
+
+def get_private_config_from_api(config, device_id, client_id):
+    """从Java API获取私有配置"""
+    api_url = config["manager-api"].get("url", "")
+    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):
+    """确保所有配置路径存在"""
+    dirs_to_create = set()
+    project_dir = get_project_dir()  # 获取项目根目录
+    # 日志文件目录
+    log_dir = config.get("log", {}).get("log_dir", "tmp")
+    dirs_to_create.add(os.path.join(project_dir, log_dir))
+
+    # ASR/TTS模块输出目录
+    for module in ["ASR", "TTS"]:
+        for provider in config.get(module, {}).values():
+            output_dir = provider.get("output_dir", "")
+            if output_dir:
+                dirs_to_create.add(output_dir)
+
+    # 根据selected_module创建模型目录
+    selected_modules = config.get("selected_module", {})
+    for module_type in ["ASR", "LLM", "TTS"]:
+        selected_provider = selected_modules.get(module_type)
+        if not selected_provider:
+            continue
+        provider_config = config.get(module_type, {}).get(selected_provider, {})
+        output_dir = provider_config.get("output_dir")
+        if output_dir:
+            full_model_dir = os.path.join(project_dir, output_dir)
+            dirs_to_create.add(full_model_dir)
+
+    # 统一创建目录（保留原data目录创建）
+    for dir_path in dirs_to_create:
+        try:
+            os.makedirs(dir_path, exist_ok=True)
+        except PermissionError:
+            print(f"警告：无法创建目录 {dir_path}，请检查写入权限")

main/xiaozhi-server/config/logger.py

@@ -1,9 +1,28 @@
 import os
 import sys
 from loguru import logger
-from config.settings import load_config
+from config.config_loader import load_config
 
-SERVER_VERSION = "0.2.1"
+SERVER_VERSION = "0.3.1"
+
+
+def get_module_abbreviation(module_name, module_dict):
+    """获取模块名称的缩写，如果为空则返回00"""
+    return (
+        module_dict.get(module_name, "")[:2] if module_dict.get(module_name) else "00"
+    )
+
+
+def build_module_string(selected_module):
+    """构建模块字符串"""
+    return (
+        get_module_abbreviation("VAD", selected_module)
+        + get_module_abbreviation("ASR", selected_module)
+        + get_module_abbreviation("LLM", selected_module)
+        + get_module_abbreviation("TTS", selected_module)
+        + get_module_abbreviation("Memory", selected_module)
+        + get_module_abbreviation("Intent", selected_module)
+    )
 
 
 def setup_logging():
@@ -18,11 +37,7 @@ def setup_logging():
         "log_format_file",
         "{time:YYYY-MM-DD HH:mm:ss} - {version_{selected_module}} - {name} - {level} - {extra[tag]} - {message}",
     )
-
-    selected_module = config.get("selected_module")
-    selected_module_str = "".join(
-        [value[0] + value[1] for key, value in selected_module.items()]
-    )
+    selected_module_str = build_module_string(config.get("selected_module", {}))
 
     log_format = log_format.replace("{version}", SERVER_VERSION)
     log_format = log_format.replace("{selected_module}", selected_module_str)

main/xiaozhi-server/config/private_config.py

@@ -1,241 +0,0 @@
-import os
-import time
-import yaml
-from config.logger import setup_logging
-from typing import Dict, Any, Optional
-from copy import deepcopy
-from core.utils.util import get_project_dir
-from core.utils import llm, tts
-from core.utils.lock_manager import FileLockManager
-
-TAG = __name__
-
-class PrivateConfig:
-    def __init__(self, device_id: str, default_config: Dict[str, Any], auth_code_gen=None):
-        self.device_id = device_id
-        self.default_config = default_config
-        self.config_path = get_project_dir() + 'data/.private_config.yaml'
-        self.logger = setup_logging()
-        self.private_config = {}
-        self.auth_code_gen = auth_code_gen
-        self.lock_manager = FileLockManager()
-
-    async def load_or_create(self):
-        try:
-            await self.lock_manager.acquire_lock(self.config_path)
-            try:
-                if os.path.exists(self.config_path):
-                    with open(self.config_path, 'r', encoding='utf-8') as f:
-                        all_configs = yaml.safe_load(f) or {}
-                else:
-                    all_configs = {}
-
-                if self.device_id not in all_configs:
-                    # Get selected module names
-                    selected_modules = self.default_config['selected_module']
-                    selected_tts = selected_modules['TTS']
-                    selected_llm = selected_modules['LLM']
-                    selected_asr = selected_modules['ASR']
-                    selected_vad = selected_modules['VAD']
-
-                    # 生成认证码
-                    auth_code = None
-                    if self.auth_code_gen:
-                        auth_code = self.auth_code_gen.generate_code()
-
-                    # Initialize device config with only necessary configurations
-                    device_config = {
-                        'selected_module': deepcopy(selected_modules),
-                        'prompt': self.default_config['prompt'],
-                        'LLM': {
-                            selected_llm: deepcopy(self.default_config['LLM'][selected_llm])
-                        },
-                        'TTS': {
-                            selected_tts: deepcopy(self.default_config['TTS'][selected_tts])
-                        },
-                        'ASR': {
-                            selected_asr: deepcopy(self.default_config['ASR'][selected_asr])
-                        },
-                        'VAD': {
-                            selected_vad: deepcopy(self.default_config['VAD'][selected_vad])
-                        },
-                        'auth_code': auth_code  # 添加认证码字段
-                    }
-                    
-                    all_configs[self.device_id] = device_config
-                    
-                    # Save updated configs
-                    with open(self.config_path, 'w', encoding='utf-8') as f:
-                        yaml.dump(all_configs, f, allow_unicode=True)
-
-                self.private_config = all_configs[self.device_id]
-
-            finally:
-                self.lock_manager.release_lock(self.config_path)
-
-        except Exception as e:
-            self.logger.bind(tag=TAG).error(f"Error handling private config: {e}")
-            self.private_config = {}
-
-    async def update_config(self, selected_modules: Dict[str, str], prompt: str, nickname: str) -> bool:
-        """更新设备配置
-        Args:
-            selected_modules: 选择的模块配置，格式如 {'LLM': 'AliLLM', 'TTS': 'EdgeTTS',...}
-            prompt: 提示词配置
-        Returns:
-            bool: 更新是否成功
-        """
-        try:
-            await self.lock_manager.acquire_lock(self.config_path)
-            try:
-                # Read main config to get full module configurations
-                main_config = self.default_config
-
-                # Create new device config
-                device_config = {
-                    'selected_module': selected_modules,
-                    'prompt': prompt,
-                    'nickname': nickname,
-                }
-                if self.private_config.get('last_chat_time'):
-                    device_config['last_chat_time'] = self.private_config['last_chat_time']
-                if self.private_config.get('owner'):
-                    device_config['owner'] = self.private_config['owner']
-
-                # Copy full module configurations from main config
-                for module_type, selected_name in selected_modules.items():
-                    if selected_name and selected_name in main_config.get(module_type, {}):
-                        device_config[module_type] = {
-                            selected_name: main_config[module_type][selected_name]
-                        }
-
-                # Read all configs
-                if os.path.exists(self.config_path):
-                    with open(self.config_path, 'r', encoding='utf-8') as f:
-                        all_configs = yaml.safe_load(f) or {}
-                else:
-                    all_configs = {}
-
-                # Update device config
-                all_configs[self.device_id] = device_config
-                self.private_config = device_config
-
-                # Save back to file
-                with open(self.config_path, 'w', encoding='utf-8') as f:
-                    yaml.dump(all_configs, f, allow_unicode=True)
-
-                return True
-            finally:
-                self.lock_manager.release_lock(self.config_path)
-
-        except Exception as e:
-            self.logger.bind(tag=TAG).error(f"Error updating config: {e}")
-            return False
-
-    async def delete_config(self) -> bool:
-        """删除设备配置
-        Returns:
-            bool: 删除是否成功
-        """
-        try:
-            await self.lock_manager.acquire_lock(self.config_path)
-            try:
-                # 读取所有配置
-                if os.path.exists(self.config_path):
-                    with open(self.config_path, 'r', encoding='utf-8') as f:
-                        all_configs = yaml.safe_load(f) or {}
-                else:
-                    return False
-
-                # 删除设备配置
-                if self.device_id in all_configs:
-                    del all_configs[self.device_id]
-                    
-                    # 保存更新后的配置
-                    with open(self.config_path, 'w', encoding='utf-8') as f:
-                        yaml.dump(all_configs, f, allow_unicode=True)
-                    
-                    self.private_config = {}
-                    return True
-                
-                return False
-            finally:
-                self.lock_manager.release_lock(self.config_path)
-
-        except Exception as e:
-            self.logger.bind(tag=TAG).error(f"Error deleting config: {e}")
-            return False
-
-    def create_private_instances(self):
-        #  判断存在私有配置，并且self.device_id在私有配置中
-        if not self.private_config:
-            self.logger.bind(tag=TAG).error("Private config not found for device_id: {}", self.device_id)
-            return None, None
-        
-        """创建私有处理模块实例"""
-        config = self.private_config
-        selected_modules = config['selected_module']
-        return (
-            llm.create_instance(
-                selected_modules["LLM"]
-                if not 'type' in config["LLM"][selected_modules["LLM"]]
-                else
-                config["LLM"][selected_modules["LLM"]]['type'],
-                config["LLM"][selected_modules["LLM"]],
-            ),
-            tts.create_instance(
-                selected_modules["TTS"]
-                if not 'type' in config["TTS"][selected_modules["TTS"]]
-                else
-                config["TTS"][selected_modules["TTS"]]["type"],
-                config["TTS"][selected_modules["TTS"]],
-                self.default_config.get("delete_audio", True)  # Using default_config for global settings
-            )
-        )
-
-    async def update_last_chat_time(self, timestamp=None):
-        """更新设备最近一次的聊天时间
-        Args:
-            timestamp: 指定的时间戳,不传则使用当前时间
-        """
-        if not self.private_config:
-            self.logger.bind(tag=TAG).error("Private config not found")
-            return False
-            
-        try:
-            await self.lock_manager.acquire_lock(self.config_path)
-            try:
-                if timestamp is None:
-                    timestamp = int(time.time())
-                    
-                self.private_config['last_chat_time'] = timestamp
-                
-                # 读取所有配置
-                with open(self.config_path, 'r', encoding='utf-8') as f:
-                    all_configs = yaml.safe_load(f) or {}
-                    
-                # 更新当前设备配置    
-                all_configs[self.device_id] = self.private_config
-                
-                # 保存回文件
-                with open(self.config_path, 'w', encoding='utf-8') as f:
-                    yaml.dump(all_configs, f, allow_unicode=True)
-                    
-                return True
-            finally:
-                self.lock_manager.release_lock(self.config_path)
-                
-        except Exception as e:
-            self.logger.bind(tag=TAG).error(f"Error updating last chat time: {e}")
-            return False
-
-    def get_auth_code(self) -> str:
-        """获取设备的认证码
-        Returns:
-            str: 认证码，如果没有返回空字符串
-        """
-        return self.private_config.get('auth_code', '')
-
-    def get_owner(self) -> Optional[str]:
-        """获取设备当前所有者"""
-        return self.private_config.get('owner')