From 84e1c54b23d27ec7cf834ac829d592145f9c0c64 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Mon, 2 Dec 2024 20:35:53 +0800 Subject: [PATCH] =?UTF-8?q?refactor(1.3.0-beta1):=20=E5=B0=86=E5=86=85?= =?UTF-8?q?=E7=BD=AE=E6=89=A7=E8=A1=8C=E5=99=A8=E7=A7=BB=E5=85=A5builtin?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{CMDExecutor.java => builtin/AbstractCMDExecutor.java} | 6 +++--- .../core/executor/{ => builtin}/AbstractHttpExecutor.java | 4 ++-- .../AbstractPowerShellExecutor.java} | 4 ++-- .../core/executor/{ => builtin}/AbstractScriptExecutor.java | 2 +- .../AbstractShellExecutor.java} | 4 ++-- .../core/executor/{ => builtin}/SnailJobCMDJobExecutor.java | 4 ++-- .../core/executor/{ => builtin}/SnailJobHttpExecutor.java | 4 ++-- .../{ => builtin}/SnailJobPowerShellJobExecutor.java | 4 ++-- .../executor/{ => builtin}/SnailJobShellJobExecutor.java | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) rename snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/{CMDExecutor.java => builtin/AbstractCMDExecutor.java} (67%) rename snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/{ => builtin}/AbstractHttpExecutor.java (98%) rename snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/{PowerShellExecutor.java => builtin/AbstractPowerShellExecutor.java} (79%) rename snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/{ => builtin}/AbstractScriptExecutor.java (99%) rename snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/{ShellExecutor.java => builtin/AbstractShellExecutor.java} (72%) rename snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/{ => builtin}/SnailJobCMDJobExecutor.java (82%) rename snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/{ => builtin}/SnailJobHttpExecutor.java (92%) rename snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/{ => builtin}/SnailJobPowerShellJobExecutor.java (81%) rename snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/{ => builtin}/SnailJobShellJobExecutor.java (82%) diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/CMDExecutor.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractCMDExecutor.java similarity index 67% rename from snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/CMDExecutor.java rename to snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractCMDExecutor.java index 94fe7505..230ac6f5 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/CMDExecutor.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractCMDExecutor.java @@ -1,9 +1,9 @@ -package com.aizuda.snailjob.client.job.core.executor; +package com.aizuda.snailjob.client.job.core.executor.builtin; import java.nio.charset.Charset; -public class CMDExecutor extends AbstractScriptExecutor { +public abstract class AbstractCMDExecutor extends AbstractScriptExecutor { @Override protected String getScriptName(Long jobId) { @@ -22,6 +22,6 @@ public class CMDExecutor extends AbstractScriptExecutor { @Override protected ProcessBuilder getScriptProcessBuilder(String scriptPath) { - return new ProcessBuilder(getRunCommand(), "/c", scriptPath); + return new ProcessBuilder(getRunCommand(), "/c", scriptPath); } } diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractHttpExecutor.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractHttpExecutor.java similarity index 98% rename from snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractHttpExecutor.java rename to snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractHttpExecutor.java index fd496d71..24e406d2 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractHttpExecutor.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractHttpExecutor.java @@ -1,4 +1,4 @@ -package com.aizuda.snailjob.client.job.core.executor; +package com.aizuda.snailjob.client.job.core.executor.builtin; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; @@ -122,7 +122,7 @@ public abstract class AbstractHttpExecutor { httpParams.getHeaders().forEach(request::header); } // 有上下文时，在请求中透传上下文;即工作流中支持上下文的传递 - if ( Objects.nonNull(httpParams.getWfContext())) { + if (Objects.nonNull(httpParams.getWfContext())) { httpParams.getWfContext().forEach((key, value) -> { String headerValue = (value instanceof String) ? (String) value : JsonUtil.toJsonString(value); // 正则表达式匹配中文字符 diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/PowerShellExecutor.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractPowerShellExecutor.java similarity index 79% rename from snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/PowerShellExecutor.java rename to snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractPowerShellExecutor.java index 06b506b1..28412c34 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/PowerShellExecutor.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractPowerShellExecutor.java @@ -1,9 +1,9 @@ -package com.aizuda.snailjob.client.job.core.executor; +package com.aizuda.snailjob.client.job.core.executor.builtin; import java.nio.charset.Charset; -public class PowerShellExecutor extends AbstractScriptExecutor { +public abstract class AbstractPowerShellExecutor extends AbstractScriptExecutor { @Override protected String getScriptName(Long jobId) { diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractScriptExecutor.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractScriptExecutor.java similarity index 99% rename from snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractScriptExecutor.java rename to snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractScriptExecutor.java index 02ec4c62..0a9c9243 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractScriptExecutor.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractScriptExecutor.java @@ -1,4 +1,4 @@ -package com.aizuda.snailjob.client.job.core.executor; +package com.aizuda.snailjob.client.job.core.executor.builtin; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.client.common.config.SnailJobProperties; diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/ShellExecutor.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractShellExecutor.java similarity index 72% rename from snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/ShellExecutor.java rename to snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractShellExecutor.java index 9d196011..7c4d19ad 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/ShellExecutor.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractShellExecutor.java @@ -1,7 +1,7 @@ -package com.aizuda.snailjob.client.job.core.executor; +package com.aizuda.snailjob.client.job.core.executor.builtin; -public class ShellExecutor extends AbstractScriptExecutor { +public abstract class AbstractShellExecutor extends AbstractScriptExecutor { @Override protected String getScriptName(Long jobId) { diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/SnailJobCMDJobExecutor.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobCMDJobExecutor.java similarity index 82% rename from snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/SnailJobCMDJobExecutor.java rename to snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobCMDJobExecutor.java index 02fa3bf8..0e2b59db 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/SnailJobCMDJobExecutor.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobCMDJobExecutor.java @@ -1,4 +1,4 @@ -package com.aizuda.snailjob.client.job.core.executor; +package com.aizuda.snailjob.client.job.core.executor.builtin; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; @Component @JobExecutor(name = "snailJobCMDJobExecutor") -public class SnailJobCMDJobExecutor extends CMDExecutor { +public class SnailJobCMDJobExecutor extends AbstractCMDExecutor { public ExecuteResult jobExecute(JobArgs jobArgs) { Object jobParams = jobArgs.getJobParams(); diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/SnailJobHttpExecutor.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobHttpExecutor.java similarity index 92% rename from snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/SnailJobHttpExecutor.java rename to snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobHttpExecutor.java index 8a0d4497..a42ca9ab 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/SnailJobHttpExecutor.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobHttpExecutor.java @@ -1,4 +1,4 @@ -package com.aizuda.snailjob.client.job.core.executor; +package com.aizuda.snailjob.client.job.core.executor.builtin; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; @@ -19,7 +19,7 @@ public class SnailJobHttpExecutor extends AbstractHttpExecutor { public ExecuteResult jobExecute(JobArgs jobArgs) { Object jobParams = jobArgs.getJobParams(); HttpParams httpParams = JsonUtil.parseObject((String) jobParams, HttpParams.class); - if (Objects.nonNull(jobArgs.getWfContext())){ + if (Objects.nonNull(jobArgs.getWfContext())) { httpParams.setWfContext(jobArgs.getWfContext()); } httpParams.setMethod(httpParams.getMethod().toUpperCase()); diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/SnailJobPowerShellJobExecutor.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobPowerShellJobExecutor.java similarity index 81% rename from snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/SnailJobPowerShellJobExecutor.java rename to snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobPowerShellJobExecutor.java index 89ac9cf8..608c040b 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/SnailJobPowerShellJobExecutor.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobPowerShellJobExecutor.java @@ -1,4 +1,4 @@ -package com.aizuda.snailjob.client.job.core.executor; +package com.aizuda.snailjob.client.job.core.executor.builtin; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; @Component @JobExecutor(name = "snailJobPowerShellJobExecutor") -public class SnailJobPowerShellJobExecutor extends PowerShellExecutor { +public class SnailJobPowerShellJobExecutor extends AbstractPowerShellExecutor { public ExecuteResult jobExecute(JobArgs jobArgs) { Object jobParams = jobArgs.getJobParams(); diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/SnailJobShellJobExecutor.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobShellJobExecutor.java similarity index 82% rename from snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/SnailJobShellJobExecutor.java rename to snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobShellJobExecutor.java index c826c76e..b2cfb1d4 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/SnailJobShellJobExecutor.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobShellJobExecutor.java @@ -1,4 +1,4 @@ -package com.aizuda.snailjob.client.job.core.executor; +package com.aizuda.snailjob.client.job.core.executor.builtin; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor; @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; @Component @JobExecutor(name = "snailJobShellJobExecutor") -public class SnailJobShellJobExecutor extends ShellExecutor { +public class SnailJobShellJobExecutor extends AbstractShellExecutor { public ExecuteResult jobExecute(JobArgs jobArgs) { Object jobParams = jobArgs.getJobParams();