diff --git a/src/main/java/neatlogic/framework/deploy/constvalue/JobSource.java b/src/main/java/neatlogic/framework/deploy/constvalue/JobSource.java index fefbbd88fd7af47f05dab2cb0eddd276241fc178..67ea880463a396d3d675690c1719e1ad0997aafb 100644 --- a/src/main/java/neatlogic/framework/deploy/constvalue/JobSource.java +++ b/src/main/java/neatlogic/framework/deploy/constvalue/JobSource.java @@ -18,6 +18,9 @@ package neatlogic.framework.deploy.constvalue; import neatlogic.framework.autoexec.source.IAutoexecJobSource; import neatlogic.framework.util.$; +import java.util.Arrays; +import java.util.List; + /** * @author longrf * @date 2022/5/5 5:20 下午 @@ -27,7 +30,8 @@ public enum JobSource implements IAutoexecJobSource { BATCHDEPLOY("一键发布+批量作业", "batchdeploy"), DEPLOY_SCHEDULE_GENERAL("发布定时作业", "deployschedulegeneral"), DEPLOY_SCHEDULE_PIPELINE("发布定时批量作业", "deployschedulepipeline"), - DEPLOY_CI("发布持续集成", "deployci"); + DEPLOY_CI("发布持续集成", "deployci"), + DEPLOY_CI_PIPELINE("发布持续集成批量作业", "deploycipipeline"); private final String text; private final String value; @@ -36,6 +40,8 @@ public enum JobSource implements IAutoexecJobSource { this.value = _value; } + private static final List batchJob = Arrays.asList(BATCHDEPLOY.getValue(),DEPLOY_SCHEDULE_PIPELINE.getValue(),DEPLOY_CI_PIPELINE.getValue()); + public String getValue() { return value; } @@ -58,4 +64,8 @@ public enum JobSource implements IAutoexecJobSource { return JobSourceType.DEPLOY.getValue(); } + public static boolean isBatch(String source){ + return batchJob.contains(source); + } + } diff --git a/src/main/java/neatlogic/framework/deploy/exception/DeployJobCannotExecuteException.java b/src/main/java/neatlogic/framework/deploy/exception/DeployJobCannotExecuteException.java index 10cdef84c66130b3b3df2334cea364b888f12e3a..30a6843d3803ad7dc4aa246885cb078b960ca7dc 100644 --- a/src/main/java/neatlogic/framework/deploy/exception/DeployJobCannotExecuteException.java +++ b/src/main/java/neatlogic/framework/deploy/exception/DeployJobCannotExecuteException.java @@ -13,6 +13,6 @@ public class DeployJobCannotExecuteException extends ApiRuntimeException { private static final long serialVersionUID = -6988752668439074063L; public DeployJobCannotExecuteException(DeployJobVo deployJobVo) { - super("无法执行,当前用户没有当前应用系统/环境/场景 {0}({1})/{2}({3})/{4}({5}) 权限", deployJobVo.getAppSystemName(), deployJobVo.getAppSystemId(), deployJobVo.getEnvName(), deployJobVo.getEnvId(), deployJobVo.getScenarioName(), deployJobVo.getScenarioId()); + super("无法执行,当前用户没有当前应用系统/环境/场景 {0}({1})/{2}({3})/{4}({5}) 执行权限", deployJobVo.getAppSystemName(), deployJobVo.getAppSystemId(), deployJobVo.getEnvName(), deployJobVo.getEnvId(), deployJobVo.getScenarioName(), deployJobVo.getScenarioId()); } }