Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-28 01:53:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2370 from xinnan-tech/ota-test

Browse Source 
fix:修复【启用】模型和【默认】模型时，密钥变*bug
This commit is contained in:
欣南科技
2025-10-19 00:37:08 +08:00
committed by GitHub
parent 19c16cfcd8 2488678f34
commit d3371c2875
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/manager-api/src/main/java/xiaozhi/modules/model/controller/ModelController.java
+10 -1
View File
@@ -21,7 +21,12 @@ import xiaozhi.common.utils.ConvertUtils;
import xiaozhi.common.utils.Result; import xiaozhi.common.utils.Result;
import xiaozhi.modules.agent.service.AgentTemplateService; import xiaozhi.modules.agent.service.AgentTemplateService;
import xiaozhi.modules.config.service.ConfigService; import xiaozhi.modules.config.service.ConfigService;
import xiaozhi.modules.model.dto.*; import xiaozhi.modules.model.dto.LlmModelBasicInfoDTO;
import xiaozhi.modules.model.dto.ModelBasicInfoDTO;
import xiaozhi.modules.model.dto.ModelConfigBodyDTO;
import xiaozhi.modules.model.dto.ModelConfigDTO;
import xiaozhi.modules.model.dto.ModelProviderDTO;
import xiaozhi.modules.model.dto.VoiceDTO;
import xiaozhi.modules.model.entity.ModelConfigEntity; import xiaozhi.modules.model.entity.ModelConfigEntity;
import xiaozhi.modules.model.service.ModelConfigService; import xiaozhi.modules.model.service.ModelConfigService;
import xiaozhi.modules.model.service.ModelProviderService; import xiaozhi.modules.model.service.ModelProviderService;
@@ -124,6 +129,8 @@ public class ModelController {
if (entity == null) { if (entity == null) {
return new Result<Void>().error("模型配置不存在"); return new Result<Void>().error("模型配置不存在");
} }
// 不更新ConfigJson字段
entity.setConfigJson(null);
entity.setIsEnabled(status); entity.setIsEnabled(status);
modelConfigService.updateById(entity); modelConfigService.updateById(entity);
return new Result<Void>(); return new Result<Void>();
@@ -141,6 +148,8 @@ public class ModelController {
modelConfigService.setDefaultModel(entity.getModelType(), 0); modelConfigService.setDefaultModel(entity.getModelType(), 0);
entity.setIsEnabled(1); entity.setIsEnabled(1);
entity.setIsDefault(1); entity.setIsDefault(1);
// 不更新ConfigJson字段
entity.setConfigJson(null);
modelConfigService.updateById(entity); modelConfigService.updateById(entity);
// 更新模板表中对应的模型ID // 更新模板表中对应的模型ID