gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

feat(1.4.0-beta1): 1. 修复阻塞策略错误 2. 删除死信表taskType

Browse Source
This commit is contained in:
opensnail 2025-02-23 20:32:46 +08:00
parent c32d1c5426
commit f6e4656567
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/RetryDeadLetter.java
View File

@ -32,7 +32,4 @@ public class RetryDeadLetter extends CreateDt {
private String argsStr; private String argsStr;
private String extAttrs; private String extAttrs;
private Integer taskType;
} }

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java
View File

@ -165,7 +165,7 @@ public class ScanRetryActor extends AbstractActor {
waitUpdateRetries.add(retry); waitUpdateRetries.add(retry);
RetryTaskPrepareDTO retryTaskPrepareDTO = RetryTaskConverter.INSTANCE.toRetryTaskPrepareDTO(partitionTask); RetryTaskPrepareDTO retryTaskPrepareDTO = RetryTaskConverter.INSTANCE.toRetryTaskPrepareDTO(partitionTask);
retryTaskPrepareDTO.setBlockStrategy(retrySceneConfig.getBackOff()); retryTaskPrepareDTO.setBlockStrategy(retrySceneConfig.getBlockStrategy());
retryTaskPrepareDTO.setExecutorTimeout(retrySceneConfig.getExecutorTimeout()); retryTaskPrepareDTO.setExecutorTimeout(retrySceneConfig.getExecutorTimeout());
retryTaskPrepareDTO.setRetryTaskExecutorScene(RetryTaskExecutorSceneEnum.AUTO_RETRY.getScene()); retryTaskPrepareDTO.setRetryTaskExecutorScene(RetryTaskExecutorSceneEnum.AUTO_RETRY.getScene());
waitExecRetries.add(retryTaskPrepareDTO); waitExecRetries.add(retryTaskPrepareDTO);

4
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/RetryServiceImpl.java
View File

@ -93,10 +93,6 @@ public class RetryServiceImpl implements RetryService {
PageDTO<Retry> pageDTO = new PageDTO<>(queryVO.getPage(), queryVO.getSize()); PageDTO<Retry> pageDTO = new PageDTO<>(queryVO.getPage(), queryVO.getSize());
String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId(); String namespaceId = UserSessionUtils.currentUserSession().getNamespaceId();
if (StrUtil.isBlank(queryVO.getGroupName())) {
return new PageResult<>(pageDTO, new ArrayList<>());
}
List<String> groupNames = UserSessionUtils.getGroupNames(queryVO.getGroupName()); List<String> groupNames = UserSessionUtils.getGroupNames(queryVO.getGroupName());
LambdaQueryWrapper<Retry> queryWrapper = new LambdaQueryWrapper<Retry>() LambdaQueryWrapper<Retry> queryWrapper = new LambdaQueryWrapper<Retry>()