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()