From 689e7b28198b1be8aa74435b27d14545376c3804 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Thu, 11 Jul 2024 00:03:57 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.1.0-beta3):=20=E6=A3=80=E9=AA=8Cjav?= =?UTF-8?q?a=E4=B8=8D=E6=94=AF=E6=8C=81=E5=85=B6=E4=BB=96=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E7=9A=84=E6=89=A7=E8=A1=8C=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aizuda/snailjob/client/job/core/client/JobEndPoint.java | 6 ++++++ .../server/common/rpc/server/RequestHandlerActor.java | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/client/JobEndPoint.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/client/JobEndPoint.java index bde61546..d0bb9411 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/client/JobEndPoint.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/client/JobEndPoint.java @@ -19,6 +19,7 @@ import com.aizuda.snailjob.client.job.core.log.JobLogMeta; import com.aizuda.snailjob.client.model.StopJobDTO; import com.aizuda.snailjob.client.model.request.DispatchJobRequest; import com.aizuda.snailjob.common.core.context.SpringContext; +import com.aizuda.snailjob.common.core.enums.ExecutorTypeEnum; import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum; import com.aizuda.snailjob.common.core.model.JobArgsHolder; import com.aizuda.snailjob.common.core.model.JobContext; @@ -59,6 +60,11 @@ public class JobEndPoint { dispatchJob.getRetryCount()); } + if (ExecutorTypeEnum.JAVA.getType() != dispatchJob.getExecutorType()) { + SnailJobLog.REMOTE.error("不支持非Java类型的执行器. executorType:[{}]", dispatchJob.getExecutorType()); + return new Result<>("不支持非Java类型的执行器", Boolean.FALSE); + } + JobExecutorInfo jobExecutorInfo = JobExecutorInfoCache.get(jobContext.getExecutorInfo()); if (Objects.isNull(jobExecutorInfo)) { SnailJobLog.REMOTE.error("执行器配置有误. executorInfo:[{}]", dispatchJob.getExecutorInfo()); diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/RequestHandlerActor.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/RequestHandlerActor.java index c352e2a0..29b55518 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/RequestHandlerActor.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/RequestHandlerActor.java @@ -88,8 +88,7 @@ public class RequestHandlerActor extends AbstractActor { String token = headers.get(HeadersEnum.TOKEN.getKey()); if (StrUtil.isBlank(token) || !CacheToken.get(groupName, namespace).equals(token)) { - SnailJobLog.LOCAL.error("Token authentication failed. [{}]", token); - return JsonUtil.toJsonString(new Result<>(0, "Token authentication failed")); + throw new SnailJobServerException("Token authentication failed. [{}]", token); } // 注册版本