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

fix: 2.6.0

Browse Source 
1. 优化工作流一个任务节点多个批次显示问题
This commit is contained in:
byteblogs168 2024-01-27 17:31:01 +08:00
parent 532ee481d9
commit 67895f3d7f
73 changed files with 158 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/sql/easy_retry_mysql.sql
View File

@ -368,7 +368,7 @@ CREATE TABLE `job_task_batch`
`task_batch_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '任务批次状态 0、失败 1、成功',
`operation_reason` tinyint(4) NOT NULL DEFAULT '0' COMMENT '操作原因',
`execution_at` bigint(13) NOT NULL DEFAULT '0' COMMENT '任务执行时间',
`task_type` tinyint(4) NOT NULL DEFAULT '3' COMMENT '任务类型 3、JOB任务 4、WORKFLOW任务',
`system_task_type` tinyint(4) NOT NULL DEFAULT '3' COMMENT '任务类型 3、JOB任务 4、WORKFLOW任务',
`parent_id` varchar(64) NOT NULL DEFAULT '' COMMENT '父节点',
`create_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_dt` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',

4
easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/persistence/po/JobTaskBatch.java
View File

@ -81,13 +81,13 @@ public class JobTaskBatch implements Serializable {
/**
* 任务类型 3、JOB任务 4、WORKFLOW任务
*/
private Integer taskType;
private Integer systemTaskType;
/**
* 操作原因
*/
private Integer operationReason;
/**
* 修改时间
*/

2
easy-retry-datasource/easy-retry-mysql-datasource/src/main/resources/mysql/mapper/JobTaskBatchMapper.xml
View File

@ -20,7 +20,7 @@
FROM job_task_batch a join job b on a.job_id = b.id
<where>
a.namespace_id = #{queryDO.namespaceId}
and a.task_type = 3
and a.system_task_type = 3
<if test="queryDO.jobId != null">
and a.job_id = #{queryDO.jobId}
</if>

6
easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/cache/CacheGroupScanActor.java vendored
View File

@ -3,7 +3,7 @@ package com.aizuda.easy.retry.server.common.cache;
import akka.actor.ActorRef;
import com.aizuda.easy.retry.common.log.EasyRetryLog;
import com.aizuda.easy.retry.server.common.Lifecycle;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import lombok.Data;
@ -29,7 +29,7 @@ public class CacheGroupScanActor implements Lifecycle {
*
* @return 缓存对象
*/
public static ActorRef get(String groupName, TaskTypeEnum typeEnum) {
public static ActorRef get(String groupName, SyetemTaskTypeEnum typeEnum) {
return CACHE.getIfPresent(groupName.concat(typeEnum.name()));
}
@ -38,7 +38,7 @@ public class CacheGroupScanActor implements Lifecycle {
*
* @return 缓存对象
*/
public static void put(String groupName, TaskTypeEnum typeEnum, ActorRef actorRef) {
public static void put(String groupName, SyetemTaskTypeEnum typeEnum, ActorRef actorRef) {
CACHE.put(groupName.concat(typeEnum.name()), actorRef);
}

10
easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/enums/JobTaskExecutorSceneEnum.java
View File

@ -14,14 +14,14 @@ import lombok.Getter;
@Getter
@AllArgsConstructor
public enum JobTaskExecutorSceneEnum {
AUTO_JOB(1, TaskTypeEnum.JOB),
MANUAL_JOB(2, TaskTypeEnum.JOB),
AUTO_WORKFLOW(3, TaskTypeEnum.WORKFLOW),
MANUAL_WORKFLOW(4, TaskTypeEnum.WORKFLOW),
AUTO_JOB(1, SyetemTaskTypeEnum.JOB),
MANUAL_JOB(2, SyetemTaskTypeEnum.JOB),
AUTO_WORKFLOW(3, SyetemTaskTypeEnum.WORKFLOW),
MANUAL_WORKFLOW(4, SyetemTaskTypeEnum.WORKFLOW),
;
private final Integer type;
private final TaskTypeEnum taskType;
private final SyetemTaskTypeEnum systemTaskType;
/**
* 根据给定的类型获取对应的触发器类型枚举

2
easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/enums/TaskTypeEnum.java → easy-retry-server/easy-retry-server-common/src/main/java/com/aizuda/easy/retry/server/common/enums/SyetemTaskTypeEnum.java
View File

@ -14,7 +14,7 @@ import java.util.function.Supplier;
*/
@AllArgsConstructor
@Getter
public enum TaskTypeEnum {
public enum SyetemTaskTypeEnum {
RETRY(1, ActorGenerator::scanGroupActor),
CALLBACK(2, ActorGenerator::scanCallbackGroupActor),
JOB(3, ActorGenerator::scanJobActor),

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorActor.java
View File

@ -13,7 +13,7 @@ import com.aizuda.easy.retry.server.common.WaitStrategy;
import com.aizuda.easy.retry.server.common.akka.ActorGenerator;
import com.aizuda.easy.retry.server.common.cache.CacheRegisterTable;
import com.aizuda.easy.retry.server.common.enums.JobTaskExecutorSceneEnum;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException;
import com.aizuda.easy.retry.server.common.strategy.WaitStrategies;
import com.aizuda.easy.retry.server.common.util.DateUtils;
@ -153,7 +153,7 @@ public class JobExecutorActor extends AbstractActor {
@Override
public void afterCompletion(int status) {
// 清除时间轮的缓存
JobTimerWheel.clearCache(TaskTypeEnum.JOB.getType(), taskExecute.getTaskBatchId());
JobTimerWheel.clearCache(SyetemTaskTypeEnum.JOB.getType(), taskExecute.getTaskBatchId());
//方法内容
doHandlerResidentTask(job, taskExecute);
}
@ -208,7 +208,7 @@ public class JobExecutorActor extends AbstractActor {
log.info("常驻任务监控. 任务时间差:[{}] 取余:[{}]", milliseconds, DateUtils.toNowMilli() % 1000);
job.setNextTriggerAt(nextTriggerAt);
JobTimerWheel.register(TaskTypeEnum.JOB.getType(), jobTimerTaskDTO.getTaskBatchId(), timerTask, milliseconds - DateUtils.toNowMilli() % 1000, TimeUnit.MILLISECONDS);
JobTimerWheel.register(SyetemTaskTypeEnum.JOB.getType(), jobTimerTaskDTO.getTaskBatchId(), timerTask, milliseconds - DateUtils.toNowMilli() % 1000, TimeUnit.MILLISECONDS);
ResidentTaskCache.refresh(job.getId(), nextTriggerAt);
}
}

8
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobTaskPrepareActor.java
View File

@ -4,7 +4,7 @@ import akka.actor.AbstractActor;
import com.aizuda.easy.retry.common.core.context.SpringContext;
import com.aizuda.easy.retry.server.common.akka.ActorGenerator;
import com.aizuda.easy.retry.server.common.enums.JobTaskExecutorSceneEnum;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import com.aizuda.easy.retry.server.job.task.dto.JobTaskPrepareDTO;
import com.aizuda.easy.retry.server.job.task.support.JobPrePareHandler;
import com.aizuda.easy.retry.server.job.task.support.prepare.job.TerminalJobPrepareHandler;
@ -59,12 +59,12 @@ public class JobTaskPrepareActor extends AbstractActor {
JobTaskExecutorSceneEnum jobTaskExecutorSceneEnum = JobTaskExecutorSceneEnum.get(
prepare.getTaskExecutorScene());
if (TaskTypeEnum.WORKFLOW.getType().equals(jobTaskExecutorSceneEnum.getTaskType().getType())) {
if (SyetemTaskTypeEnum.WORKFLOW.getType().equals(jobTaskExecutorSceneEnum.getSystemTaskType().getType())) {
queryWrapper.eq(JobTaskBatch::getWorkflowNodeId, prepare.getWorkflowNodeId());
queryWrapper.eq(JobTaskBatch::getWorkflowTaskBatchId, prepare.getWorkflowTaskBatchId());
queryWrapper.eq(JobTaskBatch::getTaskType, TaskTypeEnum.WORKFLOW.getType());
queryWrapper.eq(JobTaskBatch::getSystemTaskType, SyetemTaskTypeEnum.WORKFLOW.getType());
} else {
queryWrapper.eq(JobTaskBatch::getTaskType, TaskTypeEnum.JOB.getType());
queryWrapper.eq(JobTaskBatch::getSystemTaskType, SyetemTaskTypeEnum.JOB.getType());
}
List<JobTaskBatch> notCompleteJobTaskBatchList = jobTaskBatchMapper

3
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanWorkflowTaskActor.java
View File

@ -77,7 +77,6 @@ public class ScanWorkflowTaskActor extends AbstractActor {
long now = DateUtils.toNowMilli();
for (PartitionTask partitionTask : partitionTasks) {
WorkflowPartitionTaskDTO workflowPartitionTaskDTO = (WorkflowPartitionTaskDTO) partitionTask;
log.warn("监控时间. workflowId:[{}] now:[{}], dbnextTriggerAt:[{}]", workflowPartitionTaskDTO.getId(), now, workflowPartitionTaskDTO.getNextTriggerAt());
processWorkflow(workflowPartitionTaskDTO, waitUpdateJobs, waitExecWorkflows, now);
}
@ -85,8 +84,6 @@ public class ScanWorkflowTaskActor extends AbstractActor {
workflowMapper.updateBatchNextTriggerAtById(waitUpdateJobs);
for (final WorkflowTaskPrepareDTO waitExecTask : waitExecWorkflows) {
log.warn("监控时间. workflowId:[{}] now:[{}], nextTriggerAt:[{}]", waitExecTask.getWorkflowId(), now, waitExecTask.getNextTriggerAt());
// 执行预处理阶段
ActorRef actorRef = ActorGenerator.workflowTaskPrepareActor();
waitExecTask.setTaskExecutorScene(JobTaskExecutorSceneEnum.AUTO_WORKFLOW.getType());

11
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/batch/JobTaskBatchGenerator.java
View File

@ -1,12 +1,10 @@
package com.aizuda.easy.retry.server.job.task.support.generator.batch;
import akka.actor.ActorRef;
import cn.hutool.core.lang.Assert;
import com.aizuda.easy.retry.common.core.enums.JobOperationReasonEnum;
import com.aizuda.easy.retry.server.common.akka.ActorGenerator;
import com.aizuda.easy.retry.server.common.cache.CacheRegisterTable;
import com.aizuda.easy.retry.server.common.enums.JobTaskExecutorSceneEnum;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException;
import com.aizuda.easy.retry.server.common.util.DateUtils;
import com.aizuda.easy.retry.server.job.task.dto.JobTimerTaskDTO;
@ -21,12 +19,9 @@ import com.aizuda.easy.retry.template.datasource.persistence.po.JobTaskBatch;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.support.TransactionSynchronization;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.util.CollectionUtils;
import java.time.LocalDateTime;
@ -54,7 +49,7 @@ public class JobTaskBatchGenerator {
JobTaskBatch jobTaskBatch = JobTaskConverter.INSTANCE.toJobTaskBatch(context);
JobTaskExecutorSceneEnum jobTaskExecutorSceneEnum = JobTaskExecutorSceneEnum.get(
context.getTaskExecutorScene());
jobTaskBatch.setTaskType(jobTaskExecutorSceneEnum.getTaskType().getType());
jobTaskBatch.setSystemTaskType(jobTaskExecutorSceneEnum.getSystemTaskType().getType());
jobTaskBatch.setCreateDt(LocalDateTime.now());
// 无执行的节点
@ -100,7 +95,7 @@ public class JobTaskBatchGenerator {
jobTimerTaskDTO.setTaskExecutorScene(context.getTaskExecutorScene());
jobTimerTaskDTO.setWorkflowTaskBatchId(context.getWorkflowTaskBatchId());
jobTimerTaskDTO.setWorkflowNodeId(context.getWorkflowNodeId());
JobTimerWheel.register(TaskTypeEnum.JOB.getType(), jobTaskBatch.getId(),
JobTimerWheel.register(SyetemTaskTypeEnum.JOB.getType(), jobTaskBatch.getId(),
new JobTimerTask(jobTimerTaskDTO), delay, TimeUnit.MILLISECONDS);
return jobTaskBatch;

4
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/generator/batch/WorkflowBatchGenerator.java
View File

@ -2,7 +2,7 @@ package com.aizuda.easy.retry.server.job.task.support.generator.batch;
import cn.hutool.core.lang.Assert;
import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException;
import com.aizuda.easy.retry.server.common.util.DateUtils;
import com.aizuda.easy.retry.server.job.task.dto.WorkflowTimerTaskDTO;
@ -51,7 +51,7 @@ public class WorkflowBatchGenerator {
workflowTimerTaskDTO.setWorkflowTaskBatchId(workflowTaskBatch.getId());
workflowTimerTaskDTO.setWorkflowId(context.getWorkflowId());
workflowTimerTaskDTO.setTaskExecutorScene(context.getTaskExecutorScene());
JobTimerWheel.register(TaskTypeEnum.WORKFLOW.getType(), workflowTaskBatch.getId(),
JobTimerWheel.register(SyetemTaskTypeEnum.WORKFLOW.getType(), workflowTaskBatch.getId(),
new WorkflowTimerTask(workflowTimerTaskDTO), delay, TimeUnit.MILLISECONDS);
}
}

21
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/handler/WorkflowBatchHandler.java
View File

@ -5,6 +5,7 @@ import cn.hutool.core.lang.Assert;
import com.aizuda.easy.retry.common.core.constant.SystemConstants;
import com.aizuda.easy.retry.common.core.enums.JobOperationReasonEnum;
import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum;
import com.aizuda.easy.retry.common.core.enums.JobTaskStatusEnum;
import com.aizuda.easy.retry.common.log.EasyRetryLog;
import com.aizuda.easy.retry.server.common.akka.ActorGenerator;
import com.aizuda.easy.retry.server.common.enums.JobTaskExecutorSceneEnum;
@ -102,13 +103,19 @@ public class WorkflowBatchHandler {
}
}
// 判定叶子节点的状态
for (JobTaskBatch jobTaskBatch : jobTaskBatchList) {
if (JobTaskBatchStatusEnum.NOT_SUCCESS.contains(jobTaskBatch.getTaskBatchStatus())) {
// 只要叶子节点不是无需处理的都是失败
if (JobOperationReasonEnum.WORKFLOW_NODE_NO_REQUIRED.getReason() != jobTaskBatch.getOperationReason()
&& JobOperationReasonEnum.WORKFLOW_NODE_CLOSED_SKIP_EXECUTION.getReason() != jobTaskBatch.getOperationReason()) {
taskStatus = JobTaskBatchStatusEnum.FAIL.getStatus();
boolean isMatchSuccess = jobTaskBatchList.stream()
.anyMatch(jobTaskBatch -> JobTaskStatusEnum.SUCCESS.getStatus() == jobTaskBatch.getTaskBatchStatus());
if (!isMatchSuccess) {
// 判定叶子节点的状态
for (JobTaskBatch jobTaskBatch : jobTaskBatchList) {
if (jobTaskBatch.getTaskBatchStatus() == JobTaskBatchStatusEnum.SUCCESS.getStatus()) {
break;
} else if (JobTaskBatchStatusEnum.NOT_SUCCESS.contains(jobTaskBatch.getTaskBatchStatus())) {
// 只要叶子节点不是无需处理的都是失败
if (JobOperationReasonEnum.WORKFLOW_NODE_NO_REQUIRED.getReason() != jobTaskBatch.getOperationReason()
&& JobOperationReasonEnum.WORKFLOW_NODE_CLOSED_SKIP_EXECUTION.getReason() != jobTaskBatch.getOperationReason()) {
taskStatus = JobTaskBatchStatusEnum.FAIL.getStatus();
}
}
}
}

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/job/WaitJobPrepareHandler.java
View File

@ -1,7 +1,7 @@
package com.aizuda.easy.retry.server.job.task.support.prepare.job;
import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import com.aizuda.easy.retry.server.common.util.DateUtils;
import com.aizuda.easy.retry.server.job.task.dto.JobTaskPrepareDTO;
import com.aizuda.easy.retry.server.job.task.dto.JobTimerTaskDTO;
@ -33,7 +33,7 @@ public class WaitJobPrepareHandler extends AbstractJobPrePareHandler {
log.info("存在待处理任务. taskBatchId:[{}]", jobPrepareDTO.getTaskBatchId());
// 若时间轮中数据不存在则重新加入
if (!JobTimerWheel.isExisted(TaskTypeEnum.JOB.getType(), jobPrepareDTO.getTaskBatchId())) {
if (!JobTimerWheel.isExisted(SyetemTaskTypeEnum.JOB.getType(), jobPrepareDTO.getTaskBatchId())) {
log.info("存在待处理任务且时间轮中不存在 taskBatchId:[{}]", jobPrepareDTO.getTaskBatchId());
// 进入时间轮
@ -41,7 +41,7 @@ public class WaitJobPrepareHandler extends AbstractJobPrePareHandler {
JobTimerTaskDTO jobTimerTaskDTO = new JobTimerTaskDTO();
jobTimerTaskDTO.setTaskBatchId(jobPrepareDTO.getTaskBatchId());
jobTimerTaskDTO.setJobId(jobPrepareDTO.getJobId());
JobTimerWheel.register(TaskTypeEnum.JOB.getType(), jobPrepareDTO.getTaskBatchId(),
JobTimerWheel.register(SyetemTaskTypeEnum.JOB.getType(), jobPrepareDTO.getTaskBatchId(),
new JobTimerTask(jobTimerTaskDTO), delay, TimeUnit.MILLISECONDS);
}
}

6
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/workflow/WaiWorkflowPrepareHandler.java
View File

@ -1,7 +1,7 @@
package com.aizuda.easy.retry.server.job.task.support.prepare.workflow;
import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import com.aizuda.easy.retry.server.common.util.DateUtils;
import com.aizuda.easy.retry.server.job.task.dto.WorkflowTaskPrepareDTO;
import com.aizuda.easy.retry.server.job.task.dto.WorkflowTimerTaskDTO;
@ -34,7 +34,7 @@ public class WaiWorkflowPrepareHandler extends AbstractWorkflowPrePareHandler {
log.info("存在待处理任务. workflowTaskBatchId:[{}]", workflowTaskPrepareDTO.getWorkflowTaskBatchId());
// 若时间轮中数据不存在则重新加入
if (!JobTimerWheel.isExisted(TaskTypeEnum.WORKFLOW.getType(), workflowTaskPrepareDTO.getWorkflowTaskBatchId())) {
if (!JobTimerWheel.isExisted(SyetemTaskTypeEnum.WORKFLOW.getType(), workflowTaskPrepareDTO.getWorkflowTaskBatchId())) {
log.info("存在待处理任务且时间轮中不存在 workflowTaskBatchId:[{}]", workflowTaskPrepareDTO.getWorkflowTaskBatchId());
// 进入时间轮
@ -43,7 +43,7 @@ public class WaiWorkflowPrepareHandler extends AbstractWorkflowPrePareHandler {
workflowTimerTaskDTO.setWorkflowTaskBatchId(workflowTaskPrepareDTO.getWorkflowTaskBatchId());
workflowTimerTaskDTO.setWorkflowId(workflowTaskPrepareDTO.getWorkflowId());
workflowTimerTaskDTO.setTaskExecutorScene(workflowTaskPrepareDTO.getTaskExecutorScene());
JobTimerWheel.register(TaskTypeEnum.WORKFLOW.getType(), workflowTaskPrepareDTO.getWorkflowTaskBatchId(),
JobTimerWheel.register(SyetemTaskTypeEnum.WORKFLOW.getType(), workflowTaskPrepareDTO.getWorkflowTaskBatchId(),
new WorkflowTimerTask(workflowTimerTaskDTO), delay, TimeUnit.MILLISECONDS);
}
}

4
easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/ResidentJobTimerTask.java
View File

@ -3,7 +3,7 @@ package com.aizuda.easy.retry.server.job.task.support.timer;
import akka.actor.ActorRef;
import com.aizuda.easy.retry.server.common.akka.ActorGenerator;
import com.aizuda.easy.retry.server.common.enums.JobTaskExecutorSceneEnum;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import com.aizuda.easy.retry.server.job.task.dto.JobTaskPrepareDTO;
import com.aizuda.easy.retry.server.job.task.dto.JobTimerTaskDTO;
import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter;
@ -29,7 +29,7 @@ public class ResidentJobTimerTask implements TimerTask {
public void run(Timeout timeout) throws Exception {
try {
// 清除时间轮的缓存
JobTimerWheel.clearCache(TaskTypeEnum.JOB.getType(), jobTimerTaskDTO.getTaskBatchId());
JobTimerWheel.clearCache(SyetemTaskTypeEnum.JOB.getType(), jobTimerTaskDTO.getTaskBatchId());
JobTaskPrepareDTO jobTaskPrepare = JobTaskConverter.INSTANCE.toJobTaskPrepare(job);
jobTaskPrepare.setTaskExecutorScene(JobTaskExecutorSceneEnum.AUTO_JOB.getType());
// 执行预处理阶段

9
easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/generator/task/AbstractGenerator.java
View File

@ -8,7 +8,7 @@ import com.aizuda.easy.retry.common.core.enums.StatusEnum;
import com.aizuda.easy.retry.common.log.EasyRetryLog;
import com.aizuda.easy.retry.common.core.util.JsonUtil;
import com.aizuda.easy.retry.server.common.enums.DelayLevelEnum;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException;
import com.aizuda.easy.retry.server.common.generator.id.IdGenerator;
import com.aizuda.easy.retry.server.common.util.DateUtils;
@ -26,7 +26,6 @@ import com.aizuda.easy.retry.template.datasource.persistence.po.GroupConfig;
import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTask;
import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTaskLog;
import com.aizuda.easy.retry.template.datasource.persistence.po.SceneConfig;
import com.aizuda.easy.retry.template.datasource.utils.RequestDataHelper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@ -76,7 +75,7 @@ public abstract class AbstractGenerator implements TaskGenerator {
.eq(RetryTask::getGroupName, taskContext.getGroupName())
.eq(RetryTask::getSceneName, taskContext.getSceneName())
.eq(RetryTask::getRetryStatus, RetryStatusEnum.RUNNING.getStatus())
.eq(RetryTask::getTaskType, TaskTypeEnum.RETRY.getType())
.eq(RetryTask::getTaskType, SyetemTaskTypeEnum.RETRY.getType())
.in(RetryTask::getIdempotentId, idempotentIdSet));
Map<String/*幂等ID*/, List<RetryTask>> retryTaskMap = retryTasks.stream()
@ -131,7 +130,7 @@ public abstract class AbstractGenerator implements TaskGenerator {
RetryTask retryTask = RetryTaskConverter.INSTANCE.toRetryTask(taskInfo);
retryTask.setNamespaceId(taskContext.getNamespaceId());
retryTask.setUniqueId(getIdGenerator(taskContext.getGroupName(), taskContext.getNamespaceId()));
retryTask.setTaskType(TaskTypeEnum.RETRY.getType());
retryTask.setTaskType(SyetemTaskTypeEnum.RETRY.getType());
retryTask.setGroupName(taskContext.getGroupName());
retryTask.setSceneName(taskContext.getSceneName());
retryTask.setRetryStatus(initStatus(taskContext));
@ -153,7 +152,7 @@ public abstract class AbstractGenerator implements TaskGenerator {
// 初始化日志
RetryTaskLog retryTaskLog = RetryTaskLogConverter.INSTANCE.toRetryTask(retryTask);
retryTaskLog.setTaskType(TaskTypeEnum.RETRY.getType());
retryTaskLog.setTaskType(SyetemTaskTypeEnum.RETRY.getType());
retryTaskLog.setCreateDt(now);
waitInsertTaskLogs.add(retryTaskLog);

6
easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/service/impl/RetryServiceImpl.java
View File

@ -4,7 +4,7 @@ import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum;
import com.aizuda.easy.retry.common.core.util.JsonUtil;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException;
import com.aizuda.easy.retry.server.retry.task.service.RetryDeadLetterConverter;
import com.aizuda.easy.retry.server.retry.task.service.RetryService;
@ -53,7 +53,7 @@ public class RetryServiceImpl implements RetryService {
.eq(RetryTask::getNamespaceId, namespaceId)
.in(RetryTask::getRetryStatus, RetryStatusEnum.MAX_COUNT.getStatus(),
RetryStatusEnum.FINISH.getStatus())
.eq(RetryTask::getTaskType, TaskTypeEnum.CALLBACK.getType())
.eq(RetryTask::getTaskType, SyetemTaskTypeEnum.CALLBACK.getType())
.eq(RetryTask::getGroupName, groupName)).getRecords();
if (CollectionUtils.isEmpty(callbackRetryTasks)) {
@ -68,7 +68,7 @@ public class RetryServiceImpl implements RetryService {
List<RetryTask> retryTasks = accessTemplate.getRetryTaskAccess()
.list(groupName, namespaceId, new LambdaQueryWrapper<RetryTask>()
.eq(RetryTask::getNamespaceId, namespaceId)
.eq(RetryTask::getTaskType, TaskTypeEnum.RETRY.getType())
.eq(RetryTask::getTaskType, SyetemTaskTypeEnum.RETRY.getType())
.in(RetryTask::getUniqueId, uniqueIdSet)
);

4
easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/actor/result/FailureActor.java
View File

@ -9,7 +9,7 @@ import com.aizuda.easy.retry.common.log.EasyRetryLog;
import com.aizuda.easy.retry.server.common.IdempotentStrategy;
import com.aizuda.easy.retry.server.common.akka.ActorGenerator;
import com.aizuda.easy.retry.server.common.config.SystemProperties;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException;
import com.aizuda.easy.retry.server.retry.task.support.RetryTaskLogConverter;
import com.aizuda.easy.retry.server.retry.task.support.dispatch.actor.log.RetryTaskLogDTO;
@ -73,7 +73,7 @@ public class FailureActor extends AbstractActor {
protected void doInTransactionWithoutResult(TransactionStatus status) {
Integer maxRetryCount;
if (TaskTypeEnum.CALLBACK.getType().equals(retryTask.getTaskType())) {
if (SyetemTaskTypeEnum.CALLBACK.getType().equals(retryTask.getTaskType())) {
maxRetryCount = systemProperties.getCallback().getMaxCount();
} else {
maxRetryCount = sceneConfig.getMaxRetryCount();

12
easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/dispatch/task/TaskExecutorSceneEnum.java
View File

@ -1,6 +1,6 @@
package com.aizuda.easy.retry.server.retry.task.support.dispatch.task;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Getter;
@ -12,13 +12,13 @@ import lombok.Getter;
@AllArgsConstructor
@Getter
public enum TaskExecutorSceneEnum {
AUTO_RETRY(1, TaskTypeEnum.RETRY),
MANUAL_RETRY(2, TaskTypeEnum.RETRY),
AUTO_CALLBACK(3, TaskTypeEnum.CALLBACK),
MANUAL_CALLBACK(4, TaskTypeEnum.CALLBACK);
AUTO_RETRY(1, SyetemTaskTypeEnum.RETRY),
MANUAL_RETRY(2, SyetemTaskTypeEnum.RETRY),
AUTO_CALLBACK(3, SyetemTaskTypeEnum.CALLBACK),
MANUAL_CALLBACK(4, SyetemTaskTypeEnum.CALLBACK);
private final int scene;
private final TaskTypeEnum taskType;
private final SyetemTaskTypeEnum taskType;
}

11
easy-retry-server/easy-retry-server-retry-task/src/main/java/com/aizuda/easy/retry/server/retry/task/support/handler/CallbackRetryTaskHandler.java
View File

@ -6,14 +6,13 @@ import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum;
import com.aizuda.easy.retry.common.core.util.JsonUtil;
import com.aizuda.easy.retry.server.common.WaitStrategy;
import com.aizuda.easy.retry.server.common.config.SystemProperties;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException;
import com.aizuda.easy.retry.server.common.strategy.WaitStrategies.WaitStrategyContext;
import com.aizuda.easy.retry.server.common.strategy.WaitStrategies.WaitStrategyEnum;
import com.aizuda.easy.retry.server.common.util.DateUtils;
import com.aizuda.easy.retry.server.retry.task.support.RetryTaskConverter;
import com.aizuda.easy.retry.server.retry.task.support.RetryTaskLogConverter;
import com.aizuda.easy.retry.server.common.strategy.WaitStrategies;
import com.aizuda.easy.retry.template.datasource.access.AccessTemplate;
import com.aizuda.easy.retry.template.datasource.persistence.mapper.RetryTaskLogMapper;
import com.aizuda.easy.retry.template.datasource.persistence.po.RetryTask;
@ -26,9 +25,7 @@ import org.springframework.dao.DuplicateKeyException;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.time.Instant;
import java.time.LocalDateTime;
import java.util.concurrent.TimeUnit;
/**
@ -58,12 +55,12 @@ public class CallbackRetryTaskHandler {
*/
@Transactional
public void create(RetryTask retryTask) {
if (!TaskTypeEnum.RETRY.getType().equals(retryTask.getTaskType())) {
if (!SyetemTaskTypeEnum.RETRY.getType().equals(retryTask.getTaskType())) {
return;
}
RetryTask callbackRetryTask = RetryTaskConverter.INSTANCE.toRetryTask(retryTask);
callbackRetryTask.setTaskType(TaskTypeEnum.CALLBACK.getType());
callbackRetryTask.setTaskType(SyetemTaskTypeEnum.CALLBACK.getType());
callbackRetryTask.setId(null);
callbackRetryTask.setUniqueId(generatorCallbackUniqueId(retryTask.getUniqueId()));
callbackRetryTask.setRetryStatus(RetryStatusEnum.RUNNING.getStatus());
@ -91,7 +88,7 @@ public class CallbackRetryTaskHandler {
// 初始化回调日志
RetryTaskLog retryTaskLog = RetryTaskLogConverter.INSTANCE.toRetryTask(callbackRetryTask);
// 记录重试日志
retryTaskLog.setTaskType(TaskTypeEnum.CALLBACK.getType());
retryTaskLog.setTaskType(SyetemTaskTypeEnum.CALLBACK.getType());
retryTaskLog.setCreateDt(LocalDateTime.now());
Assert.isTrue(1 == retryTaskLogMapper.insert(retryTaskLog),
() -> new EasyRetryServerException("新增重试日志失败"));

12
easy-retry-server/easy-retry-server-starter/src/main/java/com/aizuda/easy/retry/server/starter/dispatch/ConsumerBucketActor.java
View File

@ -10,7 +10,7 @@ import com.aizuda.easy.retry.server.common.cache.CacheGroupScanActor;
import com.aizuda.easy.retry.server.common.config.SystemProperties;
import com.aizuda.easy.retry.server.common.dto.ScanTask;
import com.aizuda.easy.retry.server.common.enums.SystemModeEnum;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import com.aizuda.easy.retry.server.retry.task.support.cache.CacheGroupRateLimiter;
import com.aizuda.easy.retry.template.datasource.access.AccessTemplate;
import com.aizuda.easy.retry.template.datasource.persistence.mapper.ServerNodeMapper;
@ -70,11 +70,11 @@ public class ConsumerBucketActor extends AbstractActor {
scanTask.setBuckets(consumerBucket.getBuckets());
// 扫描定时任务数据
ActorRef scanJobActorRef = cacheActorRef(DEFAULT_JOB_KEY, TaskTypeEnum.JOB);
ActorRef scanJobActorRef = cacheActorRef(DEFAULT_JOB_KEY, SyetemTaskTypeEnum.JOB);
scanJobActorRef.tell(scanTask, scanJobActorRef);
// 扫描DAG工作流任务数据
ActorRef scanWorkflowActorRef = cacheActorRef(DEFAULT_WORKFLOW_KEY, TaskTypeEnum.WORKFLOW);
ActorRef scanWorkflowActorRef = cacheActorRef(DEFAULT_WORKFLOW_KEY, SyetemTaskTypeEnum.WORKFLOW);
scanWorkflowActorRef.tell(scanTask, scanWorkflowActorRef);
}
@ -120,11 +120,11 @@ public class ConsumerBucketActor extends AbstractActor {
cacheRateLimiter(groupName);
// 扫描重试数据
ActorRef scanRetryActorRef = cacheActorRef(groupName, TaskTypeEnum.RETRY);
ActorRef scanRetryActorRef = cacheActorRef(groupName, SyetemTaskTypeEnum.RETRY);
scanRetryActorRef.tell(scanTask, scanRetryActorRef);
// 扫描回调数据
ActorRef scanCallbackActorRef = cacheActorRef(groupName, TaskTypeEnum.CALLBACK);
ActorRef scanCallbackActorRef = cacheActorRef(groupName, SyetemTaskTypeEnum.CALLBACK);
scanCallbackActorRef.tell(scanTask, scanCallbackActorRef);
}
@ -148,7 +148,7 @@ public class ConsumerBucketActor extends AbstractActor {
/**
* 缓存Actor对象
*/
private ActorRef cacheActorRef(String groupName, TaskTypeEnum typeEnum) {
private ActorRef cacheActorRef(String groupName, SyetemTaskTypeEnum typeEnum) {
ActorRef scanActorRef = CacheGroupScanActor.get(groupName, typeEnum);
if (Objects.isNull(scanActorRef)) {
scanActorRef = typeEnum.getActorRef().get();

2
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/index.html
View File

File diff suppressed because one or more lines are too long

2
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/app.72b6a848.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/app.744eacb2.js
View File

File diff suppressed because one or more lines are too long

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-073344ab.a7b19bb8.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-073344ab.1e19be06.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-1098698c.41ab9679.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-1098698c.4552df25.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-12afb555.652547af.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-12afb555.b63274e6.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-21492311.ebee6ec7.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-21492311.113690ca.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-220c1da9.c63e81a2.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-220c1da9.30beac3f.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-23853474.ec96b6e8.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-23853474.24c4e645.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-251479d0.44e2ba10.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-251479d0.6c92c782.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-254eca9d.e0fc4594.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-254eca9d.cc4319db.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-268a3da1.675e1375.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-268a3da1.2ba88c08.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-2b85f358.5e043ece.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-2b85f358.216bc784.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-2d0aa660.d0baf2f8.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-2d0aa660.b8d7bd09.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-2d0c8f97.5ff9dbb4.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-2d0c8f97.c7fdc65c.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-35f76107.e5ac8208.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-35f76107.d1dbbf60.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-395a76bd.f9244470.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-395a76bd.2e2f12e5.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-41e3265e.4eeea3b5.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-41e3265e.c183c077.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-4c014765.4ad399e7.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-4c014765.d120fa75.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-4e75193a.318bd342.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-4e75193a.5ebcab5f.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-4fbc7c8c.f1b37a30.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-4fbc7c8c.6b5571b7.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-54cc2708.02aa3fc8.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-54cc2708.6f305a65.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-56d06063.f9e1e5a8.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-56d06063.1359db4d.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-56d0ab76.e2a5f869.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-56d0ab76.d6d508a1.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-5b7b2d68.cd3925ad.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-5b7b2d68.ad03ab39.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-5d2732ba.7ee6c938.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-5d2732ba.6b88c69f.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-5d6686e0.31a1a491.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-5d6686e0.c7e13902.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-5e4dab78.f6455f9b.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-5e4dab78.ae0a0b87.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-6204f6d4.00404671.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-6204f6d4.014547dd.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-6cba1710.eae46af3.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-6cba1710.5d183bbf.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-748d9b9d.e8496e7e.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-748d9b9d.4b22a5eb.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-74bac939.2ffd032b.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-74bac939.cd9b618d.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-8ab79138.6fb20d85.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-8ab79138.2eb0791d.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-aa00ce98.b078841c.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-aa00ce98.f1a21ae6.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-acd4dcc0.b3625325.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-acd4dcc0.fc358a6e.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-b60df838.0c590596.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-b60df838.de4c32b3.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-d8216538.b0c09b01.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-d8216538.138e0686.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-vendors.c07b72f5.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/chunk-vendors.d23b330d.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/fail.fb194c13.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/fail.cc5a53ea.js
View File

0
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/user.e36d6ae4.js → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/js/user.aaab13d0.js
View File

2
frontend/public/lib/assets/EYpaHNYA.css → easy-retry-server/easy-retry-server-starter/src/main/resources/admin/lib/assets/RihNDpOw.css
View File

File diff suppressed because one or more lines are too long

21
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/lib/assets/fjGXFx1T.js Normal file
View File

File diff suppressed because one or more lines are too long

21
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/lib/assets/nqxcaVpR.js
View File

File diff suppressed because one or more lines are too long

32
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/lib/index.html
View File

@ -1,16 +1,16 @@
<!doctype html>
<html lang="zh-CN">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Easy Retry</title>
<script type="module" crossorigin src="./assets/nqxcaVpR.js"></script>
<link rel="stylesheet" crossorigin href="./assets/eHB570AZ.css">
</head>
<body>
<div id="app"></div>
</body>
</html>
<!doctype html>
<html lang="zh-CN">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Easy Retry</title>
<script type="module" crossorigin src="./assets/fjGXFx1T.js"></script>
<link rel="stylesheet" crossorigin href="./assets/RihNDpOw.css">
</head>
<body>
<div id="app"></div>
</body>
</html>

10
easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/GroupConfigServiceImpl.java
View File

@ -339,14 +339,14 @@ public class GroupConfigServiceImpl implements GroupConfigService {
String schema = connection.getSchema();
// https://gitee.com/aizuda/easy-retry/issues/I8DAMH
String sql = MessageFormatter.arrayFormat("SELECT table_name\n"
+ "FROM information_schema.tables\n"
+ "WHERE table_name LIKE 'retry_task_%' AND table_schema = '{}' and table_catalog = '{}'", new Object[]{schema, catalog}).getMessage();
String sql = MessageFormatter.arrayFormat("SELECT table_name\n"
+ "FROM information_schema.tables\n"
+ "WHERE table_name LIKE 'retry_task_%' AND (table_schema = '{}' OR table_schema = '{}' OR table_catalog = '{}' OR table_catalog = '{}')", new Object[]{schema, catalog, schema, catalog}).getMessage();
List<String> tableList = jdbcTemplate.queryForList(sql, String.class);
return tableList.stream().map(ReUtil::getFirstNumber).filter(i ->
!Objects.isNull(i) && i <= systemProperties.getTotalPartition()).distinct()
.collect(Collectors.toList());
!Objects.isNull(i) && i <= systemProperties.getTotalPartition()).distinct()
.collect(Collectors.toList());
} catch (SQLException ignored) {
} finally {
if (Objects.nonNull(connection)) {

11
easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobBatchServiceImpl.java
View File

@ -4,15 +4,11 @@ import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import com.aizuda.easy.retry.common.core.constant.SystemConstants;
import com.aizuda.easy.retry.common.core.enums.JobOperationReasonEnum;
import com.aizuda.easy.retry.common.core.enums.StatusEnum;
import com.aizuda.easy.retry.common.core.util.JsonUtil;
import com.aizuda.easy.retry.server.common.dto.CallbackConfig;
import com.aizuda.easy.retry.server.common.dto.DecisionConfig;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException;
import com.aizuda.easy.retry.server.common.util.DateUtils;
import com.aizuda.easy.retry.server.job.task.dto.JobTaskPrepareDTO;
import com.aizuda.easy.retry.server.job.task.support.JobPrePareHandler;
import com.aizuda.easy.retry.server.job.task.support.JobTaskConverter;
import com.aizuda.easy.retry.server.job.task.support.JobTaskStopHandler;
import com.aizuda.easy.retry.server.job.task.support.stop.JobTaskStopFactory;
@ -32,12 +28,9 @@ import com.aizuda.easy.retry.template.datasource.persistence.mapper.WorkflowNode
import com.aizuda.easy.retry.template.datasource.persistence.po.Job;
import com.aizuda.easy.retry.template.datasource.persistence.po.JobTaskBatch;
import com.aizuda.easy.retry.template.datasource.persistence.po.WorkflowNode;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import com.google.common.collect.Lists;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@ -105,7 +98,7 @@ public class JobBatchServiceImpl implements JobBatchService {
Job job = jobMapper.selectById(jobTaskBatch.getJobId());
JobBatchResponseVO jobBatchResponseVO = JobBatchResponseVOConverter.INSTANCE.toJobBatchResponseVO(jobTaskBatch, job);
if (jobTaskBatch.getTaskType().equals(TaskTypeEnum.WORKFLOW.getType())) {
if (jobTaskBatch.getSystemTaskType().equals(SyetemTaskTypeEnum.WORKFLOW.getType())) {
WorkflowNode workflowNode = workflowNodeMapper.selectById(jobTaskBatch.getWorkflowNodeId());
jobBatchResponseVO.setNodeName(workflowNode.getNodeName());

8
easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryDeadLetterServiceImpl.java
View File

@ -5,9 +5,8 @@ import cn.hutool.core.util.StrUtil;
import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum;
import com.aizuda.easy.retry.server.common.WaitStrategy;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException;
import com.aizuda.easy.retry.server.common.strategy.WaitStrategies;
import com.aizuda.easy.retry.server.common.strategy.WaitStrategies.WaitStrategyContext;
import com.aizuda.easy.retry.server.common.strategy.WaitStrategies.WaitStrategyEnum;
import com.aizuda.easy.retry.server.common.util.DateUtils;
@ -37,12 +36,9 @@ import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
@ -138,7 +134,7 @@ public class RetryDeadLetterServiceImpl implements RetryDeadLetterService {
RetryTask retryTask = RetryTaskConverter.INSTANCE.toRetryTask(retryDeadLetter);
retryTask.setRetryStatus(RetryStatusEnum.RUNNING.getStatus());
retryTask.setTaskType(TaskTypeEnum.RETRY.getType());
retryTask.setTaskType(SyetemTaskTypeEnum.RETRY.getType());
WaitStrategyContext waitStrategyContext = new WaitStrategyContext();
waitStrategyContext.setNextTriggerAt(LocalDateTime.now());

6
easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/RetryTaskServiceImpl.java
View File

@ -12,7 +12,7 @@ import com.aizuda.easy.retry.server.common.cache.CacheRegisterTable;
import com.aizuda.easy.retry.server.common.client.RequestBuilder;
import com.aizuda.easy.retry.server.common.dto.RegisterNodeInfo;
import com.aizuda.easy.retry.server.common.enums.TaskGeneratorSceneEnum;
import com.aizuda.easy.retry.server.common.enums.TaskTypeEnum;
import com.aizuda.easy.retry.server.common.enums.SyetemTaskTypeEnum;
import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException;
import com.aizuda.easy.retry.server.common.strategy.WaitStrategies.WaitStrategyContext;
import com.aizuda.easy.retry.server.common.strategy.WaitStrategies.WaitStrategyEnum;
@ -368,7 +368,7 @@ public class RetryTaskServiceImpl implements RetryTaskService {
requestVO.getGroupName(), namespaceId,
new LambdaQueryWrapper<RetryTask>()
.eq(RetryTask::getNamespaceId, namespaceId)
.eq(RetryTask::getTaskType, TaskTypeEnum.RETRY.getType())
.eq(RetryTask::getTaskType, SyetemTaskTypeEnum.RETRY.getType())
.in(RetryTask::getUniqueId, uniqueIds));
Assert.notEmpty(list, () -> new EasyRetryServerException("没有可执行的任务"));
@ -399,7 +399,7 @@ public class RetryTaskServiceImpl implements RetryTaskService {
List<RetryTask> list = accessTemplate.getRetryTaskAccess().list(requestVO.getGroupName(), namespaceId,
new LambdaQueryWrapper<RetryTask>()
.eq(RetryTask::getNamespaceId, namespaceId)
.eq(RetryTask::getTaskType, TaskTypeEnum.CALLBACK.getType())
.eq(RetryTask::getTaskType, SyetemTaskTypeEnum.CALLBACK.getType())
.in(RetryTask::getUniqueId, uniqueIds));
Assert.notEmpty(list, () -> new EasyRetryServerException("没有可执行的任务"));

16
easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/WorkflowBatchServiceImpl.java
View File

@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
import com.aizuda.easy.retry.common.core.constant.SystemConstants;
import com.aizuda.easy.retry.common.core.enums.JobOperationReasonEnum;
import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum;
import com.aizuda.easy.retry.common.core.enums.JobTaskStatusEnum;
import com.aizuda.easy.retry.common.core.enums.StatusEnum;
import com.aizuda.easy.retry.server.common.dto.JobTaskConfig;
import com.aizuda.easy.retry.server.common.exception.EasyRetryServerException;
@ -105,9 +106,9 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService {
public WorkflowDetailResponseVO getWorkflowBatchDetail(Long id) {
WorkflowTaskBatch workflowTaskBatch = workflowTaskBatchMapper.selectOne(
new LambdaQueryWrapper<WorkflowTaskBatch>()
.eq(WorkflowTaskBatch::getId, id)
.eq(WorkflowTaskBatch::getNamespaceId, UserSessionUtils.currentUserSession().getNamespaceId()));
new LambdaQueryWrapper<WorkflowTaskBatch>()
.eq(WorkflowTaskBatch::getId, id)
.eq(WorkflowTaskBatch::getNamespaceId, UserSessionUtils.currentUserSession().getNamespaceId()));
if (Objects.isNull(workflowTaskBatch)) {
return null;
}
@ -121,7 +122,7 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService {
List<Long> jobIds = workflowNodes.stream().map(WorkflowNode::getJobId).collect(Collectors.toList());
List<Job> jobs = jobMapper.selectList(new LambdaQueryWrapper<Job>()
.in(Job::getId, new HashSet<>(jobIds)));
.in(Job::getId, new HashSet<>(jobIds)));
Map<Long, Job> jobMap = jobs.stream().collect(Collectors.toMap(Job::getId, job -> job));
@ -140,13 +141,15 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService {
.peek(nodeInfo -> {
JobTaskConfig jobTask = nodeInfo.getJobTask();
if(Objects.nonNull(jobTask)) {
if (Objects.nonNull(jobTask)) {
jobTask.setJobName(jobMap.getOrDefault(jobTask.getJobId(), new Job()).getJobName());
}
List<JobTaskBatch> jobTaskBatchList = jobTaskBatchMap.get(nodeInfo.getId());
if (!CollectionUtils.isEmpty(jobTaskBatchList)) {
jobTaskBatchList = jobTaskBatchList.stream().sorted(Comparator.comparingInt(JobTaskBatch::getTaskBatchStatus)).collect(Collectors.toList());
nodeInfo.setJobBatchList(JobBatchResponseVOConverter.INSTANCE.jobTaskBatchToJobBatchResponseVOs(jobTaskBatchList));
// 取第最新的一条状态
JobTaskBatch jobTaskBatch = jobTaskBatchList.get(0);
if (JobOperationReasonEnum.WORKFLOW_DECISION_FAILED.getReason() == jobTaskBatch.getOperationReason()) {
@ -166,6 +169,7 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService {
// 删除被误添加的节点
allNoOperationNode.remove(nodeInfo.getId());
}
} else {
if (JobTaskBatchStatusEnum.NOT_SUCCESS.contains(workflowTaskBatch.getTaskBatchStatus())) {
allNoOperationNode.add(nodeInfo.getId());
@ -210,7 +214,7 @@ public class WorkflowBatchServiceImpl implements WorkflowBatchService {
private static boolean isNoOperation(JobTaskBatch i) {
return JobOperationReasonEnum.WORKFLOW_SUCCESSOR_SKIP_EXECUTION.contains(i.getOperationReason())
|| i.getTaskBatchStatus() == JobTaskBatchStatusEnum.STOP.getStatus();
|| i.getTaskBatchStatus() == JobTaskBatchStatusEnum.STOP.getStatus();
}
}

2
easy-retry-server/easy-retry-server-starter/src/main/resources/admin/lib/assets/eHB570AZ.css → frontend/public/lib/assets/RihNDpOw.css
View File

File diff suppressed because one or more lines are too long

21
frontend/public/lib/assets/fjGXFx1T.js Normal file
View File

File diff suppressed because one or more lines are too long

21
frontend/public/lib/assets/yb0S4WKn.js
View File

File diff suppressed because one or more lines are too long

4
frontend/public/lib/index.html
View File

@ -5,8 +5,8 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Easy Retry</title>
<script type="module" crossorigin src="./assets/yb0S4WKn.js"></script>
<link rel="stylesheet" crossorigin href="./assets/EYpaHNYA.css">
<script type="module" crossorigin src="./assets/fjGXFx1T.js"></script>
<link rel="stylesheet" crossorigin href="./assets/RihNDpOw.css">
</head>
<body>