From 8e3dbf29c1fcf7e1f5612fb33846518da901d06f Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 17 Apr 2025 17:00:56 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE-=E7=8E=AF=E5=A2=83=E5=B1=82=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E9=80=82=E9=85=8D=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=A1=E8=AE=A1=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1400864579747840]应用配置-环境层配置文件适配变量增加审计功能 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1400864579747840 --- .../env/SaveDeployAppConfigEnvAutoConfigApi.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigEnvAutoConfigApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigEnvAutoConfigApi.java index b0d838f9..87e9922b 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigEnvAutoConfigApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigEnvAutoConfigApi.java @@ -26,6 +26,7 @@ import neatlogic.framework.deploy.dto.app.DeployAppEnvAutoConfigKeyValueVo; import neatlogic.framework.deploy.dto.app.DeployAppEnvAutoConfigVo; import neatlogic.framework.deploy.exception.DeployAppConfigEnvAutoConfigKeyIrregularException; import neatlogic.framework.deploy.exception.DeployAppConfigEnvAutoConfigKeyRepeatException; +import neatlogic.framework.deploy.exception.DeployAppConfigEnvAutoConfigKeyTypeIrregularException; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; @@ -110,11 +111,15 @@ public class SaveDeployAppConfigEnvAutoConfigApi extends PrivateApiComponentBase if (instanceId != 0L) { DeployAppEnvAutoConfigVo appEnvAutoConfigVo = new DeployAppEnvAutoConfigVo(appSystemId, appModuleId, envId, 0L); List oldKeyValueList = deployAppConfigMapper.getAppEnvAutoConfigKeyValueList(appEnvAutoConfigVo); - List keyList = oldKeyValueList.stream().filter(Objects::nonNull).map(DeployAppEnvAutoConfigKeyValueVo::getKey).collect(Collectors.toList()); + Map oldKeyValueMap = oldKeyValueList.stream().filter(Objects::nonNull).collect(Collectors.toMap(DeployAppEnvAutoConfigKeyValueVo::getKey, e -> e)); for (DeployAppEnvAutoConfigKeyValueVo keyValueVo : keyValueList) { - if (!keyList.contains(keyValueVo.getKey())) { + DeployAppEnvAutoConfigKeyValueVo oldKeyValueVo = oldKeyValueMap.get(keyValueVo.getKey()); + if (oldKeyValueVo == null) { throw new DeployAppConfigEnvAutoConfigKeyIrregularException(keyValueVo.getKey()); } + if (!Objects.equals(oldKeyValueVo.getType(), keyValueVo.getType())) { + throw new DeployAppConfigEnvAutoConfigKeyTypeIrregularException(keyValueVo.getKey(), keyValueVo.getType(), oldKeyValueVo.getType()); + } } } // DeployAppEnvAutoConfigVo appEnvAutoConfigVo = JSON.toJavaObject(paramObj, DeployAppEnvAutoConfigVo.class); -- Gitee