update:更新coze和dify模型大小写名称导致查询错误问题

joey-zhou · joey-zhou · commit 0d8cd396cb27 · 2025-06-03T15:25:56.000+08:00
update:阿里云语音识别高并发处理
diff --git a/README.md b/README.md
@@ -80,8 +80,8 @@ Xiaozhi ESP32 Server Java 是基于 [Xiaozhi ESP32](https://github.com/78/xiaozh
 | **实时打断** | ✅ | 支持实时打断功能，提高对话流畅度 |
 | **本地离线识别** | ✅ | 支持Vosk本地离线语音识别，无需联网即可使用 |
 | **WebSocket通信** | ✅ | 高性能WebSocket通信，支持设备实时状态更新和控制 |
-| **MQTT通信** | ✅ | 支持MQTT通信协议，实现设备间的消息传递 |
-| **自动语音唤醒** | ✅ | 支持自定义唤醒词，无需按键即可激活设备 |
+| **MQTT通信** | ✅ | 支持MQTT通信协议，长连接、服务端主动唤醒 |
+| **自动语音唤醒** | ✅ | 支持自定义唤醒词唤醒，无需按键即可激活设备 |
 | **多设备同时接入** | ✅ | 支持多设备同时接入，实现全屋语音覆盖 |
 | **TTS多引擎支持** | ✅ | 支持微软、阿里、火山等多种TTS引擎 |
 | **多用户支持** | ✅ | 支持多用户配置，满足家庭多成员使用需求 |
diff --git a/docs/images/wechat_group.jpg b/docs/images/wechat_group.jpg
diff --git a/pom.xml b/pom.xml
@@ -225,7 +225,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>dashscope-sdk-java</artifactId>
-            <version>2.19.1</version>
+            <version>2.20.2</version>
         </dependency>
         <!-- COZE -->
         <dependency>
diff --git a/src/main/java/com/xiaozhi/dialogue/llm/providers/CozeChatModel.java b/src/main/java/com/xiaozhi/dialogue/llm/providers/CozeChatModel.java
@@ -38,7 +38,7 @@ public class CozeChatModel implements ChatModel {
     private final String appId;
     private final String apiSecret;
     private final Logger logger = LoggerFactory.getLogger(getClass());
-    public static final String PROVIDER_NAME = "Coze";
+    public static final String PROVIDER_NAME = "coze";
 
     /**
      * 构造函数
diff --git a/src/main/java/com/xiaozhi/dialogue/stt/providers/AliyunSttService.java b/src/main/java/com/xiaozhi/dialogue/stt/providers/AliyunSttService.java
@@ -28,13 +28,37 @@ public class AliyunSttService implements SttService {
     private static final int QUEUE_CAPACITY = 1000; // 队列容量限制
     private static final String DEFAULT_MODEL = "paraformer-realtime-v2"; // 默认模型
     
-    // 复用识别器实例，避免频繁创建
-    private final Recognition recognizer;
+    // 识别器实例
+    private Recognition recognizer;
     private String apiKey;
+    private final Object recognizerLock = new Object(); // 用于同步访问recognizer
 
     public AliyunSttService(SysConfig config) {
         this.apiKey = config.getApiKey();
-        this.recognizer = new Recognition();
+        // 初始化recognizer
+        createNewRecognizer();
+    }
+
+    /**
+     * 创建新的Recognition实例
+     */
+    private void createNewRecognizer() {
+        synchronized (recognizerLock) {
+            // 如果存在旧的实例，尝试关闭它
+            if (recognizer != null) {
+                try {
+                    if (recognizer.getDuplexApi() != null) {
+                        recognizer.getDuplexApi().close(1000, "创建新实例");
+                    }
+                } catch (Exception e) {
+                    logger.warn("关闭旧的Recognition实例时出错", e);
+                }
+            }
+            
+            // 创建新实例
+            recognizer = new Recognition();
+            logger.info("创建了新的Recognition实例");
+        }
     }
 
     @Override
@@ -61,6 +85,13 @@ public String streamRecognition(Sinks.Many<byte[]> audioSink) {
         AtomicBoolean isCompleted = new AtomicBoolean(false);
         AtomicReference<String> finalResult = new AtomicReference<>("");
         AtomicBoolean isProcessing = new AtomicBoolean(true);
+        AtomicBoolean recognizerFailed = new AtomicBoolean(false);
+
+        // 获取当前的recognizer实例
+        Recognition currentRecognizer;
+        synchronized (recognizerLock) {
+            currentRecognizer = this.recognizer;
+        }
 
         // 订阅Sink并将数据放入队列
         var subscription = audioSink.asFlux().subscribe(
@@ -126,7 +157,7 @@ public String streamRecognition(Sinks.Many<byte[]> audioSink) {
                     // 保存中间结果，用于跟踪识别进度
                     StringBuilder fullText = new StringBuilder();
                     
-                    recognizer.streamCall(param, rxAudioStream)
+                    currentRecognizer.streamCall(param, rxAudioStream)
                             .blockingForEach(result -> {
                                 if (result != null && result.getSentence() != null) {
                                     String text = result.getSentence().getText();
@@ -138,7 +169,7 @@ public String streamRecognition(Sinks.Many<byte[]> audioSink) {
                                         
                                         // 记录中间结果，便于调试
                                         if (logger.isDebugEnabled()) {
-                                            logger.info("语音识别中间结果: {}", text);
+                                            logger.debug("语音识别中间结果: {}", text);
                                         }
                                     }
                                 }
@@ -147,9 +178,26 @@ public String streamRecognition(Sinks.Many<byte[]> audioSink) {
                     logger.info("语音识别完成，最终结果: {}", finalResult.get());
                 } catch (Exception e) {
                     logger.error("阿里云流式语音识别失败", e);
+                    recognizerFailed.set(true); // 标记识别器失败
                 } finally {
                     isProcessing.set(false);
                     subscription.dispose(); // 清理资源
+                    
+                    // 如果识别过程中出现异常，需要重置recognizer
+                    if (recognizerFailed.get()) {
+                        try {
+                            // 关闭WebSocket连接
+                            if (currentRecognizer.getDuplexApi() != null) {
+                                currentRecognizer.getDuplexApi().close(1000, "bye");
+                                logger.info("已关闭失败的WebSocket连接");
+                            }
+                            
+                            // 创建新的实例替代当前实例
+                            createNewRecognizer();
+                        } catch (Exception ex) {
+                            logger.error("处理失败的Recognition实例时出错", ex);
+                        }
+                    }
                 }
             });
 
@@ -160,11 +208,28 @@ public String streamRecognition(Sinks.Many<byte[]> audioSink) {
             if (isProcessing.get()) {
                 logger.warn("语音识别超时，强制结束");
                 isProcessing.set(false);
+                recognizerFailed.set(true); // 超时也视为失败，需要重置
             }
             
         } catch (Exception e) {
             logger.error("启动虚拟线程失败", e);
             subscription.dispose(); // 确保资源被释放
+            
+            // 线程启动失败也视为识别器失败
+            recognizerFailed.set(true);
+            
+            // 处理失败的识别器
+            try {
+                // 关闭WebSocket连接
+                if (currentRecognizer.getDuplexApi() != null) {
+                    currentRecognizer.getDuplexApi().close(1000, "bye");
+                }
+                
+                // 创建新的实例替代
+                createNewRecognizer();
+            } catch (Exception ex) {
+                logger.error("处理失败的Recognition实例时出错", ex);
+            }
         }
 
         return finalResult.get();
diff --git a/web/src/components/ConfigManager.vue b/web/src/components/ConfigManager.vue
@@ -202,7 +202,7 @@ export default {
             { label: 'Ollama', value: 'ollama', key: '1' },
             { label: 'Spark', value: 'spark', key: '2' },
             { label: 'Zhipu', value: 'zhipu', key: '3' },
-            { label: 'Ali', value: 'ali', key: '4'},
+            { label: 'AliYun', value: 'aliyun', key: '4'},
             { label: 'Doubao', value: 'doubao', key: '5'},
             { label: 'DeepSeek', value: 'deepseek', key: '6'},
             { label: 'ChatGLM', value: 'chatglm', key: '7'},
diff --git a/web/src/views/page/config/Agent.vue b/web/src/views/page/config/Agent.vue
@@ -122,8 +122,8 @@ export default {
       },
       // 平台选项
       providerOptions: [
-        { label: 'Coze', value: 'Coze' },
-        { label: 'Dify', value: 'Dify' }
+        { label: 'Coze', value: 'coze' },
+        { label: 'Dify', value: 'dify' }
       ],
       // 表格列定义
       tableColumns: [
@@ -162,34 +162,34 @@ export default {
           type: 'select',
           placeholder: '请选择平台类型',
           options: [
-            { label: 'Coze', value: 'Coze' },
-            { label: 'Dify', value: 'Dify' }
+            { label: 'Coze', value: 'coze' },
+            { label: 'Dify', value: 'dify' }
           ]
         },
         {
           field: 'appId',
           label: 'Space ID',
           placeholder: '请输入Coze Space ID',
-          condition: { field: 'provider', value: 'Coze' }
+          condition: { field: 'provider', value: 'coze' }
         },
         {
           field: 'apiSecret',
           label: 'Secret token',
           placeholder: '请输入Secret token',
-          condition: { field: 'provider', value: 'Coze' }
+          condition: { field: 'provider', value: 'coze' }
         },
         {
           field: 'apiUrl',
           label: 'apiUrl',
           placeholder: '请输入apiUrl',
-          condition: { field: 'provider', value: 'Dify' },
+          condition: { field: 'provider', value: 'dify' },
           suffix: '/chat_message'
         },
         {
            field: 'apiKey',
            label: 'apiKey',
            placeholder: '请输入apiKey',
-           condition: { field: 'provider', value: 'Dify' }
+           condition: { field: 'provider', value: 'dify' }
         },
       ],
 
@@ -211,7 +211,7 @@ export default {
       const columns = [...this.tableColumns];
       
       // 如果当前选择的是Coze平台，则插入智能体ID列
-      if (this.query.provider === 'Coze') {
+      if (this.query.provider === 'coze') {
         const botIdColumn = { 
           title: '智能体ID', 
           dataIndex: 'botId', 
@@ -232,7 +232,7 @@ export default {
   watch: {
     // 监听平台类型变化，根据不同平台设置不同的默认值
     'platformForm.provider': function(newVal) {
-      if (newVal === 'Dify') {
+      if (newVal === 'dify') {
         // 如果切换到Dify平台，设置默认的apiUrl
         this.platformForm.apiUrl = 'https://api.dify.ai/v1';
       }
@@ -292,7 +292,7 @@ export default {
           this.platformModalLoading = true;
 
           // 如果是Dify平台，确保apiUrl有正确的后缀
-          if (this.platformForm.provider === 'Dify' && this.platformForm.apiUrl) {
+          if (this.platformForm.provider === 'dify' && this.platformForm.apiUrl) {
             // 确保URL末尾没有斜杠
             let baseUrl = this.platformForm.apiUrl;
             if (baseUrl.endsWith('/')) {
