Merge remote-tracking branch 'origin/main'

Author: workwind

CHANGELOG.md

@@ -1,4 +1,9 @@
 # 变更日志
+## [2.8.8] - 2025-06-24
+
+### 其他变更
+- chore: update version to 2.8.8 [skip ci]
+
 ## [2.8.7] - 2025-06-20
 
 ### 其他变更

README.md

@@ -206,9 +206,9 @@ Xiaozhi ESP32 Server Java 是基于 [Xiaozhi ESP32](https://github.com/78/xiaozh
 
 ### 微信
 
-一群已满，扫码加入二群
+微信群超200人无法扫码进群，可以加我微信备注 **小智** 我拉你进微信群
 
-<img src="docs/images/wechat_group.jpg" alt="微信" width="200" />
+<img src="./web/static/img/wechat.jpg" alt="微信" width="200" />
 
 ### QQ
 
@@ -220,8 +220,6 @@ Xiaozhi ESP32 Server Java 是基于 [Xiaozhi ESP32](https://github.com/78/xiaozh
 
 我们接受各种定制化开发项目，如果您有特定需求，欢迎通过微信联系洽谈。
 
-<img src="./web/static/img/wechat.jpg" alt="微信" width="200" />
-
 ---
 
 ## 免责声明 ⚠️

db/2025_06_14.sql

@@ -0,0 +1 @@
+ALTER TABLE xiaozhi.sys_config MODIFY COLUMN sk text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL COMMENT 'Secret Key';

db/2025_06_25.sql

@@ -9,7 +9,7 @@
     </parent>
     <groupId>com.xiaozhi.server</groupId>
     <artifactId>xiaozhi.server</artifactId>
-    <version>2.8.7</version>
+    <version>2.8.8</version>
     <name>xiaozhi-server</name>
     <description></description>
 
@@ -239,6 +239,12 @@
             <artifactId>dashscope-sdk-java</artifactId>
             <version>2.20.2</version>
         </dependency>
+        <!-- 阿里云Token -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>3.7.1</version>
+        </dependency>
         <!-- 讯飞 -->
         <dependency>
             <groupId>cn.xfyun</groupId>

pom.xml

@@ -3,6 +3,7 @@
 import com.xiaozhi.communication.common.ChatSession;
 import com.xiaozhi.dialogue.llm.providers.CozeChatModel;
 import com.xiaozhi.dialogue.llm.providers.DifyChatModel;
+import com.xiaozhi.dialogue.token.factory.TokenServiceFactory;
 import com.xiaozhi.entity.SysConfig;
 import com.xiaozhi.entity.SysDevice;
 import com.xiaozhi.entity.SysRole;
@@ -50,6 +51,8 @@ public class ChatModelFactory {
     private SysRoleService roleService;
     @Autowired
     private ToolCallingManager toolCallingManager;
+    @Autowired
+    private TokenServiceFactory tokenService;
     private final Logger logger = LoggerFactory.getLogger(ChatModelFactory.class);
 
     /**
@@ -85,15 +88,21 @@ private ChatModel createChatModel(SysConfig config, SysRole role) {
         Double temperature = role.getTemperature();
         Double topP = role.getTopP();
         provider = provider.toLowerCase();
+        // Coze和Dify 拥有全局唯一配置，所以需要查询唯一配置信息来作为模型的 Token 获取
+        SysConfig agentConfig = new SysConfig().setConfigType("agent").setUserId(config.getUserId());
+        SysConfig queryConfig;
         switch (provider) {
             case "ollama":
                 return newOllamaChatModel(endpoint, appId, apiKey, apiSecret, model, temperature, topP);
             case "zhipu":
                 return newZhipuChatModel(endpoint, appId, apiKey, apiSecret, model, temperature, topP);
             case "dify":
-                return new DifyChatModel(endpoint, appId, apiKey, apiSecret, model);
+                queryConfig = configService.query(agentConfig.setProvider("dify"), null).get(0);
+                return new DifyChatModel(endpoint, queryConfig.getApiKey());
             case "coze":
-                return new CozeChatModel(endpoint, appId, apiKey, apiSecret, model);
+                queryConfig = configService.query(agentConfig.setProvider("coze"), null).get(0);
+                String token = tokenService.getTokenService(queryConfig).getToken();
+                return new CozeChatModel(token, model);
             // 默认为 openai 协议
             default:
                 return newOpenAiChatModel(endpoint, appId, apiKey, apiSecret, model, temperature, topP);

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

@@ -7,7 +7,9 @@
 import com.coze.openapi.client.connversations.message.model.MessageType;
 import com.coze.openapi.service.auth.TokenAuth;
 import com.coze.openapi.service.service.CozeAPI;
+
 import io.reactivex.Flowable;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.ai.chat.messages.AssistantMessage;
@@ -32,29 +34,16 @@ public class CozeChatModel implements ChatModel {
     private final CozeAPI coze;
     private final String botId;
 
-    private final String endpoint;
-    private final String apiKey;
-    private final String model;
-    private final String appId;
-    private final String apiSecret;
     private final Logger logger = LoggerFactory.getLogger(getClass());
     public static final String PROVIDER_NAME = "coze";
 
+
     /**
      * 构造函数
      *
-     * @param endpoint  API端点
-     * @param appId     应用ID (在Coze中对应botId)
-     * @param apiKey    API密钥 (在Coze中不使用)
-     * @param apiSecret API密钥 (在Coze中对应access_token)
      * @param model     模型名称 (在Coze中不使用)
      */
-    public CozeChatModel(String endpoint, String appId, String apiKey, String apiSecret, String model) {
-        this.endpoint = endpoint;
-        this.appId = appId;
-        this.apiSecret = apiSecret;
-        this.apiKey = apiKey;
-        this.model = model;
+    public CozeChatModel(String apiSecret, String model) {
 
         // 使用apiSecret作为access_token
         this.authCli = new TokenAuth(apiSecret);

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

@@ -33,7 +33,7 @@ public class DifyChatModel implements ChatModel {
      * @param apiSecret
      * @param model     模型名称
      */
-    public DifyChatModel(String endpoint, String appId, String apiKey, String apiSecret, String model) {
+    public DifyChatModel(String endpoint, String apiKey) {
         chatClient = DifyClientFactory.createChatClient(endpoint, apiKey);
     }
 

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

@@ -444,7 +444,7 @@ public VadResult processAudio(String sessionId, byte[] opusData) {
                 float adjustedSilenceThreshold = adjustVadThreshold(silenceThreshold, agcStats);
 
                 // 添加到预缓冲区
-                state.addToPreBuffer(pcmData);
+                // state.addToPreBuffer(pcmData);
 
                 // 处理短帧数据
                 if (pcmData.length < MIN_PCM_LENGTH && !state.isSpeaking()) {

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

@@ -0,0 +1,28 @@
+package com.xiaozhi.dialogue.token;
+
+public interface TokenService {
+    /**
+     * 获取Token (统一入口)
+     */
+    String getToken();
+
+    /**
+     * 获取服务提供商名称
+     */
+    String getProviderName();
+    
+    /**
+     * 手动刷新Token
+     */
+    String refreshToken();
+    
+    /**
+     * 检查Token是否有效
+     */
+    boolean isTokenValid();
+    
+    /**
+     * 清理指定配置的Token缓存
+     */
+    void clearTokenCache();
+}