From f6e465656791bc199d18b5647fb5146680bde11f Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Sun, 23 Feb 2025 20:32:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(1.4.0-beta1):=201.=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=98=BB=E5=A1=9E=E7=AD=96=E7=95=A5=E9=94=99=E8=AF=AF=202.=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=AD=BB=E4=BF=A1=E8=A1=A8taskType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/datasource/persistence/po/RetryDeadLetter.java | 3 --- .../server/retry/task/support/dispatch/ScanRetryActor.java | 2 +- .../snailjob/server/web/service/impl/RetryServiceImpl.java | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryDeadLetter.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryDeadLetter.java index e62f89c72..6b0b9cd6f 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryDeadLetter.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryDeadLetter.java @@ -32,7 +32,4 @@ public class RetryDeadLetter extends CreateDt { private String argsStr; private String extAttrs; - - private Integer taskType; - } diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java index 2c3738adf..0a2bcf131 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java @@ -165,7 +165,7 @@ public class ScanRetryActor extends AbstractActor { waitUpdateRetries.add(retry); RetryTaskPrepareDTO retryTaskPrepareDTO = RetryTaskConverter.INSTANCE.toRetryTaskPrepareDTO(partitionTask); - retryTaskPrepareDTO.setBlockStrategy(retrySceneConfig.getBackOff()); + retryTaskPrepareDTO.setBlockStrategy(retrySceneConfig.getBlockStrategy()); retryTaskPrepareDTO.setExecutorTimeout(retrySceneConfig.getExecutorTimeout()); retryTaskPrepareDTO.setRetryTaskExecutorScene(RetryTaskExecutorSceneEnum.AUTO_RETRY.getScene()); waitExecRetries.add(retryTaskPrepareDTO); 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 b45cd4ca8..d4167666e 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 @@ -93,10 +93,6 @@ public class RetryServiceImpl implements RetryService { PageDTO pageDTO = new PageDTO<>(queryVO.getPage(), queryVO.getSize()); String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId(); - if (StrUtil.isBlank(queryVO.getGroupName())) { - return new PageResult<>(pageDTO, new ArrayList<>()); - } - List groupNames = UserSessionUtils.getGroupNames(queryVO.getGroupName()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper()