From 03597ea97cff5bfaabfe58da6025688bb2b722c2 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Sun, 23 Feb 2025 21:51:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(1.4.0-beta1):=201.=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E6=89=A7=E8=A1=8C=E5=A4=B1=E8=B4=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/core/executor/RemoteCallbackExecutor.java        | 6 +++++-
 .../server/retry/task/support/dispatch/RetryExecutor.java   | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/executor/RemoteCallbackExecutor.java b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/executor/RemoteCallbackExecutor.java
index 9fa75aa7f..91919370a 100644
--- a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/executor/RemoteCallbackExecutor.java
+++ b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/executor/RemoteCallbackExecutor.java
@@ -9,6 +9,8 @@ import com.aizuda.snailjob.client.core.log.RetryLogMeta;
 import com.aizuda.snailjob.client.core.retryer.RetryerInfo;
 import com.aizuda.snailjob.common.core.context.SnailSpringContext;
 import com.aizuda.snailjob.common.core.enums.RetryStatusEnum;
+import com.aizuda.snailjob.common.core.util.JsonUtil;
+import com.aizuda.snailjob.common.log.SnailJobLog;
 import com.aizuda.snailjob.common.log.enums.LogTypeEnum;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -47,6 +49,8 @@ public class RemoteCallbackExecutor {
             // 以Spring Bean模式回调
             doCallbackForSpringBean(context);
 
+            // 上报执行成功
+            SnailJobLog.REMOTE.info("任务执行成功 taskId:[{}]", context.getRetryTaskId());
         } catch (NoSuchBeanDefinitionException e) {
             // 若不是SpringBean 则直接反射以普通类调用
             doCallbackForOrdinaryClass(context);
@@ -120,7 +124,7 @@ public class RemoteCallbackExecutor {
         ReflectionUtils.invokeMethod(method, retryCompleteCallback, retryerInfo.getScene(),
                 retryerInfo.getExecutorClassName(), deSerialize);
 
-
+        SnailJobLog.REMOTE.info("任务执行成功 taskId:[{}] [{}]", context.getRetryTaskId());
 
     }
 
diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryExecutor.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryExecutor.java
index bbf0d76fb..4ba2ada7b 100644
--- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryExecutor.java
+++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/RetryExecutor.java
@@ -79,9 +79,9 @@ public class RetryExecutor extends AbstractActor {
 
     private void doExecute(RetryTaskExecuteDTO execute) {
         LambdaQueryWrapper<Retry> wrapper = new LambdaQueryWrapper<>();
-
+        wrapper.eq(Retry::getId, execute.getRetryId());
         if (RetryTaskExecutorSceneEnum.MANUAL_RETRY.getScene() != execute.getRetryTaskExecutorScene()) {
-            wrapper.eq(Retry::getId, execute.getRetryId()).eq(Retry::getRetryStatus, RetryStatusEnum.RUNNING.getStatus());
+            wrapper.eq(Retry::getRetryStatus, RetryStatusEnum.RUNNING.getStatus());
         }
 
         Retry retry = retryMapper.selectOne(wrapper);