fix:修复 edge 配置为空导致的实例化错误问题

Author: joey-zhou

src/main/java/com/xiaozhi/communication/common/SessionManager.java

@@ -373,18 +373,6 @@ public ListenMode getMode(String sessionId) {
         return ListenMode.Auto;
     }
 
-    /**
-     * 清空缓存记忆
-     * 
-     * @param sessionId
-     */
-    public voic setChatMemory(String sessionId, chatMemory memory) {
-        ChatSession chatSession = sessions.get(sessionId);
-        if (chatSession != null) {
-            chatSession.setChatMemory(memory);
-        }
-    }
-
     /**
      * 设置流式识别状态
      *

src/main/java/com/xiaozhi/controller/ConfigController.java

@@ -74,10 +74,12 @@ public AjaxResult update(SysConfig config) {
             int rows = configService.update(config);
             if (rows > 0) {
                 configManager.getConfig(config.getConfigId());// 更新缓存
-                if(oldSysConfig != null){
-                    if("stt".equals(oldSysConfig.getConfigType()) && !oldSysConfig.getApiKey().equals(config.getApiKey())){
+                if (oldSysConfig != null) {
+                    if ("stt".equals(oldSysConfig.getConfigType())
+                            && !oldSysConfig.getApiKey().equals(config.getApiKey())) {
                         sttServiceFactory.removeCache(oldSysConfig);
-                    }else if("tts".equals(oldSysConfig.getConfigType()) && !oldSysConfig.getApiKey().equals(config.getApiKey())){
+                    } else if ("tts".equals(oldSysConfig.getConfigType())
+                            && !oldSysConfig.getApiKey().equals(config.getApiKey())) {
                         ttsServiceFactory.removeCache(oldSysConfig);
                     }
                 }

src/main/java/com/xiaozhi/dialogue/stt/factory/SttServiceFactory.java

@@ -169,4 +169,12 @@ private SttService createApiService(SysConfig config) {
         logger.warn("不支持的STT服务提供商: {}", provider);
         return null;
     }
+
+    public void removeCache(SysConfig config) {
+        // 对于API服务，使用"provider:configId"作为缓存键，确保每个配置使用独立的服务实例
+        Integer configId = config.getConfigId();
+        String provider = config.getProvider();
+        String cacheKey = provider + ":" + (configId != null ? configId : "default");
+        serviceCache.remove(cacheKey);
+    }
 }

src/main/java/com/xiaozhi/dialogue/tts/factory/TtsServiceFactory.java

@@ -22,7 +22,7 @@ public class TtsServiceFactory {
     private final Map<String, TtsService> serviceCache = new ConcurrentHashMap<>();
 
     // 语音生成文件保存地址
-    private static final String OUT_PUT_PATH = "audio/";
+    private static final String OUTPUT_PATH = "audio/";
 
     // 默认服务提供商名称
     private static final String DEFAULT_PROVIDER = "edge";
@@ -40,25 +40,30 @@ public TtsService getDefaultTtsService() {
 
     // 创建缓存键，包含provider、configId和voiceName，确保音色变化时创建新的服务实例
     private String createCacheKey(SysConfig config, String provider, String voiceName) {
-        var configId = config.getConfigId();
-        var configIdStr = configId != null ? String.valueOf(configId) : "default";
-        return provider + ":" + configIdStr + ":" + voiceName;
+        Integer configId = -1;
+        if (config != null && config.getConfigId() != null) {
+            configId = config.getConfigId();
+        }
+        return provider + ":" + configId + ":" + voiceName;
     }
 
     /**
      * 根据配置获取TTS服务
      */
     public TtsService getTtsService(SysConfig config, String voiceName) {
+        
+        config = !ObjectUtils.isEmpty(config) ? config : new SysConfig().setProvider(DEFAULT_PROVIDER);
+
         // 如果提供商为空，则使用默认提供商
-        var provider = ObjectUtils.isEmpty(config) ? DEFAULT_PROVIDER : config.getProvider();
+        var provider = config.getProvider();
         var cacheKey = createCacheKey(config, provider, voiceName);
 
         // 检查是否已有该配置的服务实例
         if (serviceCache.containsKey(cacheKey)) {
             return serviceCache.get(cacheKey);
         }
 
-        var service = createApiService(config, voiceName, OUT_PUT_PATH);
+        var service = createApiService(config, voiceName, OUTPUT_PATH);
         serviceCache.put(cacheKey, service);
         return service;
     }
@@ -84,4 +89,27 @@ private void ensureOutputPath(String outputPath) {
         File dir = new File(outputPath);
         if (!dir.exists()) dir.mkdirs();
     }
+
+    public void removeCache(SysConfig config) {
+        if (config == null) {
+            return;
+        }
+
+        String provider = config.getProvider();
+        Integer configId = config.getConfigId();
+        
+        // 遍历缓存的所有键，找到匹配的键并移除
+        serviceCache.keySet().removeIf(key -> {
+            String[] parts = key.split(":");
+            if (parts.length != 3) {
+                return false;
+            }
+            String keyProvider = parts[0];
+            String keyConfigId = parts[1];
+            
+            // 检查provider和configId是否匹配
+            return keyProvider.equals(provider) && keyConfigId.equals(String.valueOf(configId));
+        });
+        
+    }
 }

src/main/java/com/xiaozhi/service/impl/SysDeviceServiceImpl.java

@@ -239,7 +239,7 @@ public int updateNoRefreshCache(SysDevice device) {
                         message.setDeviceId(device.getDeviceId());
                         // 清空设备聊天记录
                         messageMapper.delete(message);
-                        session.setChatMemory(sesseion.getId(), null);
+                        // TODO 未清空已缓存记忆内容
                     }
                 }
             }