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

Merge pull request #3194 from xinnan-tech/fix(model-config)

Browse Source 
fix(model-config): 修复合并JSON时的类型异常并添加日志
This commit is contained in:
DaGou12138
2026-05-29 10:10:21 +08:00
committed by GitHub
parent ff011d3c44 1701bfbfca
commit f539d46de3
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/manager-api/src/main/java/xiaozhi/modules/model/service/impl/ModelConfigServiceImpl.java
+28 -4
View File
@@ -39,9 +39,11 @@ import xiaozhi.modules.model.dto.ModelProviderDTO;
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;
import lombok.extern.slf4j.Slf4j;
@Service @Service
@AllArgsConstructor @AllArgsConstructor
@Slf4j
public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, ModelConfigEntity> public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, ModelConfigEntity>
implements ModelConfigService { implements ModelConfigService {
@@ -373,7 +375,8 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
// 删除在新JSON中不存在的非敏感字段 // 删除在新JSON中不存在的非敏感字段
for (String oldKey : originalJson.keySet().toArray(new String[0])) { for (String oldKey : originalJson.keySet().toArray(new String[0])) {
if (!modelConfigBodyDTO.getConfigJson().containsKey(oldKey) && !SensitiveDataUtils.isSensitiveField(oldKey)) { if (!modelConfigBodyDTO.getConfigJson().containsKey(oldKey)
&& !SensitiveDataUtils.isSensitiveField(oldKey)) {
updatedJson.remove(oldKey); updatedJson.remove(oldKey);
} }
} }
@@ -392,12 +395,33 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
return value.contains("***"); return value.contains("***");
} }
// 辅助方法：递归合并JSON，保留原始敏感字段 // 辅助方法：递归合并 JSON，保留原始敏感字段
private void mergeJson(JSONObject original, String key, JSONObject updated) { private void mergeJson(JSONObject original, String key, JSONObject updated) {
// 空值检查
if (original == null || updated == null) {
log.warn("mergeJson: original 或 updated 为 null");
return;
}
// 如果 original 中不存在 key，创建一个新的 JSON 对象
if (!original.containsKey(key)) { if (!original.containsKey(key)) {
original.put(key, new JSONObject()); original.put(key, new JSONObject());
} }
JSONObject originalChild = original.getJSONObject(key);
// 获取 original 中的子对象
Object originalValue = original.get(key);
JSONObject originalChild;
// 检查 originalValue 是否是 JSONObject 类型
if (originalValue instanceof JSONObject) {
originalChild = (JSONObject) originalValue;
} else {
// 如果不是 JSONObject 类型，记录警告并创建新的 JSON 对象
log.warn("mergeJson: key '{}' 的值不是 JSONObject 类型 (实际类型：{})，将创建新对象",
key, originalValue != null ? originalValue.getClass().getSimpleName() : "null");
originalChild = new JSONObject();
original.put(key, originalChild);
}
for (String childKey : updated.keySet()) { for (String childKey : updated.keySet()) {
Object childValue = updated.get(childKey); Object childValue = updated.get(childKey);
@@ -411,7 +435,7 @@ public class ModelConfigServiceImpl extends BaseServiceImpl<ModelConfigDao, Mode
} }
} }
// 删除在新JSON中不存在的非敏感子字段 // 删除在新 JSON 中不存在的非敏感子字段
for (String oldChildKey : originalChild.keySet().toArray(new String[0])) { for (String oldChildKey : originalChild.keySet().toArray(new String[0])) {
if (!updated.containsKey(oldChildKey) && !SensitiveDataUtils.isSensitiveField(oldChildKey)) { if (!updated.containsKey(oldChildKey) && !SensitiveDataUtils.isSensitiveField(oldChildKey)) {
originalChild.remove(oldChildKey); originalChild.remove(oldChildKey);