From d945b94910f703c19b438c0f6f65ffb36ec6af10 Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Mon, 21 Apr 2025 17:35:10 +0800 Subject: [PATCH] =?UTF-8?q?update:=E5=A2=9E=E5=8A=A0=E8=85=BE=E8=AE=AFTTS?= =?UTF-8?q?=E3=80=81=E8=85=BE=E8=AE=AFASR=E4=BE=9B=E5=BA=94=E5=99=A8=20(#9?= =?UTF-8?q?18)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 欣南科技 --- .../service/impl/ConfigServiceImpl.java | 2 +- .../resources/db/changelog/202504211118.sql | 19 +++++ .../db/changelog/db.changelog-master.yaml | 7 ++ .../manager-web/src/components/DeviceItem.vue | 10 +-- main/manager-web/src/components/HeaderBar.vue | 13 ++-- main/manager-web/src/views/ModelConfig.vue | 72 +++++++++---------- main/manager-web/src/views/home.vue | 5 +- main/xiaozhi-server/config/settings.py | 8 +++ .../core/providers/tts/doubao.py | 5 +- .../core/providers/tts/ttson.py | 5 ++ main/xiaozhi-server/docker-compose_all.yml | 2 +- main/xiaozhi-server/requirements.txt | 1 + 12 files changed, 92 insertions(+), 57 deletions(-) create mode 100644 main/manager-api/src/main/resources/db/changelog/202504211118.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 f7c06fdb..36aa6bed 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 @@ -291,7 +291,7 @@ public class ConfigServiceImpl implements ConfigService { result.put("selected_module", selectedModule); if (StringUtils.isNotBlank(prompt)) { - prompt = prompt.replace("{{assistant_name}}", "小智"); + prompt = prompt.replace("{{assistant_name}}", StringUtils.isBlank(assistantName) ? "小智" : assistantName); } result.put("prompt", prompt); } diff --git a/main/manager-api/src/main/resources/db/changelog/202504211118.sql b/main/manager-api/src/main/resources/db/changelog/202504211118.sql new file mode 100644 index 00000000..6bbdc183 --- /dev/null +++ b/main/manager-api/src/main/resources/db/changelog/202504211118.sql @@ -0,0 +1,19 @@ +-- 删除无用模型供应器 +delete from `ai_model_provider` where id = 'SYSTEM_LLM_doubao'; +delete from `ai_model_provider` where id = 'SYSTEM_LLM_chatglm'; +delete from `ai_model_provider` where id = 'SYSTEM_TTS_302ai'; +delete from `ai_model_provider` where id = 'SYSTEM_TTS_gizwits'; + +-- 添加模型供应器 +delete from `ai_model_provider` where id = 'SYSTEM_ASR_TencentASR'; +INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `fields`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES +('SYSTEM_ASR_TencentASR', 'ASR', 'tencent', '腾讯语音识别', '[{"key":"appid","label":"应用ID","type":"string"},{"key":"secret_id","label":"Secret ID","type":"string"},{"key":"secret_key","label":"Secret Key","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"}]', 4, 1, NOW(), 1, NOW()); + +-- 添加腾讯语音合成模型供应器 +delete from `ai_model_provider` where id = 'SYSTEM_TTS_TencentTTS'; +INSERT INTO `ai_model_provider` (`id`, `model_type`, `provider_code`, `name`, `fields`, `sort`, `creator`, `create_date`, `updater`, `update_date`) VALUES +('SYSTEM_TTS_TencentTTS', 'TTS', 'tencent', '腾讯语音合成', '[{"key":"appid","label":"应用ID","type":"string"},{"key":"secret_id","label":"Secret ID","type":"string"},{"key":"secret_key","label":"Secret Key","type":"string"},{"key":"output_dir","label":"输出目录","type":"string"},{"key":"region","label":"区域","type":"string"},{"key":"voice","label":"音色ID","type":"string"}]', 5, 1, NOW(), 1, NOW()); + +-- 添加腾讯语音合成音色 +delete from `ai_tts_voice` where id = 'TTS_TencentTTS0001'; +INSERT INTO `ai_tts_voice` VALUES ('TTS_TencentTTS0001', 'TTS_TencentTTS', '智瑜', '101001', '中文', NULL, NULL, 1, 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 09136dc4..b84a6225 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 @@ -65,3 +65,10 @@ databaseChangeLog: - sqlFile: encoding: utf8 path: classpath:db/changelog/202504181536.sql + - changeSet: + id: 202504211118 + author: John + changes: + - sqlFile: + encoding: utf8 + path: classpath:db/changelog/202504211118.sql \ No newline at end of file diff --git a/main/manager-web/src/components/DeviceItem.vue b/main/manager-web/src/components/DeviceItem.vue index 80f64f2c..2ac0bbac 100644 --- a/main/manager-web/src/components/DeviceItem.vue +++ b/main/manager-web/src/components/DeviceItem.vue @@ -23,12 +23,6 @@
配置角色
- - - - - -
设备管理({{ device.deviceCount }})
@@ -80,7 +74,7 @@ export default { .settings-btn { font-weight: 500; - font-size: 10px; + font-size: 12px; color: #5778ff; background: #e6ebff; width: auto; @@ -95,7 +89,7 @@ export default { display: flex; justify-content: space-between; margin-top: 15px; - font-size: 10px; + font-size: 12px; color: #979db1; font-weight: 400; } diff --git a/main/manager-web/src/components/HeaderBar.vue b/main/manager-web/src/components/HeaderBar.vue index 5ddcee55..c67362ea 100644 --- a/main/manager-web/src/components/HeaderBar.vue +++ b/main/manager-web/src/components/HeaderBar.vue @@ -170,7 +170,7 @@ export default { .header { background: #f6fcfe66; border: 1px solid #fff; - height: 53px !important; + height: 63px !important; min-width: 900px; /* 设置最小宽度防止过度压缩 */ overflow: hidden; @@ -197,7 +197,7 @@ export default { } .brand-img { - height: 18px; + height: 20px; } .header-center { @@ -219,13 +219,13 @@ export default { .equipment-management { padding: 0 9px; - width: 82px; - height: 24px; - border-radius: 12px; + width: px; + height: 30px; + border-radius: 15px; background: #deeafe; display: flex; justify-content: center; - font-size: 10px; + font-size: 14px; font-weight: 500; gap: 7px; color: #3d4566; @@ -235,6 +235,7 @@ export default { cursor: pointer; flex-shrink: 0; /* 防止导航按钮被压缩 */ + padding: 0px 15px; } .equipment-management.active-tab { diff --git a/main/manager-web/src/views/ModelConfig.vue b/main/manager-web/src/views/ModelConfig.vue index 294a6ed8..8add3398 100644 --- a/main/manager-web/src/views/ModelConfig.vue +++ b/main/manager-web/src/views/ModelConfig.vue @@ -58,8 +58,8 @@ :header-cell-class-name="headerCellClassName" @selection-change="handleSelectionChange"> + -