From edca09ea7cf8d6f07998deb02d8ea2990fb98fab Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Tue, 22 Apr 2025 22:09:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(1.5.0-beta1):=20=E4=BF=AE=E5=A4=8D=E6=BB=91?= =?UTF-8?q?=E5=8A=A8=E7=AA=97=E5=8F=A3=E6=8F=90=E5=8F=96=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E9=97=B4=E9=97=B4=E9=9A=94=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=92=8C=E5=AE=8C=E6=88=90=E6=97=B6=E4=B8=BA=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?delete=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/aizuda/snailjob/client/common/window/SlidingWindow.java | 2 +- .../snailjob/server/web/service/impl/RetryServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/window/SlidingWindow.java b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/window/SlidingWindow.java index 22ca36a2..c1a8d400 100644 --- a/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/window/SlidingWindow.java +++ b/snail-job-client/snail-job-client-common/src/main/java/com/aizuda/snailjob/client/common/window/SlidingWindow.java @@ -329,7 +329,7 @@ public class SlidingWindow { threadPoolExecutor.scheduleAtFixedRate(() -> { try { - extract(LocalDateTime.now().minus(duration, chronoUnit)); + extract(LocalDateTime.now()); } catch (Exception e) { SnailJobLog.LOCAL.error("Sliding window exception", e); } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryServiceImpl.java index 7cbb8d7d..ce5539b3 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryServiceImpl.java @@ -168,12 +168,14 @@ public class RetryServiceImpl implements RetryService { waitStrategyContext.setDelayLevel(retry.getRetryCount() + 1); WaitStrategy waitStrategy = WaitStrategyEnum.getWaitStrategy(retrySceneConfig.getBackOff()); retry.setNextTriggerAt(waitStrategy.computeTriggerTime(waitStrategyContext)); + retry.setDeleted(0L); } if (RetryStatusEnum.FINISH.getStatus().equals(retryStatusEnum.getStatus())) { RetryLogMetaDTO retryLogMetaDTO = RetryTaskConverter.INSTANCE.toLogMetaDTO(retry); retryLogMetaDTO.setTimestamp(DateUtils.toNowMilli()); SnailJobLog.REMOTE.info("============Manual operation completed============. <|>{}<|>", retryLogMetaDTO); + retry.setDeleted(retry.getId()); } retry.setUpdateDt(LocalDateTime.now());