From b696f85749a7a4e42eac8a9d7af855e7e817a0fe Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 9 Dec 2024 14:53:51 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E9=9B=86=E6=88=90?= =?UTF-8?q?=E4=B8=8E=E5=8F=91=E5=B8=83-=E5=BA=94=E7=94=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E6=A8=A1=E5=9D=97=E5=A4=8D=E5=88=B6=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=8A=9F=E8=83=BD=E6=9C=89bug=EF=BC=8C=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E5=92=8C=E9=87=8D=E8=BD=BD=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1307943440449536]集成与发布-应用配置中模块复制配置功能有bug，禁用和重载失效 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1307943440449536 --- .../CopyDeployAppConfigModuleConfigApi.java | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/module/CopyDeployAppConfigModuleConfigApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/module/CopyDeployAppConfigModuleConfigApi.java index c7deb551..a668032d 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/module/CopyDeployAppConfigModuleConfigApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/module/CopyDeployAppConfigModuleConfigApi.java @@ -30,7 +30,6 @@ import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.module.deploy.dao.mapper.DeployAppConfigMapper; import neatlogic.module.deploy.service.DeployAppAuthorityService; import neatlogic.module.deploy.service.DeployAppConfigService; -import neatlogic.module.deploy.util.DeployPipelineConfigManager; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -138,7 +137,11 @@ public class CopyDeployAppConfigModuleConfigApi extends PrivateApiComponentBase //1、复制模块配置 if (fromModuleHasConfigEnvIdList.contains(0L)) { //新增模块配置，后面统一新增配置，insert时会duplicate - insertAppConfigList.add(new DeployAppConfigVo(appSystemId, toModuleId, DeployPipelineConfigManager.init(appSystemId).withAppModuleId(fromAppModuleId).getConfig())); + DeployAppConfigVo deployAppConfigVo = deployAppConfigMapper.getAppConfigVo(new DeployAppConfigVo(appSystemId, fromAppModuleId)); + if (deployAppConfigVo != null) { + insertAppConfigList.add(new DeployAppConfigVo(appSystemId, toModuleId, deployAppConfigVo.getConfig())); + } +// insertAppConfigList.add(new DeployAppConfigVo(appSystemId, toModuleId, DeployPipelineConfigManager.init(appSystemId).withAppModuleId(fromAppModuleId).getConfig())); } else if (toModuleHasConfigEnvIdList.contains(0L)) { //删除原有的配置(虽然前端已经有接口控制只能选没有独一份配置的模块，但是防止单独调接口，做多一次删除动作) deployAppConfigMapper.deleteAppConfig(new DeployAppConfigVo(appSystemId, toModuleId)); @@ -165,7 +168,11 @@ public class CopyDeployAppConfigModuleConfigApi extends PrivateApiComponentBase //如果来源模块的环境有独一份配置，则复制 if (fromModuleHasConfigEnvIdList.contains(fromEnvId)) { //新增配置，insert是会duplicate - insertAppConfigList.add(new DeployAppConfigVo(appSystemId, toModuleId, fromEnvId, DeployPipelineConfigManager.init(appSystemId).withAppModuleId(fromAppModuleId).withEnvId(fromEnvId).getConfig())); + DeployAppConfigVo deployAppConfigVo = deployAppConfigMapper.getAppConfigVo(new DeployAppConfigVo(appSystemId, fromAppModuleId, fromEnvId)); + if (deployAppConfigVo != null) { + insertAppConfigList.add(new DeployAppConfigVo(appSystemId, toModuleId, fromEnvId, deployAppConfigVo.getConfig())); + } +// insertAppConfigList.add(new DeployAppConfigVo(appSystemId, toModuleId, fromEnvId, DeployPipelineConfigManager.init(appSystemId).withAppModuleId(fromAppModuleId).withEnvId(fromEnvId).getConfig())); } else if (toModuleHasConfigEnvIdList.contains(fromEnvId)) { //如果来源模块的当前环境没有独一份的配置，而目标模块的当前配置有独一份配置，则需要删除此配置 deployAppConfigMapper.deleteAppConfig(new DeployAppConfigVo(appSystemId, toModuleId, fromEnvId)); @@ -206,12 +213,16 @@ public class CopyDeployAppConfigModuleConfigApi extends PrivateApiComponentBase List insertConfigList = new ArrayList<>(); for (Long envId : fromModuleHasConfigEnvIdList) { - if (envId == 0L) { - //模块层独有一份配置 - insertConfigList.add(new DeployAppConfigVo(appSystemId, toAppModuleId, DeployPipelineConfigManager.init(appSystemId).withAppModuleId(fromAppModuleId).getConfig())); + DeployAppConfigVo deployAppConfigVo = deployAppConfigMapper.getAppConfigVo(new DeployAppConfigVo(appSystemId, fromAppModuleId, envId)); + if (deployAppConfigVo != null) { + insertConfigList.add(new DeployAppConfigVo(appSystemId, toAppModuleId, envId, deployAppConfigVo.getConfig())); } - //环境层独有一份配置 - insertConfigList.add(new DeployAppConfigVo(appSystemId, toAppModuleId, envId, DeployPipelineConfigManager.init(appSystemId).withAppModuleId(fromAppModuleId).withEnvId(envId).getConfig())); +// if (envId == 0L) { +// //模块层独有一份配置 +// insertConfigList.add(new DeployAppConfigVo(appSystemId, toAppModuleId, DeployPipelineConfigManager.init(appSystemId).withAppModuleId(fromAppModuleId).getConfig())); +// } +// //环境层独有一份配置 +// insertConfigList.add(new DeployAppConfigVo(appSystemId, toAppModuleId, envId, DeployPipelineConfigManager.init(appSystemId).withAppModuleId(fromAppModuleId).withEnvId(envId).getConfig())); } //新增或者update流水线配置 -- Gitee