From fe237de38861a00ec8ee90f7ca4d7c8627750160 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 17 Apr 2025 14:23: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 --- .../SaveDeployAppConfigEnvAutoConfigApi.java | 21 ++++++++++++++++++- .../dao/mapper/DeployAppConfigMapper.xml | 1 + 2 files changed, 21 insertions(+), 1 deletion(-) 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 5eb87e48..b0d838f9 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 @@ -24,6 +24,8 @@ import neatlogic.framework.deploy.constvalue.DeployAppConfigAction; import neatlogic.framework.deploy.dto.app.DeployAppEnvAutoConfigAuditVo; 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.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; @@ -37,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; +import java.util.stream.Collectors; /** * @author lvzk @@ -97,7 +100,23 @@ public class SaveDeployAppConfigEnvAutoConfigApi extends PrivateApiComponentBase //校验环境权限、编辑配置的操作权限 deployAppAuthorityService.checkEnvAuth(appSystemId, paramObj.getLong("envId")); deployAppAuthorityService.checkOperationAuth(appSystemId, DeployAppConfigAction.EDIT); - + Set keySet = new HashSet<>(); + for (DeployAppEnvAutoConfigKeyValueVo keyValueVo : keyValueList ) { + if (keySet.contains(keyValueVo.getKey())) { + throw new DeployAppConfigEnvAutoConfigKeyRepeatException(keyValueVo.getKey()); + } + keySet.add(keyValueVo.getKey()); + } + 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()); + for (DeployAppEnvAutoConfigKeyValueVo keyValueVo : keyValueList) { + if (!keyList.contains(keyValueVo.getKey())) { + throw new DeployAppConfigEnvAutoConfigKeyIrregularException(keyValueVo.getKey()); + } + } + } // DeployAppEnvAutoConfigVo appEnvAutoConfigVo = JSON.toJavaObject(paramObj, DeployAppEnvAutoConfigVo.class); DeployAppEnvAutoConfigVo appEnvAutoConfigVo = new DeployAppEnvAutoConfigVo(appSystemId, appModuleId, envId, instanceId); List oldKeyValueList = deployAppConfigMapper.getAppEnvAutoConfigKeyValueList(appEnvAutoConfigVo); diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml index 9cfcf428..38d4f728 100644 --- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml +++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml @@ -1191,6 +1191,7 @@ along with this program. If not, see .--> + -- Gitee