From c74dbf03cd11f997bbf7cc4bab336949328100ef Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Fri, 18 Apr 2025 16:39:18 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=84=8F?=
 =?UTF-8?q?=E5=9B=BE=E8=AF=86=E5=88=AB=E6=8F=92=E4=BB=B6=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8Fbug=20(#885)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix：修复使用本地配置时忘记附带提示词

* fix：修复意图识别插件名称格式bug
---
 .../modules/config/service/impl/ConfigServiceImpl.java     | 6 ++++++
 .../src/main/resources/db/changelog/202504181534.sql       | 2 ++
 .../main/resources/db/changelog/db.changelog-master.yaml   | 7 +++++++
 3 files changed, 15 insertions(+)
 create mode 100644 main/manager-api/src/main/resources/db/changelog/202504181534.sql

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 44f19089..dd2a2881 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
@@ -267,6 +267,12 @@ public class ConfigServiceImpl implements ConfigService {
                         if (intentLLMModelId != null && intentLLMModelId.equals(llmModelId)) {
                             intentLLMModelId = null;
                         }
+                    } else if ("function_call".equals(map.get("type"))) {
+                        String functionStr = (String) map.get("functions");
+                        if (StringUtils.isNotBlank(functionStr)) {
+                            String[] functions = functionStr.split("\\;");
+                            map.put("functions", functions);
+                        }
                     }
                 }
                 // 如果是LLM类型，且intentLLMModelId不为空，则添加附加模型
diff --git a/main/manager-api/src/main/resources/db/changelog/202504181534.sql b/main/manager-api/src/main/resources/db/changelog/202504181534.sql
new file mode 100644
index 00000000..dcf7d336
--- /dev/null
+++ b/main/manager-api/src/main/resources/db/changelog/202504181534.sql
@@ -0,0 +1,2 @@
+delete from `ai_model_config` where id = 'Intent_function_call';
+INSERT INTO `ai_model_config` VALUES ('Intent_function_call', 'Intent', 'function_call', '函数调用意图识别', 0, 1, '{\"type\": \"function_call\", \"functions\": \"change_role;get_weather;get_news;play_music\"}', NULL, NULL, 3, NULL, NULL, NULL, NULL);
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 178f9ebe..a2a322a8 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
@@ -58,3 +58,10 @@ databaseChangeLog:
         - sqlFile:
             encoding: utf8
             path: classpath:db/changelog/202504151206.sql
+  - changeSet:
+      id: 202504181534
+      author: John
+      changes:
+        - sqlFile:
+            encoding: utf8
+            path: classpath:db/changelog/202504181534.sql
\ No newline at end of file