diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/env/CopyDeployAppConfigEnvConfigApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/env/CopyDeployAppConfigEnvConfigApi.java index 89389fbe8b2007651749e77df93809b3d4f8d34b..a96c11aaa67d8f48b4aa8db158de786b9b09e473 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/env/CopyDeployAppConfigEnvConfigApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/env/CopyDeployAppConfigEnvConfigApi.java @@ -27,8 +27,6 @@ import neatlogic.framework.restful.constvalue.OperationTypeEnum; 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; @@ -51,9 +49,6 @@ public class CopyDeployAppConfigEnvConfigApi extends PrivateApiComponentBase { @Resource DeployAppConfigMapper deployAppConfigMapper; - @Resource - DeployAppConfigService deployAppConfigService; - @Resource DeployAppAuthorityService deployAppAuthorityService; @@ -100,7 +95,12 @@ public class CopyDeployAppConfigEnvConfigApi extends PrivateApiComponentBase { boolean hasFromEnvConfig = deployAppConfigMapper.getAppConfigByAppSystemIdAndAppModuleIdAndEnvId(appSystemId, appModuleId, fromEnvId) != null; //复制流水线配置 - DeployPipelineConfigVo fromEnvConfigVo = DeployPipelineConfigManager.init(appSystemId).withAppModuleId(appModuleId).withEnvId(fromEnvId).getConfig(); + DeployAppConfigVo fromEnvAppConfigVo = deployAppConfigMapper.getAppConfigVo(new DeployAppConfigVo(appSystemId, appModuleId, fromEnvId)); + if (fromEnvAppConfigVo == null) { + throw new DeployAppConfigNotFoundException(appModuleId); + } + DeployPipelineConfigVo fromEnvConfigVo = fromEnvAppConfigVo.getConfig(); +// DeployPipelineConfigVo fromEnvConfigVo = DeployPipelineConfigManager.init(appSystemId).withAppModuleId(appModuleId).withEnvId(fromEnvId).getConfig(); if (fromEnvConfigVo == null) { throw new DeployAppConfigNotFoundException(appModuleId); } diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/module/GetDeployModuleScenarioAndEnvListApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/module/GetDeployModuleScenarioAndEnvListApi.java index e32cf38c4a8c8dbdaa553f3a2f8a3b901afac15f..158f23c62ae6b4d1eafa2e175439c5ec5683d39d 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/module/GetDeployModuleScenarioAndEnvListApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/module/GetDeployModuleScenarioAndEnvListApi.java @@ -76,6 +76,10 @@ public class GetDeployModuleScenarioAndEnvListApi extends PrivateApiComponentBas //场景 DeployPipelineConfigVo pipelineConfigVo = DeployPipelineConfigManager.init(appSystemId) .withAppModuleId(appModuleId) + .withIsDeleteDisabledPhase(false) + .withIsUpdateProfile(false) + .withIsHasBuildOrDeployTypeTool(false) + .withIsUpdateConfig(false) .getConfig(); if (pipelineConfigVo == null) { throw new DeployAppConfigNotFoundException(appSystemId); diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/system/ListDeployAppConfigAuthorityApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/system/ListDeployAppConfigAuthorityApi.java index 39061294afc710ffe30810a927d8a81ce72ceeef..3f9a48006c3c57463c53ebfad62641c3d670e0a6 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/system/ListDeployAppConfigAuthorityApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/system/ListDeployAppConfigAuthorityApi.java @@ -76,8 +76,8 @@ public class ListDeployAppConfigAuthorityApi extends PrivateApiComponentBase { public Object myDoService(JSONObject paramObj) { Long appSystemId = paramObj.getLong("appSystemId"); JSONArray includeActionList = paramObj.getJSONArray("includeActionList"); - boolean isNeedScenario = org.apache.commons.collections4.CollectionUtils.isEmpty(includeActionList) || includeActionList.contains(DeployAppConfigActionType.SCENARIO.getValue()); - boolean isNeedEnv = org.apache.commons.collections4.CollectionUtils.isEmpty(includeActionList) || includeActionList.contains(DeployAppConfigActionType.ENV.getValue()); + boolean isNeedScenario = CollectionUtils.isEmpty(includeActionList) || includeActionList.contains(DeployAppConfigActionType.SCENARIO.getValue()); + boolean isNeedEnv = CollectionUtils.isEmpty(includeActionList) || includeActionList.contains(DeployAppConfigActionType.ENV.getValue()); JSONObject returnObj = new JSONObject(); //操作权限 @@ -85,7 +85,12 @@ public class ListDeployAppConfigAuthorityApi extends PrivateApiComponentBase { //场景权限 if (isNeedScenario) { - DeployPipelineConfigVo pipelineConfigVo = DeployPipelineConfigManager.init(appSystemId).getConfig(); + DeployPipelineConfigVo pipelineConfigVo = DeployPipelineConfigManager.init(appSystemId) + .withIsDeleteDisabledPhase(false) + .withIsUpdateProfile(false) + .withIsHasBuildOrDeployTypeTool(false) + .withIsUpdateConfig(false) + .getConfig(); if (pipelineConfigVo == null) { throw new DeployAppConfigNotFoundException(appSystemId); } diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/system/SearchDeployAppConfigAuthorityApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/system/SearchDeployAppConfigAuthorityApi.java index 60dae878cb0b31375da6c0cad4441515fdd1071e..302facc8f90d83609d3c5e04b8f1414311a95983 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/system/SearchDeployAppConfigAuthorityApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/system/SearchDeployAppConfigAuthorityApi.java @@ -131,7 +131,12 @@ public class SearchDeployAppConfigAuthorityApi extends PrivateApiComponentBase { List scenarioIdList = new ArrayList<>(); if (isNeedScenario) { //根据appSystemId获取对应的场景theadList - pipelineConfigVo = DeployPipelineConfigManager.init(paramObj.getLong("appSystemId")).getConfig(); + pipelineConfigVo = DeployPipelineConfigManager.init(paramObj.getLong("appSystemId")) + .withIsDeleteDisabledPhase(false) + .withIsUpdateProfile(false) + .withIsHasBuildOrDeployTypeTool(false) + .withIsUpdateConfig(false) + .getConfig(); if (pipelineConfigVo == null) { throw new DeployAppConfigNotFoundException(paramObj.getLong("appSystemId")); } diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/system/TreeDeployAppConfigAppSystemAppModuleEnvApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/system/TreeDeployAppConfigAppSystemAppModuleEnvApi.java index 455b867dcae75e2081b1e1fe1a71a929204bce36..953e7a57cc73ee32ebbac2eb0079357faeeb985f 100644 --- a/src/main/java/neatlogic/module/deploy/api/appconfig/system/TreeDeployAppConfigAppSystemAppModuleEnvApi.java +++ b/src/main/java/neatlogic/module/deploy/api/appconfig/system/TreeDeployAppConfigAppSystemAppModuleEnvApi.java @@ -83,9 +83,9 @@ public class TreeDeployAppConfigAppSystemAppModuleEnvApi extends PrivateApiCompo List deployAppConfigList = DeployPipelineConfigManager.init(appSystemId) .withAppModuleIdList(appModuleIdList) .withEnvIdList(envIdList) - .isHasBuildOrDeployTypeTool(false) - .isUpdateConfig(false) - .isUpdateProfile(false) + .withIsHasBuildOrDeployTypeTool(false) + .withIsUpdateConfig(false) + .withIsUpdateProfile(false) .getDeployAppConfigList(); for (DeployAppModuleVo deployAppModuleVo : deployAppModuleList) { DeployPipelineConfigVo pipelineConfigVo = getDeployPipelineConfigVo(deployAppConfigList, appSystemId, deployAppModuleVo.getId(), 0L); diff --git a/src/main/java/neatlogic/module/deploy/api/apppipeline/GetDeployAppPipelineApi.java b/src/main/java/neatlogic/module/deploy/api/apppipeline/GetDeployAppPipelineApi.java index c7c5c855518d409767e607c381b3c69b1536cb9d..a28bf64dde06dda33c8731e465385b9fa77c7c5e 100644 --- a/src/main/java/neatlogic/module/deploy/api/apppipeline/GetDeployAppPipelineApi.java +++ b/src/main/java/neatlogic/module/deploy/api/apppipeline/GetDeployAppPipelineApi.java @@ -94,7 +94,7 @@ public class GetDeployAppPipelineApi extends PrivateApiComponentBase { DeployPipelineConfigVo deployPipelineConfigVo = DeployPipelineConfigManager.init(searchVo.getAppSystemId()) .withAppModuleId(searchVo.getAppModuleId()) .withEnvId(searchVo.getEnvId()) - .withDeleteDisabledPhase(isDeleteDisabledPhase) // 删除禁用阶段 + .withIsDeleteDisabledPhase(isDeleteDisabledPhase) // 删除禁用阶段 .getConfig(); searchVo.setConfig(deployPipelineConfigVo); return searchVo; diff --git a/src/main/java/neatlogic/module/deploy/api/apppipeline/ListDeployAppPipelineProfileApi.java b/src/main/java/neatlogic/module/deploy/api/apppipeline/ListDeployAppPipelineProfileApi.java index 4c80173f4ca8a8f1b78a5b2bb492a9671b108970..5136f064e91d65447239fa0a04c0682646ebd363 100644 --- a/src/main/java/neatlogic/module/deploy/api/apppipeline/ListDeployAppPipelineProfileApi.java +++ b/src/main/java/neatlogic/module/deploy/api/apppipeline/ListDeployAppPipelineProfileApi.java @@ -105,6 +105,10 @@ public class ListDeployAppPipelineProfileApi extends PrivateApiComponentBase { .withAppModuleId(searchVo.getAppModuleId()) .withEnvId(searchVo.getEnvId()) .withProfileIdList(profileIdList) + .withIsDeleteDisabledPhase(false) + .withIsHasBuildOrDeployTypeTool(false) + .withIsUpdateConfig(false) + .withIsUpdateProfile(true) .getConfig(); return deployPipelineConfigVo.getOverrideProfileList(); } diff --git a/src/main/java/neatlogic/module/deploy/api/job/GetDeployJobCreateInfoApi.java b/src/main/java/neatlogic/module/deploy/api/job/GetDeployJobCreateInfoApi.java index af431446285bf2e82f886d9a4a5604566d619bb4..bdea3708043710807f9016d71ff7c1833185fd5f 100644 --- a/src/main/java/neatlogic/module/deploy/api/job/GetDeployJobCreateInfoApi.java +++ b/src/main/java/neatlogic/module/deploy/api/job/GetDeployJobCreateInfoApi.java @@ -106,6 +106,10 @@ public class GetDeployJobCreateInfoApi extends PrivateApiComponentBase { //场景 DeployPipelineConfigVo pipelineConfigVo = DeployPipelineConfigManager.init(appSystemId) .withAppModuleId(appModuleId) + .withIsDeleteDisabledPhase(false) + .withIsUpdateProfile(false) + .withIsHasBuildOrDeployTypeTool(false) + .withIsUpdateConfig(false) .getConfig(); if (pipelineConfigVo == null) { throw new DeployAppConfigNotFoundException(appSystemId); diff --git a/src/main/java/neatlogic/module/deploy/api/job/ListDeployJobModuleApi.java b/src/main/java/neatlogic/module/deploy/api/job/ListDeployJobModuleApi.java index 1d25127630a19ca45ef1f585cc17e48f0a9d3de2..d1f552c9886abc183b34ca5009356ead9f0a2749 100644 --- a/src/main/java/neatlogic/module/deploy/api/job/ListDeployJobModuleApi.java +++ b/src/main/java/neatlogic/module/deploy/api/job/ListDeployJobModuleApi.java @@ -111,9 +111,9 @@ public class ListDeployJobModuleApi extends PrivateApiComponentBase { List deployAppConfigList = DeployPipelineConfigManager.init(appSystemId) .withAppModuleIdList(appModuleIdList) .withEnvIdList(Collections.singletonList(envId)) - .isHasBuildOrDeployTypeTool(true) - .isUpdateConfig(false) - .isUpdateProfile(false) + .withIsHasBuildOrDeployTypeTool(true) + .withIsUpdateConfig(false) + .withIsUpdateProfile(false) .getDeployAppConfigList(); // Map appConfigVoMap = appConfigVoList.stream().collect(Collectors.toMap(o -> o.getAppSystemId().toString() + "-" + o.getAppModuleId().toString() + "-" + o.getEnvId().toString(), e -> e)); for (ResourceVo resourceVo : moduleResourceList) { diff --git a/src/main/java/neatlogic/module/deploy/job/source/type/DeployJobSourceTypeHandler.java b/src/main/java/neatlogic/module/deploy/job/source/type/DeployJobSourceTypeHandler.java index eafd09298d4bc87593c81b32dc373a143f0e4c9c..4915e31e94d54a2f3ced08450b19be3fd908cff5 100644 --- a/src/main/java/neatlogic/module/deploy/job/source/type/DeployJobSourceTypeHandler.java +++ b/src/main/java/neatlogic/module/deploy/job/source/type/DeployJobSourceTypeHandler.java @@ -193,7 +193,10 @@ public class DeployJobSourceTypeHandler extends AutoexecJobSourceTypeHandlerBase DeployPipelineConfigVo deployPipelineConfigVo = DeployPipelineConfigManager.init(deployJobVo.getAppSystemId()) .withAppModuleId(deployJobVo.getAppModuleId()) .withEnvId(deployJobVo.getEnvId()) - .withDeleteDisabledPhase(true) // 删除禁用阶段 + .withIsDeleteDisabledPhase(true) // 删除禁用阶段 + .withIsHasBuildOrDeployTypeTool(false) + .withIsUpdateConfig(false) + .withIsUpdateProfile(true) .getConfig(); if (deployPipelineConfigVo == null) { throw new DeployPipelineConfigNotFoundException(); @@ -455,7 +458,10 @@ public class DeployJobSourceTypeHandler extends AutoexecJobSourceTypeHandlerBase DeployPipelineConfigVo deployPipelineConfigVo = DeployPipelineConfigManager.init(deployJobVo.getAppSystemId()) .withAppModuleId(deployJobVo.getAppModuleId()) .withEnvId(deployJobVo.getEnvId()) - .withDeleteDisabledPhase(true) // 删除禁用阶段 + .withIsDeleteDisabledPhase(true) // 删除禁用阶段 + .withIsUpdateProfile(false) + .withIsHasBuildOrDeployTypeTool(false) + .withIsUpdateConfig(true) .getConfig(); if (deployPipelineConfigVo == null) { throw new DeployPipelineConfigNotFoundException(); diff --git a/src/main/java/neatlogic/module/deploy/service/DeployCiServiceImpl.java b/src/main/java/neatlogic/module/deploy/service/DeployCiServiceImpl.java index 3e5b969c2a9942a695a5d6c663810bd7990a5c8e..7242e48ece2ed56d717eb3a556b74f1e4d3f95e0 100644 --- a/src/main/java/neatlogic/module/deploy/service/DeployCiServiceImpl.java +++ b/src/main/java/neatlogic/module/deploy/service/DeployCiServiceImpl.java @@ -107,7 +107,10 @@ public class DeployCiServiceImpl implements DeployCiService { DeployPipelineConfigVo deployPipelineConfigVo = DeployPipelineConfigManager.init(ci.getAppSystemId()) .withAppModuleId(ci.getAppModuleId()) .withEnvId(envId) - .isHasBuildOrDeployTypeTool(true) + .withIsHasBuildOrDeployTypeTool(true) + .withIsDeleteDisabledPhase(false) + .withIsUpdateProfile(false) + .withIsUpdateConfig(false) .getConfig(); if (deployPipelineConfigVo == null) { logger.error("{} callback error. Deploy app config not found, ciId: {}, callback params: {}", repoTypeName, ci.getId(), paramObj.toJSONString()); diff --git a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java index 7513bbdc5cf4f73603034a093cabec6cf1e4039b..7b42a3a11ab472ef486dbfe1948da61d3b09b7c3 100644 --- a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java +++ b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java @@ -143,22 +143,22 @@ public class DeployPipelineConfigManager { return this; } - public Builder withDeleteDisabledPhase(boolean isDeleteDisabledPhase) { + public Builder withIsDeleteDisabledPhase(boolean isDeleteDisabledPhase) { this.isDeleteDisabledPhase = isDeleteDisabledPhase; return this; } - public Builder isHasBuildOrDeployTypeTool(boolean _isHasBuildOrDeployTypeTool) { + public Builder withIsHasBuildOrDeployTypeTool(boolean _isHasBuildOrDeployTypeTool) { this.isHasBuildOrDeployTypeTool = _isHasBuildOrDeployTypeTool; return this; } - public Builder isUpdateConfig(boolean _isUpdateConfig) { + public Builder withIsUpdateConfig(boolean _isUpdateConfig) { this.isUpdateConfig = _isUpdateConfig; return this; } - public Builder isUpdateProfile(boolean _isUpdateProfile) { + public Builder withIsUpdateProfile(boolean _isUpdateProfile) { this.isUpdateProfile = _isUpdateProfile; return this; } @@ -655,8 +655,9 @@ public class DeployPipelineConfigManager { pipelineConfigVo = DeployPipelineConfigManager.init(jobTemplateVo.getAppSystemId()) .withAppModuleId(jobTemplateVo.getAppModuleId()) .withEnvId(jobTemplateVo.getEnvId()) - .isHasBuildOrDeployTypeTool(true) - .isUpdateConfig(false) + .withIsHasBuildOrDeployTypeTool(true) + .withIsUpdateConfig(false) + .withIsUpdateProfile(false) .getConfig(); if (pipelineConfigVo != null) { envPipelineMap.put(jobTemplateVo.getEnvId(), pipelineConfigVo);