diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/ClientCallbackContext.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/ClientCallbackContext.java index 7ddee1062..62c5aa78f 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/ClientCallbackContext.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/callback/ClientCallbackContext.java @@ -51,10 +51,23 @@ public class ClientCallbackContext { /** * 是否是重试流量 */ - private Boolean retryStatus = Boolean.FALSE; - + private Boolean retryStatus; /** * 工作流上下文 */ private String wfContext; + + // 兼容isRetry/retryStatus并存 + @Deprecated + public Boolean getRetryStatus() { + return Boolean.TRUE.equals(retryStatus) || isRetry; + } + + // 兼容isRetry/retryStatus并存 + @Deprecated + public void setRetryStatus(boolean value) { + this.retryStatus = Boolean.valueOf(value); + isRetry = value; + } + } diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/request/ReportDispatchResultPostHttpRequestHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/request/ReportDispatchResultPostHttpRequestHandler.java index 6797e12ee..cd7b674c2 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/request/ReportDispatchResultPostHttpRequestHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/request/ReportDispatchResultPostHttpRequestHandler.java @@ -18,6 +18,7 @@ import io.netty.handler.codec.http.HttpMethod; import org.springframework.stereotype.Component; import java.util.Objects; +import java.util.Optional; import static com.aizuda.snailjob.common.core.constant.SystemConstants.HTTP_PATH.REPORT_JOB_DISPATCH_RESULT; @@ -51,10 +52,6 @@ public class ReportDispatchResultPostHttpRequestHandler extends PostHttpRequestH ClientCallbackHandler clientCallback = ClientCallbackFactory.getClientCallback(dispatchJobResultRequest.getTaskType()); ClientCallbackContext context = JobTaskConverter.INSTANCE.toClientCallbackContext(dispatchJobResultRequest); - // 兼容过度版本 - if (Objects.isNull(context.getRetryStatus())) { - context.setRetryStatus(context.isRetry()); - } context.setNamespaceId(headers.getAsString(HeadersEnum.NAMESPACE.getKey())); clientCallback.callback(context);