refactor:重构缓存逻辑

Author: joey-zhou

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

@@ -16,6 +16,7 @@
 import com.xiaozhi.entity.SysDevice;
 import com.xiaozhi.entity.SysRole;
 import com.xiaozhi.enums.ListenState;
+import com.xiaozhi.service.SysConfigService;
 import com.xiaozhi.service.SysDeviceService;
 import com.xiaozhi.service.SysRoleService;
 import jakarta.annotation.Resource;
@@ -52,7 +53,7 @@ public class MessageHandler {
     private SessionManager sessionManager;
 
     @Resource
-    private ConfigManager configManager;
+    private SysConfigService configService;
 
     @Resource
     private DialogueService dialogueService;
@@ -111,13 +112,13 @@ public void afterConnection(ChatSession chatSession, String deviceIdAuth) {
                     SysRole role = roleService.selectRoleById(device.getRoleId());
 
                     if (role.getSttId() != null) {
-                        SysConfig sttConfig = configManager.getConfig(role.getSttId());
+                        SysConfig sttConfig = configService.selectConfigById(role.getSttId());
                         if (sttConfig != null) {
                             sttFactory.getSttService(sttConfig);// 提前初始化，加速后续使用
                         }
                     }
                     if (role.getTtsId() != null) {
-                        SysConfig ttsConfig = configManager.getConfig(role.getTtsId());
+                        SysConfig ttsConfig = configService.selectConfigById(role.getTtsId());
                         if (ttsConfig != null) {
                             ttsFactory.getTtsService(ttsConfig, role.getVoiceName());// 提前初始化，加速后续使用
                         }

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

@@ -6,7 +6,6 @@
 import com.github.pagehelper.PageInfo;
 import com.xiaozhi.common.web.AjaxResult;
 import com.xiaozhi.common.web.PageFilter;
-import com.xiaozhi.communication.common.ConfigManager;
 import com.xiaozhi.dialogue.stt.factory.SttServiceFactory;
 import com.xiaozhi.dialogue.tts.factory.TtsServiceFactory;
 import com.xiaozhi.entity.SysConfig;
@@ -40,9 +39,6 @@ public class ConfigController extends BaseController {
     @Resource
     private SysConfigService configService;
 
-    @Resource
-    private ConfigManager configManager;
-
     @Resource
     private TtsServiceFactory ttsServiceFactory;
 
@@ -84,7 +80,6 @@ public AjaxResult update(SysConfig config) {
             SysConfig oldSysConfig = configService.selectConfigById(config.getConfigId());
             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())) {

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

@@ -73,11 +73,23 @@ public ChatModel takeChatModel(ChatSession session) {
     }
 
     public ChatModel takeVisionModel() {
-        SysConfig config = configService.query(new SysConfig().setConfigType("llm").setModelType("vision"), null).get(0);
+        SysConfig config = configService.selectModelType("vision");
         Assert.notNull(config, "未配置多模态模型");
         return createChatModel(config, new SysRole());
     }
 
+    public ChatModel takeIntentModel() {
+        SysConfig config = configService.selectModelType("intent");
+        Assert.notNull(config, "未配置意图识别模型");
+        return createChatModel(config, new SysRole());
+    }
+
+    public ChatModel takeEmbeddingModel() {
+        SysConfig config = configService.selectModelType("embedding");
+        Assert.notNull(config, "未配置向量模型");
+        return createChatModel(config, new SysRole());
+    }
+
     /**
      * 创建ChatModel
      * 

src/main/java/com/xiaozhi/dialogue/llm/factory/ChatModelFactory.java

@@ -30,7 +30,6 @@
  */
 public class CozeChatModel implements ChatModel {
 
-    private final TokenAuth authCli;
     private final CozeAPI coze;
     private final String botId;
 
@@ -46,7 +45,7 @@ public class CozeChatModel implements ChatModel {
     public CozeChatModel(String apiSecret, String model) {
 
         // 使用apiSecret作为access_token
-        this.authCli = new TokenAuth(apiSecret);
+        TokenAuth authCli = new TokenAuth(apiSecret);
 
         // 使用endpoint或默认的Coze API地址
         String baseUrl = "https://api.coze.cn";

src/main/java/com/xiaozhi/dialogue/llm/providers/CozeChatModel.java

@@ -1,7 +1,6 @@
 package com.xiaozhi.dialogue.service;
 
 import com.xiaozhi.communication.common.ChatSession;
-import com.xiaozhi.communication.common.ConfigManager;
 import com.xiaozhi.communication.common.SessionManager;
 import com.xiaozhi.dialogue.llm.ChatService;
 import com.xiaozhi.dialogue.service.VadService.VadStatus;
@@ -12,6 +11,7 @@
 import com.xiaozhi.entity.SysDevice;
 import com.xiaozhi.entity.SysRole;
 import com.xiaozhi.event.ChatSessionCloseEvent;
+import com.xiaozhi.service.SysConfigService;
 import com.xiaozhi.service.SysRoleService;
 import com.xiaozhi.utils.AudioUtils;
 import com.xiaozhi.utils.EmojiUtils;
@@ -75,7 +75,7 @@ public class DialogueService implements ApplicationListener<ChatSessionCloseEven
     private SessionManager sessionManager;
 
     @Resource
-    private ConfigManager configManager;
+    private SysConfigService configService;
 
     @Resource
     private SysRoleService roleService;
@@ -282,7 +282,7 @@ public void processAudioData(ChatSession session, byte[] opusData) {
                 }
                 SysRole role = roleService.selectRoleById(device.getRoleId());
                 // 获取STT和TTS配置
-                SysConfig sttConfig = role.getSttId() != null ? configManager.getConfig(role.getSttId())
+                SysConfig sttConfig = role.getSttId() != null ? configService.selectConfigById(role.getSttId())
                         : null;
 
                 // 处理VAD
@@ -490,7 +490,7 @@ private void handleSentence(
         // 新增加的设备很有可能没有配置TTS，采用默认Edge需要传递null
         final SysConfig ttsConfig;
         if (role.getTtsId() != null) {
-            ttsConfig = configManager.getConfig(role.getTtsId());
+            ttsConfig = configService.selectConfigById(role.getTtsId());
         } else {
             ttsConfig = null;
         }

src/main/java/com/xiaozhi/dialogue/service/DialogueService.java

@@ -44,4 +44,9 @@ public interface SysConfigService {
    * @return
    */
   SysConfig selectConfigById(Integer configId);
+
+  /**
+   * 查询默认配置
+   */
+  SysConfig selectModelType(String modelType);
 }

src/main/java/com/xiaozhi/service/SysConfigService.java

@@ -10,6 +10,7 @@
 import jakarta.annotation.Resource;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
+import org.springframework.cache.annotation.Caching;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -62,7 +63,10 @@ public int add(SysConfig config) {
      */
     @Override
     @Transactional(transactionManager = "transactionManager")
-    @CacheEvict(value = CACHE_NAME, key = "#config.configId")
+    @Caching(evict = {
+        @CacheEvict(value = CACHE_NAME, key = "#config.configId"),
+        @CacheEvict(value = CACHE_NAME, key = "#config.modelType", condition = "#config.modelType != null")
+    })
     public int update(SysConfig config) {
         // 如果当前配置被设置为默认，则将同类型同用户的其他配置设置为非默认
         if (config.getIsDefault() != null && config.getIsDefault().equals("1")) {
@@ -73,7 +77,6 @@ public int update(SysConfig config) {
             sttServiceFactory.removeCache(config);
             ttsServiceFactory.removeCache(config);
         }
-        // TODO 还需处理缓存的默认视觉模型或者意图识别模型等
         return rows;
     }
 
@@ -124,4 +127,28 @@ public SysConfig selectConfigById(Integer configId) {
         return configMapper.selectConfigById(configId);
     }
 
+    /**
+     * 查询默认配置
+     *
+     * @param modelType
+     * @return 配置
+     */
+    @Override
+    @Cacheable(value = CACHE_NAME, key ="#modelType", unless = "#result == null")
+    public SysConfig selectModelType(String modelType) {
+        SysConfig queryConfig = new SysConfig();
+        queryConfig.setModelType(modelType);
+
+        List<SysConfig> modelConfigs = configMapper.query(queryConfig);
+
+        for (SysConfig config : modelConfigs) {
+            if ("1".equals(config.getIsDefault())) {
+                return config;  // 找到默认配置就返回
+            }
+        }
+
+        // 没有默认配置，返回第一个即可
+        return modelConfigs.isEmpty() ? null : modelConfigs.getFirst();
+    }
+
 }

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

@@ -3,7 +3,6 @@
 import com.github.pagehelper.PageHelper;
 import com.xiaozhi.common.web.PageFilter;
 import com.xiaozhi.communication.common.ChatSession;
-import com.xiaozhi.communication.common.ConfigManager;
 import com.xiaozhi.communication.common.SessionManager;
 import com.xiaozhi.dao.ConfigMapper;
 import com.xiaozhi.dao.DeviceMapper;
@@ -57,9 +56,6 @@ public class SysDeviceServiceImpl extends BaseServiceImpl implements SysDeviceSe
     @Resource
     private SessionManager sessionManager;
 
-    @Resource
-    private ConfigManager configManager;
-
     /**
      * 添加设备
      *
@@ -81,18 +77,26 @@ public int add(SysDevice device) throws NotFoundException {
         queryRole.setUserId(device.getUserId());
         List<SysRole> roles = roleMapper.query(queryRole);
 
-        if (roles.size() > 0) {
-            // 优先绑定默认角色，否则随便绑定一个
-            for (SysRole role: roles) {
-                device.setRoleId(role.getRoleId());
-                if (role.getIsDefault().equals("1")) {
-                    break;
-                }
-            }
-            return deviceMapper.add(device);
-        } else {
+        if (roles.isEmpty()) {
             throw new NotFoundException("没有配置角色");
         }
+
+        SysRole selectedRole = null;
+
+        // 优先绑定默认角色
+        for (SysRole role: roles) {
+            if (("1").equals(role.getIsDefault())) {
+                selectedRole = role;
+                break;
+            }
+        }
+        if  (selectedRole == null) {
+            selectedRole = roles.getFirst();
+        }
+
+        device.setRoleId(selectedRole.getRoleId());
+        return deviceMapper.add(device);
+
     }
 
     /**