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

feat(1.4.0-beta2): akka 替换为pekko

Browse Source
This commit is contained in:
opensnail 2025-03-12 23:13:36 +08:00
parent d83bbb9b95
commit b84988c83b
65 changed files with 103 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
snail-job-server/snail-job-server-common/pom.xml
View File

@ -44,13 +44,23 @@
<!-- libs -->
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor-typed_2.13</artifactId>
<groupId>org.apache.pekko</groupId>
<artifactId>pekko-actor-typed_2.13</artifactId>
<version>1.2.0-M1</version>
</dependency>
<dependency>
<groupId>com.typesafe.akka</groupId>
<artifactId>akka-actor-testkit-typed_2.13</artifactId>
<groupId>org.apache.pekko</groupId>
<artifactId>pekko-actor-testkit-typed_2.13</artifactId>
<version>1.2.0-M1</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.typesafe.akka</groupId>-->
<!-- <artifactId>akka-actor-typed_2.13</artifactId>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>com.typesafe.akka</groupId>-->
<!-- <artifactId>pekko-actor-testkit-typed_2.13</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>

34
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/ActorGenerator.java
View File

@ -1,8 +1,8 @@
package com.aizuda.snailjob.server.common.akka;
import akka.actor.ActorRef;
import akka.actor.ActorSystem;
import com.aizuda.snailjob.common.core.context.SnailSpringContext;
import org.apache.pekko.actor.ActorRef;
import org.apache.pekko.actor.ActorSystem;
/**
@ -18,20 +18,15 @@ public class ActorGenerator {
public static final String SCAN_BUCKET_ACTOR = "ScanBucketActor";
public static final String REQUEST_HANDLER_ACTOR = "RequestHandlerActor";
public static final String GRPC_REQUEST_HANDLER_ACTOR = "GrpcRequestHandlerActor";
private static final String COMMON_LOG_DISPATCHER = "akka.actor.common-log-dispatcher";
private static final String COMMON_SCAN_TASK_DISPATCHER = "akka.actor.common-scan-task-dispatcher";
private static final String NETTY_RECEIVE_REQUEST_DISPATCHER = "akka.actor.netty-receive-request-dispatcher";
private static final String COMMON_LOG_DISPATCHER = "pekko.actor.common-log-dispatcher";
private static final String COMMON_SCAN_TASK_DISPATCHER = "pekko.actor.common-scan-task-dispatcher";
private static final String NETTY_RECEIVE_REQUEST_DISPATCHER = "pekko.actor.netty-receive-request-dispatcher";
/*----------------------------------------系统通用配置 END----------------------------------------*/
/*----------------------------------------分布式重试任务 START----------------------------------------*/
public static final String SCAN_CALLBACK_GROUP_ACTOR = "ScanCallbackGroupActor";
public static final String SCAN_RETRY_ACTOR = "ScanRetryActor";
public static final String FINISH_ACTOR = "FinishActor";
public static final String FAILURE_ACTOR = "FailureActor";
public static final String NO_RETRY_ACTOR = "NoRetryActor";
public static final String EXEC_CALLBACK_UNIT_ACTOR = "ExecCallbackUnitActor";
public static final String EXEC_UNIT_ACTOR = "ExecUnitActor";
public static final String RETRY_EXECUTOR_ACTOR = "RetryExecutorActor";
public static final String RETRY_TASK_PREPARE_ACTOR = "RetryTaskPrepareActor";
public static final String LOG_ACTOR = "RetryLogActor";
@ -41,9 +36,9 @@ public class ActorGenerator {
public static final String RETRY_REAL_STOP_TASK_INSTANCE_ACTOR = "RetryRealStopTaskInstanceActor";
private static final String RETRY_TASK_EXECUTOR_DISPATCHER = "akka.actor.retry-task-executor-dispatcher";
private static final String RETRY_TASK_EXECUTOR_RESULT_DISPATCHER = "akka.actor.retry-task-executor-result-dispatcher";
private static final String RETRY_TASK_EXECUTOR_CALL_CLIENT_DISPATCHER = "akka.actor.retry-task-executor-call-client-dispatcher";
private static final String RETRY_TASK_EXECUTOR_DISPATCHER = "pekko.actor.retry-task-executor-dispatcher";
private static final String RETRY_TASK_EXECUTOR_RESULT_DISPATCHER = "pekko.actor.retry-task-executor-result-dispatcher";
private static final String RETRY_TASK_EXECUTOR_CALL_CLIENT_DISPATCHER = "pekko.actor.retry-task-executor-call-client-dispatcher";
/*----------------------------------------分布式重试任务 END----------------------------------------*/
@ -61,12 +56,12 @@ public class ActorGenerator {
public static final String JOB_REAL_STOP_TASK_INSTANCE_ACTOR = "JobRealStopTaskInstanceActor";
/*----------------------------------------dispatcher----------------------------------------*/
private static final String JOB_TASK_DISPATCHER = "akka.actor.job-task-prepare-dispatcher";
private static final String JOB_TASK_EXECUTOR_DISPATCHER = "akka.actor.job-task-executor-dispatcher";
private static final String JOB_TASK_EXECUTOR_RESULT_DISPATCHER = "akka.actor.job-task-executor-result-dispatcher";
private static final String JOB_TASK_EXECUTOR_CALL_CLIENT_DISPATCHER = "akka.actor.job-task-executor-call-client-dispatcher";
private static final String WORKFLOW_TASK_DISPATCHER = "akka.actor.workflow-task-prepare-dispatcher";
private static final String WORKFLOW_TASK_EXECUTOR_DISPATCHER = "akka.actor.workflow-task-executor-dispatcher";
private static final String JOB_TASK_DISPATCHER = "pekko.actor.job-task-prepare-dispatcher";
private static final String JOB_TASK_EXECUTOR_DISPATCHER = "pekko.actor.job-task-executor-dispatcher";
private static final String JOB_TASK_EXECUTOR_RESULT_DISPATCHER = "pekko.actor.job-task-executor-result-dispatcher";
private static final String JOB_TASK_EXECUTOR_CALL_CLIENT_DISPATCHER = "pekko.actor.job-task-executor-call-client-dispatcher";
private static final String WORKFLOW_TASK_DISPATCHER = "pekko.actor.workflow-task-prepare-dispatcher";
private static final String WORKFLOW_TASK_EXECUTOR_DISPATCHER = "pekko.actor.workflow-task-executor-dispatcher";
/*----------------------------------------分布式任务调度 END----------------------------------------*/
@ -171,6 +166,7 @@ public class ActorGenerator {
*
* @return actor 引用
*/
@Deprecated
public static ActorRef scanJobActor() {
return getCommonActorSystemSystem().actorOf(getSpringExtension()
.props(SCAN_JOB_ACTOR)

2
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/AkkaConfiguration.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.common.akka;
import akka.actor.ActorSystem;
import org.apache.pekko.actor.ActorSystem;
import com.typesafe.config.ConfigFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;

4
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/SpringActorProducer.java
View File

@ -1,7 +1,7 @@
package com.aizuda.snailjob.server.common.akka;
import akka.actor.Actor;
import akka.actor.IndirectActorProducer;
import org.apache.pekko.actor.Actor;
import org.apache.pekko.actor.IndirectActorProducer;
import org.springframework.context.ApplicationContext;
/**

4
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/akka/SpringExtension.java
View File

@ -1,7 +1,7 @@
package com.aizuda.snailjob.server.common.akka;
import akka.actor.Extension;
import akka.actor.Props;
import org.apache.pekko.actor.Extension;
import org.apache.pekko.actor.Props;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Component;

2
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/cache/CacheGroupScanActor.java vendored
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.common.cache;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.log.SnailJobLog;
import com.aizuda.snailjob.server.common.Lifecycle;
import com.aizuda.snailjob.server.common.enums.SyetemTaskTypeEnum;

2
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/enums/SyetemTaskTypeEnum.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.common.enums;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;
import lombok.AllArgsConstructor;
import lombok.Getter;

2
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/generator/id/SegmentIdGenerator.java
View File

@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicLong;
* @date 2023-05-04
* @since 1.2.0
*/
@Component
//@Component
@Slf4j
@Deprecated
public class SegmentIdGenerator implements IdGenerator, Lifecycle {

2
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/GrpcRequestHandlerActor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.common.rpc.server;
import akka.actor.AbstractActor;
import org.apache.pekko.actor.AbstractActor;
import cn.hutool.core.net.url.UrlBuilder;
import cn.hutool.core.util.StrUtil;
import com.aizuda.snailjob.common.core.context.SnailSpringContext;

2
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/NettyHttpServerHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.common.rpc.server;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;
import com.aizuda.snailjob.server.common.dto.NettyHttpRequest;
import io.netty.channel.ChannelHandlerContext;

2
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/RequestHandlerActor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.common.rpc.server;
import akka.actor.AbstractActor;
import org.apache.pekko.actor.AbstractActor;
import cn.hutool.core.net.url.UrlBuilder;
import cn.hutool.core.util.StrUtil;
import com.aizuda.snailjob.common.core.context.SnailSpringContext;

2
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/UnaryRequestHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.common.rpc.server;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.core.grpc.auto.GrpcResult;
import com.aizuda.snailjob.common.core.grpc.auto.GrpcSnailJobRequest;
import com.aizuda.snailjob.common.core.grpc.auto.Metadata;

2
snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/rpc/server/handler/ReportLogHttpRequestHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.common.rpc.server.handler;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.net.url.UrlQuery;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/block/job/RecoveryBlockStrategy.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.block.job;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import com.aizuda.snailjob.common.core.enums.JobTaskStatusEnum;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/AbstractClientCallbackHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.callback;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.util.StrUtil;
import com.aizuda.snailjob.common.core.enums.JobTaskStatusEnum;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/BroadcastClientCallbackHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.callback;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.collection.CollUtil;
import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum;
import com.aizuda.snailjob.common.core.util.StreamUtils;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/ClusterClientCallbackHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.callback;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;
import com.aizuda.snailjob.server.common.dto.RegisterNodeInfo;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/MapReduceClientCallbackHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.callback;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.RandomUtil;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/ShardingClientCallbackHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.callback;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.RandomUtil;
import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.dispatch;
import akka.actor.AbstractActor;
import org.apache.pekko.actor.AbstractActor;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorResultActor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.dispatch;
import akka.actor.AbstractActor;
import org.apache.pekko.actor.AbstractActor;
import cn.hutool.core.lang.Assert;
import com.aizuda.snailjob.common.core.enums.StatusEnum;
import com.aizuda.snailjob.common.core.util.JsonUtil;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobLogActor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.dispatch;
import akka.actor.AbstractActor;
import org.apache.pekko.actor.AbstractActor;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.aizuda.snailjob.common.core.util.JsonUtil;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobTaskPrepareActor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.dispatch;
import akka.actor.AbstractActor;
import org.apache.pekko.actor.AbstractActor;
import cn.hutool.core.collection.CollUtil;
import com.aizuda.snailjob.common.core.context.SnailSpringContext;
import com.aizuda.snailjob.common.core.enums.JobTaskBatchStatusEnum;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ReduceActor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.dispatch;
import akka.actor.AbstractActor;
import org.apache.pekko.actor.AbstractActor;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum;

4
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanJobTaskActor.java
View File

@ -1,7 +1,7 @@
package com.aizuda.snailjob.server.job.task.support.dispatch;
import akka.actor.AbstractActor;
import akka.actor.ActorRef;
import org.apache.pekko.actor.AbstractActor;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.collection.CollUtil;
import com.aizuda.snailjob.common.core.constant.SystemConstants;
import com.aizuda.snailjob.common.core.enums.StatusEnum;

4
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/ScanWorkflowTaskActor.java
View File

@ -1,7 +1,7 @@
package com.aizuda.snailjob.server.job.task.support.dispatch;
import akka.actor.AbstractActor;
import akka.actor.ActorRef;
import org.apache.pekko.actor.AbstractActor;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.RandomUtil;
import com.aizuda.snailjob.common.core.constant.SystemConstants;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/WorkflowExecutorActor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.dispatch;
import akka.actor.AbstractActor;
import org.apache.pekko.actor.AbstractActor;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import com.aizuda.snailjob.common.core.constant.SystemConstants;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/WorkflowTaskPrepareActor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.dispatch;
import akka.actor.AbstractActor;
import org.apache.pekko.actor.AbstractActor;
import cn.hutool.core.collection.CollUtil;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;
import com.aizuda.snailjob.server.job.task.dto.WorkflowTaskPrepareDTO;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/BroadcastTaskJobExecutor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.executor.job;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.util.StrUtil;
import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/ClusterJobExecutor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.executor.job;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/MapReduceJobExecutor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.executor.job;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.util.StrUtil;
import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;

4
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/RequestClientActor.java
View File

@ -1,7 +1,7 @@
package com.aizuda.snailjob.server.job.task.support.executor.job;
import akka.actor.AbstractActor;
import akka.actor.ActorRef;
import org.apache.pekko.actor.AbstractActor;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.client.model.ExecuteResult;
import com.aizuda.snailjob.client.model.request.DispatchJobRequest;
import com.aizuda.snailjob.common.core.context.SnailSpringContext;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/job/ShardingJobExecutor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.executor.job;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.util.StrUtil;
import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/executor/workflow/JobTaskWorkflowExecutor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.executor.workflow;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.core.enums.*;
import com.aizuda.snailjob.common.log.SnailJobLog;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.handler;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/log/JobLogStorage.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.log;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.core.util.JsonUtil;
import com.aizuda.snailjob.common.log.dto.LogContentDTO;
import com.aizuda.snailjob.common.log.dto.TaskLogFieldDTO;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/result/job/MapReduceJobExecutorHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.result.job;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum;
import com.aizuda.snailjob.common.log.SnailJobLog;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/AbstractJobTaskStopHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.stop;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.collection.CollUtil;
import com.aizuda.snailjob.common.core.enums.JobTaskBatchStatusEnum;
import com.aizuda.snailjob.common.core.enums.JobTaskStatusEnum;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/BroadcastTaskStopHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.stop;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;
import com.aizuda.snailjob.server.common.util.ClientInfoUtils;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/ClusterTaskStopHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.stop;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;
import com.aizuda.snailjob.server.common.util.ClientInfoUtils;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/MapReduceTaskStopHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.stop;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;
import com.aizuda.snailjob.server.common.util.ClientInfoUtils;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/RealStopTaskActor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.stop;
import akka.actor.AbstractActor;
import org.apache.pekko.actor.AbstractActor;
import com.aizuda.snailjob.client.model.StopJobDTO;
import com.aizuda.snailjob.common.core.model.Result;
import com.aizuda.snailjob.common.core.util.JsonUtil;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/stop/ShardingTaskStopHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.stop;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.core.enums.JobTaskTypeEnum;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;
import com.aizuda.snailjob.server.common.util.ClientInfoUtils;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/JobTimerTask.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.timer;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.log.SnailJobLog;
import com.aizuda.snailjob.server.common.TimerTask;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/ResidentJobTimerTask.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.timer;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.log.SnailJobLog;
import com.aizuda.snailjob.server.common.TimerTask;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/RetryJobTimerTask.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.timer;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.log.SnailJobLog;
import com.aizuda.snailjob.server.common.TimerTask;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;

2
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/timer/WorkflowTimerTask.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.job.task.support.timer;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.core.constant.SystemConstants;
import com.aizuda.snailjob.common.log.SnailJobLog;
import com.aizuda.snailjob.server.common.TimerTask;

6
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RequestCallbackClientActor.java
View File

@ -1,7 +1,7 @@
package com.aizuda.snailjob.server.retry.task.support.dispatch;
import akka.actor.AbstractActor;
import akka.actor.ActorRef;
import org.apache.pekko.actor.AbstractActor;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.client.model.request.RetryCallbackRequest;
import com.aizuda.snailjob.common.core.enums.RetryTaskStatusEnum;
import com.aizuda.snailjob.common.core.enums.StatusEnum;
@ -182,7 +182,7 @@ public class RequestCallbackClientActor extends AbstractActor {
* 更新是执行状态
*
* @param executorDTO RequestRetryExecutorDTO
* @param message 失败原因
* @param message 失败原因
*/
private static void taskExecuteFailure(RequestCallbackExecutorDTO executorDTO, String message) {
ActorRef actorRef = ActorGenerator.retryTaskExecutorResultActor();

4
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RequestRetryClientActor.java
View File

@ -1,7 +1,7 @@
package com.aizuda.snailjob.server.retry.task.support.dispatch;
import akka.actor.AbstractActor;
import akka.actor.ActorRef;
import org.apache.pekko.actor.AbstractActor;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.client.model.request.DispatchRetryRequest;
import com.aizuda.snailjob.common.core.enums.RetryTaskStatusEnum;
import com.aizuda.snailjob.common.core.enums.StatusEnum;

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RequestStopClientActor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.retry.task.support.dispatch;
import akka.actor.AbstractActor;
import org.apache.pekko.actor.AbstractActor;
import com.aizuda.snailjob.client.model.request.StopRetryRequest;
import com.aizuda.snailjob.common.core.enums.StatusEnum;
import com.aizuda.snailjob.common.core.model.Result;

4
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryExecutor.java
View File

@ -1,7 +1,7 @@
package com.aizuda.snailjob.server.retry.task.support.dispatch;
import akka.actor.AbstractActor;
import akka.actor.ActorRef;
import org.apache.pekko.actor.AbstractActor;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import com.aizuda.snailjob.common.core.context.SnailSpringContext;

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryLogActor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.retry.task.support.dispatch;
import akka.actor.AbstractActor;
import org.apache.pekko.actor.AbstractActor;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
import com.aizuda.snailjob.common.core.util.JsonUtil;

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryResultActor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.retry.task.support.dispatch;
import akka.actor.AbstractActor;
import org.apache.pekko.actor.AbstractActor;
import com.aizuda.snailjob.common.log.SnailJobLog;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;
import com.aizuda.snailjob.server.retry.task.dto.RetryExecutorResultDTO;

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryTaskPrepareActor.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.retry.task.support.dispatch;
import akka.actor.AbstractActor;
import org.apache.pekko.actor.AbstractActor;
import cn.hutool.core.collection.CollUtil;
import com.aizuda.snailjob.server.common.enums.RetryTaskExecutorSceneEnum;
import com.aizuda.snailjob.server.retry.task.dto.RetryTaskPrepareDTO;

4
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java
View File

@ -1,7 +1,7 @@
package com.aizuda.snailjob.server.retry.task.support.dispatch;
import akka.actor.AbstractActor;
import akka.actor.ActorRef;
import org.apache.pekko.actor.AbstractActor;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.collection.CollUtil;
import com.aizuda.snailjob.common.core.constant.SystemConstants;
import com.aizuda.snailjob.common.core.enums.RetryStatusEnum;

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/handler/RetryTaskStopHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.retry.task.support.handler;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.core.enums.RetryTaskStatusEnum;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;
import com.aizuda.snailjob.server.retry.task.dto.RequestRetryExecutorDTO;

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/log/RetryLogStorage.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.retry.task.support.log;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.core.util.JsonUtil;
import com.aizuda.snailjob.common.log.dto.LogContentDTO;
import com.aizuda.snailjob.common.log.dto.TaskLogFieldDTO;

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/request/ReportCallbackResultHttpRequestHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.retry.task.support.request;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.net.url.UrlQuery;
import com.aizuda.snailjob.client.model.request.DispatchCallbackResultRequest;

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/request/ReportDispatchResultHttpRequestHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.retry.task.support.request;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.net.url.UrlQuery;
import com.aizuda.snailjob.client.model.request.DispatchRetryResultRequest;

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/timer/RetryTimerTask.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.retry.task.support.timer;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import com.aizuda.snailjob.common.core.context.SnailSpringContext;
import com.aizuda.snailjob.common.core.enums.RetryStatusEnum;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;

4
snail-job-server/snail-job-server-starter/src/main/java/com/aizuda/snailjob/server/starter/dispatch/ConsumerBucketActor.java
View File

@ -1,7 +1,7 @@
package com.aizuda.snailjob.server.starter.dispatch;
import akka.actor.AbstractActor;
import akka.actor.ActorRef;
import org.apache.pekko.actor.AbstractActor;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.collection.CollUtil;
import com.aizuda.snailjob.common.log.SnailJobLog;
import com.aizuda.snailjob.server.common.akka.ActorGenerator;

2
snail-job-server/snail-job-server-starter/src/main/java/com/aizuda/snailjob/server/starter/dispatch/DispatchService.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.starter.dispatch;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.collection.CollUtil;
import com.aizuda.snailjob.common.core.constant.SystemConstants;
import com.aizuda.snailjob.common.log.SnailJobLog;

2
snail-job-server/snail-job-server-starter/src/main/resources/snailjob.conf
View File

@ -1,4 +1,4 @@
akka {
pekko {
actor {
common-log-dispatcher {
type = "Dispatcher"

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/handler/JobHandler.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.service.handler;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import com.aizuda.snailjob.client.model.ExecuteResult;

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryServiceImpl.java
View File

@ -1,6 +1,6 @@
package com.aizuda.snailjob.server.web.service.impl;
import akka.actor.ActorRef;
import org.apache.pekko.actor.ActorRef;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;