From 3fb60214af22c75990db92cd42053e4d1fa80839 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 11 Dec 2024 17:37:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=91=E5=B8=83=E5=BA=94=E7=94=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E5=BA=94=E7=94=A8=E7=B3=BB=E7=BB=9F=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=8E=AF=E5=A2=83=E6=A0=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1305869113851904]优化查询发布应用配置的应用系统模块环境树接口 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1305869113851904 --- .../env/CopyDeployAppConfigEnvConfigApi.java | 12 ++++++------ .../module/GetDeployModuleScenarioAndEnvListApi.java | 4 ++++ .../system/ListDeployAppConfigAuthorityApi.java | 11 ++++++++--- .../system/SearchDeployAppConfigAuthorityApi.java | 7 ++++++- .../apppipeline/ListDeployAppPipelineProfileApi.java | 6 +++++- .../deploy/api/job/GetDeployJobCreateInfoApi.java | 4 ++++ .../job/source/type/DeployJobSourceTypeHandler.java | 6 ++++++ .../module/deploy/service/DeployCiServiceImpl.java | 3 +++ .../deploy/util/DeployPipelineConfigManager.java | 1 + 9 files changed, 43 insertions(+), 11 deletions(-) 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 89389fbe..a96c11aa 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 e32cf38c..3bf78026 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) + .withDeleteDisabledPhase(false) + .isUpdateProfile(false) + .isHasBuildOrDeployTypeTool(false) + .isUpdateConfig(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 39061294..a6eed5f3 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) + .withDeleteDisabledPhase(false) + .isUpdateProfile(false) + .isHasBuildOrDeployTypeTool(false) + .isUpdateConfig(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 60dae878..3cce7c42 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")) + .withDeleteDisabledPhase(false) + .isUpdateProfile(false) + .isHasBuildOrDeployTypeTool(false) + .isUpdateConfig(false) + .getConfig(); if (pipelineConfigVo == null) { throw new DeployAppConfigNotFoundException(paramObj.getLong("appSystemId")); } 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 4c80173f..b3c4b9a7 100644 --- a/src/main/java/neatlogic/module/deploy/api/apppipeline/ListDeployAppPipelineProfileApi.java +++ b/src/main/java/neatlogic/module/deploy/api/apppipeline/ListDeployAppPipelineProfileApi.java @@ -101,10 +101,14 @@ public class ListDeployAppPipelineProfileApi extends PrivateApiComponentBase { if (CollectionUtils.isNotEmpty(defaultValue)) { profileIdList = defaultValue.toJavaList(Long.class); } - DeployPipelineConfigVo deployPipelineConfigVo = DeployPipelineConfigManager.init(searchVo.getAppSystemId()) + DeployPipelineConfigVo deployPipelineConfigVo = DeployPipelineConfigManager.init(searchVo.getAppSystemId())//a .withAppModuleId(searchVo.getAppModuleId()) .withEnvId(searchVo.getEnvId()) .withProfileIdList(profileIdList) + .withDeleteDisabledPhase(false) + .isHasBuildOrDeployTypeTool(false) + .isUpdateConfig(false) + .isUpdateProfile(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 af431446..65a813c9 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) + .withDeleteDisabledPhase(false) + .isUpdateProfile(false) + .isHasBuildOrDeployTypeTool(false) + .isUpdateConfig(false) .getConfig(); if (pipelineConfigVo == null) { throw new DeployAppConfigNotFoundException(appSystemId); 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 eafd0929..5158dd2a 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 @@ -194,6 +194,9 @@ public class DeployJobSourceTypeHandler extends AutoexecJobSourceTypeHandlerBase .withAppModuleId(deployJobVo.getAppModuleId()) .withEnvId(deployJobVo.getEnvId()) .withDeleteDisabledPhase(true) // 删除禁用阶段 + .isHasBuildOrDeployTypeTool(false) + .isUpdateConfig(false) + .isUpdateProfile(true) .getConfig(); if (deployPipelineConfigVo == null) { throw new DeployPipelineConfigNotFoundException(); @@ -456,6 +459,9 @@ public class DeployJobSourceTypeHandler extends AutoexecJobSourceTypeHandlerBase .withAppModuleId(deployJobVo.getAppModuleId()) .withEnvId(deployJobVo.getEnvId()) .withDeleteDisabledPhase(true) // 删除禁用阶段 + .isUpdateProfile(false) + .isHasBuildOrDeployTypeTool(false) + .isUpdateConfig(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 3e5b969c..ae8c43ed 100644 --- a/src/main/java/neatlogic/module/deploy/service/DeployCiServiceImpl.java +++ b/src/main/java/neatlogic/module/deploy/service/DeployCiServiceImpl.java @@ -108,6 +108,9 @@ public class DeployCiServiceImpl implements DeployCiService { .withAppModuleId(ci.getAppModuleId()) .withEnvId(envId) .isHasBuildOrDeployTypeTool(true) + .withDeleteDisabledPhase(false) + .isUpdateProfile(false) + .isUpdateConfig(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 7513bbdc..771fb520 100644 --- a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java +++ b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java @@ -657,6 +657,7 @@ public class DeployPipelineConfigManager { .withEnvId(jobTemplateVo.getEnvId()) .isHasBuildOrDeployTypeTool(true) .isUpdateConfig(false) + .isUpdateProfile(false) .getConfig(); if (pipelineConfigVo != null) { envPipelineMap.put(jobTemplateVo.getEnvId(), pipelineConfigVo); -- Gitee From e8c62c62cba6561bd7455980fa6e85ad336bd9ae Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Wed, 11 Dec 2024 17:42:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=91=E5=B8=83=E5=BA=94=E7=94=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=9A=84=E5=BA=94=E7=94=A8=E7=B3=BB=E7=BB=9F=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=8E=AF=E5=A2=83=E6=A0=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1305869113851904]优化查询发布应用配置的应用系统模块环境树接口 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1305869113851904 --- .../GetDeployModuleScenarioAndEnvListApi.java | 8 ++++---- .../system/ListDeployAppConfigAuthorityApi.java | 8 ++++---- .../SearchDeployAppConfigAuthorityApi.java | 8 ++++---- ...eDeployAppConfigAppSystemAppModuleEnvApi.java | 6 +++--- .../api/apppipeline/GetDeployAppPipelineApi.java | 2 +- .../ListDeployAppPipelineProfileApi.java | 10 +++++----- .../api/job/GetDeployJobCreateInfoApi.java | 8 ++++---- .../deploy/api/job/ListDeployJobModuleApi.java | 6 +++--- .../source/type/DeployJobSourceTypeHandler.java | 16 ++++++++-------- .../deploy/service/DeployCiServiceImpl.java | 8 ++++---- .../deploy/util/DeployPipelineConfigManager.java | 14 +++++++------- 11 files changed, 47 insertions(+), 47 deletions(-) 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 3bf78026..158f23c6 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,10 +76,10 @@ public class GetDeployModuleScenarioAndEnvListApi extends PrivateApiComponentBas //场景 DeployPipelineConfigVo pipelineConfigVo = DeployPipelineConfigManager.init(appSystemId) .withAppModuleId(appModuleId) - .withDeleteDisabledPhase(false) - .isUpdateProfile(false) - .isHasBuildOrDeployTypeTool(false) - .isUpdateConfig(false) + .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 a6eed5f3..3f9a4800 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 @@ -86,10 +86,10 @@ public class ListDeployAppConfigAuthorityApi extends PrivateApiComponentBase { //场景权限 if (isNeedScenario) { DeployPipelineConfigVo pipelineConfigVo = DeployPipelineConfigManager.init(appSystemId) - .withDeleteDisabledPhase(false) - .isUpdateProfile(false) - .isHasBuildOrDeployTypeTool(false) - .isUpdateConfig(false) + .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 3cce7c42..302facc8 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 @@ -132,10 +132,10 @@ public class SearchDeployAppConfigAuthorityApi extends PrivateApiComponentBase { if (isNeedScenario) { //根据appSystemId获取对应的场景theadList pipelineConfigVo = DeployPipelineConfigManager.init(paramObj.getLong("appSystemId")) - .withDeleteDisabledPhase(false) - .isUpdateProfile(false) - .isHasBuildOrDeployTypeTool(false) - .isUpdateConfig(false) + .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 455b867d..953e7a57 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 c7c5c855..a28bf64d 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 b3c4b9a7..5136f064 100644 --- a/src/main/java/neatlogic/module/deploy/api/apppipeline/ListDeployAppPipelineProfileApi.java +++ b/src/main/java/neatlogic/module/deploy/api/apppipeline/ListDeployAppPipelineProfileApi.java @@ -101,14 +101,14 @@ public class ListDeployAppPipelineProfileApi extends PrivateApiComponentBase { if (CollectionUtils.isNotEmpty(defaultValue)) { profileIdList = defaultValue.toJavaList(Long.class); } - DeployPipelineConfigVo deployPipelineConfigVo = DeployPipelineConfigManager.init(searchVo.getAppSystemId())//a + DeployPipelineConfigVo deployPipelineConfigVo = DeployPipelineConfigManager.init(searchVo.getAppSystemId()) .withAppModuleId(searchVo.getAppModuleId()) .withEnvId(searchVo.getEnvId()) .withProfileIdList(profileIdList) - .withDeleteDisabledPhase(false) - .isHasBuildOrDeployTypeTool(false) - .isUpdateConfig(false) - .isUpdateProfile(true) + .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 65a813c9..bdea3708 100644 --- a/src/main/java/neatlogic/module/deploy/api/job/GetDeployJobCreateInfoApi.java +++ b/src/main/java/neatlogic/module/deploy/api/job/GetDeployJobCreateInfoApi.java @@ -106,10 +106,10 @@ public class GetDeployJobCreateInfoApi extends PrivateApiComponentBase { //场景 DeployPipelineConfigVo pipelineConfigVo = DeployPipelineConfigManager.init(appSystemId) .withAppModuleId(appModuleId) - .withDeleteDisabledPhase(false) - .isUpdateProfile(false) - .isHasBuildOrDeployTypeTool(false) - .isUpdateConfig(false) + .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 1d251276..d1f552c9 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 5158dd2a..4915e31e 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,10 +193,10 @@ public class DeployJobSourceTypeHandler extends AutoexecJobSourceTypeHandlerBase DeployPipelineConfigVo deployPipelineConfigVo = DeployPipelineConfigManager.init(deployJobVo.getAppSystemId()) .withAppModuleId(deployJobVo.getAppModuleId()) .withEnvId(deployJobVo.getEnvId()) - .withDeleteDisabledPhase(true) // 删除禁用阶段 - .isHasBuildOrDeployTypeTool(false) - .isUpdateConfig(false) - .isUpdateProfile(true) + .withIsDeleteDisabledPhase(true) // 删除禁用阶段 + .withIsHasBuildOrDeployTypeTool(false) + .withIsUpdateConfig(false) + .withIsUpdateProfile(true) .getConfig(); if (deployPipelineConfigVo == null) { throw new DeployPipelineConfigNotFoundException(); @@ -458,10 +458,10 @@ public class DeployJobSourceTypeHandler extends AutoexecJobSourceTypeHandlerBase DeployPipelineConfigVo deployPipelineConfigVo = DeployPipelineConfigManager.init(deployJobVo.getAppSystemId()) .withAppModuleId(deployJobVo.getAppModuleId()) .withEnvId(deployJobVo.getEnvId()) - .withDeleteDisabledPhase(true) // 删除禁用阶段 - .isUpdateProfile(false) - .isHasBuildOrDeployTypeTool(false) - .isUpdateConfig(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 ae8c43ed..7242e48e 100644 --- a/src/main/java/neatlogic/module/deploy/service/DeployCiServiceImpl.java +++ b/src/main/java/neatlogic/module/deploy/service/DeployCiServiceImpl.java @@ -107,10 +107,10 @@ public class DeployCiServiceImpl implements DeployCiService { DeployPipelineConfigVo deployPipelineConfigVo = DeployPipelineConfigManager.init(ci.getAppSystemId()) .withAppModuleId(ci.getAppModuleId()) .withEnvId(envId) - .isHasBuildOrDeployTypeTool(true) - .withDeleteDisabledPhase(false) - .isUpdateProfile(false) - .isUpdateConfig(false) + .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 771fb520..7b42a3a1 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,9 +655,9 @@ public class DeployPipelineConfigManager { pipelineConfigVo = DeployPipelineConfigManager.init(jobTemplateVo.getAppSystemId()) .withAppModuleId(jobTemplateVo.getAppModuleId()) .withEnvId(jobTemplateVo.getEnvId()) - .isHasBuildOrDeployTypeTool(true) - .isUpdateConfig(false) - .isUpdateProfile(false) + .withIsHasBuildOrDeployTypeTool(true) + .withIsUpdateConfig(false) + .withIsUpdateProfile(false) .getConfig(); if (pipelineConfigVo != null) { envPipelineMap.put(jobTemplateVo.getEnvId(), pipelineConfigVo); -- Gitee