gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

refactor(1.3.0-beta1): 将内置执行器移入builtin包

Browse Source
This commit is contained in:
dhb52 2024-12-02 20:35:53 +08:00
parent 28bb43fec6
commit 84e1c54b23
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/CMDExecutor.java → snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractCMDExecutor.java
View File

@ -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; import java.nio.charset.Charset;
public class CMDExecutor extends AbstractScriptExecutor { public abstract class AbstractCMDExecutor extends AbstractScriptExecutor {
@Override @Override
protected String getScriptName(Long jobId) { protected String getScriptName(Long jobId) {
@ -22,6 +22,6 @@ public class CMDExecutor extends AbstractScriptExecutor {
@Override @Override
protected ProcessBuilder getScriptProcessBuilder(String scriptPath) { protected ProcessBuilder getScriptProcessBuilder(String scriptPath) {
return new ProcessBuilder(getRunCommand(), "/c", scriptPath); return new ProcessBuilder(getRunCommand(), "/c", scriptPath);
} }
} }

4
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractHttpExecutor.java → snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractHttpExecutor.java
View File

@ -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.HttpRequest;
import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpResponse;
@ -122,7 +122,7 @@ public abstract class AbstractHttpExecutor {
httpParams.getHeaders().forEach(request::header); httpParams.getHeaders().forEach(request::header);
} }
// 有上下文时，在请求中透传上下文;即工作流中支持上下文的传递 // 有上下文时，在请求中透传上下文;即工作流中支持上下文的传递
if ( Objects.nonNull(httpParams.getWfContext())) { if (Objects.nonNull(httpParams.getWfContext())) {
httpParams.getWfContext().forEach((key, value) -> { httpParams.getWfContext().forEach((key, value) -> {
String headerValue = (value instanceof String) ? (String) value : JsonUtil.toJsonString(value); String headerValue = (value instanceof String) ? (String) value : JsonUtil.toJsonString(value);
// 正则表达式匹配中文字符 // 正则表达式匹配中文字符

4
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/PowerShellExecutor.java → snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractPowerShellExecutor.java
View File

@ -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; import java.nio.charset.Charset;
public class PowerShellExecutor extends AbstractScriptExecutor { public abstract class AbstractPowerShellExecutor extends AbstractScriptExecutor {
@Override @Override
protected String getScriptName(Long jobId) { protected String getScriptName(Long jobId) {

2
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/AbstractScriptExecutor.java → snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractScriptExecutor.java
View File

@ -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 cn.hutool.core.util.StrUtil;
import com.aizuda.snailjob.client.common.config.SnailJobProperties; import com.aizuda.snailjob.client.common.config.SnailJobProperties;

4
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/ShellExecutor.java → snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/AbstractShellExecutor.java
View File

@ -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 @Override
protected String getScriptName(Long jobId) { protected String getScriptName(Long jobId) {

4
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/SnailJobCMDJobExecutor.java → snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobCMDJobExecutor.java
View File

@ -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; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
@Component @Component
@JobExecutor(name = "snailJobCMDJobExecutor") @JobExecutor(name = "snailJobCMDJobExecutor")
public class SnailJobCMDJobExecutor extends CMDExecutor { public class SnailJobCMDJobExecutor extends AbstractCMDExecutor {
public ExecuteResult jobExecute(JobArgs jobArgs) { public ExecuteResult jobExecute(JobArgs jobArgs) {
Object jobParams = jobArgs.getJobParams(); Object jobParams = jobArgs.getJobParams();

4
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/SnailJobHttpExecutor.java → snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobHttpExecutor.java
View File

@ -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; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
@ -19,7 +19,7 @@ public class SnailJobHttpExecutor extends AbstractHttpExecutor {
public ExecuteResult jobExecute(JobArgs jobArgs) { public ExecuteResult jobExecute(JobArgs jobArgs) {
Object jobParams = jobArgs.getJobParams(); Object jobParams = jobArgs.getJobParams();
HttpParams httpParams = JsonUtil.parseObject((String) jobParams, HttpParams.class); HttpParams httpParams = JsonUtil.parseObject((String) jobParams, HttpParams.class);
if (Objects.nonNull(jobArgs.getWfContext())){ if (Objects.nonNull(jobArgs.getWfContext())) {
httpParams.setWfContext(jobArgs.getWfContext()); httpParams.setWfContext(jobArgs.getWfContext());
} }
httpParams.setMethod(httpParams.getMethod().toUpperCase()); httpParams.setMethod(httpParams.getMethod().toUpperCase());

4
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/SnailJobPowerShellJobExecutor.java → snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobPowerShellJobExecutor.java
View File

@ -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; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
@Component @Component
@JobExecutor(name = "snailJobPowerShellJobExecutor") @JobExecutor(name = "snailJobPowerShellJobExecutor")
public class SnailJobPowerShellJobExecutor extends PowerShellExecutor { public class SnailJobPowerShellJobExecutor extends AbstractPowerShellExecutor {
public ExecuteResult jobExecute(JobArgs jobArgs) { public ExecuteResult jobExecute(JobArgs jobArgs) {
Object jobParams = jobArgs.getJobParams(); Object jobParams = jobArgs.getJobParams();

4
snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/SnailJobShellJobExecutor.java → snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/builtin/SnailJobShellJobExecutor.java
View File

@ -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; import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
@Component @Component
@JobExecutor(name = "snailJobShellJobExecutor") @JobExecutor(name = "snailJobShellJobExecutor")
public class SnailJobShellJobExecutor extends ShellExecutor { public class SnailJobShellJobExecutor extends AbstractShellExecutor {
public ExecuteResult jobExecute(JobArgs jobArgs) { public ExecuteResult jobExecute(JobArgs jobArgs) {
Object jobParams = jobArgs.getJobParams(); Object jobParams = jobArgs.getJobParams();