diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryServiceImpl.java index 807244f1..f3235f55 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryServiceImpl.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryServiceImpl.java @@ -33,7 +33,6 @@ import com.aizuda.easy.retry.server.service.convert.RetryTaskConverter; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; @@ -233,6 +232,7 @@ public class RetryServiceImpl implements RetryService { waitDelDeadLetters.addAll(finishCallbackRetryIdList); } + RequestDataHelper.setPartition(groupName); Assert.isTrue(waitDelDeadLetters.size() == retryTaskMapper.deleteBatchIds(waitDelDeadLetters), () -> new EasyRetryServerException("删除重试数据失败 [{}]", JsonUtil.toJsonString(retryTasks))); @@ -246,6 +246,9 @@ public class RetryServiceImpl implements RetryService { * @param retryTasks 待迁移数据 */ private void moveDeadLetters(String groupName, List retryTasks) { + if (CollectionUtils.isEmpty(retryTasks)) { + return; + } List retryDeadLetters = RetryDeadLetterConverter.INSTANCE.toRetryDeadLetter(retryTasks); diff --git a/pom.xml b/pom.xml index a8a04d11..7e4603fc 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 1.8 1.8 1.8 - 2.0.2 + 2.0.3-SNAPSHOT 1.0.0 5.4.2.Final 4.1.48.Final