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 9fa75aa7..91919370 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 bbf0d76f..4ba2ada7 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 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);