From add000d221c5b61c76f113963fb47f59473b6607 Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Mon, 12 May 2025 14:16:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update:=E6=95=B0=E6=8D=AE=E5=BA=93=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=81=8A=E5=A4=A9=E4=B8=8A=E6=8A=A5=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{202505111912.sql => 202505111913.sql} | 3 +++ .../db/changelog/db.changelog-master.yaml | 9 +++++++- main/manager-web/src/views/roleConfig.vue | 22 ++++++++----------- 3 files changed, 20 insertions(+), 14 deletions(-) rename main/manager-api/src/main/resources/db/changelog/{202505111912.sql => 202505111913.sql} (52%) diff --git a/main/manager-api/src/main/resources/db/changelog/202505111912.sql b/main/manager-api/src/main/resources/db/changelog/202505111913.sql similarity index 52% rename from main/manager-api/src/main/resources/db/changelog/202505111912.sql rename to main/manager-api/src/main/resources/db/changelog/202505111913.sql index 2d1cd7bf..5d248132 100644 --- a/main/manager-api/src/main/resources/db/changelog/202505111912.sql +++ b/main/manager-api/src/main/resources/db/changelog/202505111913.sql @@ -1,3 +1,6 @@ -- 添加聊天记录配置字段 ALTER TABLE `ai_agent` +ADD COLUMN `chat_history_conf` tinyint NOT NULL DEFAULT 2 COMMENT '聊天记录配置(0不记录 1仅记录文本 2记录文本和语音)' AFTER `system_prompt`; + +ALTER TABLE `ai_agent_template` ADD COLUMN `chat_history_conf` tinyint NOT NULL DEFAULT 2 COMMENT '聊天记录配置(0不记录 1仅记录文本 2记录文本和语音)' AFTER `system_prompt`; \ No newline at end of file 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 53f4609d..ef975dce 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 @@ -113,4 +113,11 @@ databaseChangeLog: changes: - sqlFile: encoding: utf8 - path: classpath:db/changelog/202505091409.sql \ No newline at end of file + path: classpath:db/changelog/202505091409.sql + - changeSet: + id: 202505111913 + author: hrz + changes: + - sqlFile: + encoding: utf8 + path: classpath:db/changelog/202505111913.sql \ No newline at end of file diff --git a/main/manager-web/src/views/roleConfig.vue b/main/manager-web/src/views/roleConfig.vue index b38035d4..ac388ed7 100644 --- a/main/manager-web/src/views/roleConfig.vue +++ b/main/manager-web/src/views/roleConfig.vue @@ -73,8 +73,8 @@ - + @@ -130,20 +130,16 @@ export default { voiceOptions: [], chatHistoryOptions: [ { - "value": 0, - "label": "不记录" + "value": 0, + "label": "不记录" }, { - "value": 1, - "label": "仅记录文本" + "value": 1, + "label": "仅记录文本" }, { - "value": 2, - "label": "仅记录语音" - }, - { - "value": 3, - "label": "文本音频都记录" + "value": 2, + "label": "文本音频都记录" } ], } @@ -538,7 +534,7 @@ export default { } ::v-deep .el-form-item__label { - font-size: 10px !important; + font-size: 12px !important; color: #3d4566 !important; font-weight: 400; line-height: 22px; From 4a0bdbf779ce1955083badcb9147e05ab7a1a2cc Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Mon, 12 May 2025 15:49:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update:=E8=81=8A=E5=A4=A9=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=A8=A1=E5=BC=8F=E5=92=8C=E8=AE=B0=E5=BF=86?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agent/service/impl/AgentServiceImpl.java | 10 +- .../{202505111913.sql => 202505111914.sql} | 4 +- .../db/changelog/db.changelog-master.yaml | 4 +- main/manager-web/src/views/roleConfig.vue | 99 ++++++++++--------- 4 files changed, 67 insertions(+), 50 deletions(-) rename main/manager-api/src/main/resources/db/changelog/{202505111913.sql => 202505111914.sql} (69%) diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java index ae650c85..96040404 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; +import xiaozhi.common.constant.Constant; import xiaozhi.common.page.PageData; import xiaozhi.common.redis.RedisKeys; import xiaozhi.common.redis.RedisUtils; @@ -46,7 +47,14 @@ public class AgentServiceImpl extends BaseServiceImpl imp @Override public AgentEntity getAgentById(String id) { - return agentDao.selectById(id); + AgentEntity agent = agentDao.selectById(id); + if (agent != null && agent.getMemModelId() != null && agent.getMemModelId().equals("Memory_nomem")) { + agent.setChatHistoryConf(Constant.ChatHistoryConfEnum.IGNORE.getCode()); + } else if (agent != null && agent.getMemModelId() != null && !agent.getMemModelId().equals("Memory_nomem") + && agent.getChatHistoryConf() == null) { + agent.setChatHistoryConf(Constant.ChatHistoryConfEnum.RECORD_TEXT_AUDIO.getCode()); + } + return agent; } @Override diff --git a/main/manager-api/src/main/resources/db/changelog/202505111913.sql b/main/manager-api/src/main/resources/db/changelog/202505111914.sql similarity index 69% rename from main/manager-api/src/main/resources/db/changelog/202505111913.sql rename to main/manager-api/src/main/resources/db/changelog/202505111914.sql index 5d248132..c67f3477 100644 --- a/main/manager-api/src/main/resources/db/changelog/202505111913.sql +++ b/main/manager-api/src/main/resources/db/changelog/202505111914.sql @@ -1,6 +1,6 @@ -- 添加聊天记录配置字段 ALTER TABLE `ai_agent` -ADD COLUMN `chat_history_conf` tinyint NOT NULL DEFAULT 2 COMMENT '聊天记录配置(0不记录 1仅记录文本 2记录文本和语音)' AFTER `system_prompt`; +ADD COLUMN `chat_history_conf` tinyint NOT NULL DEFAULT 0 COMMENT '聊天记录配置(0不记录 1仅记录文本 2记录文本和语音)' AFTER `system_prompt`; ALTER TABLE `ai_agent_template` -ADD COLUMN `chat_history_conf` tinyint NOT NULL DEFAULT 2 COMMENT '聊天记录配置(0不记录 1仅记录文本 2记录文本和语音)' AFTER `system_prompt`; \ No newline at end of file +ADD COLUMN `chat_history_conf` tinyint NOT NULL DEFAULT 0 COMMENT '聊天记录配置(0不记录 1仅记录文本 2记录文本和语音)' AFTER `system_prompt`; \ No newline at end of file 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 ef975dce..65ec8972 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 @@ -115,9 +115,9 @@ databaseChangeLog: encoding: utf8 path: classpath:db/changelog/202505091409.sql - changeSet: - id: 202505111913 + id: 202505111914 author: hrz changes: - sqlFile: encoding: utf8 - path: classpath:db/changelog/202505111913.sql \ No newline at end of file + path: classpath:db/changelog/202505111914.sql \ No newline at end of file diff --git a/main/manager-web/src/views/roleConfig.vue b/main/manager-web/src/views/roleConfig.vue index fd601732..8e0d0fb4 100644 --- a/main/manager-web/src/views/roleConfig.vue +++ b/main/manager-web/src/views/roleConfig.vue @@ -61,29 +61,40 @@
- - + + -
- -
-
功能名称: {{ func.name }}
-
- 参数配置: -
- {{ key }}: {{ value }} -
+
+ +
+
功能名称: {{ func.name }}
+
+ 参数配置: +
+ {{ key }}: {{ value }}
-
无参数配置
-
- {{ func.name.charAt(0) }} -
- - - 编辑功能 - -
+
无参数配置
+
+
+ {{ func.name.charAt(0) }} +
+ + + 编辑功能 + +
+
+ + 上报文字 + 上报文字+语音 + +
@@ -92,12 +103,6 @@ :value="item.value" /> - - - - -
@@ -107,14 +112,15 @@ - +