feat: 2.6.0

1. 优化重试导致事务超时问题

easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorResultActor.java

@@ -62,9 +62,6 @@ public class JobExecutorResultActor extends AbstractActor {
         return receiveBuilder().match(JobExecutorResultDTO.class, result -> {
             log.info("更新任务状态. 参数:[{}]", JsonUtil.toJsonString(result));
             try {
-                transactionTemplate.execute(new TransactionCallbackWithoutResult() {
-                    @Override
-                    protected void doInTransactionWithoutResult(final TransactionStatus status) {
                 JobTask jobTask = new JobTask();
                 jobTask.setTaskStatus(result.getTaskStatus());
                 if (Objects.nonNull(result.getResult())) {
@@ -81,10 +78,8 @@ public class JobExecutorResultActor extends AbstractActor {
                     distributedLockHandler.lockWithDisposableAndRetry(() -> {
                         tryCompleteAndStop(result);
                     }, MessageFormat.format(KEY, result.getTaskBatchId(),
-                                    result.getJobId()), Duration.ofSeconds(3), Duration.ofSeconds(1), 6);
+                        result.getJobId()), Duration.ofSeconds(2), Duration.ofSeconds(1), 3);
                 }
-                    }
-                });
             } catch (Exception e) {
                 EasyRetryLog.LOCAL.error(" job executor result exception. [{}]", result, e);
             } finally {

easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/WorkflowExecutorActor.java

@@ -2,6 +2,7 @@ package com.aizuda.easy.retry.server.job.task.support.dispatch;
 
 import akka.actor.AbstractActor;
 import cn.hutool.core.lang.Assert;
+import com.aizuda.easy.retry.common.core.constant.SystemConstants;
 import com.aizuda.easy.retry.common.core.enums.FailStrategyEnum;
 import com.aizuda.easy.retry.common.core.enums.JobOperationReasonEnum;
 import com.aizuda.easy.retry.common.core.enums.JobTaskBatchStatusEnum;
@@ -80,7 +81,9 @@ public class WorkflowExecutorActor extends AbstractActor {
         WorkflowTaskBatch workflowTaskBatch = workflowTaskBatchMapper.selectById(taskExecute.getWorkflowTaskBatchId());
         Assert.notNull(workflowTaskBatch, () -> new EasyRetryServerException("任务不存在"));
 
+        if (SystemConstants.ROOT.equals(taskExecute.getParentId()) && JobTaskBatchStatusEnum.WAITING.getStatus() == workflowTaskBatch.getTaskBatchStatus()) {
             handlerTaskBatch(taskExecute, JobTaskBatchStatusEnum.RUNNING.getStatus(), JobOperationReasonEnum.NONE.getReason());
+        }
 
         // 获取DAG图
         String flowInfo = workflowTaskBatch.getFlowInfo();

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

@@ -80,24 +80,18 @@ public class JobTaskBatchGenerator {
         // 非待处理状态无需进入时间轮中
         if (JobTaskBatchStatusEnum.WAITING.getStatus() != jobTaskBatch.getTaskBatchStatus()) {
 
+            if (TransactionSynchronizationManager.isActualTransactionActive()) {
                 TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
                     @Override
                     public void afterCompletion(int status) {
-                    if (Objects.nonNull(context.getWorkflowNodeId()) && Objects.nonNull(context.getWorkflowTaskBatchId())) {
+                        openNextNode(context);
-                        // 若是工作流则开启下一个任务
-                        try {
-                            WorkflowNodeTaskExecuteDTO taskExecuteDTO = new WorkflowNodeTaskExecuteDTO();
-                            taskExecuteDTO.setWorkflowTaskBatchId(context.getWorkflowTaskBatchId());
-                            taskExecuteDTO.setTaskExecutorScene(context.getTaskExecutorScene());
-                            taskExecuteDTO.setParentId(context.getWorkflowNodeId());
-                            ActorRef actorRef = ActorGenerator.workflowTaskExecutorActor();
-                            actorRef.tell(taskExecuteDTO, actorRef);
-                        } catch (Exception e) {
-                            log.error("任务调度执行失败", e);
-                        }
-                    }
                     }
                 });
+            } else {
+                openNextNode(context);
+            }
+
+
             return jobTaskBatch;
         }
 
@@ -115,4 +109,24 @@ public class JobTaskBatchGenerator {
         return jobTaskBatch;
     }
 
+    /**
+     * 工作流开启下一个节点
+     * @param context
+     */
+    private static void openNextNode(final JobTaskBatchGeneratorContext context) {
+        if (Objects.nonNull(context.getWorkflowNodeId()) && Objects.nonNull(context.getWorkflowTaskBatchId())) {
+            // 若是工作流则开启下一个任务
+            try {
+                WorkflowNodeTaskExecuteDTO taskExecuteDTO = new WorkflowNodeTaskExecuteDTO();
+                taskExecuteDTO.setWorkflowTaskBatchId(context.getWorkflowTaskBatchId());
+                taskExecuteDTO.setTaskExecutorScene(context.getTaskExecutorScene());
+                taskExecuteDTO.setParentId(context.getWorkflowNodeId());
+                ActorRef actorRef = ActorGenerator.workflowTaskExecutorActor();
+                actorRef.tell(taskExecuteDTO, actorRef);
+            } catch (Exception e) {
+                log.error("任务调度执行失败", e);
+            }
+        }
+    }
+
 }

easy-retry-server/easy-retry-server-starter/src/main/java/com/aizuda/easy/retry/server/starter/server/handler/ReportLogHttpRequestHandler.java

@@ -50,7 +50,6 @@ public class ReportLogHttpRequestHandler extends PostHttpRequestHandler {
     }
 
     @Override
-    @Transactional
     public String doHandler(String content, UrlQuery urlQuery, HttpHeaders headers) {
 
         EasyRetryLog.LOCAL.info("Begin Handler Log Report Data. [{}]", content);