From 776b5fb3b4af8d614205ed23a2273bb7bbce7dca Mon Sep 17 00:00:00 2001
From: LiJinHui <166460433+stu-rgsze@users.noreply.github.com>
Date: Sun, 28 Sep 2025 15:27:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A0=E5=AF=86=E7=9A=84bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/utils/SensitiveDataUtils.java      |  2 +
 .../service/impl/ConfigServiceImpl.java       | 15 +++---
 .../model/service/ModelConfigService.java     | 20 ++++++--
 .../service/impl/ModelConfigServiceImpl.java  | 46 ++++++++++++-------
 4 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/common/utils/SensitiveDataUtils.java b/main/manager-api/src/main/java/xiaozhi/common/utils/SensitiveDataUtils.java
index e3fc6c35..05f4853a 100644
--- a/main/manager-api/src/main/java/xiaozhi/common/utils/SensitiveDataUtils.java
+++ b/main/manager-api/src/main/java/xiaozhi/common/utils/SensitiveDataUtils.java
@@ -36,8 +36,10 @@ public class SensitiveDataUtils {
 
         int length = value.length();
         if (length <= 8) {
+            // 短字符串保留前2后2
             return value.substring(0, 2) + "****" + value.substring(length - 2);
         } else {
+            // 长字符串保留前4后4
             int maskLength = length - 8;
             StringBuilder maskBuilder = new StringBuilder();
             for (int i = 0; i < maskLength; i++) {
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 5586b9f0..c813a398 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
@@ -350,7 +350,7 @@ public class ConfigServiceImpl implements ConfigService {
      * @param result         结果Map
      */
     private void buildModuleConfig(
-            String assistantName,
+            String assistantName, 
             String prompt,
             String summaryMemory,
             String voice,
@@ -366,17 +366,18 @@ 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;
             }
-            ModelConfigEntity model = modelConfigService.getModelById(modelIds[i], isCache);
+            // 关键：第三个参数传false，确保获取原始密钥
+            ModelConfigEntity model = modelConfigService.getModelById(modelIds[i], isCache, false);
             if (model == null) {
                 continue;
             }
@@ -424,14 +425,16 @@ public class ConfigServiceImpl implements ConfigService {
                 if ("LLM".equals(modelTypes[i])) {
                     if (StringUtils.isNotBlank(intentLLMModelId)) {
                         if (!typeConfig.containsKey(intentLLMModelId)) {
-                            ModelConfigEntity intentLLM = modelConfigService.getModelById(intentLLMModelId, isCache);
+                            // 修改这里：添加isMaskSensitive=false参数
+                            ModelConfigEntity intentLLM = modelConfigService.getModelById(intentLLMModelId, isCache, false);
                             typeConfig.put(intentLLM.getId(), intentLLM.getConfigJson());
                         }
                     }
                     if (StringUtils.isNotBlank(memLocalShortLLMModelId)) {
                         if (!typeConfig.containsKey(memLocalShortLLMModelId)) {
+                            // 修改这里：添加isMaskSensitive=false参数
                             ModelConfigEntity memLocalShortLLM = modelConfigService
-                                    .getModelById(memLocalShortLLMModelId, isCache);
+                                    .getModelById(memLocalShortLLMModelId, isCache, false);
                             typeConfig.put(memLocalShortLLM.getId(), memLocalShortLLM.getConfigJson());
                         }
                     }
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/model/service/ModelConfigService.java b/main/manager-api/src/main/java/xiaozhi/modules/model/service/ModelConfigService.java
index 634101e3..7788cb20 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/model/service/ModelConfigService.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/model/service/ModelConfigService.java
@@ -35,17 +35,27 @@ public interface ModelConfigService extends BaseService<ModelConfigEntity> {
     /**
      * 根据ID获取模型配置
      * 
-     * @param id      模型ID
-     * @param isCache 是否缓存
+     * @param id          模型ID
+     * @param isCache     是否缓存
+     * @param isMaskSensitive 是否掩码敏感信息
+     * @return 模型配置实体
+     */
+    ModelConfigEntity getModelById(String id, boolean isCache, boolean isMaskSensitive);
+
+    /**
+     * 根据ID获取模型配置（默认掩码敏感信息）
+     * 
+     * @param id          模型ID
+     * @param isCache     是否缓存
      * @return 模型配置实体
      */
     ModelConfigEntity getModelById(String id, boolean isCache);
-
+    
     /**
      * 设置默认模型
      * 
-     * @param modelType 模型类型
-     * @param isDefault 是否默认
+     * @param modelType   模型类型
+     * @param isDefault   是否默认（1:是，0:否）
      */
     void setDefaultModel(String modelType, int isDefault);
 }
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 3b113d41..cee88568 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
@@ -212,29 +212,44 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
 
     @Override
     public ModelConfigEntity getModelById(String id, boolean isCache) {
+        return getModelById(id, isCache, true);
+    }
+    
+    @Override
+    public ModelConfigEntity getModelById(String id, boolean isCache, boolean isMaskSensitive) {
         if (StringUtils.isBlank(id)) {
             return null;
         }
-
+    
         ModelConfigEntity entity = null;
-
+        String cacheKey = RedisKeys.getModelConfigById(id);
+        
         if (isCache) {
-            String cacheKey = RedisKeys.getModelConfigById(id);
+            // 从缓存获取
             entity = (ModelConfigEntity) redisUtils.get(cacheKey);
             if (entity != null) {
-                return entity; 
+                // 修改：根据isMaskSensitive参数重新处理敏感信息
+                if (!isMaskSensitive && entity.getConfigJson() != null) {
+                    // 如果需要获取原始配置，但缓存的是掩码后的配置，则从数据库重新获取
+                    ModelConfigEntity originalEntity = modelConfigDao.selectById(id);
+                    if (originalEntity != null) {
+                        entity.setConfigJson(originalEntity.getConfigJson());
+                    }
+                }
+                return entity;
             }
         }
-
+    
         // 从数据库获取数据
         entity = modelConfigDao.selectById(id);
         if (entity != null) {
-            if (entity.getConfigJson() != null) {
+            // 根据isMaskSensitive参数决定是否掩码敏感信息
+            if (isMaskSensitive && entity.getConfigJson() != null) {
                 entity.setConfigJson(maskSensitiveFields(entity.getConfigJson()));
             }
-
+    
             if (isCache) {
-                redisUtils.set(RedisKeys.getModelConfigById(id), entity);
+                redisUtils.set(cacheKey, entity);
             }
         }
         return entity;
@@ -352,21 +367,20 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
         // 2. 只更新非敏感字段
         modelConfigEntity.setModelName(modelConfigBodyDTO.getModelName());
         modelConfigEntity.setSort(modelConfigBodyDTO.getSort());
-        modelConfigEntity.setIsEnabled(modelConfigBodyDTO.getIsEnabled());
-       
+        modelConfigEntity.setIsEnabled(modelConfigBodyDTO.getIsEnabled());  
         // 3. 处理配置JSON，仅更新非敏感字段和明确修改的敏感字段
         if (modelConfigBodyDTO.getConfigJson() != null && originalEntity.getConfigJson() != null) {
             JSONObject originalJson = originalEntity.getConfigJson();
             JSONObject updatedJson = new JSONObject(originalJson); // 基于原始JSON进行修改
-
+    
             // 遍历更新的JSON，只更新非敏感字段或确实被修改的敏感字段
             for (String key : modelConfigBodyDTO.getConfigJson().keySet()) {
                 Object value = modelConfigBodyDTO.getConfigJson().get(key);
-
+    
                 // 如果是敏感字段，需要确认是否真的被修改（前端传入的可能是掩码后的值）
                 if (SensitiveDataUtils.isSensitiveField(key)) {
-                    // 只有当传入的值不是掩码格式时，才认为是真实修改
-                    if (value instanceof String && !isMaskedValue((String) value)) {
+                    
+                    if (value instanceof String && !SensitiveDataUtils.isMaskedValue((String) value)) {
                         updatedJson.put(key, value);
                     }
                 } else if (value instanceof JSONObject) {
@@ -377,10 +391,10 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
                     updatedJson.put(key, value);
                 }
             }
-
+    
             modelConfigEntity.setConfigJson(updatedJson);
         }
-
+    
         return modelConfigEntity;
     }