From ef4abf08f02c7ec2ca758d78c8a42f47d130865b Mon Sep 17 00:00:00 2001
From: LiJinHui <166460433+stu-rgsze@users.noreply.github.com>
Date: Fri, 26 Sep 2025 14:44:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/service/impl/ConfigServiceImpl.java      | 13 +++++--------
 .../model/service/impl/ModelConfigServiceImpl.java  |  4 ++--
 2 files changed, 7 insertions(+), 10 deletions(-)

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 4e2d08e2..6dfe2a28 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
@@ -371,12 +371,12 @@ public class ConfigServiceImpl implements ConfigService {
             Map<String, Object> result,
             boolean isCache) {
         Map<String, String> selectedModule = new HashMap<>();
-    
+
         String[] modelTypes = { "VAD", "ASR", "TTS", "Memory", "Intent", "LLM", "VLLM" };
         String[] modelIds = { vadModelId, asrModelId, ttsModelId, memModelId, intentModelId, llmModelId, vllmModelId };
         String intentLLMModelId = null;
         String memLocalShortLLMModelId = null;
-    
+
         for (int i = 0; i < modelIds.length; i++) {
             if (modelIds[i] == null) {
                 continue;
@@ -390,17 +390,14 @@ public class ConfigServiceImpl implements ConfigService {
                 // 复制一份配置，避免修改原始数据
                 JSONObject configJsonCopy = new JSONObject(model.getConfigJson());
                 
-                // 对敏感数据进行隐藏处理
-                JSONObject maskedConfigJson = SensitiveDataUtils.maskSensitiveFields(configJsonCopy);
-                
-                typeConfig.put(model.getId(), maskedConfigJson);
+                typeConfig.put(model.getId(), configJsonCopy);
                 
             }
             result.put(modelTypes[i], typeConfig);
-    
+
             selectedModule.put(modelTypes[i], model.getId());
         }
-    
+
         result.put("selected_module", selectedModule);
         if (StringUtils.isNotBlank(prompt)) {
             prompt = prompt.replace("{{assistant_name}}", StringUtils.isBlank(assistantName) ? "小智" : assistantName);
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java
index f5049226..15be54e2 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java
@@ -138,7 +138,7 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
                 throw new RenException(ErrorCode.INVALID_LLM_TYPE);
             }
         }
-    
+
         // 再更新供应器提供的模型
         ModelConfigEntity modelConfigEntity = ConvertUtils.sourceToTarget(modelConfigBodyDTO, ModelConfigEntity.class);
         modelConfigEntity.setId(id);
@@ -175,7 +175,7 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
     public ModelConfigDTO add(String modelType, String provideCode, ModelConfigBodyDTO modelConfigBodyDTO) {
         // 先验证有没有供应器
         if (StringUtils.isBlank(modelType) || StringUtils.isBlank(provideCode)) {
-            throw new RenException("modelType和provideCode不能为空");
+            throw new RenException(ErrorCode.MODEL_TYPE_PROVIDE_CODE_NOT_NULL);
         }
         List<ModelProviderDTO> providerList = modelProviderService.getList(modelType, provideCode);
         if (CollectionUtil.isEmpty(providerList)) {