From a024d12842489ffc21396837c37c24cfdc5a2bd4 Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Fri, 4 Jul 2025 18:34:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E6=89=B9=E9=87=8F=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=9D=83=E9=99=90=E4=BC=98=E5=8C=96=20#[1457884850782?= =?UTF-8?q?208]=E6=89=B9=E9=87=8F=E5=8F=91=E5=B8=83=E6=9D=83=E9=99=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20http://192.168.0.96:8090/demo/rdm.html#/st?= =?UTF-8?q?ory-detail/939050947543040/939050947543042/1457884850782208?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/deploy/constvalue/JobSource.java | 12 +++++++++++- .../exception/DeployJobCannotExecuteException.java | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/framework/deploy/constvalue/JobSource.java b/src/main/java/neatlogic/framework/deploy/constvalue/JobSource.java index fefbbd8..67ea880 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 10cdef8..30a6843 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()); } } -- Gitee