From 766a7062505a4c1179e8f90865544f16a08fb95d Mon Sep 17 00:00:00 2001
From: LFNL-scholar <lfnltech@163.com>
Date: Tue, 8 Apr 2025 20:37:23 +0800
Subject: [PATCH 01/53] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=98=BF=E9=87=8C?=
 =?UTF-8?q?=E4=BA=91=E7=9A=84ASR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/config.yaml               |  78 +++---
 .../core/providers/asr/aliyun.py              | 265 ++++++++++++++++++
 2 files changed, 311 insertions(+), 32 deletions(-)
 create mode 100644 main/xiaozhi-server/core/providers/asr/aliyun.py

diff --git a/main/xiaozhi-server/config.yaml b/main/xiaozhi-server/config.yaml
index f1ac85c0..ad85c712 100644
--- a/main/xiaozhi-server/config.yaml
+++ b/main/xiaozhi-server/config.yaml
@@ -86,35 +86,6 @@ 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 # 刷新音乐列表的时间间隔，单位为秒
-
 # #####################################################################################
 # ################################以下是角色模型配置######################################
 
@@ -138,9 +109,9 @@ selected_module:
   # 语音活动检测模块，默认使用SileroVAD模型
   VAD: SileroVAD
   # 语音识别模块，默认使用FunASR本地模型
-  ASR: FunASR
+  ASR: AliyunASR
   # 将根据配置名称对应的type调用实际的LLM适配器
-  LLM: ChatGLMLLM
+  LLM: AliLLM
   # TTS将根据配置名称对应的type调用实际的TTS适配器
   TTS: EdgeTTS
   # 记忆模块，默认不开启记忆；如果想使用超长记忆，推荐使用mem0ai；如果注重隐私，请使用本地的mem_local_short
@@ -182,6 +153,36 @@ 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
@@ -220,6 +221,19 @@ ASR:
     secret_id: 你的腾讯语音合成服务secret_id
     secret_key: 你的腾讯语音合成服务secret_key
     output_dir: tmp/
+  AliyunASR:
+    # 阿里云智能语音交互服务，需要先在阿里云平台开通服务，然后获取验证信息
+    # 平台地址：https://nls-portal.console.aliyun.com/
+    # appkey地址：https://nls-portal.console.aliyun.com/applist
+    # token地址：https://nls-portal.console.aliyun.com/overview
+    # 定义ASR API类型
+    type: aliyun
+    appkey: 你的阿里云智能语音交互服务项目Appkey
+    token: 你的阿里云智能语音交互服务AccessToken，临时的24小时，要长期用下方的access_key_id，access_key_secret
+    access_key_id: 的阿里云账号access_key_id
+    access_key_secret: 你的阿里云账号access_key_secret
+    output_dir: tmp/
+    
 VAD:
   SileroVAD:
     threshold: 0.5
@@ -235,7 +249,7 @@ LLM:
     # 可在这里找到你的 api_key https://bailian.console.aliyun.com/?apiKey=1#/api-key
     base_url: https://dashscope.aliyuncs.com/compatible-mode/v1
     model_name: qwen-turbo
-    api_key: 你的deepseek web key
+    api_key: sk-a8b1fe19c885431c8a3769e18c02541e
     temperature: 0.7  # 温度值
     max_tokens: 500   # 最大生成token数
     top_p: 1         
diff --git a/main/xiaozhi-server/core/providers/asr/aliyun.py b/main/xiaozhi-server/core/providers/asr/aliyun.py
new file mode 100644
index 00000000..4205bec2
--- /dev/null
+++ b/main/xiaozhi-server/core/providers/asr/aliyun.py
@@ -0,0 +1,265 @@
+import http.client
+import json
+import asyncio
+from typing import Optional, Tuple, List
+import opuslib_next
+import wave
+import io
+import os
+import uuid
+import hmac
+import hashlib
+import base64
+import requests
+from urllib import parse
+import time
+from datetime import datetime
+from config.logger import setup_logging
+from core.providers.asr.base import ASRProviderBase
+
+TAG = __name__
+logger = setup_logging()
+
+class AccessToken:
+    @staticmethod
+    def _encode_text(text):
+        encoded_text = parse.quote_plus(text)
+        return encoded_text.replace('+', '%20').replace('*', '%2A').replace('%7E', '~')
+    
+    @staticmethod
+    def _encode_dict(dic):
+        keys = dic.keys()
+        dic_sorted = [(key, dic[key]) for key in sorted(keys)]
+        encoded_text = parse.urlencode(dic_sorted)
+        return encoded_text.replace('+', '%20').replace('*', '%2A').replace('%7E', '~')
+    
+    @staticmethod
+    def create_token(access_key_id, access_key_secret):
+        parameters = {'AccessKeyId': access_key_id,
+                      'Action': 'CreateToken',
+                      'Format': 'JSON',
+                      'RegionId': 'cn-shanghai',
+                      'SignatureMethod': 'HMAC-SHA1',
+                      'SignatureNonce': str(uuid.uuid1()),
+                      'SignatureVersion': '1.0',
+                      'Timestamp': time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()),
+                      'Version': '2019-02-28'}
+        # 构造规范化的请求字符串
+        query_string = AccessToken._encode_dict(parameters)
+        # print('规范化的请求字符串: %s' % query_string)
+        # 构造待签名字符串
+        string_to_sign = 'GET' + '&' + AccessToken._encode_text('/') + '&' + AccessToken._encode_text(query_string)
+        # print('待签名的字符串: %s' % string_to_sign)
+        # 计算签名
+        secreted_string = hmac.new(bytes(access_key_secret + '&', encoding='utf-8'),
+                                   bytes(string_to_sign, encoding='utf-8'),
+                                   hashlib.sha1).digest()
+        signature = base64.b64encode(secreted_string)
+        # print('签名: %s' % signature)
+        # 进行URL编码
+        signature = AccessToken._encode_text(signature)
+        # print('URL编码后的签名: %s' % signature)
+        # 调用服务
+        full_url = 'http://nls-meta.cn-shanghai.aliyuncs.com/?Signature=%s&%s' % (signature, query_string)
+        # print('url: %s' % full_url)
+        # 提交HTTP GET请求
+        response = requests.get(full_url)
+        if response.ok:
+            root_obj = response.json()
+            key = 'Token'
+            if key in root_obj:
+                token = root_obj[key]['Id']
+                expire_time = root_obj[key]['ExpireTime']
+                return token, expire_time
+        # print(response.text)
+        return None, None
+
+
+
+class ASRProvider(ASRProviderBase):
+    def __init__(self, config: dict, delete_audio_file: bool):
+        """阿里云ASR初始化"""
+        # 新增空值判断逻辑
+        self.access_key_id = config.get("access_key_id")
+        self.access_key_secret = config.get("access_key_secret")
+
+        self.app_key = config.get("appkey")
+        self.host = "nls-gateway-cn-shanghai.aliyuncs.com"
+        self.base_url = f"https://{self.host}/stream/v1/asr"
+        self.sample_rate = 16000
+        self.format = "wav"
+        self.output_dir = config.get("output_dir", "./audio_output")
+        self.delete_audio_file = delete_audio_file
+
+        if self.access_key_id and self.access_key_secret:
+            # 使用密钥对生成临时token
+            self._refresh_token()
+        else:
+            # 直接使用预生成的长期token
+            self.token = config.get("token")
+            self.expire_time = None
+        
+        # 确保输出目录存在
+        os.makedirs(self.output_dir, exist_ok=True)
+
+
+    def _refresh_token(self):
+        """刷新Token并记录过期时间"""
+        if self.access_key_id and self.access_key_secret:
+            self.token, expire_time_str = AccessToken.create_token(
+                self.access_key_id, 
+                self.access_key_secret
+            )
+            if not expire_time_str:
+                raise ValueError("无法获取有效的Token过期时间")
+
+            try:
+                #统一转换为字符串处理
+                expire_str = str(expire_time_str).strip()
+
+                if expire_str.isdigit():
+                    expire_time = datetime.fromtimestamp(int(expire_str))
+                else:
+                    expire_time = datetime.strptime(
+                        expire_str, 
+                        "%Y-%m-%dT%H:%M:%SZ"
+                    )
+                self.expire_time = expire_time.timestamp() - 60
+            except Exception as e:
+                raise ValueError(f"无效的过期时间格式: {expire_str}") from e
+        
+        else:
+            self.expire_time = None
+            
+        if not self.token:
+            raise ValueError("无法获取有效的访问Token")
+
+    def _is_token_expired(self):
+        """检查Token是否过期"""
+        if not self.expire_time:
+            return False  # 长期Token不过期
+        # 新增调试日志
+        # current_time = time.time()
+        # remaining = self.expire_time - current_time
+        # print(f"Token过期检查: 当前时间 {datetime.fromtimestamp(current_time)} | "
+        #              f"过期时间 {datetime.fromtimestamp(self.expire_time)} | "
+        #              f"剩余 {remaining:.2f}秒")
+        return time.time() > self.expire_time
+    def generate_filename(self, extension=".wav"):
+        return os.path.join(self.output_file, f"tts-{__name__}{datetime.now().date()}@{uuid.uuid4().hex}{extension}")
+
+
+    def _construct_request_url(self) -> str:
+        """构造请求URL，包含参数"""
+        request = f"{self.base_url}?appkey={self.app_key}"
+        request += f"&format={self.format}"
+        request += f"&sample_rate={self.sample_rate}"
+        request += "&enable_punctuation_prediction=true"
+        request += "&enable_inverse_text_normalization=true"
+        request += "&enable_voice_detection=false"
+        return request
+
+    def decode_opus(self, opus_data: List[bytes], session_id: str) -> List[bytes]:
+        """将Opus数据解码为PCM"""
+        decoder = opuslib_next.Decoder(16000, 1)  # 16kHz, 单声道
+        pcm_data = []
+
+        for opus_packet in opus_data:
+            try:
+                pcm_frame = decoder.decode(opus_packet, 960)  # 960 samples = 60ms
+                pcm_data.append(pcm_frame)
+            except opuslib_next.OpusError as e:
+                logger.bind(tag=TAG).error(f"Opus解码错误: {e}", exc_info=True)
+
+        return pcm_data
+
+    def save_audio_to_file(self, opus_data: List[bytes], session_id: str) -> str:
+        """将Opus音频数据解码并保存为WAV文件"""
+        file_name = f"asr_{session_id}.wav"
+        file_path = os.path.join(self.output_dir, file_name)
+
+        pcm_data = self.decode_opus(opus_data, session_id)
+
+        with wave.open(file_path, "wb") as wf:
+            wf.setnchannels(1)  # 单声道
+            wf.setsampwidth(2)  # 16-bit
+            wf.setframerate(self.sample_rate)
+            wf.writeframes(b''.join(pcm_data))
+
+        logger.bind(tag=TAG).debug(f"音频文件已保存至: {file_path}")
+        return file_path
+
+    async def _send_request(self, pcm_data: bytes) -> Optional[str]:
+        """发送请求到阿里云ASR服务"""
+        try:
+            # 设置HTTP头
+            headers = {
+                'X-NLS-Token': self.token,
+                'Content-type': 'application/octet-stream',
+                'Content-Length': str(len(pcm_data))
+            }
+
+            # 创建连接并发送请求
+            conn = http.client.HTTPSConnection(self.host)
+            request_url = self._construct_request_url()
+            
+            loop = asyncio.get_event_loop()
+            await loop.run_in_executor(None, lambda: conn.request(
+                method='POST',
+                url=request_url,
+                body=pcm_data,
+                headers=headers
+            ))
+
+            # 获取响应
+            response = await loop.run_in_executor(None, conn.getresponse)
+            body = await loop.run_in_executor(None, response.read)
+            conn.close()
+
+            # 解析响应
+            try:
+                body_json = json.loads(body)
+                status = body_json.get('status')
+                
+                if status == 20000000:
+                    result = body_json.get('result', '')
+                    logger.bind(tag=TAG).debug(f"ASR结果: {result}")
+                    return result
+                else:
+                    logger.bind(tag=TAG).error(f"ASR失败，状态码: {status}")
+                    return None
+                    
+            except ValueError:
+                logger.bind(tag=TAG).error("响应不是JSON格式")
+                return None
+
+        except Exception as e:
+            logger.bind(tag=TAG).error(f"ASR请求失败: {e}", exc_info=True)
+            return None
+
+    async def speech_to_text(self, opus_data: List[bytes], session_id: str) -> Tuple[Optional[str], Optional[str]]:
+        """将语音数据转换为文本"""
+        if self._is_token_expired():
+            logger.warning("Token已过期，正在自动刷新...")
+            self._refresh_token()
+            
+        try:
+            # 解码Opus为PCM
+            pcm_data_list = self.decode_opus(opus_data, session_id)
+            combined_pcm_data = b''.join(pcm_data_list)
+
+            # 发送请求并获取文本
+            text = await self._send_request(combined_pcm_data)
+            
+            file_path = self.save_audio_to_file(opus_data, session_id)
+            if self.delete_audio_file:
+                os.remove(file_path)
+                logger.bind(tag=TAG).debug(f"音频文件已删除: {file_path}")
+
+            if text:
+                return text, None
+            return "", None
+
+        except Exception as e:
+            logger.bind(tag=TAG).error(f"语音识别失败: {e}", exc_info=True)
+            return "", None
\ No newline at end of file

From c9eb64051007cfacbf5c2122f7c816679e745be2 Mon Sep 17 00:00:00 2001
From: LFNL-scholar <lfnltech@163.com>
Date: Tue, 8 Apr 2025 20:48:11 +0800
Subject: [PATCH 02/53] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=98=BF=E9=87=8C?=
 =?UTF-8?q?=E4=BA=91ASR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/config.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/xiaozhi-server/config.yaml b/main/xiaozhi-server/config.yaml
index ad85c712..b47ad6c9 100644
--- a/main/xiaozhi-server/config.yaml
+++ b/main/xiaozhi-server/config.yaml
@@ -109,9 +109,9 @@ selected_module:
   # 语音活动检测模块，默认使用SileroVAD模型
   VAD: SileroVAD
   # 语音识别模块，默认使用FunASR本地模型
-  ASR: AliyunASR
+  ASR: FunASR
   # 将根据配置名称对应的type调用实际的LLM适配器
-  LLM: AliLLM
+  LLM: ChatGLMLLM
   # TTS将根据配置名称对应的type调用实际的TTS适配器
   TTS: EdgeTTS
   # 记忆模块，默认不开启记忆；如果想使用超长记忆，推荐使用mem0ai；如果注重隐私，请使用本地的mem_local_short
@@ -249,7 +249,7 @@ LLM:
     # 可在这里找到你的 api_key https://bailian.console.aliyun.com/?apiKey=1#/api-key
     base_url: https://dashscope.aliyuncs.com/compatible-mode/v1
     model_name: qwen-turbo
-    api_key: sk-a8b1fe19c885431c8a3769e18c02541e
+    api_key: 你的阿里云大模型 key
     temperature: 0.7  # 温度值
     max_tokens: 500   # 最大生成token数
     top_p: 1         

From 244c76793c16919eb11814f3d07a1699a3ac0d77 Mon Sep 17 00:00:00 2001
From: wnk <weinaike@zhejianglab.com>
Date: Sun, 27 Apr 2025 11:55:10 +0800
Subject: [PATCH 03/53] =?UTF-8?q?=E5=BD=93=E5=89=8DfunASR=E4=BB=85?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9C=AC=E5=9C=B0=E6=A8=A1=E5=9E=8B=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9EFunASR=E6=9C=8D=E5=8A=A1API=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=EF=BC=88=E6=9C=8D=E5=8A=A1=E5=8F=AF=E6=A0=B9=E6=8D=AE=E5=AE=98?=
 =?UTF-8?q?=E6=96=B9=E8=AF=B4=E6=98=8E=E8=87=AA=E8=A1=8C=E5=8F=A6=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E7=BD=B2=EF=BC=89=EF=BC=8C=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=8EAPI=E8=B0=83=E7=94=A8=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/db/changelog/202504082211.sql   |   1 +
 .../resources/db/changelog/202504112044.sql   |   1 +
 main/xiaozhi-server/config.yaml               |   6 +
 .../core/providers/asr/fun_server.py          | 144 ++++++++++++++++++
 4 files changed, 152 insertions(+)
 create mode 100644 main/xiaozhi-server/core/providers/asr/fun_server.py

diff --git a/main/manager-api/src/main/resources/db/changelog/202504082211.sql b/main/manager-api/src/main/resources/db/changelog/202504082211.sql
index 91ce33ff..5aa75bef 100644
--- a/main/manager-api/src/main/resources/db/changelog/202504082211.sql
+++ b/main/manager-api/src/main/resources/db/changelog/202504082211.sql
@@ -10,6 +10,7 @@ INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `f
 ('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()),
+('SYSTEM_ASR_FunASRServer', 'ASR', 'fun_server', 'FunASR服务语音识别', '[{"key":"host","label":"服务地址","type":"string"},{"key":"port","label":"端口号","type":"number"}]', 4, 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()),
diff --git a/main/manager-api/src/main/resources/db/changelog/202504112044.sql b/main/manager-api/src/main/resources/db/changelog/202504112044.sql
index 9fd2257d..3609d235 100644
--- a/main/manager-api/src/main/resources/db/changelog/202504112044.sql
+++ b/main/manager-api/src/main/resources/db/changelog/202504112044.sql
@@ -11,6 +11,7 @@ INSERT INTO `ai_model_config` VALUES ('ASR_FunASR', 'ASR', 'FunASR', 'FunASR语
 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);
+INSERT INTO `ai_model_config` VALUES ('ASR_FunASRServer', 'ASR', 'FunASRServer', 'FunASR服务语音识别', 0, 1, '{\"type\": \"fun_server\", \"host\": \"127.0.0.1\", \"port\": 10096}', NULL, NULL, 5, NULL, NULL, NULL, NULL);
 
 -- LLM模型配置
 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);
diff --git a/main/xiaozhi-server/config.yaml b/main/xiaozhi-server/config.yaml
index 696c82d0..3ec6b013 100644
--- a/main/xiaozhi-server/config.yaml
+++ b/main/xiaozhi-server/config.yaml
@@ -200,6 +200,12 @@ ASR:
     type: fun_local
     model_dir: models/SenseVoiceSmall
     output_dir: tmp/
+  FunASRServer:
+    # 支持FunASR服务，部署方法：https://github.com/modelscope/FunASR/blob/main/runtime/docs/SDK_advanced_guide_online_zh.md
+    # mode 预置 offline
+    type: fun_server
+    host: 127.0.0.1
+    port: 10096
   SherpaASR:
     type: sherpa_onnx_local
     model_dir: models/sherpa-onnx-sense-voice-zh-en-ja-ko-yue-2024-07-17
diff --git a/main/xiaozhi-server/core/providers/asr/fun_server.py b/main/xiaozhi-server/core/providers/asr/fun_server.py
new file mode 100644
index 00000000..d0701d93
--- /dev/null
+++ b/main/xiaozhi-server/core/providers/asr/fun_server.py
@@ -0,0 +1,144 @@
+from typing import Optional, Tuple, List
+import opuslib_next
+from core.providers.asr.base import ASRProviderBase
+import  ssl
+import json
+import websockets
+from config.logger import setup_logging
+import asyncio
+TAG = __name__
+logger = setup_logging()
+
+class ASRProvider(ASRProviderBase):
+    def __init__(self, config: dict, delete_audio_file: bool):
+        '''
+        Initialize the ASRProvider with server configuration.
+        :param config: Dictionary containing 'host', 'port', and 'is_ssl'.
+        :param delete_audio_file: Boolean to indicate whether to delete audio files after processing.
+        '''
+        self.host = config.get('host', 'localhost')
+        self.port = config.get('port', 10095)
+        self.is_ssl = config.get('is_ssl', True)
+        self.delete_audio_file = delete_audio_file
+        self.uri = f"wss://{self.host}:{self.port}" if self.is_ssl else f"ws://{self.host}:{self.port}"
+        self.ssl_context = ssl.SSLContext() if self.is_ssl else None
+        if self.ssl_context:
+            self.ssl_context.check_hostname = False
+            self.ssl_context.verify_mode = ssl.CERT_NONE
+
+    def save_audio_to_file(self, opus_data: List[bytes], session_id: str) -> str:
+        """解码Opus数据并保存为WAV文件"""
+        pass
+
+    @staticmethod
+    def decode_opus(opus_data: List[bytes]) -> bytes:
+        """将Opus音频数据解码为PCM数据"""        
+        decoder = opuslib_next.Decoder(16000, 1)  # 16kHz, 单声道
+        pcm_data = []
+        
+        for opus_packet in opus_data:
+            try:
+                pcm_frame = decoder.decode(opus_packet, 960)  # 960 samples = 60ms
+                pcm_data.append(pcm_frame)
+            except opuslib_next.OpusError as e:
+                logger.bind(tag=TAG).error(f"Opus解码错误: {e}", exc_info=True)
+        
+        return b"".join(pcm_data)
+    
+
+
+    async def _receive_responses(self, ws) -> None:
+        '''
+        Asynchronous generator to receive messages from the WebSocket.
+        Yields each message as it is received.
+        '''
+        text = ""
+        while True:
+            try:
+                response = await asyncio.wait_for(ws.recv(), timeout=5)
+                response_data = json.loads(response)
+                logger.bind(tag=TAG).debug(f"Received response: {response_data}")
+                if response_data.get("is_final", True):
+                    text += response_data.get("text", "")
+                    break
+                else:
+                    text += response_data.get("text", "")
+            except asyncio.TimeoutError:
+                logger.bind(tag=TAG).error("Timeout while waiting for response from WebSocket.")
+                break
+            except websockets.exceptions.ConnectionClosed as e:
+                logger.bind(tag=TAG).error(f"WebSocket connection closed: {e}")
+                break
+        return text
+    async def _send_data(self, ws, pcm_data: bytes, session_id: str) -> tuple:
+        '''
+        Internal method to handle WebSocket communication.
+        Reuses the persistent WebSocket connection if available.
+        :param pcm_data: PCM audio data to send.
+        :param session_id: Unique session identifier.
+        :return: Tuple containing recognized text and optional timestamp.
+        '''
+
+        # Send initial configuration message
+        config_message = json.dumps({
+            "mode": "offline",
+            "chunk_size": [5, 10, 5],
+            "chunk_interval": 10,
+            "wav_name": session_id,
+            "is_speaking": True,
+            "itn": False
+        })
+        await ws.send(config_message)
+        logger.bind(tag=TAG).debug(f"Sent configuration message: {config_message}")
+        
+        # Send PCM data
+        await ws.send(pcm_data)
+        logger.bind(tag=TAG).debug(f"Sent PCM data of length: {len(pcm_data)} bytes")
+        
+        # Indicate end of speech
+        end_message = json.dumps({"is_speaking": False})
+        await ws.send(end_message)
+        logger.bind(tag=TAG).debug(f"Sent end message: {end_message}")    
+
+
+    async def speech_to_text(self, opus_data: List[bytes], session_id: str) -> Tuple[Optional[str], Optional[str]]:
+        '''
+        Convert speech data to text using FunASR.
+        :param opus_data: List of Opus-encoded audio data chunks.
+        :param session_id: Unique session identifier.
+        :return: Tuple containing recognized text and optional timestamp.
+        '''
+
+        pcm_data = self.decode_opus(opus_data)
+
+        async with websockets.connect(self.uri, subprotocols=["binary"], ping_interval=None, ssl=self.ssl_context) as ws:
+            try:
+                # Use asyncio to handle WebSocket communication
+                send_task = asyncio.create_task(self._send_data(ws, pcm_data, session_id))
+                receive_task = asyncio.create_task(self._receive_responses(ws))
+
+                # Gather tasks with error handling
+                done, pending = await asyncio.wait(
+                    [send_task, receive_task],
+                    return_when=asyncio.FIRST_EXCEPTION
+                )
+
+                # Cancel any pending tasks
+                for task in pending:
+                    task.cancel()
+
+                # Check for exceptions in completed tasks
+                for task in done:
+                    if task.exception():
+                        raise task.exception()
+
+                # Get the result from the receive task
+                result = receive_task.result()
+                return result, None  # Return the recognized text and timestamp (if any)
+
+            except websockets.exceptions.ConnectionClosed as e:
+                logger.bind(tag=TAG).error(f"WebSocket connection closed: {e}")
+                return "", None
+            except Exception as e:
+                logger.bind(tag=TAG).error(f"Error during speech-to-text conversion: {e}", exc_info=True)
+                return "", None
\ No newline at end of file

From 62857862828ceb3891d5bda7d31753b1409c1cff Mon Sep 17 00:00:00 2001
From: goodyhao <865700600@qq.com>
Date: Mon, 28 Apr 2025 11:31:10 +0800
Subject: [PATCH 04/53] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=86=E5=8C=85tts=E5=AF=B9=E8=AF=9D=E9=80=9F=E7=8E=87?=
 =?UTF-8?q?=E7=AD=89=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/config.yaml                  |  3 +++
 main/xiaozhi-server/core/providers/tts/doubao.py | 10 +++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/main/xiaozhi-server/config.yaml b/main/xiaozhi-server/config.yaml
index 4b93d87e..6632a3a9 100644
--- a/main/xiaozhi-server/config.yaml
+++ b/main/xiaozhi-server/config.yaml
@@ -385,6 +385,9 @@ TTS:
     appid: 你的火山引擎语音合成服务appid
     access_token: 你的火山引擎语音合成服务access_token
     cluster: volcano_tts
+    speed_ratio: 1.0
+    volume_ratio: 1.0
+    pitch_ratio: 1.0
   CosyVoiceSiliconflow:
     type: siliconflow
     # 硅基流动TTS
diff --git a/main/xiaozhi-server/core/providers/tts/doubao.py b/main/xiaozhi-server/core/providers/tts/doubao.py
index 968399cc..f0aedc8e 100644
--- a/main/xiaozhi-server/core/providers/tts/doubao.py
+++ b/main/xiaozhi-server/core/providers/tts/doubao.py
@@ -27,6 +27,10 @@ class TTSProvider(TTSProviderBase):
         else:
             self.voice = config.get("voice")
 
+        self.speed_ratio = config.get("speed_ratio") if config.get("speed_ratio") else 1.0
+        self.volume_ratio = config.get("volume_ratio") if config.get("volume_ratio") else 1.0
+        self.pitch_ratio = config.get("pitch_ratio") if config.get("pitch_ratio") else 1.0
+
         self.api_url = config.get("api_url")
         self.authorization = config.get("authorization")
         self.header = {"Authorization": f"{self.authorization}{self.access_token}"}
@@ -49,9 +53,9 @@ class TTSProvider(TTSProviderBase):
             "audio": {
                 "voice_type": self.voice,
                 "encoding": "wav",
-                "speed_ratio": 1.0,
-                "volume_ratio": 1.0,
-                "pitch_ratio": 1.0,
+                "speed_ratio": self.speed_ratio,
+                "volume_ratio": self.volume_ratio,
+                "pitch_ratio": self.pitch_ratio,
             },
             "request": {
                 "reqid": str(uuid.uuid4()),

From 16e77b02c21efb6ed74f90e4559f5bd6f9e67f7b Mon Sep 17 00:00:00 2001
From: MakerZorky <1053714527zhq@gmail.com>
Date: Tue, 29 Apr 2025 01:28:06 +0800
Subject: [PATCH 05/53] =?UTF-8?q?update:=E6=89=80=E6=9C=89ASR=E5=9D=87?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAPCM=E7=9B=B4=E6=8E=A5=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=EF=BC=8C=E9=80=9A=E8=BF=87delete=5Faudio=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=A6=81=E4=B8=8D=E8=A6=81=E5=82=A8=E5=AD=98?=
 =?UTF-8?q?wav?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiaozhi-server/core/providers/asr/base.py |  4 +--
 .../core/providers/asr/doubao.py              | 21 ++++++------
 .../core/providers/asr/fun_local.py           | 32 +++++++++++++++----
 .../core/providers/asr/sherpa_onnx_local.py   | 24 ++++++++------
 .../core/providers/asr/tencent.py             | 18 ++++-------
 5 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/main/xiaozhi-server/core/providers/asr/base.py b/main/xiaozhi-server/core/providers/asr/base.py
index d8db22a8..6d9c2c90 100644
--- a/main/xiaozhi-server/core/providers/asr/base.py
+++ b/main/xiaozhi-server/core/providers/asr/base.py
@@ -9,8 +9,8 @@ logger = setup_logging()
 
 class ASRProviderBase(ABC):
     @abstractmethod
-    def save_audio_to_file(self, opus_data: List[bytes], session_id: str) -> str:
-        """解码Opus数据并保存为WAV文件"""
+    def save_audio_to_file(self, pcm_data: List[bytes], session_id: str) -> str:
+        """PCM数据保存为WAV文件"""
         pass
 
     @abstractmethod
diff --git a/main/xiaozhi-server/core/providers/asr/doubao.py b/main/xiaozhi-server/core/providers/asr/doubao.py
index b19ceb97..6fba472c 100644
--- a/main/xiaozhi-server/core/providers/asr/doubao.py
+++ b/main/xiaozhi-server/core/providers/asr/doubao.py
@@ -89,6 +89,7 @@ class ASRProvider(ASRProviderBase):
         self.cluster = config.get("cluster")
         self.access_token = config.get("access_token")
         self.output_dir = config.get("output_dir")
+        self.delete_audio_file = delete_audio_file
 
         self.host = "openspeech.bytedance.com"
         self.ws_url = f"wss://{self.host}/api/v2/asr"
@@ -98,21 +99,11 @@ class ASRProvider(ASRProviderBase):
         # 确保输出目录存在
         os.makedirs(self.output_dir, exist_ok=True)
 
-    def save_audio_to_file(self, opus_data: List[bytes], session_id: str) -> str:
-        """将Opus音频数据解码并保存为WAV文件"""
+    def save_audio_to_file(self, pcm_data: List[bytes], session_id: str) -> str:
+        """PCM数据保存为WAV文件"""
         file_name = f"asr_{session_id}_{uuid.uuid4()}.wav"
         file_path = os.path.join(self.output_dir, file_name)
 
-        decoder = opuslib_next.Decoder(16000, 1)  # 16kHz, 单声道
-        pcm_data = []
-
-        for opus_packet in opus_data:
-            try:
-                pcm_frame = decoder.decode(opus_packet, 960)  # 960 samples = 60ms
-                pcm_data.append(pcm_frame)
-            except opuslib_next.OpusError as e:
-                logger.bind(tag=TAG).error(f"Opus解码错误: {e}", exc_info=True)
-
         with wave.open(file_path, "wb") as wf:
             wf.setnchannels(1)
             wf.setsampwidth(2)  # 2 bytes = 16-bit
@@ -274,6 +265,12 @@ class ASRProvider(ASRProviderBase):
             pcm_data = self.decode_opus(opus_data, session_id)
             combined_pcm_data = b"".join(pcm_data)
 
+            # 判断是否保存为WAV文件
+            if self.delete_audio_file:
+                pass
+            else:
+                self.save_audio_to_file(pcm_data, session_id)
+
             # 直接使用PCM数据
             # 计算分段大小 (单声道, 16bit, 16kHz采样率)
             size_per_sec = 1 * 2 * 16000  # nchannels * sampwidth * framerate
diff --git a/main/xiaozhi-server/core/providers/asr/fun_local.py b/main/xiaozhi-server/core/providers/asr/fun_local.py
index 82d09ab5..a678780b 100644
--- a/main/xiaozhi-server/core/providers/asr/fun_local.py
+++ b/main/xiaozhi-server/core/providers/asr/fun_local.py
@@ -51,7 +51,7 @@ class ASRProvider(ASRProviderBase):
             )
 
     def save_audio_to_file(self, opus_data: List[bytes], session_id: str) -> str:
-        """将Opus音频数据解码并保存为WAV文件"""
+        """PCM数据保存为WAV文件"""
         file_name = f"asr_{session_id}_{uuid.uuid4()}.wav"
         file_path = os.path.join(self.output_dir, file_name)
 
@@ -72,20 +72,40 @@ class ASRProvider(ASRProviderBase):
             wf.writeframes(b"".join(pcm_data))
 
         return file_path
+    
+    @staticmethod
+    def decode_opus(opus_data: List[bytes], session_id: str) -> List[bytes]:
+
+        decoder = opuslib_next.Decoder(16000, 1)  # 16kHz, 单声道
+        pcm_data = []
+
+        for opus_packet in opus_data:
+            try:
+                pcm_frame = decoder.decode(opus_packet, 960)  # 960 samples = 60ms
+                pcm_data.append(pcm_frame)
+            except opuslib_next.OpusError as e:
+                logger.bind(tag=TAG).error(f"Opus解码错误: {e}", exc_info=True)
+
+        return pcm_data
 
     async def speech_to_text(self, opus_data: List[bytes], session_id: str) -> Tuple[Optional[str], Optional[str]]:
         """语音转文本主处理逻辑"""
         file_path = None
         try:
-            # 保存音频文件
-            start_time = time.time()
-            file_path = self.save_audio_to_file(opus_data, session_id)
-            logger.bind(tag=TAG).debug(f"音频文件保存耗时: {time.time() - start_time:.3f}s | 路径: {file_path}")
+            # 合并所有opus数据包
+            pcm_data = self.decode_opus(opus_data, session_id)
+            combined_pcm_data = b"".join(pcm_data)
+
+            # 判断是否保存为WAV文件
+            if self.delete_audio_file:
+                pass
+            else:
+                self.save_audio_to_file(pcm_data, session_id)
 
             # 语音识别
             start_time = time.time()
             result = self.model.generate(
-                input=file_path,
+                input=combined_pcm_data,
                 cache={},
                 language="auto",
                 use_itn=True,
diff --git a/main/xiaozhi-server/core/providers/asr/sherpa_onnx_local.py b/main/xiaozhi-server/core/providers/asr/sherpa_onnx_local.py
index 3dfa3162..b086022b 100644
--- a/main/xiaozhi-server/core/providers/asr/sherpa_onnx_local.py
+++ b/main/xiaozhi-server/core/providers/asr/sherpa_onnx_local.py
@@ -84,10 +84,21 @@ class ASRProvider(ASRProviderBase):
             )
 
     def save_audio_to_file(self, opus_data: List[bytes], session_id: str) -> str:
-        """将Opus音频数据解码并保存为WAV文件"""
+        """PCM数据保存为WAV文件"""
         file_name = f"asr_{session_id}_{uuid.uuid4()}.wav"
         file_path = os.path.join(self.output_dir, file_name)
 
+        with wave.open(file_path, "wb") as wf:
+            wf.setnchannels(1)
+            wf.setsampwidth(2)  # 2 bytes = 16-bit
+            wf.setframerate(16000)
+            wf.writeframes(b"".join(pcm_data))
+
+        return file_path
+
+    @staticmethod
+    def decode_opus(opus_data: List[bytes], session_id: str) -> List[bytes]:
+
         decoder = opuslib_next.Decoder(16000, 1)  # 16kHz, 单声道
         pcm_data = []
 
@@ -98,13 +109,7 @@ class ASRProvider(ASRProviderBase):
             except opuslib_next.OpusError as e:
                 logger.bind(tag=TAG).error(f"Opus解码错误: {e}", exc_info=True)
 
-        with wave.open(file_path, "wb") as wf:
-            wf.setnchannels(1)
-            wf.setsampwidth(2)  # 2 bytes = 16-bit
-            wf.setframerate(16000)
-            wf.writeframes(b"".join(pcm_data))
-
-        return file_path
+        return pcm_data
 
     def read_wave(self, wave_filename: str) -> Tuple[np.ndarray, int]:
         """
@@ -136,7 +141,8 @@ class ASRProvider(ASRProviderBase):
         try:
             # 保存音频文件
             start_time = time.time()
-            file_path = self.save_audio_to_file(opus_data, session_id)
+            pcm_data = self.decode_opus(opus_data, session_id)
+            file_path = self.save_audio_to_file(pcm_data, session_id)
             logger.bind(tag=TAG).debug(f"音频文件保存耗时: {time.time() - start_time:.3f}s | 路径: {file_path}")
 
             # 语音识别
diff --git a/main/xiaozhi-server/core/providers/asr/tencent.py b/main/xiaozhi-server/core/providers/asr/tencent.py
index 8221f9df..0ac297a6 100644
--- a/main/xiaozhi-server/core/providers/asr/tencent.py
+++ b/main/xiaozhi-server/core/providers/asr/tencent.py
@@ -31,21 +31,11 @@ class ASRProvider(ASRProviderBase):
         os.makedirs(self.output_dir, exist_ok=True)
 
     def save_audio_to_file(self, opus_data: List[bytes], session_id: str) -> str:
-        """将Opus音频数据解码并保存为WAV文件"""
+        """PCM数据保存为WAV文件"""
 
         file_name = f"tencent_asr_{session_id}_{uuid.uuid4()}.wav"
         file_path = os.path.join(self.output_dir, file_name)
         
-        decoder = opuslib_next.Decoder(16000, 1)  # 16kHz, 单声道
-        pcm_data = []
-        
-        for opus_packet in opus_data:
-            try:
-                pcm_frame = decoder.decode(opus_packet, 960)  # 960 samples = 60ms
-                pcm_data.append(pcm_frame)
-            except opuslib_next.OpusError as e:
-                logger.bind(tag=TAG).error(f"Opus解码错误: {e}", exc_info=True)
-        
         with wave.open(file_path, "wb") as wf:
             wf.setnchannels(1)
             wf.setsampwidth(2)  # 2 bytes = 16-bit
@@ -85,6 +75,12 @@ class ASRProvider(ASRProviderBase):
 
             # 将Opus音频数据解码为PCM
             pcm_data = self.decode_opus(opus_data)
+
+            # 判断是否保存为WAV文件
+            if self.delete_audio_file:
+                pass
+            else:
+                self.save_audio_to_file(pcm_data, session_id)
             
             # 将音频数据转换为Base64编码
             base64_audio = base64.b64encode(pcm_data).decode('utf-8')

From 6ac894716853392e55e2ae2cb335293933c09629 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Tue, 29 Apr 2025 10:14:43 +0800
Subject: [PATCH 06/53] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0issue=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/ISSUE_TEMPLATE/bug_report.md | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 2d6c173f..deaff830 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,26 +9,24 @@ assignees: ''
 ## 🐛 问题描述
 <!-- 清晰简洁地描述问题是什么 -->
 
-## 🔍 复现步骤
-<!-- 详细描述复现问题的步骤 -->
+## 🖥️ 环境信息
+- 部署方式: 全模块部署 还是 单Server部署
+- 版本号: 例如 0.3.x
+
+## 🔍 告诉我们，应该怎么复现这个问题
+<!-- 这个很重要，方便我们快速定位 -->
 1. 打开 '...'
 2. 点击 '...'
 3. 滚动到 '...'
 4. 看到错误
 
-## 🤔 预期行为
+## 🤔 你原本希望是怎么样的
 <!-- 简要描述预期的正确行为 -->
 
-## 😯 截图
+## 😯 提供一些截图
 <!-- 如果适用，添加问题的截图 -->
-
-## 🖥️ 环境信息
-- 操作系统: [例如 Windows 10]
-- 浏览器: [例如 Chrome 89]
-- 项目版本: [例如 1.0.0]
-- Python版本: [例如 3.9.13]
-- Jdk版本：[例如 java 21.0.5 2024-10-15 LTS]
-- Nodejs版本：[例如 v20.14.0]
+1. 比如日志截图，越多越好
+2. 比如界面反应
 
 ## 📋 其他信息
 <!-- 在此添加关于此问题的任何其他上下文信息 -->

From 361defc3487ed481d976ae555fb0e4cbb57eec7f Mon Sep 17 00:00:00 2001
From: CGD <3030332422@qq.com>
Date: Tue, 29 Apr 2025 10:36:20 +0800
Subject: [PATCH 07/53] =?UTF-8?q?update:=E5=AE=8C=E6=88=90Python=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E7=9A=84=E2=80=9C=E5=8A=A8=E6=80=81=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?web=E7=AB=AF=E7=9A=84=E9=85=8D=E7=BD=AE=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/core/connection.py        | 24 +++++++++++++++++++
 main/xiaozhi-server/core/handle/textHandle.py |  3 +++
 2 files changed, 27 insertions(+)

diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index 3cf6b018..22b90313 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -214,6 +214,30 @@ class ConnectionHandler:
         elif isinstance(message, bytes):
             await handleAudioMessage(self, message)
 
+    async def handle_config_update(self, message):
+        """处理配置更新请求"""
+        config_model = message.get("model")
+        new_content = message.get("content")
+
+        # 打印更新前的配置
+        old_value = self.config.get(config_model)
+        self.logger.bind(tag=TAG).info(f"配置更新: {config_model} 从 {old_value} 更新为 {new_content}")
+
+        # 更新配置
+        self.config[config_model] = new_content
+
+        # 如果是模型相关配置，重新初始化模型
+        if config_model in ["LLM", "TTS", "ASR", "VAD", "Intent", "Memory"]:
+            self._initialize_components(self.config)
+            self.logger.bind(tag=TAG).info(f"已使用新配置重新初始化 {config_model} 模块")
+
+        # 返回更新确认
+        await self.websocket.send(json.dumps({
+            "type": "config_update_response",
+            "status": "success",
+            "message": f"{config_model} 配置已更新"
+        }))
+
     def _initialize_components(self, private_config):
         """初始化组件"""
         if private_config is not None:
diff --git a/main/xiaozhi-server/core/handle/textHandle.py b/main/xiaozhi-server/core/handle/textHandle.py
index 43e980e8..f65d436a 100644
--- a/main/xiaozhi-server/core/handle/textHandle.py
+++ b/main/xiaozhi-server/core/handle/textHandle.py
@@ -61,5 +61,8 @@ async def handleTextMessage(conn, message):
                 asyncio.create_task(handleIotDescriptors(conn, msg_json["descriptors"]))
             if "states" in msg_json:
                 asyncio.create_task(handleIotStatus(conn, msg_json["states"]))
+        elif msg_json["type"] == "server":
+            if "model" in msg_json:
+                await conn.handle_config_update(msg_json)
     except json.JSONDecodeError:
         await conn.websocket.send(message)

From 5e35cfc44abc36b4791ba6c4d72fc4daab85bdbb Mon Sep 17 00:00:00 2001
From: myifeng <myifengs@gmail.com>
Date: Tue, 29 Apr 2025 13:55:34 +0800
Subject: [PATCH 08/53] =?UTF-8?q?=E5=AE=9A=E4=B9=89config.yaml=E4=B8=BA?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE=EF=BC=9B=20data/.config.ya?=
 =?UTF-8?q?ml=20=E4=B8=BA=E8=87=AA=E5=AE=9A=E4=B9=89=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=9B=20=E4=BD=BF=E7=94=A8=E8=80=85=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=87=AA=E5=AE=9A=E4=B9=89=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8D=B3=E5=8F=AF=E5=AE=8C=E6=88=90=E5=90=AF=E5=8A=A8=EF=BC=8C?=
 =?UTF-8?q?=E6=97=A0=E9=9C=80=E5=85=B3=E5=BF=83=E9=BB=98=E8=AE=A4=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B9=EF=BC=8C=E5=87=8F=E5=B0=91=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=86=97=E4=BD=99=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/config/config_loader.py | 43 +++++++++++++++++---
 main/xiaozhi-server/config/settings.py      | 45 ++++++++-------------
 2 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/main/xiaozhi-server/config/config_loader.py b/main/xiaozhi-server/config/config_loader.py
index 849a2a8a..b892b437 100644
--- a/main/xiaozhi-server/config/config_loader.py
+++ b/main/xiaozhi-server/config/config_loader.py
@@ -1,6 +1,7 @@
 import os
 import argparse
 import yaml
+from collections.abc import Mapping
 from config.manage_api_client import init_service, get_server_config, get_agent_models
 
 
@@ -25,12 +26,19 @@ def load_config():
     if _config_cache is not None:
         return _config_cache
 
-    parser = argparse.ArgumentParser(description="Server configuration")
-    config_file = get_config_file()
+    default_config_path = get_project_dir() + "config.yaml"
+    custom_config_path = get_project_dir() + "data/.config.yaml"
 
-    parser.add_argument("--config_path", type=str, default=config_file)
-    args = parser.parse_args()
-    config = read_config(args.config_path)
+    # 加载默认配置
+    default_config = read_config(default_config_path)
+
+    # 加载用户自定义配置（如果存在）
+    if os.path.exists(custom_config_path):
+        custom_config = read_config(custom_config_path)
+        # 合并配置
+        config = merge_configs(default_config, custom_config)
+    else:
+        config = default_config
 
     if config.get("manager-api", {}).get("url"):
         config = get_config_from_api(config)
@@ -115,3 +123,28 @@ def ensure_directories(config):
             os.makedirs(dir_path, exist_ok=True)
         except PermissionError:
             print(f"警告：无法创建目录 {dir_path}，请检查写入权限")
+
+
+def merge_configs(default_config, custom_config):
+    """
+    递归合并配置，custom_config优先级更高
+    
+    Args:
+        default_config: 默认配置
+        custom_config: 用户自定义配置
+        
+    Returns:
+        合并后的配置
+    """
+    if not isinstance(default_config, Mapping) or not isinstance(custom_config, Mapping):
+        return custom_config
+    
+    merged = dict(default_config)
+    
+    for key, value in custom_config.items():
+        if key in merged and isinstance(merged[key], Mapping) and isinstance(value, Mapping):
+            merged[key] = merge_configs(merged[key], value)
+        else:
+            merged[key] = value
+            
+    return merged
\ No newline at end of file
diff --git a/main/xiaozhi-server/config/settings.py b/main/xiaozhi-server/config/settings.py
index 535a81ed..c12c70d8 100644
--- a/main/xiaozhi-server/config/settings.py
+++ b/main/xiaozhi-server/config/settings.py
@@ -1,7 +1,11 @@
 import os
 from collections.abc import Mapping
+from config import logger
 from config.config_loader import read_config, get_project_dir, load_config
 
+TAG = __name__
+logger = logger.setup_logging()
+
 default_config_file = "config.yaml"
 
 
@@ -34,31 +38,16 @@ def find_missing_keys(new_config, old_config, parent_key=""):
 
 
 def check_config_file():
-    old_config_file = get_project_dir() + "data/." + default_config_file
-    if not os.path.exists(old_config_file):
-        return
-    old_config = load_config()
-    new_config = read_config(get_project_dir() + default_config_file)
-    # 查找缺失的配置项
-    missing_keys = find_missing_keys(new_config, old_config)
-    read_config_from_api = old_config.get("read_config_from_api", False)
-    if read_config_from_api:
-        old_config_origin = read_config(old_config_file)
-        if old_config_origin.get("selected_module") is not None:
-            missing_keys_str = "\n".join(f"- {key}" for key in missing_keys)
-            error_msg = "您的配置文件好像既包含智控台的配置又包含本地配置：\n"
-            error_msg += "\n建议您：\n"
-            error_msg += "1、将根目录的config_from_api.yaml文件复制到data下，重命名为.config.yaml\n"
-            error_msg += "2、按教程配置好接口地址和密钥\n"
-            raise ValueError(error_msg)
-        return
-
-    if missing_keys:
-        missing_keys_str = "\n".join(f"- {key}" for key in missing_keys)
-        error_msg = "您的配置文件太旧了，缺少了：\n"
-        error_msg += missing_keys_str
-        error_msg += "\n建议您：\n"
-        error_msg += "1、备份data/.config.yaml文件\n"
-        error_msg += "2、将根目录的config.yaml文件复制到data下，重命名为.config.yaml\n"
-        error_msg += "3、将密钥逐个复制到新的配置文件中\n"
-        raise ValueError(error_msg)
+    """
+    简化的配置检查，仅提示用户配置文件的使用情况
+    """
+    custom_config_file = get_project_dir() + "data/." + default_config_file
+    if not os.path.exists(custom_config_file):
+        logger.bind(tag=TAG).info("提示: 使用默认配置文件。如需自定义配置，请创建 data/.config.yaml 文件")
+    else:
+        logger.bind(tag=TAG).info(f"提示: 使用自定义配置文件 data/.config.yaml，配置将覆盖默认值")
+    
+    # 检查是否从API读取配置
+    config = load_config()
+    if config.get("read_config_from_api", False):
+        logger.bind(tag=TAG).info("提示: 从API获取配置")

From 9a52b43e096109fd0301fcca1ca27e99a22df195 Mon Sep 17 00:00:00 2001
From: goodyhao <865700600@qq.com>
Date: Tue, 29 Apr 2025 14:31:01 +0800
Subject: [PATCH 09/53] =?UTF-8?q?=E4=BF=AE=E6=94=B9SQL=E5=8F=8A=E5=85=A5?=
 =?UTF-8?q?=E5=8F=82=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/db/changelog/202504082211.sql        | 2 +-
 main/xiaozhi-server/core/providers/tts/doubao.py            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/manager-api/src/main/resources/db/changelog/202504082211.sql b/main/manager-api/src/main/resources/db/changelog/202504082211.sql
index 91ce33ff..08e5dc5f 100644
--- a/main/manager-api/src/main/resources/db/changelog/202504082211.sql
+++ b/main/manager-api/src/main/resources/db/changelog/202504082211.sql
@@ -25,7 +25,7 @@ INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `f
 
 -- TTS模型供应器
 ('SYSTEM_TTS_edge', 'TTS', 'edge', 'Edge TTS', '[{"key":"voice","label":"音色","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"}]', 1, 1, NOW(), 1, NOW()),
-('SYSTEM_TTS_doubao', 'TTS', 'doubao', '火山引擎TTS', '[{"key":"api_url","label":"API地址","type":"string"},{"key":"voice","label":"音色","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"},{"key":"authorization","label":"授权","type":"string"},{"key":"appid","label":"应用ID","type":"string"},{"key":"access_token","label":"访问令牌","type":"string"},{"key":"cluster","label":"集群","type":"string"}]', 2, 1, NOW(), 1, NOW()),
+('SYSTEM_TTS_doubao', 'TTS', 'doubao', '火山引擎TTS', '[{"key": "api_url","label": "API地址","type": "string"},{"key": "voice","label": "音色","type": "string"},{"key": "output_dir","label": "输出目录","type": "string"},{"key": "authorization","label": "授权","type": "string"},{"key": "appid","label": "应用ID","type": "string"},{"key": "access_token","label": "访问令牌","type": "string"},{"key": "cluster","label": "集群","type": "string"},{"key": "speed_ratio","label": "语速","type": "number"},{"key": "volume_ratio","label": "音量","type": "number"},{"key": "pitch_ratio","label": "音高","type": "number"}]', 2, 1, NOW(), 1, NOW()),
 ('SYSTEM_TTS_siliconflow', 'TTS', 'siliconflow', '硅基流动TTS', '[{"key":"model","label":"模型","type":"string"},{"key":"voice","label":"音色","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"},{"key":"access_token","label":"访问令牌","type":"string"},{"key":"response_format","label":"响应格式","type":"string"}]', 3, 1, NOW(), 1, NOW()),
 ('SYSTEM_TTS_cozecn', 'TTS', 'cozecn', 'COZECN TTS', '[{"key":"voice","label":"音色","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"},{"key":"access_token","label":"访问令牌","type":"string"},{"key":"response_format","label":"响应格式","type":"string"}]', 4, 1, NOW(), 1, NOW()),
 ('SYSTEM_TTS_fishspeech', 'TTS', 'fishspeech', 'FishSpeech TTS', '[{"key":"output_dir","label":"输出目录","type":"string"},{"key":"response_format","label":"响应格式","type":"string"},{"key":"reference_id","label":"参考ID","type":"string"},{"key":"reference_audio","label":"参考音频","type":"dict","dict_name":"reference_audio"},{"key":"reference_text","label":"参考文本","type":"dict","dict_name":"reference_text"},{"key":"normalize","label":"是否标准化","type":"boolean"},{"key":"max_new_tokens","label":"最大新令牌数","type":"number"},{"key":"chunk_length","label":"块长度","type":"number"},{"key":"top_p","label":"top_p值","type":"number"},{"key":"repetition_penalty","label":"重复惩罚","type":"number"},{"key":"temperature","label":"温度","type":"number"},{"key":"streaming","label":"是否流式","type":"boolean"},{"key":"use_memory_cache","label":"是否使用内存缓存","type":"string"},{"key":"seed","label":"种子","type":"number"},{"key":"channels","label":"通道数","type":"number"},{"key":"rate","label":"采样率","type":"number"},{"key":"api_key","label":"API密钥","type":"string"},{"key":"api_url","label":"API地址","type":"string"}]', 5, 1, NOW(), 1, NOW()),
diff --git a/main/xiaozhi-server/core/providers/tts/doubao.py b/main/xiaozhi-server/core/providers/tts/doubao.py
index f0aedc8e..1b6414c4 100644
--- a/main/xiaozhi-server/core/providers/tts/doubao.py
+++ b/main/xiaozhi-server/core/providers/tts/doubao.py
@@ -27,9 +27,9 @@ class TTSProvider(TTSProviderBase):
         else:
             self.voice = config.get("voice")
 
-        self.speed_ratio = config.get("speed_ratio") if config.get("speed_ratio") else 1.0
-        self.volume_ratio = config.get("volume_ratio") if config.get("volume_ratio") else 1.0
-        self.pitch_ratio = config.get("pitch_ratio") if config.get("pitch_ratio") else 1.0
+        self.speed_ratio = float(config.get("speed_ratio", 0.1))
+        self.volume_ratio = float(config.get("volume_ratio", 0.1))
+        self.pitch_ratio = float(config.get("pitch_ratio", 0.1))
 
         self.api_url = config.get("api_url")
         self.authorization = config.get("authorization")

From f1b4b337273ab16a00f0e6929c05e6600f62250a Mon Sep 17 00:00:00 2001
From: CGD <3030332422@qq.com>
Date: Tue, 29 Apr 2025 15:25:03 +0800
Subject: [PATCH 10/53] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0python=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E2=80=9C=E5=8A=A8=E6=80=81=E6=9B=B4=E6=96=B0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/core/connection.py        | 67 +++++++++++++++----
 main/xiaozhi-server/core/handle/textHandle.py |  2 +-
 2 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index 8a5f1ffd..9a59d388 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -216,26 +216,67 @@ class ConnectionHandler:
 
     async def handle_config_update(self, message):
         """处理配置更新请求"""
-        config_model = message.get("model")
-        new_content = message.get("content")
+        content = message.get("content", {})
+        secret = content.pop("secret", None)
+        new_config = content
 
-        # 打印更新前的配置
-        old_value = self.config.get(config_model)
-        self.logger.bind(tag=TAG).info(f"配置更新: {config_model} 从 {old_value} 更新为 {new_content}")
+        # 密钥验证
+        if secret != "43c716ae-37c4-49ba-84ab-2f0fbfcd7115":
+            self.logger.bind(tag=TAG).warning("配置更新请求的密钥不正确")
+            await self.websocket.send(json.dumps({
+                "type": "config_update_response",
+                "status": "error",
+                "message": "密钥不正确"
+            }))
+            return
 
-        # 更新配置
-        self.config[config_model] = new_content
+        # 遍历所有支持的配置模块
+        updated_modules = []
+        for config_model in ["tts", "llm", "vad", "asr", "memory", "intent"]:
+            if config_model not in new_config:
+                continue
 
-        # 如果是模型相关配置，重新初始化模型
-        if config_model in ["LLM", "TTS", "ASR", "VAD", "Intent", "Memory"]:
-            self._initialize_components(self.config)
-            self.logger.bind(tag=TAG).info(f"已使用新配置重新初始化 {config_model} 模块")
+            new_content = new_config[config_model]
+            old_content = self.config.get(config_model, {})
 
-        # 返回更新确认
+            # 记录配置变更
+            self.logger.bind(tag=TAG).info(
+                f"配置更新: {config_model} 旧值: {json.dumps(old_content, ensure_ascii=False)} "
+                f"新值: {json.dumps(new_content, ensure_ascii=False)}"
+            )
+
+            # 深度合并配置
+            if isinstance(old_content, dict) and isinstance(new_content, dict):
+                merged = {**old_content, **new_content}
+                self.config[config_model] = merged
+            else:
+                self.config[config_model] = new_content
+
+            # 标记需要重新初始化的模块
+            if config_model in ["llm", "tts", "asr", "vad", "intent", "memory"]:
+                updated_modules.append(config_model)
+
+        # 批量初始化模块
+        if updated_modules:
+            try:
+                self._initialize_components(self.config)
+                self.logger.bind(tag=TAG).info(
+                    f"已重新初始化模块: {', '.join(updated_modules)}"
+                )
+            except Exception as e:
+                self.logger.bind(tag=TAG).error(f"模块初始化失败: {str(e)}")
+                await self.websocket.send(json.dumps({
+                    "type": "config_update_response",
+                    "status": "error",
+                    "message": f"模块初始化失败: {str(e)}"
+                }))
+                return
+
+        # 返回成功响应
         await self.websocket.send(json.dumps({
             "type": "config_update_response",
             "status": "success",
-            "message": f"{config_model} 配置已更新"
+            "message": f"已更新配置: {', '.join(updated_modules)}"
         }))
 
     def _initialize_components(self, private_config):
diff --git a/main/xiaozhi-server/core/handle/textHandle.py b/main/xiaozhi-server/core/handle/textHandle.py
index f65d436a..f0683d59 100644
--- a/main/xiaozhi-server/core/handle/textHandle.py
+++ b/main/xiaozhi-server/core/handle/textHandle.py
@@ -62,7 +62,7 @@ async def handleTextMessage(conn, message):
             if "states" in msg_json:
                 asyncio.create_task(handleIotStatus(conn, msg_json["states"]))
         elif msg_json["type"] == "server":
-            if "model" in msg_json:
+            if msg_json["action"] == "update_config":
                 await conn.handle_config_update(msg_json)
     except json.JSONDecodeError:
         await conn.websocket.send(message)

From b0262cfe72e6f4416629314408b5816155137923 Mon Sep 17 00:00:00 2001
From: Sakura-RanChen <1908198662@qq.com>
Date: Tue, 29 Apr 2025 17:14:53 +0800
Subject: [PATCH 11/53] =?UTF-8?q?update:=E4=BC=98=E5=8C=96=E5=90=9E?=
 =?UTF-8?q?=E9=9F=B3=E9=97=AE=E9=A2=98=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E9=95=BF=E9=9F=B3=E9=A2=91=E6=97=B6=E7=9A=84=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=80=80=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/core/connection.py        | 10 +++++--
 .../core/handle/sendAudioHandle.py            | 28 +++++++++++++------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index 3cf6b018..c9e984f2 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -202,12 +202,16 @@ class ConnectionHandler:
         finally:
             await self.close(ws)
 
+    async def reset_timeout(self):
+        """重置超时计时器"""
+        if self.timeout_task:
+            self.timeout_task.cancel()
+        self.timeout_task = asyncio.create_task(self._check_timeout())
+
     async def _route_message(self, message):
         """消息路由"""
         # 重置超时计时器
-        if self.timeout_task:
-            self.timeout_task.cancel()
-            self.timeout_task = asyncio.create_task(self._check_timeout())
+        await self.reset_timeout()
 
         if isinstance(message, str):
             await handleTextMessage(self, message)
diff --git a/main/xiaozhi-server/core/handle/sendAudioHandle.py b/main/xiaozhi-server/core/handle/sendAudioHandle.py
index ec29a9fd..1d4da583 100644
--- a/main/xiaozhi-server/core/handle/sendAudioHandle.py
+++ b/main/xiaozhi-server/core/handle/sendAudioHandle.py
@@ -51,8 +51,8 @@ async def sendAudioMessage(conn, audios, text, text_index=0):
         logger.bind(tag=TAG).info(f"发送第一段语音: {text}")
     await send_tts_message(conn, "sentence_start", text)
 
-    # 播放音频
-    await sendAudio(conn, audios)
+    is_first_audio = (text_index == conn.tts_first_text_index)
+    await sendAudio(conn, audios, pre_buffer=is_first_audio)
 
     await send_tts_message(conn, "sentence_end", text)
 
@@ -64,22 +64,32 @@ async def sendAudioMessage(conn, audios, text, text_index=0):
 
 
 # 播放音频
-async def sendAudio(conn, audios):
+async def sendAudio(conn, audios, pre_buffer=True):
     # 流控参数优化
     frame_duration = 60  # 帧时长（毫秒），匹配 Opus 编码
     start_time = time.perf_counter()
     play_position = 0
+    last_reset_time = time.perf_counter()  # 记录最后的重置时间
 
-    # 预缓冲：发送前 3 帧
-    pre_buffer = min(3, len(audios))
-    for i in range(pre_buffer):
-        await conn.websocket.send(audios[i])
+    # 仅当第一句话时执行预缓冲
+    if pre_buffer:
+        pre_buffer_frames = min(3, len(audios))
+        for i in range(pre_buffer_frames):
+            await conn.websocket.send(audios[i])
+        remaining_audios = audios[pre_buffer_frames:]
+    else:
+        remaining_audios = audios
 
-    # 正常播放剩余帧
-    for opus_packet in audios[pre_buffer:]:
+    # 播放剩余音频帧
+    for opus_packet in remaining_audios:
         if conn.client_abort:
             return
 
+        # 每分钟重置一次计时器
+        if time.perf_counter() - last_reset_time > 60:
+            await conn.reset_timeout()
+            last_reset_time = time.perf_counter()
+
         # 计算预期发送时间
         expected_time = start_time + (play_position / 1000)
         current_time = time.perf_counter()

From 30708a59f1815c04e005ee8beeba6ee53f5971ba Mon Sep 17 00:00:00 2001
From: goodyhao <865700600@qq.com>
Date: Tue, 29 Apr 2025 17:23:48 +0800
Subject: [PATCH 12/53] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0server=E9=80=9A?=
 =?UTF-8?q?=E7=94=A8secret=E8=BF=87=E6=BB=A4=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/controller/ConfigController.java   |  21 +---
 .../modules/security/config/ShiroConfig.java  |  25 +++--
 .../security/secret/ServerSecretFilter.java   | 105 ++++++++++++++++++
 .../security/secret/ServerSecretToken.java    |  25 +++++
 .../modules/sys/dto/ConfigSecretDTO.java      |  13 ---
 .../config/manage_api_client.py               |   4 +-
 6 files changed, 149 insertions(+), 44 deletions(-)
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/security/secret/ServerSecretFilter.java
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/security/secret/ServerSecretToken.java
 delete mode 100644 main/manager-api/src/main/java/xiaozhi/modules/sys/dto/ConfigSecretDTO.java

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/config/controller/ConfigController.java b/main/manager-api/src/main/java/xiaozhi/modules/config/controller/ConfigController.java
index bdbd20ed..13106869 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/config/controller/ConfigController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/config/controller/ConfigController.java
@@ -1,6 +1,6 @@
 package xiaozhi.modules.config.controller;
 
-import org.apache.commons.lang3.StringUtils;
+import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -9,13 +9,10 @@ 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;
 
 /**
@@ -33,29 +30,17 @@ public class ConfigController {
 
     @PostMapping("server-base")
     @Operation(summary = "获取配置")
-    public Result<Object> getConfig(@RequestBody ConfigSecretDTO dto) {
-        // 效验数据
-        ValidatorUtils.validateEntity(dto);
-        checkSecret(dto.getSecret());
+    public Result<Object> getConfig() {
         Object config = configService.getConfig(true);
         return new Result<Object>().ok(config);
     }
 
     @PostMapping("agent-models")
     @Operation(summary = "获取智能体模型")
-    public Result<Object> getAgentModels(@RequestBody AgentModelsDTO dto) {
+    public Result<Object> getAgentModels(@Valid @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("密钥错误");
-        }
-    }
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java b/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
index 6e68ce06..62e192b7 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
@@ -1,9 +1,6 @@
 package xiaozhi.modules.security.config;
 
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
+import jakarta.servlet.Filter;
 import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.session.mgt.SessionManager;
 import org.apache.shiro.spring.LifecycleBeanPostProcessor;
@@ -14,10 +11,14 @@ import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-
-import jakarta.servlet.Filter;
 import xiaozhi.modules.security.oauth2.Oauth2Filter;
 import xiaozhi.modules.security.oauth2.Oauth2Realm;
+import xiaozhi.modules.security.secret.ServerSecretFilter;
+import xiaozhi.modules.sys.service.SysParamsService;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 /**
  * Shiro的配置文件
@@ -46,7 +47,7 @@ public class ShiroConfig {
     }
 
     @Bean("shiroFilter")
-    public ShiroFilterFactoryBean shirFilter(SecurityManager securityManager) {
+    public ShiroFilterFactoryBean shirFilter(SecurityManager securityManager, SysParamsService sysParamsService) {
         ShiroFilterConfiguration config = new ShiroFilterConfiguration();
         config.setFilterOncePerRequest(true);
 
@@ -54,9 +55,11 @@ public class ShiroConfig {
         shiroFilter.setSecurityManager(securityManager);
         shiroFilter.setShiroFilterConfiguration(config);
 
-        // oauth过滤
         Map<String, Filter> filters = new HashMap<>();
+        // oauth过滤
         filters.put("oauth2", new Oauth2Filter());
+        // 服务密钥过滤
+        filters.put("server", new ServerSecretFilter(sysParamsService));
         shiroFilter.setFilters(filters);
 
         // 添加Shiro的内置过滤器
@@ -79,8 +82,8 @@ public class ShiroConfig {
         filterMap.put("/user/login", "anon");
         filterMap.put("/user/pub-config", "anon");
         filterMap.put("/user/register", "anon");
-        filterMap.put("/config/server-base", "anon");
-        filterMap.put("/config/agent-models", "anon");
+        // 将config路径使用server服务过滤器
+        filterMap.put("/config/**", "server");
         filterMap.put("/**", "oauth2");
         shiroFilter.setFilterChainDefinitionMap(filterMap);
 
@@ -98,4 +101,4 @@ public class ShiroConfig {
         advisor.setSecurityManager(securityManager);
         return advisor;
     }
-}
\ No newline at end of file
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/secret/ServerSecretFilter.java b/main/manager-api/src/main/java/xiaozhi/modules/security/secret/ServerSecretFilter.java
new file mode 100644
index 00000000..b33ce23d
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/security/secret/ServerSecretFilter.java
@@ -0,0 +1,105 @@
+package xiaozhi.modules.security.secret;
+
+import java.io.IOException;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.web.filter.authc.AuthenticatingFilter;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import xiaozhi.common.constant.Constant;
+import xiaozhi.common.exception.ErrorCode;
+import xiaozhi.common.utils.HttpContextUtils;
+import xiaozhi.common.utils.JsonUtils;
+import xiaozhi.common.utils.Result;
+import xiaozhi.modules.sys.service.SysParamsService;
+
+/**
+ * Config API 过滤器
+ */
+@Slf4j
+@RequiredArgsConstructor
+public class ServerSecretFilter extends AuthenticatingFilter {
+    private final SysParamsService sysParamsService;
+
+    @Override
+    protected ServerSecretToken createToken(ServletRequest request, ServletResponse response) {
+        // 获取请求token
+        String token = getRequestToken((HttpServletRequest) request);
+
+        if (StringUtils.isBlank(token)) {
+            log.warn("createToken:token is empty");
+            return null;
+        }
+
+        return new ServerSecretToken(token);
+    }
+
+    @Override
+    protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
+        // 对OPTIONS请求放行
+        if (((HttpServletRequest) request).getMethod().equals(RequestMethod.OPTIONS.name())) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    protected boolean onAccessDenied(ServletRequest servletRequest, ServletResponse servletResponse) throws Exception {
+        // 获取token并校验
+        String token = getRequestToken((HttpServletRequest) servletRequest);
+        if (StringUtils.isBlank(token)) {
+            // token为空，返回401
+            this.sendUnauthorizedResponse((HttpServletResponse) servletResponse, "Authorization token不能为空");
+            return false;
+        }
+
+        // 验证token是否匹配
+        String serverSecret = getServerSecret();
+        if (StringUtils.isBlank(serverSecret) || !serverSecret.equals(token)) {
+            // token无效，返回401
+            this.sendUnauthorizedResponse((HttpServletResponse) servletResponse, "无效的Authorization token");
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * 发送未授权响应
+     */
+    private void sendUnauthorizedResponse(HttpServletResponse response, String message) {
+        response.setContentType("application/json;charset=utf-8");
+        response.setHeader("Access-Control-Allow-Credentials", "true");
+        response.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin());
+        
+        try {
+            String json = JsonUtils.toJsonString(new Result<Void>().error(ErrorCode.UNAUTHORIZED, message));
+            response.getWriter().print(json);
+        } catch (IOException e) {
+            log.error("响应输出失败", e);
+        }
+    }
+
+    /**
+     * 获取请求的token
+     */
+    private String getRequestToken(HttpServletRequest httpRequest) {
+        String token = null;
+        // 从header中获取token
+        String authorization = httpRequest.getHeader("Authorization");
+        if (StringUtils.isNotBlank(authorization) && authorization.startsWith("Bearer ")) {
+            token = authorization.replace("Bearer ", "");
+        }
+        return token;
+    }
+
+    private String getServerSecret() {
+        return sysParamsService.getValue(Constant.SERVER_SECRET, true);
+    }
+} 
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/secret/ServerSecretToken.java b/main/manager-api/src/main/java/xiaozhi/modules/security/secret/ServerSecretToken.java
new file mode 100644
index 00000000..9072eaf8
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/security/secret/ServerSecretToken.java
@@ -0,0 +1,25 @@
+package xiaozhi.modules.security.secret;
+
+import org.apache.shiro.authc.AuthenticationToken;
+
+/**
+ * Config API Token
+ */
+public class ServerSecretToken implements AuthenticationToken {
+    private static final long serialVersionUID = 1L;
+    private final String token;
+
+    public ServerSecretToken(String token) {
+        this.token = token;
+    }
+
+    @Override
+    public Object getPrincipal() {
+        return token;
+    }
+
+    @Override
+    public Object getCredentials() {
+        return token;
+    }
+} 
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/ConfigSecretDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/ConfigSecretDTO.java
deleted file mode 100644
index 8e4978f9..00000000
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/ConfigSecretDTO.java
+++ /dev/null
@@ -1,13 +0,0 @@
-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;
-}
\ No newline at end of file
diff --git a/main/xiaozhi-server/config/manage_api_client.py b/main/xiaozhi-server/config/manage_api_client.py
index 1f583857..770cbf56 100644
--- a/main/xiaozhi-server/config/manage_api_client.py
+++ b/main/xiaozhi-server/config/manage_api_client.py
@@ -53,6 +53,7 @@ class ManageApiClient:
             headers={
                 "User-Agent": f"PythonClient/2.0 (PID:{os.getpid()})",
                 "Accept": "application/json",
+                "Authorization": "Bearer " + cls._secret
             },
             timeout=cls.config.get("timeout", 30),  # 默认超时时间30秒
         )
@@ -126,7 +127,7 @@ class ManageApiClient:
 def get_server_config() -> Optional[Dict]:
     """获取服务器基础配置"""
     return ManageApiClient._instance._execute_request(
-        "POST", "/config/server-base", json={"secret": ManageApiClient._secret}
+        "POST", "/config/server-base"
     )
 
 
@@ -138,7 +139,6 @@ def get_agent_models(
         "POST",
         "/config/agent-models",
         json={
-            "secret": ManageApiClient._secret,
             "macAddress": mac_address,
             "clientId": client_id,
             "selectedModule": selected_module,

From ef662e0ccfbde3cb06f7e078e6904a91bd9e87b1 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Tue, 29 Apr 2025 18:04:31 +0800
Subject: [PATCH 13/53] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E6=99=BA=E6=8E=A7?=
 =?UTF-8?q?=E5=8F=B0=E6=A8=A1=E5=9E=8B=E9=85=8D=E7=BD=AE=E5=90=84=E4=B8=AA?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=9A=84=E4=BD=BF=E7=94=A8=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/db/changelog/202504082211.sql   |   1 -
 .../resources/db/changelog/202504112044.sql   |   1 -
 .../resources/db/changelog/202504291043.sql   | 504 ++++++++++++++++++
 .../db/changelog/db.changelog-master.yaml     |   9 +-
 main/xiaozhi-server/config.yaml               |  22 +-
 .../core/providers/asr/sherpa_onnx_local.py   |  27 +-
 6 files changed, 542 insertions(+), 22 deletions(-)
 create mode 100644 main/manager-api/src/main/resources/db/changelog/202504291043.sql

diff --git a/main/manager-api/src/main/resources/db/changelog/202504082211.sql b/main/manager-api/src/main/resources/db/changelog/202504082211.sql
index 5aa75bef..91ce33ff 100644
--- a/main/manager-api/src/main/resources/db/changelog/202504082211.sql
+++ b/main/manager-api/src/main/resources/db/changelog/202504082211.sql
@@ -10,7 +10,6 @@ INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `f
 ('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()),
-('SYSTEM_ASR_FunASRServer', 'ASR', 'fun_server', 'FunASR服务语音识别', '[{"key":"host","label":"服务地址","type":"string"},{"key":"port","label":"端口号","type":"number"}]', 4, 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()),
diff --git a/main/manager-api/src/main/resources/db/changelog/202504112044.sql b/main/manager-api/src/main/resources/db/changelog/202504112044.sql
index 3609d235..9fd2257d 100644
--- a/main/manager-api/src/main/resources/db/changelog/202504112044.sql
+++ b/main/manager-api/src/main/resources/db/changelog/202504112044.sql
@@ -11,7 +11,6 @@ INSERT INTO `ai_model_config` VALUES ('ASR_FunASR', 'ASR', 'FunASR', 'FunASR语
 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);
-INSERT INTO `ai_model_config` VALUES ('ASR_FunASRServer', 'ASR', 'FunASRServer', 'FunASR服务语音识别', 0, 1, '{\"type\": \"fun_server\", \"host\": \"127.0.0.1\", \"port\": 10096}', NULL, NULL, 5, NULL, NULL, NULL, NULL);
 
 -- LLM模型配置
 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);
diff --git a/main/manager-api/src/main/resources/db/changelog/202504291043.sql b/main/manager-api/src/main/resources/db/changelog/202504291043.sql
new file mode 100644
index 00000000..555b8cf4
--- /dev/null
+++ b/main/manager-api/src/main/resources/db/changelog/202504291043.sql
@@ -0,0 +1,504 @@
+-- 增加FunASR服务语音识别模型供应器和配置
+DELETE FROM `ai_model_provider` WHERE `id` = 'SYSTEM_ASR_FunASRServer';
+INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `fields`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES
+('SYSTEM_ASR_FunASRServer', 'ASR', 'fun_server', 'FunASR服务语音识别', '[{"key":"host","label":"服务地址","type":"string"},{"key":"port","label":"端口号","type":"number"}]', 4, 1, NOW(), 1, NOW());
+
+DELETE FROM `ai_model_config` WHERE `id` = 'ASR_FunASRServer';
+INSERT INTO `ai_model_config` VALUES ('ASR_FunASRServer', 'ASR', 'FunASRServer', 'FunASR服务语音识别', 0, 1, '{\"type\": \"fun_server\", \"host\": \"127.0.0.1\", \"port\": 10096}', NULL, NULL, 5, NULL, NULL, NULL, NULL);
+
+-- 修改ai_model_config表的remark字段类型为TEXT
+ALTER TABLE `ai_model_config` MODIFY COLUMN `remark` TEXT COMMENT '备注'; 
+
+-- 更新ASR模型配置的说明文档
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://github.com/modelscope/FunASR/blob/main/runtime/docs/SDK_advanced_guide_online_zh.md',
+`remark` = '独立部署FunASR，使用FunASR的API服务，只需要五句话
+第一句：mkdir -p ./funasr-runtime-resources/models
+第二句：sudo docker run -d -p 10096:10095 --privileged=true -v $PWD/funasr-runtime-resources/models:/workspace/models registry.cn-hangzhou.aliyuncs.com/funasr_repo/funasr:funasr-runtime-sdk-online-cpu-0.1.12
+上一句话执行后会进入到容器，继续第三句：cd FunASR/runtime
+不要退出容器，继续在容器中执行第四句：nohup bash run_server_2pass.sh --download-model-dir /workspace/models --vad-dir damo/speech_fsmn_vad_zh-cn-16k-common-onnx --model-dir damo/speech_paraformer-large-vad-punc_asr_nat-zh-cn-16k-common-vocab8404-onnx  --online-model-dir damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-online-onnx  --punc-dir damo/punc_ct-transformer_zh-cn-common-vad_realtime-vocab272727-onnx --lm-dir damo/speech_ngram_lm_zh-cn-ai-wesp-fst --itn-dir thuduj12/fst_itn_zh --hotword /workspace/models/hotwords.txt > log.txt 2>&1 &
+上一句话执行后会进入到容器，继续第五句：tail -f log.txt
+第五句话执行完后，会看到模型下载日志，下载完后就可以连接使用了
+以上是使用CPU推理，如果有GPU，详细参考：https://github.com/modelscope/FunASR/blob/main/runtime/docs/SDK_advanced_guide_online_zh.md' WHERE `id` = 'ASR_FunASRServer';
+
+-- 更新FunASR本地模型配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://github.com/modelscope/FunASR',
+`remark` = 'FunASR本地模型配置说明：
+1. 需要下载模型文件到xiaozhi-server/models/SenseVoiceSmall目录
+2. 支持中日韩粤语音识别
+3. 本地推理，无需网络连接
+4. 待识别文件保存在tmp/目录' WHERE `id` = 'ASR_FunASR';
+
+-- 更新SherpaASR配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://github.com/k2-fsa/sherpa-onnx',
+`remark` = 'SherpaASR配置说明：
+1. 运行时自动下载模型文件到models/sherpa-onnx-sense-voice-zh-en-ja-ko-yue-2024-07-17目录
+2. 支持中文、英文、日语、韩语、粤语等多种语言
+3. 本地推理，无需网络连接
+4. 输出文件保存在tmp/目录' WHERE `id` = 'ASR_SherpaASR';
+
+-- 更新豆包ASR配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://console.volcengine.com/speech/app',
+`remark` = '豆包ASR配置说明：
+1. 需要在火山引擎控制台创建应用并获取appid和access_token
+2. 支持中文语音识别
+3. 需要网络连接
+4. 输出文件保存在tmp/目录
+申请步骤：
+1. 访问 https://console.volcengine.com/speech/app
+2. 创建新应用
+3. 获取appid和access_token
+4. 填入配置文件中' WHERE `id` = 'ASR_DoubaoASR';
+
+-- 更新腾讯ASR配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://console.cloud.tencent.com/cam/capi',
+`remark` = '腾讯ASR配置说明：
+1. 需要在腾讯云控制台创建应用并获取appid、secret_id和secret_key
+2. 支持中文语音识别
+3. 需要网络连接
+4. 输出文件保存在tmp/目录
+申请步骤：
+1. 访问 https://console.cloud.tencent.com/cam/capi 获取密钥
+2. 访问 https://console.cloud.tencent.com/asr/resourcebundle 领取免费资源
+3. 获取appid、secret_id和secret_key
+4. 填入配置文件中' WHERE `id` = 'ASR_TencentASR';
+
+-- 更新TTS模型配置说明
+-- EdgeTTS配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://github.com/rany2/edge-tts',
+`remark` = 'EdgeTTS配置说明：
+1. 使用微软Edge TTS服务
+2. 支持多种语言和音色
+3. 免费使用，无需注册
+4. 需要网络连接
+5. 输出文件保存在tmp/目录' WHERE `id` = 'TTS_EdgeTTS';
+
+-- 豆包TTS配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://console.volcengine.com/speech/service/8',
+`remark` = '豆包TTS配置说明：
+1. 访问 https://console.volcengine.com/speech/service/8
+2. 需要在火山引擎控制台创建应用并获取appid和access_token
+3. 山引擎语音一定要购买花钱，起步价30元，就有100并发了。如果用免费的只有2个并发，会经常报tts错误
+4. 购买服务后，购买免费的音色后，可能要等半小时左右，才能使用。
+5. 填入配置文件中' WHERE `id` = 'TTS_DoubaoTTS';
+
+-- 硅基流动TTS配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://cloud.siliconflow.cn/account/ak',
+`remark` = '硅基流动TTS配置说明：
+1. 访问 https://cloud.siliconflow.cn/account/ak
+2. 注册并获取API密钥
+3. 填入配置文件中' WHERE `id` = 'TTS_CosyVoiceSiliconflow';
+
+-- Coze中文TTS配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://www.coze.cn/open/oauth/pats',
+`remark` = 'Coze中文TTS配置说明：
+1. 访问 https://www.coze.cn/open/oauth/pats
+2. 获取个人令牌
+3. 填入配置文件中' WHERE `id` = 'TTS_CozeCnTTS';
+
+-- FishSpeech配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://github.com/fishaudio/fish-speech',
+`remark` = 'FishSpeech配置说明：
+1. 需要本地部署FishSpeech服务
+2. 支持自定义音色
+3. 本地推理，无需网络连接
+4. 输出文件保存在tmp/目录
+5. 运行服务示例命令：python -m tools.api_server --listen 0.0.0.0:8080 --llama-checkpoint-path "checkpoints/fish-speech-1.5" --decoder-checkpoint-path "checkpoints/fish-speech-1.5/firefly-gan-vq-fsq-8x1024-21hz-generator.pth" --decoder-config-name firefly_gan_vq --compile' WHERE `id` = 'TTS_FishSpeech';
+
+-- GPT-SoVITS V2配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://github.com/RVC-Boss/GPT-SoVITS',
+`remark` = 'GPT-SoVITS V2配置说明：
+1. 需要本地部署GPT-SoVITS服务
+2. 支持自定义音色克隆
+3. 本地推理，无需网络连接
+4. 输出文件保存在tmp/目录
+部署步骤：
+1. 运行服务示例命令：python api_v2.py -a 127.0.0.1 -p 9880 -c GPT_SoVITS/configs/demo.yaml' WHERE `id` = 'TTS_GPT_SOVITS_V2';
+
+-- GPT-SoVITS V3配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://github.com/RVC-Boss/GPT-SoVITS',
+`remark` = 'GPT-SoVITS V3配置说明：
+1. 需要本地部署GPT-SoVITS V3服务
+2. 支持自定义音色克隆
+3. 本地推理，无需网络连接
+4. 输出文件保存在tmp/目录' WHERE `id` = 'TTS_GPT_SOVITS_V3';
+
+-- MiniMax TTS配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://platform.minimaxi.com/',
+`remark` = 'MiniMax TTS配置说明：
+1. 需要在MiniMax平台创建账户并充值
+2. 支持多种音色，当前配置使用female-shaonv
+3. 需要网络连接
+4. 输出文件保存在tmp/目录
+申请步骤：
+1. 访问 https://platform.minimaxi.com/ 注册账号
+2. 访问 https://platform.minimaxi.com/user-center/payment/balance 充值
+3. 访问 https://platform.minimaxi.com/user-center/basic-information 获取group_id
+4. 访问 https://platform.minimaxi.com/user-center/basic-information/interface-key 获取api_key
+5. 填入配置文件中' WHERE `id` = 'TTS_MinimaxTTS';
+
+-- 阿里云TTS配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://nls-portal.console.aliyun.com/',
+`remark` = '阿里云TTS配置说明：
+1. 需要在阿里云平台开通智能语音交互服务
+2. 支持多种音色，当前配置使用xiaoyun
+3. 需要网络连接
+4. 输出文件保存在tmp/目录
+申请步骤：
+1. 访问 https://nls-portal.console.aliyun.com/ 开通服务
+2. 访问 https://nls-portal.console.aliyun.com/applist 获取appkey
+3. 访问 https://nls-portal.console.aliyun.com/overview 获取token
+4. 填入配置文件中
+注意：token是临时的24小时有效，长期使用需要配置access_key_id和access_key_secret' WHERE `id` = 'TTS_AliyunTTS';
+
+-- 腾讯TTS配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://console.cloud.tencent.com/cam/capi',
+`remark` = '腾讯TTS配置说明：
+1. 需要在腾讯云平台开通智能语音交互服务
+2. 支持多种音色，当前配置使用101001
+3. 需要网络连接
+4. 输出文件保存在tmp/目录
+申请步骤：
+1. 访问 https://console.cloud.tencent.com/cam/capi 获取密钥
+2. 访问 https://console.cloud.tencent.com/tts/resourcebundle 领取免费资源
+3. 创建新应用
+4. 获取appid、secret_id和secret_key
+5. 填入配置文件中' WHERE `id` = 'TTS_TencentTTS';
+
+-- 302AI TTS配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://dash.302.ai/',
+`remark` = '302AI TTS配置说明：
+1. 需要在302平台创建账户并获取API密钥
+2. 支持多种音色，当前配置使用湾湾小何音色
+3. 需要网络连接
+4. 输出文件保存在tmp/目录
+申请步骤：
+1. 访问 https://dash.302.ai/ 注册账号
+2. 访问 https://dash.302.ai/apis/list 获取API密钥
+3. 填入配置文件中
+价格：$35/百万字符' WHERE `id` = 'TTS_TTS302AI';
+
+-- 机智云TTS配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://agentrouter.gizwitsapi.com/panel/token',
+`remark` = '机智云TTS配置说明：
+1. 需要在机智云平台获取API密钥
+2. 支持多种音色，当前配置使用湾湾小何音色
+3. 需要网络连接
+4. 输出文件保存在tmp/目录
+申请步骤：
+1. 访问 https://agentrouter.gizwitsapi.com/panel/token 获取API密钥
+2. 填入配置文件中
+注意：前一万名注册的用户，将送5元体验金额' WHERE `id` = 'TTS_GizwitsTTS';
+
+-- ACGN TTS配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://acgn.ttson.cn/',
+`remark` = 'ACGN TTS配置说明：
+1. 需要在ttson平台购买token
+2. 支持多种角色音色，当前配置使用角色ID：1695
+3. 需要网络连接
+4. 输出文件保存在tmp/目录
+申请步骤：
+1. 访问 https://acgn.ttson.cn/ 查看角色列表
+2. 访问 www.ttson.cn 购买token
+3. 填入配置文件中
+开发相关疑问请提交至网站上的qq' WHERE `id` = 'TTS_ACGNTTS';
+
+-- OpenAI TTS配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://platform.openai.com/api-keys',
+`remark` = 'OpenAI TTS配置说明：
+1. 需要在OpenAI平台获取API密钥
+2. 支持多种音色，当前配置使用onyx
+3. 需要网络连接
+4. 输出文件保存在tmp/目录
+申请步骤：
+1. 访问 https://platform.openai.com/api-keys 获取API密钥
+2. 填入配置文件中
+注意：国内需要使用代理访问' WHERE `id` = 'TTS_OpenAITTS';
+
+-- 自定义TTS配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = NULL,
+`remark` = '自定义TTS配置说明：
+1. 支持自定义TTS接口服务
+2. 使用GET方式请求
+3. 需要网络连接
+4. 输出文件保存在tmp/目录
+配置说明：
+1. 在params中配置请求参数
+2. 在headers中配置请求头
+3. 设置返回音频格式' WHERE `id` = 'TTS_CustomTTS';
+
+-- 火山引擎边缘大模型网关TTS配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://console.volcengine.com/vei/aigateway/',
+`remark` = '火山引擎边缘大模型网关TTS配置说明：
+1. 访问 https://console.volcengine.com/vei/aigateway/
+2. 创建网关访问密钥，搜索并勾选 Doubao-语音合成
+3. 如果需要使用LLM，一并勾选 Doubao-pro-32k-functioncall
+4. 访问 https://console.volcengine.com/vei/aigateway/tokens-list 获取密钥
+5. 填入配置文件中
+音色列表参考：https://www.volcengine.com/docs/6561/1257544' WHERE `id` = 'TTS_VolcesAiGatewayTTS';
+
+-- 更新LLM模型配置说明
+-- ChatGLM配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://bigmodel.cn/usercenter/proj-mgmt/apikeys',
+`remark` = 'ChatGLM配置说明：
+1. 访问 https://bigmodel.cn/usercenter/proj-mgmt/apikeys
+2. 注册并获取API密钥
+3. 填入配置文件中' WHERE `id` = 'LLM_ChatGLMLLM';
+
+-- Ollama配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://ollama.com/',
+`remark` = 'Ollama配置说明：
+1. 安装Ollama服务
+2. 运行命令：ollama pull qwen2.5
+3. 确保服务运行在http://localhost:11434' WHERE `id` = 'LLM_OllamaLLM';
+
+-- 通义千问配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://bailian.console.aliyun.com/?apiKey=1#/api-key',
+`remark` = '通义千问配置说明：
+1. 访问 https://bailian.console.aliyun.com/?apiKey=1#/api-key
+2. 获取API密钥
+3. 填入配置文件中，当前配置使用qwen-turbo模型
+4. 支持自定义参数：temperature=0.7, max_tokens=500, top_p=1, top_k=50' WHERE `id` = 'LLM_AliLLM';
+
+-- 通义百炼配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://bailian.console.aliyun.com/?apiKey=1#/api-key',
+`remark` = '通义百炼配置说明：
+1. 访问 https://bailian.console.aliyun.com/?apiKey=1#/api-key
+2. 获取app_id和api_key
+3. 填入配置文件中' WHERE `id` = 'LLM_AliAppLLM';
+
+-- 豆包大模型配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://console.volcengine.com/ark/region:ark+cn-beijing/openManagement',
+`remark` = '豆包大模型配置说明：
+1. 访问 https://console.volcengine.com/ark/region:ark+cn-beijing/openManagement
+2. 开通Doubao-1.5-pro服务
+3. 访问 https://console.volcengine.com/ark/region:ark+cn-beijing/apiKey 获取API密钥
+4. 填入配置文件中
+5. 当前建议使用doubao-1-5-pro-32k-250115
+注意：有免费额度500000token' WHERE `id` = 'LLM_DoubaoLLM';
+
+-- DeepSeek配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://platform.deepseek.com/',
+`remark` = 'DeepSeek配置说明：
+1. 访问 https://platform.deepseek.com/
+2. 注册并获取API密钥
+3. 填入配置文件中' WHERE `id` = 'LLM_DeepSeekLLM';
+
+-- Dify配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://cloud.dify.ai/',
+`remark` = 'Dify配置说明：
+1. 访问 https://cloud.dify.ai/
+2. 注册并获取API密钥
+3. 填入配置文件中
+4. 支持多种对话模式：workflows/run, chat-messages, completion-messages
+5. 平台设置的角色定义会失效，需要在Dify控制台设置
+注意：建议使用本地部署的Dify接口，国内部分区域访问公有云接口可能受限' WHERE `id` = 'LLM_DifyLLM';
+
+-- Gemini配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://aistudio.google.com/apikey',
+`remark` = 'Gemini配置说明：
+1. 使用谷歌Gemini API服务
+2. 当前配置使用gemini-2.0-flash模型
+3. 需要网络连接
+4. 支持配置代理
+申请步骤：
+1. 访问 https://aistudio.google.com/apikey
+2. 创建API密钥
+3. 填入配置文件中
+注意：若在中国境内使用，请遵守《生成式人工智能服务管理暂行办法》' WHERE `id` = 'LLM_GeminiLLM';
+
+-- Coze配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://www.coze.cn/open/oauth/pats',
+`remark` = 'Coze配置说明：
+1. 使用Coze平台服务
+2. 需要bot_id、user_id和个人令牌
+3. 需要网络连接
+申请步骤：
+1. 访问 https://www.coze.cn/open/oauth/pats
+2. 获取个人令牌
+3. 手动计算bot_id和user_id
+4. 填入配置文件中' WHERE `id` = 'LLM_CozeLLM';
+
+-- LM Studio配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://lmstudio.ai/',
+`remark` = 'LM Studio配置说明：
+1. 使用本地部署的LM Studio服务
+2. 当前配置使用deepseek-r1-distill-llama-8b@q4_k_m模型
+3. 本地推理，无需网络连接
+4. 需要预先下载模型
+部署步骤：
+1. 安装LM Studio
+2. 从社区下载模型
+3. 确保服务运行在http://localhost:1234/v1' WHERE `id` = 'LLM_LMStudioLLM';
+
+-- FastGPT配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://cloud.tryfastgpt.ai/account/apikey',
+`remark` = 'FastGPT配置说明：
+1. 使用FastGPT平台服务
+2. 需要网络连接
+3. 配置文件中的prompt无效，需要在FastGPT控制台设置
+4. 支持自定义变量
+申请步骤：
+1. 访问 https://cloud.tryfastgpt.ai/account/apikey
+2. 获取API密钥
+3. 填入配置文件中' WHERE `id` = 'LLM_FastgptLLM';
+
+-- Xinference配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://github.com/xorbitsai/inference',
+`remark` = 'Xinference配置说明：
+1. 使用本地部署的Xinference服务
+2. 当前配置使用qwen2.5:72b-AWQ模型
+3. 本地推理，无需网络连接
+4. 需要预先启动对应模型
+部署步骤：
+1. 安装Xinference
+2. 启动服务并加载模型
+3. 确保服务运行在http://localhost:9997' WHERE `id` = 'LLM_XinferenceLLM';
+
+-- Xinference小模型配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://github.com/xorbitsai/inference',
+`remark` = 'Xinference小模型配置说明：
+1. 使用本地部署的Xinference服务
+2. 当前配置使用qwen2.5:3b-AWQ模型
+3. 本地推理，无需网络连接
+4. 用于意图识别
+部署步骤：
+1. 安装Xinference
+2. 启动服务并加载模型
+3. 确保服务运行在http://localhost:9997' WHERE `id` = 'LLM_XinferenceSmallLLM';
+
+-- 火山引擎边缘大模型网关LLM配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://console.volcengine.com/vei/aigateway/',
+`remark` = '火山引擎边缘大模型网关LLM配置说明：
+1. 使用火山引擎边缘大模型网关服务
+2. 需要网关访问密钥
+3. 需要网络连接
+4. 支持function_call功能
+申请步骤：
+1. 访问 https://console.volcengine.com/vei/aigateway/
+2. 创建网关访问密钥，搜索并勾选 Doubao-pro-32k-functioncall
+3. 如果需要使用语音合成，一并勾选 Doubao-语音合成
+4. 访问 https://console.volcengine.com/vei/aigateway/tokens-list 获取密钥
+5. 填入配置文件中' WHERE `id` = 'LLM_VolcesAiGatewayLLM';
+
+-- 更新Memory模型配置说明
+-- 无记忆配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = NULL,
+`remark` = '无记忆配置说明：
+1. 不保存对话历史
+2. 每次对话都是独立的
+3. 无需额外配置
+4. 适合对隐私要求高的场景' WHERE `id` = 'Memory_nomem';
+
+-- 本地短期记忆配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = NULL,
+`remark` = '本地短期记忆配置说明：
+1. 使用本地存储保存对话历史
+2. 通过selected_module的llm总结对话内容
+3. 数据保存在本地，不会上传到服务器
+4. 适合注重隐私的场景
+5. 无需额外配置' WHERE `id` = 'Memory_mem_local_short';
+
+-- Mem0AI记忆配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://app.mem0.ai/dashboard/api-keys',
+`remark` = 'Mem0AI记忆配置说明：
+1. 使用Mem0AI服务保存对话历史
+2. 需要API密钥
+3. 需要网络连接
+4. 每月有1000次免费调用
+申请步骤：
+1. 访问 https://app.mem0.ai/dashboard/api-keys
+2. 获取API密钥
+3. 填入配置文件中' WHERE `id` = 'Memory_mem0ai';
+
+-- 更新Intent模型配置说明
+-- 无意图识别配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = NULL,
+`remark` = '无意图识别配置说明：
+1. 不进行意图识别
+2. 所有对话直接传递给LLM处理
+3. 无需额外配置
+4. 适合简单对话场景' WHERE `id` = 'Intent_nointent';
+
+-- LLM意图识别配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = NULL,
+`remark` = 'LLM意图识别配置说明：
+1. 使用独立的LLM进行意图识别
+2. 默认使用selected_module.LLM的模型
+3. 可以配置使用独立的LLM（如免费的ChatGLMLLM）
+4. 通用性强，但会增加处理时间
+5. 不支持控制音量大小等iot操作
+配置说明：
+1. 在llm字段中指定使用的LLM模型
+2. 如果不指定，则使用selected_module.LLM的模型' WHERE `id` = 'Intent_intent_llm';
+
+-- 函数调用意图识别配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = NULL,
+`remark` = '函数调用意图识别配置说明：
+1. 使用LLM的function_call功能进行意图识别
+2. 需要所选择的LLM支持function_call
+3. 按需调用工具，处理速度快
+4. 支持所有iot指令
+5. 默认已加载以下功能：
+   - handle_exit_intent（退出识别）
+   - play_music（音乐播放）
+   - change_role（角色切换）
+   - get_weather（天气查询）
+   - get_news（新闻查询）
+配置说明：
+1. 在functions字段中配置需要加载的功能模块
+2. 系统默认已加载基础功能，无需重复配置
+3. 可以添加自定义功能模块' WHERE `id` = 'Intent_function_call';
+
+-- 更新VAD模型配置说明
+-- SileroVAD配置说明
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://github.com/snakers4/silero-vad',
+`remark` = 'SileroVAD配置说明：
+1. 使用SileroVAD模型进行语音活动检测
+2. 本地推理，无需网络连接
+3. 需要下载模型文件到models/snakers4_silero-vad目录
+4. 可配置参数：
+   - threshold: 0.5（语音检测阈值）
+   - min_silence_duration_ms: 700（最小静音持续时间，单位毫秒）
+5. 如果说话停顿比较长，可以适当增加min_silence_duration_ms的值' WHERE `id` = 'VAD_SileroVAD';
diff --git a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
index 1bbddb75..131aaf01 100755
--- a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -78,4 +78,11 @@ databaseChangeLog:
       changes:
         - sqlFile:
             encoding: utf8
-            path: classpath:db/changelog/202504251422.sql
\ No newline at end of file
+            path: classpath:db/changelog/202504251422.sql
+  - changeSet:
+      id: 202504291043
+      author: jiangkunyin
+      changes:
+        - sqlFile:
+            encoding: utf8
+            path: classpath:db/changelog/202504291043.sql
\ No newline at end of file
diff --git a/main/xiaozhi-server/config.yaml b/main/xiaozhi-server/config.yaml
index d18b23e9..21266333 100644
--- a/main/xiaozhi-server/config.yaml
+++ b/main/xiaozhi-server/config.yaml
@@ -210,8 +210,14 @@ ASR:
     model_dir: models/SenseVoiceSmall
     output_dir: tmp/
   FunASRServer:
-    # 支持FunASR服务，部署方法：https://github.com/modelscope/FunASR/blob/main/runtime/docs/SDK_advanced_guide_online_zh.md
-    # mode 预置 offline
+    # 独立部署FunASR，使用FunASR的API服务，只需要五句话
+    # 第一句：mkdir -p ./funasr-runtime-resources/models
+    # 第二句：sudo docker run -d -p 10096:10095 --privileged=true -v $PWD/funasr-runtime-resources/models:/workspace/models registry.cn-hangzhou.aliyuncs.com/funasr_repo/funasr:funasr-runtime-sdk-online-cpu-0.1.12
+    # 上一句话执行后会进入到容器，继续第三句：cd FunASR/runtime
+    # 不要退出容器，继续在容器中执行第四句：nohup bash run_server_2pass.sh --download-model-dir /workspace/models --vad-dir damo/speech_fsmn_vad_zh-cn-16k-common-onnx --model-dir damo/speech_paraformer-large-vad-punc_asr_nat-zh-cn-16k-common-vocab8404-onnx  --online-model-dir damo/speech_paraformer-large_asr_nat-zh-cn-16k-common-vocab8404-online-onnx  --punc-dir damo/punc_ct-transformer_zh-cn-common-vad_realtime-vocab272727-onnx --lm-dir damo/speech_ngram_lm_zh-cn-ai-wesp-fst --itn-dir thuduj12/fst_itn_zh --hotword /workspace/models/hotwords.txt > log.txt 2>&1 &
+    # 上一句话执行后会进入到容器，继续第五句：tail -f log.txt
+    # 第五句话执行完后，会看到模型下载日志，下载完后就可以连接使用了
+    # 以上是使用CPU推理，如果有GPU，详细参考：https://github.com/modelscope/FunASR/blob/main/runtime/docs/SDK_advanced_guide_online_zh.md
     type: fun_server
     host: 127.0.0.1
     port: 10096
@@ -272,12 +278,12 @@ LLM:
   DoubaoLLM:
     # 定义LLM API类型
     type: openai
-    # 先开通服务，打开以下网址，开通的服务搜索Doubao-pro-32k，开通它
+    # 先开通服务，打开以下网址，开通的服务搜索Doubao-1.5-pro，开通它
     # 开通改地址：https://console.volcengine.com/ark/region:ark+cn-beijing/openManagement?LLM=%7B%7D&OpenTokenDrawer=false
     # 免费额度500000token
     # 开通后，进入这里获取密钥：https://console.volcengine.com/ark/region:ark+cn-beijing/apiKey?apikey=%7B%7D
     base_url: https://ark.cn-beijing.volces.com/api/v3
-    model_name: doubao-pro-32k-functioncall-241028
+    model_name: doubao-1-5-pro-32k-250115
     api_key: 你的doubao web key
   DeepSeekLLM:
     # 定义LLM API类型
@@ -453,12 +459,12 @@ TTS:
   GPT_SOVITS_V2:
     # 定义TTS API类型
     #启动tts方法：
-    #python api_v2.py -a 127.0.0.1 -p 9880 -c GPT_SoVITS/configs/caixukun.yaml
+    #python api_v2.py -a 127.0.0.1 -p 9880 -c GPT_SoVITS/configs/demo.yaml
     type: gpt_sovits_v2
     url: "http://127.0.0.1:9880/tts"
     output_dir: tmp/
     text_lang: "auto"
-    ref_audio_path: "caixukun.wav"
+    ref_audio_path: "demo.wav"
     prompt_text: ""
     prompt_lang: "zh"
     top_k: 5
@@ -591,8 +597,8 @@ TTS:
   ACGNTTS:
     #在线网址：https://acgn.ttson.cn/
     #token购买：www.ttson.cn
-    #开发相关疑问请提交至3497689533@qq.com
-    #角色id获取地址：ctrl+f快速检索角色——网站管理者不允许发布,可询问网站管理者：1069379506
+    #开发相关疑问请提交至网站上的qq
+    #角色id获取地址：ctrl+f快速检索角色——网站管理者不允许发布,可询问网站管理者
     #各参数意义见开发文档：https://www.yuque.com/alexuh/skmti9/wm6taqislegb02gd?singleDoc#
     type: ttson
     token: your_token
diff --git a/main/xiaozhi-server/core/providers/asr/sherpa_onnx_local.py b/main/xiaozhi-server/core/providers/asr/sherpa_onnx_local.py
index b086022b..cfcbe83b 100644
--- a/main/xiaozhi-server/core/providers/asr/sherpa_onnx_local.py
+++ b/main/xiaozhi-server/core/providers/asr/sherpa_onnx_local.py
@@ -43,11 +43,11 @@ class ASRProvider(ASRProviderBase):
 
         # 确保输出目录存在
         os.makedirs(self.output_dir, exist_ok=True)
-        
+
         # 初始化模型文件路径
         model_files = {
             "model.int8.onnx": os.path.join(self.model_dir, "model.int8.onnx"),
-            "tokens.txt": os.path.join(self.model_dir, "tokens.txt")
+            "tokens.txt": os.path.join(self.model_dir, "tokens.txt"),
         }
 
         # 下载并检查模型文件
@@ -58,15 +58,15 @@ class ASRProvider(ASRProviderBase):
                     model_file_download(
                         model_id="pengzhendong/sherpa-onnx-sense-voice-zh-en-ja-ko-yue",
                         file_path=file_name,
-                        local_dir=self.model_dir
+                        local_dir=self.model_dir,
                     )
-                    
+
                     if not os.path.isfile(file_path):
                         raise FileNotFoundError(f"模型文件下载失败: {file_path}")
-                        
+
             self.model_path = model_files["model.int8.onnx"]
             self.tokens_path = model_files["tokens.txt"]
-            
+
         except Exception as e:
             logger.bind(tag=TAG).error(f"模型文件处理失败: {str(e)}")
             raise
@@ -83,7 +83,7 @@ class ASRProvider(ASRProviderBase):
                 use_itn=True,
             )
 
-    def save_audio_to_file(self, opus_data: List[bytes], session_id: str) -> str:
+    def save_audio_to_file(self, pcm_data: List[bytes], session_id: str) -> str:
         """PCM数据保存为WAV文件"""
         file_name = f"asr_{session_id}_{uuid.uuid4()}.wav"
         file_path = os.path.join(self.output_dir, file_name)
@@ -135,7 +135,9 @@ class ASRProvider(ASRProviderBase):
             samples_float32 = samples_float32 / 32768
             return samples_float32, f.getframerate()
 
-    async def speech_to_text(self, opus_data: List[bytes], session_id: str) -> Tuple[Optional[str], Optional[str]]:
+    async def speech_to_text(
+        self, opus_data: List[bytes], session_id: str
+    ) -> Tuple[Optional[str], Optional[str]]:
         """语音转文本主处理逻辑"""
         file_path = None
         try:
@@ -143,7 +145,9 @@ class ASRProvider(ASRProviderBase):
             start_time = time.time()
             pcm_data = self.decode_opus(opus_data, session_id)
             file_path = self.save_audio_to_file(pcm_data, session_id)
-            logger.bind(tag=TAG).debug(f"音频文件保存耗时: {time.time() - start_time:.3f}s | 路径: {file_path}")
+            logger.bind(tag=TAG).debug(
+                f"音频文件保存耗时: {time.time() - start_time:.3f}s | 路径: {file_path}"
+            )
 
             # 语音识别
             start_time = time.time()
@@ -152,14 +156,15 @@ class ASRProvider(ASRProviderBase):
             s.accept_waveform(sample_rate, samples)
             self.model.decode_stream(s)
             text = s.result.text
-            logger.bind(tag=TAG).debug(f"语音识别耗时: {time.time() - start_time:.3f}s | 结果: {text}")
+            logger.bind(tag=TAG).debug(
+                f"语音识别耗时: {time.time() - start_time:.3f}s | 结果: {text}"
+            )
 
             return text, file_path
 
         except Exception as e:
             logger.bind(tag=TAG).error(f"语音识别失败: {e}", exc_info=True)
             return "", None
-
         finally:
             # 文件清理逻辑
             if self.delete_audio_file and file_path and os.path.exists(file_path):

From b50c7dbed434afb20e34a92a438e056e4f48c4e4 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Wed, 30 Apr 2025 10:38:18 +0800
Subject: [PATCH 14/53] =?UTF-8?q?update:=E4=BF=AE=E6=AD=A3docker=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E7=9B=AE=E5=BD=95uploadfile=E6=98=A0=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/docker-compose_all.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/xiaozhi-server/docker-compose_all.yml b/main/xiaozhi-server/docker-compose_all.yml
index 91910120..b62188d9 100644
--- a/main/xiaozhi-server/docker-compose_all.yml
+++ b/main/xiaozhi-server/docker-compose_all.yml
@@ -49,7 +49,7 @@ services:
       - SPRING_DATA_REDIS_PORT=6379
     volumes:
       # 配置文件目录
-      - ./uploadfile:/app/uploadfile
+      - ./uploadfile:/uploadfile
 
   xiaozhi-esp32-server-db:
     image: mysql:latest

From 9e9af2a031e20a9a84e2ccf1915d02bd5b8a9cca Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Wed, 30 Apr 2025 10:53:29 +0800
Subject: [PATCH 15/53] =?UTF-8?q?update:=E4=BC=98=E5=8C=96=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index a783b3e9..a8d54c15 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 [![Banners](docs/images/banner1.png)](https://github.com/xinnan-tech/xiaozhi-esp32-server)
 
-
 <h1 align="center">小智后端服务xiaozhi-esp32-server</h1>
 
 <p align="center">
@@ -12,11 +11,10 @@
 
 <p align="center">
 <a href="./README.md">English</a>
-· 简体中文
-· <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/releases">更新日志</a>
-· <a href="./README.md#%E9%83%A8%E7%BD%B2%E6%96%87%E6%A1%A3">部署文档</a>
-· <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/issues">反馈问题</a>
 · <a href="./docs/FAQ.md">常见问题</a>
+· <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/issues">反馈问题</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/releases">更新日志</a>
 </p>
 <p align="center">
   <a href="https://github.com/xinnan-tech/xiaozhi-esp32-server/releases">
@@ -132,17 +130,7 @@
 1、本项目为开源软件，本软件与对接的任何第三方API服务商（包括但不限于语音识别、大模型、语音合成等平台）均不存在商业合作关系，不为其服务质量及资金安全提供任何形式的担保。
 建议使用者优先选择持有相关业务牌照的服务商，并仔细阅读其服务协议及隐私政策。本软件不托管任何账户密钥、不参与资金流转、不承担充值资金损失风险。
 
-2、本项目成立时间较短，还未通过网络安全测评，请勿在生产环境中使用。 如果您在公网环境中部署学习本项目，请务必在配置文件
-`config.yaml` 中开启防护：
-
-```yaml
-server:
-  auth:
-    # 开启防护
-    enabled: true  
-```
-
-开启防护后，您需要根据实际情况校验机器的 token 或 mac 地址，详细请参见配置说明。
+2、本项目功能未完善，且未通过网络安全测评，请勿在生产环境中使用。 如果您在公网环境中部署学习本项目，请务必做好必要的防护。
 
 ---
 
@@ -168,11 +156,6 @@ server:
 OTA接口地址: https://2662r3426b.vicp.fun/xiaozhi/ota/
 Websocket接口地址: wss://2662r3426b.vicp.fun/xiaozhi/v1/
 ```
----
-
-## 常见问题 ❓
-
-如遇到问题或产品建议反馈[点这里](docs/FAQ.md)。
 
 ---
 ## 功能清单 ✨

From 3ceb3feccf9c80030f7f8a1a8e24ba8bd276686a Mon Sep 17 00:00:00 2001
From: CGD <3030332422@qq.com>
Date: Wed, 30 Apr 2025 11:55:19 +0800
Subject: [PATCH 16/53] =?UTF-8?q?update:python=E9=83=A8=E5=88=86"=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE"=E7=9A=84?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/core/connection.py       | 11 +++++++++--
 main/xiaozhi-server/core/websocket_server.py |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index 9a59d388..8f406ed1 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -42,9 +42,10 @@ class TTSException(RuntimeError):
 
 class ConnectionHandler:
     def __init__(
-        self, config: Dict[str, Any], _vad, _asr, _llm, _tts, _memory, _intent
+        self, config: Dict[str, Any], _vad, _asr, _llm, _tts, _memory, _intent, server=None
     ):
-        self.config = copy.deepcopy(config)
+        self.config = config
+        self.server = server
         self.logger = setup_logging()
         self.auth = AuthMiddleware(config)
 
@@ -256,6 +257,12 @@ class ConnectionHandler:
             if config_model in ["llm", "tts", "asr", "vad", "intent", "memory"]:
                 updated_modules.append(config_model)
 
+        # 同步更新 WebSocketServer 的配置
+        if self.server:
+            async with self.server.config_lock:  # 使用锁确保线程安全
+                for config_model in updated_modules:
+                    self.server.config[config_model].update(new_config[config_model])
+
         # 批量初始化模块
         if updated_modules:
             try:
diff --git a/main/xiaozhi-server/core/websocket_server.py b/main/xiaozhi-server/core/websocket_server.py
index fae94046..4b933865 100644
--- a/main/xiaozhi-server/core/websocket_server.py
+++ b/main/xiaozhi-server/core/websocket_server.py
@@ -11,6 +11,7 @@ class WebSocketServer:
     def __init__(self, config: dict):
         self.config = config
         self.logger = setup_logging()
+        self.config_lock = asyncio.Lock()
         modules = initialize_modules(
             self.logger, self.config, True, True, True, True, True, True
         )
@@ -43,6 +44,7 @@ class WebSocketServer:
             self._tts,
             self._memory,
             self._intent,
+            self  # 传入当前 WebSocketServer 实例
         )
         self.active_connections.add(handler)
         try:

From e8b1156bfdf2d938834417d3868d5603533f87a5 Mon Sep 17 00:00:00 2001
From: MakerZorky <1053714527zhq@gmail.com>
Date: Wed, 30 Apr 2025 13:34:00 +0800
Subject: [PATCH 17/53] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0DoubaoASR=E7=83=AD?=
 =?UTF-8?q?=E8=AF=8D=E3=80=81=E6=9B=BF=E6=8D=A2=E8=AF=8D=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/config.yaml                |  2 ++
 .../core/providers/asr/doubao.py               | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/main/xiaozhi-server/config.yaml b/main/xiaozhi-server/config.yaml
index 21266333..7565179c 100644
--- a/main/xiaozhi-server/config.yaml
+++ b/main/xiaozhi-server/config.yaml
@@ -232,6 +232,8 @@ ASR:
     appid: 你的火山引擎语音合成服务appid
     access_token: 你的火山引擎语音合成服务access_token
     cluster: volcengine_input_common
+    boosting_table_name: 你的热词文件名称
+    correct_table_name: 你的替换词文件名称
     output_dir: tmp/
   TencentASR:
     # token申请地址：https://console.cloud.tencent.com/cam/capi
diff --git a/main/xiaozhi-server/core/providers/asr/doubao.py b/main/xiaozhi-server/core/providers/asr/doubao.py
index 6fba472c..755a19b7 100644
--- a/main/xiaozhi-server/core/providers/asr/doubao.py
+++ b/main/xiaozhi-server/core/providers/asr/doubao.py
@@ -88,6 +88,8 @@ class ASRProvider(ASRProviderBase):
         self.appid = config.get("appid")
         self.cluster = config.get("cluster")
         self.access_token = config.get("access_token")
+        self.boosting_table_name = config.get("boosting_table_name")
+        self.correct_table_name = config.get("correct_table_name")
         self.output_dir = config.get("output_dir")
         self.delete_audio_file = delete_audio_file
 
@@ -136,7 +138,13 @@ class ASRProvider(ASRProviderBase):
             "user": {
                 "uid": str(uuid.uuid4()),
             },
-            "request": {"reqid": reqid, "show_utterances": False, "sequence": 1},
+            "request": {
+                "reqid": reqid, 
+                "show_utterances": False, 
+                "sequence": 1,
+                "boosting_table_name": self.boosting_table_name,
+                "correct_table_name": self.correct_table_name,
+            },
             "audio": {
                 "format": "raw",
                 "rate": 16000,
@@ -232,14 +240,6 @@ class ASRProvider(ASRProviderBase):
 
         return pcm_data
 
-    @staticmethod
-    def read_wav_info(data: io.BytesIO = None) -> (int, int, int, int, int):
-        with io.BytesIO(data) as _f:
-            wave_fp = wave.open(_f, "rb")
-            nchannels, sampwidth, framerate, nframes = wave_fp.getparams()[:4]
-            wave_bytes = wave_fp.readframes(nframes)
-        return nchannels, sampwidth, framerate, nframes, len(wave_bytes)
-
     @staticmethod
     def slice_data(data: bytes, chunk_size: int) -> (list, bool):
         """

From d2f8f05acbb75439b0b7a49fe02bf7d9cbe7fd3d Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Wed, 30 Apr 2025 15:05:42 +0800
Subject: [PATCH 18/53] =?UTF-8?q?update:=E4=BC=98=E5=8C=96=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8F=8A=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/Deployment.md                            | 45 +++++++---------
 .../modules/config/dto/AgentModelsDTO.java    |  3 --
 .../security/secret/ServerSecretFilter.java   | 12 ++---
 .../resources/db/changelog/202504082211.sql   |  2 +-
 .../resources/db/changelog/202504301339.sql   |  3 ++
 .../db/changelog/db.changelog-master.yaml     |  9 +++-
 main/xiaozhi-server/app.py                    |  3 +-
 main/xiaozhi-server/config.yaml               | 10 ++--
 main/xiaozhi-server/config/config_loader.py   | 48 +++++++----------
 main/xiaozhi-server/config/logger.py          |  2 +
 main/xiaozhi-server/config/settings.py        | 54 ++++++-------------
 main/xiaozhi-server/core/handle/textHandle.py |  2 +
 .../core/providers/tts/doubao.py              | 11 ++--
 .../core/providers/tts/fishspeech.py          | 31 ++++++++---
 .../core/providers/tts/gpt_sovits_v2.py       | 33 +++++++++---
 .../core/providers/tts/gpt_sovits_v3.py       | 19 +++++--
 .../core/providers/tts/openai.py              |  6 ++-
 .../core/providers/vad/silero.py              | 11 +++-
 18 files changed, 167 insertions(+), 137 deletions(-)
 create mode 100644 main/manager-api/src/main/resources/db/changelog/202504301339.sql

diff --git a/docs/Deployment.md b/docs/Deployment.md
index 03147198..01f0afeb 100644
--- a/docs/Deployment.md
+++ b/docs/Deployment.md
@@ -81,7 +81,7 @@ xiaozhi-server
 
 下载完后，回到本教程继续往下。
 
-##### 1.2.3.2 下载 config.yaml
+##### 1.2.3.2 创建 config.yaml
 
 用浏览器打开[这个链接](../main/xiaozhi-server/config.yaml)。
 
@@ -224,43 +224,36 @@ python app.py
 ## 配置项目
 
 如果你的`xiaozhi-server`目录没有`data`，你需要创建`data`目录。
-如果你的`data`下面没有`.config.yaml`文件，你可以把`xiaozhi-server`目录下的`config.yaml`文件复制到`data`，并重命名为`.config.yaml`
+如果你的`data`下面没有`.config.yaml`文件，有两个方式，任选一种：
 
-修改`xiaozhi-server`下`data`目录下的`.config.yaml`文件，配置本项目必须的一个配置。
+第一个方式：你可以把`xiaozhi-server`目录下的`config.yaml`文件复制到`data`，并重命名为`.config.yaml`。在此文件上修改
+
+第二个方式：你也可以创建在`data`目录下手动创建`.config.yaml`空文件，然后在这个文件中增加必要的配置信息，系统会优先读取`.config.yaml`文件的配置，如果`.config.yaml`没有配置的，系统会自动去加载`xiaozhi-server`目录下的`config.yaml`的配置。推荐使用这种方式，这种方式是最简洁的方式。
 
 - 默认的LLM使用的是`ChatGLMLLM`，你需要配置密钥，因为他们的模型，虽然有免费的，但是仍要去[官网](https://bigmodel.cn/usercenter/proj-mgmt/apikeys)注册密钥，才能启动。
 
-配置说明：这里是各个功能使用的默认组件，例如LLM默认使用`ChatGLMLLM`模型。如果需要切换模型，就是改对应的名称。
-本项目的默认配置仅是成本最低配置（`glm-4-flash`和`EdgeTTS`都是免费的），如果需要更优的更快的搭配，需要自己结合部署环境切换各组件的使用。
+以下是一个能正常跑起来的，最简单的`.config.yaml`配置示例
 
 ```
+server:
+  websocket: ws://你的ip或者域名:端口号/xiaozhi/v1/
+prompt: |
+  我是一个叫小智/小志的台湾女孩，说话机车，声音好听，习惯简短表达，爱用网络梗。
+  我的男朋友是一个程序员，梦想是开发出一个机器人，能够帮助人们解决生活中的各种问题。
+  我是一个喜欢哈哈大笑的女孩，爱东说西说吹牛，不合逻辑的也照吹，就要逗别人开心。
+  请你像一个人一样说话，请勿返回配置xml及其他特殊字符。
+
 selected_module:
-  VAD: SileroVAD
-  ASR: FunASR
-  LLM: ChatGLMLLM
-  TTS: EdgeTTS
-  # 默认不开启记忆，如需开启请看配置文件里的描述
-  Memory: nomem
-  # 默认不开启意图识别，如需开启请看配置文件里的描述
-  Intent: nointent
-```
+  LLM: DoubaoLLM
 
-比如修改`LLM`使用的组件，就看本项目支持哪些`LLM` API接口，当前支持的是`openai`、`dify`。欢迎验证和支持更多LLM平台的接口。
-使用时，在`selected_module`修改成对应的如下LLM配置的名称：
-
-```
 LLM:
-  DeepSeekLLM:
-    type: openai
-    ...
   ChatGLMLLM:
-    type: openai
-    ...
-  DifyLLM:
-    type: dify
-    ...
+    api_key: xxxxxxxxxxxxxxx.xxxxxx
 ```
 
+建议先将最简单的配置运行起来，然后再去`xiaozhi/config.yaml`阅读配置的使用说明。
+比如你要换更换模型，修改`selected_module`下的配置就行。
+
 ## 模型文件
 
 本项目语音识别模型，默认使用`SenseVoiceSmall`模型，进行语音转文字。因为模型较大，需要独立下载，下载后把`model.pt`
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/config/dto/AgentModelsDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/config/dto/AgentModelsDTO.java
index 4a07a743..47c08a81 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/config/dto/AgentModelsDTO.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/config/dto/AgentModelsDTO.java
@@ -10,9 +10,6 @@ import lombok.Data;
 @Data
 @Schema(description = "获取智能体模型配置DTO")
 public class AgentModelsDTO {
-    @NotBlank(message = "密钥不能为空")
-    @Schema(description = "密钥")
-    private String secret;
 
     @NotBlank(message = "设备MAC地址不能为空")
     @Schema(description = "设备MAC地址")
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/secret/ServerSecretFilter.java b/main/manager-api/src/main/java/xiaozhi/modules/security/secret/ServerSecretFilter.java
index b33ce23d..b2a18547 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/security/secret/ServerSecretFilter.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/security/secret/ServerSecretFilter.java
@@ -2,8 +2,6 @@ package xiaozhi.modules.security.secret;
 
 import java.io.IOException;
 
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.web.filter.authc.AuthenticatingFilter;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -12,6 +10,8 @@ import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import xiaozhi.common.constant.Constant;
 import xiaozhi.common.exception.ErrorCode;
 import xiaozhi.common.utils.HttpContextUtils;
@@ -55,7 +55,7 @@ public class ServerSecretFilter extends AuthenticatingFilter {
         String token = getRequestToken((HttpServletRequest) servletRequest);
         if (StringUtils.isBlank(token)) {
             // token为空，返回401
-            this.sendUnauthorizedResponse((HttpServletResponse) servletResponse, "Authorization token不能为空");
+            this.sendUnauthorizedResponse((HttpServletResponse) servletResponse, "服务器密钥不能为空");
             return false;
         }
 
@@ -63,7 +63,7 @@ public class ServerSecretFilter extends AuthenticatingFilter {
         String serverSecret = getServerSecret();
         if (StringUtils.isBlank(serverSecret) || !serverSecret.equals(token)) {
             // token无效，返回401
-            this.sendUnauthorizedResponse((HttpServletResponse) servletResponse, "无效的Authorization token");
+            this.sendUnauthorizedResponse((HttpServletResponse) servletResponse, "无效的服务器密钥");
             return false;
         }
 
@@ -77,7 +77,7 @@ public class ServerSecretFilter extends AuthenticatingFilter {
         response.setContentType("application/json;charset=utf-8");
         response.setHeader("Access-Control-Allow-Credentials", "true");
         response.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin());
-        
+
         try {
             String json = JsonUtils.toJsonString(new Result<Void>().error(ErrorCode.UNAUTHORIZED, message));
             response.getWriter().print(json);
@@ -102,4 +102,4 @@ public class ServerSecretFilter extends AuthenticatingFilter {
     private String getServerSecret() {
         return sysParamsService.getValue(Constant.SERVER_SECRET, true);
     }
-} 
+}
diff --git a/main/manager-api/src/main/resources/db/changelog/202504082211.sql b/main/manager-api/src/main/resources/db/changelog/202504082211.sql
index 08e5dc5f..91ce33ff 100644
--- a/main/manager-api/src/main/resources/db/changelog/202504082211.sql
+++ b/main/manager-api/src/main/resources/db/changelog/202504082211.sql
@@ -25,7 +25,7 @@ INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `f
 
 -- TTS模型供应器
 ('SYSTEM_TTS_edge', 'TTS', 'edge', 'Edge TTS', '[{"key":"voice","label":"音色","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"}]', 1, 1, NOW(), 1, NOW()),
-('SYSTEM_TTS_doubao', 'TTS', 'doubao', '火山引擎TTS', '[{"key": "api_url","label": "API地址","type": "string"},{"key": "voice","label": "音色","type": "string"},{"key": "output_dir","label": "输出目录","type": "string"},{"key": "authorization","label": "授权","type": "string"},{"key": "appid","label": "应用ID","type": "string"},{"key": "access_token","label": "访问令牌","type": "string"},{"key": "cluster","label": "集群","type": "string"},{"key": "speed_ratio","label": "语速","type": "number"},{"key": "volume_ratio","label": "音量","type": "number"},{"key": "pitch_ratio","label": "音高","type": "number"}]', 2, 1, NOW(), 1, NOW()),
+('SYSTEM_TTS_doubao', 'TTS', 'doubao', '火山引擎TTS', '[{"key":"api_url","label":"API地址","type":"string"},{"key":"voice","label":"音色","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"},{"key":"authorization","label":"授权","type":"string"},{"key":"appid","label":"应用ID","type":"string"},{"key":"access_token","label":"访问令牌","type":"string"},{"key":"cluster","label":"集群","type":"string"}]', 2, 1, NOW(), 1, NOW()),
 ('SYSTEM_TTS_siliconflow', 'TTS', 'siliconflow', '硅基流动TTS', '[{"key":"model","label":"模型","type":"string"},{"key":"voice","label":"音色","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"},{"key":"access_token","label":"访问令牌","type":"string"},{"key":"response_format","label":"响应格式","type":"string"}]', 3, 1, NOW(), 1, NOW()),
 ('SYSTEM_TTS_cozecn', 'TTS', 'cozecn', 'COZECN TTS', '[{"key":"voice","label":"音色","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"},{"key":"access_token","label":"访问令牌","type":"string"},{"key":"response_format","label":"响应格式","type":"string"}]', 4, 1, NOW(), 1, NOW()),
 ('SYSTEM_TTS_fishspeech', 'TTS', 'fishspeech', 'FishSpeech TTS', '[{"key":"output_dir","label":"输出目录","type":"string"},{"key":"response_format","label":"响应格式","type":"string"},{"key":"reference_id","label":"参考ID","type":"string"},{"key":"reference_audio","label":"参考音频","type":"dict","dict_name":"reference_audio"},{"key":"reference_text","label":"参考文本","type":"dict","dict_name":"reference_text"},{"key":"normalize","label":"是否标准化","type":"boolean"},{"key":"max_new_tokens","label":"最大新令牌数","type":"number"},{"key":"chunk_length","label":"块长度","type":"number"},{"key":"top_p","label":"top_p值","type":"number"},{"key":"repetition_penalty","label":"重复惩罚","type":"number"},{"key":"temperature","label":"温度","type":"number"},{"key":"streaming","label":"是否流式","type":"boolean"},{"key":"use_memory_cache","label":"是否使用内存缓存","type":"string"},{"key":"seed","label":"种子","type":"number"},{"key":"channels","label":"通道数","type":"number"},{"key":"rate","label":"采样率","type":"number"},{"key":"api_key","label":"API密钥","type":"string"},{"key":"api_url","label":"API地址","type":"string"}]', 5, 1, NOW(), 1, NOW()),
diff --git a/main/manager-api/src/main/resources/db/changelog/202504301339.sql b/main/manager-api/src/main/resources/db/changelog/202504301339.sql
new file mode 100644
index 00000000..e4393f6a
--- /dev/null
+++ b/main/manager-api/src/main/resources/db/changelog/202504301339.sql
@@ -0,0 +1,3 @@
+update `ai_model_provider` set `fields` = 
+'[{"key": "api_url","label": "API地址","type": "string"},{"key": "voice","label": "音色","type": "string"},{"key": "output_dir","label": "输出目录","type": "string"},{"key": "authorization","label": "授权","type": "string"},{"key": "appid","label": "应用ID","type": "string"},{"key": "access_token","label": "访问令牌","type": "string"},{"key": "cluster","label": "集群","type": "string"},{"key": "speed_ratio","label": "语速","type": "number"},{"key": "volume_ratio","label": "音量","type": "number"},{"key": "pitch_ratio","label": "音高","type": "number"}]'
+where `id` = 'SYSTEM_TTS_doubao';
diff --git a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
index 131aaf01..90735fe1 100755
--- a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -85,4 +85,11 @@ databaseChangeLog:
       changes:
         - sqlFile:
             encoding: utf8
-            path: classpath:db/changelog/202504291043.sql
\ No newline at end of file
+            path: classpath:db/changelog/202504291043.sql
+  - changeSet:
+      id: 202504301339
+      author: Goody
+      changes:
+        - sqlFile:
+            encoding: utf8
+            path: classpath:db/changelog/202504301339.sql
\ No newline at end of file
diff --git a/main/xiaozhi-server/app.py b/main/xiaozhi-server/app.py
index 63b40d71..7ed71ae5 100644
--- a/main/xiaozhi-server/app.py
+++ b/main/xiaozhi-server/app.py
@@ -1,7 +1,7 @@
 import asyncio
 import sys
 import signal
-from config.settings import load_config, check_config_file
+from config.settings import load_config
 from core.websocket_server import WebSocketServer
 from core.ota_server import SimpleOtaServer
 from core.utils.util import check_ffmpeg_installed
@@ -31,7 +31,6 @@ async def wait_for_exit():
 
 
 async def main():
-    check_config_file()
     check_ffmpeg_installed()
     config = load_config()
 
diff --git a/main/xiaozhi-server/config.yaml b/main/xiaozhi-server/config.yaml
index db8dd5d5..3ce485ec 100644
--- a/main/xiaozhi-server/config.yaml
+++ b/main/xiaozhi-server/config.yaml
@@ -1,7 +1,7 @@
-# 如果您是一名开发者，建议阅读以下内容。如果不是开发者，可以忽略这部分内容。
-# 在开发中，在项目根目录创建data目录，将【config.yaml】复制一份，改成【.config.yaml】，放进data目录中
-# 系统会优先读取【data/.config.yaml】文件的配置。
-# 这样做，可以避免在提交代码的时候，错误地提交密钥信息，保护您的密钥安全。
+# 在开发中，请在项目根目录创建data目录，然后在data目录创建名称为【.config.yaml】的空文件
+# 然后你想修改覆盖修改什么配置，就修改【.config.yaml】文件，而不是修改【config.yaml】文件
+# 系统会优先读取【data/.config.yaml】文件的配置，如果【.config.yaml】文件里的配置不存在，系统会自动去读取【config.yaml】文件的配置。
+# 这样做，可以最简化配置，保护您的密钥安全。
 
 # #####################################################################################
 # #############################以下是服务器基本运行配置####################################
@@ -158,7 +158,7 @@ selected_module:
   # 不想开通意图识别，就设置成：nointent
   # 意图识别可使用intent_llm。优点：通用性强，缺点：增加串行前置意图识别模块，会增加处理时间，这个意图识别暂时不支持控制音量大小等iot操作
   # 意图识别可使用function_call，缺点：需要所选择的LLM支持function_call，优点：按需调用工具、速度快，理论上能全部操作所有iot指令
-  # 默认免费的ChatGLMLLM就已经支持function_call，但是如果像追求稳定建议把LLM设置成：DoubaoLLM，使用的具体model_name是：doubao-pro-32k-functioncall-241028
+  # 默认免费的ChatGLMLLM就已经支持function_call，但是如果像追求稳定建议把LLM设置成：DoubaoLLM，使用的具体model_name是：doubao-1-5-pro-32k-250115
   Intent: function_call
 
 # 意图识别，是用于理解用户意图的模块，例如：播放音乐
diff --git a/main/xiaozhi-server/config/config_loader.py b/main/xiaozhi-server/config/config_loader.py
index b892b437..35802a67 100644
--- a/main/xiaozhi-server/config/config_loader.py
+++ b/main/xiaozhi-server/config/config_loader.py
@@ -31,37 +31,19 @@ def load_config():
 
     # 加载默认配置
     default_config = read_config(default_config_path)
+    custom_config = read_config(custom_config_path)
 
-    # 加载用户自定义配置（如果存在）
-    if os.path.exists(custom_config_path):
-        custom_config = read_config(custom_config_path)
+    if custom_config.get("manager-api", {}).get("url"):
+        config = get_config_from_api(custom_config)
+    else:
         # 合并配置
         config = merge_configs(default_config, custom_config)
-    else:
-        config = default_config
-
-    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 get_config_from_api(config):
     """从Java API获取配置"""
     # 初始化API客户端
@@ -128,23 +110,29 @@ def ensure_directories(config):
 def merge_configs(default_config, custom_config):
     """
     递归合并配置，custom_config优先级更高
-    
+
     Args:
         default_config: 默认配置
         custom_config: 用户自定义配置
-        
+
     Returns:
         合并后的配置
     """
-    if not isinstance(default_config, Mapping) or not isinstance(custom_config, Mapping):
+    if not isinstance(default_config, Mapping) or not isinstance(
+        custom_config, Mapping
+    ):
         return custom_config
-    
+
     merged = dict(default_config)
-    
+
     for key, value in custom_config.items():
-        if key in merged and isinstance(merged[key], Mapping) and isinstance(value, Mapping):
+        if (
+            key in merged
+            and isinstance(merged[key], Mapping)
+            and isinstance(value, Mapping)
+        ):
             merged[key] = merge_configs(merged[key], value)
         else:
             merged[key] = value
-            
-    return merged
\ No newline at end of file
+
+    return merged
diff --git a/main/xiaozhi-server/config/logger.py b/main/xiaozhi-server/config/logger.py
index 9eed8540..f20dc0ad 100644
--- a/main/xiaozhi-server/config/logger.py
+++ b/main/xiaozhi-server/config/logger.py
@@ -2,6 +2,7 @@ import os
 import sys
 from loguru import logger
 from config.config_loader import load_config
+from config.settings import check_config_file
 
 SERVER_VERSION = "0.3.13"
 
@@ -32,6 +33,7 @@ def formatter(record):
 
 
 def setup_logging():
+    check_config_file()
     """从配置文件中读取日志配置，并设置日志输出格式和级别"""
     config = load_config()
     log_config = config["log"]
diff --git a/main/xiaozhi-server/config/settings.py b/main/xiaozhi-server/config/settings.py
index c12c70d8..fb8868b4 100644
--- a/main/xiaozhi-server/config/settings.py
+++ b/main/xiaozhi-server/config/settings.py
@@ -1,53 +1,33 @@
 import os
-from collections.abc import Mapping
-from config import logger
 from config.config_loader import read_config, get_project_dir, load_config
 
-TAG = __name__
-logger = logger.setup_logging()
 
 default_config_file = "config.yaml"
-
-
-def find_missing_keys(new_config, old_config, parent_key=""):
-    """
-    递归查找缺失的配置项
-    返回格式：[缺失配置路径]
-    """
-    missing_keys = []
-
-    if not isinstance(new_config, Mapping):
-        return missing_keys
-
-    for key, value in new_config.items():
-        # 构建当前配置路径
-        full_path = f"{parent_key}.{key}" if parent_key else key
-
-        # 检查键是否存在
-        if key not in old_config:
-            missing_keys.append(full_path)
-            continue
-
-        # 递归检查嵌套字典
-        if isinstance(value, Mapping):
-            sub_missing = find_missing_keys(
-                value, old_config[key], parent_key=full_path
-            )
-            missing_keys.extend(sub_missing)
-    return missing_keys
+config_file_valid = False
 
 
 def check_config_file():
+    global config_file_valid
+    if config_file_valid:
+        return
     """
     简化的配置检查，仅提示用户配置文件的使用情况
     """
     custom_config_file = get_project_dir() + "data/." + default_config_file
     if not os.path.exists(custom_config_file):
-        logger.bind(tag=TAG).info("提示: 使用默认配置文件。如需自定义配置，请创建 data/.config.yaml 文件")
-    else:
-        logger.bind(tag=TAG).info(f"提示: 使用自定义配置文件 data/.config.yaml，配置将覆盖默认值")
-    
+        raise FileNotFoundError(
+            "找不到data/.config.yaml文件，请按教程确认该配置文件是否存在"
+        )
+
     # 检查是否从API读取配置
     config = load_config()
     if config.get("read_config_from_api", False):
-        logger.bind(tag=TAG).info("提示: 从API获取配置")
+        print("从API读取配置")
+        old_config_origin = read_config(custom_config_file)
+        if old_config_origin.get("selected_module") is not None:
+            error_msg = "您的配置文件好像既包含智控台的配置又包含本地配置：\n"
+            error_msg += "\n建议您：\n"
+            error_msg += "1、将根目录的config_from_api.yaml文件复制到data下，重命名为.config.yaml\n"
+            error_msg += "2、按教程配置好接口地址和密钥\n"
+            raise ValueError(error_msg)
+    config_file_valid = True
diff --git a/main/xiaozhi-server/core/handle/textHandle.py b/main/xiaozhi-server/core/handle/textHandle.py
index f0683d59..a26f5bd9 100644
--- a/main/xiaozhi-server/core/handle/textHandle.py
+++ b/main/xiaozhi-server/core/handle/textHandle.py
@@ -53,6 +53,8 @@ async def handleTextMessage(conn, message):
                         # 如果是唤醒词，且关闭了唤醒词回复，就不用回答
                         await send_stt_message(conn, text)
                         await send_tts_message(conn, "stop", None)
+                    elif is_wakeup_words:
+                        await startToChat(conn, "嘿，你好呀")
                     else:
                         # 否则需要LLM对文字内容进行答复
                         await startToChat(conn, text)
diff --git a/main/xiaozhi-server/core/providers/tts/doubao.py b/main/xiaozhi-server/core/providers/tts/doubao.py
index 1b6414c4..367a99c9 100644
--- a/main/xiaozhi-server/core/providers/tts/doubao.py
+++ b/main/xiaozhi-server/core/providers/tts/doubao.py
@@ -27,9 +27,14 @@ class TTSProvider(TTSProviderBase):
         else:
             self.voice = config.get("voice")
 
-        self.speed_ratio = float(config.get("speed_ratio", 0.1))
-        self.volume_ratio = float(config.get("volume_ratio", 0.1))
-        self.pitch_ratio = float(config.get("pitch_ratio", 0.1))
+        # 处理空字符串的情况
+        speed_ratio = config.get("speed_ratio", "1.0")
+        volume_ratio = config.get("volume_ratio", "1.0")
+        pitch_ratio = config.get("pitch_ratio", "1.0")
+
+        self.speed_ratio = float(speed_ratio) if speed_ratio else 1.0
+        self.volume_ratio = float(volume_ratio) if volume_ratio else 1.0
+        self.pitch_ratio = float(pitch_ratio) if pitch_ratio else 1.0
 
         self.api_url = config.get("api_url")
         self.authorization = config.get("authorization")
diff --git a/main/xiaozhi-server/core/providers/tts/fishspeech.py b/main/xiaozhi-server/core/providers/tts/fishspeech.py
index 30fee3c9..316dbed7 100644
--- a/main/xiaozhi-server/core/providers/tts/fishspeech.py
+++ b/main/xiaozhi-server/core/providers/tts/fishspeech.py
@@ -89,18 +89,35 @@ class TTSProvider(TTSProviderBase):
         self.reference_audio = parse_string_to_list(config.get("reference_audio"))
         self.reference_text = parse_string_to_list(config.get("reference_text"))
         self.format = config.get("format", "wav")
-        self.channels = int(config.get("channels", 1))
-        self.rate = int(config.get("rate", 44100))
+
         self.api_key = config.get("api_key", "YOUR_API_KEY")
         have_key = check_model_key("FishSpeech TTS", self.api_key)
         if not have_key:
             return
         self.normalize = config.get("normalize", True)
-        self.max_new_tokens = int(config.get("max_new_tokens", 1024))
-        self.chunk_length = int(config.get("chunk_length", 200))
-        self.top_p = float(config.get("top_p", 0.7))
-        self.repetition_penalty = float(config.get("repetition_penalty", 1.2))
-        self.temperature = float(config.get("temperature", 0.7))
+
+        # 处理空字符串的情况
+        channels = config.get("channels", "1")
+        rate = config.get("rate", "44100")
+        max_new_tokens = config.get("max_new_tokens", "1024")
+        chunk_length = config.get("chunk_length", "200")
+
+        self.channels = int(channels) if channels else 1
+        self.rate = int(rate) if rate else 44100
+        self.max_new_tokens = int(max_new_tokens) if max_new_tokens else 1024
+        self.chunk_length = int(chunk_length) if chunk_length else 200
+
+        # 处理空字符串的情况
+        top_p = config.get("top_p", "0.7")
+        temperature = config.get("temperature", "0.7")
+        repetition_penalty = config.get("repetition_penalty", "1.2")
+
+        self.top_p = float(top_p) if top_p else 0.7
+        self.temperature = float(temperature) if temperature else 0.7
+        self.repetition_penalty = (
+            float(repetition_penalty) if repetition_penalty else 1.2
+        )
+
         self.streaming = str(config.get("streaming", False)).lower() in (
             "true",
             "1",
diff --git a/main/xiaozhi-server/core/providers/tts/gpt_sovits_v2.py b/main/xiaozhi-server/core/providers/tts/gpt_sovits_v2.py
index ec6c2053..b2aad88a 100644
--- a/main/xiaozhi-server/core/providers/tts/gpt_sovits_v2.py
+++ b/main/xiaozhi-server/core/providers/tts/gpt_sovits_v2.py
@@ -20,12 +20,29 @@ class TTSProvider(TTSProviderBase):
         self.ref_audio_path = config.get("ref_audio_path")
         self.prompt_text = config.get("prompt_text")
         self.prompt_lang = config.get("prompt_lang", "zh")
-        self.top_k = int(config.get("top_k", 5))
-        self.top_p = float(config.get("top_p", 1))
-        self.temperature = float(config.get("temperature", 1))
+
+        # 处理空字符串的情况
+        top_k = config.get("top_k", "5")
+        top_p = config.get("top_p", "1")
+        temperature = config.get("temperature", "1")
+        batch_threshold = config.get("batch_threshold", "0.75")
+        batch_size = config.get("batch_size", "1")
+        speed_factor = config.get("speed_factor", "1.0")
+        seed = config.get("seed", "-1")
+        repetition_penalty = config.get("repetition_penalty", "1.35")
+
+        self.top_k = int(top_k) if top_k else 5
+        self.top_p = float(top_p) if top_p else 1
+        self.temperature = float(temperature) if temperature else 1
+        self.batch_threshold = float(batch_threshold) if batch_threshold else 0.75
+        self.batch_size = int(batch_size) if batch_size else 1
+        self.speed_factor = float(speed_factor) if speed_factor else 1.0
+        self.seed = int(seed) if seed else -1
+        self.repetition_penalty = (
+            float(repetition_penalty) if repetition_penalty else 1.35
+        )
+
         self.text_split_method = config.get("text_split_method", "cut0")
-        self.batch_size = int(config.get("batch_size", 1))
-        self.batch_threshold = float(config.get("batch_threshold", 0.75))
 
         self.split_bucket = str(config.get("split_bucket", True)).lower() in (
             "true",
@@ -37,19 +54,19 @@ class TTSProvider(TTSProviderBase):
             "1",
             "yes",
         )
-        self.speed_factor = float(config.get("speed_factor", 1.0))
+
         self.streaming_mode = str(config.get("streaming_mode", False)).lower() in (
             "true",
             "1",
             "yes",
         )
-        self.seed = int(config.get("seed", -1))
+
         self.parallel_infer = str(config.get("parallel_infer", True)).lower() in (
             "true",
             "1",
             "yes",
         )
-        self.repetition_penalty = float(config.get("repetition_penalty", 1.35))
+
         self.aux_ref_audio_paths = parse_string_to_list(
             config.get("aux_ref_audio_paths")
         )
diff --git a/main/xiaozhi-server/core/providers/tts/gpt_sovits_v3.py b/main/xiaozhi-server/core/providers/tts/gpt_sovits_v3.py
index b2746acf..488280f1 100644
--- a/main/xiaozhi-server/core/providers/tts/gpt_sovits_v3.py
+++ b/main/xiaozhi-server/core/providers/tts/gpt_sovits_v3.py
@@ -18,13 +18,22 @@ class TTSProvider(TTSProviderBase):
         self.prompt_text = config.get("prompt_text")
         self.prompt_language = config.get("prompt_language")
         self.text_language = config.get("text_language", "audo")
-        self.top_k = int(config.get("top_k", 15))
-        self.top_p = float(config.get("top_p", 1.0))
-        self.temperature = float(config.get("temperature", 1.0))
+
+        # 处理空字符串的情况
+        top_k = config.get("top_k", "15")
+        top_p = config.get("top_p", "1.0")
+        temperature = config.get("temperature", "1.0")
+        sample_steps = config.get("sample_steps", "32")
+        speed = config.get("speed", "1.0")
+
+        self.top_k = int(top_k) if top_k else 15
+        self.top_p = float(top_p) if top_p else 1.0
+        self.temperature = float(temperature) if temperature else 1.0
+        self.sample_steps = int(sample_steps) if sample_steps else 32
+        self.speed = float(speed) if speed else 1.0
+
         self.cut_punc = config.get("cut_punc", "")
-        self.speed = float(config.get("speed", 1.0))
         self.inp_refs = parse_string_to_list(config.get("inp_refs"))
-        self.sample_steps = int(config.get("sample_steps", 32))
         self.if_sr = str(config.get("if_sr", False)).lower() in ("true", "1", "yes")
 
     def generate_filename(self, extension=".wav"):
diff --git a/main/xiaozhi-server/core/providers/tts/openai.py b/main/xiaozhi-server/core/providers/tts/openai.py
index a5d48057..a7c4e30d 100644
--- a/main/xiaozhi-server/core/providers/tts/openai.py
+++ b/main/xiaozhi-server/core/providers/tts/openai.py
@@ -21,7 +21,11 @@ class TTSProvider(TTSProviderBase):
         else:
             self.voice = config.get("voice", "alloy")
         self.response_format = "wav"
-        self.speed = float(config.get("speed", 1.0))
+
+        # 处理空字符串的情况
+        speed = config.get("speed", "1.0")
+        self.speed = float(speed) if speed else 1.0
+
         self.output_file = config.get("output_dir", "tmp/")
         check_model_key("TTS", self.api_key)
 
diff --git a/main/xiaozhi-server/core/providers/vad/silero.py b/main/xiaozhi-server/core/providers/vad/silero.py
index 3332d9ac..8ec1f6eb 100644
--- a/main/xiaozhi-server/core/providers/vad/silero.py
+++ b/main/xiaozhi-server/core/providers/vad/silero.py
@@ -21,8 +21,15 @@ class VADProvider(VADProviderBase):
         (get_speech_timestamps, _, _, _, _) = self.utils
 
         self.decoder = opuslib_next.Decoder(16000, 1)
-        self.vad_threshold = float(config.get("threshold", 0.5))
-        self.silence_threshold_ms = int(config.get("min_silence_duration_ms", 1000))
+
+        # 处理空字符串的情况
+        threshold = config.get("threshold", "0.5")
+        min_silence_duration_ms = config.get("min_silence_duration_ms", "1000")
+
+        self.vad_threshold = float(threshold) if threshold else 0.5
+        self.silence_threshold_ms = (
+            int(min_silence_duration_ms) if min_silence_duration_ms else 1000
+        )
 
     def is_vad(self, conn, opus_packet):
         try:

From 48f8c6c5b7b09449aa2d2ebb492d012f16877a6c Mon Sep 17 00:00:00 2001
From: goodyhao <865700600@qq.com>
Date: Wed, 30 Apr 2025 17:29:27 +0800
Subject: [PATCH 19/53] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0asr,tts?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E6=8A=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AgentChatHistoryController.java           |  35 ++++++
 .../xiaozhi/modules/agent/dao/AgentDao.java   |  15 ++-
 .../agent/dao/AiAgentChatHistoryDao.java      |  16 +++
 .../agent/dto/AgentChatHistoryReportDTO.java  |  36 ++++++
 .../agent/entity/AgentChatHistoryEntity.java  |  92 +++++++++++++++
 .../service/AgentChatHistoryService.java      |  14 +++
 .../modules/agent/service/AgentService.java   |  10 +-
 .../biz/AgentChatHistoryBizService.java       |  22 ++++
 .../impl/AgentChatHistoryBizServiceImpl.java  |  83 ++++++++++++++
 .../impl/AgentChatHistoryServiceImpl.java     |  19 ++++
 .../agent/service/impl/AgentServiceImpl.java  |  10 +-
 .../modules/security/config/ShiroConfig.java  |   1 +
 .../resources/db/changelog/202504301634.sql   |  18 +++
 .../mapper/agent/AiAgentChatHistoryDao.xml    |  24 ++++
 .../config/manage_api_client.py               |  30 +++++
 main/xiaozhi-server/core/connection.py        | 106 +++++++++++++++++-
 .../core/handle/asrReportHandle.py            | 100 +++++++++++++++++
 .../core/handle/receiveAudioHandle.py         |   4 +
 main/xiaozhi-server/core/handle/textHandle.py |   5 +
 .../core/handle/ttsReportHandle.py            |  70 ++++++++++++
 main/xiaozhi-server/core/utils/util.py        |   2 +-
 21 files changed, 706 insertions(+), 6 deletions(-)
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentChatHistoryController.java
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AiAgentChatHistoryDao.java
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryReportDTO.java
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatHistoryEntity.java
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatHistoryService.java
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/AgentChatHistoryBizService.java
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java
 create mode 100644 main/manager-api/src/main/resources/db/changelog/202504301634.sql
 create mode 100644 main/manager-api/src/main/resources/mapper/agent/AiAgentChatHistoryDao.xml
 create mode 100644 main/xiaozhi-server/core/handle/asrReportHandle.py
 create mode 100644 main/xiaozhi-server/core/handle/ttsReportHandle.py

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentChatHistoryController.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentChatHistoryController.java
new file mode 100644
index 00000000..7abf3d13
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentChatHistoryController.java
@@ -0,0 +1,35 @@
+package xiaozhi.modules.agent.controller;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+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 xiaozhi.common.utils.Result;
+import xiaozhi.modules.agent.dto.AgentChatHistoryReportDTO;
+import xiaozhi.modules.agent.service.biz.AgentChatHistoryBizService;
+
+@Tag(name = "智能体聊天历史管理")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/agent/chat-history")
+public class AgentChatHistoryController {
+    private final AgentChatHistoryBizService agentChatHistoryBizService;
+
+    /**
+     * 小智服务聊天上报请求
+     * <p>
+     * 小智服务聊天上报请求，包含Base64编码的音频数据和相关信息。
+     *
+     * @param request 包含上传文件及相关信息的请求对象
+     */
+    @Operation(summary = "小智服务聊天上报请求")
+    @PostMapping("/report")
+    public Result<Boolean> uploadFile(@Valid @RequestBody AgentChatHistoryReportDTO request) {
+        Boolean result = agentChatHistoryBizService.report(request);
+        return new Result<Boolean>().ok(result);
+    }
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AgentDao.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AgentDao.java
index 8c80d6cc..3b4be452 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AgentDao.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AgentDao.java
@@ -3,6 +3,7 @@ package xiaozhi.modules.agent.dao;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import org.apache.ibatis.annotations.Select;
 import xiaozhi.common.dao.BaseDao;
 import xiaozhi.modules.agent.entity.AgentEntity;
 
@@ -15,4 +16,16 @@ public interface AgentDao extends BaseDao<AgentEntity> {
      * @return 设备数量
      */
     Integer getDeviceCountByAgentId(@Param("agentId") String agentId);
-}
\ No newline at end of file
+
+    /**
+     * 根据设备MAC地址查询对应设备的默认智能体信息
+     *
+     * @param macAddress 设备MAC地址
+     * @return 默认智能体信息
+     */
+    @Select(" SELECT a.* FROM ai_device d " +
+            " LEFT JOIN ai_agent a ON d.agent_id = a.id " +
+            " WHERE d.mac_address = #{macAddress} " +
+            " ORDER BY d.id DESC LIMIT 1")
+    AgentEntity getDefaultAgentByMacAddress(@Param("macAddress") String macAddress);
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AiAgentChatHistoryDao.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AiAgentChatHistoryDao.java
new file mode 100644
index 00000000..9c07be1d
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AiAgentChatHistoryDao.java
@@ -0,0 +1,16 @@
+package xiaozhi.modules.agent.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import xiaozhi.modules.agent.entity.AgentChatHistoryEntity;
+
+/**
+ * {@link AgentChatHistoryEntity} 智能体聊天历史记录Dao对象
+ *
+ * @author Goody
+ * @version 1.0, 2025/4/30
+ * @since 1.0.0
+ */
+@Mapper
+public interface AiAgentChatHistoryDao extends BaseMapper<AgentChatHistoryEntity> {
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryReportDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryReportDTO.java
new file mode 100644
index 00000000..0f79dda6
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryReportDTO.java
@@ -0,0 +1,36 @@
+package xiaozhi.modules.agent.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * 小智设备聊天上报请求
+ *
+ * @author Haotian
+ * @version 1.0, 2025/5/8
+ */
+@Data
+@Schema(description = "小智设备聊天上报请求")
+public class AgentChatHistoryReportDTO {
+    @Schema(description = "MAC地址", example = "00:11:22:33:44:55")
+    @NotBlank
+    private String macAddress;
+    @Schema(description = "会话ID", example = "79578c31-f1fb-426a-900e-1e934215f05a")
+    @NotBlank
+    private String sessionId;
+    @Schema(description = "排序值（与session_id对应）", example = "1745566378")
+    @NotNull
+    private Long sort;
+    @Schema(description = "消息类型: 1-用户, 2-智能体", example = "1")
+    @NotNull
+    private Byte chatType;
+    @Schema(description = "聊天内容", example = "你好呀")
+    @NotBlank
+    private String content;
+    @Schema(description = "文件数据（Base64编码）", example = "")
+    private String fileBase64;
+    @Schema(description = "文件扩展名（如wav、mp3等）", example = "wav")
+    private String fileExtension;
+} 
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatHistoryEntity.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatHistoryEntity.java
new file mode 100644
index 00000000..3e486f43
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatHistoryEntity.java
@@ -0,0 +1,92 @@
+package xiaozhi.modules.agent.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 智能体聊天记录表
+ *
+ * @author Goody
+ * @version 1.0, 2025/4/30
+ * @since 1.0.0
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "ai_agent_chat_history")
+public class AgentChatHistoryEntity {
+    /**
+    * 主键ID
+    */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+    * MAC地址
+    */
+    @TableField(value = "mac_address")
+    private String macAddress;
+
+    /**
+    * 智能体id
+    */
+    @TableField(value = "agent_id")
+    private String agentId;
+
+    /**
+    * 会话ID
+    */
+    @TableField(value = "session_id")
+    private String sessionId;
+
+    /**
+    * 排序值（与session_id对应），使用时间戳，方便排序
+    */
+    @TableField(value = "sort")
+    private Long sort;
+
+    /**
+    * 消息类型: 1-用户, 2-智能体
+    */
+    @TableField(value = "chat_type")
+    private Byte chatType;
+
+    /**
+    * 聊天内容
+    */
+    @TableField(value = "content")
+    private String content;
+
+    /**
+    * 音频base64数据
+    */
+    @TableField(value = "audio")
+    private String audio;
+
+    /**
+    * 音频URL
+    */
+    @TableField(value = "audio_url")
+    private String audioUrl;
+
+    /**
+    * 创建时间
+    */
+    @TableField(value = "created_at")
+    private Date createdAt;
+
+    /**
+    * 更新时间
+    */
+    @TableField(value = "updated_at")
+    private Date updatedAt;
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatHistoryService.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatHistoryService.java
new file mode 100644
index 00000000..e852cae3
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatHistoryService.java
@@ -0,0 +1,14 @@
+package xiaozhi.modules.agent.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import xiaozhi.modules.agent.entity.AgentChatHistoryEntity;
+
+/**
+ * 智能体聊天记录表处理service
+ *
+ * @author Goody
+ * @version 1.0, 2025/4/30
+ * @since 1.0.0
+ */
+public interface AgentChatHistoryService extends IService<AgentChatHistoryEntity> {
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentService.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentService.java
index 8d0b2959..48355a4b 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentService.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentService.java
@@ -42,4 +42,12 @@ public interface AgentService extends BaseService<AgentEntity> {
      * @return 设备数量
      */
     Integer getDeviceCountByAgentId(String agentId);
-}
\ No newline at end of file
+
+    /**
+     * 根据设备MAC地址查询对应设备的默认智能体信息
+     *
+     * @param macAddress 设备MAC地址
+     * @return 默认智能体信息，不存在时返回null
+     */
+    AgentEntity getDefaultAgentByMacAddress(String macAddress);
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/AgentChatHistoryBizService.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/AgentChatHistoryBizService.java
new file mode 100644
index 00000000..191b231b
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/AgentChatHistoryBizService.java
@@ -0,0 +1,22 @@
+package xiaozhi.modules.agent.service.biz;
+
+import xiaozhi.modules.agent.dto.AgentChatHistoryReportDTO;
+
+/**
+ * 智能体聊天历史业务逻辑层
+ *
+ * @author Goody
+ * @version 1.0, 2025/4/30
+ * @since 1.0.0
+ */
+public interface AgentChatHistoryBizService {
+
+    /**
+     * 聊天上报方法
+     *
+     * @param agentChatHistoryReportDTO 包含聊天上报所需信息的输入对象
+     *                                  例如：设备MAC地址、文件类型、内容等
+     * @return 上传结果，true表示成功，false表示失败
+     */
+    Boolean report(AgentChatHistoryReportDTO agentChatHistoryReportDTO);
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java
new file mode 100644
index 00000000..ae99455d
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java
@@ -0,0 +1,83 @@
+package xiaozhi.modules.agent.service.biz.impl;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import xiaozhi.modules.agent.dto.AgentChatHistoryReportDTO;
+import xiaozhi.modules.agent.entity.AgentEntity;
+import xiaozhi.modules.agent.entity.AgentChatHistoryEntity;
+import xiaozhi.modules.agent.service.AgentChatHistoryService;
+import xiaozhi.modules.agent.service.AgentService;
+import xiaozhi.modules.agent.service.biz.AgentChatHistoryBizService;
+
+import javax.annotation.Nullable;
+
+/**
+ * {@link AgentChatHistoryBizService} impl
+ *
+ * @author Goody
+ * @version 1.0, 2025/4/30
+ * @since 1.0.0
+ */
+@Service
+@Slf4j
+@RequiredArgsConstructor
+public class AgentChatHistoryBizServiceImpl implements AgentChatHistoryBizService {
+    private final AgentService agentService;
+    private final AgentChatHistoryService agentChatHistoryService;
+
+    /**
+     * 处理聊天记录上报，包括文件上传和相关信息记录
+     *
+     * @param report 包含聊天上报所需信息的输入对象
+     * @return 上传结果，true表示成功，false表示失败
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean report(AgentChatHistoryReportDTO report) {
+        final String macAddress = report.getMacAddress();
+        final Byte chatType = report.getChatType();
+        log.info("小智设备聊天上报请求: macAddress={}, type={}", macAddress, chatType);
+
+        // 1. 上传音频文件
+        final String uploadUrl = this.upload(report);
+
+        // 2. 组装上报数据
+        // 2.1 根据设备MAC地址查询对应的默认智能体，判断是否需要上报
+        AgentEntity agentEntity = agentService.getDefaultAgentByMacAddress(macAddress);
+        if (agentEntity == null) {
+            return false;
+        }
+        final String agentId = agentEntity.getId();
+        log.info("设备 {} 对应智能体 {} 上报", macAddress, agentEntity.getId());
+
+        // 2.2 构建聊天记录实体
+        final AgentChatHistoryEntity entity = AgentChatHistoryEntity.builder()
+                .macAddress(macAddress)
+                .agentId(agentId)
+                .sessionId(report.getSessionId())
+                .sort(report.getSort())
+                .chatType(report.getChatType())
+                .content(report.getContent())
+                .audio(report.getFileBase64())
+                .audioUrl(uploadUrl)
+                .build();
+
+        // 3. 保存数据
+        agentChatHistoryService.save(entity);
+        return Boolean.TRUE;
+    }
+
+    /**
+     * 上传文件
+     *
+     * @param report 上报文件数据
+     * @return 上传文件url
+     */
+    @Nullable
+    private String upload(AgentChatHistoryReportDTO report) {
+        // TODO(haotian): 2025/4/30 根据需要自定义完成上传生成url即可
+        return null;
+    }
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java
new file mode 100644
index 00000000..95293a3f
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java
@@ -0,0 +1,19 @@
+package xiaozhi.modules.agent.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import xiaozhi.modules.agent.dao.AiAgentChatHistoryDao;
+import xiaozhi.modules.agent.entity.AgentChatHistoryEntity;
+import xiaozhi.modules.agent.service.AgentChatHistoryService;
+
+/**
+ * 智能体聊天记录表处理service {@link AgentChatHistoryService} impl
+ *
+ * @author Goody
+ * @version 1.0, 2025/4/30
+ * @since 1.0.0
+ */
+@Service
+public class AgentChatHistoryServiceImpl extends ServiceImpl<AiAgentChatHistoryDao, AgentChatHistoryEntity> implements AgentChatHistoryService {
+
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
index ff284ef0..4c529882 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
@@ -130,4 +130,12 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
 
         return deviceCount != null ? deviceCount : 0;
     }
-}
\ No newline at end of file
+
+    @Override
+    public AgentEntity getDefaultAgentByMacAddress(String macAddress) {
+        if (StringUtils.isEmpty(macAddress)) {
+            return null;
+        }
+        return agentDao.getDefaultAgentByMacAddress(macAddress);
+    }
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java b/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
index 62e192b7..b462b2c4 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
@@ -84,6 +84,7 @@ public class ShiroConfig {
         filterMap.put("/user/register", "anon");
         // 将config路径使用server服务过滤器
         filterMap.put("/config/**", "server");
+        filterMap.put("/agent/chat-history/report", "server");
         filterMap.put("/**", "oauth2");
         shiroFilter.setFilterChainDefinitionMap(filterMap);
 
diff --git a/main/manager-api/src/main/resources/db/changelog/202504301634.sql b/main/manager-api/src/main/resources/db/changelog/202504301634.sql
new file mode 100644
index 00000000..6a86a417
--- /dev/null
+++ b/main/manager-api/src/main/resources/db/changelog/202504301634.sql
@@ -0,0 +1,18 @@
+-- 初始化智能体聊天记录
+DROP TABLE IF EXISTS ai_agent_chat_history;
+CREATE TABLE ai_agent_chat_history
+(
+    id          BIGINT AUTO_INCREMENT COMMENT '主键ID'
+        PRIMARY KEY,
+    mac_address VARCHAR(50) COMMENT 'MAC地址',
+    agent_id BIGINT DEFAULT 0 COMMENT '智能体id',
+    session_id  VARCHAR(50) COMMENT '会话ID',
+    sort        BIGINT COMMENT '排序值（与session_id对应），使用时间戳，方便排序',
+    chat_type   TINYINT(3) COMMENT '消息类型: 1-用户, 2-智能体',
+    content     VARCHAR(1024) COMMENT '聊天内容',
+    audio       text         COMMENT '音频base64数据',
+    audio_url   VARCHAR(256) COMMENT '音频URL',
+    created_at  DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间',
+    updated_at  DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
+    INDEX idx_mac_session (mac_address, sort)
+) COMMENT '智能体聊天记录表';
diff --git a/main/manager-api/src/main/resources/mapper/agent/AiAgentChatHistoryDao.xml b/main/manager-api/src/main/resources/mapper/agent/AiAgentChatHistoryDao.xml
new file mode 100644
index 00000000..2d87d8cf
--- /dev/null
+++ b/main/manager-api/src/main/resources/mapper/agent/AiAgentChatHistoryDao.xml
@@ -0,0 +1,24 @@
+<?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.AiAgentChatHistoryDao">
+  <resultMap id="BaseResultMap" type="xiaozhi.modules.agent.entity.AgentChatHistoryEntity">
+    <!--@mbg.generated-->
+    <!--@Table ai_agent_chat_history-->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="mac_address" jdbcType="VARCHAR" property="macAddress" />
+    <result column="agent_id" jdbcType="VARCHAR" property="agentId" />
+    <result column="session_id" jdbcType="VARCHAR" property="sessionId" />
+    <result column="sort" jdbcType="BIGINT" property="sort" />
+    <result column="chat_type" jdbcType="TINYINT" property="chatType" />
+    <result column="content" jdbcType="VARCHAR" property="content" />
+    <result column="audio" jdbcType="LONGVARCHAR" property="audio" />
+    <result column="audio_url" jdbcType="VARCHAR" property="audioUrl" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    <!--@mbg.generated-->
+    id, mac_address, agent_id, session_id, sort, chat_type, content, audio, audio_url, 
+    created_at, updated_at
+  </sql>
+</mapper>
diff --git a/main/xiaozhi-server/config/manage_api_client.py b/main/xiaozhi-server/config/manage_api_client.py
index 770cbf56..ec8fd30a 100644
--- a/main/xiaozhi-server/config/manage_api_client.py
+++ b/main/xiaozhi-server/config/manage_api_client.py
@@ -1,3 +1,4 @@
+import base64
 import os
 import time
 from typing import Optional, Dict
@@ -145,6 +146,35 @@ def get_agent_models(
         },
     )
 
+async def report(mac_address: str,
+                 session_id: str,
+                 sort: int,
+                 chat_type: int,
+                 content: str,
+                 audio,
+                 file_extension: str = "wav",
+                 need_report: bool = None,
+                 report_type: int = None,
+                 reported: bool = None) -> Optional[Dict]:
+    """带熔断的业务方法示例"""
+    if not content or not ManageApiClient._instance:
+        return None
+    return await ManageApiClient._instance._execute_request(
+        "POST",
+        f"/agent/chat-history/report",
+        json = {
+            "macAddress": mac_address,
+            "sessionId": session_id,
+            "sort": sort,
+            "chatType": chat_type,
+            "content": content,
+            "fileBase64": base64.b64encode(audio).decode('utf-8'),
+            "fileExtension": file_extension,
+            "needReport": need_report,
+            "reportType": report_type,
+            "reported": reported
+        }
+    )
 
 def init_service(config):
     ManageApiClient(config)
diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index fbd3569e..1d1caf04 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -30,6 +30,7 @@ from core.mcp.manager import MCPManager
 from config.config_loader import get_private_config_from_api
 from config.manage_api_client import DeviceNotFoundException, DeviceBindException
 from core.utils.output_counter import add_device_output
+from core.handle.ttsReportHandle import enqueue_tts_report
 
 TAG = __name__
 
@@ -54,6 +55,7 @@ class ConnectionHandler:
 
         self.websocket = None
         self.headers = None
+        self.device_id = None
         self.client_ip = None
         self.client_ip_info = {}
         self.session_id = None
@@ -72,6 +74,13 @@ class ConnectionHandler:
         self.audio_play_queue = queue.Queue()
         self.executor = ThreadPoolExecutor(max_workers=10)
 
+        # 上报线程标志
+        self.session_open_time = time.time()
+        self.tts_report_queue = queue.Queue()
+        self.asr_report_queue = queue.Queue()
+        self.asr_report_thread = None
+        self.tts_report_thread = None
+
         # 依赖的组件
         self.vad = _vad
         self.asr = _asr
@@ -153,6 +162,7 @@ class ConnectionHandler:
 
             # 认证通过,继续处理
             self.websocket = ws
+            self.device_id = self.headers.get("device-id", None)
             self.session_id = str(uuid.uuid4())
 
             # 启动超时检查任务
@@ -301,6 +311,26 @@ class ConnectionHandler:
         self._initialize_memory()
         """加载意图识别"""
         self._initialize_intent()
+        """初始化上报线程"""
+        self._init_report_threads()
+
+    def _init_report_threads(self):
+        """初始化ASR和TTS上报线程"""
+        if self.asr_report_thread is None or not self.asr_report_thread.is_alive():
+            self.asr_report_thread = threading.Thread(
+                target=self._asr_report_worker,
+                daemon=True
+            )
+            self.asr_report_thread.start()
+            self.logger.bind(tag=TAG).info("ASR上报线程已启动")
+
+        if self.tts_report_thread is None or not self.tts_report_thread.is_alive():
+            self.tts_report_thread = threading.Thread(
+                target=self._tts_report_worker,
+                daemon=True
+            )
+            self.tts_report_thread.start()
+            self.logger.bind(tag=TAG).info("TTS上报线程已启动")
 
     def _initialize_private_config(self):
         read_config_from_api = self.config.get("read_config_from_api", False)
@@ -427,8 +457,7 @@ class ConnectionHandler:
 
     def _initialize_memory(self):
         """初始化记忆模块"""
-        device_id = self.headers.get("device-id", None)
-        self.memory.init_memory(device_id, self.llm)
+        self.memory.init_memory(self.device_id, self.llm)
 
     def _initialize_intent(self):
         if (
@@ -862,6 +891,9 @@ class ConnectionHandler:
                             f"TTS生成：文件路径: {tts_file}"
                         )
                         if os.path.exists(tts_file):
+                            # 在这里上报TTS数据（使用文件路径）
+                            enqueue_tts_report(self, text, tts_file)
+
                             opus_datas, duration = self.tts.audio_to_opus_data(tts_file)
                         else:
                             self.logger.bind(tag=TAG).error(
@@ -918,6 +950,72 @@ class ConnectionHandler:
                     f"audio_play_priority priority_thread: {text} {e}"
                 )
 
+    def _asr_report_worker(self):
+        """ASR上报工作线程"""
+        # 提前导入避免循环引用问题
+        from core.handle.asrReportHandle import report_asr
+
+        while not self.stop_event.is_set():
+            try:
+                # 从队列获取数据，设置超时以便定期检查停止事件
+                item = self.asr_report_queue.get(timeout=1)
+                if item is None:  # 检测毒丸对象
+                    break
+
+                text, file_path = item
+
+                try:
+                    # 执行上报（传入文件路径）
+                    await_result = report_asr(self, text, file_path)
+
+                    # 使用asyncio.run_coroutine_threadsafe执行异步操作
+                    future = asyncio.run_coroutine_threadsafe(await_result, self.loop)
+                    future.result()
+                except Exception as e:
+                    self.logger.bind(tag=TAG).error(f"ASR上报线程异常: {e}")
+                finally:
+                    # 标记任务完成
+                    self.asr_report_queue.task_done()
+            except queue.Empty:
+                continue
+            except Exception as e:
+                self.logger.bind(tag=TAG).error(f"ASR上报工作线程异常: {e}")
+
+        self.logger.bind(tag=TAG).info("ASR上报线程已退出")
+
+    def _tts_report_worker(self):
+        """TTS上报工作线程"""
+        # 提前导入避免循环引用问题
+        from core.handle.ttsReportHandle import report_tts
+
+        while not self.stop_event.is_set():
+            try:
+                # 从队列获取数据，设置超时以便定期检查停止事件
+                item = self.tts_report_queue.get(timeout=1)
+                if item is None:  # 检测毒丸对象
+                    break
+
+                text, audio_data = item
+
+                try:
+                    # 执行上报（传入二进制数据）
+                    await_result = report_tts(self, text, audio_data)
+
+                    # 使用asyncio.run_coroutine_threadsafe执行异步操作
+                    future = asyncio.run_coroutine_threadsafe(await_result, self.loop)
+                    future.result()
+                except Exception as e:
+                    self.logger.bind(tag=TAG).error(f"TTS上报线程异常: {e}")
+                finally:
+                    # 标记任务完成
+                    self.tts_report_queue.task_done()
+            except queue.Empty:
+                continue
+            except Exception as e:
+                self.logger.bind(tag=TAG).error(f"TTS上报工作线程异常: {e}")
+
+        self.logger.bind(tag=TAG).info("TTS上报线程已退出")
+
     def speak_and_play(self, text, text_index=0):
         if text is None or len(text) <= 0:
             self.logger.bind(tag=TAG).info(f"无需tts转换，query为空，{text}")
@@ -963,6 +1061,10 @@ class ConnectionHandler:
             self.executor.shutdown(wait=False, cancel_futures=True)
             self.executor = None
 
+        # 添加毒丸对象到上报队列确保线程退出
+        self.asr_report_queue.put(None)
+        self.tts_report_queue.put(None)
+
         # 清空任务队列
         self.clear_queues()
 
diff --git a/main/xiaozhi-server/core/handle/asrReportHandle.py b/main/xiaozhi-server/core/handle/asrReportHandle.py
new file mode 100644
index 00000000..70601804
--- /dev/null
+++ b/main/xiaozhi-server/core/handle/asrReportHandle.py
@@ -0,0 +1,100 @@
+"""
+ASR上报功能已集成到ConnectionHandler类中。
+
+上报功能包括：
+1. 每个连接对象拥有自己的上报队列和处理线程
+2. 上报线程的生命周期与连接对象绑定
+3. 使用ConnectionHandler.enqueue_asr_report方法进行上报
+
+具体实现请参考core/connection.py中的相关代码。
+"""
+
+import os
+from config.logger import setup_logging
+from config.manage_api_client import report
+
+TAG = __name__
+logger = setup_logging()
+
+async def report_asr(conn, text, file_path):
+    """执行ASR上报操作
+    
+    Args:
+        conn: 连接对象
+        text: 识别文本
+        file_path: 音频文件路径（可以为None或空字符串，表示纯文本上报）
+    """
+    audio_data = None
+    try:
+        # 处理无音频的纯文本上报
+        if not file_path or not os.path.exists(file_path):
+            # 纯文本上报时使用空音频数据
+            result = await report(
+                mac_address=conn.device_id,
+                session_id=conn.session_id,
+                sort=int(conn.session_open_time),
+                chat_type=1,  # ASR类型为1
+                content=text,
+                audio=b'',  # 空音频数据
+                file_extension="wav"
+            )
+            logger.bind(tag=TAG).info(f"纯文本上报成功: {conn.device_id}, {conn.session_id}")
+        else:
+            # 读取文件为二进制数据
+            with open(file_path, 'rb') as f:
+                audio_data = f.read()
+                
+            # 正常ASR上报（带音频）
+            result = await report(
+                mac_address=conn.device_id,
+                session_id=conn.session_id,
+                sort=int(conn.session_open_time),
+                chat_type=1,  # ASR类型为1
+                content=text,
+                audio=audio_data,
+                file_extension="wav"
+            )
+            logger.bind(tag=TAG).info(f"ASR上报成功: {conn.device_id}, {conn.session_id}，文件: {file_path}")
+        
+        return result
+    except Exception as e:
+        logger.bind(tag=TAG).error(f"ASR上报失败: {e}")
+        return None
+    finally:
+        # 清理资源
+        if file_path and os.path.exists(file_path):
+            try:
+                os.remove(file_path)
+                logger.bind(tag=TAG).debug(f"ASR上报后删除文件: {file_path}")
+            except Exception as e:
+                logger.bind(tag=TAG).error(f"ASR上报后删除文件失败: {e}")
+        
+        # 手动清理audio_data
+        if audio_data:
+            del audio_data
+
+def enqueue_asr_report(conn, text, audio):
+    """将ASR数据加入上报队列
+    
+    Args:
+        conn: 连接对象
+        text: 识别文本
+        audio: 音频数据（可以为空列表，表示纯文本上报）
+    """
+    try:
+        if not audio or len(audio) == 0:
+            # 纯文本上报，不需要保存文件
+            file_path = None
+        else:
+            # 保存音频数据到文件
+            file_path = conn.asr.save_audio_to_file(audio, conn.session_id)
+        
+        # 使用连接对象的队列，传入文件路径
+        conn.asr_report_queue.put((text, file_path))
+        
+        if not audio or len(audio) == 0:
+            logger.bind(tag=TAG).info(f"纯文本数据已加入上报队列: {conn.device_id}, {text[:20] if text else ''}...")
+        else:
+            logger.bind(tag=TAG).info(f"ASR数据已加入上报队列: {conn.device_id}, 文件: {file_path}")
+    except Exception as e:
+        logger.bind(tag=TAG).error(f"加入ASR上报队列失败: {e}")
diff --git a/main/xiaozhi-server/core/handle/receiveAudioHandle.py b/main/xiaozhi-server/core/handle/receiveAudioHandle.py
index 485544f7..2d8b0eef 100644
--- a/main/xiaozhi-server/core/handle/receiveAudioHandle.py
+++ b/main/xiaozhi-server/core/handle/receiveAudioHandle.py
@@ -4,6 +4,7 @@ from core.utils.util import remove_punctuation_and_length
 from core.handle.sendAudioHandle import send_stt_message
 from core.handle.intentHandler import handle_user_intent
 from core.utils.output_counter import check_device_output_limit
+from core.handle.asrReportHandle import enqueue_asr_report
 
 TAG = __name__
 logger = setup_logging()
@@ -40,6 +41,9 @@ async def handleAudioMessage(conn, audio):
             logger.bind(tag=TAG).info(f"识别文本: {text}")
             text_len, _ = remove_punctuation_and_length(text)
             if text_len > 0:
+                # 使用自定义模块进行上报
+                enqueue_asr_report(conn, text, conn.asr_audio)
+
                 await startToChat(conn, text)
             else:
                 conn.asr_server_receive = True
diff --git a/main/xiaozhi-server/core/handle/textHandle.py b/main/xiaozhi-server/core/handle/textHandle.py
index a26f5bd9..fa81eb76 100644
--- a/main/xiaozhi-server/core/handle/textHandle.py
+++ b/main/xiaozhi-server/core/handle/textHandle.py
@@ -6,6 +6,7 @@ from core.utils.util import remove_punctuation_and_length
 from core.handle.receiveAudioHandle import startToChat, handleAudioMessage
 from core.handle.sendAudioHandle import send_stt_message, send_tts_message
 from core.handle.iotHandle import handleIotDescriptors, handleIotStatus
+from core.handle.asrReportHandle import enqueue_asr_report
 import asyncio
 
 TAG = __name__
@@ -54,8 +55,12 @@ async def handleTextMessage(conn, message):
                         await send_stt_message(conn, text)
                         await send_tts_message(conn, "stop", None)
                     elif is_wakeup_words:
+                        # 上报纯文字数据（复用ASR上报功能，但不提供音频数据）
+                        enqueue_asr_report(conn, "嘿，你好呀", [])
                         await startToChat(conn, "嘿，你好呀")
                     else:
+                        # 上报纯文字数据（复用ASR上报功能，但不提供音频数据）
+                        enqueue_asr_report(conn, text, [])
                         # 否则需要LLM对文字内容进行答复
                         await startToChat(conn, text)
         elif msg_json["type"] == "iot":
diff --git a/main/xiaozhi-server/core/handle/ttsReportHandle.py b/main/xiaozhi-server/core/handle/ttsReportHandle.py
new file mode 100644
index 00000000..ed3a6a76
--- /dev/null
+++ b/main/xiaozhi-server/core/handle/ttsReportHandle.py
@@ -0,0 +1,70 @@
+"""
+TTS上报功能已集成到ConnectionHandler类中。
+
+上报功能包括：
+1. 每个连接对象拥有自己的上报队列和处理线程
+2. 上报线程的生命周期与连接对象绑定
+3. 使用ConnectionHandler.enqueue_tts_report方法进行上报
+
+具体实现请参考core/connection.py中的相关代码。
+"""
+
+import os
+from config.logger import setup_logging
+from config.manage_api_client import report
+
+TAG = __name__
+logger = setup_logging()
+
+async def report_tts(conn, text, audio_data):
+    """执行TTS上报操作
+    
+    Args:
+        conn: 连接对象
+        text: 合成文本
+        audio_data: 音频二进制数据
+    """
+    try:
+        # 执行上报
+        result = await report(
+            mac_address=conn.device_id,
+            session_id=conn.session_id,
+            sort=int(conn.session_open_time),
+            chat_type=2,  # TTS类型为2
+            content=text,
+            audio=audio_data,
+            file_extension="wav"
+        )
+        logger.bind(tag=TAG).info(f"TTS上报成功: {conn.device_id}, {conn.session_id}, 数据大小: {len(audio_data)} 字节")
+        return result
+    except Exception as e:
+        logger.bind(tag=TAG).error(f"TTS上报失败: {e}")
+        return None
+    finally:
+        # 手动清理audio_data引用，帮助垃圾回收
+        del audio_data
+
+def enqueue_tts_report(conn, text, file_path):
+    """将TTS数据加入上报队列
+    
+    Args:
+        conn: 连接对象
+        text: 合成文本
+        file_path: TTS音频文件路径
+    """
+    try:
+        # 检查文件是否存在
+        if not file_path or not os.path.exists(file_path):
+            logger.bind(tag=TAG).error(f"加入TTS上报队列失败: 文件不存在 {file_path}")
+            return
+            
+        # 立即读取文件为二进制数据，因为外部会删除文件
+        with open(file_path, 'rb') as f:
+            audio_data = f.read()
+            
+        # 使用连接对象的队列，传入文本和二进制数据而非文件路径
+        conn.tts_report_queue.put((text, audio_data))
+        
+        logger.bind(tag=TAG).info(f"TTS数据已加入上报队列: {conn.device_id}, 文件大小: {len(audio_data)} 字节")
+    except Exception as e:
+        logger.bind(tag=TAG).error(f"加入TTS上报队列失败: {e}, 文件: {file_path}")
diff --git a/main/xiaozhi-server/core/utils/util.py b/main/xiaozhi-server/core/utils/util.py
index 1cc9742b..a1956cee 100644
--- a/main/xiaozhi-server/core/utils/util.py
+++ b/main/xiaozhi-server/core/utils/util.py
@@ -484,4 +484,4 @@ def analyze_emotion(text):
         if emotion in top_emotions:
             return emotion
 
-    return top_emotions[0]  # 如果都不在优先级列表里，返回第一个
\ No newline at end of file
+    return top_emotions[0]  # 如果都不在优先级列表里，返回第一个

From 17192440158c70060e1e84612164fa9ac5c3c887 Mon Sep 17 00:00:00 2001
From: CGD <3030332422@qq.com>
Date: Wed, 30 Apr 2025 18:11:46 +0800
Subject: [PATCH 20/53] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9python=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E7=9A=84=E2=80=9C=E5=8A=A8=E6=80=81=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E2=80=9D=E7=9A=84=E9=AA=8C=E8=AF=81=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/core/connection.py        | 11 -----------
 main/xiaozhi-server/core/handle/textHandle.py | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index fbd3569e..a8259e34 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -222,19 +222,8 @@ class ConnectionHandler:
     async def handle_config_update(self, message):
         """处理配置更新请求"""
         content = message.get("content", {})
-        secret = content.pop("secret", None)
         new_config = content
 
-        # 密钥验证
-        if secret != "43c716ae-37c4-49ba-84ab-2f0fbfcd7115":
-            self.logger.bind(tag=TAG).warning("配置更新请求的密钥不正确")
-            await self.websocket.send(json.dumps({
-                "type": "config_update_response",
-                "status": "error",
-                "message": "密钥不正确"
-            }))
-            return
-
         # 遍历所有支持的配置模块
         updated_modules = []
         for config_model in ["tts", "llm", "vad", "asr", "memory", "intent"]:
diff --git a/main/xiaozhi-server/core/handle/textHandle.py b/main/xiaozhi-server/core/handle/textHandle.py
index a26f5bd9..9afe7b62 100644
--- a/main/xiaozhi-server/core/handle/textHandle.py
+++ b/main/xiaozhi-server/core/handle/textHandle.py
@@ -64,6 +64,22 @@ async def handleTextMessage(conn, message):
             if "states" in msg_json:
                 asyncio.create_task(handleIotStatus(conn, msg_json["states"]))
         elif msg_json["type"] == "server":
+            # 如果配置是从API读取的，则需要验证secret
+            read_config_from_api = conn.config.get("read_config_from_api", False)
+            if not read_config_from_api:
+                return
+            # 获取post请求的secret
+            post_secret = msg_json.get("content", {}).get("secret", "")
+            secret = conn.config["manager-api"].get("secret", "")
+            # 如果secret不匹配，则返回
+            if post_secret != secret:
+                await conn.websocket.send(json.dumps({
+                    "type": "config_update_response",
+                    "status": "error",
+                    "message": "服务器密钥验证失败"
+                }))
+                return
+            # 动态更新配置
             if msg_json["action"] == "update_config":
                 await conn.handle_config_update(msg_json)
     except json.JSONDecodeError:

From 54692859fde8782962d84b87a25a1a91aad3a8a6 Mon Sep 17 00:00:00 2001
From: MakerZorky <152245790+MakerZorky@users.noreply.github.com>
Date: Wed, 30 Apr 2025 19:23:44 +0800
Subject: [PATCH 21/53] =?UTF-8?q?Update:config.yaml=E7=83=AD=E8=AF=8D?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/config.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/main/xiaozhi-server/config.yaml b/main/xiaozhi-server/config.yaml
index 7565179c..6948aebd 100644
--- a/main/xiaozhi-server/config.yaml
+++ b/main/xiaozhi-server/config.yaml
@@ -232,8 +232,9 @@ ASR:
     appid: 你的火山引擎语音合成服务appid
     access_token: 你的火山引擎语音合成服务access_token
     cluster: volcengine_input_common
-    boosting_table_name: 你的热词文件名称
-    correct_table_name: 你的替换词文件名称
+    # 热词、替换词使用流程：https://www.volcengine.com/docs/6561/155738
+    boosting_table_name: （选填）你的热词文件名称
+    correct_table_name: （选填）你的替换词文件名称
     output_dir: tmp/
   TencentASR:
     # token申请地址：https://console.cloud.tencent.com/cam/capi

From 48f7ef2023be058a82adee6e3575dff782dd9e1b Mon Sep 17 00:00:00 2001
From: zccaif <zccaif@isstech.com>
Date: Wed, 30 Apr 2025 22:46:55 +0800
Subject: [PATCH 22/53] =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sys/controller/AdminController.java       |   1 -
 .../sys/controller/SysDictDataController.java |  96 +++++++++++++++++
 .../sys/controller/SysDictTypeController.java |  93 ++++++++++++++++
 .../modules/sys/dao/SysDictDataDao.java       |  10 --
 .../modules/sys/dao/SysDictTypeDao.java       |   8 --
 .../modules/sys/dto/SysDictTypeDTO.java       |   1 +
 .../xiaozhi/modules/sys/entity/DictData.java  |  16 ---
 .../xiaozhi/modules/sys/entity/DictType.java  |  19 ----
 .../modules/sys/entity/SysDictTypeEntity.java |   2 +-
 .../sys/service/SysDictDataService.java       |  32 +++++-
 .../sys/service/SysDictTypeService.java       |  42 ++++++--
 .../service/impl/SysDictDataServiceImpl.java  |  79 ++++++++++++--
 .../service/impl/SysDictTypeServiceImpl.java  | 102 +++++++++++++-----
 .../service/impl/SysUserUtilServiceImpl.java  |   4 +-
 .../xiaozhi/modules/sys/vo/SysDictDataVO.java |  50 +++++++++
 .../xiaozhi/modules/sys/vo/SysDictTypeVO.java |  47 ++++++++
 .../resources/mapper/sys/SysDictDataDao.xml   |   7 --
 .../resources/mapper/sys/SysDictTypeDao.xml   |   4 -
 18 files changed, 498 insertions(+), 115 deletions(-)
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictDataController.java
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictTypeController.java
 delete mode 100644 main/manager-api/src/main/java/xiaozhi/modules/sys/entity/DictData.java
 delete mode 100644 main/manager-api/src/main/java/xiaozhi/modules/sys/entity/DictType.java
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/sys/vo/SysDictDataVO.java
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/sys/vo/SysDictTypeVO.java

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/AdminController.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/AdminController.java
index e202e1e4..2ccc1e6a 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/AdminController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/AdminController.java
@@ -58,7 +58,6 @@ public class AdminController {
         dto.setLimit((String) params.get(Constant.LIMIT));
         dto.setPage((String) params.get(Constant.PAGE));
         ValidatorUtils.validateEntity(dto);
-        ValidatorUtils.validateEntity(dto);
         PageData<AdminPageUserVO> page = sysUserService.page(dto);
         return new Result<PageData<AdminPageUserVO>>().ok(page);
     }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictDataController.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictDataController.java
new file mode 100644
index 00000000..e1a91df9
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictDataController.java
@@ -0,0 +1,96 @@
+package xiaozhi.modules.sys.controller;
+
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import xiaozhi.common.constant.Constant;
+import xiaozhi.common.page.PageData;
+import xiaozhi.common.utils.Result;
+import xiaozhi.common.validator.ValidatorUtils;
+import xiaozhi.modules.sys.dto.SysDictDataDTO;
+import xiaozhi.modules.sys.service.SysDictDataService;
+import xiaozhi.modules.sys.vo.SysDictDataVO;
+
+/**
+ * 字典数据管理
+ *
+ * @author czc
+ * @since 2025-04-30
+ */
+@AllArgsConstructor
+@RestController
+@RequestMapping("/admin/dict/data")
+@Tag(name = "字典数据管理")
+public class SysDictDataController {
+    private final SysDictDataService sysDictDataService;
+
+    @GetMapping("/page")
+    @Operation(summary = "分页查询字典数据")
+    @RequiresPermissions("sys:role:superAdmin")
+    @Parameters({@Parameter(name = "dictTypeId", description = "字典类型ID", required = true),
+        @Parameter(name = "dictLabel", description = "数据标签"), @Parameter(name = "dictValue", description = "数据值"),
+        @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
+        @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true)})
+    public Result<PageData<SysDictDataVO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params) {
+        ValidatorUtils.validateEntity(params);
+        // 强制校验dictTypeId是否存在
+        if (!params.containsKey("dictTypeId") || StringUtils.isEmpty(String.valueOf(params.get("dictTypeId")))) {
+            return new Result<PageData<SysDictDataVO>>().error("dictTypeId不能为空");
+        }
+
+        PageData<SysDictDataVO> page = sysDictDataService.page(params);
+        return new Result<PageData<SysDictDataVO>>().ok(page);
+    }
+
+    @GetMapping("/{id}")
+    @Operation(summary = "获取字典数据详情")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<SysDictDataVO> get(@PathVariable("id") Long id) {
+        SysDictDataVO vo = sysDictDataService.get(id);
+        return new Result<SysDictDataVO>().ok(vo);
+    }
+
+    @PostMapping("/save")
+    @Operation(summary = "新增字典数据")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<Void> save(@RequestBody SysDictDataDTO dto) {
+        ValidatorUtils.validateEntity(dto);
+        sysDictDataService.save(dto);
+        return new Result<>();
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "修改字典数据")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<Void> update(@RequestBody SysDictDataDTO dto) {
+        ValidatorUtils.validateEntity(dto);
+        sysDictDataService.update(dto);
+        return new Result<>();
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除字典数据")
+    @RequiresPermissions("sys:role:superAdmin")
+    @Parameter(name = "ids", description = "ID数组", required = true)
+    public Result<Void> delete(@RequestBody Long[] ids) {
+        sysDictDataService.delete(ids);
+        return new Result<>();
+    }
+
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictTypeController.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictTypeController.java
new file mode 100644
index 00000000..bf152c19
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictTypeController.java
@@ -0,0 +1,93 @@
+package xiaozhi.modules.sys.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;
+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.tags.Tag;
+import lombok.AllArgsConstructor;
+import xiaozhi.common.constant.Constant;
+import xiaozhi.common.page.PageData;
+import xiaozhi.common.utils.Result;
+import xiaozhi.common.validator.ValidatorUtils;
+import xiaozhi.modules.sys.dto.SysDictTypeDTO;
+import xiaozhi.modules.sys.service.SysDictTypeService;
+import xiaozhi.modules.sys.vo.SysDictTypeVO;
+
+/**
+ * 字典类型管理
+ *
+ * @author czc
+ * @since 2025-04-30
+ */
+@AllArgsConstructor
+@RestController
+@RequestMapping("/admin/dict/type")
+@Tag(name = "字典类型管理")
+public class SysDictTypeController {
+    private final SysDictTypeService sysDictTypeService;
+
+    @GetMapping("/page")
+    @Operation(summary = "分页查询字典类型")
+    @RequiresPermissions("sys:role:superAdmin")
+    @Parameters({@Parameter(name = "dictType", description = "字典类型编码"),
+        @Parameter(name = "dictName", description = "字典类型名称"),
+        @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
+        @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true)})
+    public Result<PageData<SysDictTypeVO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params) {
+        ValidatorUtils.validateEntity(params);
+        PageData<SysDictTypeVO> page = sysDictTypeService.page(params);
+        return new Result<PageData<SysDictTypeVO>>().ok(page);
+    }
+
+    @GetMapping("/{id}")
+    @Operation(summary = "获取字典类型详情")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<SysDictTypeVO> get(@PathVariable("id") Long id) {
+        SysDictTypeVO vo = sysDictTypeService.get(id);
+        return new Result<SysDictTypeVO>().ok(vo);
+    }
+
+    @PostMapping("/save")
+    @Operation(summary = "保存字典类型")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<Void> save(@RequestBody SysDictTypeDTO dto) {
+        // 参数校验
+        ValidatorUtils.validateEntity(dto);
+
+        sysDictTypeService.save(dto);
+        return new Result<>();
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "修改字典类型")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<Void> update(@RequestBody SysDictTypeDTO dto) {
+        // 参数校验
+        ValidatorUtils.validateEntity(dto);
+
+        sysDictTypeService.update(dto);
+        return new Result<>();
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除字典类型")
+    @RequiresPermissions("sys:role:superAdmin")
+    @Parameter(name = "ids", description = "ID数组", required = true)
+    public Result<Void> delete(@RequestBody Long[] ids) {
+        sysDictTypeService.delete(ids);
+        return new Result<>();
+    }
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysDictDataDao.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysDictDataDao.java
index 9dd124fe..3ca5fb8c 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysDictDataDao.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysDictDataDao.java
@@ -1,12 +1,8 @@
 package xiaozhi.modules.sys.dao;
 
-import java.util.List;
-
 import org.apache.ibatis.annotations.Mapper;
 
 import xiaozhi.common.dao.BaseDao;
-import xiaozhi.modules.sys.dto.SysDictDataDTO;
-import xiaozhi.modules.sys.entity.DictData;
 import xiaozhi.modules.sys.entity.SysDictDataEntity;
 
 /**
@@ -15,10 +11,4 @@ import xiaozhi.modules.sys.entity.SysDictDataEntity;
 @Mapper
 public interface SysDictDataDao extends BaseDao<SysDictDataEntity> {
 
-    /**
-     * 字典数据列表
-     */
-    List<DictData> getDictDataList();
-
-    List<SysDictDataDTO> getDataByTypeCode(String dictType);
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysDictTypeDao.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysDictTypeDao.java
index 5a9d5a27..6c271e31 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysDictTypeDao.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysDictTypeDao.java
@@ -1,11 +1,8 @@
 package xiaozhi.modules.sys.dao;
 
-import java.util.List;
-
 import org.apache.ibatis.annotations.Mapper;
 
 import xiaozhi.common.dao.BaseDao;
-import xiaozhi.modules.sys.entity.DictType;
 import xiaozhi.modules.sys.entity.SysDictTypeEntity;
 
 /**
@@ -14,9 +11,4 @@ import xiaozhi.modules.sys.entity.SysDictTypeEntity;
 @Mapper
 public interface SysDictTypeDao extends BaseDao<SysDictTypeEntity> {
 
-    /**
-     * 字典类型列表
-     */
-    List<DictType> getDictTypeList();
-
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/SysDictTypeDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/SysDictTypeDTO.java
index 01d69795..912c817c 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/SysDictTypeDTO.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/SysDictTypeDTO.java
@@ -51,5 +51,6 @@ public class SysDictTypeDTO implements Serializable {
 
     @Schema(description = "更新时间")
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    @JsonFormat(pattern = DateUtils.DATE_TIME_PATTERN)
     private Date updateDate;
 }
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/entity/DictData.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/entity/DictData.java
deleted file mode 100644
index c8deac81..00000000
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/entity/DictData.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package xiaozhi.modules.sys.entity;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import lombok.Data;
-
-/**
- * 字典数据
- */
-@Data
-public class DictData {
-    @JsonIgnore
-    private Long dictTypeId;
-    private String dictLabel;
-    private String dictValue;
-}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/entity/DictType.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/entity/DictType.java
deleted file mode 100644
index 4a1e2ca5..00000000
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/entity/DictType.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package xiaozhi.modules.sys.entity;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-import lombok.Data;
-
-/**
- * 字典类型
- */
-@Data
-public class DictType {
-    @JsonIgnore
-    private Long id;
-    private String dictType;
-    private List<DictData> dataList = new ArrayList<>();
-}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/entity/SysDictTypeEntity.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/entity/SysDictTypeEntity.java
index fa372055..350d857b 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/entity/SysDictTypeEntity.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/entity/SysDictTypeEntity.java
@@ -18,7 +18,7 @@ import xiaozhi.common.entity.BaseEntity;
 @TableName("sys_dict_type")
 public class SysDictTypeEntity extends BaseEntity {
     /**
-     * 字典类型
+     * 字典类型编码
      */
     private String dictType;
     /**
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysDictDataService.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysDictDataService.java
index a33df029..5b4a9317 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysDictDataService.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysDictDataService.java
@@ -6,20 +6,48 @@ import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.BaseService;
 import xiaozhi.modules.sys.dto.SysDictDataDTO;
 import xiaozhi.modules.sys.entity.SysDictDataEntity;
+import xiaozhi.modules.sys.vo.SysDictDataVO;
 
 /**
  * 数据字典
  */
 public interface SysDictDataService extends BaseService<SysDictDataEntity> {
 
-    PageData<SysDictDataDTO> page(Map<String, Object> params);
+    /**
+     * 分页查询数据字典信息
+     *
+     * @param params 查询参数，包含分页信息和查询条件
+     * @return 返回数据字典的分页查询结果
+     */
+    PageData<SysDictDataVO> page(Map<String, Object> params);
 
-    SysDictDataDTO get(Long id);
+    /**
+     * 根据ID获取数据字典实体
+     *
+     * @param id 数据字典实体的唯一标识
+     * @return 返回数据字典实体的详细信息
+     */
+    SysDictDataVO get(Long id);
 
+    /**
+     * 保存新的数据字典项
+     *
+     * @param dto 数据字典项的保存数据传输对象
+     */
     void save(SysDictDataDTO dto);
 
+    /**
+     * 更新数据字典项
+     *
+     * @param dto 数据字典项的更新数据传输对象
+     */
     void update(SysDictDataDTO dto);
 
+    /**
+     * 删除数据字典项
+     *
+     * @param ids 要删除的数据字典项的ID数组
+     */
     void delete(Long[] ids);
 
 }
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysDictTypeService.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysDictTypeService.java
index a18e086f..697b2d10 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysDictTypeService.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysDictTypeService.java
@@ -6,25 +6,55 @@ import java.util.Map;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.BaseService;
 import xiaozhi.modules.sys.dto.SysDictTypeDTO;
-import xiaozhi.modules.sys.entity.DictType;
 import xiaozhi.modules.sys.entity.SysDictTypeEntity;
+import xiaozhi.modules.sys.vo.SysDictTypeVO;
 
 /**
  * 数据字典
  */
 public interface SysDictTypeService extends BaseService<SysDictTypeEntity> {
 
-    PageData<SysDictTypeDTO> page(Map<String, Object> params);
+    /**
+     * 分页查询字典类型信息
+     *
+     * @param params 查询参数，包含分页信息和查询条件
+     * @return 返回分页的字典类型数据
+     */
+    PageData<SysDictTypeVO> page(Map<String, Object> params);
 
-    SysDictTypeDTO get(Long id);
+    /**
+     * 根据ID获取字典类型信息
+     *
+     * @param id 字典类型ID
+     * @return 返回字典类型对象
+     */
+    SysDictTypeVO get(Long id);
 
+    /**
+     * 保存字典类型信息
+     *
+     * @param dto 字典类型数据传输对象
+     */
     void save(SysDictTypeDTO dto);
 
+    /**
+     * 更新字典类型信息
+     *
+     * @param dto 字典类型数据传输对象
+     */
     void update(SysDictTypeDTO dto);
 
+    /**
+     * 删除字典类型信息
+     *
+     * @param ids 要删除的字典类型ID数组
+     */
     void delete(Long[] ids);
 
-    List<DictType> getAllList();
-
-    List<DictType> getDictTypeList();
+    /**
+     * 列出所有字典类型信息
+     *
+     * @return 返回字典类型列表
+     */
+    List<SysDictTypeVO> list(Map<String, Object> params);
 }
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictDataServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictDataServiceImpl.java
index 20530e6b..6ca83eea 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictDataServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictDataServiceImpl.java
@@ -1,43 +1,58 @@
 package xiaozhi.modules.sys.service.impl;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import lombok.AllArgsConstructor;
+import xiaozhi.common.exception.RenException;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.utils.ConvertUtils;
 import xiaozhi.modules.sys.dao.SysDictDataDao;
+import xiaozhi.modules.sys.dao.SysUserDao;
 import xiaozhi.modules.sys.dto.SysDictDataDTO;
 import xiaozhi.modules.sys.entity.SysDictDataEntity;
+import xiaozhi.modules.sys.entity.SysUserEntity;
 import xiaozhi.modules.sys.service.SysDictDataService;
+import xiaozhi.modules.sys.vo.SysDictDataVO;
 
 /**
  * 字典类型
  */
 @Service
+@AllArgsConstructor
 public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysDictDataEntity>
-        implements SysDictDataService {
+    implements SysDictDataService {
+    private final SysUserDao sysUserDao;
 
     @Override
-    public PageData<SysDictDataDTO> page(Map<String, Object> params) {
-        IPage<SysDictDataEntity> page = baseDao.selectPage(
-                getPage(params, "sort", true),
-                getWrapper(params));
+    public PageData<SysDictDataVO> page(Map<String, Object> params) {
+        IPage<SysDictDataEntity> page = baseDao.selectPage(getPage(params, "sort", true), getWrapper(params));
 
-        return getPageData(page, SysDictDataDTO.class);
+        PageData<SysDictDataVO> pageData = getPageData(page, SysDictDataVO.class);
+
+        setUserName(pageData.getList());
+
+        return pageData;
     }
 
     private QueryWrapper<SysDictDataEntity> getWrapper(Map<String, Object> params) {
-        String dictTypeId = (String) params.get("dictTypeId");
-        String dictLabel = (String) params.get("dictLabel");
-        String dictValue = (String) params.get("dictValue");
+        String dictTypeId = (String)params.get("dictTypeId");
+        String dictLabel = (String)params.get("dictLabel");
+        String dictValue = (String)params.get("dictValue");
 
         QueryWrapper<SysDictDataEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("dict_type_id", Long.parseLong(dictTypeId));
@@ -48,15 +63,18 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
     }
 
     @Override
-    public SysDictDataDTO get(Long id) {
+    public SysDictDataVO get(Long id) {
         SysDictDataEntity entity = baseDao.selectById(id);
 
-        return ConvertUtils.sourceToTarget(entity, SysDictDataDTO.class);
+        return ConvertUtils.sourceToTarget(entity, SysDictDataVO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(SysDictDataDTO dto) {
+        // 相同字典类型的标签不能相同
+        checkDictValueUnique(dto.getDictTypeId(), dto.getDictValue(), null);
+
         SysDictDataEntity entity = ConvertUtils.sourceToTarget(dto, SysDictDataEntity.class);
 
         insert(entity);
@@ -65,6 +83,9 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(SysDictDataDTO dto) {
+        // 相同字典类型的标签不能相同
+        checkDictValueUnique(dto.getDictTypeId(), dto.getDictValue(), String.valueOf(dto.getId()));
+
         SysDictDataEntity entity = ConvertUtils.sourceToTarget(dto, SysDictDataEntity.class);
 
         updateById(entity);
@@ -76,4 +97,40 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
         // 删除
         deleteBatchIds(Arrays.asList(ids));
     }
+
+    /**
+     * 设置用户名
+     *
+     * @param sysDictDataList 字典类型集合
+     */
+    private void setUserName(List<SysDictDataVO> sysDictDataList) {
+        // 收集所有用户 ID
+        Set<Long> userIds = sysDictDataList.stream().flatMap(vo -> Stream.of(vo.getCreator(), vo.getUpdater()))
+            .filter(Objects::nonNull).collect(Collectors.toSet());
+
+        // 设置更新者和创建者名称
+        if (!userIds.isEmpty()) {
+            List<SysUserEntity> sysUserEntities = sysUserDao.selectBatchIds(userIds);
+            // 把List转成Map，Map<Long, String>
+            Map<Long, String> userNameMap = sysUserEntities.stream().collect(Collectors.toMap(SysUserEntity::getId,
+                SysUserEntity::getUsername, (existing, replacement) -> existing));
+
+            sysDictDataList.forEach(vo -> {
+                vo.setCreatorName(userNameMap.get(vo.getCreator()));
+                vo.setUpdaterName(userNameMap.get(vo.getUpdater()));
+            });
+        }
+    }
+
+    private void checkDictValueUnique(Long dictTypeId, String dictValue, String excludeId) {
+        LambdaQueryWrapper<SysDictDataEntity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysDictDataEntity::getDictTypeId, dictTypeId).eq(SysDictDataEntity::getDictLabel, dictValue);
+        if (StringUtils.isNotBlank(excludeId)) {
+            queryWrapper.ne(SysDictDataEntity::getId, excludeId);
+        }
+        boolean exists = baseDao.exists(queryWrapper);
+        if (exists) {
+            throw new RenException("字典标签重复");
+        }
+    }
 }
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictTypeServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictTypeServiceImpl.java
index ce2e423e..415b7adb 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictTypeServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictTypeServiceImpl.java
@@ -3,47 +3,56 @@ package xiaozhi.modules.sys.service.impl;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import lombok.AllArgsConstructor;
+import xiaozhi.common.exception.RenException;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.utils.ConvertUtils;
-import xiaozhi.modules.sys.dao.SysDictDataDao;
 import xiaozhi.modules.sys.dao.SysDictTypeDao;
+import xiaozhi.modules.sys.dao.SysUserDao;
 import xiaozhi.modules.sys.dto.SysDictTypeDTO;
-import xiaozhi.modules.sys.entity.DictData;
-import xiaozhi.modules.sys.entity.DictType;
 import xiaozhi.modules.sys.entity.SysDictTypeEntity;
+import xiaozhi.modules.sys.entity.SysUserEntity;
 import xiaozhi.modules.sys.service.SysDictTypeService;
+import xiaozhi.modules.sys.vo.SysDictTypeVO;
 
 /**
  * 字典类型
  */
-@AllArgsConstructor
 @Service
+@AllArgsConstructor
 public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysDictTypeEntity>
-        implements SysDictTypeService {
-    private final SysDictDataDao sysDictDataDao;
+    implements SysDictTypeService {
+
+    private final SysUserDao sysUserDao;
 
     @Override
-    public PageData<SysDictTypeDTO> page(Map<String, Object> params) {
-        IPage<SysDictTypeEntity> page = baseDao.selectPage(
-                getPage(params, "sort", true),
-                getWrapper(params));
+    public PageData<SysDictTypeVO> page(Map<String, Object> params) {
+        IPage<SysDictTypeEntity> page = baseDao.selectPage(getPage(params, "sort", true), getWrapper(params));
 
-        return getPageData(page, SysDictTypeDTO.class);
+        PageData<SysDictTypeVO> pageData = getPageData(page, SysDictTypeVO.class);
+
+        setUserName(pageData.getList());
+
+        return pageData;
     }
 
     private QueryWrapper<SysDictTypeEntity> getWrapper(Map<String, Object> params) {
-        String dictType = (String) params.get("dictType");
-        String dictName = (String) params.get("dictName");
+        String dictType = (String)params.get("dictType");
+        String dictName = (String)params.get("dictName");
 
         QueryWrapper<SysDictTypeEntity> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(dictType), "dict_type", dictType);
@@ -53,15 +62,21 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysD
     }
 
     @Override
-    public SysDictTypeDTO get(Long id) {
+    public SysDictTypeVO get(Long id) {
         SysDictTypeEntity entity = baseDao.selectById(id);
+        if (entity == null) {
+            throw new RenException("字典类型不存在");
+        }
 
-        return ConvertUtils.sourceToTarget(entity, SysDictTypeDTO.class);
+        return ConvertUtils.sourceToTarget(entity, SysDictTypeVO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(SysDictTypeDTO dto) {
+        // 字典类型编码不能重复
+        checkDictTypeUnique(dto.getDictType(), null);
+
         SysDictTypeEntity entity = ConvertUtils.sourceToTarget(dto, SysDictTypeEntity.class);
 
         insert(entity);
@@ -70,6 +85,9 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(SysDictTypeDTO dto) {
+        // 字典类型编码不能重复
+        checkDictTypeUnique(dto.getDictType(), String.valueOf(dto.getId()));
+
         SysDictTypeEntity entity = ConvertUtils.sourceToTarget(dto, SysDictTypeEntity.class);
 
         updateById(entity);
@@ -83,22 +101,48 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysD
     }
 
     @Override
-    public List<DictType> getAllList() {
-        List<DictType> typeList = baseDao.getDictTypeList();
-        List<DictData> dataList = sysDictDataDao.getDictDataList();
-        for (DictType type : typeList) {
-            for (DictData data : dataList) {
-                if (type.getId().equals(data.getDictTypeId())) {
-                    type.getDataList().add(data);
-                }
-            }
+    public List<SysDictTypeVO> list(Map<String, Object> params) {
+        List<SysDictTypeEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<SysDictTypeVO> sysDictTypeVOList = ConvertUtils.sourceToTarget(entityList, SysDictTypeVO.class);
+        // 设置用户名
+        setUserName(sysDictTypeVOList);
+
+        return sysDictTypeVOList;
+    }
+
+    /**
+     * 设置用户名
+     *
+     * @param sysDictTypeList 字典类型集合
+     */
+    private void setUserName(List<SysDictTypeVO> sysDictTypeList) {
+        // 收集所有用户 ID
+        Set<Long> userIds = sysDictTypeList.stream().flatMap(vo -> Stream.of(vo.getCreator(), vo.getUpdater()))
+            .filter(Objects::nonNull).collect(Collectors.toSet());
+
+        // 设置更新者和创建者名称
+        if (!userIds.isEmpty()) {
+            List<SysUserEntity> sysUserEntities = sysUserDao.selectBatchIds(userIds);
+            // 把List转成Map，Map<Long, String>
+            Map<Long, String> userNameMap = sysUserEntities.stream().collect(Collectors.toMap(SysUserEntity::getId,
+                SysUserEntity::getUsername, (existing, replacement) -> existing));
+
+            sysDictTypeList.forEach(vo -> {
+                vo.setCreatorName(userNameMap.get(vo.getCreator()));
+                vo.setUpdaterName(userNameMap.get(vo.getUpdater()));
+            });
         }
-        return typeList;
     }
 
-    @Override
-    public List<DictType> getDictTypeList() {
-        return baseDao.getDictTypeList();
+    private void checkDictTypeUnique(String dictType, String excludeId) {
+        LambdaQueryWrapper<SysDictTypeEntity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysDictTypeEntity::getDictType, dictType);
+        if (StringUtils.isNotBlank(excludeId)) {
+            queryWrapper.ne(SysDictTypeEntity::getId, excludeId);
+        }
+        boolean exists = baseDao.exists(queryWrapper);
+        if (exists) {
+            throw new RenException("字典类型编码重复");
+        }
     }
-
 }
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserUtilServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserUtilServiceImpl.java
index 8fd0351a..f4fe601a 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserUtilServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserUtilServiceImpl.java
@@ -20,7 +20,9 @@ public class SysUserUtilServiceImpl extends BaseServiceImpl<SysUserDao, SysUserE
     @Override
     public void assignUsername(Long userId, Consumer<String> setter) {
         String userIdKey = RedisKeys.getUserIdKey(userId);
-        String username = redisUtils.get(userIdKey).toString();
+
+        Object value = redisUtils.get(userIdKey);
+        String username = (value != null) ? value.toString() : null;
         if(username != null){
             setter.accept(username);
         }else {
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/vo/SysDictDataVO.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/vo/SysDictDataVO.java
new file mode 100644
index 00000000..40025b70
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/vo/SysDictDataVO.java
@@ -0,0 +1,50 @@
+package xiaozhi.modules.sys.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 字典数据VO
+ */
+@Data
+@Schema(description = "字典数据VO")
+public class SysDictDataVO implements Serializable {
+    @Schema(description = "主键")
+    private Long id;
+
+    @Schema(description = "字典类型ID")
+    private Long dictTypeId;
+
+    @Schema(description = "字典标签")
+    private String dictLabel;
+
+    @Schema(description = "字典值")
+    private String dictValue;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "排序")
+    private Integer sort;
+
+    @Schema(description = "创建者")
+    private Long creator;
+
+    @Schema(description = "创建者名称")
+    private String creatorName;
+
+    @Schema(description = "创建时间")
+    private Date createDate;
+
+    @Schema(description = "更新者")
+    private Long updater;
+
+    @Schema(description = "更新者名称")
+    private String updaterName;
+
+    @Schema(description = "更新时间")
+    private Date updateDate;
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/vo/SysDictTypeVO.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/vo/SysDictTypeVO.java
new file mode 100644
index 00000000..5e5844f3
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/vo/SysDictTypeVO.java
@@ -0,0 +1,47 @@
+package xiaozhi.modules.sys.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 字典类型VO
+ */
+@Data
+@Schema(description = "字典类型VO")
+public class SysDictTypeVO implements Serializable {
+    @Schema(description = "主键")
+    private Long id;
+
+    @Schema(description = "字典类型")
+    private String dictType;
+
+    @Schema(description = "字典名称")
+    private String dictName;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "排序")
+    private Integer sort;
+
+    @Schema(description = "创建者")
+    private Long creator;
+
+    @Schema(description = "创建者名称")
+    private String creatorName;
+
+    @Schema(description = "创建时间")
+    private Date createDate;
+
+    @Schema(description = "更新者")
+    private Long updater;
+
+    @Schema(description = "更新者名称")
+    private String updaterName;
+
+    @Schema(description = "更新时间")
+    private Date updateDate;
+}
diff --git a/main/manager-api/src/main/resources/mapper/sys/SysDictDataDao.xml b/main/manager-api/src/main/resources/mapper/sys/SysDictDataDao.xml
index 7ea5e429..f1044e27 100644
--- a/main/manager-api/src/main/resources/mapper/sys/SysDictDataDao.xml
+++ b/main/manager-api/src/main/resources/mapper/sys/SysDictDataDao.xml
@@ -3,11 +3,4 @@
 
 <mapper namespace="xiaozhi.modules.sys.dao.SysDictDataDao">
 
-    <select id="getDictDataList" resultType="xiaozhi.modules.sys.entity.DictData">
-        select dict_type_id, dict_label, dict_value from sys_dict_data order by dict_type_id, sort
-    </select>
-
-    <select id="getDataByTypeCode" resultType="xiaozhi.modules.sys.dto.SysDictDataDTO">
-        select * from sys_dict_data WHERE DICT_TYPE_ID =(SELECT id FROM SYS_DICT_TYPE WHERE DICT_TYPE = #{dictType}) order by sort;
-    </select>
 </mapper>
\ No newline at end of file
diff --git a/main/manager-api/src/main/resources/mapper/sys/SysDictTypeDao.xml b/main/manager-api/src/main/resources/mapper/sys/SysDictTypeDao.xml
index 11887552..825db02b 100644
--- a/main/manager-api/src/main/resources/mapper/sys/SysDictTypeDao.xml
+++ b/main/manager-api/src/main/resources/mapper/sys/SysDictTypeDao.xml
@@ -3,8 +3,4 @@
 
 <mapper namespace="xiaozhi.modules.sys.dao.SysDictTypeDao">
 
-    <select id="getDictTypeList" resultType="xiaozhi.modules.sys.entity.DictType">
-        select id, dict_type from sys_dict_type order by dict_type, sort
-    </select>
-
 </mapper>
\ No newline at end of file

From 9b6f894be23ddd5ebcd92ecc91b239cfd23beec3 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Wed, 30 Apr 2025 23:33:17 +0800
Subject: [PATCH 23/53] =?UTF-8?q?update:=E6=99=BA=E6=8E=A7=E4=BD=93?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=98=BF=E9=87=8C=E4=BA=91ASR?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 +-
 .../resources/db/changelog/202504301339.sql   |  3 -
 .../resources/db/changelog/202504301340.sql   | 20 ++++++
 .../db/changelog/db.changelog-master.yaml     |  4 +-
 main/xiaozhi-server/config.yaml               | 65 +++++++++----------
 5 files changed, 55 insertions(+), 39 deletions(-)
 delete mode 100644 main/manager-api/src/main/resources/db/changelog/202504301339.sql
 create mode 100644 main/manager-api/src/main/resources/db/changelog/202504301340.sql

diff --git a/README.md b/README.md
index a8d54c15..b1bf6dae 100644
--- a/README.md
+++ b/README.md
@@ -231,7 +231,7 @@ Websocket接口地址: wss://2662r3426b.vicp.fun/xiaozhi/v1/
 | 使用方式 | 支持平台 | 免费平台 |
 |:---:|:---:|:---:|
 | 本地使用 | FunASR、SherpaASR | FunASR、SherpaASR |
-| 接口调用 | DoubaoASR | - |
+| 接口调用 | DoubaoASR、FunASRServer、TencentASR、AliyunASR | FunASRServer |
 
 ---
 
diff --git a/main/manager-api/src/main/resources/db/changelog/202504301339.sql b/main/manager-api/src/main/resources/db/changelog/202504301339.sql
deleted file mode 100644
index e4393f6a..00000000
--- a/main/manager-api/src/main/resources/db/changelog/202504301339.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-update `ai_model_provider` set `fields` = 
-'[{"key": "api_url","label": "API地址","type": "string"},{"key": "voice","label": "音色","type": "string"},{"key": "output_dir","label": "输出目录","type": "string"},{"key": "authorization","label": "授权","type": "string"},{"key": "appid","label": "应用ID","type": "string"},{"key": "access_token","label": "访问令牌","type": "string"},{"key": "cluster","label": "集群","type": "string"},{"key": "speed_ratio","label": "语速","type": "number"},{"key": "volume_ratio","label": "音量","type": "number"},{"key": "pitch_ratio","label": "音高","type": "number"}]'
-where `id` = 'SYSTEM_TTS_doubao';
diff --git a/main/manager-api/src/main/resources/db/changelog/202504301340.sql b/main/manager-api/src/main/resources/db/changelog/202504301340.sql
new file mode 100644
index 00000000..1f0e2f7c
--- /dev/null
+++ b/main/manager-api/src/main/resources/db/changelog/202504301340.sql
@@ -0,0 +1,20 @@
+update `ai_model_provider` set `fields` = 
+'[{"key": "api_url","label": "API地址","type": "string"},{"key": "voice","label": "音色","type": "string"},{"key": "output_dir","label": "输出目录","type": "string"},{"key": "authorization","label": "授权","type": "string"},{"key": "appid","label": "应用ID","type": "string"},{"key": "access_token","label": "访问令牌","type": "string"},{"key": "cluster","label": "集群","type": "string"},{"key": "speed_ratio","label": "语速","type": "number"},{"key": "volume_ratio","label": "音量","type": "number"},{"key": "pitch_ratio","label": "音高","type": "number"}]'
+where `id` = 'SYSTEM_TTS_doubao';
+
+-- 添加阿里云ASR供应器
+INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `fields`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES
+('SYSTEM_ASR_AliyunASR', 'ASR', 'aliyun', '阿里云语音识别', '[{"key":"appkey","label":"应用AppKey","type":"string"},{"key":"token","label":"临时Token","type":"string"},{"key":"access_key_id","label":"AccessKey ID","type":"string"},{"key":"access_key_secret","label":"AccessKey Secret","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"}]', 5, 1, NOW(), 1, NOW());
+
+-- 添加阿里云ASR模型配置
+INSERT INTO `ai_model_config` VALUES ('ASR_AliyunASR', 'ASR', 'AliyunASR', '阿里云语音识别', 0, 1, '{\"type\": \"aliyun\", \"appkey\": \"\", \"token\": \"\", \"access_key_id\": \"\", \"access_key_secret\": \"\", \"output_dir\": \"tmp/\"}', NULL, NULL, 6, NULL, NULL, NULL, NULL);
+
+-- 更新阿里云ASR模型配置的说明文档
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://nls-portal.console.aliyun.com/',
+`remark` = '阿里云ASR配置说明：
+1. 访问 https://nls-portal.console.aliyun.com/ 开通服务
+2. 访问 https://nls-portal.console.aliyun.com/applist 获取appkey
+3. 访问 https://nls-portal.console.aliyun.com/overview 获取token
+4. 获取access_key_id和access_key_secret
+5. 填入配置文件中' WHERE `id` = 'ASR_AliyunASR';
diff --git a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
index 90735fe1..1d965a15 100755
--- a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -87,9 +87,9 @@ databaseChangeLog:
             encoding: utf8
             path: classpath:db/changelog/202504291043.sql
   - changeSet:
-      id: 202504301339
+      id: 202504301340
       author: Goody
       changes:
         - sqlFile:
             encoding: utf8
-            path: classpath:db/changelog/202504301339.sql
\ No newline at end of file
+            path: classpath:db/changelog/202504301340.sql
\ No newline at end of file
diff --git a/main/xiaozhi-server/config.yaml b/main/xiaozhi-server/config.yaml
index 568d395d..8b5cca86 100644
--- a/main/xiaozhi-server/config.yaml
+++ b/main/xiaozhi-server/config.yaml
@@ -95,6 +95,35 @@ 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 # 刷新音乐列表的时间间隔，单位为秒
+
 # #####################################################################################
 # ################################以下是角色模型配置######################################
 
@@ -162,36 +191,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
@@ -254,7 +253,7 @@ ASR:
     access_key_id: 的阿里云账号access_key_id
     access_key_secret: 你的阿里云账号access_key_secret
     output_dir: tmp/
-    
+
 VAD:
   SileroVAD:
     type: silero
@@ -271,7 +270,7 @@ LLM:
     # 可在这里找到你的 api_key https://bailian.console.aliyun.com/?apiKey=1#/api-key
     base_url: https://dashscope.aliyuncs.com/compatible-mode/v1
     model_name: qwen-turbo
-    api_key: 你的阿里云大模型 key
+    api_key: 你的deepseek web key
     temperature: 0.7  # 温度值
     max_tokens: 500   # 最大生成token数
     top_p: 1
@@ -657,4 +656,4 @@ TTS:
     headers: # 自定义请求头
       # Authorization: Bearer xxxx
     format: wav # 接口返回的音频格式
-    output_dir: tmp/
+    output_dir: tmp/
\ No newline at end of file

From 76f47bce37e34ee1010f53a363b6a01aa528b7c3 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Thu, 1 May 2025 16:57:58 +0800
Subject: [PATCH 24/53] =?UTF-8?q?update:=E5=AD=97=E5=85=B8=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/xiaozhi/common/redis/RedisKeys.java  |   7 +
 .../service/impl/ModelConfigServiceImpl.java  |   4 -
 .../sys/controller/SysDictDataController.java |  21 +-
 .../sys/controller/SysDictTypeController.java |  11 +-
 .../modules/sys/dao/SysDictDataDao.java       |  12 +
 .../sys/service/SysDictDataService.java       |  17 +
 .../service/impl/SysDictDataServiceImpl.java  |  65 +-
 .../service/impl/SysDictTypeServiceImpl.java  |  19 +-
 .../sys/service/impl/SysUserServiceImpl.java  |   1 +
 .../modules/sys/vo/AdminPageUserVO.java       |   5 +
 .../modules/sys/vo/SysDictDataItem.java       |  20 +
 .../resources/db/changelog/202504301340.sql   |  20 -
 .../resources/db/changelog/202504301341.sql   |  85 ++
 .../db/changelog/db.changelog-master.yaml     |   4 +-
 .../resources/mapper/sys/SysDictDataDao.xml   |  12 +
 main/manager-web/src/apis/api.js              |   7 +-
 main/manager-web/src/apis/module/dict.js      | 227 +++++
 .../src/components/DictDataDialog.vue         | 105 +++
 .../src/components/DictTypeDialog.vue         |  86 ++
 .../src/components/FirmwareDialog.vue         |  10 +-
 main/manager-web/src/components/HeaderBar.vue |  60 +-
 main/manager-web/src/router/index.js          |   8 +-
 main/manager-web/src/utils/index.js           |  60 --
 .../src/views/DeviceManagement.vue            |  18 +-
 main/manager-web/src/views/DictManagement.vue | 835 ++++++++++++++++++
 main/manager-web/src/views/OtaManagement.vue  |  20 +-
 main/manager-web/src/views/UserManagement.vue |  12 +-
 main/manager-web/src/views/roleConfig.vue     | 124 +--
 28 files changed, 1653 insertions(+), 222 deletions(-)
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/sys/vo/SysDictDataItem.java
 delete mode 100644 main/manager-api/src/main/resources/db/changelog/202504301340.sql
 create mode 100644 main/manager-api/src/main/resources/db/changelog/202504301341.sql
 create mode 100644 main/manager-web/src/apis/module/dict.js
 create mode 100644 main/manager-web/src/components/DictDataDialog.vue
 create mode 100644 main/manager-web/src/components/DictTypeDialog.vue
 create mode 100644 main/manager-web/src/views/DictManagement.vue

diff --git a/main/manager-api/src/main/java/xiaozhi/common/redis/RedisKeys.java b/main/manager-api/src/main/java/xiaozhi/common/redis/RedisKeys.java
index 5d3b4f32..7cadad2b 100644
--- a/main/manager-api/src/main/java/xiaozhi/common/redis/RedisKeys.java
+++ b/main/manager-api/src/main/java/xiaozhi/common/redis/RedisKeys.java
@@ -96,4 +96,11 @@ public class RedisKeys {
     public static String getOtaDownloadCountKey(String uuid) {
         return "ota:download:count:" + uuid;
     }
+
+    /**
+     * 获取字典数据的缓存key
+     */
+    public static String getDictDataByTypeKey(String dictType) {
+        return "sys:dict:data:" + dictType;
+    }
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java
index 25b03034..1f006d93 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java
@@ -21,9 +21,7 @@ import xiaozhi.common.redis.RedisUtils;
 import xiaozhi.common.service.impl.BaseServiceImpl;
 import xiaozhi.common.utils.ConvertUtils;
 import xiaozhi.modules.agent.dao.AgentDao;
-import xiaozhi.modules.agent.dao.AgentTemplateDao;
 import xiaozhi.modules.agent.entity.AgentEntity;
-import xiaozhi.modules.agent.service.AgentTemplateService;
 import xiaozhi.modules.model.dao.ModelConfigDao;
 import xiaozhi.modules.model.dto.ModelBasicInfoDTO;
 import xiaozhi.modules.model.dto.ModelConfigBodyDTO;
@@ -41,8 +39,6 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
     private final ModelConfigDao modelConfigDao;
     private final ModelProviderService modelProviderService;
     private final RedisUtils redisUtils;
-    private final AgentTemplateDao agentTemplateDao;
-    private final AgentTemplateService agentTemplateService;
     private final AgentDao agentDao;
 
     @Override
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictDataController.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictDataController.java
index e1a91df9..72d1b41b 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictDataController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictDataController.java
@@ -1,10 +1,10 @@
 package xiaozhi.modules.sys.controller;
 
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 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;
@@ -25,6 +25,7 @@ import xiaozhi.common.utils.Result;
 import xiaozhi.common.validator.ValidatorUtils;
 import xiaozhi.modules.sys.dto.SysDictDataDTO;
 import xiaozhi.modules.sys.service.SysDictDataService;
+import xiaozhi.modules.sys.vo.SysDictDataItem;
 import xiaozhi.modules.sys.vo.SysDictDataVO;
 
 /**
@@ -43,10 +44,10 @@ public class SysDictDataController {
     @GetMapping("/page")
     @Operation(summary = "分页查询字典数据")
     @RequiresPermissions("sys:role:superAdmin")
-    @Parameters({@Parameter(name = "dictTypeId", description = "字典类型ID", required = true),
-        @Parameter(name = "dictLabel", description = "数据标签"), @Parameter(name = "dictValue", description = "数据值"),
-        @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
-        @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true)})
+    @Parameters({ @Parameter(name = "dictTypeId", description = "字典类型ID", required = true),
+            @Parameter(name = "dictLabel", description = "数据标签"), @Parameter(name = "dictValue", description = "数据值"),
+            @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
+            @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) })
     public Result<PageData<SysDictDataVO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params) {
         ValidatorUtils.validateEntity(params);
         // 强制校验dictTypeId是否存在
@@ -84,7 +85,7 @@ public class SysDictDataController {
         return new Result<>();
     }
 
-    @DeleteMapping("/delete")
+    @PostMapping("/delete")
     @Operation(summary = "删除字典数据")
     @RequiresPermissions("sys:role:superAdmin")
     @Parameter(name = "ids", description = "ID数组", required = true)
@@ -93,4 +94,12 @@ public class SysDictDataController {
         return new Result<>();
     }
 
+    @GetMapping("/type/{dictType}")
+    @Operation(summary = "获取字典数据列表")
+    @RequiresPermissions("sys:role:superAdmin")
+    public Result<List<SysDictDataItem>> getDictDataByType(@PathVariable("dictType") String dictType) {
+        List<SysDictDataItem> list = sysDictDataService.getDictDataByType(dictType);
+        return new Result<List<SysDictDataItem>>().ok(list);
+    }
+
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictTypeController.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictTypeController.java
index bf152c19..f16409b0 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictTypeController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictTypeController.java
@@ -3,7 +3,6 @@ package xiaozhi.modules.sys.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;
@@ -42,10 +41,10 @@ public class SysDictTypeController {
     @GetMapping("/page")
     @Operation(summary = "分页查询字典类型")
     @RequiresPermissions("sys:role:superAdmin")
-    @Parameters({@Parameter(name = "dictType", description = "字典类型编码"),
-        @Parameter(name = "dictName", description = "字典类型名称"),
-        @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
-        @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true)})
+    @Parameters({ @Parameter(name = "dictType", description = "字典类型编码"),
+            @Parameter(name = "dictName", description = "字典类型名称"),
+            @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
+            @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true) })
     public Result<PageData<SysDictTypeVO>> page(@Parameter(hidden = true) @RequestParam Map<String, Object> params) {
         ValidatorUtils.validateEntity(params);
         PageData<SysDictTypeVO> page = sysDictTypeService.page(params);
@@ -82,7 +81,7 @@ public class SysDictTypeController {
         return new Result<>();
     }
 
-    @DeleteMapping("/delete")
+    @PostMapping("/delete")
     @Operation(summary = "删除字典类型")
     @RequiresPermissions("sys:role:superAdmin")
     @Parameter(name = "ids", description = "ID数组", required = true)
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysDictDataDao.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysDictDataDao.java
index 3ca5fb8c..e5c4c7bb 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysDictDataDao.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/dao/SysDictDataDao.java
@@ -1,9 +1,12 @@
 package xiaozhi.modules.sys.dao;
 
+import java.util.List;
+
 import org.apache.ibatis.annotations.Mapper;
 
 import xiaozhi.common.dao.BaseDao;
 import xiaozhi.modules.sys.entity.SysDictDataEntity;
+import xiaozhi.modules.sys.vo.SysDictDataItem;
 
 /**
  * 字典数据
@@ -11,4 +14,13 @@ import xiaozhi.modules.sys.entity.SysDictDataEntity;
 @Mapper
 public interface SysDictDataDao extends BaseDao<SysDictDataEntity> {
 
+    List<SysDictDataItem> getDictDataByType(String dictType);
+
+    /**
+     * 根据字典类型ID获取字典类型编码
+     * 
+     * @param dictTypeId 字典类型ID
+     * @return 字典类型编码
+     */
+    String getTypeByTypeId(Long dictTypeId);
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysDictDataService.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysDictDataService.java
index 5b4a9317..ea898447 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysDictDataService.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/SysDictDataService.java
@@ -1,11 +1,13 @@
 package xiaozhi.modules.sys.service;
 
+import java.util.List;
 import java.util.Map;
 
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.service.BaseService;
 import xiaozhi.modules.sys.dto.SysDictDataDTO;
 import xiaozhi.modules.sys.entity.SysDictDataEntity;
+import xiaozhi.modules.sys.vo.SysDictDataItem;
 import xiaozhi.modules.sys.vo.SysDictDataVO;
 
 /**
@@ -50,4 +52,19 @@ public interface SysDictDataService extends BaseService<SysDictDataEntity> {
      */
     void delete(Long[] ids);
 
+    /**
+     * 根据字典类型ID删除对应的字典数据
+     *
+     * @param dictTypeId 字典类型ID
+     */
+    void deleteByTypeId(Long dictTypeId);
+
+    /**
+     * 根据字典类型获取字典数据列表
+     *
+     * @param dictType 字典类型
+     * @return 返回字典数据列表
+     */
+    List<SysDictDataItem> getDictDataByType(String dictType);
+
 }
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictDataServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictDataServiceImpl.java
index 6ca83eea..ffe88986 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictDataServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictDataServiceImpl.java
@@ -1,6 +1,5 @@
 package xiaozhi.modules.sys.service.impl;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -19,6 +18,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 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.sys.dao.SysDictDataDao;
@@ -27,6 +28,7 @@ import xiaozhi.modules.sys.dto.SysDictDataDTO;
 import xiaozhi.modules.sys.entity.SysDictDataEntity;
 import xiaozhi.modules.sys.entity.SysUserEntity;
 import xiaozhi.modules.sys.service.SysDictDataService;
+import xiaozhi.modules.sys.vo.SysDictDataItem;
 import xiaozhi.modules.sys.vo.SysDictDataVO;
 
 /**
@@ -35,8 +37,9 @@ import xiaozhi.modules.sys.vo.SysDictDataVO;
 @Service
 @AllArgsConstructor
 public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysDictDataEntity>
-    implements SysDictDataService {
+        implements SysDictDataService {
     private final SysUserDao sysUserDao;
+    private final RedisUtils redisUtils;
 
     @Override
     public PageData<SysDictDataVO> page(Map<String, Object> params) {
@@ -50,9 +53,9 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
     }
 
     private QueryWrapper<SysDictDataEntity> getWrapper(Map<String, Object> params) {
-        String dictTypeId = (String)params.get("dictTypeId");
-        String dictLabel = (String)params.get("dictLabel");
-        String dictValue = (String)params.get("dictValue");
+        String dictTypeId = (String) params.get("dictTypeId");
+        String dictLabel = (String) params.get("dictLabel");
+        String dictValue = (String) params.get("dictValue");
 
         QueryWrapper<SysDictDataEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("dict_type_id", Long.parseLong(dictTypeId));
@@ -78,6 +81,9 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
         SysDictDataEntity entity = ConvertUtils.sourceToTarget(dto, SysDictDataEntity.class);
 
         insert(entity);
+        // 删除Redis缓存
+        String dictType = baseDao.getTypeByTypeId(dto.getDictTypeId());
+        redisUtils.delete(RedisKeys.getDictDataByTypeKey(dictType));
     }
 
     @Override
@@ -89,13 +95,30 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
         SysDictDataEntity entity = ConvertUtils.sourceToTarget(dto, SysDictDataEntity.class);
 
         updateById(entity);
+        // 删除Redis缓存
+        String dictType = baseDao.getTypeByTypeId(dto.getDictTypeId());
+        redisUtils.delete(RedisKeys.getDictDataByTypeKey(dictType));
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(Long[] ids) {
-        // 删除
-        deleteBatchIds(Arrays.asList(ids));
+        for (Long id : ids) {
+            SysDictDataEntity entity = baseDao.selectById(id);
+            // 删除Redis缓存
+            String dictType = baseDao.getTypeByTypeId(entity.getDictTypeId());
+            redisUtils.delete(RedisKeys.getDictDataByTypeKey(dictType));
+            // 删除
+            deleteById(id);
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteByTypeId(Long dictTypeId) {
+        LambdaQueryWrapper<SysDictDataEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysDictDataEntity::getDictTypeId, dictTypeId);
+        baseDao.delete(wrapper);
     }
 
     /**
@@ -106,14 +129,14 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
     private void setUserName(List<SysDictDataVO> sysDictDataList) {
         // 收集所有用户 ID
         Set<Long> userIds = sysDictDataList.stream().flatMap(vo -> Stream.of(vo.getCreator(), vo.getUpdater()))
-            .filter(Objects::nonNull).collect(Collectors.toSet());
+                .filter(Objects::nonNull).collect(Collectors.toSet());
 
         // 设置更新者和创建者名称
         if (!userIds.isEmpty()) {
             List<SysUserEntity> sysUserEntities = sysUserDao.selectBatchIds(userIds);
             // 把List转成Map，Map<Long, String>
             Map<Long, String> userNameMap = sysUserEntities.stream().collect(Collectors.toMap(SysUserEntity::getId,
-                SysUserEntity::getUsername, (existing, replacement) -> existing));
+                    SysUserEntity::getUsername, (existing, replacement) -> existing));
 
             sysDictDataList.forEach(vo -> {
                 vo.setCreatorName(userNameMap.get(vo.getCreator()));
@@ -133,4 +156,28 @@ public class SysDictDataServiceImpl extends BaseServiceImpl<SysDictDataDao, SysD
             throw new RenException("字典标签重复");
         }
     }
+
+    @Override
+    public List<SysDictDataItem> getDictDataByType(String dictType) {
+        if (StringUtils.isBlank(dictType)) {
+            return null;
+        }
+
+        // 先从Redis获取缓存
+        String key = RedisKeys.getDictDataByTypeKey(dictType);
+        List<SysDictDataItem> cachedData = (List<SysDictDataItem>) redisUtils.get(key);
+        if (cachedData != null) {
+            return cachedData;
+        }
+
+        // 如果缓存中没有，则从数据库获取
+        List<SysDictDataItem> data = baseDao.getDictDataByType(dictType);
+
+        // 存入Redis缓存
+        if (data != null) {
+            redisUtils.set(key, data);
+        }
+
+        return data;
+    }
 }
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictTypeServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictTypeServiceImpl.java
index 415b7adb..91522482 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictTypeServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysDictTypeServiceImpl.java
@@ -26,6 +26,7 @@ import xiaozhi.modules.sys.dao.SysUserDao;
 import xiaozhi.modules.sys.dto.SysDictTypeDTO;
 import xiaozhi.modules.sys.entity.SysDictTypeEntity;
 import xiaozhi.modules.sys.entity.SysUserEntity;
+import xiaozhi.modules.sys.service.SysDictDataService;
 import xiaozhi.modules.sys.service.SysDictTypeService;
 import xiaozhi.modules.sys.vo.SysDictTypeVO;
 
@@ -35,9 +36,9 @@ import xiaozhi.modules.sys.vo.SysDictTypeVO;
 @Service
 @AllArgsConstructor
 public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysDictTypeEntity>
-    implements SysDictTypeService {
-
+        implements SysDictTypeService {
     private final SysUserDao sysUserDao;
+    private final SysDictDataService sysDictDataService;
 
     @Override
     public PageData<SysDictTypeVO> page(Map<String, Object> params) {
@@ -51,8 +52,8 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysD
     }
 
     private QueryWrapper<SysDictTypeEntity> getWrapper(Map<String, Object> params) {
-        String dictType = (String)params.get("dictType");
-        String dictName = (String)params.get("dictName");
+        String dictType = (String) params.get("dictType");
+        String dictName = (String) params.get("dictName");
 
         QueryWrapper<SysDictTypeEntity> wrapper = new QueryWrapper<>();
         wrapper.like(StringUtils.isNotBlank(dictType), "dict_type", dictType);
@@ -96,7 +97,11 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysD
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(Long[] ids) {
-        // 删除
+        // 先删除对应的字典数据
+        for (Long id : ids) {
+            sysDictDataService.deleteByTypeId(id);
+        }
+        // 再删除字典类型
         deleteBatchIds(Arrays.asList(ids));
     }
 
@@ -118,14 +123,14 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeDao, SysD
     private void setUserName(List<SysDictTypeVO> sysDictTypeList) {
         // 收集所有用户 ID
         Set<Long> userIds = sysDictTypeList.stream().flatMap(vo -> Stream.of(vo.getCreator(), vo.getUpdater()))
-            .filter(Objects::nonNull).collect(Collectors.toSet());
+                .filter(Objects::nonNull).collect(Collectors.toSet());
 
         // 设置更新者和创建者名称
         if (!userIds.isEmpty()) {
             List<SysUserEntity> sysUserEntities = sysUserDao.selectBatchIds(userIds);
             // 把List转成Map，Map<Long, String>
             Map<Long, String> userNameMap = sysUserEntities.stream().collect(Collectors.toMap(SysUserEntity::getId,
-                SysUserEntity::getUsername, (existing, replacement) -> existing));
+                    SysUserEntity::getUsername, (existing, replacement) -> existing));
 
             sysDictTypeList.forEach(vo -> {
                 vo.setCreatorName(userNameMap.get(vo.getCreator()));
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java
index 30976229..97944ba9 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/service/impl/SysUserServiceImpl.java
@@ -169,6 +169,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
             String deviceCount = deviceService.selectCountByUserId(user.getId()).toString();
             adminPageUserVO.setDeviceCount(deviceCount);
             adminPageUserVO.setStatus(user.getStatus());
+            adminPageUserVO.setCreateDate(user.getCreateDate());
             return adminPageUserVO;
         }).toList();
         return new PageData<>(list, page.getTotal());
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/vo/AdminPageUserVO.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/vo/AdminPageUserVO.java
index a406848f..9f832372 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/vo/AdminPageUserVO.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/vo/AdminPageUserVO.java
@@ -1,5 +1,7 @@
 package xiaozhi.modules.sys.vo;
 
+import java.util.Date;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -23,4 +25,7 @@ public class AdminPageUserVO {
 
     @Schema(description = "用户id")
     private String userid;
+
+    @Schema(description = "注册时间")
+    private Date createDate;
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/vo/SysDictDataItem.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/vo/SysDictDataItem.java
new file mode 100644
index 00000000..f6c81500
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/vo/SysDictDataItem.java
@@ -0,0 +1,20 @@
+package xiaozhi.modules.sys.vo;
+
+import java.io.Serializable;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 字典数据VO
+ */
+@Data
+@Schema(description = "字典数据项")
+public class SysDictDataItem implements Serializable {
+
+    @Schema(description = "字典标签")
+    private String name;
+
+    @Schema(description = "字典值")
+    private String key;
+}
diff --git a/main/manager-api/src/main/resources/db/changelog/202504301340.sql b/main/manager-api/src/main/resources/db/changelog/202504301340.sql
deleted file mode 100644
index 1f0e2f7c..00000000
--- a/main/manager-api/src/main/resources/db/changelog/202504301340.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-update `ai_model_provider` set `fields` = 
-'[{"key": "api_url","label": "API地址","type": "string"},{"key": "voice","label": "音色","type": "string"},{"key": "output_dir","label": "输出目录","type": "string"},{"key": "authorization","label": "授权","type": "string"},{"key": "appid","label": "应用ID","type": "string"},{"key": "access_token","label": "访问令牌","type": "string"},{"key": "cluster","label": "集群","type": "string"},{"key": "speed_ratio","label": "语速","type": "number"},{"key": "volume_ratio","label": "音量","type": "number"},{"key": "pitch_ratio","label": "音高","type": "number"}]'
-where `id` = 'SYSTEM_TTS_doubao';
-
--- 添加阿里云ASR供应器
-INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `fields`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES
-('SYSTEM_ASR_AliyunASR', 'ASR', 'aliyun', '阿里云语音识别', '[{"key":"appkey","label":"应用AppKey","type":"string"},{"key":"token","label":"临时Token","type":"string"},{"key":"access_key_id","label":"AccessKey ID","type":"string"},{"key":"access_key_secret","label":"AccessKey Secret","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"}]', 5, 1, NOW(), 1, NOW());
-
--- 添加阿里云ASR模型配置
-INSERT INTO `ai_model_config` VALUES ('ASR_AliyunASR', 'ASR', 'AliyunASR', '阿里云语音识别', 0, 1, '{\"type\": \"aliyun\", \"appkey\": \"\", \"token\": \"\", \"access_key_id\": \"\", \"access_key_secret\": \"\", \"output_dir\": \"tmp/\"}', NULL, NULL, 6, NULL, NULL, NULL, NULL);
-
--- 更新阿里云ASR模型配置的说明文档
-UPDATE `ai_model_config` SET 
-`doc_link` = 'https://nls-portal.console.aliyun.com/',
-`remark` = '阿里云ASR配置说明：
-1. 访问 https://nls-portal.console.aliyun.com/ 开通服务
-2. 访问 https://nls-portal.console.aliyun.com/applist 获取appkey
-3. 访问 https://nls-portal.console.aliyun.com/overview 获取token
-4. 获取access_key_id和access_key_secret
-5. 填入配置文件中' WHERE `id` = 'ASR_AliyunASR';
diff --git a/main/manager-api/src/main/resources/db/changelog/202504301341.sql b/main/manager-api/src/main/resources/db/changelog/202504301341.sql
new file mode 100644
index 00000000..a88ee783
--- /dev/null
+++ b/main/manager-api/src/main/resources/db/changelog/202504301341.sql
@@ -0,0 +1,85 @@
+update `ai_model_provider` set `fields` = 
+'[{"key": "api_url","label": "API地址","type": "string"},{"key": "voice","label": "音色","type": "string"},{"key": "output_dir","label": "输出目录","type": "string"},{"key": "authorization","label": "授权","type": "string"},{"key": "appid","label": "应用ID","type": "string"},{"key": "access_token","label": "访问令牌","type": "string"},{"key": "cluster","label": "集群","type": "string"},{"key": "speed_ratio","label": "语速","type": "number"},{"key": "volume_ratio","label": "音量","type": "number"},{"key": "pitch_ratio","label": "音高","type": "number"}]'
+where `id` = 'SYSTEM_TTS_doubao';
+
+-- 添加阿里云ASR供应器
+delete from `ai_model_provider` where `id` = 'SYSTEM_ASR_AliyunASR';
+INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `fields`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES
+('SYSTEM_ASR_AliyunASR', 'ASR', 'aliyun', '阿里云语音识别', '[{"key":"appkey","label":"应用AppKey","type":"string"},{"key":"token","label":"临时Token","type":"string"},{"key":"access_key_id","label":"AccessKey ID","type":"string"},{"key":"access_key_secret","label":"AccessKey Secret","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"}]', 5, 1, NOW(), 1, NOW());
+
+-- 添加阿里云ASR模型配置
+delete from `ai_model_config` where `id` = 'ASR_AliyunASR';
+INSERT INTO `ai_model_config` VALUES ('ASR_AliyunASR', 'ASR', 'AliyunASR', '阿里云语音识别', 0, 1, '{\"type\": \"aliyun\", \"appkey\": \"\", \"token\": \"\", \"access_key_id\": \"\", \"access_key_secret\": \"\", \"output_dir\": \"tmp/\"}', NULL, NULL, 6, NULL, NULL, NULL, NULL);
+
+-- 更新阿里云ASR模型配置的说明文档
+UPDATE `ai_model_config` SET 
+`doc_link` = 'https://nls-portal.console.aliyun.com/',
+`remark` = '阿里云ASR配置说明：
+1. 访问 https://nls-portal.console.aliyun.com/ 开通服务
+2. 访问 https://nls-portal.console.aliyun.com/applist 获取appkey
+3. 访问 https://nls-portal.console.aliyun.com/overview 获取token
+4. 获取access_key_id和access_key_secret
+5. 填入配置文件中' WHERE `id` = 'ASR_AliyunASR';
+
+-- 插入固件类型字典类型
+delete from `sys_dict_type` where `id` = 101;
+INSERT INTO `sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES 
+(101, 'FIRMWARE_TYPE', '固件类型', '固件类型字典', 0, 1, NOW(), 1, NOW());
+
+-- 插入固件类型字典数据
+delete from `sys_dict_data` where `dict_type_id` = 101;
+INSERT INTO `sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `remark`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES 
+(101001, 101, '面包板新版接线（WiFi）', 'bread-compact-wifi', '面包板新版接线（WiFi）', 1, 1, NOW(), 1, NOW()),
+(101002, 101, '面包板新版接线（WiFi）+ LCD', 'bread-compact-wifi-lcd', '面包板新版接线（WiFi）+ LCD', 2, 1, NOW(), 1, NOW()),
+(101003, 101, '面包板新版接线（ML307 AT）', 'bread-compact-ml307', '面包板新版接线（ML307 AT）', 3, 1, NOW(), 1, NOW()),
+(101004, 101, '面包板（WiFi） ESP32 DevKit', 'bread-compact-esp32', '面包板（WiFi） ESP32 DevKit', 4, 1, NOW(), 1, NOW()),
+(101005, 101, '面包板（WiFi+ LCD） ESP32 DevKit', 'bread-compact-esp32-lcd', '面包板（WiFi+ LCD） ESP32 DevKit', 5, 1, NOW(), 1, NOW()),
+(101006, 101, 'DFRobot 行空板 k10', 'df-k10', 'DFRobot 行空板 k10', 6, 1, NOW(), 1, NOW()),
+(101007, 101, 'ESP32 CGC', 'esp32-cgc', 'ESP32 CGC', 7, 1, NOW(), 1, NOW()),
+(101008, 101, 'ESP BOX 3', 'esp-box-3', 'ESP BOX 3', 8, 1, NOW(), 1, NOW()),
+(101009, 101, 'ESP BOX', 'esp-box', 'ESP BOX', 9, 1, NOW(), 1, NOW()),
+(101010, 101, 'ESP BOX Lite', 'esp-box-lite', 'ESP BOX Lite', 10, 1, NOW(), 1, NOW()),
+(101011, 101, 'Kevin Box 1', 'kevin-box-1', 'Kevin Box 1', 11, 1, NOW(), 1, NOW()),
+(101012, 101, 'Kevin Box 2', 'kevin-box-2', 'Kevin Box 2', 12, 1, NOW(), 1, NOW()),
+(101013, 101, 'Kevin C3', 'kevin-c3', 'Kevin C3', 13, 1, NOW(), 1, NOW()),
+(101014, 101, 'Kevin SP V3开发板', 'kevin-sp-v3-dev', 'Kevin SP V3开发板', 14, 1, NOW(), 1, NOW()),
+(101015, 101, 'Kevin SP V4开发板', 'kevin-sp-v4-dev', 'Kevin SP V4开发板', 15, 1, NOW(), 1, NOW()),
+(101016, 101, '鱼鹰科技3.13LCD开发板', 'kevin-yuying-313lcd', '鱼鹰科技3.13LCD开发板', 16, 1, NOW(), 1, NOW()),
+(101017, 101, '立创·实战派ESP32-S3开发板', 'lichuang-dev', '立创·实战派ESP32-S3开发板', 17, 1, NOW(), 1, NOW()),
+(101018, 101, '立创·实战派ESP32-C3开发板', 'lichuang-c3-dev', '立创·实战派ESP32-C3开发板', 18, 1, NOW(), 1, NOW()),
+(101019, 101, '神奇按钮 Magiclick_2.4', 'magiclick-2p4', '神奇按钮 Magiclick_2.4', 19, 1, NOW(), 1, NOW()),
+(101020, 101, '神奇按钮 Magiclick_2.5', 'magiclick-2p5', '神奇按钮 Magiclick_2.5', 20, 1, NOW(), 1, NOW()),
+(101021, 101, '神奇按钮 Magiclick_C3', 'magiclick-c3', '神奇按钮 Magiclick_C3', 21, 1, NOW(), 1, NOW()),
+(101022, 101, '神奇按钮 Magiclick_C3_v2', 'magiclick-c3-v2', '神奇按钮 Magiclick_C3_v2', 22, 1, NOW(), 1, NOW()),
+(101023, 101, 'M5Stack CoreS3', 'm5stack-core-s3', 'M5Stack CoreS3', 23, 1, NOW(), 1, NOW()),
+(101024, 101, 'AtomS3 + Echo Base', 'atoms3-echo-base', 'AtomS3 + Echo Base', 24, 1, NOW(), 1, NOW()),
+(101025, 101, 'AtomS3R + Echo Base', 'atoms3r-echo-base', 'AtomS3R + Echo Base', 25, 1, NOW(), 1, NOW()),
+(101026, 101, 'AtomS3R CAM/M12 + Echo Base', 'atoms3r-cam-m12-echo-base', 'AtomS3R CAM/M12 + Echo Base', 26, 1, NOW(), 1, NOW()),
+(101027, 101, 'AtomMatrix + Echo Base', 'atommatrix-echo-base', 'AtomMatrix + Echo Base', 27, 1, NOW(), 1, NOW()),
+(101028, 101, '虾哥 Mini C3', 'xmini-c3', '虾哥 Mini C3', 28, 1, NOW(), 1, NOW()),
+(101029, 101, 'ESP32S3_KORVO2_V3开发板', 'esp32s3-korvo2-v3', 'ESP32S3_KORVO2_V3开发板', 29, 1, NOW(), 1, NOW()),
+(101030, 101, 'ESP-SparkBot开发板', 'esp-sparkbot', 'ESP-SparkBot开发板', 30, 1, NOW(), 1, NOW()),
+(101031, 101, 'ESP-Spot-S3', 'esp-spot-s3', 'ESP-Spot-S3', 31, 1, NOW(), 1, NOW()),
+(101032, 101, 'Waveshare ESP32-S3-Touch-AMOLED-1.8', 'esp32-s3-touch-amoled-1.8', 'Waveshare ESP32-S3-Touch-AMOLED-1.8', 32, 1, NOW(), 1, NOW()),
+(101033, 101, 'Waveshare ESP32-S3-Touch-LCD-1.85C', 'esp32-s3-touch-lcd-1.85c', 'Waveshare ESP32-S3-Touch-LCD-1.85C', 33, 1, NOW(), 1, NOW()),
+(101034, 101, 'Waveshare ESP32-S3-Touch-LCD-1.85', 'esp32-s3-touch-lcd-1.85', 'Waveshare ESP32-S3-Touch-LCD-1.85', 34, 1, NOW(), 1, NOW()),
+(101035, 101, 'Waveshare ESP32-S3-Touch-LCD-1.46', 'esp32-s3-touch-lcd-1.46', 'Waveshare ESP32-S3-Touch-LCD-1.46', 35, 1, NOW(), 1, NOW()),
+(101036, 101, 'Waveshare ESP32-S3-Touch-LCD-3.5', 'esp32-s3-touch-lcd-3.5', 'Waveshare ESP32-S3-Touch-LCD-3.5', 36, 1, NOW(), 1, NOW()),
+(101037, 101, '土豆子', 'tudouzi', '土豆子', 37, 1, NOW(), 1, NOW()),
+(101038, 101, 'LILYGO T-Circle-S3', 'lilygo-t-circle-s3', 'LILYGO T-Circle-S3', 38, 1, NOW(), 1, NOW()),
+(101039, 101, 'LILYGO T-CameraPlus-S3', 'lilygo-t-cameraplus-s3', 'LILYGO T-CameraPlus-S3', 39, 1, NOW(), 1, NOW()),
+(101040, 101, 'Movecall Moji 小智AI衍生版', 'movecall-moji-esp32s3', 'Movecall Moji 小智AI衍生版', 40, 1, NOW(), 1, NOW()),
+(101041, 101, 'Movecall CuiCan 璀璨·AI吊坠', 'movecall-cuican-esp32s3', 'Movecall CuiCan 璀璨·AI吊坠', 41, 1, NOW(), 1, NOW()),
+(101042, 101, '正点原子DNESP32S3开发板', 'atk-dnesp32s3', '正点原子DNESP32S3开发板', 42, 1, NOW(), 1, NOW()),
+(101043, 101, '正点原子DNESP32S3-BOX', 'atk-dnesp32s3-box', '正点原子DNESP32S3-BOX', 43, 1, NOW(), 1, NOW()),
+(101044, 101, '嘟嘟开发板CHATX(wifi)', 'du-chatx', '嘟嘟开发板CHATX(wifi)', 44, 1, NOW(), 1, NOW()),
+(101045, 101, '太极小派esp32s3', 'taiji-pi-s3', '太极小派esp32s3', 45, 1, NOW(), 1, NOW()),
+(101046, 101, '无名科技星智0.85(WIFI)', 'xingzhi-cube-0.85tft-wifi', '无名科技星智0.85(WIFI)', 46, 1, NOW(), 1, NOW()),
+(101047, 101, '无名科技星智0.85(ML307)', 'xingzhi-cube-0.85tft-ml307', '无名科技星智0.85(ML307)', 47, 1, NOW(), 1, NOW()),
+(101048, 101, '无名科技星智0.96(WIFI)', 'xingzhi-cube-0.96oled-wifi', '无名科技星智0.96(WIFI)', 48, 1, NOW(), 1, NOW()),
+(101049, 101, '无名科技星智0.96(ML307)', 'xingzhi-cube-0.96oled-ml307', '无名科技星智0.96(ML307)', 49, 1, NOW(), 1, NOW()),
+(101050, 101, '无名科技星智1.54(WIFI)', 'xingzhi-cube-1.54tft-wifi', '无名科技星智1.54(WIFI)', 50, 1, NOW(), 1, NOW()),
+(101051, 101, '无名科技星智1.54(ML307)', 'xingzhi-cube-1.54tft-ml307', '无名科技星智1.54(ML307)', 51, 1, NOW(), 1, NOW()),
+(101052, 101, 'SenseCAP Watcher', 'sensecap-watcher', 'SenseCAP Watcher', 52, 1, NOW(), 1, NOW()),
+(101053, 101, '四博智联AI陪伴盒子', 'doit-s3-aibox', '四博智联AI陪伴盒子', 53, 1, NOW(), 1, NOW()),
+(101054, 101, '元控·青春', 'mixgo-nova', '元控·青春', 54, 1, NOW(), 1, NOW());
diff --git a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
index 1d965a15..ffe96a9b 100755
--- a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -87,9 +87,9 @@ databaseChangeLog:
             encoding: utf8
             path: classpath:db/changelog/202504291043.sql
   - changeSet:
-      id: 202504301340
+      id: 202504301341
       author: Goody
       changes:
         - sqlFile:
             encoding: utf8
-            path: classpath:db/changelog/202504301340.sql
\ No newline at end of file
+            path: classpath:db/changelog/202504301341.sql
\ No newline at end of file
diff --git a/main/manager-api/src/main/resources/mapper/sys/SysDictDataDao.xml b/main/manager-api/src/main/resources/mapper/sys/SysDictDataDao.xml
index f1044e27..39848831 100644
--- a/main/manager-api/src/main/resources/mapper/sys/SysDictDataDao.xml
+++ b/main/manager-api/src/main/resources/mapper/sys/SysDictDataDao.xml
@@ -2,5 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="xiaozhi.modules.sys.dao.SysDictDataDao">
+    <select id="getDictDataByType" resultType="xiaozhi.modules.sys.vo.SysDictDataItem">
+        SELECT d.dict_label AS `name`, d.dict_value AS `key`
+        FROM sys_dict_data d
+        LEFT JOIN sys_dict_type t ON d.dict_type_id = t.id
+        WHERE t.dict_type = #{dictType}
+        ORDER BY d.sort ASC
+    </select>
 
+    <select id="getTypeByTypeId" resultType="java.lang.String">
+        SELECT dict_type
+        FROM sys_dict_type
+        WHERE id = #{dictTypeId}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/main/manager-web/src/apis/api.js b/main/manager-web/src/apis/api.js
index 1b9f0a9e..0a3e8d18 100755
--- a/main/manager-web/src/apis/api.js
+++ b/main/manager-web/src/apis/api.js
@@ -2,11 +2,11 @@
 import admin from './module/admin.js'
 import agent from './module/agent.js'
 import device from './module/device.js'
+import dict from './module/dict.js'
 import model from './module/model.js'
+import ota from './module/ota.js'
 import timbre from "./module/timbre.js"
 import user from './module/user.js'
-import ota from './module/ota.js'
-
 /**
  * 接口地址
  * 开发时自动读取使用.env.development文件
@@ -32,5 +32,6 @@ export default {
     device,
     model,
     timbre,
-    ota
+    ota,
+    dict
 }
diff --git a/main/manager-web/src/apis/module/dict.js b/main/manager-web/src/apis/module/dict.js
new file mode 100644
index 00000000..caf78279
--- /dev/null
+++ b/main/manager-web/src/apis/module/dict.js
@@ -0,0 +1,227 @@
+import { getServiceUrl } from '../api';
+import RequestService from '../httpRequest';
+
+export default {
+    // 获取字典类型列表
+    getDictTypeList(params, callback) {
+        const queryParams = new URLSearchParams({
+            dictType: params.dictType || '',
+            dictName: params.dictName || '',
+            page: params.page || 1,
+            limit: params.limit || 10
+        }).toString();
+
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/admin/dict/type/page?${queryParams}`)
+            .method('GET')
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res)
+            })
+            .fail((err) => {
+                console.error('获取字典类型列表失败:', err)
+                this.$message.error(err.msg || '获取字典类型列表失败')
+                RequestService.reAjaxFun(() => {
+                    this.getDictTypeList(params, callback)
+                })
+            }).send()
+    },
+
+    // 获取字典类型详情
+    getDictTypeDetail(id, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/admin/dict/type/${id}`)
+            .method('GET')
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res)
+            })
+            .fail((err) => {
+                console.error('获取字典类型详情失败:', err)
+                this.$message.error(err.msg || '获取字典类型详情失败')
+                RequestService.reAjaxFun(() => {
+                    this.getDictTypeDetail(id, callback)
+                })
+            }).send()
+    },
+
+    // 新增字典类型
+    addDictType(data, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/admin/dict/type/save`)
+            .method('POST')
+            .data(data)
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res)
+            })
+            .fail((err) => {
+                console.error('新增字典类型失败:', err)
+                this.$message.error(err.msg || '新增字典类型失败')
+                RequestService.reAjaxFun(() => {
+                    this.addDictType(data, callback)
+                })
+            }).send()
+    },
+
+    // 更新字典类型
+    updateDictType(data, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/admin/dict/type/update`)
+            .method('PUT')
+            .data(data)
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res)
+            })
+            .fail((err) => {
+                console.error('更新字典类型失败:', err)
+                this.$message.error(err.msg || '更新字典类型失败')
+                RequestService.reAjaxFun(() => {
+                    this.updateDictType(data, callback)
+                })
+            }).send()
+    },
+
+    // 删除字典类型
+    deleteDictType(ids, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/admin/dict/type/delete`)
+            .method('POST')
+            .data(ids)
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res)
+            })
+            .fail((err) => {
+                console.error('删除字典类型失败:', err)
+                this.$message.error(err.msg || '删除字典类型失败')
+                RequestService.reAjaxFun(() => {
+                    this.deleteDictType(ids, callback)
+                })
+            }).send()
+    },
+
+    // 获取字典数据列表
+    getDictDataList(params, callback) {
+        const queryParams = new URLSearchParams({
+            dictTypeId: params.dictTypeId,
+            dictLabel: params.dictLabel || '',
+            dictValue: params.dictValue || '',
+            page: params.page || 1,
+            limit: params.limit || 10
+        }).toString();
+
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/admin/dict/data/page?${queryParams}`)
+            .method('GET')
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res)
+            })
+            .fail((err) => {
+                console.error('获取字典数据列表失败:', err)
+                this.$message.error(err.msg || '获取字典数据列表失败')
+                RequestService.reAjaxFun(() => {
+                    this.getDictDataList(params, callback)
+                })
+            }).send()
+    },
+
+    // 获取字典数据详情
+    getDictDataDetail(id, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/admin/dict/data/${id}`)
+            .method('GET')
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res)
+            })
+            .fail((err) => {
+                console.error('获取字典数据详情失败:', err)
+                this.$message.error(err.msg || '获取字典数据详情失败')
+                RequestService.reAjaxFun(() => {
+                    this.getDictDataDetail(id, callback)
+                })
+            }).send()
+    },
+
+    // 新增字典数据
+    addDictData(data, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/admin/dict/data/save`)
+            .method('POST')
+            .data(data)
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res)
+            })
+            .fail((err) => {
+                console.error('新增字典数据失败:', err)
+                this.$message.error(err.msg || '新增字典数据失败')
+                RequestService.reAjaxFun(() => {
+                    this.addDictData(data, callback)
+                })
+            }).send()
+    },
+
+    // 更新字典数据
+    updateDictData(data, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/admin/dict/data/update`)
+            .method('PUT')
+            .data(data)
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res)
+            })
+            .fail((err) => {
+                console.error('更新字典数据失败:', err)
+                this.$message.error(err.msg || '更新字典数据失败')
+                RequestService.reAjaxFun(() => {
+                    this.updateDictData(data, callback)
+                })
+            }).send()
+    },
+
+    // 删除字典数据
+    deleteDictData(ids, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/admin/dict/data/delete`)
+            .method('POST')
+            .data(ids)
+            .success((res) => {
+                RequestService.clearRequestTime()
+                callback(res)
+            })
+            .fail((err) => {
+                console.error('删除字典数据失败:', err)
+                this.$message.error(err.msg || '删除字典数据失败')
+                RequestService.reAjaxFun(() => {
+                    this.deleteDictData(ids, callback)
+                })
+            }).send()
+    },
+
+    // 获取字典数据列表
+    getDictDataByType(dictType) {
+        return new Promise((resolve, reject) => {
+            RequestService.sendRequest()
+                .url(`${getServiceUrl()}/admin/dict/data/type/${dictType}`)
+                .method('GET')
+                .success((res) => {
+                    RequestService.clearRequestTime()
+                    if (res.data && res.data.code === 0) {
+                        resolve(res.data)
+                    } else {
+                        reject(new Error(res.data?.msg || '获取字典数据列表失败'))
+                    }
+                })
+                .fail((err) => {
+                    console.error('获取字典数据列表失败:', err)
+                    reject(err)
+                }).send()
+        })
+    }
+
+} 
\ No newline at end of file
diff --git a/main/manager-web/src/components/DictDataDialog.vue b/main/manager-web/src/components/DictDataDialog.vue
new file mode 100644
index 00000000..7934602b
--- /dev/null
+++ b/main/manager-web/src/components/DictDataDialog.vue
@@ -0,0 +1,105 @@
+<template>
+    <el-dialog :title="title" :visible.sync="visible" width="500px" @close="handleClose">
+        <el-form :model="form" :rules="rules" ref="form" label-width="100px">
+            <el-form-item label="字典标签" prop="dictLabel">
+                <el-input v-model="form.dictLabel" placeholder="请输入字典标签"></el-input>
+            </el-form-item>
+            <el-form-item label="字典值" prop="dictValue">
+                <el-input v-model="form.dictValue" placeholder="请输入字典值"></el-input>
+            </el-form-item>
+            <el-form-item label="排序" prop="sort">
+                <el-input-number v-model="form.sort" :min="0" :max="999" style="width: 100%;"></el-input-number>
+            </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="handleClose">取 消</el-button>
+            <el-button type="primary" @click="handleSave">确 定</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+export default {
+    name: 'DictDataDialog',
+    props: {
+        visible: {
+            type: Boolean,
+            default: false
+        },
+        title: {
+            type: String,
+            default: '新增字典数据'
+        },
+        dictData: {
+            type: Object,
+            default: () => ({})
+        },
+        dictTypeId: {
+            type: [Number, String],
+            default: null
+        }
+    },
+    data() {
+        return {
+            form: {
+                id: null,
+                dictTypeId: null,
+                dictLabel: '',
+                dictValue: '',
+                sort: 0
+            },
+            rules: {
+                dictLabel: [{ required: true, message: '请输入字典标签', trigger: 'blur' }],
+                dictValue: [{ required: true, message: '请输入字典值', trigger: 'blur' }]
+            }
+        }
+    },
+    watch: {
+        dictData: {
+            handler(val) {
+                if (val) {
+                    this.form = { ...val }
+                }
+            },
+            immediate: true
+        },
+        dictTypeId: {
+            handler(val) {
+                if (val) {
+                    this.form.dictTypeId = val
+                }
+            },
+            immediate: true
+        }
+    },
+    methods: {
+        handleClose() {
+            this.$emit('update:visible', false)
+            this.resetForm()
+        },
+        resetForm() {
+            this.form = {
+                id: null,
+                dictTypeId: this.dictTypeId,
+                dictLabel: '',
+                dictValue: '',
+                sort: 0
+            }
+            this.$refs.form?.resetFields()
+        },
+        handleSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.$emit('save', this.form)
+                }
+            })
+        }
+    }
+}
+</script>
+
+<style scoped>
+.dialog-footer {
+    text-align: right;
+}
+</style>
\ No newline at end of file
diff --git a/main/manager-web/src/components/DictTypeDialog.vue b/main/manager-web/src/components/DictTypeDialog.vue
new file mode 100644
index 00000000..a9a7aa07
--- /dev/null
+++ b/main/manager-web/src/components/DictTypeDialog.vue
@@ -0,0 +1,86 @@
+<template>
+    <el-dialog :title="title" :visible.sync="visible" width="500px" @close="handleClose">
+        <el-form :model="form" :rules="rules" ref="form" label-width="120px">
+            <el-form-item label="字典类型名称" prop="dictName">
+                <el-input v-model="form.dictName" placeholder="请输入字典类型名称"></el-input>
+            </el-form-item>
+            <el-form-item label="字典类型编码" prop="dictType">
+                <el-input v-model="form.dictType" placeholder="请输入字典类型编码"></el-input>
+            </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="handleClose">取 消</el-button>
+            <el-button type="primary" @click="handleSave">确 定</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+export default {
+    name: 'DictTypeDialog',
+    props: {
+        visible: {
+            type: Boolean,
+            default: false
+        },
+        title: {
+            type: String,
+            default: '新增字典类型'
+        },
+        dictTypeData: {
+            type: Object,
+            default: () => ({})
+        }
+    },
+    data() {
+        return {
+            form: {
+                id: null,
+                dictName: '',
+                dictType: ''
+            },
+            rules: {
+                dictName: [{ required: true, message: '请输入字典类型名称', trigger: 'blur' }],
+                dictType: [{ required: true, message: '请输入字典类型编码', trigger: 'blur' }]
+            }
+        }
+    },
+    watch: {
+        dictTypeData: {
+            handler(val) {
+                if (val) {
+                    this.form = { ...val }
+                }
+            },
+            immediate: true
+        }
+    },
+    methods: {
+        handleClose() {
+            this.$emit('update:visible', false)
+            this.resetForm()
+        },
+        resetForm() {
+            this.form = {
+                id: null,
+                dictName: '',
+                dictType: ''
+            }
+            this.$refs.form?.resetFields()
+        },
+        handleSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.$emit('save', this.form)
+                }
+            })
+        }
+    }
+}
+</script>
+
+<style scoped>
+.dialog-footer {
+    text-align: right;
+}
+</style>
\ No newline at end of file
diff --git a/main/manager-web/src/components/FirmwareDialog.vue b/main/manager-web/src/components/FirmwareDialog.vue
index fab99a57..940fbbeb 100644
--- a/main/manager-web/src/components/FirmwareDialog.vue
+++ b/main/manager-web/src/components/FirmwareDialog.vue
@@ -38,7 +38,6 @@
 
 <script>
 import Api from '@/apis/api';
-import { FIRMWARE_TYPES } from '@/utils';
 
 export default {
   name: 'FirmwareDialog',
@@ -54,11 +53,14 @@ export default {
     form: {
       type: Object,
       default: () => ({})
+    },
+    firmwareTypes: {
+      type: Array,
+      default: () => []
     }
   },
   data() {
     return {
-      firmwareTypes: FIRMWARE_TYPES,
       uploadProgress: 0,
       uploadStatus: '',
       isUploading: false,
@@ -85,7 +87,11 @@ export default {
       return !!this.form.id
     }
   },
+  created() {
+    // 移除 getDictDataByType 调用
+  },
   methods: {
+    // 移除 getFirmwareTypes 方法
     handleClose() {
       this.$refs.form.clearValidate();
       this.$emit('cancel');
diff --git a/main/manager-web/src/components/HeaderBar.vue b/main/manager-web/src/components/HeaderBar.vue
index 2d0b3c3b..3d6a62f0 100644
--- a/main/manager-web/src/components/HeaderBar.vue
+++ b/main/manager-web/src/components/HeaderBar.vue
@@ -9,9 +9,11 @@
 
       <!-- 中间导航菜单 -->
       <div class="header-center">
-        <div class="equipment-management" :class="{ 'active-tab': $route.path === '/home' }" @click="goHome">
+        <div class="equipment-management"
+          :class="{ 'active-tab': $route.path === '/home' || $route.path === '/role-config' || $route.path === '/device-management' }"
+          @click="goHome">
           <img loading="lazy" alt="" src="@/assets/header/robot.png"
-            :style="{ filter: $route.path === '/home' ? 'brightness(0) invert(1)' : 'None' }" />
+            :style="{ filter: $route.path === '/home' || $route.path === '/role-config' || $route.path === '/device-management' ? 'brightness(0) invert(1)' : 'None' }" />
           智能体管理
         </div>
         <div v-if="isSuperAdmin" class="equipment-management" :class="{ 'active-tab': $route.path === '/model-config' }"
@@ -26,18 +28,29 @@
             :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 v-if="isSuperAdmin" class="equipment-management"
           :class="{ 'active-tab': $route.path === '/ota-management' }" @click="goOtaManagement">
           <img loading="lazy" alt="" src="@/assets/header/firmware_update.png"
             :style="{ filter: $route.path === '/ota-management' ? 'brightness(0) invert(1)' : 'None' }" />
           OTA管理
         </div>
+        <el-dropdown v-if="isSuperAdmin" trigger="click" class="equipment-management more-dropdown"
+          :class="{ 'active-tab': $route.path === '/dict-management' || $route.path === '/params-management' }">
+          <span class="el-dropdown-link">
+            <img loading="lazy" alt="" src="@/assets/header/param_management.png"
+              :style="{ filter: $route.path === '/dict-management' || $route.path === '/params-management' ? 'brightness(0) invert(1)' : 'None' }" />
+            参数字典
+            <i class="el-icon-arrow-down el-icon--right"></i>
+          </span>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item @click.native="goParamManagement">
+              参数管理
+            </el-dropdown-item>
+            <el-dropdown-item @click.native="goDictManagement">
+              字典管理
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
       </div>
 
       <!-- 右侧元素 -->
@@ -114,6 +127,9 @@ export default {
     goOtaManagement() {
       this.$router.push('/ota-management')
     },
+    goDictManagement() {
+      this.$router.push('/dict-management')
+    },
     // 获取用户信息
     fetchUserInfo() {
       userApi.getUserInfo(({ data }) => {
@@ -343,4 +359,32 @@ export default {
     min-width: 100px;
   }
 }
+
+.equipment-management.more-dropdown {
+  position: relative;
+}
+
+.equipment-management.more-dropdown .el-dropdown-menu {
+  position: absolute;
+  right: 0;
+  min-width: 120px;
+  margin-top: 5px;
+}
+
+.el-dropdown-menu__item {
+  min-width: 60px;
+  padding: 8px 20px;
+  font-size: 14px;
+  color: #606266;
+  white-space: nowrap;
+}
+
+@media (max-width: 768px) {
+  .equipment-management.more-dropdown .el-dropdown-menu {
+    position: fixed;
+    right: 10px;
+    top: 60px;
+    z-index: 2000;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/main/manager-web/src/router/index.js b/main/manager-web/src/router/index.js
index d50e9407..57b3c7e7 100644
--- a/main/manager-web/src/router/index.js
+++ b/main/manager-web/src/router/index.js
@@ -84,8 +84,14 @@ const routes = [
       title: 'OTA管理'
     }
   },
+  {
+    path: '/dict-management',
+    name: 'DictManagement',
+    component: function () {
+      return import('../views/DictManagement.vue')
+    }
+  }
 ]
-
 const router = new VueRouter({
   base: process.env.VUE_APP_PUBLIC_PATH || '/',
   routes
diff --git a/main/manager-web/src/utils/index.js b/main/manager-web/src/utils/index.js
index bac4b18a..8a5a960e 100755
--- a/main/manager-web/src/utils/index.js
+++ b/main/manager-web/src/utils/index.js
@@ -136,63 +136,3 @@ export function getUUID() {
     })
 }
 
-/**
- * 固件类型选项
- */
-export const FIRMWARE_TYPES = [
-    { "key": "bread-compact-wifi", "name": "面包板新版接线（WiFi）" },
-    { "key": "bread-compact-wifi-lcd", "name": "面包板新版接线（WiFi）+ LCD" },
-    { "key": "bread-compact-ml307", "name": "面包板新版接线（ML307 AT）" },
-    { "key": "bread-compact-esp32", "name": "面包板（WiFi） ESP32 DevKit" },
-    { "key": "bread-compact-esp32-lcd", "name": "面包板（WiFi+ LCD） ESP32 DevKit" },
-    { "key": "df-k10", "name": "DFRobot 行空板 k10" },
-    { "key": "esp32-cgc", "name": "ESP32 CGC" },
-    { "key": "esp-box-3", "name": "ESP BOX 3" },
-    { "key": "esp-box", "name": "ESP BOX" },
-    { "key": "esp-box-lite", "name": "ESP BOX Lite" },
-    { "key": "kevin-box-1", "name": "Kevin Box 1" },
-    { "key": "kevin-box-2", "name": "Kevin Box 2" },
-    { "key": "kevin-c3", "name": "Kevin C3" },
-    { "key": "kevin-sp-v3-dev", "name": "Kevin SP V3开发板" },
-    { "key": "kevin-sp-v4-dev", "name": "Kevin SP V4开发板" },
-    { "key": "kevin-yuying-313lcd", "name": "鱼鹰科技3.13LCD开发板" },
-    { "key": "lichuang-dev", "name": "立创·实战派ESP32-S3开发板" },
-    { "key": "lichuang-c3-dev", "name": "立创·实战派ESP32-C3开发板" },
-    { "key": "magiclick-2p4", "name": "神奇按钮 Magiclick_2.4" },
-    { "key": "magiclick-2p5", "name": "神奇按钮 Magiclick_2.5" },
-    { "key": "magiclick-c3", "name": "神奇按钮 Magiclick_C3" },
-    { "key": "magiclick-c3-v2", "name": "神奇按钮 Magiclick_C3_v2" },
-    { "key": "m5stack-core-s3", "name": "M5Stack CoreS3" },
-    { "key": "atoms3-echo-base", "name": "AtomS3 + Echo Base" },
-    { "key": "atoms3r-echo-base", "name": "AtomS3R + Echo Base" },
-    { "key": "atoms3r-cam-m12-echo-base", "name": "AtomS3R CAM/M12 + Echo Base" },
-    { "key": "atommatrix-echo-base", "name": "AtomMatrix + Echo Base" },
-    { "key": "xmini-c3", "name": "虾哥 Mini C3" },
-    { "key": "esp32s3-korvo2-v3", "name": "ESP32S3_KORVO2_V3开发板" },
-    { "key": "esp-sparkbot", "name": "ESP-SparkBot开发板" },
-    { "key": "esp-spot-s3", "name": "ESP-Spot-S3" },
-    { "key": "esp32-s3-touch-amoled-1.8", "name": "Waveshare ESP32-S3-Touch-AMOLED-1.8" },
-    { "key": "esp32-s3-touch-lcd-1.85c", "name": "Waveshare ESP32-S3-Touch-LCD-1.85C" },
-    { "key": "esp32-s3-touch-lcd-1.85", "name": "Waveshare ESP32-S3-Touch-LCD-1.85" },
-    { "key": "esp32-s3-touch-lcd-1.46", "name": "Waveshare ESP32-S3-Touch-LCD-1.46" },
-    { "key": "esp32-s3-touch-lcd-3.5", "name": "Waveshare ESP32-S3-Touch-LCD-3.5" },
-    { "key": "tudouzi", "name": "土豆子" },
-    { "key": "lilygo-t-circle-s3", "name": "LILYGO T-Circle-S3" },
-    { "key": "lilygo-t-cameraplus-s3", "name": "LILYGO T-CameraPlus-S3" },
-    { "key": "movecall-moji-esp32s3", "name": "Movecall Moji 小智AI衍生版" },
-    { "key": "movecall-cuican-esp32s3", "name": "Movecall CuiCan 璀璨·AI吊坠" },
-    { "key": "atk-dnesp32s3", "name": "正点原子DNESP32S3开发板" },
-    { "key": "atk-dnesp32s3-box", "name": "正点原子DNESP32S3-BOX" },
-    { "key": "du-chatx", "name": "嘟嘟开发板CHATX(wifi)" },
-    { "key": "taiji-pi-s3", "name": "太极小派esp32s3" },
-    { "key": "xingzhi-cube-0.85tft-wifi", "name": "无名科技星智0.85(WIFI)" },
-    { "key": "xingzhi-cube-0.85tft-ml307", "name": "无名科技星智0.85(ML307)" },
-    { "key": "xingzhi-cube-0.96oled-wifi", "name": "无名科技星智0.96(WIFI)" },
-    { "key": "xingzhi-cube-0.96oled-ml307", "name": "无名科技星智0.96(ML307)" },
-    { "key": "xingzhi-cube-1.54tft-wifi", "name": "无名科技星智1.54(WIFI)" },
-    { "key": "xingzhi-cube-1.54tft-ml307", "name": "无名科技星智1.54(ML307)" },
-    { "key": "sensecap-watcher", "name": "SenseCAP Watcher" },
-    { "key": "doit-s3-aibox", "name": "四博智联AI陪伴盒子" },
-    { "key": "mixgo-nova", "name": "元控·青春" }
-]
-
diff --git a/main/manager-web/src/views/DeviceManagement.vue b/main/manager-web/src/views/DeviceManagement.vue
index 578469bc..34086960 100644
--- a/main/manager-web/src/views/DeviceManagement.vue
+++ b/main/manager-web/src/views/DeviceManagement.vue
@@ -100,7 +100,6 @@
 import Api from '@/apis/api';
 import AddDeviceDialog from "@/components/AddDeviceDialog.vue";
 import HeaderBar from "@/components/HeaderBar.vue";
-import { FIRMWARE_TYPES } from "@/utils";
 
 export default {
   components: { HeaderBar, AddDeviceDialog },
@@ -118,6 +117,7 @@ export default {
       deviceList: [],
       loading: false,
       userApi: null,
+      firmwareTypes: [],
     };
   },
   computed: {
@@ -163,7 +163,19 @@ export default {
       this.fetchBindDevices(agentId);
     }
   },
+  created() {
+    this.getFirmwareTypes()
+  },
   methods: {
+    async getFirmwareTypes() {
+      try {
+        const res = await Api.dict.getDictDataByType('FIRMWARE_TYPE')
+        this.firmwareTypes = res.data
+      } catch (error) {
+        console.error('获取固件类型失败:', error)
+        this.$message.error(error.message || '获取固件类型失败')
+      }
+    },
     handlePageSizeChange(val) {
       this.pageSize = val;
       this.currentPage = 1;
@@ -317,8 +329,8 @@ export default {
       return "";
     },
     getFirmwareTypeName(type) {
-      const firmwareType = FIRMWARE_TYPES.find(item => item.key === type);
-      return firmwareType ? firmwareType.name : type;
+      const firmwareType = this.firmwareTypes.find(item => item.key === type)
+      return firmwareType ? firmwareType.name : type
     },
     handleOtaSwitchChange(row) {
       Api.device.enableOtaUpgrade(row.device_id, row.otaSwitch ? 1 : 0, ({ data }) => {
diff --git a/main/manager-web/src/views/DictManagement.vue b/main/manager-web/src/views/DictManagement.vue
new file mode 100644
index 00000000..da6db171
--- /dev/null
+++ b/main/manager-web/src/views/DictManagement.vue
@@ -0,0 +1,835 @@
+<template>
+    <div class="welcome">
+        <HeaderBar />
+
+        <div class="operation-bar">
+            <h2 class="page-title">字典管理</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>
+
+        <!-- 主体内容 -->
+        <div class="main-wrapper">
+            <div class="content-panel">
+                <!-- 左侧字典类型列表 -->
+                <div class="dict-type-panel">
+                    <div class="dict-type-header">
+                        <el-button type="success" size="mini" @click="showAddDictTypeDialog">新增字典类型</el-button>
+                        <el-button type="danger" size="mini" @click="batchDeleteDictType"
+                            :disabled="selectedDictTypes.length === 0">
+                            批量删除字典类型
+                        </el-button>
+                    </div>
+                    <el-table ref="dictTypeTable" :data="dictTypeList" style="width: 100%" v-loading="dictTypeLoading"
+                        element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading"
+                        element-loading-background="rgba(255, 255, 255, 0.7)" @row-click="handleDictTypeRowClick"
+                        @selection-change="handleDictTypeSelectionChange" :row-class-name="tableRowClassName"
+                        class="dict-type-table">
+                        <el-table-column type="selection" width="55" align="center"></el-table-column>
+                        <el-table-column label="字典类型名称" prop="dictName" align="center"></el-table-column>
+                        <el-table-column label="操作" width="100" align="center">
+                            <template slot-scope="scope">
+                                <el-button type="text" size="mini" @click.stop="editDictType(scope.row)">编辑</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+
+                <!-- 右侧字典数据列表 -->
+                <div class="content-area">
+                    <el-card class="dict-data-card" shadow="never">
+                        <el-table ref="dictDataTable" :data="dictDataList" style="width: 100%"
+                            v-loading="dictDataLoading" element-loading-text="拼命加载中"
+                            element-loading-spinner="el-icon-loading"
+                            element-loading-background="rgba(255, 255, 255, 0.7)"
+                            @selection-change="handleDictDataSelectionChange" class="data-table"
+                            header-row-class-name="table-header">
+                            <el-table-column type="selection" width="55" align="center"></el-table-column>
+                            <el-table-column label="字典标签" prop="dictLabel" align="center"></el-table-column>
+                            <el-table-column label="字典值" prop="dictValue" align="center"></el-table-column>
+                            <el-table-column label="排序" prop="sort" align="center"></el-table-column>
+                            <el-table-column label="操作" align="center" width="180px">
+                                <template slot-scope="scope">
+                                    <el-button type="text" size="mini" @click="editDictData(scope.row)"
+                                        class="edit-btn">
+                                        修改
+                                    </el-button>
+                                    <el-button type="text" size="mini" @click="deleteDictData(scope.row)"
+                                        class="delete-btn">
+                                        删除
+                                    </el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                        <div class="table-footer">
+                            <div class="batch-actions">
+                                <el-button size="mini" type="primary" @click="selectAllDictData">
+                                    {{ isAllDictDataSelected ? '取消全选' : '全选' }}
+                                </el-button>
+                                <el-button type="success" size="mini" @click="showAddDictDataDialog" class="add-btn">
+                                    新增字典数据
+                                </el-button>
+                                <el-button size="mini" type="danger" icon="el-icon-delete" @click="batchDeleteDictData">
+                                    批量删除字典数据
+                                </el-button>
+                            </div>
+                            <div class="custom-pagination">
+                                <el-select v-model="pageSize" @change="handlePageSizeChange" class="page-size-select">
+                                    <el-option v-for="item in pageSizeOptions" :key="item" :label="`${item}条/页`"
+                                        :value="item">
+                                    </el-option>
+                                </el-select>
+
+                                <button class="pagination-btn" :disabled="currentPage === 1" @click="goFirst">
+                                    首页
+                                </button>
+                                <button class="pagination-btn" :disabled="currentPage === 1" @click="goPrev">
+                                    上一页
+                                </button>
+                                <button v-for="page in visiblePages" :key="page" class="pagination-btn"
+                                    :class="{ active: page === currentPage }" @click="goToPage(page)">
+                                    {{ page }}
+                                </button>
+                                <button class="pagination-btn" :disabled="currentPage === pageCount" @click="goNext">
+                                    下一页
+                                </button>
+                                <span class="total-text">共{{ total }}条记录</span>
+                            </div>
+                        </div>
+                    </el-card>
+                </div>
+            </div>
+        </div>
+
+        <!-- 使用字典类型编辑弹框组件 -->
+        <DictTypeDialog :visible.sync="dictTypeDialogVisible" :title="dictTypeDialogTitle" :dictTypeData="dictTypeForm"
+            @save="saveDictType" />
+
+        <!-- 使用字典数据编辑弹框组件 -->
+        <DictDataDialog :visible.sync="dictDataDialogVisible" :title="dictDataDialogTitle" :dictData="dictDataForm"
+            :dictTypeId="selectedDictType?.id" @save="saveDictData" />
+        <el-footer style="flex-shrink:unset;">
+            <version-footer />
+        </el-footer>
+    </div>
+</template>
+
+<script>
+import dictApi from '@/apis/module/dict'
+import DictDataDialog from '@/components/DictDataDialog.vue'
+import DictTypeDialog from '@/components/DictTypeDialog.vue'
+import HeaderBar from '@/components/HeaderBar.vue'
+import VersionFooter from '@/components/VersionFooter.vue'
+export default {
+    name: 'DictManagement',
+    components: {
+        HeaderBar,
+        DictTypeDialog,
+        DictDataDialog,
+        VersionFooter
+    },
+    data() {
+        return {
+            // 字典类型相关
+            dictTypeList: [],
+            dictTypeLoading: false,
+            selectedDictType: null,
+            selectedDictTypes: [],  // 恢复多选数组
+            dictTypeDialogVisible: false,
+            dictTypeDialogTitle: '新增字典类型',
+            dictTypeForm: {
+                id: null,
+                dictName: '',
+                dictType: ''
+            },
+
+            // 字典数据相关
+            dictDataList: [],
+            dictDataLoading: false,
+            selectedDictData: [],
+            isAllDictDataSelected: false,
+            dictDataDialogVisible: false,
+            dictDataDialogTitle: '新增字典数据',
+            dictDataForm: {
+                id: null,
+                dictTypeId: null,
+                dictLabel: '',
+                dictValue: '',
+                sort: 0
+            },
+            search: '',
+            // 添加分页相关数据
+            pageSizeOptions: [10, 20, 50, 100],
+            currentPage: 1,
+            pageSize: 10,
+            total: 0
+        }
+    },
+    created() {
+        this.loadDictTypeList()
+    },
+    methods: {
+        // 字典类型相关方法
+        loadDictTypeList() {
+            this.dictTypeLoading = true
+            dictApi.getDictTypeList({
+                page: 1,
+                limit: 100,
+                dictName: this.search
+            }, ({ data }) => {
+                if (data.code === 0) {
+                    this.dictTypeList = data.data.list
+                    if (this.dictTypeList.length > 0) {
+                        this.selectedDictType = this.dictTypeList[0]
+                        this.loadDictDataList(this.dictTypeList[0].id)
+                        this.$nextTick(() => {
+                            this.$refs.dictTypeTable.setCurrentRow(this.dictTypeList[0])
+                        })
+                    }
+                }
+                this.dictTypeLoading = false
+            })
+        },
+        handleDictTypeRowClick(row) {
+            this.selectedDictType = row
+            this.loadDictDataList(row.id)
+            this.$refs.dictTypeTable.setCurrentRow(row)
+        },
+        handleDictTypeSelectionChange(val) {
+            this.selectedDictTypes = val
+        },
+        tableRowClassName({ row }) {
+            return row === this.selectedDictType ? 'current-row' : ''
+        },
+        showAddDictTypeDialog() {
+            this.dictTypeDialogTitle = '新增字典类型'
+            this.dictTypeForm = {
+                id: null,
+                dictName: '',
+                dictType: ''
+            }
+            this.dictTypeDialogVisible = true
+        },
+        editDictType(row) {
+            this.dictTypeDialogTitle = '编辑字典类型'
+            this.dictTypeForm = { ...row }
+            this.dictTypeDialogVisible = true
+        },
+        saveDictType(formData) {
+            const api = formData.id ? dictApi.updateDictType : dictApi.addDictType
+            api(formData, ({ data }) => {
+                if (data.code === 0) {
+                    this.$message.success('保存成功')
+                    this.dictTypeDialogVisible = false
+                    this.loadDictTypeList()
+                }
+            })
+        },
+        batchDeleteDictType() {
+            if (this.selectedDictTypes.length === 0) {
+                this.$message.warning('请选择要删除的字典类型')
+                return
+            }
+
+            this.$confirm('确定要删除选中的字典类型吗?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                const ids = this.selectedDictTypes.map(item => item.id)
+                dictApi.deleteDictType(ids, ({ data }) => {
+                    if (data.code === 0) {
+                        this.$message.success('删除成功')
+                        this.loadDictTypeList()
+                    }
+                })
+            })
+        },
+
+        // 字典数据相关方法
+        loadDictDataList(dictTypeId) {
+            if (!dictTypeId) return
+            this.dictDataLoading = true
+            dictApi.getDictDataList({
+                dictTypeId,
+                page: this.currentPage,
+                limit: this.pageSize,
+                dictLabel: this.search,
+                dictValue: ''
+            }, ({ data }) => {
+                if (data.code === 0) {
+                    this.dictDataList = data.data.list
+                    this.total = data.data.total
+                } else {
+                    this.$message.error(data.msg || '获取字典数据失败')
+                }
+                this.dictDataLoading = false
+            })
+        },
+        handleDictDataSelectionChange(val) {
+            this.selectedDictData = val
+            this.isAllDictDataSelected = val.length === this.dictDataList.length
+        },
+        selectAllDictData() {
+            if (this.isAllDictDataSelected) {
+                this.$refs.dictDataTable.clearSelection()
+            } else {
+                this.$refs.dictDataTable.toggleAllSelection()
+            }
+        },
+        showAddDictDataDialog() {
+            if (!this.selectedDictType) {
+                this.$message.warning('请先选择字典类型')
+                return
+            }
+            this.dictDataDialogTitle = '新增字典数据'
+            this.dictDataForm = {
+                id: null,
+                dictTypeId: this.selectedDictType.id,
+                dictLabel: '',
+                dictValue: '',
+                sort: 0
+            }
+            this.dictDataDialogVisible = true
+        },
+        editDictData(row) {
+            this.dictDataDialogTitle = '编辑字典数据'
+            this.dictDataForm = { ...row }
+            this.dictDataDialogVisible = true
+        },
+        saveDictData(formData) {
+            const api = formData.id ? dictApi.updateDictData : dictApi.addDictData
+            api(formData, ({ data }) => {
+                if (data.code === 0) {
+                    this.$message.success('保存成功')
+                    this.dictDataDialogVisible = false
+                    this.loadDictDataList(formData.dictTypeId)
+                }
+            })
+        },
+        deleteDictData(row) {
+            this.$confirm('确定要删除该字典数据吗?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                dictApi.deleteDictData([row.id], ({ data }) => {
+                    if (data.code === 0) {
+                        this.$message.success('删除成功')
+                        this.loadDictDataList(row.dictTypeId)
+                    }
+                })
+            })
+        },
+        batchDeleteDictData() {
+            if (this.selectedDictData.length === 0) {
+                this.$message.warning('请选择要删除的字典数据')
+                return
+            }
+
+            this.$confirm('确定要删除选中的字典数据吗?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                const ids = this.selectedDictData.map(item => item.id)
+                dictApi.deleteDictData(ids, ({ data }) => {
+                    if (data.code === 0) {
+                        this.$message.success('删除成功')
+                        this.loadDictDataList(this.selectedDictType.id)
+                    }
+                })
+            })
+        },
+        handleSearch() {
+            if (!this.selectedDictType) {
+                this.$message.warning('请先选择字典类型')
+                return
+            }
+            this.currentPage = 1
+            this.loadDictDataList(this.selectedDictType.id)
+        },
+        // 添加分页相关方法
+        handlePageSizeChange(val) {
+            this.pageSize = val;
+            this.currentPage = 1;
+            this.loadDictDataList(this.selectedDictType?.id);
+        },
+        goFirst() {
+            this.currentPage = 1;
+            this.loadDictDataList(this.selectedDictType?.id);
+        },
+        goPrev() {
+            if (this.currentPage > 1) {
+                this.currentPage--;
+                this.loadDictDataList(this.selectedDictType?.id);
+            }
+        },
+        goNext() {
+            if (this.currentPage < this.pageCount) {
+                this.currentPage++;
+                this.loadDictDataList(this.selectedDictType?.id);
+            }
+        },
+        goToPage(page) {
+            this.currentPage = page;
+            this.loadDictDataList(this.selectedDictType?.id);
+        }
+    },
+    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;
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.welcome {
+    min-width: 900px;
+    min-height: 506px;
+    height: 100vh;
+    display: flex;
+    position: relative;
+    flex-direction: column;
+    background-size: cover;
+    background: linear-gradient(to bottom right, #dce8ff, #e4eeff, #e6cbfd) center;
+    -webkit-background-size: cover;
+    -o-background-size: cover;
+    overflow: hidden;
+}
+
+.main-wrapper {
+    margin: 5px 22px;
+    border-radius: 15px;
+    min-height: calc(100vh - 24vh);
+    height: auto;
+    max-height: 80vh;
+    box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+    position: relative;
+    background: rgba(237, 242, 255, 0.5);
+    display: flex;
+    flex-direction: column;
+}
+
+.operation-bar {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 16px 24px;
+}
+
+.page-title {
+    font-size: 24px;
+    margin: 0;
+}
+
+.action-group {
+    display: flex;
+    align-items: center;
+    gap: 16px;
+}
+
+.search-group {
+    display: flex;
+    gap: 10px;
+}
+
+.search-input {
+    width: 240px;
+}
+
+.btn-search {
+    background: linear-gradient(135deg, #6b8cff, #a966ff);
+    border: none;
+    color: white;
+}
+
+.btn-search:hover {
+    opacity: 0.9;
+    transform: translateY(-1px);
+}
+
+:deep(.search-input .el-input__inner) {
+    border-radius: 4px;
+    border: 1px solid #DCDFE6;
+    background-color: white;
+    transition: border-color 0.2s;
+}
+
+:deep(.search-input .el-input__inner:focus) {
+    border-color: #6b8cff;
+    outline: none;
+}
+
+.content-panel {
+    flex: 1;
+    display: flex;
+    overflow: hidden;
+    height: 100%;
+    border-radius: 15px;
+    background: transparent;
+    border: 1px solid #fff;
+}
+
+.dict-type-panel {
+    width: 300px;
+    background: white;
+    border-right: 1px solid #ebeef5;
+    display: flex;
+    flex-direction: column;
+}
+
+.dict-type-header {
+    padding: 16px;
+    border-bottom: 1px solid #ebeef5;
+    display: flex;
+    gap: 8px;
+}
+
+.dict-type-table {
+    flex: 1;
+    overflow-y: auto;
+}
+
+.content-area {
+    flex: 1;
+    padding: 24px;
+    height: 100%;
+    min-width: 600px;
+    overflow: hidden;
+    background-color: white;
+    display: flex;
+    flex-direction: column;
+}
+
+.dict-data-card {
+    background: white;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    border: none;
+    box-shadow: none;
+    overflow: hidden;
+}
+
+.data-table {
+    border-radius: 6px;
+    overflow-y: auto;
+    background-color: transparent !important;
+    --table-max-height: calc(100vh - 40vh);
+    max-height: var(--table-max-height);
+
+    :deep(.el-table__body-wrapper) {
+        max-height: calc(var(--table-max-height) - 40px);
+    }
+
+    :deep(.el-table__body) {
+        tr:last-child td {
+            border-bottom: none;
+        }
+    }
+}
+
+:deep(.el-table) {
+    &::before {
+        display: none;
+    }
+
+    &::after {
+        display: none;
+    }
+}
+
+.table-footer {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 16px 0;
+    width: 100%;
+    flex-shrink: 0;
+    min-height: 60px;
+    background: white;
+    margin-top: 10px;
+}
+
+.batch-actions {
+    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--success {
+        background: #5bc98c;
+        color: white;
+    }
+
+    .el-button--danger {
+        background: #fd5b63;
+        color: white;
+    }
+}
+
+.custom-pagination {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .el-select {
+        margin-right: 8px;
+    }
+
+    .pagination-btn:first-child,
+    .pagination-btn:nth-child(2),
+    .pagination-btn:nth-child(3),
+    .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-child(3)):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;
+    }
+}
+
+.page-size-select {
+    width: 100px;
+    margin-right: 10px;
+
+    :deep(.el-input__inner) {
+        height: 32px;
+        line-height: 32px;
+        border-radius: 4px;
+        border: 1px solid #e4e7ed;
+        background: #dee7ff;
+        color: #606266;
+        font-size: 14px;
+    }
+
+    :deep(.el-input__suffix) {
+        right: 6px;
+        width: 15px;
+        height: 20px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        top: 6px;
+        border-radius: 4px;
+    }
+
+    :deep(.el-input__suffix-inner) {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+    }
+
+    :deep(.el-icon-arrow-up:before) {
+        content: "";
+        display: inline-block;
+        border-left: 6px solid transparent;
+        border-right: 6px solid transparent;
+        border-top: 9px solid #606266;
+        position: relative;
+        transform: rotate(0deg);
+        transition: transform 0.3s;
+    }
+}
+
+.edit-btn,
+.delete-btn {
+    margin: 0 8px;
+    color: #7079aa !important;
+    font-size: 12px;
+    padding: 7px 12px;
+    height: 32px;
+    line-height: 1;
+    border-radius: 4px;
+    transition: all 0.3s ease;
+
+    &:hover {
+        color: #5a64b5 !important;
+        transform: translateY(-1px);
+    }
+}
+
+:deep(.dict-type-header .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--success {
+        background: #5bc98c;
+        color: white;
+    }
+
+    &.el-button--danger {
+        background: #fd5b63;
+        color: white;
+    }
+}
+
+:deep(.el-table .cell) {
+    padding-left: 10px;
+    padding-right: 10px;
+}
+
+:deep(.el-loading-mask) {
+    background-color: rgba(255, 255, 255, 0.6) !important;
+    backdrop-filter: blur(2px);
+}
+
+:deep(.el-loading-spinner .circular) {
+    width: 28px;
+    height: 28px;
+}
+
+:deep(.el-loading-spinner .path) {
+    stroke: #6b8cff;
+}
+
+:deep(.el-loading-text) {
+    color: #6b8cff !important;
+    font-size: 14px;
+    margin-top: 8px;
+}
+
+:deep(.dict-type-table .el-table__row) {
+    cursor: pointer;
+}
+
+:deep(.dict-type-table .el-table__row.current-row) {
+    background-color: #5778ff !important;
+    color: white;
+}
+
+:deep(.dict-type-table .el-table__row.current-row .el-button--text) {
+    color: white !important;
+}
+
+:deep(.dict-type-table .el-table__row:hover) {
+    background-color: #f5f7fa;
+}
+
+:deep(.dict-type-table .el-table__row.current-row:hover) {
+    background-color: #5778ff !important;
+}
+
+:deep(.dict-type-table .el-table__row td) {
+    background-color: transparent !important;
+}
+
+:deep(.el-table thead) {
+    color: #000000;
+}
+
+:deep(.el-card__body) {
+    padding: 15px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: hidden;
+}
+</style>
\ No newline at end of file
diff --git a/main/manager-web/src/views/OtaManagement.vue b/main/manager-web/src/views/OtaManagement.vue
index 106e12fb..300e83ad 100644
--- a/main/manager-web/src/views/OtaManagement.vue
+++ b/main/manager-web/src/views/OtaManagement.vue
@@ -96,8 +96,8 @@
         </div>
 
         <!-- 新增/编辑固件对话框 -->
-        <firmware-dialog :title="dialogTitle" :visible.sync="dialogVisible" :form="firmwareForm" @submit="handleSubmit"
-            @cancel="dialogVisible = false" />
+        <firmware-dialog :title="dialogTitle" :visible.sync="dialogVisible" :form="firmwareForm"
+            :firmware-types="firmwareTypes" @submit="handleSubmit" @cancel="dialogVisible = false" />
         <el-footer>
             <version-footer />
         </el-footer>
@@ -109,7 +109,6 @@ import Api from "@/apis/api";
 import FirmwareDialog from "@/components/FirmwareDialog.vue";
 import HeaderBar from "@/components/HeaderBar.vue";
 import VersionFooter from "@/components/VersionFooter.vue";
-import { FIRMWARE_TYPES } from "@/utils";
 import { formatDate, formatFileSize } from "@/utils/format";
 
 export default {
@@ -136,10 +135,12 @@ export default {
                 remark: "",
                 firmwarePath: ""
             },
+            firmwareTypes: [],
         };
     },
     created() {
         this.fetchFirmwareList();
+        this.getFirmwareTypes();
     },
 
     computed: {
@@ -387,9 +388,18 @@ export default {
         },
         formatDate,
         formatFileSize,
+        async getFirmwareTypes() {
+            try {
+                const res = await Api.dict.getDictDataByType('FIRMWARE_TYPE')
+                this.firmwareTypes = res.data
+            } catch (error) {
+                console.error('获取固件类型失败:', error)
+                this.$message.error(error.message || '获取固件类型失败')
+            }
+        },
         getFirmwareTypeName(type) {
-            const firmwareType = FIRMWARE_TYPES.find(item => item.key === type);
-            return firmwareType ? firmwareType.name : type;
+            const firmwareType = this.firmwareTypes.find(item => item.key === type)
+            return firmwareType ? firmwareType.name : type
         },
     },
 };
diff --git a/main/manager-web/src/views/UserManagement.vue b/main/manager-web/src/views/UserManagement.vue
index eb43a959..87ce3747 100644
--- a/main/manager-web/src/views/UserManagement.vue
+++ b/main/manager-web/src/views/UserManagement.vue
@@ -26,6 +26,11 @@
               <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="createDate" align="center">
+                <template slot-scope="scope">
+                  {{ formatDate(scope.row.createDate) }}
+                </template>
+              </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>
@@ -336,7 +341,12 @@ export default {
       }).catch(() => {
         // 用户取消操作
       });
-    }
+    },
+    formatDate(dateString) {
+      if (!dateString) return '';
+      const date = new Date(dateString);
+      return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')} ${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}:${date.getSeconds().toString().padStart(2, '0')}`;
+    },
   },
 };
 </script>
diff --git a/main/manager-web/src/views/roleConfig.vue b/main/manager-web/src/views/roleConfig.vue
index c13ad718..cbeb2c50 100644
--- a/main/manager-web/src/views/roleConfig.vue
+++ b/main/manager-web/src/views/roleConfig.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="welcome">
-    <HeaderBar/>
+    <HeaderBar />
 
     <div class="operation-bar">
       <h2 class="page-title">角色配置</h2>
@@ -26,93 +26,49 @@
                 <div class="form-grid">
                   <div class="form-column">
                     <el-form-item label="助手昵称：">
-                      <el-input v-model="form.agentName" class="form-input"/>
+                      <el-input v-model="form.agentName" class="form-input" />
                     </el-form-item>
                     <el-form-item label="角色模版：">
                       <div class="template-container">
-                        <div
-                            v-for="(template, index) in templates"
-                            :key="`template-${index}`"
-                            class="template-item"
-                            :class="{ 'template-loading': loadingTemplate }"
-                            @click="selectTemplate(template)"
-                        >
+                        <div v-for="(template, index) in templates" :key="`template-${index}`" class="template-item"
+                          :class="{ 'template-loading': loadingTemplate }" @click="selectTemplate(template)">
                           {{ template.agentName }}
                         </div>
                       </div>
                     </el-form-item>
                     <el-form-item label="角色介绍：">
-                      <el-input
-                          type="textarea"
-                          rows="5"
-                          resize="none"
-                          placeholder="请输入内容"
-                          v-model="form.systemPrompt"
-                          maxlength="2000"
-                          show-word-limit
-                          class="form-textarea"
-                      />
+                      <el-input type="textarea" rows="12" resize="none" placeholder="请输入内容" v-model="form.systemPrompt"
+                        maxlength="2000" show-word-limit class="form-textarea" />
                     </el-form-item>
-                    <el-form-item label="语言编码：">
-                      <el-input
-                          v-model="form.langCode"
-                          placeholder="请输入语言编码，如：zh_CN"
-                          maxlength="10"
-                          show-word-limit
-                          class="form-input"
-                      />
+                    <el-form-item label="语言编码：" style="display: none;">
+                      <el-input v-model="form.langCode" placeholder="请输入语言编码，如：zh_CN" maxlength="10" show-word-limit
+                        class="form-input" />
                     </el-form-item>
-                    <el-form-item label="交互语种：">
-                      <el-input
-                          v-model="form.language"
-                          placeholder="请输入交互语种，如：中文"
-                          maxlength="10"
-                          show-word-limit
-                          class="form-input"
-                      />
+                    <el-form-item label="交互语种：" style="display: none;">
+                      <el-input v-model="form.language" placeholder="请输入交互语种，如：中文" maxlength="10" show-word-limit
+                        class="form-input" />
                     </el-form-item>
                     <div class="action-bar">
-              <el-button type="primary" class="save-btn" @click="saveConfig">保存配置</el-button>
-              <el-button class="reset-btn" @click="resetConfig">重置</el-button>
-              <div class="hint-text">
-                <img loading="lazy" src="@/assets/home/red-info.png" alt="">
-                <span>保存配置后，需要重启设备，新的配置才会生效。</span>
-              </div>
-</div>
+                      <el-button type="primary" class="save-btn" @click="saveConfig">保存配置</el-button>
+                      <el-button class="reset-btn" @click="resetConfig">重置</el-button>
+                      <div class="hint-text">
+                        <img loading="lazy" src="@/assets/home/red-info.png" alt="">
+                        <span>保存配置后，需要重启设备，新的配置才会生效。</span>
+                      </div>
+                    </div>
                   </div>
                   <div class="form-column">
-                    <el-form-item
-                        v-for="(model, index) in models"
-                        :key="`model-${index}`"
-                        :label="model.label"
-                        class="model-item"
-                    >
-                      <el-select
-                          v-model="form.model[model.key]"
-                          filterable
-                          placeholder="请选择"
-                          class="form-select"
-                      >
-                        <el-option
-                            v-for="(item, optionIndex) in modelOptions[model.type]"
-                            :key="`option-${index}-${optionIndex}`"
-                            :label="item.label"
-                            :value="item.value"
-                        />
+                    <el-form-item v-for="(model, index) in models" :key="`model-${index}`" :label="model.label"
+                      class="model-item">
+                      <el-select v-model="form.model[model.key]" filterable placeholder="请选择" class="form-select">
+                        <el-option v-for="(item, optionIndex) in modelOptions[model.type]"
+                          :key="`option-${index}-${optionIndex}`" :label="item.label" :value="item.value" />
                       </el-select>
                     </el-form-item>
                     <el-form-item label="角色音色：">
-                      <el-select
-                          v-model="form.ttsVoiceId"
-                          placeholder="请选择"
-                          class="form-select"
-                      >
-                        <el-option
-                            v-for="(item, index) in voiceOptions"
-                            :key="`voice-${index}`"
-                            :label="item.label"
-                            :value="item.value"
-                        />
+                      <el-select v-model="form.ttsVoiceId" placeholder="请选择" class="form-select">
+                        <el-option v-for="(item, index) in voiceOptions" :key="`voice-${index}`" :label="item.label"
+                          :value="item.value" />
                       </el-select>
                     </el-form-item>
                   </div>
@@ -133,7 +89,7 @@ import HeaderBar from "@/components/HeaderBar.vue";
 
 export default {
   name: 'RoleConfigPage',
-  components: {HeaderBar},
+  components: { HeaderBar },
   data() {
     return {
       form: {
@@ -154,12 +110,12 @@ export default {
         }
       },
       models: [
-        {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'},
+        { 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' },
       ],
       modelOptions: {},
       templates: [],
@@ -187,7 +143,7 @@ export default {
         language: this.form.language,
         sort: this.form.sort
       };
-      Api.agent.updateAgentConfig(this.$route.query.agentId, configData, ({data}) => {
+      Api.agent.updateAgentConfig(this.$route.query.agentId, configData, ({ data }) => {
         if (data.code === 0) {
           this.$message.success({
             message: '配置保存成功',
@@ -232,7 +188,7 @@ export default {
       });
     },
     fetchTemplates() {
-      Api.agent.getAgentTemplate(({data}) => {
+      Api.agent.getAgentTemplate(({ data }) => {
         if (data.code === 0) {
           this.templates = data.data;
         } else {
@@ -277,7 +233,7 @@ export default {
       };
     },
     fetchAgentConfig(agentId) {
-      Api.agent.getDeviceConfig(agentId, ({data}) => {
+      Api.agent.getDeviceConfig(agentId, ({ data }) => {
         if (data.code === 0) {
           this.form = {
             ...this.form,
@@ -298,7 +254,7 @@ export default {
     },
     fetchModelOptions() {
       this.models.forEach(model => {
-        Api.model.getModelNames(model.type, '', ({data}) => {
+        Api.model.getModelNames(model.type, '', ({ data }) => {
           if (data.code === 0) {
             this.$set(this.modelOptions, model.type, data.data.map(item => ({
               value: item.id,
@@ -315,7 +271,7 @@ export default {
         this.voiceOptions = [];
         return;
       }
-      Api.model.getModelVoices(modelId, '', ({data}) => {
+      Api.model.getModelVoices(modelId, '', ({ data }) => {
         if (data.code === 0 && data.data) {
           this.voiceOptions = data.data.map(voice => ({
             value: voice.id,
@@ -567,7 +523,6 @@ export default {
   background: none;
   position: absolute;
   font-size: 12px;
-  bottom: -10%;
   right: 3%;
 }
 
@@ -597,5 +552,4 @@ export default {
   color: #409EFF;
   border-color: #409EFF;
 }
-
 </style>
\ No newline at end of file

From f0e353cc1a9b0a6394942ebc77add67ae74f96ef Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Fri, 2 May 2025 00:07:36 +0800
Subject: [PATCH 25/53] =?UTF-8?q?update:=E4=BC=98=E5=8C=96=E5=AF=B9?=
 =?UTF-8?q?=E8=AF=9D=E6=95=B0=E6=8D=AE=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   1 +
 .../common/service/impl/BaseServiceImpl.java  |   2 -
 .../common/service/impl/CrudServiceImpl.java  |   1 -
 .../AgentChatHistoryController.java           |   9 +-
 .../agent/dao/AiAgentChatAudioDao.java        |  18 +++
 .../agent/dto/AgentChatHistoryReportDTO.java  |  11 +-
 .../agent/entity/AgentChatAudioEntity.java    |  29 +++++
 .../agent/entity/AgentChatHistoryEntity.java  |  51 ++++----
 .../agent/service/AgentChatAudioService.java  |  22 ++++
 .../impl/AgentChatHistoryBizServiceImpl.java  |  50 ++++----
 .../impl/AgentChatAudioServiceImpl.java       |  28 +++++
 .../config/controller/ConfigController.java   |   4 +-
 .../service/impl/ConfigServiceImpl.java       |   1 -
 .../resources/db/changelog/202504301634.sql   |  18 ---
 .../resources/db/changelog/202505012207.sql   |  24 ++++
 .../db/changelog/db.changelog-master.yaml     |   9 +-
 .../config/manage_api_client.py               |  66 ++++++-----
 main/xiaozhi-server/core/connection.py        | 112 ++++++------------
 .../core/handle/asrReportHandle.py            | 100 ----------------
 .../core/handle/receiveAudioHandle.py         |   5 +-
 main/xiaozhi-server/core/handle/textHandle.py |  23 ++--
 .../core/handle/ttsReportHandle.py            |  51 ++++----
 22 files changed, 295 insertions(+), 340 deletions(-)
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AiAgentChatAudioDao.java
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatAudioEntity.java
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatAudioService.java
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatAudioServiceImpl.java
 delete mode 100644 main/manager-api/src/main/resources/db/changelog/202504301634.sql
 create mode 100644 main/manager-api/src/main/resources/db/changelog/202505012207.sql
 delete mode 100644 main/xiaozhi-server/core/handle/asrReportHandle.py

diff --git a/.gitignore b/.gitignore
index e1ee3d0c..f4efaeaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -165,3 +165,4 @@ main/manager-api/.vscode
 main/manager-web/.webpack_cache/
 main/xiaozhi-server/mysql
 uploadfile
+.vscode
diff --git a/main/manager-api/src/main/java/xiaozhi/common/service/impl/BaseServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/common/service/impl/BaseServiceImpl.java
index 8ebb4cd1..9d2ba5d5 100644
--- a/main/manager-api/src/main/java/xiaozhi/common/service/impl/BaseServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/common/service/impl/BaseServiceImpl.java
@@ -128,12 +128,10 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> implements Bas
         return SqlHelper.retBool(result);
     }
 
-    @SuppressWarnings("unchecked")
     protected Class<M> currentMapperClass() {
         return (Class<M>) ReflectionKit.getSuperClassGenericType(this.getClass(), BaseServiceImpl.class, 0);
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public Class<T> currentModelClass() {
         return (Class<T>) ReflectionKit.getSuperClassGenericType(this.getClass(), BaseServiceImpl.class, 1);
diff --git a/main/manager-api/src/main/java/xiaozhi/common/service/impl/CrudServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/common/service/impl/CrudServiceImpl.java
index 524a8cb2..9a1bf39e 100644
--- a/main/manager-api/src/main/java/xiaozhi/common/service/impl/CrudServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/common/service/impl/CrudServiceImpl.java
@@ -24,7 +24,6 @@ import xiaozhi.common.utils.ConvertUtils;
 public abstract class CrudServiceImpl<M extends BaseMapper<T>, T, D> extends BaseServiceImpl<M, T>
         implements CrudService<T, D> {
 
-    @SuppressWarnings("unchecked")
     protected Class<D> currentDtoClass() {
         return (Class<D>) ReflectionKit.getSuperClassGenericType(getClass(), CrudServiceImpl.class, 2);
     }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentChatHistoryController.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentChatHistoryController.java
index 7abf3d13..9d6542cc 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentChatHistoryController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentChatHistoryController.java
@@ -1,13 +1,14 @@
 package xiaozhi.modules.agent.controller;
 
+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 jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-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 xiaozhi.common.utils.Result;
 import xiaozhi.modules.agent.dto.AgentChatHistoryReportDTO;
 import xiaozhi.modules.agent.service.biz.AgentChatHistoryBizService;
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AiAgentChatAudioDao.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AiAgentChatAudioDao.java
new file mode 100644
index 00000000..355b25ac
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AiAgentChatAudioDao.java
@@ -0,0 +1,18 @@
+package xiaozhi.modules.agent.dao;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import xiaozhi.modules.agent.entity.AgentChatAudioEntity;
+
+/**
+ * {@link AgentChatAudioEntity} 智能体聊天音频数据Dao对象
+ *
+ * @author Goody
+ * @version 1.0, 2025/5/8
+ * @since 1.0.0
+ */
+@Mapper
+public interface AiAgentChatAudioDao extends BaseMapper<AgentChatAudioEntity> {
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryReportDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryReportDTO.java
index 0f79dda6..8227260d 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryReportDTO.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryReportDTO.java
@@ -20,17 +20,12 @@ public class AgentChatHistoryReportDTO {
     @Schema(description = "会话ID", example = "79578c31-f1fb-426a-900e-1e934215f05a")
     @NotBlank
     private String sessionId;
-    @Schema(description = "排序值（与session_id对应）", example = "1745566378")
-    @NotNull
-    private Long sort;
     @Schema(description = "消息类型: 1-用户, 2-智能体", example = "1")
     @NotNull
     private Byte chatType;
     @Schema(description = "聊天内容", example = "你好呀")
     @NotBlank
     private String content;
-    @Schema(description = "文件数据（Base64编码）", example = "")
-    private String fileBase64;
-    @Schema(description = "文件扩展名（如wav、mp3等）", example = "wav")
-    private String fileExtension;
-} 
+    @Schema(description = "文件数据（opus编码）", example = "")
+    private String opusDataBase64;
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatAudioEntity.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatAudioEntity.java
new file mode 100644
index 00000000..ac30d9d4
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatAudioEntity.java
@@ -0,0 +1,29 @@
+package xiaozhi.modules.agent.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
+/**
+ * 智能体聊天音频数据表
+ *
+ * @author Goody
+ * @version 1.0, 2025/5/8
+ * @since 1.0.0
+ */
+@Data
+@TableName("ai_agent_chat_audio")
+public class AgentChatAudioEntity {
+    /**
+     * 主键ID
+     */
+    @TableId(type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 音频opus数据
+     */
+    private byte[] audio;
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatHistoryEntity.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatHistoryEntity.java
index 3e486f43..96e82885 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatHistoryEntity.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatHistoryEntity.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -25,68 +26,62 @@ import lombok.NoArgsConstructor;
 @TableName(value = "ai_agent_chat_history")
 public class AgentChatHistoryEntity {
     /**
-    * 主键ID
-    */
+     * 主键ID
+     */
     @TableId(type = IdType.AUTO)
     private Long id;
 
     /**
-    * MAC地址
-    */
+     * MAC地址
+     */
     @TableField(value = "mac_address")
     private String macAddress;
 
     /**
-    * 智能体id
-    */
+     * 智能体id
+     */
     @TableField(value = "agent_id")
     private String agentId;
 
     /**
-    * 会话ID
-    */
+     * 会话ID
+     */
     @TableField(value = "session_id")
     private String sessionId;
 
     /**
-    * 排序值（与session_id对应），使用时间戳，方便排序
-    */
-    @TableField(value = "sort")
-    private Long sort;
-
-    /**
-    * 消息类型: 1-用户, 2-智能体
-    */
+     * 消息类型: 1-用户, 2-智能体
+     */
     @TableField(value = "chat_type")
     private Byte chatType;
 
     /**
-    * 聊天内容
-    */
+     * 聊天内容
+     */
     @TableField(value = "content")
     private String content;
 
     /**
-    * 音频base64数据
-    */
-    @TableField(value = "audio")
-    private String audio;
+     * 音频base64数据
+     */
+    @TableField(value = "audio_id")
+    private String audioId;
 
     /**
-    * 音频URL
-    */
+     * 音频URL
+     */
     @TableField(value = "audio_url")
     private String audioUrl;
 
     /**
-    * 创建时间
-    */
+     * 创建时间
+     */
     @TableField(value = "created_at")
     private Date createdAt;
 
     /**
-    * 更新时间
-    */
+     * 更新时间
+     */
     @TableField(value = "updated_at")
     private Date updatedAt;
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatAudioService.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatAudioService.java
new file mode 100644
index 00000000..fdd0e1f6
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatAudioService.java
@@ -0,0 +1,22 @@
+package xiaozhi.modules.agent.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import xiaozhi.modules.agent.entity.AgentChatAudioEntity;
+
+/**
+ * 智能体聊天音频数据表处理service
+ *
+ * @author Goody
+ * @version 1.0, 2025/5/8
+ * @since 1.0.0
+ */
+public interface AgentChatAudioService extends IService<AgentChatAudioEntity> {
+    /**
+     * 保存音频数据
+     *
+     * @param audioData 音频数据
+     * @return 音频ID
+     */
+    String saveAudio(byte[] audioData);
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java
index ae99455d..edd96256 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java
@@ -1,18 +1,18 @@
 package xiaozhi.modules.agent.service.biz.impl;
 
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import xiaozhi.modules.agent.dto.AgentChatHistoryReportDTO;
-import xiaozhi.modules.agent.entity.AgentEntity;
 import xiaozhi.modules.agent.entity.AgentChatHistoryEntity;
+import xiaozhi.modules.agent.entity.AgentEntity;
+import xiaozhi.modules.agent.service.AgentChatAudioService;
 import xiaozhi.modules.agent.service.AgentChatHistoryService;
 import xiaozhi.modules.agent.service.AgentService;
 import xiaozhi.modules.agent.service.biz.AgentChatHistoryBizService;
 
-import javax.annotation.Nullable;
-
 /**
  * {@link AgentChatHistoryBizService} impl
  *
@@ -26,6 +26,7 @@ import javax.annotation.Nullable;
 public class AgentChatHistoryBizServiceImpl implements AgentChatHistoryBizService {
     private final AgentService agentService;
     private final AgentChatHistoryService agentChatHistoryService;
+    private final AgentChatAudioService agentChatAudioService;
 
     /**
      * 处理聊天记录上报，包括文件上传和相关信息记录
@@ -36,12 +37,23 @@ public class AgentChatHistoryBizServiceImpl implements AgentChatHistoryBizServic
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean report(AgentChatHistoryReportDTO report) {
-        final String macAddress = report.getMacAddress();
-        final Byte chatType = report.getChatType();
+        String macAddress = report.getMacAddress();
+        Byte chatType = report.getChatType();
         log.info("小智设备聊天上报请求: macAddress={}, type={}", macAddress, chatType);
 
-        // 1. 上传音频文件
-        final String uploadUrl = this.upload(report);
+        // 1. base64解码report.getOpusDataBase64(),存入ai_agent_chat_audio表
+        String audioId = null;
+        if (report.getOpusDataBase64() != null && !report.getOpusDataBase64().isEmpty()) {
+            try {
+                // TODO: 需要考虑保留什么格式的音频数据，比如是opus还是wave
+                // byte[] audioData = Base64.getDecoder().decode(report.getOpusDataBase64());
+                // audioId = agentChatAudioService.saveAudio(audioData);
+                // log.info("音频数据保存成功，audioId={}", audioId);
+            } catch (Exception e) {
+                log.error("音频数据保存失败", e);
+                return false;
+            }
+        }
 
         // 2. 组装上报数据
         // 2.1 根据设备MAC地址查询对应的默认智能体，判断是否需要上报
@@ -49,35 +61,21 @@ public class AgentChatHistoryBizServiceImpl implements AgentChatHistoryBizServic
         if (agentEntity == null) {
             return false;
         }
-        final String agentId = agentEntity.getId();
+        String agentId = agentEntity.getId();
         log.info("设备 {} 对应智能体 {} 上报", macAddress, agentEntity.getId());
 
         // 2.2 构建聊天记录实体
-        final AgentChatHistoryEntity entity = AgentChatHistoryEntity.builder()
+        AgentChatHistoryEntity entity = AgentChatHistoryEntity.builder()
                 .macAddress(macAddress)
                 .agentId(agentId)
                 .sessionId(report.getSessionId())
-                .sort(report.getSort())
                 .chatType(report.getChatType())
                 .content(report.getContent())
-                .audio(report.getFileBase64())
-                .audioUrl(uploadUrl)
+                .audioId(audioId)
                 .build();
 
         // 3. 保存数据
         agentChatHistoryService.save(entity);
         return Boolean.TRUE;
     }
-
-    /**
-     * 上传文件
-     *
-     * @param report 上报文件数据
-     * @return 上传文件url
-     */
-    @Nullable
-    private String upload(AgentChatHistoryReportDTO report) {
-        // TODO(haotian): 2025/4/30 根据需要自定义完成上传生成url即可
-        return null;
-    }
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatAudioServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatAudioServiceImpl.java
new file mode 100644
index 00000000..c222abe4
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatAudioServiceImpl.java
@@ -0,0 +1,28 @@
+package xiaozhi.modules.agent.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import xiaozhi.modules.agent.dao.AiAgentChatAudioDao;
+import xiaozhi.modules.agent.entity.AgentChatAudioEntity;
+import xiaozhi.modules.agent.service.AgentChatAudioService;
+
+/**
+ * 智能体聊天音频数据表处理service {@link AgentChatAudioService} impl
+ *
+ * @author Goody
+ * @version 1.0, 2025/5/8
+ * @since 1.0.0
+ */
+@Service
+public class AgentChatAudioServiceImpl extends ServiceImpl<AiAgentChatAudioDao, AgentChatAudioEntity>
+        implements AgentChatAudioService {
+    @Override
+    public String saveAudio(byte[] audioData) {
+        AgentChatAudioEntity entity = new AgentChatAudioEntity();
+        entity.setAudio(audioData);
+        save(entity);
+        return entity.getId();
+    }
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/config/controller/ConfigController.java b/main/manager-api/src/main/java/xiaozhi/modules/config/controller/ConfigController.java
index 13106869..f83efb3a 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/config/controller/ConfigController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/config/controller/ConfigController.java
@@ -1,6 +1,5 @@
 package xiaozhi.modules.config.controller;
 
-import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -8,12 +7,12 @@ import org.springframework.web.bind.annotation.RestController;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 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.service.SysParamsService;
 
 /**
  * xiaozhi-server 配置获取
@@ -26,7 +25,6 @@ import xiaozhi.modules.sys.service.SysParamsService;
 @AllArgsConstructor
 public class ConfigController {
     private final ConfigService configService;
-    private final SysParamsService sysParamsService;
 
     @PostMapping("server-base")
     @Operation(summary = "获取配置")
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java
index e4914029..f0ed4bf1 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java
@@ -153,7 +153,6 @@ public class ConfigServiceImpl implements ConfigService {
      * @param paramsList 系统参数列表
      * @return 配置信息
      */
-    @SuppressWarnings("unchecked")
     private Object buildConfig(Map<String, Object> config) {
 
         // 查询所有系统参数
diff --git a/main/manager-api/src/main/resources/db/changelog/202504301634.sql b/main/manager-api/src/main/resources/db/changelog/202504301634.sql
deleted file mode 100644
index 6a86a417..00000000
--- a/main/manager-api/src/main/resources/db/changelog/202504301634.sql
+++ /dev/null
@@ -1,18 +0,0 @@
--- 初始化智能体聊天记录
-DROP TABLE IF EXISTS ai_agent_chat_history;
-CREATE TABLE ai_agent_chat_history
-(
-    id          BIGINT AUTO_INCREMENT COMMENT '主键ID'
-        PRIMARY KEY,
-    mac_address VARCHAR(50) COMMENT 'MAC地址',
-    agent_id BIGINT DEFAULT 0 COMMENT '智能体id',
-    session_id  VARCHAR(50) COMMENT '会话ID',
-    sort        BIGINT COMMENT '排序值（与session_id对应），使用时间戳，方便排序',
-    chat_type   TINYINT(3) COMMENT '消息类型: 1-用户, 2-智能体',
-    content     VARCHAR(1024) COMMENT '聊天内容',
-    audio       text         COMMENT '音频base64数据',
-    audio_url   VARCHAR(256) COMMENT '音频URL',
-    created_at  DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间',
-    updated_at  DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
-    INDEX idx_mac_session (mac_address, sort)
-) COMMENT '智能体聊天记录表';
diff --git a/main/manager-api/src/main/resources/db/changelog/202505012207.sql b/main/manager-api/src/main/resources/db/changelog/202505012207.sql
new file mode 100644
index 00000000..5003edc7
--- /dev/null
+++ b/main/manager-api/src/main/resources/db/changelog/202505012207.sql
@@ -0,0 +1,24 @@
+-- 初始化智能体聊天记录
+DROP TABLE IF EXISTS ai_chat_history;
+DROP TABLE IF EXISTS ai_agent_chat_history;
+CREATE TABLE ai_agent_chat_history
+(
+    id          BIGINT AUTO_INCREMENT COMMENT '主键ID' PRIMARY KEY,
+    mac_address VARCHAR(50) COMMENT 'MAC地址',
+    agent_id VARCHAR(32) COMMENT '智能体id',
+    session_id  VARCHAR(50) COMMENT '会话ID',
+    chat_type   TINYINT(3) COMMENT '消息类型: 1-用户, 2-智能体',
+    content     VARCHAR(1024) COMMENT '聊天内容',
+    audio_id    VARCHAR(32) COMMENT '音频ID',
+    created_at  DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间',
+    updated_at  DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
+    INDEX idx_ai_agent_chat_history_mac (mac_address),
+    INDEX idx_ai_agent_chat_history_agent_id (agent_id)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT '智能体聊天记录表';
+
+DROP TABLE IF EXISTS ai_agent_chat_audio;
+CREATE TABLE ai_agent_chat_audio
+(
+    id          VARCHAR(32) COMMENT '主键ID' PRIMARY KEY,
+    audio       LONGBLOB COMMENT '音频opus数据'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT '智能体聊天音频数据表'; 
\ No newline at end of file
diff --git a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
index ffe96a9b..aaef45bc 100755
--- a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -92,4 +92,11 @@ databaseChangeLog:
       changes:
         - sqlFile:
             encoding: utf8
-            path: classpath:db/changelog/202504301341.sql
\ No newline at end of file
+            path: classpath:db/changelog/202504301341.sql
+  - changeSet:
+      id: 202505012207
+      author: Goody
+      changes:
+        - sqlFile:
+            encoding: utf8
+            path: classpath:db/changelog/202505012207.sql
\ No newline at end of file
diff --git a/main/xiaozhi-server/config/manage_api_client.py b/main/xiaozhi-server/config/manage_api_client.py
index ec8fd30a..7de4c8fe 100644
--- a/main/xiaozhi-server/config/manage_api_client.py
+++ b/main/xiaozhi-server/config/manage_api_client.py
@@ -1,6 +1,6 @@
-import base64
 import os
 import time
+import base64
 from typing import Optional, Dict
 
 import httpx
@@ -54,7 +54,7 @@ class ManageApiClient:
             headers={
                 "User-Agent": f"PythonClient/2.0 (PID:{os.getpid()})",
                 "Accept": "application/json",
-                "Authorization": "Bearer " + cls._secret
+                "Authorization": "Bearer " + cls._secret,
             },
             timeout=cls.config.get("timeout", 30),  # 默认超时时间30秒
         )
@@ -127,9 +127,7 @@ class ManageApiClient:
 
 def get_server_config() -> Optional[Dict]:
     """获取服务器基础配置"""
-    return ManageApiClient._instance._execute_request(
-        "POST", "/config/server-base"
-    )
+    return ManageApiClient._instance._execute_request("POST", "/config/server-base")
 
 
 def get_agent_models(
@@ -146,35 +144,41 @@ def get_agent_models(
         },
     )
 
-async def report(mac_address: str,
-                 session_id: str,
-                 sort: int,
-                 chat_type: int,
-                 content: str,
-                 audio,
-                 file_extension: str = "wav",
-                 need_report: bool = None,
-                 report_type: int = None,
-                 reported: bool = None) -> Optional[Dict]:
+
+def report(
+    mac_address: str, session_id: str, chat_type: int, content: str, opus_data
+) -> Optional[Dict]:
     """带熔断的业务方法示例"""
     if not content or not ManageApiClient._instance:
         return None
-    return await ManageApiClient._instance._execute_request(
-        "POST",
-        f"/agent/chat-history/report",
-        json = {
-            "macAddress": mac_address,
-            "sessionId": session_id,
-            "sort": sort,
-            "chatType": chat_type,
-            "content": content,
-            "fileBase64": base64.b64encode(audio).decode('utf-8'),
-            "fileExtension": file_extension,
-            "needReport": need_report,
-            "reportType": report_type,
-            "reported": reported
-        }
-    )
+    try:
+        # 处理opus_data为列表的情况
+        if isinstance(opus_data, list):
+            # 将列表中的所有bytes数据合并
+            combined_data = b"".join(opus_data)
+        else:
+            combined_data = opus_data
+
+        # 将二进制数据转换为Base64编码的字符串
+        opus_data_base64 = (
+            base64.b64encode(combined_data).decode("utf-8") if combined_data else None
+        )
+
+        return ManageApiClient._instance._execute_request(
+            "POST",
+            f"/agent/chat-history/report",
+            json={
+                "macAddress": mac_address,
+                "sessionId": session_id,
+                "chatType": chat_type,
+                "content": content,
+                "opusDataBase64": opus_data_base64,
+            },
+        )
+    except Exception as e:
+        print(f"TTS上报失败: {e}")
+        return None
+
 
 def init_service(config):
     ManageApiClient(config)
diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index 87052940..f08a61ff 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -17,7 +17,6 @@ from core.handle.textHandle import handleTextMessage
 from core.utils.util import (
     get_string_no_punctuation_or_emoji,
     extract_json_from_string,
-    get_ip_info,
     initialize_modules,
 )
 from concurrent.futures import ThreadPoolExecutor, TimeoutError
@@ -30,7 +29,7 @@ from core.mcp.manager import MCPManager
 from config.config_loader import get_private_config_from_api
 from config.manage_api_client import DeviceNotFoundException, DeviceBindException
 from core.utils.output_counter import add_device_output
-from core.handle.ttsReportHandle import enqueue_tts_report
+from core.handle.ttsReportHandle import enqueue_tts_report, report_tts
 
 TAG = __name__
 
@@ -43,7 +42,15 @@ class TTSException(RuntimeError):
 
 class ConnectionHandler:
     def __init__(
-        self, config: Dict[str, Any], _vad, _asr, _llm, _tts, _memory, _intent, server=None
+        self,
+        config: Dict[str, Any],
+        _vad,
+        _asr,
+        _llm,
+        _tts,
+        _memory,
+        _intent,
+        server=None,
     ):
         self.config = config
         self.server = server
@@ -52,6 +59,7 @@ class ConnectionHandler:
 
         self.need_bind = False
         self.bind_code = None
+        self.read_config_from_api = self.config.get("read_config_from_api", False)
 
         self.websocket = None
         self.headers = None
@@ -74,11 +82,8 @@ class ConnectionHandler:
         self.audio_play_queue = queue.Queue()
         self.executor = ThreadPoolExecutor(max_workers=10)
 
-        # 上报线程标志
-        self.session_open_time = time.time()
+        # 上报线程
         self.tts_report_queue = queue.Queue()
-        self.asr_report_queue = queue.Queue()
-        self.asr_report_thread = None
         self.tts_report_thread = None
 
         # 依赖的组件
@@ -275,19 +280,27 @@ class ConnectionHandler:
                 )
             except Exception as e:
                 self.logger.bind(tag=TAG).error(f"模块初始化失败: {str(e)}")
-                await self.websocket.send(json.dumps({
-                    "type": "config_update_response",
-                    "status": "error",
-                    "message": f"模块初始化失败: {str(e)}"
-                }))
+                await self.websocket.send(
+                    json.dumps(
+                        {
+                            "type": "config_update_response",
+                            "status": "error",
+                            "message": f"模块初始化失败: {str(e)}",
+                        }
+                    )
+                )
                 return
 
         # 返回成功响应
-        await self.websocket.send(json.dumps({
-            "type": "config_update_response",
-            "status": "success",
-            "message": f"已更新配置: {', '.join(updated_modules)}"
-        }))
+        await self.websocket.send(
+            json.dumps(
+                {
+                    "type": "config_update_response",
+                    "status": "success",
+                    "message": f"已更新配置: {', '.join(updated_modules)}",
+                }
+            )
+        )
 
     def _initialize_components(self, private_config):
         """初始化组件"""
@@ -305,26 +318,18 @@ class ConnectionHandler:
 
     def _init_report_threads(self):
         """初始化ASR和TTS上报线程"""
-        if self.asr_report_thread is None or not self.asr_report_thread.is_alive():
-            self.asr_report_thread = threading.Thread(
-                target=self._asr_report_worker,
-                daemon=True
-            )
-            self.asr_report_thread.start()
-            self.logger.bind(tag=TAG).info("ASR上报线程已启动")
-
+        if not self.read_config_from_api:
+            return
         if self.tts_report_thread is None or not self.tts_report_thread.is_alive():
             self.tts_report_thread = threading.Thread(
-                target=self._tts_report_worker,
-                daemon=True
+                target=self._tts_report_worker, daemon=True
             )
             self.tts_report_thread.start()
             self.logger.bind(tag=TAG).info("TTS上报线程已启动")
 
     def _initialize_private_config(self):
-        read_config_from_api = self.config.get("read_config_from_api", False)
         """如果是从配置文件获取，则进行二次实例化"""
-        if not read_config_from_api:
+        if not self.read_config_from_api:
             return
         """从接口获取差异化的配置进行二次实例化，非全量重新实例化"""
         try:
@@ -880,10 +885,9 @@ class ConnectionHandler:
                             f"TTS生成：文件路径: {tts_file}"
                         )
                         if os.path.exists(tts_file):
+                            opus_datas, _ = self.tts.audio_to_opus_data(tts_file)
                             # 在这里上报TTS数据（使用文件路径）
-                            enqueue_tts_report(self, text, tts_file)
-
-                            opus_datas, duration = self.tts.audio_to_opus_data(tts_file)
+                            enqueue_tts_report(self, 2, text, opus_datas)
                         else:
                             self.logger.bind(tag=TAG).error(
                                 f"TTS出错：文件不存在{tts_file}"
@@ -939,43 +943,8 @@ class ConnectionHandler:
                     f"audio_play_priority priority_thread: {text} {e}"
                 )
 
-    def _asr_report_worker(self):
-        """ASR上报工作线程"""
-        # 提前导入避免循环引用问题
-        from core.handle.asrReportHandle import report_asr
-
-        while not self.stop_event.is_set():
-            try:
-                # 从队列获取数据，设置超时以便定期检查停止事件
-                item = self.asr_report_queue.get(timeout=1)
-                if item is None:  # 检测毒丸对象
-                    break
-
-                text, file_path = item
-
-                try:
-                    # 执行上报（传入文件路径）
-                    await_result = report_asr(self, text, file_path)
-
-                    # 使用asyncio.run_coroutine_threadsafe执行异步操作
-                    future = asyncio.run_coroutine_threadsafe(await_result, self.loop)
-                    future.result()
-                except Exception as e:
-                    self.logger.bind(tag=TAG).error(f"ASR上报线程异常: {e}")
-                finally:
-                    # 标记任务完成
-                    self.asr_report_queue.task_done()
-            except queue.Empty:
-                continue
-            except Exception as e:
-                self.logger.bind(tag=TAG).error(f"ASR上报工作线程异常: {e}")
-
-        self.logger.bind(tag=TAG).info("ASR上报线程已退出")
-
     def _tts_report_worker(self):
         """TTS上报工作线程"""
-        # 提前导入避免循环引用问题
-        from core.handle.ttsReportHandle import report_tts
 
         while not self.stop_event.is_set():
             try:
@@ -984,15 +953,11 @@ class ConnectionHandler:
                 if item is None:  # 检测毒丸对象
                     break
 
-                text, audio_data = item
+                type, text, audio_data = item
 
                 try:
                     # 执行上报（传入二进制数据）
-                    await_result = report_tts(self, text, audio_data)
-
-                    # 使用asyncio.run_coroutine_threadsafe执行异步操作
-                    future = asyncio.run_coroutine_threadsafe(await_result, self.loop)
-                    future.result()
+                    report_tts(self, type, text, audio_data)
                 except Exception as e:
                     self.logger.bind(tag=TAG).error(f"TTS上报线程异常: {e}")
                 finally:
@@ -1051,7 +1016,6 @@ class ConnectionHandler:
             self.executor = None
 
         # 添加毒丸对象到上报队列确保线程退出
-        self.asr_report_queue.put(None)
         self.tts_report_queue.put(None)
 
         # 清空任务队列
diff --git a/main/xiaozhi-server/core/handle/asrReportHandle.py b/main/xiaozhi-server/core/handle/asrReportHandle.py
deleted file mode 100644
index 70601804..00000000
--- a/main/xiaozhi-server/core/handle/asrReportHandle.py
+++ /dev/null
@@ -1,100 +0,0 @@
-"""
-ASR上报功能已集成到ConnectionHandler类中。
-
-上报功能包括：
-1. 每个连接对象拥有自己的上报队列和处理线程
-2. 上报线程的生命周期与连接对象绑定
-3. 使用ConnectionHandler.enqueue_asr_report方法进行上报
-
-具体实现请参考core/connection.py中的相关代码。
-"""
-
-import os
-from config.logger import setup_logging
-from config.manage_api_client import report
-
-TAG = __name__
-logger = setup_logging()
-
-async def report_asr(conn, text, file_path):
-    """执行ASR上报操作
-    
-    Args:
-        conn: 连接对象
-        text: 识别文本
-        file_path: 音频文件路径（可以为None或空字符串，表示纯文本上报）
-    """
-    audio_data = None
-    try:
-        # 处理无音频的纯文本上报
-        if not file_path or not os.path.exists(file_path):
-            # 纯文本上报时使用空音频数据
-            result = await report(
-                mac_address=conn.device_id,
-                session_id=conn.session_id,
-                sort=int(conn.session_open_time),
-                chat_type=1,  # ASR类型为1
-                content=text,
-                audio=b'',  # 空音频数据
-                file_extension="wav"
-            )
-            logger.bind(tag=TAG).info(f"纯文本上报成功: {conn.device_id}, {conn.session_id}")
-        else:
-            # 读取文件为二进制数据
-            with open(file_path, 'rb') as f:
-                audio_data = f.read()
-                
-            # 正常ASR上报（带音频）
-            result = await report(
-                mac_address=conn.device_id,
-                session_id=conn.session_id,
-                sort=int(conn.session_open_time),
-                chat_type=1,  # ASR类型为1
-                content=text,
-                audio=audio_data,
-                file_extension="wav"
-            )
-            logger.bind(tag=TAG).info(f"ASR上报成功: {conn.device_id}, {conn.session_id}，文件: {file_path}")
-        
-        return result
-    except Exception as e:
-        logger.bind(tag=TAG).error(f"ASR上报失败: {e}")
-        return None
-    finally:
-        # 清理资源
-        if file_path and os.path.exists(file_path):
-            try:
-                os.remove(file_path)
-                logger.bind(tag=TAG).debug(f"ASR上报后删除文件: {file_path}")
-            except Exception as e:
-                logger.bind(tag=TAG).error(f"ASR上报后删除文件失败: {e}")
-        
-        # 手动清理audio_data
-        if audio_data:
-            del audio_data
-
-def enqueue_asr_report(conn, text, audio):
-    """将ASR数据加入上报队列
-    
-    Args:
-        conn: 连接对象
-        text: 识别文本
-        audio: 音频数据（可以为空列表，表示纯文本上报）
-    """
-    try:
-        if not audio or len(audio) == 0:
-            # 纯文本上报，不需要保存文件
-            file_path = None
-        else:
-            # 保存音频数据到文件
-            file_path = conn.asr.save_audio_to_file(audio, conn.session_id)
-        
-        # 使用连接对象的队列，传入文件路径
-        conn.asr_report_queue.put((text, file_path))
-        
-        if not audio or len(audio) == 0:
-            logger.bind(tag=TAG).info(f"纯文本数据已加入上报队列: {conn.device_id}, {text[:20] if text else ''}...")
-        else:
-            logger.bind(tag=TAG).info(f"ASR数据已加入上报队列: {conn.device_id}, 文件: {file_path}")
-    except Exception as e:
-        logger.bind(tag=TAG).error(f"加入ASR上报队列失败: {e}")
diff --git a/main/xiaozhi-server/core/handle/receiveAudioHandle.py b/main/xiaozhi-server/core/handle/receiveAudioHandle.py
index 2d8b0eef..a346fb61 100644
--- a/main/xiaozhi-server/core/handle/receiveAudioHandle.py
+++ b/main/xiaozhi-server/core/handle/receiveAudioHandle.py
@@ -1,10 +1,11 @@
 from config.logger import setup_logging
 import time
+import copy
 from core.utils.util import remove_punctuation_and_length
 from core.handle.sendAudioHandle import send_stt_message
 from core.handle.intentHandler import handle_user_intent
 from core.utils.output_counter import check_device_output_limit
-from core.handle.asrReportHandle import enqueue_asr_report
+from core.handle.ttsReportHandle import enqueue_tts_report
 
 TAG = __name__
 logger = setup_logging()
@@ -42,7 +43,7 @@ async def handleAudioMessage(conn, audio):
             text_len, _ = remove_punctuation_and_length(text)
             if text_len > 0:
                 # 使用自定义模块进行上报
-                enqueue_asr_report(conn, text, conn.asr_audio)
+                enqueue_tts_report(conn, 1, text, copy.deepcopy(conn.asr_audio))
 
                 await startToChat(conn, text)
             else:
diff --git a/main/xiaozhi-server/core/handle/textHandle.py b/main/xiaozhi-server/core/handle/textHandle.py
index 08c1c40e..d350f78c 100644
--- a/main/xiaozhi-server/core/handle/textHandle.py
+++ b/main/xiaozhi-server/core/handle/textHandle.py
@@ -6,7 +6,7 @@ from core.utils.util import remove_punctuation_and_length
 from core.handle.receiveAudioHandle import startToChat, handleAudioMessage
 from core.handle.sendAudioHandle import send_stt_message, send_tts_message
 from core.handle.iotHandle import handleIotDescriptors, handleIotStatus
-from core.handle.asrReportHandle import enqueue_asr_report
+from core.handle.ttsReportHandle import enqueue_tts_report
 import asyncio
 
 TAG = __name__
@@ -56,11 +56,11 @@ async def handleTextMessage(conn, message):
                         await send_tts_message(conn, "stop", None)
                     elif is_wakeup_words:
                         # 上报纯文字数据（复用ASR上报功能，但不提供音频数据）
-                        enqueue_asr_report(conn, "嘿，你好呀", [])
+                        enqueue_tts_report(conn, 1, "嘿，你好呀", [])
                         await startToChat(conn, "嘿，你好呀")
                     else:
                         # 上报纯文字数据（复用ASR上报功能，但不提供音频数据）
-                        enqueue_asr_report(conn, text, [])
+                        enqueue_tts_report(conn, 1, text, [])
                         # 否则需要LLM对文字内容进行答复
                         await startToChat(conn, text)
         elif msg_json["type"] == "iot":
@@ -70,19 +70,22 @@ async def handleTextMessage(conn, message):
                 asyncio.create_task(handleIotStatus(conn, msg_json["states"]))
         elif msg_json["type"] == "server":
             # 如果配置是从API读取的，则需要验证secret
-            read_config_from_api = conn.config.get("read_config_from_api", False)
-            if not read_config_from_api:
+            if not conn.read_config_from_api:
                 return
             # 获取post请求的secret
             post_secret = msg_json.get("content", {}).get("secret", "")
             secret = conn.config["manager-api"].get("secret", "")
             # 如果secret不匹配，则返回
             if post_secret != secret:
-                await conn.websocket.send(json.dumps({
-                    "type": "config_update_response",
-                    "status": "error",
-                    "message": "服务器密钥验证失败"
-                }))
+                await conn.websocket.send(
+                    json.dumps(
+                        {
+                            "type": "config_update_response",
+                            "status": "error",
+                            "message": "服务器密钥验证失败",
+                        }
+                    )
+                )
                 return
             # 动态更新配置
             if msg_json["action"] == "update_config":
diff --git a/main/xiaozhi-server/core/handle/ttsReportHandle.py b/main/xiaozhi-server/core/handle/ttsReportHandle.py
index ed3a6a76..3aec8a32 100644
--- a/main/xiaozhi-server/core/handle/ttsReportHandle.py
+++ b/main/xiaozhi-server/core/handle/ttsReportHandle.py
@@ -9,62 +9,51 @@ TTS上报功能已集成到ConnectionHandler类中。
 具体实现请参考core/connection.py中的相关代码。
 """
 
-import os
 from config.logger import setup_logging
 from config.manage_api_client import report
 
 TAG = __name__
 logger = setup_logging()
 
-async def report_tts(conn, text, audio_data):
+
+def report_tts(conn, type, text, opus_data):
     """执行TTS上报操作
-    
+
     Args:
         conn: 连接对象
+        type: 上报类型，1为用户，2为智能体
         text: 合成文本
-        audio_data: 音频二进制数据
+        opus_data: opus音频数据
     """
     try:
         # 执行上报
-        result = await report(
+        report(
             mac_address=conn.device_id,
             session_id=conn.session_id,
-            sort=int(conn.session_open_time),
-            chat_type=2,  # TTS类型为2
+            chat_type=type,
             content=text,
-            audio=audio_data,
-            file_extension="wav"
+            opus_data=opus_data,
         )
-        logger.bind(tag=TAG).info(f"TTS上报成功: {conn.device_id}, {conn.session_id}, 数据大小: {len(audio_data)} 字节")
-        return result
     except Exception as e:
         logger.bind(tag=TAG).error(f"TTS上报失败: {e}")
-        return None
-    finally:
-        # 手动清理audio_data引用，帮助垃圾回收
-        del audio_data
 
-def enqueue_tts_report(conn, text, file_path):
+
+def enqueue_tts_report(conn, type, text, opus_data):
+    if not conn.read_config_from_api:
+        return
     """将TTS数据加入上报队列
-    
+
     Args:
         conn: 连接对象
         text: 合成文本
-        file_path: TTS音频文件路径
+        opus_data: opus音频数据
     """
     try:
-        # 检查文件是否存在
-        if not file_path or not os.path.exists(file_path):
-            logger.bind(tag=TAG).error(f"加入TTS上报队列失败: 文件不存在 {file_path}")
-            return
-            
-        # 立即读取文件为二进制数据，因为外部会删除文件
-        with open(file_path, 'rb') as f:
-            audio_data = f.read()
-            
         # 使用连接对象的队列，传入文本和二进制数据而非文件路径
-        conn.tts_report_queue.put((text, audio_data))
-        
-        logger.bind(tag=TAG).info(f"TTS数据已加入上报队列: {conn.device_id}, 文件大小: {len(audio_data)} 字节")
+        conn.tts_report_queue.put((type, text, opus_data))
+
+        logger.bind(tag=TAG).info(
+            f"TTS数据已加入上报队列: {conn.device_id}, 音频大小: {len(opus_data)} "
+        )
     except Exception as e:
-        logger.bind(tag=TAG).error(f"加入TTS上报队列失败: {e}, 文件: {file_path}")
+        logger.bind(tag=TAG).error(f"加入TTS上报队列失败: {text}, {e}")

From dfb2bf3923625355124efd62893f5f0701019d91 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Fri, 2 May 2025 16:17:18 +0800
Subject: [PATCH 26/53] =?UTF-8?q?update:=E4=B8=8A=E6=8A=A5=E8=81=8A?=
 =?UTF-8?q?=E5=A4=A9=E9=9F=B3=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiaozhi/common/constant/Constant.java     |  2 +-
 .../agent/dto/AgentChatHistoryReportDTO.java  |  4 +-
 .../impl/AgentChatHistoryBizServiceImpl.java  | 11 ++--
 main/xiaozhi-server/config/logger.py          |  2 +-
 .../config/manage_api_client.py               | 18 ++----
 .../core/handle/ttsReportHandle.py            | 58 ++++++++++++++++++-
 6 files changed, 71 insertions(+), 24 deletions(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java b/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java
index 07d746b8..779fea83 100644
--- a/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java
+++ b/main/manager-api/src/main/java/xiaozhi/common/constant/Constant.java
@@ -177,5 +177,5 @@ public interface Constant {
     /**
      * 版本号
      */
-    public static final String VERSION = "0.3.13";
+    public static final String VERSION = "0.3.14";
 }
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryReportDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryReportDTO.java
index 8227260d..bdaed950 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryReportDTO.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryReportDTO.java
@@ -26,6 +26,6 @@ public class AgentChatHistoryReportDTO {
     @Schema(description = "聊天内容", example = "你好呀")
     @NotBlank
     private String content;
-    @Schema(description = "文件数据（opus编码）", example = "")
-    private String opusDataBase64;
+    @Schema(description = "base64编码的opus音频数据", example = "")
+    private String audioBase64;
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java
index edd96256..b839e9e4 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/biz/impl/AgentChatHistoryBizServiceImpl.java
@@ -1,5 +1,7 @@
 package xiaozhi.modules.agent.service.biz.impl;
 
+import java.util.Base64;
+
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -43,12 +45,11 @@ public class AgentChatHistoryBizServiceImpl implements AgentChatHistoryBizServic
 
         // 1. base64解码report.getOpusDataBase64(),存入ai_agent_chat_audio表
         String audioId = null;
-        if (report.getOpusDataBase64() != null && !report.getOpusDataBase64().isEmpty()) {
+        if (report.getAudioBase64() != null && !report.getAudioBase64().isEmpty()) {
             try {
-                // TODO: 需要考虑保留什么格式的音频数据，比如是opus还是wave
-                // byte[] audioData = Base64.getDecoder().decode(report.getOpusDataBase64());
-                // audioId = agentChatAudioService.saveAudio(audioData);
-                // log.info("音频数据保存成功，audioId={}", audioId);
+                byte[] audioData = Base64.getDecoder().decode(report.getAudioBase64());
+                audioId = agentChatAudioService.saveAudio(audioData);
+                log.info("音频数据保存成功，audioId={}", audioId);
             } catch (Exception e) {
                 log.error("音频数据保存失败", e);
                 return false;
diff --git a/main/xiaozhi-server/config/logger.py b/main/xiaozhi-server/config/logger.py
index f20dc0ad..396260f4 100644
--- a/main/xiaozhi-server/config/logger.py
+++ b/main/xiaozhi-server/config/logger.py
@@ -4,7 +4,7 @@ from loguru import logger
 from config.config_loader import load_config
 from config.settings import check_config_file
 
-SERVER_VERSION = "0.3.13"
+SERVER_VERSION = "0.3.14"
 
 
 def get_module_abbreviation(module_name, module_dict):
diff --git a/main/xiaozhi-server/config/manage_api_client.py b/main/xiaozhi-server/config/manage_api_client.py
index 7de4c8fe..fe3da63c 100644
--- a/main/xiaozhi-server/config/manage_api_client.py
+++ b/main/xiaozhi-server/config/manage_api_client.py
@@ -146,24 +146,12 @@ def get_agent_models(
 
 
 def report(
-    mac_address: str, session_id: str, chat_type: int, content: str, opus_data
+    mac_address: str, session_id: str, chat_type: int, content: str, audio
 ) -> Optional[Dict]:
     """带熔断的业务方法示例"""
     if not content or not ManageApiClient._instance:
         return None
     try:
-        # 处理opus_data为列表的情况
-        if isinstance(opus_data, list):
-            # 将列表中的所有bytes数据合并
-            combined_data = b"".join(opus_data)
-        else:
-            combined_data = opus_data
-
-        # 将二进制数据转换为Base64编码的字符串
-        opus_data_base64 = (
-            base64.b64encode(combined_data).decode("utf-8") if combined_data else None
-        )
-
         return ManageApiClient._instance._execute_request(
             "POST",
             f"/agent/chat-history/report",
@@ -172,7 +160,9 @@ def report(
                 "sessionId": session_id,
                 "chatType": chat_type,
                 "content": content,
-                "opusDataBase64": opus_data_base64,
+                "audioBase64": (
+                    base64.b64encode(audio).decode("utf-8") if audio else None
+                ),
             },
         )
     except Exception as e:
diff --git a/main/xiaozhi-server/core/handle/ttsReportHandle.py b/main/xiaozhi-server/core/handle/ttsReportHandle.py
index 3aec8a32..5442a79f 100644
--- a/main/xiaozhi-server/core/handle/ttsReportHandle.py
+++ b/main/xiaozhi-server/core/handle/ttsReportHandle.py
@@ -9,6 +9,11 @@ TTS上报功能已集成到ConnectionHandler类中。
 具体实现请参考core/connection.py中的相关代码。
 """
 
+import os
+import uuid
+import wave
+import opuslib_next
+
 from config.logger import setup_logging
 from config.manage_api_client import report
 
@@ -26,18 +31,69 @@ def report_tts(conn, type, text, opus_data):
         opus_data: opus音频数据
     """
     try:
+        if opus_data:
+            audio_data = opus_to_wav(opus_data)
+        else:
+            audio_data = None
         # 执行上报
         report(
             mac_address=conn.device_id,
             session_id=conn.session_id,
             chat_type=type,
             content=text,
-            opus_data=opus_data,
+            audio=audio_data,
         )
     except Exception as e:
         logger.bind(tag=TAG).error(f"TTS上报失败: {e}")
 
 
+def opus_to_wav(opus_data):
+    """将Opus数据转换为WAV格式的字节流
+
+    Args:
+        output_dir: 输出目录（保留参数以保持接口兼容）
+        opus_data: opus音频数据
+
+    Returns:
+        bytes: WAV格式的音频数据
+    """
+    decoder = opuslib_next.Decoder(16000, 1)  # 16kHz, 单声道
+    pcm_data = []
+
+    for opus_packet in opus_data:
+        try:
+            pcm_frame = decoder.decode(opus_packet, 960)  # 960 samples = 60ms
+            pcm_data.append(pcm_frame)
+        except opuslib_next.OpusError as e:
+            logger.bind(tag=TAG).error(f"Opus解码错误: {e}", exc_info=True)
+
+    if not pcm_data:
+        raise ValueError("没有有效的PCM数据")
+
+    # 创建WAV文件头
+    pcm_data_bytes = b"".join(pcm_data)
+    num_samples = len(pcm_data_bytes) // 2  # 16-bit samples
+
+    # WAV文件头
+    wav_header = bytearray()
+    wav_header.extend(b"RIFF")  # ChunkID
+    wav_header.extend((36 + len(pcm_data_bytes)).to_bytes(4, "little"))  # ChunkSize
+    wav_header.extend(b"WAVE")  # Format
+    wav_header.extend(b"fmt ")  # Subchunk1ID
+    wav_header.extend((16).to_bytes(4, "little"))  # Subchunk1Size
+    wav_header.extend((1).to_bytes(2, "little"))  # AudioFormat (PCM)
+    wav_header.extend((1).to_bytes(2, "little"))  # NumChannels
+    wav_header.extend((16000).to_bytes(4, "little"))  # SampleRate
+    wav_header.extend((32000).to_bytes(4, "little"))  # ByteRate
+    wav_header.extend((2).to_bytes(2, "little"))  # BlockAlign
+    wav_header.extend((16).to_bytes(2, "little"))  # BitsPerSample
+    wav_header.extend(b"data")  # Subchunk2ID
+    wav_header.extend(len(pcm_data_bytes).to_bytes(4, "little"))  # Subchunk2Size
+
+    # 返回完整的WAV数据
+    return bytes(wav_header) + pcm_data_bytes
+
+
 def enqueue_tts_report(conn, type, text, opus_data):
     if not conn.read_config_from_api:
         return

From 727621fdac5f6694dc8a627f89368f657af795a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E=E4=BE=A8?= <honestqiao@163.com>
Date: Sat, 3 May 2025 22:20:50 +0800
Subject: [PATCH 27/53] =?UTF-8?q?=E8=A7=84=E8=8C=83asr=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/config.yaml               |  4 +-
 .../core/providers/asr/aliyun.py              | 54 +++++++++---------
 .../core/providers/asr/doubao.py              | 17 +++---
 .../core/providers/asr/fun_local.py           | 37 +++++--------
 .../core/providers/asr/fun_server.py          | 55 +++++++++++++------
 .../core/providers/asr/sherpa_onnx_local.py   |  5 +-
 .../core/providers/asr/tencent.py             | 50 +++++++++--------
 7 files changed, 122 insertions(+), 100 deletions(-)

diff --git a/main/xiaozhi-server/config.yaml b/main/xiaozhi-server/config.yaml
index da14a6a4..ed8908f1 100644
--- a/main/xiaozhi-server/config.yaml
+++ b/main/xiaozhi-server/config.yaml
@@ -221,6 +221,8 @@ ASR:
     type: fun_server
     host: 127.0.0.1
     port: 10096
+    is_ssl: true
+    output_dir: tmp/
   SherpaASR:
     type: sherpa_onnx_local
     model_dir: models/sherpa-onnx-sense-voice-zh-en-ja-ko-yue-2024-07-17
@@ -253,7 +255,7 @@ ASR:
     type: aliyun
     appkey: 你的阿里云智能语音交互服务项目Appkey
     token: 你的阿里云智能语音交互服务AccessToken，临时的24小时，要长期用下方的access_key_id，access_key_secret
-    access_key_id: 的阿里云账号access_key_id
+    access_key_id: 你的阿里云账号access_key_id
     access_key_secret: 你的阿里云账号access_key_secret
     output_dir: tmp/
 
diff --git a/main/xiaozhi-server/core/providers/asr/aliyun.py b/main/xiaozhi-server/core/providers/asr/aliyun.py
index 4205bec2..250d3a66 100644
--- a/main/xiaozhi-server/core/providers/asr/aliyun.py
+++ b/main/xiaozhi-server/core/providers/asr/aliyun.py
@@ -25,14 +25,14 @@ class AccessToken:
     def _encode_text(text):
         encoded_text = parse.quote_plus(text)
         return encoded_text.replace('+', '%20').replace('*', '%2A').replace('%7E', '~')
-    
+
     @staticmethod
     def _encode_dict(dic):
         keys = dic.keys()
         dic_sorted = [(key, dic[key]) for key in sorted(keys)]
         encoded_text = parse.urlencode(dic_sorted)
         return encoded_text.replace('+', '%20').replace('*', '%2A').replace('%7E', '~')
-    
+
     @staticmethod
     def create_token(access_key_id, access_key_secret):
         parameters = {'AccessKeyId': access_key_id,
@@ -98,7 +98,7 @@ class ASRProvider(ASRProviderBase):
             # 直接使用预生成的长期token
             self.token = config.get("token")
             self.expire_time = None
-        
+
         # 确保输出目录存在
         os.makedirs(self.output_dir, exist_ok=True)
 
@@ -107,7 +107,7 @@ class ASRProvider(ASRProviderBase):
         """刷新Token并记录过期时间"""
         if self.access_key_id and self.access_key_secret:
             self.token, expire_time_str = AccessToken.create_token(
-                self.access_key_id, 
+                self.access_key_id,
                 self.access_key_secret
             )
             if not expire_time_str:
@@ -121,16 +121,16 @@ class ASRProvider(ASRProviderBase):
                     expire_time = datetime.fromtimestamp(int(expire_str))
                 else:
                     expire_time = datetime.strptime(
-                        expire_str, 
+                        expire_str,
                         "%Y-%m-%dT%H:%M:%SZ"
                     )
                 self.expire_time = expire_time.timestamp() - 60
             except Exception as e:
                 raise ValueError(f"无效的过期时间格式: {expire_str}") from e
-        
+
         else:
             self.expire_time = None
-            
+
         if not self.token:
             raise ValueError("无法获取有效的访问Token")
 
@@ -173,13 +173,12 @@ class ASRProvider(ASRProviderBase):
 
         return pcm_data
 
-    def save_audio_to_file(self, opus_data: List[bytes], session_id: str) -> str:
-        """将Opus音频数据解码并保存为WAV文件"""
-        file_name = f"asr_{session_id}.wav"
+    def save_audio_to_file(self, pcm_data: List[bytes], session_id: str) -> str:
+        """PCM数据保存为WAV文件"""
+        module_name = __name__.split(".")[-1]
+        file_name = f"asr_{module_name}_{session_id}_{uuid.uuid4()}.wav"
         file_path = os.path.join(self.output_dir, file_name)
 
-        pcm_data = self.decode_opus(opus_data, session_id)
-
         with wave.open(file_path, "wb") as wf:
             wf.setnchannels(1)  # 单声道
             wf.setsampwidth(2)  # 16-bit
@@ -202,7 +201,7 @@ class ASRProvider(ASRProviderBase):
             # 创建连接并发送请求
             conn = http.client.HTTPSConnection(self.host)
             request_url = self._construct_request_url()
-            
+
             loop = asyncio.get_event_loop()
             await loop.run_in_executor(None, lambda: conn.request(
                 method='POST',
@@ -220,7 +219,7 @@ class ASRProvider(ASRProviderBase):
             try:
                 body_json = json.loads(body)
                 status = body_json.get('status')
-                
+
                 if status == 20000000:
                     result = body_json.get('result', '')
                     logger.bind(tag=TAG).debug(f"ASR结果: {result}")
@@ -228,7 +227,7 @@ class ASRProvider(ASRProviderBase):
                 else:
                     logger.bind(tag=TAG).error(f"ASR失败，状态码: {status}")
                     return None
-                    
+
             except ValueError:
                 logger.bind(tag=TAG).error("响应不是JSON格式")
                 return None
@@ -242,24 +241,27 @@ class ASRProvider(ASRProviderBase):
         if self._is_token_expired():
             logger.warning("Token已过期，正在自动刷新...")
             self._refresh_token()
-            
+
+        file_path = None
         try:
             # 解码Opus为PCM
-            pcm_data_list = self.decode_opus(opus_data, session_id)
-            combined_pcm_data = b''.join(pcm_data_list)
+            pcm_data = self.decode_opus(opus_data, session_id)
+            combined_pcm_data = b''.join(pcm_data)
+
+            # 判断是否保存为WAV文件
+            if self.delete_audio_file:
+                pass
+            else:
+                file_path = self.save_audio_to_file(pcm_data, session_id)
 
             # 发送请求并获取文本
             text = await self._send_request(combined_pcm_data)
-            
-            file_path = self.save_audio_to_file(opus_data, session_id)
-            if self.delete_audio_file:
-                os.remove(file_path)
-                logger.bind(tag=TAG).debug(f"音频文件已删除: {file_path}")
 
             if text:
-                return text, None
-            return "", None
+                return text, file_path
+
+            return "", file_path
 
         except Exception as e:
             logger.bind(tag=TAG).error(f"语音识别失败: {e}", exc_info=True)
-            return "", None
\ No newline at end of file
+            return "", file_path
\ No newline at end of file
diff --git a/main/xiaozhi-server/core/providers/asr/doubao.py b/main/xiaozhi-server/core/providers/asr/doubao.py
index 755a19b7..ce7e05ee 100644
--- a/main/xiaozhi-server/core/providers/asr/doubao.py
+++ b/main/xiaozhi-server/core/providers/asr/doubao.py
@@ -103,7 +103,8 @@ class ASRProvider(ASRProviderBase):
 
     def save_audio_to_file(self, pcm_data: List[bytes], session_id: str) -> str:
         """PCM数据保存为WAV文件"""
-        file_name = f"asr_{session_id}_{uuid.uuid4()}.wav"
+        module_name = __name__.split(".")[-1]
+        file_name = f"asr_{module_name}_{session_id}_{uuid.uuid4()}.wav"
         file_path = os.path.join(self.output_dir, file_name)
 
         with wave.open(file_path, "wb") as wf:
@@ -139,8 +140,8 @@ class ASRProvider(ASRProviderBase):
                 "uid": str(uuid.uuid4()),
             },
             "request": {
-                "reqid": reqid, 
-                "show_utterances": False, 
+                "reqid": reqid,
+                "show_utterances": False,
                 "sequence": 1,
                 "boosting_table_name": self.boosting_table_name,
                 "correct_table_name": self.correct_table_name,
@@ -260,6 +261,8 @@ class ASRProvider(ASRProviderBase):
         self, opus_data: List[bytes], session_id: str
     ) -> Tuple[Optional[str], Optional[str]]:
         """将语音数据转换为文本"""
+
+        file_path = None
         try:
             # 合并所有opus数据包
             pcm_data = self.decode_opus(opus_data, session_id)
@@ -269,7 +272,7 @@ class ASRProvider(ASRProviderBase):
             if self.delete_audio_file:
                 pass
             else:
-                self.save_audio_to_file(pcm_data, session_id)
+                file_path = self.save_audio_to_file(pcm_data, session_id)
 
             # 直接使用PCM数据
             # 计算分段大小 (单声道, 16bit, 16kHz采样率)
@@ -283,9 +286,9 @@ class ASRProvider(ASRProviderBase):
                 logger.bind(tag=TAG).debug(
                     f"语音识别耗时: {time.time() - start_time:.3f}s | 结果: {text}"
                 )
-                return text, None
-            return "", None
+                return text, file_path
+            return "", file_path
 
         except Exception as e:
             logger.bind(tag=TAG).error(f"语音识别失败: {e}", exc_info=True)
-            return "", None
+            return "", file_path
diff --git a/main/xiaozhi-server/core/providers/asr/fun_local.py b/main/xiaozhi-server/core/providers/asr/fun_local.py
index a678780b..3724ec2e 100644
--- a/main/xiaozhi-server/core/providers/asr/fun_local.py
+++ b/main/xiaozhi-server/core/providers/asr/fun_local.py
@@ -50,21 +50,12 @@ class ASRProvider(ASRProviderBase):
                 # device="cuda:0",  # 启用GPU加速
             )
 
-    def save_audio_to_file(self, opus_data: List[bytes], session_id: str) -> str:
+    def save_audio_to_file(self, pcm_data: List[bytes], session_id: str) -> str:
         """PCM数据保存为WAV文件"""
-        file_name = f"asr_{session_id}_{uuid.uuid4()}.wav"
+        module_name = __name__.split(".")[-1]
+        file_name = f"asr_{module_name}_{session_id}_{uuid.uuid4()}.wav"
         file_path = os.path.join(self.output_dir, file_name)
 
-        decoder = opuslib_next.Decoder(16000, 1)  # 16kHz, 单声道
-        pcm_data = []
-
-        for opus_packet in opus_data:
-            try:
-                pcm_frame = decoder.decode(opus_packet, 960)  # 960 samples = 60ms
-                pcm_data.append(pcm_frame)
-            except opuslib_next.OpusError as e:
-                logger.bind(tag=TAG).error(f"Opus解码错误: {e}", exc_info=True)
-
         with wave.open(file_path, "wb") as wf:
             wf.setnchannels(1)
             wf.setsampwidth(2)  # 2 bytes = 16-bit
@@ -72,7 +63,7 @@ class ASRProvider(ASRProviderBase):
             wf.writeframes(b"".join(pcm_data))
 
         return file_path
-    
+
     @staticmethod
     def decode_opus(opus_data: List[bytes], session_id: str) -> List[bytes]:
 
@@ -100,7 +91,7 @@ class ASRProvider(ASRProviderBase):
             if self.delete_audio_file:
                 pass
             else:
-                self.save_audio_to_file(pcm_data, session_id)
+                file_path = self.save_audio_to_file(pcm_data, session_id)
 
             # 语音识别
             start_time = time.time()
@@ -118,13 +109,13 @@ class ASRProvider(ASRProviderBase):
 
         except Exception as e:
             logger.bind(tag=TAG).error(f"语音识别失败: {e}", exc_info=True)
-            return "", None
+            return "", file_path
 
-        finally:
-            # 文件清理逻辑
-            if self.delete_audio_file and file_path and os.path.exists(file_path):
-                try:
-                    os.remove(file_path)
-                    logger.bind(tag=TAG).debug(f"已删除临时音频文件: {file_path}")
-                except Exception as e:
-                    logger.bind(tag=TAG).error(f"文件删除失败: {file_path} | 错误: {e}")
+        # finally:
+        #     # 文件清理逻辑
+        #     if self.delete_audio_file and file_path and os.path.exists(file_path):
+        #         try:
+        #             os.remove(file_path)
+        #             logger.bind(tag=TAG).debug(f"已删除临时音频文件: {file_path}")
+        #         except Exception as e:
+        #             logger.bind(tag=TAG).error(f"文件删除失败: {file_path} | 错误: {e}")
diff --git a/main/xiaozhi-server/core/providers/asr/fun_server.py b/main/xiaozhi-server/core/providers/asr/fun_server.py
index d0701d93..501d43bd 100644
--- a/main/xiaozhi-server/core/providers/asr/fun_server.py
+++ b/main/xiaozhi-server/core/providers/asr/fun_server.py
@@ -1,8 +1,11 @@
 from typing import Optional, Tuple, List
 import opuslib_next
 from core.providers.asr.base import ASRProviderBase
-import  ssl
+import os
+import ssl
 import json
+import uuid
+import wave
 import websockets
 from config.logger import setup_logging
 import asyncio
@@ -19,6 +22,7 @@ class ASRProvider(ASRProviderBase):
         self.host = config.get('host', 'localhost')
         self.port = config.get('port', 10095)
         self.is_ssl = config.get('is_ssl', True)
+        self.output_dir = config.get("output_dir")
         self.delete_audio_file = delete_audio_file
         self.uri = f"wss://{self.host}:{self.port}" if self.is_ssl else f"ws://{self.host}:{self.port}"
         self.ssl_context = ssl.SSLContext() if self.is_ssl else None
@@ -26,25 +30,35 @@ class ASRProvider(ASRProviderBase):
             self.ssl_context.check_hostname = False
             self.ssl_context.verify_mode = ssl.CERT_NONE
 
-    def save_audio_to_file(self, opus_data: List[bytes], session_id: str) -> str:
-        """解码Opus数据并保存为WAV文件"""
-        pass
+    def save_audio_to_file(self, pcm_data: List[bytes], session_id: str) -> str:
+        """PCM数据保存为WAV文件"""
+        module_name = __name__.split(".")[-1]
+        file_name = f"asr_{module_name}_{session_id}_{uuid.uuid4()}.wav"
+        file_path = os.path.join(self.output_dir, file_name)
+
+        with wave.open(file_path, "wb") as wf:
+            wf.setnchannels(1)
+            wf.setsampwidth(2)  # 2 bytes = 16-bit
+            wf.setframerate(16000)
+            wf.writeframes(b"".join(pcm_data))
+
+        return file_path
 
     @staticmethod
     def decode_opus(opus_data: List[bytes]) -> bytes:
-        """将Opus音频数据解码为PCM数据"""        
+        """将Opus音频数据解码为PCM数据"""
         decoder = opuslib_next.Decoder(16000, 1)  # 16kHz, 单声道
         pcm_data = []
-        
+
         for opus_packet in opus_data:
             try:
                 pcm_frame = decoder.decode(opus_packet, 960)  # 960 samples = 60ms
                 pcm_data.append(pcm_frame)
             except opuslib_next.OpusError as e:
                 logger.bind(tag=TAG).error(f"Opus解码错误: {e}", exc_info=True)
-        
-        return b"".join(pcm_data)
-    
+
+        return pcm_data
+
 
 
     async def _receive_responses(self, ws) -> None:
@@ -90,15 +104,15 @@ class ASRProvider(ASRProviderBase):
         })
         await ws.send(config_message)
         logger.bind(tag=TAG).debug(f"Sent configuration message: {config_message}")
-        
+
         # Send PCM data
         await ws.send(pcm_data)
         logger.bind(tag=TAG).debug(f"Sent PCM data of length: {len(pcm_data)} bytes")
-        
+
         # Indicate end of speech
         end_message = json.dumps({"is_speaking": False})
         await ws.send(end_message)
-        logger.bind(tag=TAG).debug(f"Sent end message: {end_message}")    
+        logger.bind(tag=TAG).debug(f"Sent end message: {end_message}")
 
 
     async def speech_to_text(self, opus_data: List[bytes], session_id: str) -> Tuple[Optional[str], Optional[str]]:
@@ -108,13 +122,20 @@ class ASRProvider(ASRProviderBase):
         :param session_id: Unique session identifier.
         :return: Tuple containing recognized text and optional timestamp.
         '''
-
+        file_path = None
         pcm_data = self.decode_opus(opus_data)
+        combined_pcm_data = b"".join(pcm_data)
+
+        # 判断是否保存为WAV文件
+        if self.delete_audio_file:
+            pass
+        else:
+            file_path = self.save_audio_to_file(pcm_data, session_id)
 
         async with websockets.connect(self.uri, subprotocols=["binary"], ping_interval=None, ssl=self.ssl_context) as ws:
             try:
                 # Use asyncio to handle WebSocket communication
-                send_task = asyncio.create_task(self._send_data(ws, pcm_data, session_id))
+                send_task = asyncio.create_task(self._send_data(ws, combined_pcm_data, session_id))
                 receive_task = asyncio.create_task(self._receive_responses(ws))
 
                 # Gather tasks with error handling
@@ -134,11 +155,11 @@ class ASRProvider(ASRProviderBase):
 
                 # Get the result from the receive task
                 result = receive_task.result()
-                return result, None  # Return the recognized text and timestamp (if any)
+                return result, file_path  # Return the recognized text and timestamp (if any)
 
             except websockets.exceptions.ConnectionClosed as e:
                 logger.bind(tag=TAG).error(f"WebSocket connection closed: {e}")
-                return "", None
+                return "", file_path
             except Exception as e:
                 logger.bind(tag=TAG).error(f"Error during speech-to-text conversion: {e}", exc_info=True)
-                return "", None
\ No newline at end of file
+                return "", file_path
\ No newline at end of file
diff --git a/main/xiaozhi-server/core/providers/asr/sherpa_onnx_local.py b/main/xiaozhi-server/core/providers/asr/sherpa_onnx_local.py
index cfcbe83b..3e720210 100644
--- a/main/xiaozhi-server/core/providers/asr/sherpa_onnx_local.py
+++ b/main/xiaozhi-server/core/providers/asr/sherpa_onnx_local.py
@@ -85,7 +85,8 @@ class ASRProvider(ASRProviderBase):
 
     def save_audio_to_file(self, pcm_data: List[bytes], session_id: str) -> str:
         """PCM数据保存为WAV文件"""
-        file_name = f"asr_{session_id}_{uuid.uuid4()}.wav"
+        module_name = __name__.split(".")[-1]
+        file_name = f"asr_{module_name}_{session_id}_{uuid.uuid4()}.wav"
         file_path = os.path.join(self.output_dir, file_name)
 
         with wave.open(file_path, "wb") as wf:
@@ -164,7 +165,7 @@ class ASRProvider(ASRProviderBase):
 
         except Exception as e:
             logger.bind(tag=TAG).error(f"语音识别失败: {e}", exc_info=True)
-            return "", None
+            return "", file_path
         finally:
             # 文件清理逻辑
             if self.delete_audio_file and file_path and os.path.exists(file_path):
diff --git a/main/xiaozhi-server/core/providers/asr/tencent.py b/main/xiaozhi-server/core/providers/asr/tencent.py
index 0ac297a6..dbdcbe26 100644
--- a/main/xiaozhi-server/core/providers/asr/tencent.py
+++ b/main/xiaozhi-server/core/providers/asr/tencent.py
@@ -26,40 +26,40 @@ class ASRProvider(ASRProviderBase):
         self.secret_id = config.get("secret_id")
         self.secret_key = config.get("secret_key")
         self.output_dir = config.get("output_dir")
-        
+        self.delete_audio_file = delete_audio_file
+
         # 确保输出目录存在
         os.makedirs(self.output_dir, exist_ok=True)
 
-    def save_audio_to_file(self, opus_data: List[bytes], session_id: str) -> str:
+    def save_audio_to_file(self, pcm_data: List[bytes], session_id: str) -> str:
         """PCM数据保存为WAV文件"""
-
-        file_name = f"tencent_asr_{session_id}_{uuid.uuid4()}.wav"
+        module_name = __name__.split(".")[-1]
+        file_name = f"asr_{module_name}_{session_id}_{uuid.uuid4()}.wav"
         file_path = os.path.join(self.output_dir, file_name)
-        
+
         with wave.open(file_path, "wb") as wf:
             wf.setnchannels(1)
             wf.setsampwidth(2)  # 2 bytes = 16-bit
             wf.setframerate(16000)
             wf.writeframes(b"".join(pcm_data))
-        
+
         return file_path
 
     @staticmethod
     def decode_opus(opus_data: List[bytes]) -> bytes:
         """将Opus音频数据解码为PCM数据"""
-        import opuslib_next
-        
+
         decoder = opuslib_next.Decoder(16000, 1)  # 16kHz, 单声道
         pcm_data = []
-        
+
         for opus_packet in opus_data:
             try:
                 pcm_frame = decoder.decode(opus_packet, 960)  # 960 samples = 60ms
                 pcm_data.append(pcm_frame)
             except opuslib_next.OpusError as e:
                 logger.bind(tag=TAG).error(f"Opus解码错误: {e}", exc_info=True)
-        
-        return b"".join(pcm_data)
+
+        return pcm_data
 
     async def speech_to_text(self, opus_data: List[bytes], session_id: str) -> Tuple[Optional[str], Optional[str]]:
         """将语音数据转换为文本"""
@@ -67,23 +67,25 @@ class ASRProvider(ASRProviderBase):
             logger.bind(tag=TAG).warn("音频数据为空！")
             return None, None
 
+        file_path = None
         try:
             # 检查配置是否已设置
             if not self.secret_id or not self.secret_key:
                 logger.bind(tag=TAG).error("腾讯云语音识别配置未设置，无法进行识别")
-                return None, None
+                return None, file_path
 
             # 将Opus音频数据解码为PCM
             pcm_data = self.decode_opus(opus_data)
+            combined_pcm_data = b"".join(pcm_data)
 
             # 判断是否保存为WAV文件
             if self.delete_audio_file:
                 pass
             else:
                 self.save_audio_to_file(pcm_data, session_id)
-            
+
             # 将音频数据转换为Base64编码
-            base64_audio = base64.b64encode(pcm_data).decode('utf-8')
+            base64_audio = base64.b64encode(combined_pcm_data).decode('utf-8')
 
             # 构建请求体
             request_body = self._build_request_body(base64_audio)
@@ -94,15 +96,15 @@ class ASRProvider(ASRProviderBase):
             # 发送请求
             start_time = time.time()
             result = self._send_request(request_body, timestamp, authorization)
-            
+
             if result:
                 logger.bind(tag=TAG).debug(f"腾讯云语音识别耗时: {time.time() - start_time:.3f}s | 结果: {result}")
-            
-            return result, None
+
+            return result, file_path
 
         except Exception as e:
             logger.bind(tag=TAG).error(f"处理音频时发生错误！{e}", exc_info=True)
-            return None, None
+            return None, file_path
 
     def _build_request_body(self, base64_audio: str) -> str:
         """构建请求体"""
@@ -206,26 +208,26 @@ class ASRProvider(ASRProviderBase):
 
         try:
             response = requests.post(self.API_URL, headers=headers, data=request_body)
-            
+
             if not response.ok:
                 raise IOError(f"请求失败: {response.status_code} {response.reason}")
-            
+
             response_json = response.json()
-            
+
             # 检查是否有错误
             if "Response" in response_json and "Error" in response_json["Response"]:
                 error = response_json["Response"]["Error"]
                 error_code = error["Code"]
                 error_message = error["Message"]
                 raise IOError(f"API返回错误: {error_code}: {error_message}")
-            
+
             # 提取识别结果
             if "Response" in response_json and "Result" in response_json["Response"]:
                 return response_json["Response"]["Result"]
             else:
                 logger.bind(tag=TAG).warn(f"响应中没有识别结果: {response_json}")
                 return ""
-                
+
         except Exception as e:
             logger.bind(tag=TAG).error(f"发送请求失败: {e}", exc_info=True)
             return None
@@ -239,7 +241,7 @@ class ASRProvider(ASRProviderBase):
         """计算HMAC-SHA256"""
         if isinstance(key, str):
             key = key.encode('utf-8')
-        
+
         return hmac.new(key, data.encode('utf-8'), hashlib.sha256).digest()
 
     def _bytes_to_hex(self, bytes_data: bytes) -> str:

From 1976034f12ca328df72e298736ee12faeb539147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8D=8E=E4=BE=A8?= <honestqiao@163.com>
Date: Sat, 3 May 2025 22:21:22 +0800
Subject: [PATCH 28/53] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=99=BE=E5=BA=A6asr?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/config.yaml               |  13 +++
 .../core/providers/asr/baidu.py               | 103 ++++++++++++++++++
 main/xiaozhi-server/requirements.txt          |   4 +-
 3 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 main/xiaozhi-server/core/providers/asr/baidu.py

diff --git a/main/xiaozhi-server/config.yaml b/main/xiaozhi-server/config.yaml
index ed8908f1..6135f0d7 100644
--- a/main/xiaozhi-server/config.yaml
+++ b/main/xiaozhi-server/config.yaml
@@ -258,6 +258,19 @@ ASR:
     access_key_id: 你的阿里云账号access_key_id
     access_key_secret: 你的阿里云账号access_key_secret
     output_dir: tmp/
+  BaiduASR:
+    # 可以在这里申请百度语音技术的AppID、API Key、Secret Key
+    # https://console.bce.baidu.com/ai-engine/old/#/ai/speech/app/list
+    # 启用前需要先安装依赖包：
+    # pip install baidu-aip==4.16.13
+    # pip install chardet==5.2.0
+    type: baidu
+    app_id: 你的百度语音技术AppID
+    api_key: 你的百度语音技术APIKey
+    secret_key: 你的百度语音技术SecretKey
+    # 语言参数，1537为普通话，具体参考：https://ai.baidu.com/ai-doc/SPEECH/0lbxfnc9b
+    dev_pid: 1537
+    output_dir: tmp/
 
 VAD:
   SileroVAD:
diff --git a/main/xiaozhi-server/core/providers/asr/baidu.py b/main/xiaozhi-server/core/providers/asr/baidu.py
new file mode 100644
index 00000000..6edfe128
--- /dev/null
+++ b/main/xiaozhi-server/core/providers/asr/baidu.py
@@ -0,0 +1,103 @@
+import base64
+import hashlib
+import hmac
+import json
+import time
+from datetime import datetime, timezone
+import os
+import uuid
+from typing import Optional, Tuple, List
+import wave
+import opuslib_next
+
+from aip import AipSpeech
+from core.providers.asr.base import ASRProviderBase
+from config.logger import setup_logging
+
+TAG = __name__
+logger = setup_logging()
+
+class ASRProvider(ASRProviderBase):
+    def __init__(self, config: dict, delete_audio_file: bool = True):
+        self.app_id = config.get("app_id")
+        self.api_key = config.get("api_key")
+        self.secret_key = config.get("secret_key")
+        self.dev_pid = config.get("dev_pid")
+        self.output_dir = config.get("output_dir")
+        self.delete_audio_file = delete_audio_file
+
+        self.client = AipSpeech(str(self.app_id), self.api_key, self.secret_key)
+
+        # 确保输出目录存在
+        os.makedirs(self.output_dir, exist_ok=True)
+
+    def save_audio_to_file(self, pcm_data: List[bytes], session_id: str) -> str:
+        """PCM数据保存为WAV文件"""
+        module_name = __name__.split(".")[-1]
+        file_name = f"asr_{module_name}_{session_id}_{uuid.uuid4()}.wav"
+        file_path = os.path.join(self.output_dir, file_name)
+
+        with wave.open(file_path, "wb") as wf:
+            wf.setnchannels(1)
+            wf.setsampwidth(2)  # 2 bytes = 16-bit
+            wf.setframerate(16000)
+            wf.writeframes(b"".join(pcm_data))
+
+        return file_path
+
+    @staticmethod
+    def decode_opus(opus_data: List[bytes]) -> bytes:
+        """将Opus音频数据解码为PCM数据"""
+
+        decoder = opuslib_next.Decoder(16000, 1)  # 16kHz, 单声道
+        pcm_data = []
+
+        for opus_packet in opus_data:
+            try:
+                pcm_frame = decoder.decode(opus_packet, 960)  # 960 samples = 60ms
+                pcm_data.append(pcm_frame)
+            except opuslib_next.OpusError as e:
+                logger.bind(tag=TAG).error(f"Opus解码错误: {e}", exc_info=True)
+
+        return pcm_data
+
+    async def speech_to_text(self, opus_data: List[bytes], session_id: str) -> Tuple[Optional[str], Optional[str]]:
+        """将语音数据转换为文本"""
+        if not opus_data:
+            logger.bind(tag=TAG).warn("音频数据为空！")
+            return None, None
+
+        file_path = None
+        try:
+            # 检查配置是否已设置
+            if not self.app_id or not self.api_key or not self.secret_key:
+                logger.bind(tag=TAG).error("百度语音识别配置未设置，无法进行识别")
+                return None, file_path
+
+            # 将Opus音频数据解码为PCM
+            pcm_data = self.decode_opus(opus_data)
+            combined_pcm_data = b"".join(pcm_data)
+
+            # 判断是否保存为WAV文件
+            if self.delete_audio_file:
+                pass
+            else:
+                self.save_audio_to_file(pcm_data, session_id)
+
+            start_time = time.time()
+            # 识别本地文件
+            result = self.client.asr(combined_pcm_data, 'pcm', 16000, {
+                'dev_pid': str(self.dev_pid),
+            })
+
+            if result and result["err_no"] == 0:
+                logger.bind(tag=TAG).debug(f"百度语音识别耗时: {time.time() - start_time:.3f}s | 结果: {result}")
+                result = result["result"][0]
+                return result, file_path
+            else:
+                raise Exception(f"百度语音识别失败，错误码: {result['err_no']}，错误信息: {result['err_msg']}")
+                return None, file_path
+
+        except Exception as e:
+            logger.bind(tag=TAG).error(f"处理音频时发生错误！{e}", exc_info=True)
+            return None, file_path
diff --git a/main/xiaozhi-server/requirements.txt b/main/xiaozhi-server/requirements.txt
index 7da31b6f..e26fec18 100755
--- a/main/xiaozhi-server/requirements.txt
+++ b/main/xiaozhi-server/requirements.txt
@@ -25,4 +25,6 @@ sherpa_onnx==1.11.0
 mcp==1.4.1
 cnlunar==0.2.0
 PySocks==1.7.1
-dashscope==1.23.1
\ No newline at end of file
+dashscope==1.23.1
+baidu-aip==4.16.13
+chardet==5.2.0
\ No newline at end of file

From dc68b8148af2b762816253a9fc104413a2a19198 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Sat, 3 May 2025 23:30:39 +0800
Subject: [PATCH 29/53] =?UTF-8?q?add:=E8=8E=B7=E5=8F=96=E8=81=8A=E5=A4=A9?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/manager-api/pom.xml                      |  4 +
 .../agent/controller/AgentController.java     | 37 +++++++
 .../agent/dto/AgentChatHistoryDTO.java        | 25 +++++
 .../agent/dto/AgentChatSessionDTO.java        | 26 +++++
 .../agent/entity/AgentChatHistoryEntity.java  |  6 --
 .../service/AgentChatHistoryService.java      | 24 +++++
 .../modules/agent/service/AgentService.java   | 51 +++++++---
 .../impl/AgentChatHistoryServiceImpl.java     | 96 +++++++++++++++----
 .../agent/service/impl/AgentServiceImpl.java  | 39 +++++---
 .../modules/security/config/WebMvcConfig.java | 33 ++++++-
 .../{202505012207.sql => 202505022134.sql}    |  5 +-
 .../db/changelog/db.changelog-master.yaml     |  4 +-
 .../src/views/DeviceManagement.vue            | 11 +--
 main/manager-web/src/views/UserManagement.vue | 11 +--
 14 files changed, 298 insertions(+), 74 deletions(-)
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryDTO.java
 create mode 100644 main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatSessionDTO.java
 rename main/manager-api/src/main/resources/db/changelog/{202505012207.sql => 202505022134.sql} (82%)

diff --git a/main/manager-api/pom.xml b/main/manager-api/pom.xml
index 9ad38043..d08e32f2 100644
--- a/main/manager-api/pom.xml
+++ b/main/manager-api/pom.xml
@@ -197,6 +197,10 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
     </dependencies>
 
     <!-- 阿里云maven仓库 -->
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
index 123e10ba..7b717a3f 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
@@ -28,11 +28,14 @@ import xiaozhi.common.page.PageData;
 import xiaozhi.common.user.UserDetail;
 import xiaozhi.common.utils.ConvertUtils;
 import xiaozhi.common.utils.Result;
+import xiaozhi.modules.agent.dto.AgentChatHistoryDTO;
+import xiaozhi.modules.agent.dto.AgentChatSessionDTO;
 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.AgentChatHistoryService;
 import xiaozhi.modules.agent.service.AgentService;
 import xiaozhi.modules.agent.service.AgentTemplateService;
 import xiaozhi.modules.device.service.DeviceService;
@@ -46,6 +49,7 @@ public class AgentController {
     private final AgentService agentService;
     private final AgentTemplateService agentTemplateService;
     private final DeviceService deviceService;
+    private final AgentChatHistoryService agentChatHistoryService;
 
     @GetMapping("/list")
     @Operation(summary = "获取用户智能体列表")
@@ -192,4 +196,37 @@ public class AgentController {
         return new Result<List<AgentTemplateEntity>>().ok(list);
     }
 
+    @GetMapping("/{id}/sessions")
+    @Operation(summary = "获取智能体会话列表")
+    @RequiresPermissions("sys:role:normal")
+    @Parameters({
+            @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", required = true),
+            @Parameter(name = Constant.LIMIT, description = "每页显示记录数", required = true),
+    })
+    public Result<PageData<AgentChatSessionDTO>> getAgentSessions(
+            @PathVariable("id") String id,
+            @Parameter(hidden = true) @RequestParam Map<String, Object> params) {
+        params.put("agentId", id);
+        PageData<AgentChatSessionDTO> page = agentChatHistoryService.getSessionListByAgentId(params);
+        return new Result<PageData<AgentChatSessionDTO>>().ok(page);
+    }
+
+    @GetMapping("/{id}/chat-history/{sessionId}")
+    @Operation(summary = "获取智能体聊天记录")
+    @RequiresPermissions("sys:role:normal")
+    public Result<List<AgentChatHistoryDTO>> getAgentChatHistory(
+            @PathVariable("id") String id,
+            @PathVariable("sessionId") String sessionId) {
+        // 获取当前用户
+        UserDetail user = SecurityUser.getUser();
+
+        // 检查权限
+        if (!agentService.checkAgentPermission(id, user.getId())) {
+            return new Result<List<AgentChatHistoryDTO>>().error("没有权限查看该智能体的聊天记录");
+        }
+
+        // 查询聊天记录
+        List<AgentChatHistoryDTO> result = agentChatHistoryService.getChatHistoryBySessionId(id, sessionId);
+        return new Result<List<AgentChatHistoryDTO>>().ok(result);
+    }
 }
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryDTO.java
new file mode 100644
index 00000000..a444917d
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryDTO.java
@@ -0,0 +1,25 @@
+package xiaozhi.modules.agent.dto;
+
+import java.util.Date;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 智能体聊天记录DTO
+ */
+@Data
+@Schema(description = "智能体聊天记录")
+public class AgentChatHistoryDTO {
+    @Schema(description = "创建时间")
+    private Date createdAt;
+
+    @Schema(description = "消息类型: 1-用户, 2-智能体")
+    private Byte chatType;
+
+    @Schema(description = "聊天内容")
+    private String content;
+
+    @Schema(description = "音频ID")
+    private String audioId;
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatSessionDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatSessionDTO.java
new file mode 100644
index 00000000..c65f05c6
--- /dev/null
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatSessionDTO.java
@@ -0,0 +1,26 @@
+package xiaozhi.modules.agent.dto;
+
+import java.time.LocalDateTime;
+
+import lombok.Data;
+
+/**
+ * 智能体会话列表DTO
+ */
+@Data
+public class AgentChatSessionDTO {
+    /**
+     * 会话ID
+     */
+    private String sessionId;
+
+    /**
+     * 会话时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 聊天条数
+     */
+    private Integer chatCount;
+}
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatHistoryEntity.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatHistoryEntity.java
index 96e82885..679c814a 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatHistoryEntity.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/entity/AgentChatHistoryEntity.java
@@ -67,12 +67,6 @@ public class AgentChatHistoryEntity {
     @TableField(value = "audio_id")
     private String audioId;
 
-    /**
-     * 音频URL
-     */
-    @TableField(value = "audio_url")
-    private String audioUrl;
-
     /**
      * 创建时间
      */
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatHistoryService.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatHistoryService.java
index e852cae3..e729c6dd 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatHistoryService.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatHistoryService.java
@@ -1,6 +1,13 @@
 package xiaozhi.modules.agent.service;
 
+import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.extension.service.IService;
+
+import xiaozhi.common.page.PageData;
+import xiaozhi.modules.agent.dto.AgentChatHistoryDTO;
+import xiaozhi.modules.agent.dto.AgentChatSessionDTO;
 import xiaozhi.modules.agent.entity.AgentChatHistoryEntity;
 
 /**
@@ -11,4 +18,21 @@ import xiaozhi.modules.agent.entity.AgentChatHistoryEntity;
  * @since 1.0.0
  */
 public interface AgentChatHistoryService extends IService<AgentChatHistoryEntity> {
+
+    /**
+     * 根据智能体ID获取会话列表
+     *
+     * @param params 查询参数，包含agentId、page、limit
+     * @return 分页的会话列表
+     */
+    PageData<AgentChatSessionDTO> getSessionListByAgentId(Map<String, Object> params);
+
+    /**
+     * 根据会话ID获取聊天记录列表
+     *
+     * @param agentId   智能体ID
+     * @param sessionId 会话ID
+     * @return 聊天记录列表
+     */
+    List<AgentChatHistoryDTO> getChatHistoryBySessionId(String agentId, String sessionId);
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentService.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentService.java
index 48355a4b..2104d353 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentService.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentService.java
@@ -8,36 +8,56 @@ import xiaozhi.common.service.BaseService;
 import xiaozhi.modules.agent.dto.AgentDTO;
 import xiaozhi.modules.agent.entity.AgentEntity;
 
+/**
+ * 智能体表处理service
+ *
+ * @author Goody
+ * @version 1.0, 2025/4/30
+ * @since 1.0.0
+ */
 public interface AgentService extends BaseService<AgentEntity> {
-
     /**
-     * 管理员获取所有智能体列表（分页）
+     * 获取管理员智能体列表
+     *
+     * @param params 查询参数
+     * @return 分页数据
      */
     PageData<AgentEntity> adminAgentList(Map<String, Object> params);
 
     /**
-     * 获取智能体详情
+     * 根据ID获取智能体
+     *
+     * @param id 智能体ID
+     * @return 智能体实体
      */
     AgentEntity getAgentById(String id);
 
     /**
-     * 删除这个用户的所有
-     * 
-     * @param userId
+     * 插入智能体
+     *
+     * @param entity 智能体实体
+     * @return 是否成功
+     */
+    boolean insert(AgentEntity entity);
+
+    /**
+     * 根据用户ID删除智能体
+     *
+     * @param userId 用户ID
      */
     void deleteAgentByUserId(Long userId);
 
     /**
      * 获取用户智能体列表
-     * 
-     * @param userId
-     * @return
+     *
+     * @param userId 用户ID
+     * @return 智能体列表
      */
     List<AgentDTO> getUserAgents(Long userId);
 
     /**
-     * 获取智能体的设备数量
-     * 
+     * 根据智能体ID获取设备数量
+     *
      * @param agentId 智能体ID
      * @return 设备数量
      */
@@ -50,4 +70,13 @@ public interface AgentService extends BaseService<AgentEntity> {
      * @return 默认智能体信息，不存在时返回null
      */
     AgentEntity getDefaultAgentByMacAddress(String macAddress);
+
+    /**
+     * 检查用户是否有权限访问智能体
+     *
+     * @param agentId 智能体ID
+     * @param userId  用户ID
+     * @return 是否有权限
+     */
+    boolean checkAgentPermission(String agentId, Long userId);
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java
index 95293a3f..18669a6c 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java
@@ -1,19 +1,77 @@
-package xiaozhi.modules.agent.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import xiaozhi.modules.agent.dao.AiAgentChatHistoryDao;
-import xiaozhi.modules.agent.entity.AgentChatHistoryEntity;
-import xiaozhi.modules.agent.service.AgentChatHistoryService;
-
-/**
- * 智能体聊天记录表处理service {@link AgentChatHistoryService} impl
- *
- * @author Goody
- * @version 1.0, 2025/4/30
- * @since 1.0.0
- */
-@Service
-public class AgentChatHistoryServiceImpl extends ServiceImpl<AiAgentChatHistoryDao, AgentChatHistoryEntity> implements AgentChatHistoryService {
-
-}
+package xiaozhi.modules.agent.service.impl;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import xiaozhi.common.constant.Constant;
+import xiaozhi.common.page.PageData;
+import xiaozhi.common.utils.ConvertUtils;
+import xiaozhi.modules.agent.dao.AiAgentChatHistoryDao;
+import xiaozhi.modules.agent.dto.AgentChatHistoryDTO;
+import xiaozhi.modules.agent.dto.AgentChatSessionDTO;
+import xiaozhi.modules.agent.entity.AgentChatHistoryEntity;
+import xiaozhi.modules.agent.service.AgentChatHistoryService;
+
+/**
+ * 智能体聊天记录表处理service {@link AgentChatHistoryService} impl
+ *
+ * @author Goody
+ * @version 1.0, 2025/4/30
+ * @since 1.0.0
+ */
+@Service
+public class AgentChatHistoryServiceImpl extends ServiceImpl<AiAgentChatHistoryDao, AgentChatHistoryEntity>
+        implements AgentChatHistoryService {
+
+    @Override
+    public PageData<AgentChatSessionDTO> getSessionListByAgentId(Map<String, Object> params) {
+        String agentId = (String) params.get("agentId");
+        int page = Integer.parseInt(params.get(Constant.PAGE).toString());
+        int limit = Integer.parseInt(params.get(Constant.LIMIT).toString());
+
+        // 构建查询条件
+        QueryWrapper<AgentChatHistoryEntity> wrapper = new QueryWrapper<>();
+        wrapper.select("session_id", "MAX(created_at) as created_at", "COUNT(*) as chat_count")
+                .eq("agent_id", agentId)
+                .groupBy("session_id")
+                .orderByDesc("created_at");
+
+        // 执行分页查询
+        Page<Map<String, Object>> pageParam = new Page<>(page, limit);
+        IPage<Map<String, Object>> result = this.baseMapper.selectMapsPage(pageParam, wrapper);
+
+        List<AgentChatSessionDTO> records = result.getRecords().stream().map(map -> {
+            AgentChatSessionDTO dto = new AgentChatSessionDTO();
+            dto.setSessionId((String) map.get("session_id"));
+            dto.setCreatedAt((LocalDateTime) map.get("created_at"));
+            dto.setChatCount(((Number) map.get("chat_count")).intValue());
+            return dto;
+        }).collect(Collectors.toList());
+
+        return new PageData<>(records, result.getTotal());
+    }
+
+    @Override
+    public List<AgentChatHistoryDTO> getChatHistoryBySessionId(String agentId, String sessionId) {
+        // 构建查询条件
+        QueryWrapper<AgentChatHistoryEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("agent_id", agentId)
+                .eq("session_id", sessionId)
+                .orderByAsc("created_at");
+
+        // 查询聊天记录
+        List<AgentChatHistoryEntity> historyList = list(wrapper);
+
+        // 转换为DTO
+        return ConvertUtils.sourceToTarget(historyList, AgentChatHistoryDTO.class);
+    }
+}
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
index 4c529882..97722b59 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
@@ -6,13 +6,13 @@ 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;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
+import lombok.AllArgsConstructor;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.redis.RedisKeys;
 import xiaozhi.common.redis.RedisUtils;
@@ -22,24 +22,18 @@ 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.security.user.SecurityUser;
+import xiaozhi.modules.sys.enums.SuperAdminEnum;
 import xiaozhi.modules.timbre.service.TimbreService;
 
 @Service
+@AllArgsConstructor
 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;
-    }
+    private final TimbreService timbreModelService;
+    private final ModelConfigService modelConfigService;
+    private final RedisUtils redisUtils;
 
     @Override
     public PageData<AgentEntity> adminAgentList(Map<String, Object> params) {
@@ -138,4 +132,21 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
         }
         return agentDao.getDefaultAgentByMacAddress(macAddress);
     }
+
+    @Override
+    public boolean checkAgentPermission(String agentId, Long userId) {
+        // 获取智能体信息
+        AgentEntity agent = getAgentById(agentId);
+        if (agent == null) {
+            return false;
+        }
+
+        // 如果是超级管理员，直接返回true
+        if (SecurityUser.getUser().getSuperAdmin() == SuperAdminEnum.YES.value()) {
+            return true;
+        }
+
+        // 检查是否是智能体的所有者
+        return userId.equals(agent.getUserId());
+    }
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/config/WebMvcConfig.java b/main/manager-api/src/main/java/xiaozhi/modules/security/config/WebMvcConfig.java
index d576bfb3..02538caf 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/security/config/WebMvcConfig.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/security/config/WebMvcConfig.java
@@ -1,5 +1,6 @@
 package xiaozhi.modules.security.config;
 
+import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.TimeZone;
 
@@ -18,6 +19,15 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+
+import xiaozhi.common.utils.DateUtils;
 
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {
@@ -53,10 +63,29 @@ public class WebMvcConfig implements WebMvcConfigurer {
         // 忽略未知属性
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
-        // 日期格式转换
-        // mapper.setDateFormat(new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN));
+        // 设置时区
         mapper.setTimeZone(TimeZone.getTimeZone("GMT+8"));
 
+        // 配置Java8日期时间序列化
+        JavaTimeModule javaTimeModule = new JavaTimeModule();
+        javaTimeModule.addSerializer(java.time.LocalDateTime.class, new LocalDateTimeSerializer(
+                java.time.format.DateTimeFormatter.ofPattern(DateUtils.DATE_TIME_PATTERN)));
+        javaTimeModule.addSerializer(java.time.LocalDate.class, new LocalDateSerializer(
+                java.time.format.DateTimeFormatter.ofPattern(DateUtils.DATE_PATTERN)));
+        javaTimeModule.addSerializer(java.time.LocalTime.class,
+                new LocalTimeSerializer(java.time.format.DateTimeFormatter.ofPattern("HH:mm:ss")));
+        javaTimeModule.addDeserializer(java.time.LocalDateTime.class, new LocalDateTimeDeserializer(
+                java.time.format.DateTimeFormatter.ofPattern(DateUtils.DATE_TIME_PATTERN)));
+        javaTimeModule.addDeserializer(java.time.LocalDate.class, new LocalDateDeserializer(
+                java.time.format.DateTimeFormatter.ofPattern(DateUtils.DATE_PATTERN)));
+        javaTimeModule.addDeserializer(java.time.LocalTime.class,
+                new LocalTimeDeserializer(java.time.format.DateTimeFormatter.ofPattern("HH:mm:ss")));
+        mapper.registerModule(javaTimeModule);
+
+        // 配置java.util.Date的序列化和反序列化
+        SimpleDateFormat dateFormat = new SimpleDateFormat(DateUtils.DATE_TIME_PATTERN);
+        mapper.setDateFormat(dateFormat);
+
         // Long类型转String类型
         SimpleModule simpleModule = new SimpleModule();
         simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
diff --git a/main/manager-api/src/main/resources/db/changelog/202505012207.sql b/main/manager-api/src/main/resources/db/changelog/202505022134.sql
similarity index 82%
rename from main/manager-api/src/main/resources/db/changelog/202505012207.sql
rename to main/manager-api/src/main/resources/db/changelog/202505022134.sql
index 5003edc7..ccbaaaee 100644
--- a/main/manager-api/src/main/resources/db/changelog/202505012207.sql
+++ b/main/manager-api/src/main/resources/db/changelog/202505022134.sql
@@ -1,5 +1,6 @@
 -- 初始化智能体聊天记录
 DROP TABLE IF EXISTS ai_chat_history;
+DROP TABLE IF EXISTS ai_chat_message;
 DROP TABLE IF EXISTS ai_agent_chat_history;
 CREATE TABLE ai_agent_chat_history
 (
@@ -13,7 +14,9 @@ CREATE TABLE ai_agent_chat_history
     created_at  DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间',
     updated_at  DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
     INDEX idx_ai_agent_chat_history_mac (mac_address),
-    INDEX idx_ai_agent_chat_history_agent_id (agent_id)
+    INDEX idx_ai_agent_chat_history_session_id (session_id),
+    INDEX idx_ai_agent_chat_history_agent_id (agent_id),
+    INDEX idx_ai_agent_chat_history_agent_session_created (agent_id, session_id, created_at)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT '智能体聊天记录表';
 
 DROP TABLE IF EXISTS ai_agent_chat_audio;
diff --git a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
index aaef45bc..ffbef2ce 100755
--- a/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/main/manager-api/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -94,9 +94,9 @@ databaseChangeLog:
             encoding: utf8
             path: classpath:db/changelog/202504301341.sql
   - changeSet:
-      id: 202505012207
+      id: 202505022134
       author: Goody
       changes:
         - sqlFile:
             encoding: utf8
-            path: classpath:db/changelog/202505012207.sql
\ No newline at end of file
+            path: classpath:db/changelog/202505022134.sql
\ No newline at end of file
diff --git a/main/manager-web/src/views/DeviceManagement.vue b/main/manager-web/src/views/DeviceManagement.vue
index 34086960..14138bd8 100644
--- a/main/manager-web/src/views/DeviceManagement.vue
+++ b/main/manager-web/src/views/DeviceManagement.vue
@@ -294,20 +294,13 @@ export default {
         this.loading = false;
         if (data.code === 0) {
           this.deviceList = data.data.map(device => {
-            const bindDate = new Date(device.createDate);
-            const formattedBindTime = `${bindDate.getFullYear()}-${(bindDate.getMonth() + 1).toString().padStart(2, '0')}-${bindDate.getDate().toString().padStart(2, '0')} ${bindDate.getHours().toString().padStart(2, '0')}:${bindDate.getMinutes().toString().padStart(2, '0')}:${bindDate.getSeconds().toString().padStart(2, '0')}`;
-            let formattedLastConversation = '';
-            if (device.lastConnectedAt) {
-              const lastConvoDate = new Date(device.lastConnectedAt);
-              formattedLastConversation = `${lastConvoDate.getFullYear()}-${(lastConvoDate.getMonth() + 1).toString().padStart(2, '0')}-${lastConvoDate.getDate().toString().padStart(2, '0')} ${lastConvoDate.getHours().toString().padStart(2, '0')}:${lastConvoDate.getMinutes().toString().padStart(2, '0')}:${lastConvoDate.getSeconds().toString().padStart(2, '0')}`;
-            }
             return {
               device_id: device.id,
               model: device.board,
               firmwareVersion: device.appVersion,
               macAddress: device.macAddress,
-              bindTime: formattedBindTime,
-              lastConversation: formattedLastConversation,
+              bindTime: device.createDate,
+              lastConversation: device.lastConnectedAt,
               remark: device.alias,
               isEdit: false,
               otaSwitch: device.autoUpdate === 1,
diff --git a/main/manager-web/src/views/UserManagement.vue b/main/manager-web/src/views/UserManagement.vue
index 87ce3747..34d60e74 100644
--- a/main/manager-web/src/views/UserManagement.vue
+++ b/main/manager-web/src/views/UserManagement.vue
@@ -26,11 +26,7 @@
               <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="createDate" align="center">
-                <template slot-scope="scope">
-                  {{ formatDate(scope.row.createDate) }}
-                </template>
-              </el-table-column>
+              <el-table-column label="注册时间" prop="createDate" 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>
@@ -342,11 +338,6 @@ export default {
         // 用户取消操作
       });
     },
-    formatDate(dateString) {
-      if (!dateString) return '';
-      const date = new Date(dateString);
-      return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')} ${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}:${date.getSeconds().toString().padStart(2, '0')}`;
-    },
   },
 };
 </script>

From 15c0677a4b6290f060ee6008f78f67f76c27ad45 Mon Sep 17 00:00:00 2001
From: kevin1sMe <linjiang1205@gmail.com>
Date: Sat, 3 May 2025 23:33:32 +0800
Subject: [PATCH 30/53] fix: doubao tts token

---
 main/xiaozhi-server/core/providers/tts/doubao.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/xiaozhi-server/core/providers/tts/doubao.py b/main/xiaozhi-server/core/providers/tts/doubao.py
index 367a99c9..3a0fdde3 100644
--- a/main/xiaozhi-server/core/providers/tts/doubao.py
+++ b/main/xiaozhi-server/core/providers/tts/doubao.py
@@ -51,7 +51,7 @@ class TTSProvider(TTSProviderBase):
         request_json = {
             "app": {
                 "appid": f"{self.appid}",
-                "token": "access_token",
+                "token": self.access_token,
                 "cluster": self.cluster,
             },
             "user": {"uid": "1"},

From 4530345a1fe881d2373f0330a7e4c97f3d998c7b Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Sun, 4 May 2025 00:51:51 +0800
Subject: [PATCH 31/53] =?UTF-8?q?fix:=E8=AE=BE=E7=BD=AE=E6=9C=89=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/Deployment_all.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Deployment_all.md b/docs/Deployment_all.md
index 0d372353..da984993 100644
--- a/docs/Deployment_all.md
+++ b/docs/Deployment_all.md
@@ -213,7 +213,7 @@ CREATE DATABASE xiaozhi_esp32_server CHARACTER SET utf8mb4 COLLATE utf8mb4_unico
 如果还没有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
+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" -e TZ=Asia/Shanghai -d mysql:latest
 ```
 
 ## 2.安装redis

From 56c3a04809433d08641025c22186d5de25f3c790 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Sun, 4 May 2025 01:19:54 +0800
Subject: [PATCH 32/53] =?UTF-8?q?update:=E4=BC=98=E5=8C=96=E7=99=BE?=
 =?UTF-8?q?=E5=BA=A6ASR=E6=96=87=E6=A1=A3=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/config.yaml               |  7 ++---
 .../core/providers/asr/baidu.py               | 29 ++++++++++++++-----
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/main/xiaozhi-server/config.yaml b/main/xiaozhi-server/config.yaml
index 6135f0d7..cef214ac 100644
--- a/main/xiaozhi-server/config.yaml
+++ b/main/xiaozhi-server/config.yaml
@@ -259,11 +259,8 @@ ASR:
     access_key_secret: 你的阿里云账号access_key_secret
     output_dir: tmp/
   BaiduASR:
-    # 可以在这里申请百度语音技术的AppID、API Key、Secret Key
-    # https://console.bce.baidu.com/ai-engine/old/#/ai/speech/app/list
-    # 启用前需要先安装依赖包：
-    # pip install baidu-aip==4.16.13
-    # pip install chardet==5.2.0
+    # 获取AppID、API Key、Secret Key：https://console.bce.baidu.com/ai-engine/old/#/ai/speech/app/list
+    # 查看资源额度：https://console.bce.baidu.com/ai-engine/old/#/ai/speech/overview/resource/list
     type: baidu
     app_id: 你的百度语音技术AppID
     api_key: 你的百度语音技术APIKey
diff --git a/main/xiaozhi-server/core/providers/asr/baidu.py b/main/xiaozhi-server/core/providers/asr/baidu.py
index 6edfe128..94996a59 100644
--- a/main/xiaozhi-server/core/providers/asr/baidu.py
+++ b/main/xiaozhi-server/core/providers/asr/baidu.py
@@ -17,12 +17,16 @@ from config.logger import setup_logging
 TAG = __name__
 logger = setup_logging()
 
+
 class ASRProvider(ASRProviderBase):
     def __init__(self, config: dict, delete_audio_file: bool = True):
         self.app_id = config.get("app_id")
         self.api_key = config.get("api_key")
         self.secret_key = config.get("secret_key")
-        self.dev_pid = config.get("dev_pid")
+
+        dev_pid = config.get("dev_pid", "1537")
+        self.dev_pid = int(dev_pid) if dev_pid else 1537
+
         self.output_dir = config.get("output_dir")
         self.delete_audio_file = delete_audio_file
 
@@ -61,7 +65,9 @@ class ASRProvider(ASRProviderBase):
 
         return pcm_data
 
-    async def speech_to_text(self, opus_data: List[bytes], session_id: str) -> Tuple[Optional[str], Optional[str]]:
+    async def speech_to_text(
+        self, opus_data: List[bytes], session_id: str
+    ) -> Tuple[Optional[str], Optional[str]]:
         """将语音数据转换为文本"""
         if not opus_data:
             logger.bind(tag=TAG).warn("音频数据为空！")
@@ -86,16 +92,25 @@ class ASRProvider(ASRProviderBase):
 
             start_time = time.time()
             # 识别本地文件
-            result = self.client.asr(combined_pcm_data, 'pcm', 16000, {
-                'dev_pid': str(self.dev_pid),
-            })
+            result = self.client.asr(
+                combined_pcm_data,
+                "pcm",
+                16000,
+                {
+                    "dev_pid": str(self.dev_pid),
+                },
+            )
 
             if result and result["err_no"] == 0:
-                logger.bind(tag=TAG).debug(f"百度语音识别耗时: {time.time() - start_time:.3f}s | 结果: {result}")
+                logger.bind(tag=TAG).debug(
+                    f"百度语音识别耗时: {time.time() - start_time:.3f}s | 结果: {result}"
+                )
                 result = result["result"][0]
                 return result, file_path
             else:
-                raise Exception(f"百度语音识别失败，错误码: {result['err_no']}，错误信息: {result['err_msg']}")
+                raise Exception(
+                    f"百度语音识别失败，错误码: {result['err_no']}，错误信息: {result['err_msg']}"
+                )
                 return None, file_path
 
         except Exception as e:

From 4043d20ea6d953d001e966f145c15e2b50b43d00 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Sun, 4 May 2025 12:53:36 +0800
Subject: [PATCH 33/53] =?UTF-8?q?update:=E8=81=8A=E5=A4=A9=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=B1=95=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agent/dto/AgentChatHistoryDTO.java        |   3 +
 main/manager-web/src/apis/module/agent.js     |  46 +++
 main/manager-web/src/assets/user-avatar.png   | Bin 0 -> 8330 bytes
 .../src/components/ChatHistoryDialog.vue      | 366 ++++++++++++++++++
 .../manager-web/src/components/DeviceItem.vue |   6 +
 main/manager-web/src/views/home.vue           |  42 +-
 6 files changed, 442 insertions(+), 21 deletions(-)
 create mode 100644 main/manager-web/src/assets/user-avatar.png
 create mode 100644 main/manager-web/src/components/ChatHistoryDialog.vue

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryDTO.java
index a444917d..fd49e52b 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryDTO.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dto/AgentChatHistoryDTO.java
@@ -22,4 +22,7 @@ public class AgentChatHistoryDTO {
 
     @Schema(description = "音频ID")
     private String audioId;
+
+    @Schema(description = "MAC地址")
+    private String macAddress;
 }
\ No newline at end of file
diff --git a/main/manager-web/src/apis/module/agent.js b/main/manager-web/src/apis/module/agent.js
index 87323f9c..fd8f6cf3 100644
--- a/main/manager-web/src/apis/module/agent.js
+++ b/main/manager-web/src/apis/module/agent.js
@@ -97,4 +97,50 @@ export default {
                 });
             }).send();
     },
+    // 获取智能体会话列表
+    getAgentSessions(agentId, params, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/agent/${agentId}/sessions`)
+            .method('GET')
+            .data(params)
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .fail(() => {
+                RequestService.reAjaxFun(() => {
+                    this.getAgentSessions(agentId, params, callback);
+                });
+            }).send();
+    },
+    // 获取智能体聊天记录
+    getAgentChatHistory(agentId, sessionId, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/agent/${agentId}/chat-history/${sessionId}`)
+            .method('GET')
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .fail(() => {
+                RequestService.reAjaxFun(() => {
+                    this.getAgentChatHistory(agentId, sessionId, callback);
+                });
+            }).send();
+    },
+}
+
+export function getAgentSessions(agentId, params) {
+    return request({
+        url: `/agent/${agentId}/sessions`,
+        method: 'get',
+        params
+    });
+}
+
+export function getAgentChatHistory(agentId, sessionId) {
+    return request({
+        url: `/agent/${agentId}/chat-history/${sessionId}`,
+        method: 'get'
+    });
 }
diff --git a/main/manager-web/src/assets/user-avatar.png b/main/manager-web/src/assets/user-avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..c99604750825693a37a9aaa2cb9f4934139983e1
GIT binary patch
literal 8330
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

literal 0
HcmV?d00001

diff --git a/main/manager-web/src/components/ChatHistoryDialog.vue b/main/manager-web/src/components/ChatHistoryDialog.vue
new file mode 100644
index 00000000..967df436
--- /dev/null
+++ b/main/manager-web/src/components/ChatHistoryDialog.vue
@@ -0,0 +1,366 @@
+<template>
+    <el-dialog :title="'与' + agentName + '的聊天记录' + (currentMacAddress ? '[' + currentMacAddress + ']' : '')"
+        :visible.sync="dialogVisible" width="80%" :before-close="handleClose" custom-class="chat-history-dialog">
+        <div class="chat-container">
+            <div class="session-list" @scroll="handleScroll">
+                <div v-for="session in sessions" :key="session.sessionId" class="session-item"
+                    :class="{ active: currentSessionId === session.sessionId }" @click="selectSession(session)">
+                    <img src="@/assets/xiaozhi-logo.png" class="avatar" />
+                    <div class="session-info">
+                        <div class="session-time">{{ formatTime(session.createdAt) }}</div>
+                        <div class="message-count">{{ session.chatCount }}</div>
+                    </div>
+                </div>
+                <div v-if="loading" class="loading">加载中...</div>
+                <div v-if="!hasMore" class="no-more">没有更多记录了</div>
+            </div>
+            <div class="chat-content">
+                <div v-if="currentSessionId" class="messages">
+                    <div v-for="(message, index) in messagesWithTime" :key="message.id">
+                        <div v-if="message.type === 'time'" class="time-divider">
+                            {{ message.content }}
+                        </div>
+                        <div v-else class="message-item" :class="{ 'user-message': message.chatType === 1 }">
+                            <img :src="message.chatType === 1 ? require('@/assets/user-avatar.png') : require('@/assets/xiaozhi-logo.png')"
+                                class="avatar" />
+                            <div class="message-content">{{ message.content }}</div>
+                        </div>
+                    </div>
+                </div>
+                <div v-else class="no-session-selected">
+                    请选择会话查看聊天记录
+                </div>
+            </div>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import Api from '@/apis/api';
+
+export default {
+    name: 'ChatHistoryDialog',
+    props: {
+        visible: {
+            type: Boolean,
+            default: false
+        },
+        agentId: {
+            type: String,
+            required: true
+        },
+        agentName: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            sessions: [],
+            messages: [],
+            currentSessionId: '',
+            currentMacAddress: '',
+            page: 1,
+            limit: 10,
+            loading: false,
+            hasMore: true,
+            scrollTimer: null,
+            isFirstLoad: true
+        };
+    },
+    watch: {
+        visible(val) {
+            this.dialogVisible = val;
+            if (val) {
+                this.resetData();
+                this.loadSessions();
+            }
+        },
+        dialogVisible(val) {
+            if (!val) {
+                this.$emit('update:visible', false);
+            }
+        }
+    },
+    computed: {
+        messagesWithTime() {
+            if (!this.messages || this.messages.length === 0) return [];
+
+            const result = [];
+            const TIME_INTERVAL = 60 * 1000; // 1分钟的时间间隔（毫秒）
+
+            // 添加第一条消息的时间标记
+            if (this.messages[0]) {
+                result.push({
+                    type: 'time',
+                    content: this.formatTime(this.messages[0].createdAt),
+                    id: `time-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`
+                });
+            }
+
+            // 处理消息列表
+            for (let i = 0; i < this.messages.length; i++) {
+                const currentMessage = this.messages[i];
+                result.push(currentMessage);
+
+                // 检查是否需要添加时间标记
+                if (i < this.messages.length - 1) {
+                    const currentTime = new Date(currentMessage.createdAt).getTime();
+                    const nextTime = new Date(this.messages[i + 1].createdAt).getTime();
+
+                    if (nextTime - currentTime > TIME_INTERVAL) {
+                        result.push({
+                            type: 'time',
+                            content: this.formatTime(this.messages[i + 1].createdAt),
+                            id: `time-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`
+                        });
+                    }
+                }
+            }
+
+            return result;
+        }
+    },
+    methods: {
+        resetData() {
+            this.sessions = [];
+            this.messages = [];
+            this.currentSessionId = '';
+            this.currentMacAddress = '';
+            this.page = 1;
+            this.loading = false;
+            this.hasMore = true;
+            this.isFirstLoad = true;
+        },
+        handleClose() {
+            this.dialogVisible = false;
+        },
+        loadSessions() {
+            if (this.loading || (!this.isFirstLoad && !this.hasMore)) {
+                return;
+            }
+
+            this.loading = true;
+            const params = {
+                page: this.page,
+                limit: this.limit
+            };
+
+            Api.agent.getAgentSessions(this.agentId, params, (res) => {
+                if (res.data && res.data.data && Array.isArray(res.data.data.list)) {
+                    const list = res.data.data.list;
+                    this.hasMore = list.length === this.limit;
+
+                    this.sessions = [...this.sessions, ...list];
+                    this.page++;
+
+                    if (this.sessions.length > 0 && !this.currentSessionId) {
+                        this.selectSession(this.sessions[0]);
+                    }
+                }
+                this.loading = false;
+                this.isFirstLoad = false;
+            });
+        },
+        selectSession(session) {
+            this.currentSessionId = session.sessionId;
+            Api.agent.getAgentChatHistory(this.agentId, session.sessionId, (res) => {
+                if (res.data && res.data.data) {
+                    this.messages = res.data.data;
+                    if (this.messages.length > 0 && this.messages[0].macAddress) {
+                        this.currentMacAddress = this.messages[0].macAddress;
+                    }
+                }
+            });
+        },
+        handleScroll(e) {
+            if (this.scrollTimer) {
+                clearTimeout(this.scrollTimer);
+            }
+
+            this.scrollTimer = setTimeout(() => {
+                const { scrollTop, scrollHeight, clientHeight } = e.target;
+                // 当滚动到底部时加载更多
+                if (scrollHeight - scrollTop <= clientHeight + 50) {
+                    this.loadSessions();
+                }
+            }, 200);
+        },
+        formatTime(timestamp) {
+            const date = new Date(timestamp);
+            const now = new Date();
+            const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+            const yesterday = new Date(today);
+            yesterday.setDate(yesterday.getDate() - 1);
+
+            const hours = date.getHours().toString().padStart(2, '0');
+            const minutes = date.getMinutes().toString().padStart(2, '0');
+
+            if (date >= today) {
+                return `今天 ${hours}:${minutes}`;
+            } else if (date >= yesterday) {
+                return `昨天 ${hours}:${minutes}`;
+            } else {
+                const year = date.getFullYear();
+                const month = (date.getMonth() + 1).toString().padStart(2, '0');
+                const day = date.getDate().toString().padStart(2, '0');
+                return `${year}-${month}-${day} ${hours}:${minutes}`;
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+.chat-container {
+    display: flex;
+    height: 600px;
+}
+
+.session-list {
+    width: 250px;
+    border-right: 1px solid #eee;
+    overflow-y: auto;
+    padding: 10px;
+}
+
+.session-item {
+    display: flex;
+    align-items: center;
+    padding: 10px;
+    cursor: pointer;
+    border-radius: 8px;
+    margin-bottom: 10px;
+}
+
+.session-item:hover {
+    background-color: #f5f5f5;
+}
+
+.session-item.active {
+    background-color: #e6f7ff;
+}
+
+.avatar {
+    width: 40px;
+    height: 40px;
+    border-radius: 50%;
+    margin-right: 10px;
+}
+
+.session-info {
+    flex: 1;
+}
+
+.session-time {
+    font-size: 14px;
+    color: #272727;
+    float: left;
+    height: 30px;
+    line-height: 30px;
+    width: calc(100% - 30px);
+    /* 为消息数量留出空间 */
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.message-count {
+    font-size: 14px;
+    color: #fff;
+    background-color: #1890ff;
+    border-radius: 20px;
+    float: left;
+    width: 20px;
+    height: 20px;
+    line-height: 20px;
+    margin-top: 5px;
+    margin-left: 5px;
+}
+
+.chat-content {
+    flex: 1;
+    padding: 20px;
+    overflow-y: auto;
+}
+
+.message-item {
+    display: flex;
+    margin-bottom: 20px;
+}
+
+.message-item.user-message {
+    flex-direction: row-reverse;
+}
+
+.message-content {
+    max-width: 60%;
+    padding: 10px 15px;
+    border-radius: 8px;
+    background-color: #f0f0f0;
+    margin: 0 10px;
+    text-align: left;
+    line-height: 20px;
+}
+
+.user-message .message-content {
+    background-color: #1890ff;
+    color: white;
+}
+
+.loading,
+.no-more {
+    text-align: center;
+    padding: 10px 10px 30px 10px;
+    color: #999;
+}
+
+.no-session-selected {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100%;
+    color: #999;
+}
+
+.time-divider {
+    text-align: center;
+    margin: 10px 0;
+    color: #999;
+    font-size: 12px;
+}
+
+.time-divider::before,
+.time-divider::after {
+    content: '';
+    display: inline-block;
+    width: 30%;
+    height: 1px;
+    background-color: #eee;
+    vertical-align: middle;
+    margin: 0 10px;
+}
+</style>
+
+<style>
+.chat-history-dialog {
+    display: flex;
+    flex-direction: column;
+    min-width: 700px;
+    margin: 0 !important;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    height: 80vh;
+    max-width: 85vw;
+}
+
+.chat-history-dialog .el-dialog__body {
+    padding: 0;
+    overflow: hidden;
+    height: calc(80vh - 54px);
+    /* 减去标题栏的高度 */
+}
+</style>
\ No newline at end of file
diff --git a/main/manager-web/src/components/DeviceItem.vue b/main/manager-web/src/components/DeviceItem.vue
index 2ac0bbac..fa81a04d 100644
--- a/main/manager-web/src/components/DeviceItem.vue
+++ b/main/manager-web/src/components/DeviceItem.vue
@@ -26,6 +26,9 @@
       <div class="settings-btn" @click="handleDeviceManage">
         设备管理({{ device.deviceCount }})
       </div>
+      <div class="settings-btn" @click="handleChatHistory">
+        聊天记录
+      </div>
     </div>
     <div class="version-info">
       <div>最近对话：{{ device.lastConnectedAt }}</div>
@@ -51,6 +54,9 @@ export default {
     },
     handleDeviceManage() {
       this.$router.push({ path: '/device-management', query: { agentId: this.device.agentId } });
+    },
+    handleChatHistory() {
+      this.$emit('chat-history', { agentId: this.device.agentId, agentName: this.device.agentName })
     }
   }
 }
diff --git a/main/manager-web/src/views/home.vue b/main/manager-web/src/views/home.vue
index 8091b8bb..e276ec20 100644
--- a/main/manager-web/src/views/home.vue
+++ b/main/manager-web/src/views/home.vue
@@ -32,11 +32,7 @@
         </div>
         <div class="device-list-container">
           <template v-if="isLoading">
-            <div
-              v-for="i in skeletonCount"
-              :key="'skeleton-'+i"
-              class="skeleton-item"
-            >
+            <div v-for="i in skeletonCount" :key="'skeleton-' + i" class="skeleton-item">
               <div class="skeleton-image"></div>
               <div class="skeleton-content">
                 <div class="skeleton-line"></div>
@@ -46,14 +42,8 @@
           </template>
 
           <template v-else>
-            <DeviceItem
-              v-for="(item, index) in devices"
-              :key="index"
-              :device="item"
-              @configure="goToRoleConfig"
-              @deviceManage="handleDeviceManage"
-              @delete="handleDeleteAgent"
-            />
+            <DeviceItem v-for="(item, index) in devices" :key="index" :device="item" @configure="goToRoleConfig"
+              @deviceManage="handleDeviceManage" @delete="handleDeleteAgent" @chat-history="handleShowChatHistory" />
           </template>
         </div>
       </div>
@@ -62,6 +52,7 @@
     <el-footer>
       <version-footer />
     </el-footer>
+    <chat-history-dialog :visible.sync="showChatHistory" :agent-id="currentAgentId" :agent-name="currentAgentName" />
   </div>
 
 </template>
@@ -69,13 +60,14 @@
 <script>
 import Api from '@/apis/api';
 import AddWisdomBodyDialog from '@/components/AddWisdomBodyDialog.vue';
+import ChatHistoryDialog from '@/components/ChatHistoryDialog.vue';
 import DeviceItem from '@/components/DeviceItem.vue';
 import HeaderBar from '@/components/HeaderBar.vue';
 import VersionFooter from '@/components/VersionFooter.vue';
 
 export default {
   name: 'HomePage',
-  components: { DeviceItem, AddWisdomBodyDialog, HeaderBar, VersionFooter },
+  components: { DeviceItem, AddWisdomBodyDialog, HeaderBar, VersionFooter, ChatHistoryDialog },
   data() {
     return {
       addDeviceDialogVisible: false,
@@ -85,6 +77,9 @@ export default {
       searchRegex: null,
       isLoading: true,
       skeletonCount: localStorage.getItem('skeletonCount') || 8,
+      showChatHistory: false,
+      currentAgentId: '',
+      currentAgentName: ''
     }
   },
 
@@ -177,6 +172,11 @@ export default {
           }
         });
       }).catch(() => { });
+    },
+    handleShowChatHistory({ agentId, agentName }) {
+      this.currentAgentId = agentId;
+      this.currentAgentName = agentName;
+      this.showChatHistory = true;
     }
   }
 }
@@ -302,7 +302,9 @@ export default {
 
 /* 骨架屏动画 */
 @keyframes shimmer {
-  100% { transform: translateX(100%); }
+  100% {
+    transform: translateX(100%);
+  }
 }
 
 .skeleton-item {
@@ -353,12 +355,10 @@ export default {
   left: 0;
   width: 50%;
   height: 100%;
-  background: linear-gradient(
-    90deg,
-    rgba(255,255,255,0),
-    rgba(255,255,255,0.3),
-    rgba(255,255,255,0)
-  );
+  background: linear-gradient(90deg,
+      rgba(255, 255, 255, 0),
+      rgba(255, 255, 255, 0.3),
+      rgba(255, 255, 255, 0));
   animation: shimmer 1.5s infinite;
 }
 </style>
\ No newline at end of file

From e7d999278d7613358202a69e8d955945c1f0e88f Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Sun, 4 May 2025 13:00:56 +0800
Subject: [PATCH 34/53] =?UTF-8?q?update:=E4=BC=98=E5=8C=96=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiaozhi/modules/sys/controller/SysDictDataController.java   | 2 +-
 main/manager-web/src/components/ChatHistoryDialog.vue           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictDataController.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictDataController.java
index 72d1b41b..30187fe8 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictDataController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/SysDictDataController.java
@@ -96,7 +96,7 @@ public class SysDictDataController {
 
     @GetMapping("/type/{dictType}")
     @Operation(summary = "获取字典数据列表")
-    @RequiresPermissions("sys:role:superAdmin")
+    @RequiresPermissions("sys:role:normal")
     public Result<List<SysDictDataItem>> getDictDataByType(@PathVariable("dictType") String dictType) {
         List<SysDictDataItem> list = sysDictDataService.getDictDataByType(dictType);
         return new Result<List<SysDictDataItem>>().ok(list);
diff --git a/main/manager-web/src/components/ChatHistoryDialog.vue b/main/manager-web/src/components/ChatHistoryDialog.vue
index 967df436..646164b9 100644
--- a/main/manager-web/src/components/ChatHistoryDialog.vue
+++ b/main/manager-web/src/components/ChatHistoryDialog.vue
@@ -8,7 +8,7 @@
                     <img src="@/assets/xiaozhi-logo.png" class="avatar" />
                     <div class="session-info">
                         <div class="session-time">{{ formatTime(session.createdAt) }}</div>
-                        <div class="message-count">{{ session.chatCount }}</div>
+                        <div class="message-count">{{ session.chatCount > 99 ? '99' : session.chatCount }}</div>
                     </div>
                 </div>
                 <div v-if="loading" class="loading">加载中...</div>

From c9111d1bfcb63312ab650c9241211502d65fe231 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Sun, 4 May 2025 13:15:49 +0800
Subject: [PATCH 35/53] =?UTF-8?q?update:=E4=BC=98=E5=8C=96websocket?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/xiaozhi/modules/sys/utils/WebSocketValidator.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/utils/WebSocketValidator.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/utils/WebSocketValidator.java
index d9ff280b..39bbe01f 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/utils/WebSocketValidator.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/utils/WebSocketValidator.java
@@ -8,6 +8,7 @@ import java.util.regex.Pattern;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.web.socket.WebSocketHttpHeaders;
 import org.springframework.web.socket.client.WebSocketClient;
 import org.springframework.web.socket.client.standard.StandardWebSocketClient;
 
@@ -45,8 +46,9 @@ public class WebSocketValidator {
         try {
             WebSocketClient client = new StandardWebSocketClient();
             CompletableFuture<Boolean> future = new CompletableFuture<>();
+            WebSocketHttpHeaders headers = new WebSocketHttpHeaders();
 
-            client.doHandshake(new WebSocketTestHandler(future), null, URI.create(url));
+            client.execute(new WebSocketTestHandler(future), headers, URI.create(url));
 
             // 等待最多5秒获取连接结果
             return future.get(5, TimeUnit.SECONDS);

From 0732b72e8f50e5e98819bd98844a01743721025c Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Sun, 4 May 2025 15:43:28 +0800
Subject: [PATCH 36/53] =?UTF-8?q?update:=E8=81=8A=E5=A4=A9=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E9=9F=B3=E9=A2=91=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agent/controller/AgentController.java     |  19 ++++
 .../agent/service/AgentChatAudioService.java  |   8 ++
 .../impl/AgentChatAudioServiceImpl.java       |   6 ++
 .../modules/security/config/ShiroConfig.java  |  11 ++-
 main/manager-web/src/assets/user-avatar1.png  | Bin 0 -> 10906 bytes
 main/manager-web/src/assets/user-avatar2.png  | Bin 0 -> 10720 bytes
 main/manager-web/src/assets/user-avatar3.png  | Bin 0 -> 11231 bytes
 main/manager-web/src/assets/user-avatar4.png  | Bin 0 -> 10297 bytes
 .../{user-avatar.png => user-avatar5.png}     | Bin
 .../src/components/ChatHistoryDialog.vue      |  86 +++++++++++++++++-
 10 files changed, 120 insertions(+), 10 deletions(-)
 create mode 100644 main/manager-web/src/assets/user-avatar1.png
 create mode 100644 main/manager-web/src/assets/user-avatar2.png
 create mode 100644 main/manager-web/src/assets/user-avatar3.png
 create mode 100644 main/manager-web/src/assets/user-avatar4.png
 rename main/manager-web/src/assets/{user-avatar.png => user-avatar5.png} (100%)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
index 7b717a3f..cfbb107f 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
@@ -5,6 +5,9 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -35,6 +38,7 @@ 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.AgentChatAudioService;
 import xiaozhi.modules.agent.service.AgentChatHistoryService;
 import xiaozhi.modules.agent.service.AgentService;
 import xiaozhi.modules.agent.service.AgentTemplateService;
@@ -50,6 +54,7 @@ public class AgentController {
     private final AgentTemplateService agentTemplateService;
     private final DeviceService deviceService;
     private final AgentChatHistoryService agentChatHistoryService;
+    private final AgentChatAudioService agentChatAudioService;
 
     @GetMapping("/list")
     @Operation(summary = "获取用户智能体列表")
@@ -229,4 +234,18 @@ public class AgentController {
         List<AgentChatHistoryDTO> result = agentChatHistoryService.getChatHistoryBySessionId(id, sessionId);
         return new Result<List<AgentChatHistoryDTO>>().ok(result);
     }
+
+    @GetMapping("/audio/{audioId}")
+    @Operation(summary = "下载音频")
+    @RequiresPermissions("sys:role:normal")
+    public ResponseEntity<byte[]> downloadAudio(@PathVariable("audioId") String audioId) {
+        byte[] audioData = agentChatAudioService.getAudio(audioId);
+        if (audioData == null) {
+            return ResponseEntity.notFound().build();
+        }
+        return ResponseEntity.ok()
+                .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"play.wav\"")
+                .body(audioData);
+    }
 }
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatAudioService.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatAudioService.java
index fdd0e1f6..e284b69f 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatAudioService.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatAudioService.java
@@ -19,4 +19,12 @@ public interface AgentChatAudioService extends IService<AgentChatAudioEntity> {
      * @return 音频ID
      */
     String saveAudio(byte[] audioData);
+
+    /**
+     * 获取音频数据
+     *
+     * @param audioId 音频ID
+     * @return 音频数据
+     */
+    byte[] getAudio(String audioId);
 }
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatAudioServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatAudioServiceImpl.java
index c222abe4..cf804678 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatAudioServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatAudioServiceImpl.java
@@ -25,4 +25,10 @@ public class AgentChatAudioServiceImpl extends ServiceImpl<AiAgentChatAudioDao,
         save(entity);
         return entity.getId();
     }
+
+    @Override
+    public byte[] getAudio(String audioId) {
+        AgentChatAudioEntity entity = getById(audioId);
+        return entity != null ? entity.getAudio() : null;
+    }
 }
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java b/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
index b462b2c4..abccec0f 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
@@ -1,6 +1,9 @@
 package xiaozhi.modules.security.config;
 
-import jakarta.servlet.Filter;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.session.mgt.SessionManager;
 import org.apache.shiro.spring.LifecycleBeanPostProcessor;
@@ -11,15 +14,13 @@ import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+
+import jakarta.servlet.Filter;
 import xiaozhi.modules.security.oauth2.Oauth2Filter;
 import xiaozhi.modules.security.oauth2.Oauth2Realm;
 import xiaozhi.modules.security.secret.ServerSecretFilter;
 import xiaozhi.modules.sys.service.SysParamsService;
 
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 /**
  * Shiro的配置文件
  * Copyright (c) 人人开源 All rights reserved.
diff --git a/main/manager-web/src/assets/user-avatar1.png b/main/manager-web/src/assets/user-avatar1.png
new file mode 100644
index 0000000000000000000000000000000000000000..d835d2f70ed88eae5d0908766835dd1cbcdd8729
GIT binary patch
literal 10906
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

literal 0
HcmV?d00001

diff --git a/main/manager-web/src/assets/user-avatar2.png b/main/manager-web/src/assets/user-avatar2.png
new file mode 100644
index 0000000000000000000000000000000000000000..71d5fd1bbe37d2a970a2a6c6d412b7e94ec6960a
GIT binary patch
literal 10720
zcmV<6DIeB}P)<h;3K|Lk000e1NJLTq0077U0077c1^@s6tyr#}00001b5ch_0Itp)
z=>PyA07*naRCr$PeFu0P*LCiHX11e~U@u_rG$m1rWEI=8BrIf0uCg7!M79$v%|%#H
zd9w4xc3e^<y@*)Iwh||j<0n7I&qbDPH7rC*1Pe$B><t810fIy&I(8SkJ9DA|2^u8Y
z>|l0hcChn(`smNN_muzKf9K9E=Md6QLJ;6zeoBnw&07(Zv62WY1R2vol*!ClM4ZV?
zSs>0NDE}X_K*)shuksLj!RRAGFN6EQ)JMd<Joqp5g1Ju?aETdpHUYJc&I@()>0e0+
zab$`Mr77<Jq}>k&HZ35EtsoXw09e7mO66YwOD8QnJ^`lz)Dcjt{L3WQG27}q-p%LZ
z6O(Q|9Dy`J;v5e>uWnjl7v=W>xR1g25m8>8B9hvinL7#e27ouBlCVAd!<*}pYCwuB
zOA};*0ES-oEdufF1iGDp`#^(lhtz#|@GbKOgR8()<-Xs4E_Izryya<vjDm5vqNETk
z7cuB|0JkPS42EiWn-sE;Q0^)$tuWLQ6Dm&=<VsM26}~%&`2m0)0I<%4u}X$XM*)6?
ziC*y(`gbKmq1kmzX@c~XZ`vS|`~Zj^0P}5T4^~p`BiaMzS0ol*$t>D@D5<(lq-@F&
zgexAOJAmk?Se73I(LE-Lg?UY3-b#Y-vJ>`SQQ=b;&1<OsmQ5Lg41R12c!YsR2$-cm
zl-8HXKnnrSLB?}a<>TJ+1PO21v_h8n5dwb^z%=U*<D_`l!Jy{_k)CtiYwcxY%MxTD
z@aQ^;g+~O!7a7P*%CMPYN(kta8PAI(Kj-v5bJU9NTaF<8<-VIlqAxP|5daP=2F-*%
zMF{kq#Qc0lk$=Al?bB?MWeCz;UNX%o;BjXDnr1Z89Vd+d5j{B|<EfmY(vC?BGl2k0
z5F`{R`8?4eIo6l}(<yHP5glj7Q*LkR|4nr;Qko!<EycIUlJGSKe=^krVMY51^r9fj
zPde@`t4>w_Qj#F8Z+$5<E9!V03}rf%{?0J>=!<~xWUoE))Xck|?K8KjBdtq0f&?pk
zpH+xKz=l)<dn((@z#)Ywo<jf6QwfKZA;{UczTlb_$$6SUUrHr_)3#oV0E3@xadbbn
z`0k&CQvsWlAV`1U(TxIxrvbb_6+lhfI3WU+GUUfHywB{Lu%*EbOiz$ddGY5U(9>Y#
z8;n(2y`BgV+9C5}?xM06^c1VNEK?ICSnhjLS-#cV>9joaAfPM<dy4#~-Mca+L6q}T
z9FsSL@L}_WGHpr15MaDYHer()&vluOAOjU8AD5Xo16Y)>fTRVR5rK08(I#hM=}TrZ
z&Qt^mmKT48h`w(ofYP=k7XfDes;8*z2g%hswl>ocBoy%dBY?j*3ovOr3`O9d++P1T
z47K2ja#Ii_6!1L{;LptfNZJO|An;?i*RR~+G4wH<AmKpCs|@~-p(v!4n-T#6z2@?k
z8oE$pC_#ed#ruiqMpH&7ZImexVCDm!qOzNeGR821gaSV0^8Xy898c>_DFm9_UjJMp
zEH;E7p@5H#a5k+owGnW8{Yf9MNmm%E@YRA-Jbh<skF(UZo>1p5^ef51llCN)AmKpC
z%M2xZVfslUpbY^6z2fqgKB%pC{JoM!kYJ#AGl5FtH!<BKjli`CFu2s?E!&g~T#`bN
zP@v@N0RKxe97^k$DhSZuxxJ-NB--1A6C_+-{1r|gA4zl^r=)yh{;Dg%$5IkXkWhv1
z3t;@$l#E{5>Es|l_%nB*|0ju3mN0@`IhFgHL>Zozn?_&=0fFcfi8=+G5P}Te=aA$;
z`p9~E5GM(Nb0iAhMBFDy2th*SzE{$hosu*((rPXvz<AYN<kx)*L3e_rugRuItWgLg
z;`*+x1Q|@QK$P<7CXEVkTCWZWFn?apL=d_WWH2=k3FYbRBRT{*EkZj2gm#(bBE3=y
z=|T`CsoU&GZh1OymG-!%d+LfnWwWEJNRQ-nx)3B7DE?tO<DsqrP79kP0!ju)kGJg0
zlN5tV6GX|CON{@XtRd<CX$15}fC>L=vblgKMGz&+dS=A2Go46U@6e{@>4AWfFuTtY
zxpOjE<tIguP=)WiV0=>#XVNm#2qXjn!uQ;T{%>iOt(hQ7@ft~@o$2}<8laca#}T2O
zqqZ(YgrGcNi!!*M>~b&n_K0$rvmwAKIs}33unSId2-(6Ma#8w<a{O>dM3L{*TEs^)
zLBfHOU#BZOO&l$b2<JIyZ<2%dpxkG7bCe1InmtxesjWE(DdrjD?;V1J&LN9>?K4Cd
zO&1plE=t#YpCAlMr7M@W^r4BPHL`^!f+#fs0Z!NnN-d6<sgK-eKPGj$+PKd?gJoJ9
zk8M&%TMZ%ut5x?As8-0JR&kDKw=b~Wrn=vhYe-+vQZq4bf?TO4yCYpN^V$(62W>Ud
zC3lM!QVf?QceNknaQFsI<5xtTI74i*FS0KYGH8J&85ZrN6c!zjaaX+6cjG2VxT55V
zbgAV(j3T+$epqVF=#j(XoqCL|NfG1^284ucs&=e&<O|tCy7KQ8T$B>kuENr<#}lWx
z2-08fyGbCJzA8{W0BCJ1bvyS-t)2)+g!gKdF<L*J2r?wPUz{fFw6C(y72LvlJ?%_Y
zSu$f|Mv;HNTKnT7NH|dPLk3Uj8i7)`W53jr5#y-vM`}Tir=5JM<upg5OXKOIqHU9y
zFTU+q<5)y?Xq&#NP?8Ew2=uJWTdI18T{S@l0*|hfAt-N;DOq-zBjUx#g^W`O+TWL`
zfxtjWZf<lZN<IiD#96k3uC?|x47?{{ddw|2B0%2g^geS`jhU(m5-j)miBPOYsMXrY
zm)yIfE$#(inx9DDSe6gVtrrtMa7m;}=Z%i2kR#liNPo;Kn;B)EBEL_KeX0neT%m;|
z?_(fSjZiDKiCxUxCUrVLkPM$V5_wbZX#HR^bOChHzC_$-Uu;iW61L>{HL(@~`XCA$
z)m+h4MUY^i<S7FG?}=4grv*pE`slf=CXR|p+gsrNzBlFGt|SrUa;(HW@ipg7j=KRQ
zZfa-3VZosP<MEbGSRi&nf`nf8ErKw(ay89_ekR1EXuE5-)RM7~fO!c~Fosa>y0lLY
zhc+ftr=p7-ROPzKIh`^nsd;ac?dNs+Iv``C`+onq@$8tGAXBU~TI_t*HmS#vlquEq
zfstA-wnLVUsRvJJaIAD(w9QN28`EHdDC#FH^)@a+xZ?4-A&%@PU`m|#iPmRV%6<0t
z8xlBKdPiz)O32c2JpPCaY}=hH61P$pk1dIA%Rq~p95+$nQ%bFxQJ--M60RsIW@dk)
z4K;)O$eHXN9J1eKlr7xXvqSFdF--q(zr~rhZO-*}L*Amv#-E6MuENqXO#}&*7jFU4
zJ;^pY+4>B9b6j?|H`dw|B3YW5Y~RPyH)Tk|ywzP)Hs*5om~W82@=Y5=k`J0CV2QFL
z*6gX2F1d}FR$XyQj>f9^QuFPJ@=>c?`*K^AeWBfSc4_rztbP&;H)IxVJ~Z0j$0SH7
z;8SXrE49ll`^bIvqtW{8bw)cV_jd2*{$5?rbm`@j^JYh#m?N&xOP)#Pe8cVa|5JPf
zsVLbE=A`WbBpWzopCfWIw;<Viuh&OFQ>^7e4w%QfBxS6LL>Jw6xNPKvX{LX=146XN
zU06Em57ek{kYI)H4q_<RX|4IlLU*(-r(TwXgdgje2tbYuY?nLQ5_Z08BK>OqF1Y9&
z*BvgySJ>3ps<jOh?(`J;ca8D`Hd16LQ2Z|d#dU68t6@g;i`3=rN#+jucs@$q9eWW9
z-fRR8@#qxt#Y)!(hoRqU@z@)GTYkdrE&Dr_1o0gKVEEiTekUjHA+=^~kF~kX@ry0T
zs-@QETPC*J94#Dc9s6vv#iZ}_C&~MxZm)mDotY6+tZ+q1Au}trJuLSq2^6BI@@&j7
zMRpLmtMdSd`)^DcphX<_-03cW4H+q8a~y^ek=IpNS~0xK2!aFyzET2I9R-d<w<(%N
z&*biqL!v1*;~+_UrM4#1Ppz&GoRB9}x^8k>a;n9E-{bXPQ;B&5K|&S2YA{kRa1${w
z*5TYEHD#J+RgSwlj>zF)N?wC?Zg3nH^F_lKI3|jD+<zzRbr<@tnetvkkZ^g)GA2G5
zx8M}$Fi<nC1~REnr;|vZOmgl@tBd5OJ?`6Grunha>c?pPh-ta2sPxp(->xA@sKWOM
z82_oKLNmyUU2;`P%^9ZI5th3<PH-r=$_&_OwZXp1zQ;b#f_b<If8j3lKQ}r-0zRcW
z)aSH<X4ZZKwR!sx6U?#tB1?Ou)~3||^|jGq&--20n`QwoxV`?*k3o>)GXO0%>p<6H
zmy(_*)|hDyasZHn{q@|_Y4{Gl7A&vt<5=q0X<MXEJ}^D((MJZKb$iQ}j3CIsmdDn}
zl5|WTCFYS5Ih9+*1EMLWSHkoe+nu-EncMf1?_1)R*Q(zlf+((a-uv`%WfWii1__oI
ze}#y?Z=Rt&c}wJedrkCQwmCk`i7sS(<g+4WX3Y-0`pZD%#1Zf0Jv3Z`<i5>yo-$~W
z;g;xV05gBpQ&jeYYX}mq@V&^4Pw1$}a8a=fncJkU<YXk7$XUnQ8!8<)+<JNcK$7~q
zfB4Vm5sjquhq~g5I8Ur}uCmq<6e9e_Rp|fZwQrDsuakh>i2|KUe;+uJcNiu(kVqMs
zZ)be$Pi`HKU99f-$^MsrzC4xi9L-j;(P6j6KGqrN@_7AuR|ygfY+68&8&W-3!|msY
z*cdsPo6tmWD)EZA?|HCJoIQ8M*|x|#J5GdlRHXb{#C40~l#nehQ;A1PG-C)0J>Jdd
z2fsl=6_4Hn7Ph2><tmMgHD_#>E*XC)(YA2uHrHMEj(NX37<g%S^yq$5UY1e`HS7hp
z?e=9BOY}hUz3#$iwhj^`9Ps@O1J9}jBo*34YV)c&CK!5BR>;iW<N4@kC*1Q0ZLfGK
zQoZBjsetQfHVT=v%XO>kj#RaO)TtxzC70L#Z$ktreRtkvsRN1w$EF(_FHty~@!`)n
zC@Wi4^0|TC+kP9a+WIkLjn=50(CGP~+YHlLjSh_L_U`w%-{tj}T%KYDe6InxUpMJS
z3kr*;22ST1Iwy9%_wH)@k`-~i!6N&2?+k4#Uj~-PtYK(0v}5Uazt?r1JeI0z^}5^Z
z|IiRYl*3ti*Q78kmV?>Yn>~ij>mAEhZFAiEeoc9$q_*ZW{lEL~Htz1cX4T6uFjXqH
zue85ypKnVkn<sGXwA<@nM*Pc9iQ$}iF_k!^M6>AmtZlME=|hE_yj`9LK0WFAcqs6j
zZIPn~G?C1RAX#xg#MOPlMgwp7R?9L5x7DrkL{8@I*1I&C8f=8@oZX%W|5&#-SM1b@
zL&1vQ${aHPtwSM4-0r&BVUDZJYJ#PrjUZqR^#^<(6M&agv`?8Pk(z0zSf-?YgXm3;
z;b4bee{oyn_<`G%JnUu-0@<<O{XX|iX0=a?T{7@-3Rd_YC&rUn1emo?vRAMYNsb|m
zV-2T|hF<$kSnlsJ=WS0ygXe?pg=QTSTI^!N*C<@>dy)wg7822-z^FdSBuFyIF&xKW
z#qTPkNA@be)LBO1JC<J0J=UthLyV`$ij`}VMG(C{$m1R8(uMjHq1RvRmQ1$NWjTU?
zo~2N^?*$MZjyFhVZl4T-*p{uTblv)XL$iCt&eR?n*!@;dwE4o#WP%cERwD=)Kc#S>
z_%{qn*<%i)5jBwnA)Bqvb=wDe#e$`#xuqywYO5cpdh=}Tbj@OxB*ShiT8$tCeo1+Q
zya9rx$^j>eAj*`=ea{0c$nBY7$~R~%8Vv8Q+!r}qoz3CkhGg4lHG+V#g+hVi-2hE^
zpf1^9Yu0DWz`!Aw=I*0*6m2IRE7vtUZoJhTN#|5}7ddfwU+lz@{@8{3=^PHNRncYA
zO)N(c@E!^Wd`H+yd3Z$^Vjb(=k{Zt{rHv=|h(f(>$*Oa%jqkk;qRlxuVaD~Ad%9X<
zCyvxdYLBqg-Z~$$G*?$^h<Y3=*6y**KV7J+T!V!Xa8#LModdzJd21ptu&w{wLmUid
z4pePxlrFX00!Cc5H%Opnv0&K==goKAKn|y+ZdodLOD#?3B1iW($QSE{SXXBrq5})S
zoE>K@qC!UIadF<FPS1TGSr4a^qlca_rb2I=hO2JQsHafC*ABqov*D^uR@Kn9=F7Xu
zku!MYgG0ftNZpZ>v6Cn49F1l}mXvz$*9>|BB4oFpqWoE%_JXAzalztc<Zzm9pFx%L
z8XIwMceB)V;bQc{xjw165pw6HY&e_)<a9;J?UBTcOh#swC}!o@g{&NxZSl%=5Cq$h
zI*#`2j~)AgrFPN*TvFa310b082!ob*i_89Wmyo$|>;r?c9N}<ZyVTp?O%A71%$s&K
z50Vyr={|tmeR`{O_7~PF_{xYV8-*bT>-<$~?2r)`e0YyAeS>ut9*l)km3Fyh*A}U%
z(o(CT1PUuttY!eSRH2X}jfCkp9S|23rB2<A6v1^oGo`aH?vcA|t@fkTqD--BL9kR6
zQ_7fo&bIsumP%%3b`HgA{{1u$bXexn-5}nKI^_-WHUMiCXcX*G`-aCwFbifMSXQww
zdhnm40PI%r=ZYWiC<IYTPTglQ$6(*^^%js|si~uBV<bzB(Zf$#Drv(Ntlywu!1t?n
zH$)yXE%+J@v#l#RNH+Hk8oQ^v#eo3FLI-0<OD%`>yBp}gR*srH2hbPez#}D^iu3M$
zOPKLTliy8G32%)xQf_<aE$PA*3u4XBQ@En!UzzzaV<FaGJ2|o&ZEL<_#n-<6U`<kD
z?D!8FInrY}tcmDp3RU>N3C4FPiIFM0+t!!tC(&B>q|F92OQHR-Bc)c`LB9+$;ae08
z6hBI!GP41%hdsjlqH;0+rXoFLrDcqcfYiRfTy8A4B*qLbrcinD=Rl;?CbZlmcxKg#
zE55kWa*mnEA*t^9S~=KaO^lg8PXpy8AC-xJYa+~bH6=aG(iP5Ygjsre1wdf>7=>Q<
zeE<U9N*s*FN)`(~x>d+qYpp|c#zJ~kyWDwft5p9x>tZY8Zt8mFZ}OaWXNO5J*WC;u
zv*4(>>`z7%uhCu66ci|(`q@#ruimoQh8@ToN?u(Lz*0%ShL2a<s=wY%u4%fZ1f7Ch
z7~wL9J9fuT{JWJgJ?HlN7Z243`8@*<S~c)OX2CIW*`Fw-&P1#Fm}I{s>D13o$bI!m
zx$B-}->$6i;<qlZ|KnHQASK@e_!~wTk}RF#lFw8M*-H)0W0fpl6Rk(?IbA88`Guvi
zlx2J;<9`3Q2MH2<z4%ik&@U4Wtda8Bp4skL{pBD8(Xvy?q~I${4Uw83dMMgwt^4QK
zfu|&{&hYwwdwGiW>ZTQJlWUU#uz^a%xgXpv%)HG~Df*KQr`)<{yL9nQ>tiTmvHO1i
zxj}*`PblCE!UX9n6CH5dy5a+5%Shig)BrTc`VYj8mRTM<0=ito>!e>Mh{Y1fjWGa(
zymfoUf{&Q9gn))Yo6Ig!{qOh6oky*Y9buch&_8%OdH5UT-vRtpG66SAmu=;r?Iib{
zJB`wxih4QJv@=%wUsD3Jp$fOx5X6eL(#IT#qBCS$^QE&Sy4R%QU`@8oEQOB8jz7B?
z(tx!JfQ$vCj6ZYV@Bhg)1PQ+8yMsjROg8w2>2uF+wy*et4J254HD=QIvfLi6`$-I;
z=9DW<t<`slaARhn|KK$QY5nDwGP80Vy;_B)Vm~2o^=Yx-<JQW=p>rUl`j<}2oi$Sm
zBe&Oo_0!|(|G2V}wH-jpWH8rbEQqu3su5=2wOS8ZR+Aw&@2HWQcT6d42$y%zhhljR
zL4twe5&~_uTA(NLM_l-kqr$XxmOXSgk^iIpUG6w~RBHJB)Wc-h_s2C;tid<P*2fAE
zlg?=YG}ZgqR()|Vxn@~^2~$O&INY)~cH;RdiG^~4H}7tL*QjrhE7Pn!0B%)*qve{|
z);?NI_RL!>=U5yLakQ^GcI=s{i2>18cVX!@`Gv2UVktNdyy5$MS;jxcfvKgM3JV{2
zS)BGB%bsi=FIZB?;g{uxSEi)z3NFkj@f7*}!!a63kS$+bBTM2jOO5(Coe{H_Z55V$
z+PXL8M!`cq^UJML&#5Wp^9UHOoWB~EAX9ysbrl?Y);asCzi5Q$vi9z=6y6y<@t^Y%
z?Vak$zPG!*{t-v`N4!C<5ab`;{rB5({_t9|xoz3!UZc$UAF`rz+}HS8?9>aE^eygq
zG5@{0sO+Dw?>8zz`d=@;MG)wnxRqG6gKhqOTPXh)OBILV_UbLM#y2eG(`1I<@ZIwX
zr&#G})<~#Hxwbps+fA<g+b0tUqx*8Wy-I2f<gkUW%f^i{W4F7=KWbb@eS@T@S>r&Q
zw{EX(-rYpDtc`I8!oUt3>)jW-@D^h#99NGQXX1Zw7nY5hes@fQ^jDPJEHGEct81#X
zr&+h}5@+5%jYNm3k7BSCsgYW%I=H23?4qVqC1_*#DHGk2QCPZnv_FqYkioY|h3^G0
z9-iX(jqN@Ol5PHdJ1Osmr4U4OWjB|lM(#X#I@b8conSeg&1I}85`O9~^nY&bKaVr|
zLjm6h-#xszHBFES5O8F+*=F2&0@=$P<e0V`L`p68<Uh<E9O*cTo>P%n+uN%U>6?*!
zBT`P|J#Mf6O-%$*It9ypzazp&QqFCo3?@Mm@>U-c^413_V}3pa$FhW)B1cYfe`CAc
zdBh`k)~rpxE!3mUjNf~T{2v{!$GB6hL4v&g=*LMAexqJ(y5%(pIP#ip`5R6nca2T3
zXXZ1BGXTogf)WvRu{6-Zv0xjzj>lr{hn6DJIb|*~X~Ar~J}k?h@ZA5*OOqnVm2Z)^
z!1#dP22M$Nf*29p`Ip!;Yr5dd3&T0Bg<R8m$etU4-6I0Fm>^Ia6WSmM?Q-+m?~{7!
zZ>C_&B{|eS9kS$@lDO&Z^svMXlP5@^<nsUz-qB4z>JSjJ=bsX0u4@wWmdePOodcUY
zA0+7WA<uF%qJ8aBZ&N?I&a&KoJYVi<Ozc!no!cqYioW3XmQGj~XTmAgkjKID;{8Nq
z`J6~vBP`@Dt`TOgZxg4l6yV993&Flbt1M0ZnA>=u_q^QS)GIeuWy@{H*MTLg)h*Wq
z&Gns_`GBXWOjX%9)dUF#d|zeY8C@*2fDrQJLzuat+BWx=2t4_VLBd=!xkW%b_qWzc
zE&ExzcwiBS+VpvQnaN3wwh-{B%j^HXn(nFz!aE<&3in420GLu2_^$^s;-a%IXTgB|
zJr8%om6sA1%jD3d>e%5I3i{;pEg5}SuV!FaxXo!-hT}%M^C?vcN>meM@MAqt{0)G<
zXJPQhbS;>TBklPJx%)9Nqvdj93;TOMw@sLJgQ*uUq?Ut~vBNJ69^-DCi#Ng^<Yaae
za@%<WF`QE`mi$e(w@megz_<v~v*pXv9kP7~GfaKFLeHRgPeXP0bU0%+yho9{s1`kf
zjH}DE!n|AGv9JE*Opwi7_bE7bE>`nmt90S*KN`X#;>4-OB^dmeC&sCaUbN(1!a_$F
z3-rXytg?tu6A_|!W#9Y5OKNS5iy)WZB2!~Ut0SLx_Dsh#S)i-g7exvC3+gc9<Br@j
z8f`Z|(kNuixJ@naiEJl_+V;fuKR2I)BfmS&u0}TlIYash2suNjo_PUFZBfiiq+Q0#
zR=09B+|IZOqI3?H7yp`wK54we`diSKgT3uDAjtNSM6gGA&w|r5CJF58|8$!$`zAxD
zTypci%IJ}wjal60+)C8S0!Ef?W^T^zrrP`_Sh6q<Gr#C5Dtjp25u=G9k&2R=C1xc}
zsb%J{10K}2&qCXP3u9ifb%wEH-r4aJ>xpx3skW_tXnN9@dFAMt*oj|Xk}gz_n~|hp
z8QzZB$Ie<KN;ovF6_KniSSho~fJk(wV~i8K<B>)aK?bK<<t5(%@weh-q}kfDfc}>G
zs19cEZ2-B(v(Md+$~g@a|H6`cT9f0(zdDPI8Oga^)!$YXIq;*!9O{@e5xz|Ys0?`~
z_CfhEn0+3r#TZgQcQMm<-9@F!HS)M0%>=pl@?UzUIXpWUBc~#9TVYU#P$nH|nahwx
zbxWTaeb_eZy!s<Iwl$xv6zAQN&?$>_p}I15{O785G%vumV5T}B1R1q6E^;uVH+46N
z3E1Be3EnmL!T(SSM8*ARCdlP)k&;gn@h{@mYJv{!Gq9s4e~{c6YRz#6Q8}l6;$Pq4
z^29ke?X|7`Ob$f*a<zI?wUeSJV>Q3%mYVj*l>zbMB5V)4p}K?`1F_sr+BLnIRg+Ma
z{Yh%XOrP--m1?fPIVpk+PPJ0(Qk62LYAV3KuuJ_Q8H%Md#5?Dmqqx%mku$f&w(&1d
z2^q6>xz#84H}8t>`_Xa?bkB@;oLyLqo#TCHjU~?+!j3r&e4`*!X1qELYd^tdC^dFX
znjiz^C2N_mgTZ-f6dKuPz=fKog@~!0QeAJWJ%Zf}PUF2=eXy<mWTiO&4&~$5qftgs
zYTQ*Ft9eoLulf0<yeH}ydnIl>y9Ak!&N&a8Ge}C!c~d_G>LkWp&Z5#uB|)4tK`u|V
zioZrgPna380T-$-E~Xp?uh43z7{%U#Q;2IybG<HM+KQw0_dFbdJww%DxuO0X={*oT
z@-w^KQ8%fK>-EdAPqIOC!U<wroOJ=Mo?hIb6~|=sW9F}WiprjxtS(&$q8JgbD0!8c
zO__vDA;*P9SPA;W4!9QJ1PMnL)v5cSpGdxa!=G;xX0B7UXCk*A-4;FcV^wV@(tB<d
z9hZqGReFwr(40opnw2C(^qQ-%^urTjq2}-U5oAlr5|;QiV9g!K$p8Qej!8s8RFq99
zHI^i(%^*1z>$awUeo2jf$1;RD8~55*J(LNXbMz^T6gd&C`Bk6Xv~N;xt>Ms~U5$$j
z=yLLSb|Vg&kR-Jv(uZ94mY&gLNa;op#hAW8@qHqwLJ!0AkP*tH15FE9w>vD#v5dtv
z(6x{y+1%Z>8y`6&<SxE;WvTP@uE@b3uj5$g>ah?#FgdfDA^_`lE75Euk-&wS-m*9J
zz)F#!D?u(#wTl0WnUs>!hCVSnx*C=tS8pQ<YPm<0wcRNn&la)Z168)=4=ezfq`H?|
zV-4Hm`bJUXrzE1Qeue&+EILV@Ld^I@8Y2E{S7F(Y)L@~ujqU`wOcLLd%y?X_5s7Gb
zb~V}=`tJhIKSO671H3p9Hh0Xzn*xY)TR0(Q2qG?=X<Q85Z#t5U`o*;<NCYNoWfI{j
zSE2uFYTK)Amk@#|%7X#lK>{|YHAK&L=a<omsGSqC6q$%A1%b{sEJat;ad|puAHX{c
zPGcqrx*nkqX5nD-{KTw2xr0<Wr{0*&L<SCdy#9o&swIpd{pG$n0^y>b17D4-X60N}
zmTn*ABUF02Q91i!e7ou6+1;Cioo#amcl58_8)5X$ZbY@G4@&YrU7nVCyt6+${*6wx
z%CovqIm3X{z%pZQMv=cst)20-OBg{0-y#*hJBXp2`c2Bym5<#WGqi8ysWDQFVPC;X
z?fVGBbVQp9us7rx-(F8IzcIU!lqKFtCt#>wjw6yypJnQ?u$taNRXH7;oI{#Q*)+nP
zo<jdFHL=suCZPmT3<_10d<UHPQ@=3>8XGR(mQQGM0%av@Q5`^%_SLKb7awd|NV&48
zZVDyDaCH889<YT;^9CP_2%TL)1n{^gmbDC`>-sb<JPp_)iH*acPNMI+3$>lnRqJQM
z338bvzJw>9(|X28El|VT&ANd789mxgF}KaeuHHOoI+Hc69k1uM;eIVP_vYYW+uX!_
ze_U^mGmM?{&W?SrMvMI;`lw9&Hd$RsAxNT0(wUE)oih>~kYPw?^kCbp3+j%H4|S78
zG+tOlZ9^a8S_9_{;mx@Xw47v)>mGT_JZ$UFj?ZSTHY)w{+ORXPJwY)^5;+E6Qj-B8
z-oA-=lO$_uHQd*DkDPQ(<Lb^?w1@#+vaJ(vKK~-lWp$5#yK%V9=T_i|)<c@{#`#M7
z#7wo4NRFfvWbjQAD0vmo@61**r&hxU%KWo9=?G)|J01+VX%TjZJldvI6AjGF9t37K
z;yw_B@!CdQIN7*(0$V3irs41UPqpYZw^yGtR%+cz>KkOps9?bND+1!aK!3eceK~li
zbuO-^wNdM|9__L_QJLR7_Hu79i;lO>WtIi3)kEJ{GDHcxXPrl;D>U}%RQqgH_T=fe
zG#!sW(=XzkobJiTh=E^wy#7zcqg#)*h7jcPo5ZIi4j!|zj~eG1meV^i8yi9pF^0Vb
zCr3Z}-Z2|Hy7C4SBj|SKX*@g#6wc}3s%b5w@0rvu$6m=cxnufj;xSqqotDL4aC`lq
z*J{IL`WZ$L#prOr_bdZ{qs0Lu-yTEudit?#cEcY&d}DTQZdyQRqt3+c#f*iQV*uM{
zH}DEujIP!UX_=2L{aG-y+;e^lS7mpQro9mY{>|m}e@V+2(W8%{1Q{erMajQ1^JDQk
zW8~XoxUEAQV?DWeyJI%ZlqoUiv{d86IGx{&_Uta)+C7b{F3r+5FjebQ(NIYxR8SZH
zu_GdS+ErNkw<=U5tcl?S8JupF`@RdpH`RJ+hPQ`WThr|>BM|qpFXMaeBER8jrA$GP
zL6TJX9sv)QSD5g=g<0Mn>A|la0g~zX;@XLCG7_PWC4AL=zuy!En@mHHL6W@g`v3_j
zV_Z%YJ=zm;<4Dt@#GWToANF+1co3Lzk@sbFk9S;#s$^02W!zg<9go~Zwlx(&6i1ah
zBm=?7PnhwE(Hw7`i;BJ+6ebdswCuzn;0$8dy!z4igb4Ui7i^Es_Wo;sVzg_MYC3`p
zxe=}?d4icoT!1;Z5{G4B>^F=y7}C9xf&g>#k`sSeVH?uP;9`%r%#_v3OiK_2ykNlh
z5CJa?eV0V+IM%o<u^Vqm87Na&$(#lpara-IA`gCVK=_!uaPwBPLSkxy41Slq`d9(m
zq~8*7L+c!VtuL2MnOexK0XCamu0Gy5_q=jxi>hSihZ1$sNiV-mPmm!;LxGb2IJ-)I
zkZI&AS}!otauSaK0hbmZ=U=&t$~0{dC*HzqHKYtd6tj=j7k`S0HdBHxMI}23Q$`<i
zvp}?I^+Ny8Q^n_$B8UR&q2|BM5F^p=5vU|pKu+5^h`^7<pu@LnmAdM(X2C4w2r>j*
zO+!f`6Mvi8m~&5N383liAUYsJ`ri5l&%9)MTSqZ4WeKAA^4445w#{7D{mo?Dc~8aQ
z8g4V=U)C(l{T9);V}{$J(SVdD$kn$=qwl>kV-tAtcT6<mnC><l0m82Z!sgZU{ku~g
z7)uajC<sRz9{poL*hENNUaV9Pcp~j*pc;@juUq)c|4*czWXiS_L58MXvzB#jV&#nj
z%t|JhQ&?9E5jMA+%H4eT-KjgB8ZCa7Bgl}Gb@e4nVgf5f`HN)T?3;oFi4fsGZ8B|M
zQJ_z`0kdIfS%M4!edL^PwII-+0{k$bUu_Sw1v1I@oCoNqvdsT){UU!&l65Clo#hEK
zgl2vH*Yo;>(8J91Fu|Dn*-4FT0+cbZmxzCwDZ77KQ1C=&0#ukz<dh-EaO96S6n{n`
z3JAKC=`vkZ^)`s{szQu43(Hcn<o9IYn34n;0_<4RV`~tRKSBZ?WKLef<;esrS$&D9
zie<bEhw%HgbDln)EWKvaGo=YKJQzpLJ$kz!(t}`n5SX$@>W_i=Wm)2v*Drde%4~zx
z2z$~583py4hGMS_;e7xrbp!7-A}~qQ$-EVUu!~u)TDPz)kTkt1q9{#}2?BNGOz|wy
zCfp6e2bo!^(=mR!QPT&Wjx)G|z;D@XwyKqLpKdq3$p#vjCP<v%A3yV00okP6Wza?f
zZ)CzoFtXwllbq&+USjNH&^`gYFBTDYu3xtKd~%dqLra<<I>fQ2anlOO^2TALSpvpF
z9Ym`aL1-YxnISSj5caK}zqwAmfON~z5J(dwLF0n?+qM%IdX~t{ONg<AfhF(WuV2F8
z83ec(P%1r*_Mc)=`1=0{2s02SP#Xhh2sp!pGXl|>Rr9jXr1FW`1cg8svHt^AY&~X~
S5UZ5{0000<MNUMnLSTZhVaSC5

literal 0
HcmV?d00001

diff --git a/main/manager-web/src/assets/user-avatar3.png b/main/manager-web/src/assets/user-avatar3.png
new file mode 100644
index 0000000000000000000000000000000000000000..159e68861aa0a1843a979e0392ba47fa03e47f57
GIT binary patch
literal 11231
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
JPDHLkV1nyx&M^Q0

literal 0
HcmV?d00001

diff --git a/main/manager-web/src/assets/user-avatar4.png b/main/manager-web/src/assets/user-avatar4.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d07814411637a00f1cb03bac39db98e7a0abcae
GIT binary patch
literal 10297
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
LNkvXXu0mjfH1GIh

literal 0
HcmV?d00001

diff --git a/main/manager-web/src/assets/user-avatar.png b/main/manager-web/src/assets/user-avatar5.png
similarity index 100%
rename from main/manager-web/src/assets/user-avatar.png
rename to main/manager-web/src/assets/user-avatar5.png
diff --git a/main/manager-web/src/components/ChatHistoryDialog.vue b/main/manager-web/src/components/ChatHistoryDialog.vue
index 646164b9..4c5421cd 100644
--- a/main/manager-web/src/components/ChatHistoryDialog.vue
+++ b/main/manager-web/src/components/ChatHistoryDialog.vue
@@ -5,7 +5,7 @@
             <div class="session-list" @scroll="handleScroll">
                 <div v-for="session in sessions" :key="session.sessionId" class="session-item"
                     :class="{ active: currentSessionId === session.sessionId }" @click="selectSession(session)">
-                    <img src="@/assets/xiaozhi-logo.png" class="avatar" />
+                    <img :src="getUserAvatar(session.sessionId)" class="avatar" />
                     <div class="session-info">
                         <div class="session-time">{{ formatTime(session.createdAt) }}</div>
                         <div class="message-count">{{ session.chatCount > 99 ? '99' : session.chatCount }}</div>
@@ -21,9 +21,13 @@
                             {{ message.content }}
                         </div>
                         <div v-else class="message-item" :class="{ 'user-message': message.chatType === 1 }">
-                            <img :src="message.chatType === 1 ? require('@/assets/user-avatar.png') : require('@/assets/xiaozhi-logo.png')"
+                            <img :src="message.chatType === 1 ? getUserAvatar(currentSessionId) : require('@/assets/xiaozhi-logo.png')"
                                 class="avatar" />
-                            <div class="message-content">{{ message.content }}</div>
+                            <div class="message-content">
+                                {{ message.content }}
+                                <i v-if="message.audioId" :class="getAudioIconClass(message)"
+                                    @click="playAudio(message)" class="audio-icon"></i>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -66,7 +70,9 @@ export default {
             loading: false,
             hasMore: true,
             scrollTimer: null,
-            isFirstLoad: true
+            isFirstLoad: true,
+            playingAudioId: null,
+            audioElement: null
         };
     },
     watch: {
@@ -207,6 +213,54 @@ export default {
                 const day = date.getDate().toString().padStart(2, '0');
                 return `${year}-${month}-${day} ${hours}:${minutes}`;
             }
+        },
+        getAudioIconClass(message) {
+            if (this.playingAudioId === message.audioId) {
+                return 'el-icon-loading';
+            }
+            return 'el-icon-video-play';
+        },
+        playAudio(message) {
+            if (this.playingAudioId === message.audioId) {
+                // 如果正在播放当前音频，则停止播放
+                if (this.audioElement) {
+                    this.audioElement.pause();
+                    this.audioElement = null;
+                }
+                this.playingAudioId = null;
+                return;
+            }
+
+            // 停止当前正在播放的音频
+            if (this.audioElement) {
+                this.audioElement.pause();
+                this.audioElement = null;
+            }
+
+            // 播放新音频
+            this.playingAudioId = message.audioId;
+            this.audioElement = new Audio(Api.getServiceUrl() + `/agent/audio/${message.audioId}`);
+
+            this.audioElement.onended = () => {
+                this.playingAudioId = null;
+                this.audioElement = null;
+            };
+
+            this.audioElement.play();
+        },
+        getUserAvatar(sessionId) {
+            // 从 sessionId 中提取所有数字
+            const numbers = sessionId.match(/\d+/g);
+            if (!numbers) return require('@/assets/user-avatar1.png');
+
+            // 将所有数字相加
+            const sum = numbers.reduce((acc, num) => acc + parseInt(num), 0);
+
+            // 计算模5并加1，得到1-5之间的数字
+            const avatarIndex = (sum % 5) + 1;
+
+            // 返回对应的头像图片
+            return require(`@/assets/user-avatar${avatarIndex}.png`);
         }
     }
 };
@@ -269,7 +323,7 @@ export default {
 .message-count {
     font-size: 14px;
     color: #fff;
-    background-color: #1890ff;
+    background-color: #b4b4b4;
     border-radius: 20px;
     float: left;
     width: 20px;
@@ -302,11 +356,26 @@ export default {
     margin: 0 10px;
     text-align: left;
     line-height: 20px;
+    position: relative;
+    display: flex;
+    align-items: center;
+}
+
+.audio-icon {
+    font-size: 20px;
+    cursor: pointer;
+    margin: 0 5px;
+    color: #1890ff;
 }
 
 .user-message .message-content {
     background-color: #1890ff;
     color: white;
+    flex-direction: row-reverse;
+}
+
+.user-message .audio-icon {
+    color: white;
 }
 
 .loading,
@@ -355,6 +424,13 @@ export default {
     transform: translate(-50%, -50%);
     height: 80vh;
     max-width: 85vw;
+    border-radius: 12px;
+    overflow: hidden;
+}
+
+.chat-history-dialog .el-dialog__header {
+    background-color: #e6f7ff;
+    padding: 15px 20px;
 }
 
 .chat-history-dialog .el-dialog__body {

From 81359bf419bca6f7fb28ca2b404358e246be9876 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Sun, 4 May 2025 20:03:13 +0800
Subject: [PATCH 37/53] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=99=BA=E6=8E=A7?=
 =?UTF-8?q?=E5=8F=B0=E9=9F=B3=E9=A2=91=E6=92=AD=E6=94=BE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/xiaozhi/common/redis/RedisKeys.java  |  7 +++++
 .../agent/controller/AgentController.java     | 31 +++++++++++++++++--
 .../modules/security/config/ShiroConfig.java  |  1 +
 main/manager-web/src/apis/module/agent.js     | 30 +++++++++---------
 .../src/components/ChatHistoryDialog.vue      | 27 +++++++++-------
 5 files changed, 67 insertions(+), 29 deletions(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/common/redis/RedisKeys.java b/main/manager-api/src/main/java/xiaozhi/common/redis/RedisKeys.java
index 7cadad2b..62d21ab5 100644
--- a/main/manager-api/src/main/java/xiaozhi/common/redis/RedisKeys.java
+++ b/main/manager-api/src/main/java/xiaozhi/common/redis/RedisKeys.java
@@ -103,4 +103,11 @@ public class RedisKeys {
     public static String getDictDataByTypeKey(String dictType) {
         return "sys:dict:data:" + dictType;
     }
+
+    /**
+     * 获取智能体音频ID的缓存key
+     */
+    public static String getAgentAudioIdKey(String uuid) {
+        return "agent:audio:id:" + uuid;
+    }
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
index cfbb107f..cbb204bb 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
@@ -3,7 +3,9 @@ package xiaozhi.modules.agent.controller;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
@@ -28,6 +30,8 @@ import jakarta.validation.Valid;
 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.user.UserDetail;
 import xiaozhi.common.utils.ConvertUtils;
 import xiaozhi.common.utils.Result;
@@ -55,6 +59,7 @@ public class AgentController {
     private final DeviceService deviceService;
     private final AgentChatHistoryService agentChatHistoryService;
     private final AgentChatAudioService agentChatAudioService;
+    private final RedisUtils redisUtils;
 
     @GetMapping("/list")
     @Operation(summary = "获取用户智能体列表")
@@ -235,17 +240,37 @@ public class AgentController {
         return new Result<List<AgentChatHistoryDTO>>().ok(result);
     }
 
-    @GetMapping("/audio/{audioId}")
-    @Operation(summary = "下载音频")
+    @PostMapping("/audio/{audioId}")
+    @Operation(summary = "获取音频下载ID")
     @RequiresPermissions("sys:role:normal")
-    public ResponseEntity<byte[]> downloadAudio(@PathVariable("audioId") String audioId) {
+    public Result<String> getAudioId(@PathVariable("audioId") String audioId) {
+        byte[] audioData = agentChatAudioService.getAudio(audioId);
+        if (audioData == null) {
+            return new Result<String>().error("音频不存在");
+        }
+        String uuid = UUID.randomUUID().toString();
+        redisUtils.set(RedisKeys.getAgentAudioIdKey(uuid), audioId);
+        return new Result<String>().ok(uuid);
+    }
+
+    @GetMapping("/play/{uuid}")
+    @Operation(summary = "播放音频")
+    public ResponseEntity<byte[]> playAudio(@PathVariable("uuid") String uuid) {
+
+        String audioId = (String) redisUtils.get(RedisKeys.getAgentAudioIdKey(uuid));
+        if (StringUtils.isBlank(audioId)) {
+            return ResponseEntity.notFound().build();
+        }
+
         byte[] audioData = agentChatAudioService.getAudio(audioId);
         if (audioData == null) {
             return ResponseEntity.notFound().build();
         }
+        redisUtils.delete(RedisKeys.getAgentAudioIdKey(uuid));
         return ResponseEntity.ok()
                 .contentType(MediaType.APPLICATION_OCTET_STREAM)
                 .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"play.wav\"")
                 .body(audioData);
     }
+
 }
\ No newline at end of file
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java b/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
index abccec0f..5252336f 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/security/config/ShiroConfig.java
@@ -86,6 +86,7 @@ public class ShiroConfig {
         // 将config路径使用server服务过滤器
         filterMap.put("/config/**", "server");
         filterMap.put("/agent/chat-history/report", "server");
+        filterMap.put("/agent/play/**", "anon");
         filterMap.put("/**", "oauth2");
         shiroFilter.setFilterChainDefinitionMap(filterMap);
 
diff --git a/main/manager-web/src/apis/module/agent.js b/main/manager-web/src/apis/module/agent.js
index fd8f6cf3..8aa89072 100644
--- a/main/manager-web/src/apis/module/agent.js
+++ b/main/manager-web/src/apis/module/agent.js
@@ -128,19 +128,19 @@ export default {
                 });
             }).send();
     },
-}
-
-export function getAgentSessions(agentId, params) {
-    return request({
-        url: `/agent/${agentId}/sessions`,
-        method: 'get',
-        params
-    });
-}
-
-export function getAgentChatHistory(agentId, sessionId) {
-    return request({
-        url: `/agent/${agentId}/chat-history/${sessionId}`,
-        method: 'get'
-    });
+    // 获取音频下载ID
+    getAudioId(audioId, callback) {
+        RequestService.sendRequest()
+            .url(`${getServiceUrl()}/agent/audio/${audioId}`)
+            .method('POST')
+            .success((res) => {
+                RequestService.clearRequestTime();
+                callback(res);
+            })
+            .fail(() => {
+                RequestService.reAjaxFun(() => {
+                    this.getAudioId(audioId, callback);
+                });
+            }).send();
+    },
 }
diff --git a/main/manager-web/src/components/ChatHistoryDialog.vue b/main/manager-web/src/components/ChatHistoryDialog.vue
index 4c5421cd..33350208 100644
--- a/main/manager-web/src/components/ChatHistoryDialog.vue
+++ b/main/manager-web/src/components/ChatHistoryDialog.vue
@@ -66,7 +66,7 @@ export default {
             currentSessionId: '',
             currentMacAddress: '',
             page: 1,
-            limit: 10,
+            limit: 20,
             loading: false,
             hasMore: true,
             scrollTimer: null,
@@ -237,16 +237,21 @@ export default {
                 this.audioElement = null;
             }
 
-            // 播放新音频
+            // 先获取音频下载ID
             this.playingAudioId = message.audioId;
-            this.audioElement = new Audio(Api.getServiceUrl() + `/agent/audio/${message.audioId}`);
+            Api.agent.getAudioId(message.audioId, (res) => {
+                if (res.data && res.data.data) {
+                    // 使用获取到的下载ID播放音频
+                    this.audioElement = new Audio(Api.getServiceUrl() + `/agent/play/${res.data.data}`);
 
-            this.audioElement.onended = () => {
-                this.playingAudioId = null;
-                this.audioElement = null;
-            };
+                    this.audioElement.onended = () => {
+                        this.playingAudioId = null;
+                        this.audioElement = null;
+                    };
 
-            this.audioElement.play();
+                    this.audioElement.play();
+                }
+            });
         },
         getUserAvatar(sessionId) {
             // 从 sessionId 中提取所有数字
@@ -269,7 +274,7 @@ export default {
 <style scoped>
 .chat-container {
     display: flex;
-    height: 600px;
+    height: 100%;
 }
 
 .session-list {
@@ -422,7 +427,7 @@ export default {
     top: 50%;
     left: 50%;
     transform: translate(-50%, -50%);
-    height: 80vh;
+    height: 90vh;
     max-width: 85vw;
     border-radius: 12px;
     overflow: hidden;
@@ -436,7 +441,7 @@ export default {
 .chat-history-dialog .el-dialog__body {
     padding: 0;
     overflow: hidden;
-    height: calc(80vh - 54px);
+    height: calc(90vh - 54px);
     /* 减去标题栏的高度 */
 }
 </style>
\ No newline at end of file

From f9632af016398a202a620d7c939c4dd94095e015 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Sun, 4 May 2025 20:13:32 +0800
Subject: [PATCH 38/53] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=99=BA=E8=83=BD?=
 =?UTF-8?q?=E4=BD=93=E8=BF=94=E5=9B=9E=E6=99=BA=E8=83=BD=E4=BD=93id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xiaozhi/modules/agent/controller/AgentController.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
index cbb204bb..b6c0ac62 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
@@ -94,7 +94,7 @@ public class AgentController {
     @PostMapping
     @Operation(summary = "创建智能体")
     @RequiresPermissions("sys:role:normal")
-    public Result<Void> save(@RequestBody @Valid AgentCreateDTO dto) {
+    public Result<String> save(@RequestBody @Valid AgentCreateDTO dto) {
         AgentEntity entity = ConvertUtils.sourceToTarget(dto, AgentEntity.class);
 
         // 获取默认模板
@@ -122,7 +122,7 @@ public class AgentController {
         // ID、智能体编码和排序会在Service层自动生成
         agentService.insert(entity);
 
-        return new Result<>();
+        return new Result<String>().ok(entity.getId());
     }
 
     @PutMapping("/{id}")

From 9fc1285c0935148dd268c578b0808f90d4896f87 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Sun, 4 May 2025 20:34:49 +0800
Subject: [PATCH 39/53] Merge pull request #1101 from xinnan-tech/hot-fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

update:删除智能体时删除聊天记录
---
 .../agent/controller/AgentController.java       |  2 ++
 .../agent/dao/AiAgentChatHistoryDao.java        | 17 ++++++++++++++++-
 .../agent/service/AgentChatHistoryService.java  |  7 +++++++
 .../impl/AgentChatHistoryServiceImpl.java       |  8 ++++++++
 .../mapper/agent/AiAgentChatHistoryDao.xml      | 14 ++++++++++++++
 5 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
index b6c0ac62..9368cf6b 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/controller/AgentController.java
@@ -192,6 +192,8 @@ public class AgentController {
     public Result<Void> delete(@PathVariable String id) {
         // 先删除关联的设备
         deviceService.deleteByAgentId(id);
+        // 删除关联的聊天记录
+        agentChatHistoryService.deleteByAgentId(id);
         // 再删除智能体
         agentService.deleteById(id);
         return new Result<>();
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AiAgentChatHistoryDao.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AiAgentChatHistoryDao.java
index 9c07be1d..43a5f1ce 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AiAgentChatHistoryDao.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/dao/AiAgentChatHistoryDao.java
@@ -1,7 +1,9 @@
 package xiaozhi.modules.agent.dao;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
 import xiaozhi.modules.agent.entity.AgentChatHistoryEntity;
 
 /**
@@ -13,4 +15,17 @@ import xiaozhi.modules.agent.entity.AgentChatHistoryEntity;
  */
 @Mapper
 public interface AiAgentChatHistoryDao extends BaseMapper<AgentChatHistoryEntity> {
+    /**
+     * 根据智能体ID删除音频
+     *
+     * @param agentId 智能体ID
+     */
+    void deleteAudioByAgentId(String agentId);
+
+    /**
+     * 根据智能体ID删除聊天历史记录
+     *
+     * @param agentId 智能体ID
+     */
+    void deleteHistoryByAgentId(String agentId);
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatHistoryService.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatHistoryService.java
index e729c6dd..889f64cd 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatHistoryService.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/AgentChatHistoryService.java
@@ -35,4 +35,11 @@ public interface AgentChatHistoryService extends IService<AgentChatHistoryEntity
      * @return 聊天记录列表
      */
     List<AgentChatHistoryDTO> getChatHistoryBySessionId(String agentId, String sessionId);
+
+    /**
+     * 根据智能体ID删除聊天记录
+     *
+     * @param agentId 智能体ID
+     */
+    void deleteByAgentId(String agentId);
 }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java
index 18669a6c..cc7236ae 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentChatHistoryServiceImpl.java
@@ -6,6 +6,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -74,4 +75,11 @@ public class AgentChatHistoryServiceImpl extends ServiceImpl<AiAgentChatHistoryD
         // 转换为DTO
         return ConvertUtils.sourceToTarget(historyList, AgentChatHistoryDTO.class);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteByAgentId(String agentId) {
+        baseMapper.deleteAudioByAgentId(agentId);
+        baseMapper.deleteHistoryByAgentId(agentId);
+    }
 }
diff --git a/main/manager-api/src/main/resources/mapper/agent/AiAgentChatHistoryDao.xml b/main/manager-api/src/main/resources/mapper/agent/AiAgentChatHistoryDao.xml
index 2d87d8cf..24a669c1 100644
--- a/main/manager-api/src/main/resources/mapper/agent/AiAgentChatHistoryDao.xml
+++ b/main/manager-api/src/main/resources/mapper/agent/AiAgentChatHistoryDao.xml
@@ -21,4 +21,18 @@
     id, mac_address, agent_id, session_id, sort, chat_type, content, audio, audio_url, 
     created_at, updated_at
   </sql>
+
+  <delete id="deleteAudioByAgentId">
+    DELETE FROM ai_agent_chat_audio 
+    WHERE id IN (
+      SELECT audio_id 
+      FROM ai_agent_chat_history 
+      WHERE agent_id = #{agentId}
+    );
+  </delete>
+
+  <delete id="deleteHistoryByAgentId">
+    DELETE FROM ai_agent_chat_history 
+    WHERE agent_id = #{agentId};
+  </delete>
 </mapper>

From ee3f0555d1a0642c30f13c456af94d681776d124 Mon Sep 17 00:00:00 2001
From: caixypromise <caixypromised@gmail.com>
Date: Sun, 4 May 2025 22:58:43 +0800
Subject: [PATCH 40/53] =?UTF-8?q?fix(app):=20=E9=87=8D=E5=86=99app.py?=
 =?UTF-8?q?=E5=86=85=E7=9A=84wait=5Ffor=5Fexit()=EF=BC=8C=E4=BB=A5?=
 =?UTF-8?q?=E6=AD=A4=E8=A7=A3=E5=86=B3Windows=E7=8E=AF=E5=A2=83=E4=B8=8B?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E9=80=80=E5=87=BA=E6=97=B6=EF=BC=8C=E8=BF=9B?=
 =?UTF-8?q?=E7=A8=8B=E9=98=BB=E5=A1=9E=E5=8D=A1=E6=AD=BB=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82=20=E5=BD=B1=E5=93=8D=20----=20-=20Ctrl?=
 =?UTF-8?q?=E2=80=91C/kill=E9=80=80=E5=87=BA=E6=97=B6=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E5=8D=A1=E4=BD=8F=EF=BC=8C=E8=B5=84=E6=BA=90=E5=AE=8C=E5=85=A8?=
 =?UTF-8?q?=E9=87=8A=E6=94=BE=EF=BC=8C=20-=20Windows=20=E4=B8=8E=20Unix=20?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E4=B8=80=E8=87=B4=EF=BC=8C=E6=94=B9=E5=8A=A8?=
 =?UTF-8?q?=E4=B8=8D=E5=BD=B1=E5=93=8D=E6=AD=A3=E5=B8=B8=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/app.py | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/main/xiaozhi-server/app.py b/main/xiaozhi-server/app.py
index 7ed71ae5..4ad57855 100644
--- a/main/xiaozhi-server/app.py
+++ b/main/xiaozhi-server/app.py
@@ -12,22 +12,26 @@ TAG = __name__
 logger = setup_logging()
 
 
-async def wait_for_exit():
-    """Windows 和 Linux 兼容的退出监听"""
+async def wait_for_exit() -> None:
+    """
+    阻塞直到收到 Ctrl‑C / SIGTERM。
+    - Unix: 使用 add_signal_handler
+    - Windows: 依赖 KeyboardInterrupt
+    """
     loop = asyncio.get_running_loop()
     stop_event = asyncio.Event()
 
-    if sys.platform == "win32":
-        # Windows: 用 sys.stdin.read() 监听 Ctrl + C
-        await loop.run_in_executor(None, sys.stdin.read)
-    else:
-        # 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 进程
+    if sys.platform != "win32":  # Unix / macOS
+        for sig in (signal.SIGINT, signal.SIGTERM):
+            loop.add_signal_handler(sig, stop_event.set)
         await stop_event.wait()
+    else:
+        # Windows：await一个永远pending的fut，
+        # 让 KeyboardInterrupt 冒泡到 asyncio.run，以此消除遗留普通线程导致进程退出阻塞的问题
+        try:
+            await asyncio.Future()
+        except KeyboardInterrupt:  # Ctrl‑C
+            pass
 
 
 async def main():

From 0a765f4aaca98486f06bdc83122f8a5996b94ddd Mon Sep 17 00:00:00 2001
From: caixypromise <caixypromised@gmail.com>
Date: Sun, 4 May 2025 23:01:30 +0800
Subject: [PATCH 41/53] =?UTF-8?q?fix(MCP):=20=E9=87=8D=E6=9E=84MCPClient?=
 =?UTF-8?q?=E4=B8=BA=E5=90=8E=E5=8F=B0=E5=8D=8F=E7=A8=8B=20+=20AsyncExitSt?=
 =?UTF-8?q?ack=E7=AE=A1=E7=90=86=EF=BC=8C=E8=A7=A3=E5=86=B3=E8=BF=9B?=
 =?UTF-8?q?=E7=A8=8B=E9=80=80=E5=87=BA=E6=97=B6=E7=9A=84=E2=80=9CAttempted?=
 =?UTF-8?q?=20to=20exit=20cancel=20scope=20in=20a=20different=20task?=
 =?UTF-8?q?=E2=80=9D=E9=94=99=E8=AF=AF=20#=20=E5=8F=98=E6=9B=B4=20----=20-?=
 =?UTF-8?q?=20=E5=B0=86=E6=89=80=E6=9C=89stdio=5Fclient=E4=B8=8EClientSess?=
 =?UTF-8?q?ion=E7=9A=84=E5=88=9B=E5=BB=BA/=E9=94=80=E6=AF=81=E9=83=BD?=
 =?UTF-8?q?=E6=94=BE=E5=88=B0=E5=90=8C=E4=B8=80=E4=B8=AA=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=20task=20=E4=B8=AD=20-=20=E4=BD=BF=E7=94=A8AsyncExitStack?=
 =?UTF-8?q?=E6=89=98=E7=AE=A1=E5=BC=82=E6=AD=A5=E8=B5=84=E6=BA=90=EF=BC=8C?=
 =?UTF-8?q?cleanup=E6=97=B6=E5=9C=A8=E5=90=8C=E4=B8=80task=E5=86=85?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8Cexit=5Fstack.aclose()=20-=20=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E5=8F=AA=E9=80=9A=E8=BF=87=E4=BA=8B=E4=BB=B6=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=90=8E=E5=8F=B0task=E9=80=80=E5=87=BA=EF=BC=8C?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E8=B7=A8=E5=8D=8F=E7=A8=8B=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?cancel-scope=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/core/mcp/MCPClient.py | 197 ++++++++++++++--------
 main/xiaozhi-server/core/mcp/manager.py   |  17 +-
 2 files changed, 137 insertions(+), 77 deletions(-)

diff --git a/main/xiaozhi-server/core/mcp/MCPClient.py b/main/xiaozhi-server/core/mcp/MCPClient.py
index 103ac645..e2517f92 100644
--- a/main/xiaozhi-server/core/mcp/MCPClient.py
+++ b/main/xiaozhi-server/core/mcp/MCPClient.py
@@ -1,86 +1,145 @@
+from __future__ import annotations
+
+import asyncio, os, shutil, concurrent.futures
 from datetime import timedelta
-from typing import Optional
 from contextlib import AsyncExitStack
-import os, shutil
+from typing import Optional, List
+
 from mcp import ClientSession, StdioServerParameters
 from mcp.client.stdio import stdio_client
-
 from config.logger import setup_logging
 
 TAG = __name__
 
+
 class MCPClient:
-    def __init__(self, config):
-        # Initialize session and client objects
-        self.session: Optional[ClientSession] = None
-        self.exit_stack = AsyncExitStack()
+    def __init__(self, config: dict):
         self.logger = setup_logging()
         self.config = config
-        self.tolls = []
+
+        # Back‑worker task & 状态同步
+        self._worker_task: Optional[asyncio.Task] = None
+        self._ready_evt = asyncio.Event()
+        self._shutdown_evt = asyncio.Event()
+
+        # 运行时资源
+        self.session: Optional[ClientSession] = None
+        self.tools: List = []
 
     async def initialize(self):
-        args = self.config.get("args", [])
+        """
+        启动后台 task，并等待其就绪（拿到 `tools`）。
+        """
+        if self._worker_task:
+            return  # 已经 init 过
 
-        command = (
-            shutil.which("npx")
-            if self.config["command"] == "npx"
-            else self.config["command"]
-        )
-        
-        env={**os.environ}
-        if self.config.get("env"):
-            env.update(self.config["env"])
-        
-        server_params = StdioServerParameters(
-            command=command,
-            args=args,
-            env=env
-        )
-        
-        stdio_transport = await self.exit_stack.enter_async_context(stdio_client(server_params))
-        self.stdio, self.write = stdio_transport
-        time_out_delta =  timedelta(seconds=15)
-        self.session = await self.exit_stack.enter_async_context(ClientSession(read_stream=self.stdio, write_stream=self.write, read_timeout_seconds=time_out_delta))
-        
-        await self.session.initialize()
-        
-        # List available tools
-        response = await self.session.list_tools()
-        tools = response.tools
-        self.tools = tools
-        self.logger.bind(tag=TAG).info(f"Connected to server with tools:{[tool.name for tool in tools]}")
-    
-    def has_tool(self, tool_name):
-        return any(tool.name == tool_name for tool in self.tools)
-    
-    def get_available_tools(self):
-        available_tools = [{"type": "function", "function":{ 
-            "name": tool.name,
-            "description": tool.description,
-            "parameters": tool.inputSchema
-        } } for tool in self.tools]
+        # 在当前 loop 创建后台 task
+        self._worker_task = asyncio.create_task(self._worker(), name="MCPClientWorker")
+        await self._ready_evt.wait()  # 等待 worker 初始化完成
 
-        return available_tools
-    
-    async def call_tool(self, tool_name: str, tool_args: dict):
-        self.logger.bind(tag=TAG).info(f"MCPClient Calling tool {tool_name} with args: {tool_args}")
-        try:
-            response = await self.session.call_tool(tool_name, tool_args)
-        except Exception as e:
-            self.logger.bind(tag=TAG).error(f"Error calling tool {tool_name}: {e}")
-            from types import SimpleNamespace
-            error_content = SimpleNamespace(
-                type='text',
-                text=f"Error calling tool {tool_name}: {e}"
-            )
-            error_response = SimpleNamespace(
-                content=[error_content],
-                isError=True
-            )
-            return error_response
-        self.logger.bind(tag=TAG).info(f"MCPClient Response from tool {tool_name}: {response}")
-        return response
+        # 此时 tools 已填充
+        self.logger.bind(tag=TAG).info(
+            f"Connected, tools = {[t.name for t in self.tools]}"
+        )
 
     async def cleanup(self):
-        """Clean up resources"""
-        await self.exit_stack.aclose()
\ No newline at end of file
+        """
+        对外关闭接口：
+            · 只负责发出 “关机信号”
+            · 等待后台 task 正常退出
+        在任何 loop / task 调用都安全。
+        """
+        if not self._worker_task:
+            return
+
+        self._shutdown_evt.set()  # 发信号
+        try:
+            await asyncio.wait_for(self._worker_task, timeout=15)
+        except (asyncio.TimeoutError, Exception) as e:
+            self.logger.bind(tag=TAG).error(f"worker shutdown err: {e}")
+        finally:
+            self._worker_task = None
+
+    # ----------------------------- 工具接口 -----------------------------
+
+    def has_tool(self, name: str) -> bool:
+        return any(t.name == name for t in self.tools)
+
+    def get_available_tools(self):
+        return [
+            {
+                "type": "function",
+                "function": {
+                    "name": t.name,
+                    "description": t.description,
+                    "parameters": t.inputSchema,
+                },
+            }
+            for t in self.tools
+        ]
+
+    async def call_tool(self, name: str, args: dict):
+        """
+        转发到 session.call_tool。
+        若在 worker 之外的 task 调用，会通过 run_coroutine_threadsafe
+        投递到 worker 所在 loop 中执行，保证线程安全。
+        """
+        if not self.session:  # 尚未就绪
+            raise RuntimeError("MCPClient not initialized")
+
+        loop = self._worker_task.get_loop()
+        coro = self.session.call_tool(name, args)
+
+        # 在同一个 loop ➜ 直接 await
+        if loop is asyncio.get_running_loop():
+            return await coro
+
+        # 跨 loop ➜ run_coroutine_threadsafe
+        fut: concurrent.futures.Future = asyncio.run_coroutine_threadsafe(coro, loop)
+        return await asyncio.wrap_future(fut)
+
+    # ----------------------------- 后台 task -----------------------------
+
+    async def _worker(self):
+        """
+        单线程协程：
+            1. 创建所有异步资源
+            2. set_ready → 供外部使用
+            3. 等待 shutdown_evt
+            4. 自动随 AsyncExitStack 退出而清理资源
+        """
+        async with AsyncExitStack() as stack:
+            try:
+                # ---------- 启动后端进程 ----------
+                cmd = shutil.which("npx") if self.config["command"] == "npx" else self.config["command"]
+                env = {**os.environ, **self.config.get("env", {})}
+                params = StdioServerParameters(
+                    command=cmd,
+                    args=self.config.get("args", []),
+                    env=env,
+                )
+                stdio_r, stdio_w = await stack.enter_async_context(stdio_client(params))
+
+                # ---------- 会话 ----------
+                self.session = await stack.enter_async_context(
+                    ClientSession(
+                        read_stream=stdio_r,
+                        write_stream=stdio_w,
+                        read_timeout_seconds=timedelta(seconds=15),
+                    )
+                )
+                await self.session.initialize()
+
+                # ---------- 工具 ----------
+                self.tools = (await self.session.list_tools()).tools
+
+                # 初始化完成，放行外部
+                self._ready_evt.set()
+
+                # ---------- 挂起等待关闭 ----------
+                await self._shutdown_evt.wait()
+
+            except Exception as e:
+                self.logger.bind(tag=TAG).error(f"worker error: {e}")
+                self._ready_evt.set()  # 确保外部不会卡死
+                raise
diff --git a/main/xiaozhi-server/core/mcp/manager.py b/main/xiaozhi-server/core/mcp/manager.py
index f212b67a..0a35f357 100644
--- a/main/xiaozhi-server/core/mcp/manager.py
+++ b/main/xiaozhi-server/core/mcp/manager.py
@@ -1,5 +1,5 @@
 """MCP服务管理器"""
-
+import asyncio
 import os, json
 from typing import Dict, Any, List
 from .MCPClient import MCPClient
@@ -94,8 +94,8 @@ class MCPManager:
         """
         for tool in self.tools:
             if (
-                tool.get("function") != None
-                and tool["function"].get("name") == tool_name
+                    tool.get("function") != None
+                    and tool["function"].get("name") == tool_name
             ):
                 return True
         return False
@@ -120,12 +120,13 @@ class MCPManager:
         raise ValueError(f"Tool {tool_name} not found in any MCP server")
 
     async def cleanup_all(self) -> None:
-        for name, client in self.client.items():
+        """依次关闭所有 MCPClient，不让异常阻断整体流程。"""
+        for name, client in list(self.client.items()):
             try:
-                await client.cleanup()
-                self.logger.bind(tag=TAG).info(f"Cleaned up MCP client: {name}")
-            except Exception as e:
+                await asyncio.wait_for(client.cleanup(), timeout=20)
+                self.logger.bind(tag=TAG).info(f"MCP client closed: {name}")
+            except (asyncio.TimeoutError, Exception) as e:
                 self.logger.bind(tag=TAG).error(
-                    f"Error cleaning up MCP client {name}: {e}"
+                    f"Error closing MCP client {name}: {e}"
                 )
         self.client.clear()

From 8f266bea0d62d0ab2d2f7e2ad476440aad00622f Mon Sep 17 00:00:00 2001
From: kevin1sMe <linjiang1205@gmail.com>
Date: Sun, 4 May 2025 23:33:07 +0800
Subject: [PATCH 42/53] =?UTF-8?q?feat:=20MCP=20server=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8sse=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/core/mcp/MCPClient.py    | 52 +++++++++++---------
 main/xiaozhi-server/core/mcp/manager.py      |  4 +-
 main/xiaozhi-server/mcp_server_settings.json |  3 ++
 main/xiaozhi-server/requirements.txt         |  2 +-
 4 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/main/xiaozhi-server/core/mcp/MCPClient.py b/main/xiaozhi-server/core/mcp/MCPClient.py
index 103ac645..7996ff67 100644
--- a/main/xiaozhi-server/core/mcp/MCPClient.py
+++ b/main/xiaozhi-server/core/mcp/MCPClient.py
@@ -4,6 +4,7 @@ from contextlib import AsyncExitStack
 import os, shutil
 from mcp import ClientSession, StdioServerParameters
 from mcp.client.stdio import stdio_client
+from mcp.client.sse import sse_client
 
 from config.logger import setup_logging
 
@@ -21,29 +22,36 @@ class MCPClient:
     async def initialize(self):
         args = self.config.get("args", [])
 
-        command = (
-            shutil.which("npx")
-            if self.config["command"] == "npx"
-            else self.config["command"]
-        )
-        
-        env={**os.environ}
-        if self.config.get("env"):
-            env.update(self.config["env"])
-        
-        server_params = StdioServerParameters(
-            command=command,
-            args=args,
-            env=env
-        )
-        
-        stdio_transport = await self.exit_stack.enter_async_context(stdio_client(server_params))
-        self.stdio, self.write = stdio_transport
-        time_out_delta =  timedelta(seconds=15)
-        self.session = await self.exit_stack.enter_async_context(ClientSession(read_stream=self.stdio, write_stream=self.write, read_timeout_seconds=time_out_delta))
-        
+        if "command" in self.config:
+            command = (
+                shutil.which("npx")
+                if self.config["command"] == "npx"
+                else self.config["command"]
+            )
+            env = {**os.environ}
+            if self.config.get("env"):
+                env.update(self.config["env"])
+            server_params = StdioServerParameters(
+                command=command,
+                args=args,
+                env=env
+            )
+            stdio_transport = await self.exit_stack.enter_async_context(stdio_client(server_params))
+            self.stdio, self.write = stdio_transport
+            time_out_delta = timedelta(seconds=15)
+            self.session = await self.exit_stack.enter_async_context(
+                ClientSession(read_stream=self.stdio, write_stream=self.write, read_timeout_seconds=time_out_delta)
+            )
+        elif "url" in self.config:
+            sse_transport = await self.exit_stack.enter_async_context(sse_client(self.config["url"]))
+            self.sse_read, self.sse_write = sse_transport
+            self.session = await self.exit_stack.enter_async_context(
+                ClientSession(read_stream=self.sse_read, write_stream=self.sse_write)
+            )
+        else:
+            raise ValueError("MCPClient config must have 'command' or 'url'.")
+
         await self.session.initialize()
-        
         # List available tools
         response = await self.session.list_tools()
         tools = response.tools
diff --git a/main/xiaozhi-server/core/mcp/manager.py b/main/xiaozhi-server/core/mcp/manager.py
index f212b67a..a0e310fa 100644
--- a/main/xiaozhi-server/core/mcp/manager.py
+++ b/main/xiaozhi-server/core/mcp/manager.py
@@ -50,9 +50,9 @@ class MCPManager:
         """初始化所有MCP服务"""
         config = self.load_config()
         for name, srv_config in config.items():
-            if not srv_config.get("command"):
+            if not srv_config.get("command") and not srv_config.get("url"):
                 self.logger.bind(tag=TAG).warning(
-                    f"Skipping server {name}: command not specified"
+                    f"Skipping server {name}: neither command nor url specified"
                 )
                 continue
 
diff --git a/main/xiaozhi-server/mcp_server_settings.json b/main/xiaozhi-server/mcp_server_settings.json
index a38bbdfb..26e2cf42 100644
--- a/main/xiaozhi-server/mcp_server_settings.json
+++ b/main/xiaozhi-server/mcp_server_settings.json
@@ -26,6 +26,9 @@
       "command": "npx",
       "args": ["-y", "@simonb97/server-win-cli"],
       "link": "https://github.com/SimonB97/win-cli-mcp-server"
+    },
+    "perplexity-ask": {
+      "url": "http://your-server-ip:your-port/sse"
     }
   }
 }
diff --git a/main/xiaozhi-server/requirements.txt b/main/xiaozhi-server/requirements.txt
index 7da31b6f..7b7237cf 100755
--- a/main/xiaozhi-server/requirements.txt
+++ b/main/xiaozhi-server/requirements.txt
@@ -22,7 +22,7 @@ mem0ai==0.1.62
 bs4==0.0.2
 modelscope==1.23.2
 sherpa_onnx==1.11.0
-mcp==1.4.1
+mcp==1.7.1
 cnlunar==0.2.0
 PySocks==1.7.1
 dashscope==1.23.1
\ No newline at end of file

From 3fcfb65d45fefb086ecb6a375554dee29e6e25ec Mon Sep 17 00:00:00 2001
From: kevin1sMe <linjiang1205@gmail.com>
Date: Sun, 4 May 2025 23:37:17 +0800
Subject: [PATCH 43/53] update: example

---
 main/xiaozhi-server/mcp_server_settings.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/main/xiaozhi-server/mcp_server_settings.json b/main/xiaozhi-server/mcp_server_settings.json
index 26e2cf42..dc173f37 100644
--- a/main/xiaozhi-server/mcp_server_settings.json
+++ b/main/xiaozhi-server/mcp_server_settings.json
@@ -3,7 +3,8 @@
     "在data目录下创建.mcp_server_settings.json文件，可以选择下面的MCP服务，也可以自行添加新的MCP服务。",
     "后面不断测试补充好用的mcp服务，欢迎大家一起补充。",
     "记得删除注释行,des属性仅为说明,不会被解析。",
-    "des和link属性，仅为说明安装方式，方便大家查看原始链接，不是必须项。"
+    "des和link属性，仅为说明安装方式，方便大家查看原始链接，不是必须项。",
+    "当前支持stdio/sse两种模式。"
   ],
   "mcpServers": {
     "filesystem": {
@@ -26,9 +27,6 @@
       "command": "npx",
       "args": ["-y", "@simonb97/server-win-cli"],
       "link": "https://github.com/SimonB97/win-cli-mcp-server"
-    },
-    "perplexity-ask": {
-      "url": "http://your-server-ip:your-port/sse"
     }
   }
 }

From a2baef89118c3f3753a8f9a83feafe1089ab84f0 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Tue, 6 May 2025 13:09:43 +0800
Subject: [PATCH 44/53] =?UTF-8?q?update:=E4=BC=98=E5=8C=96=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ConfigServiceImpl.java       | 22 ++++--------------
 main/xiaozhi-server/core/websocket_server.py  | 23 ++++++++++++-------
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java
index f0ed4bf1..a15df002 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java
@@ -61,15 +61,15 @@ public class ConfigServiceImpl implements ConfigService {
 
         // 构建模块配置
         buildModuleConfig(
-                agent.getAgentName(),
+                null,
                 null,
                 null,
                 agent.getVadModelId(),
                 agent.getAsrModelId(),
-                agent.getLlmModelId(),
-                agent.getTtsModelId(),
-                agent.getMemModelId(),
-                agent.getIntentModelId(),
+                null,
+                null,
+                null,
+                null,
                 result,
                 isCache);
 
@@ -117,18 +117,6 @@ public class ConfigServiceImpl implements ConfigService {
         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(
diff --git a/main/xiaozhi-server/core/websocket_server.py b/main/xiaozhi-server/core/websocket_server.py
index 4b933865..06f00594 100644
--- a/main/xiaozhi-server/core/websocket_server.py
+++ b/main/xiaozhi-server/core/websocket_server.py
@@ -13,14 +13,21 @@ class WebSocketServer:
         self.logger = setup_logging()
         self.config_lock = asyncio.Lock()
         modules = initialize_modules(
-            self.logger, self.config, True, True, True, True, True, True
+            self.logger,
+            self.config,
+            "VAD" in self.config["selected_module"],
+            "ASR" in self.config["selected_module"],
+            "LLM" in self.config["selected_module"],
+            "TTS" in self.config["selected_module"],
+            "Memory" in self.config["selected_module"],
+            "Intent" in self.config["selected_module"],
         )
-        self._vad = modules["vad"]
-        self._asr = modules["asr"]
-        self._tts = modules["tts"]
-        self._llm = modules["llm"]
-        self._intent = modules["intent"]
-        self._memory = modules["memory"]
+        self._vad = modules["vad"] if "vad" in modules else None
+        self._asr = modules["asr"] if "asr" in modules else None
+        self._tts = modules["tts"] if "tts" in modules else None
+        self._llm = modules["llm"] if "llm" in modules else None
+        self._intent = modules["intent"] if "intent" in modules else None
+        self._memory = modules["memory"] if "memory" in modules else None
         self.active_connections = set()
 
     async def start(self):
@@ -44,7 +51,7 @@ class WebSocketServer:
             self._tts,
             self._memory,
             self._intent,
-            self  # 传入当前 WebSocketServer 实例
+            self,  # 传入当前 WebSocketServer 实例
         )
         self.active_connections.add(handler)
         try:

From aa77bfdfc4f56e031a81e404050aba3550e3ee42 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Tue, 6 May 2025 13:10:26 +0800
Subject: [PATCH 45/53] =?UTF-8?q?update:=E4=BC=98=E5=8C=96=E6=9C=AA?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=94=A8=E6=88=B7=E7=9A=84=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/core/connection.py        |  11 +-
 .../xiaozhi-server/core/handle/helloHandle.py |   2 +-
 .../core/handle/receiveAudioHandle.py         |   9 +-
 .../core/handle/ttsReportHandle.py            |   4 +-
 .../xiaozhi-server/core/providers/tts/base.py |  53 +-
 main/xiaozhi-server/core/utils/util.py        | 606 +++++++++++++++---
 6 files changed, 535 insertions(+), 150 deletions(-)

diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index f08a61ff..27b1e0ac 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -151,11 +151,9 @@ class ConnectionHandler:
                     self.headers["device-id"] = query_params["device-id"][0]
                     self.headers["client-id"] = query_params["client-id"][0]
                 else:
-                    self.logger.bind(tag=TAG).error(
-                        "无法从请求头和URL查询参数中获取device-id"
-                    )
+                    await ws.send("端口正常，如需测试连接，请使用test_page.html")
+                    await self.close(ws)
                     return
-
             # 获取客户端ip地址
             self.client_ip = ws.remote_address[0]
             self.logger.bind(tag=TAG).info(
@@ -212,7 +210,8 @@ class ConnectionHandler:
     async def _save_and_close(self, ws):
         """保存记忆并关闭连接"""
         try:
-            await self.memory.save_memory(self.dialogue.dialogue)
+            if self.memory:
+                await self.memory.save_memory(self.dialogue.dialogue)
         except Exception as e:
             self.logger.bind(tag=TAG).error(f"保存记忆失败: {e}")
         finally:
@@ -318,7 +317,7 @@ class ConnectionHandler:
 
     def _init_report_threads(self):
         """初始化ASR和TTS上报线程"""
-        if not self.read_config_from_api:
+        if not self.read_config_from_api or self.need_bind:
             return
         if self.tts_report_thread is None or not self.tts_report_thread.is_alive():
             self.tts_report_thread = threading.Thread(
diff --git a/main/xiaozhi-server/core/handle/helloHandle.py b/main/xiaozhi-server/core/handle/helloHandle.py
index 51782bb9..e84a798f 100644
--- a/main/xiaozhi-server/core/handle/helloHandle.py
+++ b/main/xiaozhi-server/core/handle/helloHandle.py
@@ -44,7 +44,7 @@ async def checkWakeupWords(conn, text):
         if file is None:
             asyncio.create_task(wakeupWordsResponse(conn))
             return False
-        opus_packets, duration = conn.tts.audio_to_opus_data(file)
+        opus_packets, _ = conn.tts.audio_to_opus_data(file)
         text_hello = WAKEUP_CONFIG["text"]
         if not text_hello:
             text_hello = text
diff --git a/main/xiaozhi-server/core/handle/receiveAudioHandle.py b/main/xiaozhi-server/core/handle/receiveAudioHandle.py
index a346fb61..ff6aaad5 100644
--- a/main/xiaozhi-server/core/handle/receiveAudioHandle.py
+++ b/main/xiaozhi-server/core/handle/receiveAudioHandle.py
@@ -6,6 +6,7 @@ from core.handle.sendAudioHandle import send_stt_message
 from core.handle.intentHandler import handle_user_intent
 from core.utils.output_counter import check_device_output_limit
 from core.handle.ttsReportHandle import enqueue_tts_report
+from core.providers.tts.base import audio_to_opus_data
 
 TAG = __name__
 logger = setup_logging()
@@ -110,7 +111,7 @@ async def max_out_size(conn):
     conn.tts_last_text_index = 0
     conn.llm_finish_task = True
     file_path = "config/assets/max_output_size.wav"
-    opus_packets, _ = conn.tts.audio_to_opus_data(file_path)
+    opus_packets, _ = audio_to_opus_data(file_path)
     conn.audio_play_queue.put((opus_packets, text, 0))
     conn.close_after_chat = True
 
@@ -132,7 +133,7 @@ async def check_bind_device(conn):
 
         # 播放提示音
         music_path = "config/assets/bind_code.wav"
-        opus_packets, _ = conn.tts.audio_to_opus_data(music_path)
+        opus_packets, _ = audio_to_opus_data(music_path)
         conn.audio_play_queue.put((opus_packets, text, 0))
 
         # 逐个播放数字
@@ -140,7 +141,7 @@ async def check_bind_device(conn):
             try:
                 digit = conn.bind_code[i]
                 num_path = f"config/assets/bind_code/{digit}.wav"
-                num_packets, _ = conn.tts.audio_to_opus_data(num_path)
+                num_packets, _ = audio_to_opus_data(num_path)
                 conn.audio_play_queue.put((num_packets, None, i + 1))
             except Exception as e:
                 logger.bind(tag=TAG).error(f"播放数字音频失败: {e}")
@@ -152,5 +153,5 @@ async def check_bind_device(conn):
         conn.tts_last_text_index = 0
         conn.llm_finish_task = True
         music_path = "config/assets/bind_not_found.wav"
-        opus_packets, _ = conn.tts.audio_to_opus_data(music_path)
+        opus_packets, _ = audio_to_opus_data(music_path)
         conn.audio_play_queue.put((opus_packets, text, 0))
diff --git a/main/xiaozhi-server/core/handle/ttsReportHandle.py b/main/xiaozhi-server/core/handle/ttsReportHandle.py
index 5442a79f..0935b9de 100644
--- a/main/xiaozhi-server/core/handle/ttsReportHandle.py
+++ b/main/xiaozhi-server/core/handle/ttsReportHandle.py
@@ -95,7 +95,7 @@ def opus_to_wav(opus_data):
 
 
 def enqueue_tts_report(conn, type, text, opus_data):
-    if not conn.read_config_from_api:
+    if not conn.read_config_from_api or conn.need_bind:
         return
     """将TTS数据加入上报队列
 
@@ -108,7 +108,7 @@ def enqueue_tts_report(conn, type, text, opus_data):
         # 使用连接对象的队列，传入文本和二进制数据而非文件路径
         conn.tts_report_queue.put((type, text, opus_data))
 
-        logger.bind(tag=TAG).info(
+        logger.bind(tag=TAG).debug(
             f"TTS数据已加入上报队列: {conn.device_id}, 音频大小: {len(opus_data)} "
         )
     except Exception as e:
diff --git a/main/xiaozhi-server/core/providers/tts/base.py b/main/xiaozhi-server/core/providers/tts/base.py
index e668459c..4cf37edb 100644
--- a/main/xiaozhi-server/core/providers/tts/base.py
+++ b/main/xiaozhi-server/core/providers/tts/base.py
@@ -1,11 +1,9 @@
 import asyncio
 from config.logger import setup_logging
 import os
-import numpy as np
-import opuslib_next
-from pydub import AudioSegment
 from abc import ABC, abstractmethod
 from core.utils.tts import MarkdownCleaner
+from core.utils.util import audio_to_opus_data
 
 TAG = __name__
 logger = setup_logging()
@@ -29,7 +27,9 @@ class TTSProviderBase(ABC):
                 try:
                     asyncio.run(self.text_to_speak(text, tmp_file))
                 except Exception as e:
-                    logger.bind(tag=TAG).warning(f"语音生成失败{5 - max_repeat_time + 1}次: {text}，错误: {e}")
+                    logger.bind(tag=TAG).warning(
+                        f"语音生成失败{5 - max_repeat_time + 1}次: {text}，错误: {e}"
+                    )
                     # 未执行成功，删除文件
                     if os.path.exists(tmp_file):
                         os.remove(tmp_file)
@@ -54,47 +54,4 @@ class TTSProviderBase(ABC):
         pass
 
     def audio_to_opus_data(self, audio_file_path):
-        """音频文件转换为Opus编码"""
-        # 获取文件后缀名
-        file_type = os.path.splitext(audio_file_path)[1]
-        if file_type:
-            file_type = file_type.lstrip(".")
-        # 读取音频文件，-nostdin 参数：不要从标准输入读取数据，否则FFmpeg会阻塞
-        audio = AudioSegment.from_file(
-            audio_file_path, format=file_type, parameters=["-nostdin"]
-        )
-
-        # 转换为单声道/16kHz采样率/16位小端编码（确保与编码器匹配）
-        audio = audio.set_channels(1).set_frame_rate(16000).set_sample_width(2)
-
-        # 音频时长(秒)
-        duration = len(audio) / 1000.0
-
-        # 获取原始PCM数据（16位小端）
-        raw_data = audio.raw_data
-
-        # 初始化Opus编码器
-        encoder = opuslib_next.Encoder(16000, 1, opuslib_next.APPLICATION_AUDIO)
-
-        # 编码参数
-        frame_duration = 60  # 60ms per frame
-        frame_size = int(16000 * frame_duration / 1000)  # 960 samples/frame
-
-        opus_datas = []
-        # 按帧处理所有音频数据（包括最后一帧可能补零）
-        for i in range(0, len(raw_data), frame_size * 2):  # 16bit=2bytes/sample
-            # 获取当前帧的二进制数据
-            chunk = raw_data[i : i + frame_size * 2]
-
-            # 如果最后一帧不足，补零
-            if len(chunk) < frame_size * 2:
-                chunk += b"\x00" * (frame_size * 2 - len(chunk))
-
-            # 转换为numpy数组处理
-            np_frame = np.frombuffer(chunk, dtype=np.int16)
-
-            # 编码Opus数据
-            opus_data = encoder.encode(np_frame.tobytes(), frame_size)
-            opus_datas.append(opus_data)
-
-        return opus_datas, duration
+        return audio_to_opus_data(audio_file_path)
diff --git a/main/xiaozhi-server/core/utils/util.py b/main/xiaozhi-server/core/utils/util.py
index a1956cee..6e5b1028 100644
--- a/main/xiaozhi-server/core/utils/util.py
+++ b/main/xiaozhi-server/core/utils/util.py
@@ -2,35 +2,40 @@ import json
 import socket
 import subprocess
 import re
+import os
+import numpy as np
 import requests
+import opuslib_next
+from pydub import AudioSegment
 from typing import Dict, Any
 from core.utils import tts, llm, intent, memory, vad, asr
 
 TAG = __name__
 emoji_map = {
-    'neutral': '😶',
-    'happy': '🙂',
-    'laughing': '😆',
-    'funny': '😂',
-    'sad': '😔',
-    'angry': '😠',
-    'crying': '😭',
-    'loving': '😍',
-    'embarrassed': '😳',
-    'surprised': '😲',
-    'shocked': '😱',
-    'thinking': '🤔',
-    'winking': '😉',
-    'cool': '😎',
-    'relaxed': '😌',
-    'delicious': '🤤',
-    'kissy': '😘',
-    'confident': '😏',
-    'sleepy': '😴',
-    'silly': '😜',
-    'confused': '🙄'
+    "neutral": "😶",
+    "happy": "🙂",
+    "laughing": "😆",
+    "funny": "😂",
+    "sad": "😔",
+    "angry": "😠",
+    "crying": "😭",
+    "loving": "😍",
+    "embarrassed": "😳",
+    "surprised": "😲",
+    "shocked": "😱",
+    "thinking": "🤔",
+    "winking": "😉",
+    "cool": "😎",
+    "relaxed": "😌",
+    "delicious": "🤤",
+    "kissy": "😘",
+    "confident": "😏",
+    "sleepy": "😴",
+    "silly": "😜",
+    "confused": "🙄",
 }
 
+
 def get_local_ip():
     try:
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
@@ -117,9 +122,9 @@ def is_punctuation_or_emoji(char):
         "、",  # 中文顿号
         "“",
         "”",
-        "\"",  # 中文双引号 + 英文引号
+        '"',  # 中文双引号 + 英文引号
         "：",
-        ":",   # 中文冒号 + 英文冒号
+        ":",  # 中文冒号 + 英文冒号
     }
     if char.isspace() or char in punctuation_set:
         return True
@@ -353,12 +358,13 @@ def initialize_modules(
 
     return modules
 
+
 def analyze_emotion(text):
     """
     分析文本情感并返回对应的emoji名称（支持中英文）
     """
     if not text or not isinstance(text, str):
-        return 'neutral'
+        return "neutral"
 
     original_text = text
     text = text.lower().strip()
@@ -369,84 +375,444 @@ def analyze_emotion(text):
             return emotion
 
     # 标点符号分析
-    has_exclamation = '!' in original_text or '！' in original_text
-    has_question = '?' in original_text or '？' in original_text
-    has_ellipsis = '...' in original_text or '…' in original_text
+    has_exclamation = "!" in original_text or "！" in original_text
+    has_question = "?" in original_text or "？" in original_text
+    has_ellipsis = "..." in original_text or "…" in original_text
 
     # 定义情感关键词映射（中英文扩展版）
     emotion_keywords = {
-        'happy': ['开心', '高兴', '快乐', '愉快', '幸福', '满意', '棒', '好', '不错', '完美', '棒极了', '太好了',
-                  '好呀', '好的', 'happy', 'joy', 'great', 'good', 'nice', 'awesome', 'fantastic', 'wonderful'],
-        'laughing': ['哈哈', '哈哈哈', '呵呵', '嘿嘿', '嘻嘻', '笑死', '太好笑了', '笑死我了', 'lol', 'lmao', 'haha',
-                     'hahaha', 'hehe', 'rofl', 'funny', 'laugh'],
-        'funny': ['搞笑', '滑稽', '逗', '幽默', '笑点', '段子', '笑话', '太逗了', 'hilarious', 'joke', 'comedy'],
-        'sad': ['伤心', '难过', '悲哀', '悲伤', '忧郁', '郁闷', '沮丧', '失望', '想哭', '难受', '不开心', '唉', '呜呜',
-                'sad', 'upset', 'unhappy', 'depressed', 'sorrow', 'gloomy'],
-        'angry': ['生气', '愤怒', '气死', '讨厌', '烦人', '可恶', '烦死了', '恼火', '暴躁', '火大', '愤怒', '气炸了',
-                  'angry', 'mad', 'annoyed', 'furious', 'pissed', 'hate'],
-        'crying': ['哭泣', '泪流', '大哭', '伤心欲绝', '泪目', '流泪', '哭死', '哭晕', '想哭', '泪崩',
-                   'cry', 'crying', 'tears', 'sob', 'weep'],
-        'loving': ['爱你', '喜欢', '爱', '亲爱的', '宝贝', '么么哒', '抱抱', '想你', '思念', '最爱', '亲亲', '喜欢你',
-                   'love', 'like', 'adore', 'darling', 'sweetie', 'honey', 'miss you', 'heart'],
-        'embarrassed': ['尴尬', '不好意思', '害羞', '脸红', '难为情', '社死', '丢脸', '出丑',
-                        'embarrassed', 'awkward', 'shy', 'blush'],
-        'surprised': ['惊讶', '吃惊', '天啊', '哇塞', '哇', '居然', '竟然', '没想到', '出乎意料',
-                      'surprise', 'wow', 'omg', 'oh my god', 'amazing', 'unbelievable'],
-        'shocked': ['震惊', '吓到', '惊呆了', '不敢相信', '震撼', '吓死', '恐怖', '害怕', '吓人',
-                    'shocked', 'shocking', 'scared', 'frightened', 'terrified', 'horror'],
-        'thinking': ['思考', '考虑', '想一下', '琢磨', '沉思', '冥想', '想', '思考中', '在想',
-                      'think', 'thinking', 'consider', 'ponder', 'meditate'],
-        'winking': ['调皮', '眨眼', '你懂的', '坏笑', '邪恶', '奸笑', '使眼色',
-                    'wink', 'teasing', 'naughty', 'mischievous'],
-        'cool': ['酷', '帅', '厉害', '棒极了', '真棒', '牛逼', '强', '优秀', '杰出', '出色', '完美',
-                 'cool', 'awesome', 'amazing', 'great', 'impressive', 'perfect'],
-        'relaxed': ['放松', '舒服', '惬意', '悠闲', '轻松', '舒适', '安逸', '自在',
-                     'relax', 'relaxed', 'comfortable', 'cozy', 'chill', 'peaceful'],
-        'delicious': ['好吃', '美味', '香', '馋', '可口', '香甜', '大餐', '大快朵颐', '流口水', '垂涎',
-                      'delicious', 'yummy', 'tasty', 'yum', 'appetizing', 'mouthwatering'],
-        'kissy': ['亲亲', '么么', '吻', 'mua', 'muah', '亲一下', '飞吻',
-                  'kiss', 'xoxo', 'hug', 'muah', 'smooch'],
-        'confident': ['自信', '肯定', '确定', '毫无疑问', '当然', '必须的', '毫无疑问', '确信', '坚信',
-                      'confident', 'sure', 'certain', 'definitely', 'positive'],
-        'sleepy': ['困', '睡觉', '晚安', '想睡', '好累', '疲惫', '疲倦', '困了', '想休息', '睡意',
-                   'sleep', 'sleepy', 'tired', 'exhausted', 'bedtime', 'good night'],
-        'silly': ['傻', '笨', '呆', '憨', '蠢', '二', '憨憨', '傻乎乎', '呆萌',
-                  'silly', 'stupid', 'dumb', 'foolish', 'goofy', 'ridiculous'],
-        'confused': ['疑惑', '不明白', '不懂', '困惑', '疑问', '为什么', '怎么回事', '啥意思', '不清楚',
-                     'confused', 'puzzled', 'doubt', 'question', 'what', 'why', 'how']
+        "happy": [
+            "开心",
+            "高兴",
+            "快乐",
+            "愉快",
+            "幸福",
+            "满意",
+            "棒",
+            "好",
+            "不错",
+            "完美",
+            "棒极了",
+            "太好了",
+            "好呀",
+            "好的",
+            "happy",
+            "joy",
+            "great",
+            "good",
+            "nice",
+            "awesome",
+            "fantastic",
+            "wonderful",
+        ],
+        "laughing": [
+            "哈哈",
+            "哈哈哈",
+            "呵呵",
+            "嘿嘿",
+            "嘻嘻",
+            "笑死",
+            "太好笑了",
+            "笑死我了",
+            "lol",
+            "lmao",
+            "haha",
+            "hahaha",
+            "hehe",
+            "rofl",
+            "funny",
+            "laugh",
+        ],
+        "funny": [
+            "搞笑",
+            "滑稽",
+            "逗",
+            "幽默",
+            "笑点",
+            "段子",
+            "笑话",
+            "太逗了",
+            "hilarious",
+            "joke",
+            "comedy",
+        ],
+        "sad": [
+            "伤心",
+            "难过",
+            "悲哀",
+            "悲伤",
+            "忧郁",
+            "郁闷",
+            "沮丧",
+            "失望",
+            "想哭",
+            "难受",
+            "不开心",
+            "唉",
+            "呜呜",
+            "sad",
+            "upset",
+            "unhappy",
+            "depressed",
+            "sorrow",
+            "gloomy",
+        ],
+        "angry": [
+            "生气",
+            "愤怒",
+            "气死",
+            "讨厌",
+            "烦人",
+            "可恶",
+            "烦死了",
+            "恼火",
+            "暴躁",
+            "火大",
+            "愤怒",
+            "气炸了",
+            "angry",
+            "mad",
+            "annoyed",
+            "furious",
+            "pissed",
+            "hate",
+        ],
+        "crying": [
+            "哭泣",
+            "泪流",
+            "大哭",
+            "伤心欲绝",
+            "泪目",
+            "流泪",
+            "哭死",
+            "哭晕",
+            "想哭",
+            "泪崩",
+            "cry",
+            "crying",
+            "tears",
+            "sob",
+            "weep",
+        ],
+        "loving": [
+            "爱你",
+            "喜欢",
+            "爱",
+            "亲爱的",
+            "宝贝",
+            "么么哒",
+            "抱抱",
+            "想你",
+            "思念",
+            "最爱",
+            "亲亲",
+            "喜欢你",
+            "love",
+            "like",
+            "adore",
+            "darling",
+            "sweetie",
+            "honey",
+            "miss you",
+            "heart",
+        ],
+        "embarrassed": [
+            "尴尬",
+            "不好意思",
+            "害羞",
+            "脸红",
+            "难为情",
+            "社死",
+            "丢脸",
+            "出丑",
+            "embarrassed",
+            "awkward",
+            "shy",
+            "blush",
+        ],
+        "surprised": [
+            "惊讶",
+            "吃惊",
+            "天啊",
+            "哇塞",
+            "哇",
+            "居然",
+            "竟然",
+            "没想到",
+            "出乎意料",
+            "surprise",
+            "wow",
+            "omg",
+            "oh my god",
+            "amazing",
+            "unbelievable",
+        ],
+        "shocked": [
+            "震惊",
+            "吓到",
+            "惊呆了",
+            "不敢相信",
+            "震撼",
+            "吓死",
+            "恐怖",
+            "害怕",
+            "吓人",
+            "shocked",
+            "shocking",
+            "scared",
+            "frightened",
+            "terrified",
+            "horror",
+        ],
+        "thinking": [
+            "思考",
+            "考虑",
+            "想一下",
+            "琢磨",
+            "沉思",
+            "冥想",
+            "想",
+            "思考中",
+            "在想",
+            "think",
+            "thinking",
+            "consider",
+            "ponder",
+            "meditate",
+        ],
+        "winking": [
+            "调皮",
+            "眨眼",
+            "你懂的",
+            "坏笑",
+            "邪恶",
+            "奸笑",
+            "使眼色",
+            "wink",
+            "teasing",
+            "naughty",
+            "mischievous",
+        ],
+        "cool": [
+            "酷",
+            "帅",
+            "厉害",
+            "棒极了",
+            "真棒",
+            "牛逼",
+            "强",
+            "优秀",
+            "杰出",
+            "出色",
+            "完美",
+            "cool",
+            "awesome",
+            "amazing",
+            "great",
+            "impressive",
+            "perfect",
+        ],
+        "relaxed": [
+            "放松",
+            "舒服",
+            "惬意",
+            "悠闲",
+            "轻松",
+            "舒适",
+            "安逸",
+            "自在",
+            "relax",
+            "relaxed",
+            "comfortable",
+            "cozy",
+            "chill",
+            "peaceful",
+        ],
+        "delicious": [
+            "好吃",
+            "美味",
+            "香",
+            "馋",
+            "可口",
+            "香甜",
+            "大餐",
+            "大快朵颐",
+            "流口水",
+            "垂涎",
+            "delicious",
+            "yummy",
+            "tasty",
+            "yum",
+            "appetizing",
+            "mouthwatering",
+        ],
+        "kissy": [
+            "亲亲",
+            "么么",
+            "吻",
+            "mua",
+            "muah",
+            "亲一下",
+            "飞吻",
+            "kiss",
+            "xoxo",
+            "hug",
+            "muah",
+            "smooch",
+        ],
+        "confident": [
+            "自信",
+            "肯定",
+            "确定",
+            "毫无疑问",
+            "当然",
+            "必须的",
+            "毫无疑问",
+            "确信",
+            "坚信",
+            "confident",
+            "sure",
+            "certain",
+            "definitely",
+            "positive",
+        ],
+        "sleepy": [
+            "困",
+            "睡觉",
+            "晚安",
+            "想睡",
+            "好累",
+            "疲惫",
+            "疲倦",
+            "困了",
+            "想休息",
+            "睡意",
+            "sleep",
+            "sleepy",
+            "tired",
+            "exhausted",
+            "bedtime",
+            "good night",
+        ],
+        "silly": [
+            "傻",
+            "笨",
+            "呆",
+            "憨",
+            "蠢",
+            "二",
+            "憨憨",
+            "傻乎乎",
+            "呆萌",
+            "silly",
+            "stupid",
+            "dumb",
+            "foolish",
+            "goofy",
+            "ridiculous",
+        ],
+        "confused": [
+            "疑惑",
+            "不明白",
+            "不懂",
+            "困惑",
+            "疑问",
+            "为什么",
+            "怎么回事",
+            "啥意思",
+            "不清楚",
+            "confused",
+            "puzzled",
+            "doubt",
+            "question",
+            "what",
+            "why",
+            "how",
+        ],
     }
 
     # 特殊句型判断（中英文）
     # 赞美他人
-    if any(phrase in text for phrase in
-           ['你真', '你好', '您真', '你真棒', '你好厉害', '你太强了', '你真好', '你真聪明',
-            'you are', 'you\'re', 'you look', 'you seem', 'so smart', 'so kind']):
-        return 'loving'
+    if any(
+        phrase in text
+        for phrase in [
+            "你真",
+            "你好",
+            "您真",
+            "你真棒",
+            "你好厉害",
+            "你太强了",
+            "你真好",
+            "你真聪明",
+            "you are",
+            "you're",
+            "you look",
+            "you seem",
+            "so smart",
+            "so kind",
+        ]
+    ):
+        return "loving"
     # 自我赞美
-    if any(phrase in text for phrase in ['我真', '我最', '我太棒了', '我厉害', '我聪明', '我优秀',
-                                        'i am', 'i\'m', 'i feel', 'so good', 'so happy']):
-        return 'cool'
+    if any(
+        phrase in text
+        for phrase in [
+            "我真",
+            "我最",
+            "我太棒了",
+            "我厉害",
+            "我聪明",
+            "我优秀",
+            "i am",
+            "i'm",
+            "i feel",
+            "so good",
+            "so happy",
+        ]
+    ):
+        return "cool"
     # 晚安/睡觉相关
-    if any(phrase in text for phrase in ['睡觉', '晚安', '睡了', '好梦', '休息了', '去睡了',
-                                         'sleep', 'good night', 'bedtime', 'go to bed']):
-        return 'sleepy'
+    if any(
+        phrase in text
+        for phrase in [
+            "睡觉",
+            "晚安",
+            "睡了",
+            "好梦",
+            "休息了",
+            "去睡了",
+            "sleep",
+            "good night",
+            "bedtime",
+            "go to bed",
+        ]
+    ):
+        return "sleepy"
     # 疑问句
     if has_question and not has_exclamation:
-        return 'thinking'
+        return "thinking"
     # 强烈情感（感叹号）
     if has_exclamation and not has_question:
         # 检查是否是积极内容
-        positive_words = emotion_keywords['happy'] + emotion_keywords['laughing'] + emotion_keywords['cool']
+        positive_words = (
+            emotion_keywords["happy"]
+            + emotion_keywords["laughing"]
+            + emotion_keywords["cool"]
+        )
         if any(word in text for word in positive_words):
-            return 'laughing'
+            return "laughing"
         # 检查是否是消极内容
-        negative_words = emotion_keywords['angry'] + emotion_keywords['sad'] + emotion_keywords['crying']
+        negative_words = (
+            emotion_keywords["angry"]
+            + emotion_keywords["sad"]
+            + emotion_keywords["crying"]
+        )
         if any(word in text for word in negative_words):
-            return 'angry'
-        return 'surprised'
+            return "angry"
+        return "surprised"
     # 省略号（表示犹豫或思考）
     if has_ellipsis:
-        return 'thinking'
+        return "thinking"
 
     # 关键词匹配（带权重）
     emotion_scores = {emotion: 0 for emotion in emoji_map.keys()}
@@ -466,18 +832,33 @@ def analyze_emotion(text):
     # 根据分数选择最可能的情感
     max_score = max(emotion_scores.values())
     if max_score == 0:
-        return 'happy'  # 默认
+        return "happy"  # 默认
 
     # 可能有多个情感同分，根据上下文选择最合适的
     top_emotions = [e for e, s in emotion_scores.items() if s == max_score]
 
     # 如果多个情感同分，使用以下优先级
     priority_order = [
-        'laughing', 'crying', 'angry', 'surprised', 'shocked',  # 强烈情感优先
-        'loving', 'happy', 'funny', 'cool',  # 积极情感
-        'sad', 'embarrassed', 'confused',  # 消极情感
-        'thinking', 'winking', 'relaxed',  # 中性情感
-        'delicious', 'kissy', 'confident', 'sleepy', 'silly'  # 特殊场景
+        "laughing",
+        "crying",
+        "angry",
+        "surprised",
+        "shocked",  # 强烈情感优先
+        "loving",
+        "happy",
+        "funny",
+        "cool",  # 积极情感
+        "sad",
+        "embarrassed",
+        "confused",  # 消极情感
+        "thinking",
+        "winking",
+        "relaxed",  # 中性情感
+        "delicious",
+        "kissy",
+        "confident",
+        "sleepy",
+        "silly",  # 特殊场景
     ]
 
     for emotion in priority_order:
@@ -485,3 +866,50 @@ def analyze_emotion(text):
             return emotion
 
     return top_emotions[0]  # 如果都不在优先级列表里，返回第一个
+
+
+def audio_to_opus_data(audio_file_path):
+    """音频文件转换为Opus编码"""
+    # 获取文件后缀名
+    file_type = os.path.splitext(audio_file_path)[1]
+    if file_type:
+        file_type = file_type.lstrip(".")
+    # 读取音频文件，-nostdin 参数：不要从标准输入读取数据，否则FFmpeg会阻塞
+    audio = AudioSegment.from_file(
+        audio_file_path, format=file_type, parameters=["-nostdin"]
+    )
+
+    # 转换为单声道/16kHz采样率/16位小端编码（确保与编码器匹配）
+    audio = audio.set_channels(1).set_frame_rate(16000).set_sample_width(2)
+
+    # 音频时长(秒)
+    duration = len(audio) / 1000.0
+
+    # 获取原始PCM数据（16位小端）
+    raw_data = audio.raw_data
+
+    # 初始化Opus编码器
+    encoder = opuslib_next.Encoder(16000, 1, opuslib_next.APPLICATION_AUDIO)
+
+    # 编码参数
+    frame_duration = 60  # 60ms per frame
+    frame_size = int(16000 * frame_duration / 1000)  # 960 samples/frame
+
+    opus_datas = []
+    # 按帧处理所有音频数据（包括最后一帧可能补零）
+    for i in range(0, len(raw_data), frame_size * 2):  # 16bit=2bytes/sample
+        # 获取当前帧的二进制数据
+        chunk = raw_data[i : i + frame_size * 2]
+
+        # 如果最后一帧不足，补零
+        if len(chunk) < frame_size * 2:
+            chunk += b"\x00" * (frame_size * 2 - len(chunk))
+
+        # 转换为numpy数组处理
+        np_frame = np.frombuffer(chunk, dtype=np.int16)
+
+        # 编码Opus数据
+        opus_data = encoder.encode(np_frame.tobytes(), frame_size)
+        opus_datas.append(opus_data)
+
+    return opus_datas, duration

From 05331f001a134ec8e8f50121288e0a669d22bfcc Mon Sep 17 00:00:00 2001
From: Sakura-RanChen <1908198662@qq.com>
Date: Tue, 6 May 2025 15:15:27 +0800
Subject: [PATCH 46/53] =?UTF-8?q?update:=20tts=E8=B6=85=E6=97=B6=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=E6=96=87=E6=9C=AC=E7=B4=A2=E5=BC=95=E6=B7=B7?=
 =?UTF-8?q?=E4=B9=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/core/connection.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index f08a61ff..1fe63912 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -565,7 +565,7 @@ class ConnectionHandler:
                     future = self.executor.submit(
                         self.speak_and_play, segment_text, text_index
                     )
-                    self.tts_queue.put(future)
+                    self.tts_queue.put((future, text_index))
                     processed_chars += len(segment_text_raw)  # 更新已处理字符位置
 
         # 处理最后剩余的文本
@@ -695,7 +695,7 @@ class ConnectionHandler:
                             future = self.executor.submit(
                                 self.speak_and_play, segment_text, text_index
                             )
-                            self.tts_queue.put(future)
+                            self.tts_queue.put((future, text_index))
                             # 更新已处理字符位置
                             processed_chars += len(segment_text_raw)
 
@@ -859,7 +859,10 @@ class ConnectionHandler:
             text = None
             try:
                 try:
-                    future = self.tts_queue.get(timeout=1)
+                    item = self.tts_queue.get(timeout=1)
+                    if item is None:
+                        continue
+                    future, text_index = item  # 解包获取 Future 和 text_index
                 except queue.Empty:
                     if self.stop_event.is_set():
                         break
@@ -867,11 +870,11 @@ class ConnectionHandler:
                 if future is None:
                     continue
                 text = None
-                opus_datas, text_index, tts_file = [], 0, None
+                opus_datas, tts_file = [],  None
                 try:
                     self.logger.bind(tag=TAG).debug("正在处理TTS任务...")
                     tts_timeout = int(self.config.get("tts_timeout", 10))
-                    tts_file, text, text_index = future.result(timeout=tts_timeout)
+                    tts_file, text, _ = future.result(timeout=tts_timeout)
                     if text is None or len(text) <= 0:
                         self.logger.bind(tag=TAG).error(
                             f"TTS出错：{text_index}: tts text is empty"

From 12c957d48b3684bea2c9a8f1501870d7951d7b99 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Tue, 6 May 2025 17:14:58 +0800
Subject: [PATCH 47/53] =?UTF-8?q?update:=E4=BF=AE=E5=A4=8D=E6=99=BA?=
 =?UTF-8?q?=E6=8E=A7=E5=8F=B0=E6=A8=A1=E5=BC=8F=E4=B8=8B=EF=BC=8C=E6=89=80?=
 =?UTF-8?q?=E9=80=89=E6=A8=A1=E5=9D=97=E7=9A=84=E6=97=A5=E5=BF=97=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/config/logger.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/main/xiaozhi-server/config/logger.py b/main/xiaozhi-server/config/logger.py
index 396260f4..03768989 100644
--- a/main/xiaozhi-server/config/logger.py
+++ b/main/xiaozhi-server/config/logger.py
@@ -8,10 +8,16 @@ SERVER_VERSION = "0.3.14"
 
 
 def get_module_abbreviation(module_name, module_dict):
-    """获取模块名称的缩写，如果为空则返回00"""
-    return (
-        module_dict.get(module_name, "")[:2] if module_dict.get(module_name) else "00"
-    )
+    """获取模块名称的缩写，如果为空则返回00
+    如果名称中包含下划线，则返回下划线后面的前两个字符
+    """
+    module_value = module_dict.get(module_name, "")
+    if not module_value:
+        return "00"
+    if "_" in module_value:
+        parts = module_value.split("_")
+        return parts[-1][:2] if parts[-1] else "00"
+    return module_value[:2]
 
 
 def build_module_string(selected_module):

From b699886953e26cb07f7b709366b0ea0429e7ea4b Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Tue, 6 May 2025 17:30:39 +0800
Subject: [PATCH 48/53] =?UTF-8?q?update:=E4=BC=98=E5=8C=96=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=85=8D=E7=BD=AE=E6=95=8F=E6=84=9F=E5=AF=86=E9=92=A5?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/ParamsManagement.vue            | 32 ++++++++++++++++---
 main/xiaozhi-server/core/connection.py        |  1 +
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/main/manager-web/src/views/ParamsManagement.vue b/main/manager-web/src/views/ParamsManagement.vue
index 3301bbb5..afb0dc1d 100644
--- a/main/manager-web/src/views/ParamsManagement.vue
+++ b/main/manager-web/src/views/ParamsManagement.vue
@@ -25,8 +25,19 @@
                                 </template>
                             </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="paramValue" align="center" show-overflow-tooltip>
+                                <template slot-scope="scope">
+                                    <div v-if="isSensitiveParam(scope.row.paramCode)">
+                                        <span v-if="!scope.row.showValue">{{ maskSensitiveValue(scope.row.paramValue)
+                                        }}</span>
+                                        <span v-else>{{ scope.row.paramValue }}</span>
+                                        <el-button size="mini" type="text" @click="toggleSensitiveValue(scope.row)">
+                                            {{ scope.row.showValue ? '隐藏' : '查看' }}
+                                        </el-button>
+                                    </div>
+                                    <span v-else>{{ scope.row.paramValue }}</span>
+                                </template>
+                            </el-table-column>
                             <el-table-column label="备注" prop="remark" align="center"></el-table-column>
                             <el-table-column label="操作" align="center">
                                 <template slot-scope="scope">
@@ -100,6 +111,7 @@ export default {
             dialogVisible: false,
             dialogTitle: "新增参数",
             isAllSelected: false,
+            sensitive_keys: ["api_key", "personal_access_token", "access_token", "token", "secret", "access_key_secret", "secret_key"],
             paramForm: {
                 id: null,
                 paramCode: "",
@@ -152,7 +164,8 @@ export default {
                     if (data.code === 0) {
                         this.paramsList = data.data.list.map(item => ({
                             ...item,
-                            selected: false
+                            selected: false,
+                            showValue: false
                         }));
                         this.total = data.data.total;
                     } else {
@@ -314,7 +327,18 @@ export default {
         goToPage(page) {
             this.currentPage = page;
             this.fetchParams();
-        }
+        },
+        isSensitiveParam(paramCode) {
+            return this.sensitive_keys.some(key => paramCode.toLowerCase().includes(key.toLowerCase()));
+        },
+        maskSensitiveValue(value) {
+            if (!value) return '';
+            if (value.length <= 8) return '****';
+            return value.substring(0, 4) + '****' + value.substring(value.length - 4);
+        },
+        toggleSensitiveValue(row) {
+            this.$set(row, 'showValue', !row.showValue);
+        },
     },
 };
 </script>
diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index 27b1e0ac..6b503b66 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -1090,6 +1090,7 @@ def filter_sensitive_info(config: dict) -> dict:
         "personal_access_token",
         "access_token",
         "token",
+        "secret",
         "access_key_secret",
         "secret_key",
     ]

From 43d2adff7068d5a4c1e912e265ba24091b45aacf Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Wed, 7 May 2025 09:11:59 +0800
Subject: [PATCH 49/53] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E9=85=8D=E7=BD=AE=E5=B9=B6=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/core/connection.py        | 70 +----------------
 main/xiaozhi-server/core/handle/textHandle.py | 50 +++++++++++-
 main/xiaozhi-server/core/websocket_server.py  | 78 ++++++++++++++++++-
 3 files changed, 126 insertions(+), 72 deletions(-)

diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index 6b503b66..ac22c272 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -53,9 +53,9 @@ class ConnectionHandler:
         server=None,
     ):
         self.config = config
-        self.server = server
         self.logger = setup_logging()
         self.auth = AuthMiddleware(config)
+        self.server = server  # 保存server实例的引用
 
         self.need_bind = False
         self.bind_code = None
@@ -233,74 +233,6 @@ class ConnectionHandler:
         elif isinstance(message, bytes):
             await handleAudioMessage(self, message)
 
-    async def handle_config_update(self, message):
-        """处理配置更新请求"""
-        content = message.get("content", {})
-        new_config = content
-
-        # 遍历所有支持的配置模块
-        updated_modules = []
-        for config_model in ["tts", "llm", "vad", "asr", "memory", "intent"]:
-            if config_model not in new_config:
-                continue
-
-            new_content = new_config[config_model]
-            old_content = self.config.get(config_model, {})
-
-            # 记录配置变更
-            self.logger.bind(tag=TAG).info(
-                f"配置更新: {config_model} 旧值: {json.dumps(old_content, ensure_ascii=False)} "
-                f"新值: {json.dumps(new_content, ensure_ascii=False)}"
-            )
-
-            # 深度合并配置
-            if isinstance(old_content, dict) and isinstance(new_content, dict):
-                merged = {**old_content, **new_content}
-                self.config[config_model] = merged
-            else:
-                self.config[config_model] = new_content
-
-            # 标记需要重新初始化的模块
-            if config_model in ["llm", "tts", "asr", "vad", "intent", "memory"]:
-                updated_modules.append(config_model)
-
-        # 同步更新 WebSocketServer 的配置
-        if self.server:
-            async with self.server.config_lock:  # 使用锁确保线程安全
-                for config_model in updated_modules:
-                    self.server.config[config_model].update(new_config[config_model])
-
-        # 批量初始化模块
-        if updated_modules:
-            try:
-                self._initialize_components(self.config)
-                self.logger.bind(tag=TAG).info(
-                    f"已重新初始化模块: {', '.join(updated_modules)}"
-                )
-            except Exception as e:
-                self.logger.bind(tag=TAG).error(f"模块初始化失败: {str(e)}")
-                await self.websocket.send(
-                    json.dumps(
-                        {
-                            "type": "config_update_response",
-                            "status": "error",
-                            "message": f"模块初始化失败: {str(e)}",
-                        }
-                    )
-                )
-                return
-
-        # 返回成功响应
-        await self.websocket.send(
-            json.dumps(
-                {
-                    "type": "config_update_response",
-                    "status": "success",
-                    "message": f"已更新配置: {', '.join(updated_modules)}",
-                }
-            )
-        )
-
     def _initialize_components(self, private_config):
         """初始化组件"""
         if private_config is not None:
diff --git a/main/xiaozhi-server/core/handle/textHandle.py b/main/xiaozhi-server/core/handle/textHandle.py
index d350f78c..0bded15b 100644
--- a/main/xiaozhi-server/core/handle/textHandle.py
+++ b/main/xiaozhi-server/core/handle/textHandle.py
@@ -80,7 +80,7 @@ async def handleTextMessage(conn, message):
                 await conn.websocket.send(
                     json.dumps(
                         {
-                            "type": "config_update_response",
+                            "type": "server",
                             "status": "error",
                             "message": "服务器密钥验证失败",
                         }
@@ -89,6 +89,52 @@ async def handleTextMessage(conn, message):
                 return
             # 动态更新配置
             if msg_json["action"] == "update_config":
-                await conn.handle_config_update(msg_json)
+                try:
+                    # 更新WebSocketServer的配置
+                    if not conn.server:
+                        await conn.websocket.send(
+                            json.dumps(
+                                {
+                                    "type": "config_update_response",
+                                    "status": "error",
+                                    "message": "无法获取服务器实例",
+                                }
+                            )
+                        )
+                        return
+
+                    if not await conn.server.update_config():
+                        await conn.websocket.send(
+                            json.dumps(
+                                {
+                                    "type": "config_update_response",
+                                    "status": "error",
+                                    "message": "更新服务器配置失败",
+                                }
+                            )
+                        )
+                        return
+
+                    # 发送成功响应
+                    await conn.websocket.send(
+                        json.dumps(
+                            {
+                                "type": "config_update_response",
+                                "status": "success",
+                                "message": "配置更新成功",
+                            }
+                        )
+                    )
+                except Exception as e:
+                    conn.logger.bind(tag=TAG).error(f"更新配置失败: {str(e)}")
+                    await conn.websocket.send(
+                        json.dumps(
+                            {
+                                "type": "config_update_response",
+                                "status": "error",
+                                "message": f"更新配置失败: {str(e)}",
+                            }
+                        )
+                    )
     except json.JSONDecodeError:
         await conn.websocket.send(message)
diff --git a/main/xiaozhi-server/core/websocket_server.py b/main/xiaozhi-server/core/websocket_server.py
index 06f00594..9e84aaec 100644
--- a/main/xiaozhi-server/core/websocket_server.py
+++ b/main/xiaozhi-server/core/websocket_server.py
@@ -3,6 +3,7 @@ import websockets
 from config.logger import setup_logging
 from core.connection import ConnectionHandler
 from core.utils.util import initialize_modules
+from config.config_loader import get_config_from_api
 
 TAG = __name__
 
@@ -51,7 +52,7 @@ class WebSocketServer:
             self._tts,
             self._memory,
             self._intent,
-            self,  # 传入当前 WebSocketServer 实例
+            self,  # 传入server实例
         )
         self.active_connections.add(handler)
         try:
@@ -67,3 +68,78 @@ class WebSocketServer:
         else:
             # 如果是普通 HTTP 请求，返回 "server is running"
             return websocket.respond(200, "Server is running\n")
+
+    async def update_config(self) -> bool:
+        """更新服务器配置并重新初始化组件
+
+        Returns:
+            bool: 更新是否成功
+        """
+        try:
+            async with self.config_lock:
+                # 重新获取配置
+                new_config = get_config_from_api(self.config)
+                if new_config is None:
+                    self.logger.bind(tag=TAG).error("获取新配置失败")
+                    return False
+
+                # 检查 VAD 和 ASR 类型是否需要更新
+                update_vad = False
+                update_asr = False
+
+                # 获取当前和新的 VAD 类型
+                current_vad_module = self.config["selected_module"]["VAD"]
+                new_vad_module = new_config["selected_module"]["VAD"]
+                current_vad_type = (
+                    current_vad_module
+                    if "type" not in self.config["VAD"][current_vad_module]
+                    else self.config["VAD"][current_vad_module]["type"]
+                )
+                new_vad_type = (
+                    new_vad_module
+                    if "type" not in new_config["VAD"][new_vad_module]
+                    else new_config["VAD"][new_vad_module]["type"]
+                )
+                update_vad = current_vad_type != new_vad_type
+
+                # 获取当前和新的 ASR 类型
+                current_asr_module = self.config["selected_module"]["ASR"]
+                new_asr_module = new_config["selected_module"]["ASR"]
+                current_asr_type = (
+                    current_asr_module
+                    if "type" not in self.config["ASR"][current_asr_module]
+                    else self.config["ASR"][current_asr_module]["type"]
+                )
+                new_asr_type = (
+                    new_asr_module
+                    if "type" not in new_config["ASR"][new_asr_module]
+                    else new_config["ASR"][new_asr_module]["type"]
+                )
+                update_asr = current_asr_type != new_asr_type
+
+                # 更新配置
+                self.config = new_config
+                # 重新初始化组件
+                modules = initialize_modules(
+                    self.logger,
+                    new_config,
+                    update_vad,
+                    update_asr,
+                    "LLM" in new_config["selected_module"],
+                    "TTS" in new_config["selected_module"],
+                    "Memory" in new_config["selected_module"],
+                    "Intent" in new_config["selected_module"],
+                )
+
+                # 更新组件实例
+                self._vad = modules["vad"] if "vad" in modules else None
+                self._asr = modules["asr"] if "asr" in modules else None
+                self._tts = modules["tts"] if "tts" in modules else None
+                self._llm = modules["llm"] if "llm" in modules else None
+                self._intent = modules["intent"] if "intent" in modules else None
+                self._memory = modules["memory"] if "memory" in modules else None
+
+                return True
+        except Exception as e:
+            self.logger.bind(tag=TAG).error(f"更新服务器配置失败: {str(e)}")
+            return False

From bbc31e01c40c00b6d590cb7320db00e7dbb646d8 Mon Sep 17 00:00:00 2001
From: Sakura-RanChen <1908198662@qq.com>
Date: Wed, 7 May 2025 14:31:59 +0800
Subject: [PATCH 50/53] =?UTF-8?q?fix:tts=E9=98=9F=E5=88=97=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E5=85=83=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/core/connection.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index 060de4c9..6836c08e 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -510,7 +510,7 @@ class ConnectionHandler:
                 future = self.executor.submit(
                     self.speak_and_play, segment_text, text_index
                 )
-                self.tts_queue.put(future)
+                self.tts_queue.put((future, text_index))
 
         self.llm_finish_task = True
         self.dialogue.put(Message(role="assistant", content="".join(response_message)))
@@ -685,7 +685,7 @@ class ConnectionHandler:
                 future = self.executor.submit(
                     self.speak_and_play, segment_text, text_index
                 )
-                self.tts_queue.put(future)
+                self.tts_queue.put((future, text_index))
 
         # 存储对话内容
         if len(response_message) > 0:
@@ -747,7 +747,7 @@ class ConnectionHandler:
             text = result.response
             self.recode_first_last_text(text, text_index)
             future = self.executor.submit(self.speak_and_play, text, text_index)
-            self.tts_queue.put(future)
+            self.tts_queue.put((future, text_index))
             self.dialogue.put(Message(role="assistant", content=text))
         elif result.action == Action.REQLLM:  # 调用函数后再请求llm生成回复
             text = result.result
@@ -780,7 +780,7 @@ class ConnectionHandler:
             text = result.result
             self.recode_first_last_text(text, text_index)
             future = self.executor.submit(self.speak_and_play, text, text_index)
-            self.tts_queue.put(future)
+            self.tts_queue.put((future, text_index))
             self.dialogue.put(Message(role="assistant", content=text))
         else:
             pass
@@ -908,6 +908,8 @@ class ConnectionHandler:
         if text is None or len(text) <= 0:
             self.logger.bind(tag=TAG).info(f"无需tts转换，query为空，{text}")
             return None, text, text_index
+        if text_index>2:
+            time.sleep(20)
         tts_file = self.tts.to_tts(text)
         if tts_file is None:
             self.logger.bind(tag=TAG).error(f"tts转换失败，{text}")

From 4a3ac2cfcd6c09392190f84d417ccde64a7564b2 Mon Sep 17 00:00:00 2001
From: Sakura-RanChen <1908198662@qq.com>
Date: Wed, 7 May 2025 14:35:41 +0800
Subject: [PATCH 51/53] no message

---
 main/xiaozhi-server/core/connection.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index 6836c08e..56c745fe 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -908,8 +908,6 @@ class ConnectionHandler:
         if text is None or len(text) <= 0:
             self.logger.bind(tag=TAG).info(f"无需tts转换，query为空，{text}")
             return None, text, text_index
-        if text_index>2:
-            time.sleep(20)
         tts_file = self.tts.to_tts(text)
         if tts_file is None:
             self.logger.bind(tag=TAG).error(f"tts转换失败，{text}")

From 44e1f00ffc8e7b89f9a741f21fb1ec54d93e3e83 Mon Sep 17 00:00:00 2001
From: Sakura-RanChen <1908198662@qq.com>
Date: Wed, 7 May 2025 15:17:34 +0800
Subject: [PATCH 52/53] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B9=E4=BE=BF=E6=84=8F=E5=9B=BE=E8=AF=86=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/plugins_func/functions/play_music.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/main/xiaozhi-server/plugins_func/functions/play_music.py b/main/xiaozhi-server/plugins_func/functions/play_music.py
index 0b283c8e..4ea9bb57 100644
--- a/main/xiaozhi-server/plugins_func/functions/play_music.py
+++ b/main/xiaozhi-server/plugins_func/functions/play_music.py
@@ -10,6 +10,7 @@ from pathlib import Path
 from core.utils import p3
 from core.handle.sendAudioHandle import send_stt_message
 from plugins_func.register import register_function, ToolType, ActionResponse, Action
+from core.utils.dialogue import Message
 
 
 TAG = __name__
@@ -214,6 +215,7 @@ async def play_local_music(conn, specific_file=None):
             return
         text = _get_random_play_prompt(selected_music)
         await send_stt_message(conn, text)
+        conn.dialogue.put(Message(role="assistant", content=text))
         conn.tts_first_text_index = 0
         conn.tts_last_text_index = 0
 

From ea5f54e4210ffccdc7fdf8e763912beaa2c6ff3e Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Wed, 7 May 2025 18:06:13 +0800
Subject: [PATCH 53/53] =?UTF-8?q?update:=E4=BC=98=E5=8C=96=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/xiaozhi-server/core/connection.py        | 124 ++++++++----------
 .../xiaozhi-server/core/handle/abortHandle.py |   9 +-
 .../core/handle/functionHandler.py            |  11 +-
 .../xiaozhi-server/core/handle/helloHandle.py |   3 +-
 .../core/handle/intentHandler.py              |  14 +-
 main/xiaozhi-server/core/handle/iotHandle.py  |  41 +++---
 .../core/handle/receiveAudioHandle.py         |  12 +-
 .../core/handle/sendAudioHandle.py            |   6 +-
 main/xiaozhi-server/core/handle/textHandle.py |   8 +-
 .../core/handle/ttsReportHandle.py            |  17 +--
 main/xiaozhi-server/core/mcp/manager.py       |  23 ++--
 main/xiaozhi-server/core/utils/dialogue.py    |  27 ++--
 main/xiaozhi-server/core/utils/util.py        |  48 ++++++-
 main/xiaozhi-server/core/websocket_server.py  |  54 +++-----
 .../plugins_func/functions/play_music.py      |  26 ++--
 .../plugins_func/functions/plugin_loader.py   |  69 +++++-----
 16 files changed, 249 insertions(+), 243 deletions(-)

diff --git a/main/xiaozhi-server/core/connection.py b/main/xiaozhi-server/core/connection.py
index 060de4c9..b49917ba 100644
--- a/main/xiaozhi-server/core/connection.py
+++ b/main/xiaozhi-server/core/connection.py
@@ -18,6 +18,8 @@ from core.utils.util import (
     get_string_no_punctuation_or_emoji,
     extract_json_from_string,
     initialize_modules,
+    check_vad_update,
+    check_asr_update,
 )
 from concurrent.futures import ThreadPoolExecutor, TimeoutError
 from core.handle.sendAudioHandle import sendAudioMessage
@@ -52,7 +54,9 @@ class ConnectionHandler:
         _intent,
         server=None,
     ):
-        self.config = config
+        self.common_config = config
+        self.config = copy.deepcopy(config)
+        self.session_id = str(uuid.uuid4())
         self.logger = setup_logging()
         self.auth = AuthMiddleware(config)
         self.server = server  # 保存server实例的引用
@@ -66,7 +70,6 @@ class ConnectionHandler:
         self.device_id = None
         self.client_ip = None
         self.client_ip_info = {}
-        self.session_id = None
         self.prompt = None
         self.welcome_msg = None
         self.max_output_size = 0
@@ -87,8 +90,10 @@ class ConnectionHandler:
         self.tts_report_thread = None
 
         # 依赖的组件
-        self.vad = _vad
-        self.asr = _asr
+        self.vad = None
+        self.asr = None
+        self._asr = _asr
+        self._vad = _vad
         self.llm = _llm
         self.tts = _tts
         self.memory = _memory
@@ -166,7 +171,6 @@ class ConnectionHandler:
             # 认证通过,继续处理
             self.websocket = ws
             self.device_id = self.headers.get("device-id", None)
-            self.session_id = str(uuid.uuid4())
 
             # 启动超时检查任务
             self.timeout_task = asyncio.create_task(self._check_timeout())
@@ -176,9 +180,9 @@ class ConnectionHandler:
             await self.websocket.send(json.dumps(self.welcome_msg))
 
             # 获取差异化配置
-            private_config = self._initialize_private_config()
+            self._initialize_private_config()
             # 异步初始化
-            self.executor.submit(self._initialize_components, private_config)
+            self.executor.submit(self._initialize_components)
             # tts 消化线程
             self.tts_priority_thread = threading.Thread(
                 target=self._tts_priority_thread, daemon=True
@@ -233,13 +237,17 @@ class ConnectionHandler:
         elif isinstance(message, bytes):
             await handleAudioMessage(self, message)
 
-    def _initialize_components(self, private_config):
+    def _initialize_components(self):
         """初始化组件"""
-        if private_config is not None:
-            self._initialize_models(private_config)
-        else:
-            self.prompt = self.config["prompt"]
-            self.change_system_prompt(self.prompt)
+        self.prompt = self.config["prompt"]
+        self.change_system_prompt(self.prompt)
+        self.logger.bind(tag=TAG).info(f"初始化组件: prompt成功 {self.prompt[:50]}...")
+
+        """初始化本地组件"""
+        if self.vad is None:
+            self.vad = self._vad
+        if self.asr is None:
+            self.asr = self._asr
         """加载记忆"""
         self._initialize_memory()
         """加载意图识别"""
@@ -286,54 +294,21 @@ class ConnectionHandler:
             self.logger.bind(tag=TAG).error(f"获取差异化配置失败: {e}")
             private_config = {}
 
-        init_tts = False
-        if private_config.get("TTS", None) is not None:
-            init_tts = True
-            self.config["TTS"] = private_config["TTS"]
-            self.config["selected_module"]["TTS"] = private_config["selected_module"][
-                "TTS"
-            ]
-
-        try:
-            modules = initialize_modules(
-                self.logger,
-                private_config,
-                False,
-                False,
-                False,
-                init_tts,
-                False,
-                False,
-            )
-        except Exception as e:
-            self.logger.bind(tag=TAG).error(f"初始化组件失败: {e}")
-            modules = {}
-        if modules.get("tts", None) is not None:
-            self.tts = modules["tts"]
-        if modules.get("prompt", None) is not None:
-            self.change_system_prompt(modules["prompt"])
-            private_config["prompt"] = None
-        return private_config
-
-    def _initialize_models(self, private_config):
-        init_vad, init_asr, init_llm, init_memory, init_intent = (
-            False,
+        init_llm, init_tts, init_memory, init_intent = (
             False,
             False,
             False,
             False,
         )
-        if private_config.get("VAD", None) is not None:
-            init_vad = True
-            self.config["VAD"] = private_config["VAD"]
-            self.config["selected_module"]["VAD"] = private_config["selected_module"][
-                "VAD"
-            ]
-        if private_config.get("ASR", None) is not None:
-            init_asr = True
-            self.config["ASR"] = private_config["ASR"]
-            self.config["selected_module"]["ASR"] = private_config["selected_module"][
-                "ASR"
+
+        init_vad = check_vad_update(self.common_config, private_config)
+        init_asr = check_asr_update(self.common_config, private_config)
+
+        if private_config.get("TTS", None) is not None:
+            init_tts = True
+            self.config["TTS"] = private_config["TTS"]
+            self.config["selected_module"]["TTS"] = private_config["selected_module"][
+                "TTS"
             ]
         if private_config.get("LLM", None) is not None:
             init_llm = True
@@ -353,8 +328,11 @@ class ConnectionHandler:
             self.config["selected_module"]["Intent"] = private_config[
                 "selected_module"
             ]["Intent"]
+        if private_config.get("prompt", None) is not None:
+            self.config["prompt"] = private_config["prompt"]
         if private_config.get("device_max_output_size", None) is not None:
             self.max_output_size = int(private_config["device_max_output_size"])
+
         try:
             modules = initialize_modules(
                 self.logger,
@@ -362,13 +340,15 @@ class ConnectionHandler:
                 init_vad,
                 init_asr,
                 init_llm,
-                False,
+                init_tts,
                 init_memory,
                 init_intent,
             )
         except Exception as e:
             self.logger.bind(tag=TAG).error(f"初始化组件失败: {e}")
             modules = {}
+        if modules.get("tts", None) is not None:
+            self.tts = modules["tts"]
         if modules.get("vad", None) is not None:
             self.vad = modules["vad"]
         if modules.get("asr", None) is not None:
@@ -446,10 +426,12 @@ class ConnectionHandler:
         processed_chars = 0  # 跟踪已处理的字符位置
         try:
             # 使用带记忆的对话
-            future = asyncio.run_coroutine_threadsafe(
-                self.memory.query_memory(query), self.loop
-            )
-            memory_str = future.result()
+            memory_str = None
+            if self.memory is not None:
+                future = asyncio.run_coroutine_threadsafe(
+                    self.memory.query_memory(query), self.loop
+                )
+                memory_str = future.result()
 
             self.logger.bind(tag=TAG).debug(f"记忆内容: {memory_str}")
             llm_responses = self.llm.response(
@@ -510,7 +492,7 @@ class ConnectionHandler:
                 future = self.executor.submit(
                     self.speak_and_play, segment_text, text_index
                 )
-                self.tts_queue.put(future)
+                self.tts_queue.put((future, text_index))
 
         self.llm_finish_task = True
         self.dialogue.put(Message(role="assistant", content="".join(response_message)))
@@ -537,10 +519,12 @@ class ConnectionHandler:
             start_time = time.time()
 
             # 使用带记忆的对话
-            future = asyncio.run_coroutine_threadsafe(
-                self.memory.query_memory(query), self.loop
-            )
-            memory_str = future.result()
+            memory_str = None
+            if self.memory is not None:
+                future = asyncio.run_coroutine_threadsafe(
+                    self.memory.query_memory(query), self.loop
+                )
+                memory_str = future.result()
 
             # self.logger.bind(tag=TAG).info(f"对话记录: {self.dialogue.get_llm_dialogue_with_memory(memory_str)}")
 
@@ -685,7 +669,7 @@ class ConnectionHandler:
                 future = self.executor.submit(
                     self.speak_and_play, segment_text, text_index
                 )
-                self.tts_queue.put(future)
+                self.tts_queue.put((future, text_index))
 
         # 存储对话内容
         if len(response_message) > 0:
@@ -747,7 +731,7 @@ class ConnectionHandler:
             text = result.response
             self.recode_first_last_text(text, text_index)
             future = self.executor.submit(self.speak_and_play, text, text_index)
-            self.tts_queue.put(future)
+            self.tts_queue.put((future, text_index))
             self.dialogue.put(Message(role="assistant", content=text))
         elif result.action == Action.REQLLM:  # 调用函数后再请求llm生成回复
             text = result.result
@@ -780,7 +764,7 @@ class ConnectionHandler:
             text = result.result
             self.recode_first_last_text(text, text_index)
             future = self.executor.submit(self.speak_and_play, text, text_index)
-            self.tts_queue.put(future)
+            self.tts_queue.put((future, text_index))
             self.dialogue.put(Message(role="assistant", content=text))
         else:
             pass
@@ -801,7 +785,7 @@ class ConnectionHandler:
                 if future is None:
                     continue
                 text = None
-                opus_datas, tts_file = [],  None
+                opus_datas, tts_file = [], None
                 try:
                     self.logger.bind(tag=TAG).debug("正在处理TTS任务...")
                     tts_timeout = int(self.config.get("tts_timeout", 10))
diff --git a/main/xiaozhi-server/core/handle/abortHandle.py b/main/xiaozhi-server/core/handle/abortHandle.py
index 35385b89..fe271511 100644
--- a/main/xiaozhi-server/core/handle/abortHandle.py
+++ b/main/xiaozhi-server/core/handle/abortHandle.py
@@ -3,15 +3,16 @@ import queue
 from config.logger import setup_logging
 
 TAG = __name__
-logger = setup_logging()
 
 
 async def handleAbortMessage(conn):
-    logger.bind(tag=TAG).info("Abort message received")
+    conn.logger.bind(tag=TAG).info("Abort message received")
     # 设置成打断状态，会自动打断llm、tts任务
     conn.client_abort = True
     conn.clear_queues()
     # 打断客户端说话状态
-    await conn.websocket.send(json.dumps({"type": "tts", "state": "stop", "session_id": conn.session_id}))
+    await conn.websocket.send(
+        json.dumps({"type": "tts", "state": "stop", "session_id": conn.session_id})
+    )
     conn.clearSpeakStatus()
-    logger.bind(tag=TAG).info("Abort message received-end")
+    conn.logger.bind(tag=TAG).info("Abort message received-end")
diff --git a/main/xiaozhi-server/core/handle/functionHandler.py b/main/xiaozhi-server/core/handle/functionHandler.py
index 77d22bb9..b09a369c 100644
--- a/main/xiaozhi-server/core/handle/functionHandler.py
+++ b/main/xiaozhi-server/core/handle/functionHandler.py
@@ -4,7 +4,6 @@ from plugins_func.register import FunctionRegistry, ActionResponse, Action, Tool
 from plugins_func.functions.hass_init import append_devices_to_prompt
 
 TAG = __name__
-logger = setup_logging()
 
 
 class FunctionHandler:
@@ -40,7 +39,9 @@ class FunctionHandler:
         for func in self.functions_desc:
             func_names.append(func["function"]["name"])
         # 打印当前支持的函数列表
-        logger.bind(tag=TAG).info(f"当前支持的函数列表: {func_names}")
+        self.conn.logger.bind(tag=TAG, session_id=self.conn.session_id).info(
+            f"当前支持的函数列表: {func_names}"
+        )
         return func_names
 
     def get_functions(self):
@@ -79,7 +80,9 @@ class FunctionHandler:
             func = funcItem.func
             arguments = function_call_data["arguments"]
             arguments = json.loads(arguments) if arguments else {}
-            logger.bind(tag=TAG).debug(f"调用函数: {function_name}, 参数: {arguments}")
+            self.conn.logger.bind(tag=TAG).debug(
+                f"调用函数: {function_name}, 参数: {arguments}"
+            )
             if (
                 funcItem.type == ToolType.SYSTEM_CTL
                 or funcItem.type == ToolType.IOT_CTL
@@ -94,6 +97,6 @@ class FunctionHandler:
                     action=Action.NOTFOUND, result="没有找到对应的函数", response=""
                 )
         except Exception as e:
-            logger.bind(tag=TAG).error(f"处理function call错误: {e}")
+            self.conn.logger.bind(tag=TAG).error(f"处理function call错误: {e}")
 
         return None
diff --git a/main/xiaozhi-server/core/handle/helloHandle.py b/main/xiaozhi-server/core/handle/helloHandle.py
index e84a798f..b23c2f0a 100644
--- a/main/xiaozhi-server/core/handle/helloHandle.py
+++ b/main/xiaozhi-server/core/handle/helloHandle.py
@@ -9,7 +9,6 @@ import random
 import time
 
 TAG = __name__
-logger = setup_logging()
 
 WAKEUP_CONFIG = {
     "dir": "config/assets/",
@@ -75,7 +74,7 @@ async def wakeupWordsResponse(conn):
         await asyncio.sleep(1)
         wait_max_time -= 1
         if wait_max_time <= 0:
-            logger.bind(tag=TAG).error("连接对象没有llm")
+            conn.logger.bind(tag=TAG).error("连接对象没有llm")
             return
 
     """唤醒词响应"""
diff --git a/main/xiaozhi-server/core/handle/intentHandler.py b/main/xiaozhi-server/core/handle/intentHandler.py
index 90d8e1d5..0174bc43 100644
--- a/main/xiaozhi-server/core/handle/intentHandler.py
+++ b/main/xiaozhi-server/core/handle/intentHandler.py
@@ -5,10 +5,8 @@ from core.handle.sendAudioHandle import send_stt_message
 from core.handle.helloHandle import checkWakeupWords
 from core.utils.util import remove_punctuation_and_length
 from core.utils.dialogue import Message
-from loguru import logger
 
 TAG = __name__
-logger = setup_logging()
 
 
 async def handle_user_intent(conn, text):
@@ -36,7 +34,7 @@ async def check_direct_exit(conn, text):
     cmd_exit = conn.cmd_exit
     for cmd in cmd_exit:
         if text == cmd:
-            logger.bind(tag=TAG).info(f"识别到明确的退出命令: {text}")
+            conn.logger.bind(tag=TAG).info(f"识别到明确的退出命令: {text}")
             await send_stt_message(conn, text)
             await conn.close()
             return True
@@ -46,7 +44,7 @@ async def check_direct_exit(conn, text):
 async def analyze_intent_with_llm(conn, text):
     """使用LLM分析用户意图"""
     if not hasattr(conn, "intent") or not conn.intent:
-        logger.bind(tag=TAG).warning("意图识别服务未初始化")
+        conn.logger.bind(tag=TAG).warning("意图识别服务未初始化")
         return None
 
     # 对话历史记录
@@ -55,7 +53,7 @@ async def analyze_intent_with_llm(conn, text):
         intent_result = await conn.intent.detect_intent(conn, dialogue.dialogue, text)
         return intent_result
     except Exception as e:
-        logger.bind(tag=TAG).error(f"意图识别失败: {str(e)}")
+        conn.logger.bind(tag=TAG).error(f"意图识别失败: {str(e)}")
 
     return None
 
@@ -69,7 +67,7 @@ async def process_intent_result(conn, intent_result, original_text):
         # 检查是否有function_call
         if "function_call" in intent_data:
             # 直接从意图识别获取了function_call
-            logger.bind(tag=TAG).debug(
+            conn.logger.bind(tag=TAG).debug(
                 f"检测到function_call格式的意图结果: {intent_data['function_call']['name']}"
             )
             function_name = intent_data["function_call"]["name"]
@@ -118,7 +116,7 @@ async def process_intent_result(conn, intent_result, original_text):
                             conn.speak_and_play, text, text_index
                         )
                         conn.llm_finish_task = True
-                        conn.tts_queue.put(future)
+                        conn.tts_queue.put((future, text_index))
                         conn.dialogue.put(Message(role="assistant", content=text))
 
             # 将函数执行放在线程池中
@@ -126,7 +124,7 @@ async def process_intent_result(conn, intent_result, original_text):
             return True
         return False
     except json.JSONDecodeError as e:
-        logger.bind(tag=TAG).error(f"处理意图结果时出错: {e}")
+        conn.logger.bind(tag=TAG).error(f"处理意图结果时出错: {e}")
         return False
 
 
diff --git a/main/xiaozhi-server/core/handle/iotHandle.py b/main/xiaozhi-server/core/handle/iotHandle.py
index c6d9f4d1..12432102 100644
--- a/main/xiaozhi-server/core/handle/iotHandle.py
+++ b/main/xiaozhi-server/core/handle/iotHandle.py
@@ -10,7 +10,6 @@ from plugins_func.register import (
 )
 
 TAG = __name__
-logger = setup_logging()
 
 
 def wrap_async_function(async_func):
@@ -21,7 +20,7 @@ def wrap_async_function(async_func):
             # 获取连接对象（第一个参数）
             conn = args[0]
             if not hasattr(conn, "loop"):
-                logger.bind(tag=TAG).error("Connection对象没有loop属性")
+                conn.logger.bind(tag=TAG).error("Connection对象没有loop属性")
                 return ActionResponse(
                     Action.ERROR,
                     "Connection对象没有loop属性",
@@ -35,7 +34,7 @@ def wrap_async_function(async_func):
             # 等待结果返回
             return future.result()
         except Exception as e:
-            logger.bind(tag=TAG).error(f"运行异步函数时出错: {e}")
+            conn.logger.bind(tag=TAG).error(f"运行异步函数时出错: {e}")
             return ActionResponse(Action.ERROR, str(e), f"执行操作时出错: {e}")
 
     return wrapper
@@ -57,7 +56,7 @@ def create_iot_function(device_name, method_name, method_info):
                 response_failure = "操作失败"
 
             # 打印响应参数
-            logger.bind(tag=TAG).debug(
+            conn.logger.bind(tag=TAG).debug(
                 f"控制函数接收到的响应参数: success='{response_success}', failure='{response_failure}'"
             )
 
@@ -86,7 +85,9 @@ def create_iot_function(device_name, method_name, method_info):
 
             return ActionResponse(Action.RESPONSE, result, response)
         except Exception as e:
-            logger.bind(tag=TAG).error(f"执行{device_name}的{method_name}操作失败: {e}")
+            conn.logger.bind(tag=TAG).error(
+                f"执行{device_name}的{method_name}操作失败: {e}"
+            )
 
             # 操作失败时使用大模型提供的失败响应
             response = response_failure
@@ -104,7 +105,7 @@ def create_iot_query_function(device_name, prop_name, prop_info):
     async def iot_query_function(conn, response_success=None, response_failure=None):
         try:
             # 打印响应参数
-            logger.bind(tag=TAG).info(
+            conn.logger.bind(tag=TAG).info(
                 f"查询函数接收到的响应参数: success='{response_success}', failure='{response_failure}'"
             )
 
@@ -122,7 +123,9 @@ def create_iot_query_function(device_name, prop_name, prop_info):
 
                 return ActionResponse(Action.ERROR, f"属性{prop_name}不存在", response)
         except Exception as e:
-            logger.bind(tag=TAG).error(f"查询{device_name}的{prop_name}时出错: {e}")
+            conn.logger.bind(tag=TAG).error(
+                f"查询{device_name}的{prop_name}时出错: {e}"
+            )
 
             # 查询出错时使用大模型提供的失败响应
             response = response_failure
@@ -280,7 +283,7 @@ async def handleIotDescriptors(conn, descriptors):
         await asyncio.sleep(1)
         wait_max_time -= 1
         if wait_max_time <= 0:
-            logger.bind(tag=TAG).debug("连接对象没有func_handler")
+            conn.logger.bind(tag=TAG).debug("连接对象没有func_handler")
             return
     """处理物联网描述"""
     functions_changed = False
@@ -323,7 +326,7 @@ async def handleIotDescriptors(conn, descriptors):
             if hasattr(conn, "func_handler"):
                 for func_name in device_functions:
                     conn.func_handler.function_registry.register_function(func_name)
-                    logger.bind(tag=TAG).info(
+                    conn.logger.bind(tag=TAG).info(
                         f"注册IOT函数到function handler: {func_name}"
                     )
                     functions_changed = True
@@ -332,8 +335,8 @@ async def handleIotDescriptors(conn, descriptors):
     if functions_changed and hasattr(conn, "func_handler"):
         conn.func_handler.upload_functions_desc()
         func_names = conn.func_handler.current_support_functions()
-        logger.bind(tag=TAG).info(f"设备类型: {type_id}")
-        logger.bind(tag=TAG).info(
+        conn.logger.bind(tag=TAG).info(f"设备类型: {type_id}")
+        conn.logger.bind(tag=TAG).info(
             f"更新function描述列表完成，当前支持的函数: {func_names}"
         )
 
@@ -347,13 +350,13 @@ async def handleIotStatus(conn, states):
                     for k, v in state["state"].items():
                         if property_item["name"] == k:
                             if type(v) != type(property_item["value"]):
-                                logger.bind(tag=TAG).error(
+                                conn.logger.bind(tag=TAG).error(
                                     f"属性{property_item['name']}的值类型不匹配"
                                 )
                                 break
                             else:
                                 property_item["value"] = v
-                                logger.bind(tag=TAG).info(
+                                conn.logger.bind(tag=TAG).info(
                                     f"物联网状态更新: {key} , {property_item['name']} = {v}"
                                 )
                             break
@@ -367,7 +370,7 @@ async def get_iot_status(conn, name, property_name):
             for property_item in value.properties:
                 if property_item["name"] == property_name:
                     return property_item["value"]
-    logger.bind(tag=TAG).warning(f"未找到设备 {name} 的属性 {property_name}")
+    conn.logger.bind(tag=TAG).warning(f"未找到设备 {name} 的属性 {property_name}")
     return None
 
 
@@ -378,16 +381,16 @@ async def set_iot_status(conn, name, property_name, value):
             for property_item in iot_descriptor.properties:
                 if property_item["name"] == property_name:
                     if type(value) != type(property_item["value"]):
-                        logger.bind(tag=TAG).error(
+                        conn.logger.bind(tag=TAG).error(
                             f"属性{property_item['name']}的值类型不匹配"
                         )
                         return
                     property_item["value"] = value
-                    logger.bind(tag=TAG).info(
+                    conn.logger.bind(tag=TAG).info(
                         f"物联网状态更新: {name} , {property_name} = {value}"
                     )
                     return
-    logger.bind(tag=TAG).warning(f"未找到设备 {name} 的属性 {property_name}")
+    conn.logger.bind(tag=TAG).warning(f"未找到设备 {name} 的属性 {property_name}")
 
 
 async def send_iot_conn(conn, name, method_name, parameters):
@@ -409,6 +412,6 @@ async def send_iot_conn(conn, name, method_name, parameters):
                         command["parameters"] = parameters
                     send_message = json.dumps({"type": "iot", "commands": [command]})
                     await conn.websocket.send(send_message)
-                    logger.bind(tag=TAG).info(f"发送物联网指令: {send_message}")
+                    conn.logger.bind(tag=TAG).info(f"发送物联网指令: {send_message}")
                     return
-    logger.bind(tag=TAG).error(f"未找到方法{method_name}")
+    conn.logger.bind(tag=TAG).error(f"未找到方法{method_name}")
diff --git a/main/xiaozhi-server/core/handle/receiveAudioHandle.py b/main/xiaozhi-server/core/handle/receiveAudioHandle.py
index ff6aaad5..383616c3 100644
--- a/main/xiaozhi-server/core/handle/receiveAudioHandle.py
+++ b/main/xiaozhi-server/core/handle/receiveAudioHandle.py
@@ -1,4 +1,3 @@
-from config.logger import setup_logging
 import time
 import copy
 from core.utils.util import remove_punctuation_and_length
@@ -9,12 +8,13 @@ from core.handle.ttsReportHandle import enqueue_tts_report
 from core.providers.tts.base import audio_to_opus_data
 
 TAG = __name__
-logger = setup_logging()
 
 
 async def handleAudioMessage(conn, audio):
+    if conn.vad is None:
+        return
     if not conn.asr_server_receive:
-        logger.bind(tag=TAG).debug(f"前期数据处理中，暂停接收")
+        conn.logger.bind(tag=TAG).debug(f"前期数据处理中，暂停接收")
         return
     if conn.client_listen_mode == "auto":
         have_voice = conn.vad.is_vad(conn, audio)
@@ -40,7 +40,7 @@ async def handleAudioMessage(conn, audio):
             conn.asr_server_receive = True
         else:
             text, _ = await conn.asr.speech_to_text(conn.asr_audio, conn.session_id)
-            logger.bind(tag=TAG).info(f"识别文本: {text}")
+            conn.logger.bind(tag=TAG).info(f"识别文本: {text}")
             text_len, _ = remove_punctuation_and_length(text)
             if text_len > 0:
                 # 使用自定义模块进行上报
@@ -120,7 +120,7 @@ async def check_bind_device(conn):
     if conn.bind_code:
         # 确保bind_code是6位数字
         if len(conn.bind_code) != 6:
-            logger.bind(tag=TAG).error(f"无效的绑定码格式: {conn.bind_code}")
+            conn.logger.bind(tag=TAG).error(f"无效的绑定码格式: {conn.bind_code}")
             text = "绑定码格式错误，请检查配置。"
             await send_stt_message(conn, text)
             return
@@ -144,7 +144,7 @@ async def check_bind_device(conn):
                 num_packets, _ = audio_to_opus_data(num_path)
                 conn.audio_play_queue.put((num_packets, None, i + 1))
             except Exception as e:
-                logger.bind(tag=TAG).error(f"播放数字音频失败: {e}")
+                conn.logger.bind(tag=TAG).error(f"播放数字音频失败: {e}")
                 continue
     else:
         text = f"没有找到该设备的版本信息，请正确配置 OTA地址，然后重新编译固件。"
diff --git a/main/xiaozhi-server/core/handle/sendAudioHandle.py b/main/xiaozhi-server/core/handle/sendAudioHandle.py
index b9148238..78fe743c 100644
--- a/main/xiaozhi-server/core/handle/sendAudioHandle.py
+++ b/main/xiaozhi-server/core/handle/sendAudioHandle.py
@@ -1,11 +1,9 @@
-from config.logger import setup_logging
 import json
 import asyncio
 import time
 from core.utils.util import get_string_no_punctuation_or_emoji, analyze_emotion
 
 TAG = __name__
-logger = setup_logging()
 
 emoji_map = {
     "neutral": "😶",
@@ -49,10 +47,10 @@ async def sendAudioMessage(conn, audios, text, text_index=0):
         )
 
     if text_index == conn.tts_first_text_index:
-        logger.bind(tag=TAG).info(f"发送第一段语音: {text}")
+        conn.logger.bind(tag=TAG).info(f"发送第一段语音: {text}")
     await send_tts_message(conn, "sentence_start", text)
 
-    is_first_audio = (text_index == conn.tts_first_text_index)
+    is_first_audio = text_index == conn.tts_first_text_index
     await sendAudio(conn, audios, pre_buffer=is_first_audio)
 
     await send_tts_message(conn, "sentence_end", text)
diff --git a/main/xiaozhi-server/core/handle/textHandle.py b/main/xiaozhi-server/core/handle/textHandle.py
index 0bded15b..f446edf8 100644
--- a/main/xiaozhi-server/core/handle/textHandle.py
+++ b/main/xiaozhi-server/core/handle/textHandle.py
@@ -1,4 +1,3 @@
-from config.logger import setup_logging
 import json
 from core.handle.abortHandle import handleAbortMessage
 from core.handle.helloHandle import handleHelloMessage
@@ -10,12 +9,11 @@ from core.handle.ttsReportHandle import enqueue_tts_report
 import asyncio
 
 TAG = __name__
-logger = setup_logging()
 
 
 async def handleTextMessage(conn, message):
     """处理文本消息"""
-    logger.bind(tag=TAG).info(f"收到文本消息：{message}")
+    conn.logger.bind(tag=TAG).info(f"收到文本消息：{message}")
     try:
         msg_json = json.loads(message)
         if isinstance(msg_json, int):
@@ -28,7 +26,9 @@ async def handleTextMessage(conn, message):
         elif msg_json["type"] == "listen":
             if "mode" in msg_json:
                 conn.client_listen_mode = msg_json["mode"]
-                logger.bind(tag=TAG).debug(f"客户端拾音模式：{conn.client_listen_mode}")
+                conn.logger.bind(tag=TAG).debug(
+                    f"客户端拾音模式：{conn.client_listen_mode}"
+                )
             if msg_json["state"] == "start":
                 conn.client_have_voice = True
                 conn.client_voice_stop = False
diff --git a/main/xiaozhi-server/core/handle/ttsReportHandle.py b/main/xiaozhi-server/core/handle/ttsReportHandle.py
index 0935b9de..ae8928ce 100644
--- a/main/xiaozhi-server/core/handle/ttsReportHandle.py
+++ b/main/xiaozhi-server/core/handle/ttsReportHandle.py
@@ -9,16 +9,11 @@ TTS上报功能已集成到ConnectionHandler类中。
 具体实现请参考core/connection.py中的相关代码。
 """
 
-import os
-import uuid
-import wave
 import opuslib_next
 
-from config.logger import setup_logging
 from config.manage_api_client import report
 
 TAG = __name__
-logger = setup_logging()
 
 
 def report_tts(conn, type, text, opus_data):
@@ -32,7 +27,7 @@ def report_tts(conn, type, text, opus_data):
     """
     try:
         if opus_data:
-            audio_data = opus_to_wav(opus_data)
+            audio_data = opus_to_wav(conn, opus_data)
         else:
             audio_data = None
         # 执行上报
@@ -44,10 +39,10 @@ def report_tts(conn, type, text, opus_data):
             audio=audio_data,
         )
     except Exception as e:
-        logger.bind(tag=TAG).error(f"TTS上报失败: {e}")
+        conn.logger.bind(tag=TAG).error(f"TTS上报失败: {e}")
 
 
-def opus_to_wav(opus_data):
+def opus_to_wav(conn, opus_data):
     """将Opus数据转换为WAV格式的字节流
 
     Args:
@@ -65,7 +60,7 @@ def opus_to_wav(opus_data):
             pcm_frame = decoder.decode(opus_packet, 960)  # 960 samples = 60ms
             pcm_data.append(pcm_frame)
         except opuslib_next.OpusError as e:
-            logger.bind(tag=TAG).error(f"Opus解码错误: {e}", exc_info=True)
+            conn.logger.bind(tag=TAG).error(f"Opus解码错误: {e}", exc_info=True)
 
     if not pcm_data:
         raise ValueError("没有有效的PCM数据")
@@ -108,8 +103,8 @@ def enqueue_tts_report(conn, type, text, opus_data):
         # 使用连接对象的队列，传入文本和二进制数据而非文件路径
         conn.tts_report_queue.put((type, text, opus_data))
 
-        logger.bind(tag=TAG).debug(
+        conn.logger.bind(tag=TAG).debug(
             f"TTS数据已加入上报队列: {conn.device_id}, 音频大小: {len(opus_data)} "
         )
     except Exception as e:
-        logger.bind(tag=TAG).error(f"加入TTS上报队列失败: {text}, {e}")
+        conn.logger.bind(tag=TAG).error(f"加入TTS上报队列失败: {text}, {e}")
diff --git a/main/xiaozhi-server/core/mcp/manager.py b/main/xiaozhi-server/core/mcp/manager.py
index cc72228a..dc2f9de9 100644
--- a/main/xiaozhi-server/core/mcp/manager.py
+++ b/main/xiaozhi-server/core/mcp/manager.py
@@ -1,9 +1,9 @@
 """MCP服务管理器"""
+
 import asyncio
 import os, json
 from typing import Dict, Any, List
 from .MCPClient import MCPClient
-from config.logger import setup_logging
 from plugins_func.register import register_function, ToolType
 from config.config_loader import get_project_dir
 
@@ -18,11 +18,10 @@ class MCPManager:
         初始化MCP管理器
         """
         self.conn = conn
-        self.logger = setup_logging()
         self.config_path = get_project_dir() + "data/.mcp_server_settings.json"
         if os.path.exists(self.config_path) == False:
             self.config_path = ""
-            self.logger.bind(tag=TAG).warning(
+            self.conn.logger.bind(tag=TAG).warning(
                 f"请检查mcp服务配置文件：data/.mcp_server_settings.json"
             )
         self.client: Dict[str, MCPClient] = {}
@@ -41,7 +40,7 @@ class MCPManager:
                 config = json.load(f)
             return config.get("mcpServers", {})
         except Exception as e:
-            self.logger.bind(tag=TAG).error(
+            self.conn.logger.bind(tag=TAG).error(
                 f"Error loading MCP config from {self.config_path}: {e}"
             )
             return {}
@@ -51,7 +50,7 @@ class MCPManager:
         config = self.load_config()
         for name, srv_config in config.items():
             if not srv_config.get("command") and not srv_config.get("url"):
-                self.logger.bind(tag=TAG).warning(
+                self.conn.logger.bind(tag=TAG).warning(
                     f"Skipping server {name}: neither command nor url specified"
                 )
                 continue
@@ -60,7 +59,7 @@ class MCPManager:
                 client = MCPClient(srv_config)
                 await client.initialize()
                 self.client[name] = client
-                self.logger.bind(tag=TAG).info(f"Initialized MCP client: {name}")
+                self.conn.logger.bind(tag=TAG).info(f"Initialized MCP client: {name}")
                 client_tools = client.get_available_tools()
                 self.tools.extend(client_tools)
                 for tool in client_tools:
@@ -73,7 +72,7 @@ class MCPManager:
                     )
 
             except Exception as e:
-                self.logger.bind(tag=TAG).error(
+                self.conn.logger.bind(tag=TAG).error(
                     f"Failed to initialize MCP server {name}: {e}"
                 )
         self.conn.func_handler.upload_functions_desc()
@@ -94,8 +93,8 @@ class MCPManager:
         """
         for tool in self.tools:
             if (
-                    tool.get("function") != None
-                    and tool["function"].get("name") == tool_name
+                tool.get("function") != None
+                and tool["function"].get("name") == tool_name
             ):
                 return True
         return False
@@ -110,7 +109,7 @@ class MCPManager:
         Raises:
             ValueError: 工具未找到时抛出
         """
-        self.logger.bind(tag=TAG).info(
+        self.conn.logger.bind(tag=TAG).info(
             f"Executing tool {tool_name} with arguments: {arguments}"
         )
         for client in self.client.values():
@@ -124,9 +123,9 @@ class MCPManager:
         for name, client in list(self.client.items()):
             try:
                 await asyncio.wait_for(client.cleanup(), timeout=20)
-                self.logger.bind(tag=TAG).info(f"MCP client closed: {name}")
+                self.conn.logger.bind(tag=TAG).info(f"MCP client closed: {name}")
             except (asyncio.TimeoutError, Exception) as e:
-                self.logger.bind(tag=TAG).error(
+                self.conn.logger.bind(tag=TAG).error(
                     f"Error closing MCP client {name}: {e}"
                 )
         self.client.clear()
diff --git a/main/xiaozhi-server/core/utils/dialogue.py b/main/xiaozhi-server/core/utils/dialogue.py
index d4e66bb6..8b79a35a 100644
--- a/main/xiaozhi-server/core/utils/dialogue.py
+++ b/main/xiaozhi-server/core/utils/dialogue.py
@@ -4,7 +4,14 @@ from datetime import datetime
 
 
 class Message:
-    def __init__(self, role: str, content: str = None, uniq_id: str = None, tool_calls = None, tool_call_id=None):
+    def __init__(
+        self,
+        role: str,
+        content: str = None,
+        uniq_id: str = None,
+        tool_calls=None,
+        tool_call_id=None,
+    ):
         self.uniq_id = uniq_id if uniq_id is not None else str(uuid.uuid4())
         self.role = role
         self.content = content
@@ -16,7 +23,7 @@ class Dialogue:
     def __init__(self):
         self.dialogue: List[Message] = []
         # 获取当前时间
-        self.current_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        self.current_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
 
     def put(self, message: Message):
         self.dialogue.append(message)
@@ -25,7 +32,9 @@ class Dialogue:
         if m.tool_calls is not None:
             dialogue.append({"role": m.role, "tool_calls": m.tool_calls})
         elif m.role == "tool":
-            dialogue.append({"role": m.role, "tool_call_id": m.tool_call_id, "content": m.content})
+            dialogue.append(
+                {"role": m.role, "tool_call_id": m.tool_call_id, "content": m.content}
+            )
         else:
             dialogue.append({"role": m.role, "content": m.content})
 
@@ -44,23 +53,23 @@ class Dialogue:
         else:
             self.put(Message(role="system", content=new_content))
 
-    def get_llm_dialogue_with_memory(self, memory_str: str = None) -> List[Dict[str, str]]:
+    def get_llm_dialogue_with_memory(
+        self, memory_str: str = None
+    ) -> List[Dict[str, str]]:
         if memory_str is None or len(memory_str) == 0:
             return self.get_llm_dialogue()
-        
+
         # 构建带记忆的对话
         dialogue = []
-        
+
         # 添加系统提示和记忆
         system_message = next(
             (msg for msg in self.dialogue if msg.role == "system"), None
         )
 
-
         if system_message:
             enhanced_system_prompt = (
-                f"{system_message.content}\n\n"
-                f"相关记忆：\n{memory_str}"
+                f"{system_message.content}\n\n" f"相关记忆：\n{memory_str}"
             )
             dialogue.append({"role": "system", "content": enhanced_system_prompt})
 
diff --git a/main/xiaozhi-server/core/utils/util.py b/main/xiaozhi-server/core/utils/util.py
index 6e5b1028..b75a24da 100644
--- a/main/xiaozhi-server/core/utils/util.py
+++ b/main/xiaozhi-server/core/utils/util.py
@@ -350,12 +350,6 @@ def initialize_modules(
             str(config.get("delete_audio", True)).lower() in ("true", "1", "yes"),
         )
         logger.bind(tag=TAG).info(f"初始化组件: asr成功 {select_asr_module}")
-
-    # 初始化自定义prompt
-    if config.get("prompt", None) is not None:
-        modules["prompt"] = config["prompt"]
-        logger.bind(tag=TAG).info(f"初始化组件: prompt成功 {modules['prompt'][:50]}...")
-
     return modules
 
 
@@ -913,3 +907,45 @@ def audio_to_opus_data(audio_file_path):
         opus_datas.append(opus_data)
 
     return opus_datas, duration
+
+
+def check_vad_update(before_config, new_config):
+    if new_config["selected_module"].get("VAD") is None:
+        return False
+    update_vad = False
+    current_vad_module = before_config["selected_module"]["VAD"]
+    new_vad_module = new_config["selected_module"]["VAD"]
+    current_vad_type = (
+        current_vad_module
+        if "type" not in before_config["VAD"][current_vad_module]
+        else before_config["VAD"][current_vad_module]["type"]
+    )
+    new_vad_type = (
+        new_vad_module
+        if "type" not in new_config["VAD"][new_vad_module]
+        else new_config["VAD"][new_vad_module]["type"]
+    )
+    print(f"前vad:{current_vad_type}，后vad:{new_vad_type}")
+    update_vad = current_vad_type != new_vad_type
+    return update_vad
+
+
+def check_asr_update(before_config, new_config):
+    if new_config["selected_module"].get("ASR") is None:
+        return False
+    update_asr = False
+    current_asr_module = before_config["selected_module"]["ASR"]
+    new_asr_module = new_config["selected_module"]["ASR"]
+    current_asr_type = (
+        current_asr_module
+        if "type" not in before_config["ASR"][current_asr_module]
+        else before_config["ASR"][current_asr_module]["type"]
+    )
+    new_asr_type = (
+        new_asr_module
+        if "type" not in new_config["ASR"][new_asr_module]
+        else new_config["ASR"][new_asr_module]["type"]
+    )
+    print(f"前asr:{current_asr_type}，后asr:{new_asr_type}")
+    update_asr = current_asr_type != new_asr_type
+    return update_asr
diff --git a/main/xiaozhi-server/core/websocket_server.py b/main/xiaozhi-server/core/websocket_server.py
index 9e84aaec..441fd4e1 100644
--- a/main/xiaozhi-server/core/websocket_server.py
+++ b/main/xiaozhi-server/core/websocket_server.py
@@ -2,7 +2,7 @@ import asyncio
 import websockets
 from config.logger import setup_logging
 from core.connection import ConnectionHandler
-from core.utils.util import initialize_modules
+from core.utils.util import initialize_modules, check_vad_update, check_asr_update
 from config.config_loader import get_config_from_api
 
 TAG = __name__
@@ -84,38 +84,8 @@ class WebSocketServer:
                     return False
 
                 # 检查 VAD 和 ASR 类型是否需要更新
-                update_vad = False
-                update_asr = False
-
-                # 获取当前和新的 VAD 类型
-                current_vad_module = self.config["selected_module"]["VAD"]
-                new_vad_module = new_config["selected_module"]["VAD"]
-                current_vad_type = (
-                    current_vad_module
-                    if "type" not in self.config["VAD"][current_vad_module]
-                    else self.config["VAD"][current_vad_module]["type"]
-                )
-                new_vad_type = (
-                    new_vad_module
-                    if "type" not in new_config["VAD"][new_vad_module]
-                    else new_config["VAD"][new_vad_module]["type"]
-                )
-                update_vad = current_vad_type != new_vad_type
-
-                # 获取当前和新的 ASR 类型
-                current_asr_module = self.config["selected_module"]["ASR"]
-                new_asr_module = new_config["selected_module"]["ASR"]
-                current_asr_type = (
-                    current_asr_module
-                    if "type" not in self.config["ASR"][current_asr_module]
-                    else self.config["ASR"][current_asr_module]["type"]
-                )
-                new_asr_type = (
-                    new_asr_module
-                    if "type" not in new_config["ASR"][new_asr_module]
-                    else new_config["ASR"][new_asr_module]["type"]
-                )
-                update_asr = current_asr_type != new_asr_type
+                update_vad = check_vad_update(self.config, new_config)
+                update_asr = check_asr_update(self.config, new_config)
 
                 # 更新配置
                 self.config = new_config
@@ -132,12 +102,18 @@ class WebSocketServer:
                 )
 
                 # 更新组件实例
-                self._vad = modules["vad"] if "vad" in modules else None
-                self._asr = modules["asr"] if "asr" in modules else None
-                self._tts = modules["tts"] if "tts" in modules else None
-                self._llm = modules["llm"] if "llm" in modules else None
-                self._intent = modules["intent"] if "intent" in modules else None
-                self._memory = modules["memory"] if "memory" in modules else None
+                if "vad" in modules:
+                    self._vad = modules["vad"]
+                if "asr" in modules:
+                    self._asr = modules["asr"]
+                if "tts" in modules:
+                    self._tts = modules["tts"]
+                if "llm" in modules:
+                    self._llm = modules["llm"]
+                if "intent" in modules:
+                    self._intent = modules["intent"]
+                if "memory" in modules:
+                    self._memory = modules["memory"]
 
                 return True
         except Exception as e:
diff --git a/main/xiaozhi-server/plugins_func/functions/play_music.py b/main/xiaozhi-server/plugins_func/functions/play_music.py
index 0b283c8e..b9fc3aa9 100644
--- a/main/xiaozhi-server/plugins_func/functions/play_music.py
+++ b/main/xiaozhi-server/plugins_func/functions/play_music.py
@@ -11,9 +11,7 @@ from core.utils import p3
 from core.handle.sendAudioHandle import send_stt_message
 from plugins_func.register import register_function, ToolType, ActionResponse, Action
 
-
 TAG = __name__
-logger = setup_logging()
 
 MUSIC_CACHE = {}
 
@@ -45,7 +43,7 @@ def play_music(conn, song_name: str):
 
         # 检查事件循环状态
         if not conn.loop.is_running():
-            logger.bind(tag=TAG).error("事件循环未运行，无法提交任务")
+            conn.logger.bind(tag=TAG).error("事件循环未运行，无法提交任务")
             return ActionResponse(
                 action=Action.RESPONSE, result="系统繁忙", response="请稍后再试"
             )
@@ -59,9 +57,9 @@ def play_music(conn, song_name: str):
         def handle_done(f):
             try:
                 f.result()  # 可在此处理成功逻辑
-                logger.bind(tag=TAG).info("播放完成")
+                conn.logger.bind(tag=TAG).info("播放完成")
             except Exception as e:
-                logger.bind(tag=TAG).error(f"播放失败: {e}")
+                conn.logger.bind(tag=TAG).error(f"播放失败: {e}")
 
         future.add_done_callback(handle_done)
 
@@ -69,7 +67,7 @@ def play_music(conn, song_name: str):
             action=Action.NONE, result="指令已接收", response="正在为您播放音乐"
         )
     except Exception as e:
-        logger.bind(tag=TAG).error(f"处理音乐意图错误: {e}")
+        conn.logger.bind(tag=TAG).error(f"处理音乐意图错误: {e}")
         return ActionResponse(
             action=Action.RESPONSE, result=str(e), response="播放音乐时出错了"
         )
@@ -150,7 +148,7 @@ async def handle_music_command(conn, text):
 
     """处理音乐播放指令"""
     clean_text = re.sub(r"[^\w\s]", "", text).strip()
-    logger.bind(tag=TAG).debug(f"检查是否是音乐命令: {clean_text}")
+    conn.logger.bind(tag=TAG).debug(f"检查是否是音乐命令: {clean_text}")
 
     # 尝试匹配具体歌名
     if os.path.exists(MUSIC_CACHE["music_dir"]):
@@ -165,7 +163,7 @@ async def handle_music_command(conn, text):
         if potential_song:
             best_match = _find_best_match(potential_song, MUSIC_CACHE["music_files"])
             if best_match:
-                logger.bind(tag=TAG).info(f"找到最匹配的歌曲: {best_match}")
+                conn.logger.bind(tag=TAG).info(f"找到最匹配的歌曲: {best_match}")
                 await play_local_music(conn, specific_file=best_match)
                 return True
     # 检查是否是通用播放音乐命令
@@ -195,7 +193,9 @@ async def play_local_music(conn, specific_file=None):
     """播放本地音乐文件"""
     try:
         if not os.path.exists(MUSIC_CACHE["music_dir"]):
-            logger.bind(tag=TAG).error(f"音乐目录不存在: " + MUSIC_CACHE["music_dir"])
+            conn.logger.bind(tag=TAG).error(
+                f"音乐目录不存在: " + MUSIC_CACHE["music_dir"]
+            )
             return
 
         # 确保路径正确性
@@ -204,13 +204,13 @@ async def play_local_music(conn, specific_file=None):
             music_path = os.path.join(MUSIC_CACHE["music_dir"], specific_file)
         else:
             if not MUSIC_CACHE["music_files"]:
-                logger.bind(tag=TAG).error("未找到MP3音乐文件")
+                conn.logger.bind(tag=TAG).error("未找到MP3音乐文件")
                 return
             selected_music = random.choice(MUSIC_CACHE["music_files"])
             music_path = os.path.join(MUSIC_CACHE["music_dir"], selected_music)
 
         if not os.path.exists(music_path):
-            logger.bind(tag=TAG).error(f"选定的音乐文件不存在: {music_path}")
+            conn.logger.bind(tag=TAG).error(f"选定的音乐文件不存在: {music_path}")
             return
         text = _get_random_play_prompt(selected_music)
         await send_stt_message(conn, text)
@@ -233,5 +233,5 @@ async def play_local_music(conn, specific_file=None):
         conn.audio_play_queue.put((opus_packets, None, conn.tts_last_text_index))
 
     except Exception as e:
-        logger.bind(tag=TAG).error(f"播放音乐失败: {str(e)}")
-        logger.bind(tag=TAG).error(f"详细错误: {traceback.format_exc()}")
+        conn.logger.bind(tag=TAG).error(f"播放音乐失败: {str(e)}")
+        conn.logger.bind(tag=TAG).error(f"详细错误: {traceback.format_exc()}")
diff --git a/main/xiaozhi-server/plugins_func/functions/plugin_loader.py b/main/xiaozhi-server/plugins_func/functions/plugin_loader.py
index 4747d997..7041d7a0 100644
--- a/main/xiaozhi-server/plugins_func/functions/plugin_loader.py
+++ b/main/xiaozhi-server/plugins_func/functions/plugin_loader.py
@@ -1,51 +1,56 @@
-from plugins_func.register import register_function,ToolType, ActionResponse, Action
-from config.logger import setup_logging
-
-TAG = __name__
-logger = setup_logging()
+from plugins_func.register import register_function, ToolType, ActionResponse, Action
 
 plugin_loader_function_desc = {
-                "type": "function",
-                "function": {
-                    "name": "plugin_loader",
-                    "description": "当用户想加载或卸载插件/function时，调用此函数：支持的插件列表为[plugins]",
-                    "parameters": {
-                        "type": "object",
-                        "properties": {
-                            "oper": {
-                                "type": "string",
-                                "description": "load or unload"
-                            },
-                            "name":{
-                                "type": "string",
-                                "description": "要加载或卸载的插件名字"
-                            }
-                        },
-                        "required": ["oper","name"]
-                    }
-                }
-            }
+    "type": "function",
+    "function": {
+        "name": "plugin_loader",
+        "description": "当用户想加载或卸载插件/function时，调用此函数：支持的插件列表为[plugins]",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "oper": {"type": "string", "description": "load or unload"},
+                "name": {"type": "string", "description": "要加载或卸载的插件名字"},
+            },
+            "required": ["oper", "name"],
+        },
+    },
+}
 
-@register_function('plugin_loader', plugin_loader_function_desc, ToolType.SYSTEM_CTL)
+
+@register_function("plugin_loader", plugin_loader_function_desc, ToolType.SYSTEM_CTL)
 def plugin_loader(conn, oper: str, name: str):
     """插件加载"""
     if oper not in ["load", "unload"]:
-        return ActionResponse(action=Action.RESPONSE, result="插件操作失败", response="不支持的操作")
-    
+        return ActionResponse(
+            action=Action.RESPONSE, result="插件操作失败", response="不支持的操作"
+        )
+
     cur_support = conn.func_handler.current_support_functions()
     if oper == "load":
         if name in cur_support:
-            return ActionResponse(action=Action.RESPONSE, result="插件加载失败", response=f"{name}插件已加载,无需重复加载")
+            return ActionResponse(
+                action=Action.RESPONSE,
+                result="插件加载失败",
+                response=f"{name}插件已加载,无需重复加载",
+            )
         func = conn.func_handler.function_registry.register_function(name)
         if not func:
-            return ActionResponse(action=Action.RESPONSE, result="插件加载失败", response="插件未找到")
+            return ActionResponse(
+                action=Action.RESPONSE, result="插件加载失败", response="插件未找到"
+            )
         res = f"{name}插件加载成功"
     else:
         if name not in cur_support:
-            return ActionResponse(action=Action.RESPONSE, result="插件卸载失败", response=f"{name}插件未加载")
+            return ActionResponse(
+                action=Action.RESPONSE,
+                result="插件卸载失败",
+                response=f"{name}插件未加载",
+            )
         bOK = conn.func_handler.function_registry.unregister_function(name)
         if not bOK:
-            return ActionResponse(action=Action.RESPONSE, result="插件卸载失败", response="插件未找到")
+            return ActionResponse(
+                action=Action.RESPONSE, result="插件卸载失败", response="插件未找到"
+            )
         res = f"{name}插件卸载成功"
     conn.func_handler.upload_functions_desc()
     return ActionResponse(action=Action.RESPONSE, result="插件操作成功", response=res)