From 05e4c0b1372f5f6e5e06168de54464890ac3f90c Mon Sep 17 00:00:00 2001
From: byteblogs168 <598092184@qq.com>
Date: Tue, 16 Jan 2024 18:12:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=202.6.0=201.=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E8=8A=82=E7=82=B9=E5=92=8C=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workflow/CallbackWorkflowExecutor.java     | 18 ++++++++++++------
 .../workflow/ConditionWorkflowExecutor.java    |  3 ++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/workflow/CallbackWorkflowExecutor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/workflow/CallbackWorkflowExecutor.java
index 1bcc1ba8..8d0a325f 100644
--- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/workflow/CallbackWorkflowExecutor.java
+++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/workflow/CallbackWorkflowExecutor.java
@@ -46,6 +46,7 @@ import java.util.concurrent.TimeUnit;
 @Component
 @RequiredArgsConstructor
 public class CallbackWorkflowExecutor extends AbstractWorkflowExecutor {
+
     private static final String SECRET = "secret";
     private static final String CALLBACK_TIMEOUT = "10";
     private final RestTemplate restTemplate;
@@ -78,8 +79,8 @@ public class CallbackWorkflowExecutor extends AbstractWorkflowExecutor {
         requestHeaders.set(RequestInterceptor.TIMEOUT_TIME, CALLBACK_TIMEOUT);
 
         List<JobTask> jobTasks = jobTaskMapper.selectList(new LambdaQueryWrapper<JobTask>()
-                .select(JobTask::getResultMessage, JobTask::getClientInfo)
-                .eq(JobTask::getTaskBatchId, context.getTaskBatchId()));
+            .select(JobTask::getResultMessage, JobTask::getClientInfo)
+            .eq(JobTask::getTaskBatchId, context.getTaskBatchId()));
         List<CallbackParamsDTO> callbackParamsList = WorkflowTaskConverter.INSTANCE.toCallbackParamsDTO(jobTasks);
 
         context.setTaskResult(JsonUtil.toJsonString(callbackParamsList));
@@ -94,7 +95,10 @@ public class CallbackWorkflowExecutor extends AbstractWorkflowExecutor {
                 .withRetryListener(new RetryListener() {
                     @Override
                     public <V> void onRetry(final Attempt<V> attempt) {
-                        EasyRetryLog.LOCAL.error("回调接口第 【{}】 重试. 回调配置信息: [{}]", attempt.getAttemptNumber(), JsonUtil.toJsonString(decisionConfig));
+                        if (attempt.hasException()) {
+                            EasyRetryLog.LOCAL.error("回调接口第 【{}】 重试. 回调配置信息: [{}]",
+                                attempt.getAttemptNumber(), JsonUtil.toJsonString(decisionConfig));
+                        }
                     }
                 }).build();
 
@@ -105,7 +109,8 @@ public class CallbackWorkflowExecutor extends AbstractWorkflowExecutor {
             result = response.getBody();
             EasyRetryLog.LOCAL.info("回调结果. webHook:[{}]，结果: [{}]", decisionConfig.getWebhook(), result);
         } catch (Exception e) {
-            EasyRetryLog.LOCAL.error("回调异常. webHook:[{}]，参数: [{}]", decisionConfig.getWebhook(), context.getTaskResult(), e);
+            EasyRetryLog.LOCAL.error("回调异常. webHook:[{}]，参数: [{}]", decisionConfig.getWebhook(),
+                context.getTaskResult(), e);
             taskBatchStatus = JobTaskBatchStatusEnum.FAIL.getStatus();
             operationReason = JobOperationReasonEnum.WORKFLOW_CALLBACK_NODE_EXECUTOR_ERROR.getReason();
             jobTaskStatus = JobTaskStatusEnum.FAIL.getStatus();
@@ -152,8 +157,9 @@ public class CallbackWorkflowExecutor extends AbstractWorkflowExecutor {
             EasyRetryLog.REMOTE.info("workflowNodeId:[{}] 回调成功. 回调参数:[{}] 回调结果:[{}] <|>{}<|>",
                 context.getWorkflowNodeId(), context.getTaskResult(), context.getTaskResult(), logMetaDTO);
         } else {
-            EasyRetryLog.REMOTE.error("workflowNodeId:[{}] 回调失败. 失败原因:[{}] <|>{}<|>", context.getWorkflowNodeId(),
-                    context.getLogMessage(), logMetaDTO);
+            EasyRetryLog.REMOTE.error("workflowNodeId:[{}] 回调失败. 失败原因:[{}] <|>{}<|>",
+                context.getWorkflowNodeId(),
+                context.getLogMessage(), logMetaDTO);
 
             // 尝试完成任务
             workflowBatchHandler.complete(context.getWorkflowTaskBatchId());
diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/workflow/ConditionWorkflowExecutor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/workflow/ConditionWorkflowExecutor.java
index bc1212f9..e3e9e5ae 100644
--- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/workflow/ConditionWorkflowExecutor.java
+++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/executor/workflow/ConditionWorkflowExecutor.java
@@ -140,7 +140,8 @@ public class ConditionWorkflowExecutor extends AbstractWorkflowExecutor {
         logMetaDTO.setTaskBatchId(jobTaskBatch.getId());
         logMetaDTO.setJobId(SystemConstants.DECISION_JOB_ID);
         logMetaDTO.setTaskId(jobTask.getId());
-        if (jobTaskBatch.getTaskBatchStatus() == JobTaskStatusEnum.SUCCESS.getStatus()) {
+        if (jobTaskBatch.getTaskBatchStatus() == JobTaskStatusEnum.SUCCESS.getStatus()
+            || JobOperationReasonEnum.WORKFLOW_NODE_NO_OPERATION_REQUIRED.getReason() == context.getOperationReason()) {
             EasyRetryLog.REMOTE.info("workflowNodeId:[{}]决策完成. 决策结果:[{}] <|>{}<|>",
                 context.getWorkflowNodeId(), context.getEvaluationResult(), logMetaDTO);
         } else {