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 22ca36a25..c1a8d4005 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 7cbb8d7d3..ce5539b30 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());