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 8c5b9138..a139289d 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 @@ -60,6 +60,7 @@ public class ConfigServiceImpl implements ConfigService { // 构建模块配置 buildModuleConfig( + agent.getAgentName(), agent.getSystemPrompt(), null, agent.getVadModelId(), @@ -122,6 +123,7 @@ public class ConfigServiceImpl implements ConfigService { // 构建模块配置 buildModuleConfig( + agent.getAgentName(), agent.getSystemPrompt(), voice, agent.getVadModelId(), @@ -216,6 +218,7 @@ public class ConfigServiceImpl implements ConfigService { * @param result 结果Map */ private void buildModuleConfig( + String assistantName, String prompt, String voice, String vadModelId, @@ -248,6 +251,9 @@ public class ConfigServiceImpl implements ConfigService { selectedModule.put(modelTypes[i], model.getId()); } result.put("selected_module", selectedModule); + if (StringUtils.isNotBlank(prompt)) { + prompt = prompt.replace("{{assistant_name}}", "小智"); + } result.put("prompt", prompt); } } diff --git a/main/manager-api/src/main/resources/db/changelog/202504112057.sql b/main/manager-api/src/main/resources/db/changelog/202504112058.sql similarity index 99% rename from main/manager-api/src/main/resources/db/changelog/202504112057.sql rename to main/manager-api/src/main/resources/db/changelog/202504112058.sql index 8b87826f..e19f2da1 100644 --- a/main/manager-api/src/main/resources/db/changelog/202504112057.sql +++ b/main/manager-api/src/main/resources/db/changelog/202504112058.sql @@ -32,7 +32,7 @@ INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, r INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (301, 'delete_audio', 'true', 'boolean', 1, '是否删除使用后的音频文件'); INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (302, 'close_connection_no_voice_time', '120', 'number', 1, '无语音输入断开连接时间(秒)'); INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (303, 'tts_timeout', '10', 'number', 1, 'TTS请求超时时间(秒)'); -INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (304, 'enable_wakeup_words_response_cache', 'true', 'boolean', 1, '是否开启唤醒词加速'); +INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (304, 'enable_wakeup_words_response_cache', 'false', 'boolean', 1, '是否开启唤醒词加速'); INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (305, 'enable_greeting', 'true', 'boolean', 1, '是否开启开场回复'); INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (306, 'enable_stop_tts_notify', 'false', 'boolean', 1, '是否开启结束提示音'); INSERT INTO `sys_params` (id, param_code, param_value, value_type, param_type, remark) VALUES (307, 'stop_tts_notify_voice', 'config/assets/tts_notify.mp3', 'string', 1, '结束提示音文件路径'); 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 8ceb6ea5..438b1cf4 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 @@ -45,9 +45,9 @@ databaseChangeLog: encoding: utf8 path: classpath:db/changelog/202504112044.sql - changeSet: - id: 202504112057 + id: 202504112058 author: John changes: - sqlFile: encoding: utf8 - path: classpath:db/changelog/202504112057.sql \ No newline at end of file + path: classpath:db/changelog/202504112058.sql \ No newline at end of file diff --git a/main/manager-web/src/views/ParamsManagement.vue b/main/manager-web/src/views/ParamsManagement.vue index 2edffdfc..e9baa1e8 100644 --- a/main/manager-web/src/views/ParamsManagement.vue +++ b/main/manager-web/src/views/ParamsManagement.vue @@ -19,7 +19,8 @@ :header-cell-class-name="headerCellClassName"> - +