From 7c6eb9ebdffb7960ad83a90f92217ea3b10fe94b Mon Sep 17 00:00:00 2001 From: "www.byteblogs.com" <598092184@qq.com> Date: Mon, 5 Jun 2023 23:49:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=201.5.0=201.=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E6=98=BE=E7=A4=BA=202.=20=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=203.=20=E8=BF=81=E7=A7=BB=E4=BA=86=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=9E=9A=E4=B8=BE=E5=88=B0=E6=9C=8D=E5=8A=A1=E7=AB=AF?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/enums/StorageTypeEnum.java | 24 --------- .../enums/AllocationAlgorithmEnum.java | 2 +- .../retry/server}/enums/DelayLevelEnum.java | 3 +- .../retry/server}/enums/IdGeneratorMode.java | 2 +- .../easy/retry/server}/enums/StatusEnum.java | 2 +- .../access/config/MybatisConfigAccess.java | 2 +- .../access/retry/MybatisRetryTaskAccess.java | 2 +- .../ReportRetryInfoHttpRequestHandler.java | 2 +- .../service/impl/GroupConfigServiceImpl.java | 2 +- .../server/service/impl/RetryServiceImpl.java | 6 +-- .../service/impl/RetryTaskLogServiceImpl.java | 2 +- .../service/impl/RetryTaskServiceImpl.java | 3 +- .../ClientLoadBalanceConsistentHash.java | 2 +- .../client/ClientLoadBalanceRandom.java | 2 +- .../server/support/dispatch/ScanTaskDTO.java | 3 ++ .../actor/exec/ExecCallbackUnitActor.java | 4 +- .../dispatch/actor/result/FailureActor.java | 2 +- .../dispatch/actor/result/FinishActor.java | 2 +- .../generator/id/SegmentIdGenerator.java | 2 +- .../generator/id/SnowflakeIdGenerator.java | 2 +- .../support/strategy/StopStrategies.java | 2 +- .../support/strategy/WaitStrategies.java | 2 +- .../model/request/BatchDeleteRetryTaskVO.java | 1 - .../model/request/GroupConfigRequestVO.java | 2 +- .../response/RetryDeadLetterResponseVO.java | 2 + .../response/RetryTaskLogResponseVO.java | 2 + .../model/response/RetryTaskResponseVO.java | 2 + example/src/main/resources/application.yml | 2 +- .../src/views/task/RetryDeadLetterList.vue | 21 ++++++++ frontend/src/views/task/RetryLogInfo.vue | 8 +-- frontend/src/views/task/RetryLogList.vue | 53 ++++++++++++++----- frontend/src/views/task/RetryTaskInfo.vue | 30 ++++++++--- frontend/src/views/task/RetryTaskList.vue | 48 +++++++++++++++-- 33 files changed, 166 insertions(+), 80 deletions(-) delete mode 100644 easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/StorageTypeEnum.java rename {easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core => easy-retry-server/src/main/java/com/aizuda/easy/retry/server}/enums/AllocationAlgorithmEnum.java (85%) rename {easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core => easy-retry-server/src/main/java/com/aizuda/easy/retry/server}/enums/DelayLevelEnum.java (93%) rename {easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core => easy-retry-server/src/main/java/com/aizuda/easy/retry/server}/enums/IdGeneratorMode.java (92%) rename {easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core => easy-retry-server/src/main/java/com/aizuda/easy/retry/server}/enums/StatusEnum.java (84%) diff --git a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/StorageTypeEnum.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/StorageTypeEnum.java deleted file mode 100644 index e56e5597..00000000 --- a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/StorageTypeEnum.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.aizuda.easy.retry.common.core.enums; - -import lombok.Getter; - -/** - * 存储类型 - * - * @author: www.byteblogs.com - * @date : 2021-11-26 18:01 - */ -@Getter -public enum StorageTypeEnum { - - MYSQL(1), - REDIS(2); - - private final Integer type; - - StorageTypeEnum(int type) { - this.type = type; - } - - -} diff --git a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/AllocationAlgorithmEnum.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/enums/AllocationAlgorithmEnum.java similarity index 85% rename from easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/AllocationAlgorithmEnum.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/enums/AllocationAlgorithmEnum.java index 7b71137b..76e57117 100644 --- a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/AllocationAlgorithmEnum.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/enums/AllocationAlgorithmEnum.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.common.core.enums; +package com.aizuda.easy.retry.server.enums; import lombok.Getter; diff --git a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/DelayLevelEnum.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/enums/DelayLevelEnum.java similarity index 93% rename from easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/DelayLevelEnum.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/enums/DelayLevelEnum.java index 4b81ec1f..e6347458 100644 --- a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/DelayLevelEnum.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/enums/DelayLevelEnum.java @@ -1,6 +1,5 @@ -package com.aizuda.easy.retry.common.core.enums; +package com.aizuda.easy.retry.server.enums; -import com.aizuda.easy.retry.common.core.exception.EasyRetryCommonException; import lombok.Getter; import java.time.temporal.ChronoUnit; diff --git a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/IdGeneratorMode.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/enums/IdGeneratorMode.java similarity index 92% rename from easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/IdGeneratorMode.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/enums/IdGeneratorMode.java index 983f00b1..e3f3188a 100644 --- a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/IdGeneratorMode.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/enums/IdGeneratorMode.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.common.core.enums; +package com.aizuda.easy.retry.server.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/StatusEnum.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/enums/StatusEnum.java similarity index 84% rename from easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/StatusEnum.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/enums/StatusEnum.java index 9ff43d58..79dd7c56 100644 --- a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/StatusEnum.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/enums/StatusEnum.java @@ -1,4 +1,4 @@ -package com.aizuda.easy.retry.common.core.enums; +package com.aizuda.easy.retry.server.enums; import lombok.Getter; diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/config/MybatisConfigAccess.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/config/MybatisConfigAccess.java index 1b63b8d9..82f09136 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/config/MybatisConfigAccess.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/config/MybatisConfigAccess.java @@ -4,7 +4,7 @@ import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; import com.aizuda.easy.retry.server.persistence.mybatis.po.NotifyConfig; import com.aizuda.easy.retry.server.persistence.mybatis.po.SceneConfig; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.aizuda.easy.retry.common.core.enums.StatusEnum; +import com.aizuda.easy.retry.server.enums.StatusEnum; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/retry/MybatisRetryTaskAccess.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/retry/MybatisRetryTaskAccess.java index edbf17f4..dd860548 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/retry/MybatisRetryTaskAccess.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/retry/MybatisRetryTaskAccess.java @@ -1,9 +1,9 @@ package com.aizuda.easy.retry.server.persistence.support.access.retry; import cn.hutool.core.lang.Assert; +import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; import com.aizuda.easy.retry.common.core.util.JsonUtil; import com.aizuda.easy.retry.server.exception.EasyRetryServerException; import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryTaskMapper; diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/ReportRetryInfoHttpRequestHandler.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/ReportRetryInfoHttpRequestHandler.java index 0fc0f06f..3b1aada7 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/ReportRetryInfoHttpRequestHandler.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/ReportRetryInfoHttpRequestHandler.java @@ -3,7 +3,7 @@ package com.aizuda.easy.retry.server.server.handler; import cn.hutool.core.net.url.UrlQuery; import com.aizuda.easy.retry.server.model.dto.RetryTaskDTO; import com.aizuda.easy.retry.server.service.RetryService; -import com.aizuda.easy.retry.common.core.enums.StatusEnum; +import com.aizuda.easy.retry.server.enums.StatusEnum; import com.aizuda.easy.retry.common.core.log.LogUtils; import com.aizuda.easy.retry.common.core.model.NettyResult; import com.aizuda.easy.retry.common.core.model.EasyRetryRequest; diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/GroupConfigServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/GroupConfigServiceImpl.java index 651376a6..611be062 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/GroupConfigServiceImpl.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/GroupConfigServiceImpl.java @@ -2,7 +2,7 @@ package com.aizuda.easy.retry.server.service.impl; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.HashUtil; -import com.aizuda.easy.retry.common.core.enums.IdGeneratorMode; +import com.aizuda.easy.retry.server.enums.IdGeneratorMode; import com.aizuda.easy.retry.server.exception.EasyRetryServerException; import com.aizuda.easy.retry.server.persistence.mybatis.mapper.GroupConfigMapper; import com.aizuda.easy.retry.server.persistence.mybatis.mapper.NotifyConfigMapper; 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 4c4aaf25..36759162 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 @@ -1,8 +1,8 @@ package com.aizuda.easy.retry.server.service.impl; import cn.hutool.core.lang.Assert; -import com.aizuda.easy.retry.common.core.enums.DelayLevelEnum; -import com.aizuda.easy.retry.common.core.enums.StatusEnum; +import com.aizuda.easy.retry.server.enums.DelayLevelEnum; +import com.aizuda.easy.retry.server.enums.StatusEnum; import com.aizuda.easy.retry.common.core.log.LogUtils; import com.aizuda.easy.retry.server.exception.EasyRetryServerException; import com.aizuda.easy.retry.server.model.dto.RetryTaskDTO; @@ -119,7 +119,7 @@ public class RetryServiceImpl implements RetryService { * 若配置了默认初始化场景配置，则发现上报数据的时候未配置场景，默认生成一个场景 * backOff(退避策略): 等级策略 * maxRetryCount(最大重试次数): 26 - * triggerInterval(间隔时间): see: {@link com.aizuda.easy.retry.common.core.enums.DelayLevelEnum} + * triggerInterval(间隔时间): see: {@link DelayLevelEnum} * * @param retryTaskDTO 重试上报DTO */ diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryTaskLogServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryTaskLogServiceImpl.java index d396a5ca..5b67626d 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryTaskLogServiceImpl.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryTaskLogServiceImpl.java @@ -49,7 +49,7 @@ public class RetryTaskLogServiceImpl implements RetryTaskLogService { retryTaskLogLambdaQueryWrapper.select(RetryTaskLog::getGroupName, RetryTaskLog::getId, RetryTaskLog::getSceneName, RetryTaskLog::getIdempotentId, RetryTaskLog::getBizNo, RetryTaskLog::getErrorMessage, RetryTaskLog::getRetryStatus, - RetryTaskLog::getCreateDt, RetryTaskLog::getUniqueId); + RetryTaskLog::getCreateDt, RetryTaskLog::getUniqueId, RetryTaskLog::getTaskType); PageDTO retryTaskLogPageDTO = retryTaskLogMapper.selectPage(pageDTO, retryTaskLogLambdaQueryWrapper.orderByDesc(RetryTaskLog::getCreateDt)); return new PageResult<>( diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryTaskServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryTaskServiceImpl.java index 30ba6e36..0ef1a41d 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryTaskServiceImpl.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryTaskServiceImpl.java @@ -9,6 +9,7 @@ import com.aizuda.easy.retry.server.exception.EasyRetryServerException; import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryTaskMapper; import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTaskLog; import com.aizuda.easy.retry.server.persistence.mybatis.po.ServerNode; import com.aizuda.easy.retry.server.persistence.support.ConfigAccess; import com.aizuda.easy.retry.server.service.RetryTaskService; @@ -98,7 +99,7 @@ public class RetryTaskServiceImpl implements RetryTaskService { retryTaskLambdaQueryWrapper.select(RetryTask::getId, RetryTask::getBizNo, RetryTask::getIdempotentId, RetryTask::getGroupName, RetryTask::getNextTriggerAt, RetryTask::getRetryCount, - RetryTask::getRetryStatus, RetryTask::getUpdateDt, RetryTask::getSceneName, RetryTask::getUniqueId); + RetryTask::getRetryStatus, RetryTask::getUpdateDt, RetryTask::getSceneName, RetryTask::getUniqueId, RetryTask::getTaskType); pageDTO = retryTaskMapper.selectPage(pageDTO, retryTaskLambdaQueryWrapper.orderByDesc(RetryTask::getCreateDt)); return new PageResult<>(pageDTO, RetryTaskResponseVOConverter.INSTANCE.toRetryTaskResponseVO(pageDTO.getRecords())); } diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceConsistentHash.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceConsistentHash.java index 0da4bf0d..ab3201a9 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceConsistentHash.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceConsistentHash.java @@ -2,7 +2,7 @@ package com.aizuda.easy.retry.server.support.allocate.client; import com.aizuda.easy.retry.server.support.allocate.common.ConsistentHashRouter; import com.aizuda.easy.retry.server.support.allocate.common.Node; -import com.aizuda.easy.retry.common.core.enums.AllocationAlgorithmEnum; +import com.aizuda.easy.retry.server.enums.AllocationAlgorithmEnum; import com.aizuda.easy.retry.server.support.ClientLoadBalance; import java.util.ArrayList; diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceRandom.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceRandom.java index 8b2f12a6..8308eb22 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceRandom.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceRandom.java @@ -1,6 +1,6 @@ package com.aizuda.easy.retry.server.support.allocate.client; -import com.aizuda.easy.retry.common.core.enums.AllocationAlgorithmEnum; +import com.aizuda.easy.retry.server.enums.AllocationAlgorithmEnum; import com.aizuda.easy.retry.server.support.ClientLoadBalance; import org.springframework.stereotype.Component; diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/ScanTaskDTO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/ScanTaskDTO.java index e351d4dc..76aa8721 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/ScanTaskDTO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/ScanTaskDTO.java @@ -3,8 +3,11 @@ package com.aizuda.easy.retry.server.support.dispatch; import lombok.Data; /** + * 扫描任务模型 + * * @author: ww.byteblogs.com * @date : 2023-06-05 16:30 + * @since 1.5.0 */ @Data public class ScanTaskDTO { diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecCallbackUnitActor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecCallbackUnitActor.java index 1c5c49b8..8f760005 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecCallbackUnitActor.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecCallbackUnitActor.java @@ -2,11 +2,10 @@ package com.aizuda.easy.retry.server.support.dispatch.actor.exec; import akka.actor.AbstractActor; import cn.hutool.core.lang.Assert; -import com.aizuda.easy.retry.client.model.DispatchRetryDTO; import com.aizuda.easy.retry.client.model.DispatchRetryResultDTO; import com.aizuda.easy.retry.client.model.RetryCallbackDTO; import com.aizuda.easy.retry.common.core.constant.SystemConstants; -import com.aizuda.easy.retry.common.core.enums.StatusEnum; +import com.aizuda.easy.retry.server.enums.StatusEnum; import com.aizuda.easy.retry.common.core.log.LogUtils; import com.aizuda.easy.retry.common.core.model.EasyRetryHeaders; import com.aizuda.easy.retry.common.core.model.Result; @@ -19,7 +18,6 @@ import com.aizuda.easy.retry.server.persistence.mybatis.po.ServerNode; import com.aizuda.easy.retry.server.service.convert.RetryTaskLogConverter; import com.aizuda.easy.retry.server.support.IdempotentStrategy; import com.aizuda.easy.retry.server.support.context.CallbackRetryContext; -import com.aizuda.easy.retry.server.support.context.MaxAttemptsPersistenceRetryContext; import com.aizuda.easy.retry.server.support.retry.RetryExecutor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/FailureActor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/FailureActor.java index c0b56ef1..c6f3cab5 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/FailureActor.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/FailureActor.java @@ -3,11 +3,11 @@ package com.aizuda.easy.retry.server.support.dispatch.actor.result; import akka.actor.AbstractActor; import cn.hutool.core.lang.Assert; import com.aizuda.easy.retry.common.core.constant.SystemConstants; +import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; import com.aizuda.easy.retry.server.enums.TaskTypeEnum; import com.aizuda.easy.retry.server.support.handler.CallbackRetryTaskHandler; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; import com.aizuda.easy.retry.common.core.log.LogUtils; import com.aizuda.easy.retry.server.exception.EasyRetryServerException; import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryTaskLogMapper; diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/FinishActor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/FinishActor.java index f57bbd56..e30ff562 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/FinishActor.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/FinishActor.java @@ -2,11 +2,11 @@ package com.aizuda.easy.retry.server.support.dispatch.actor.result; import akka.actor.AbstractActor; import cn.hutool.core.lang.Assert; +import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; import com.aizuda.easy.retry.server.enums.TaskTypeEnum; import com.aizuda.easy.retry.server.support.handler.CallbackRetryTaskHandler; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; import com.aizuda.easy.retry.common.core.log.LogUtils; import com.aizuda.easy.retry.server.exception.EasyRetryServerException; import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryTaskLogMapper; diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/generator/id/SegmentIdGenerator.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/generator/id/SegmentIdGenerator.java index 10a83a26..edbb1110 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/generator/id/SegmentIdGenerator.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/generator/id/SegmentIdGenerator.java @@ -1,6 +1,6 @@ package com.aizuda.easy.retry.server.support.generator.id; -import com.aizuda.easy.retry.common.core.enums.IdGeneratorMode; +import com.aizuda.easy.retry.server.enums.IdGeneratorMode; import com.aizuda.easy.retry.common.core.log.LogUtils; import com.aizuda.easy.retry.server.persistence.mybatis.mapper.SequenceAllocMapper; import com.aizuda.easy.retry.server.persistence.mybatis.po.SequenceAlloc; diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/generator/id/SnowflakeIdGenerator.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/generator/id/SnowflakeIdGenerator.java index ec94a220..2b02c73f 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/generator/id/SnowflakeIdGenerator.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/generator/id/SnowflakeIdGenerator.java @@ -2,7 +2,7 @@ package com.aizuda.easy.retry.server.support.generator.id; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.IdUtil; -import com.aizuda.easy.retry.common.core.enums.IdGeneratorMode; +import com.aizuda.easy.retry.server.enums.IdGeneratorMode; import com.aizuda.easy.retry.server.support.generator.IdGenerator; import org.springframework.stereotype.Component; diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/StopStrategies.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/StopStrategies.java index 3226bcb9..01ab08a0 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/StopStrategies.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/StopStrategies.java @@ -2,7 +2,7 @@ package com.aizuda.easy.retry.server.support.strategy; import com.aizuda.easy.retry.client.model.DispatchRetryResultDTO; import com.aizuda.easy.retry.common.core.enums.RetryResultStatusEnum; -import com.aizuda.easy.retry.common.core.enums.StatusEnum; +import com.aizuda.easy.retry.server.enums.StatusEnum; import com.aizuda.easy.retry.common.core.model.Result; import com.aizuda.easy.retry.server.support.RetryContext; import com.aizuda.easy.retry.server.support.StopStrategy; diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/WaitStrategies.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/WaitStrategies.java index e1e86d24..87ff28d4 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/WaitStrategies.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/WaitStrategies.java @@ -7,7 +7,7 @@ import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; import com.aizuda.easy.retry.server.persistence.mybatis.po.SceneConfig; import com.aizuda.easy.retry.server.persistence.support.ConfigAccess; import com.aizuda.easy.retry.common.core.context.SpringContext; -import com.aizuda.easy.retry.common.core.enums.DelayLevelEnum; +import com.aizuda.easy.retry.server.enums.DelayLevelEnum; import com.aizuda.easy.retry.common.core.util.CronExpression; import com.google.common.base.Preconditions; import com.aizuda.easy.retry.server.support.RetryContext; diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/BatchDeleteRetryTaskVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/BatchDeleteRetryTaskVO.java index aa2a46cd..fc427caa 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/BatchDeleteRetryTaskVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/BatchDeleteRetryTaskVO.java @@ -1,6 +1,5 @@ package com.aizuda.easy.retry.server.web.model.request; -import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; import lombok.Data; import org.hibernate.validator.constraints.NotBlank; import org.hibernate.validator.constraints.NotEmpty; diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/GroupConfigRequestVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/GroupConfigRequestVO.java index b5b22bf4..359aed4c 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/GroupConfigRequestVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/GroupConfigRequestVO.java @@ -1,6 +1,6 @@ package com.aizuda.easy.retry.server.web.model.request; -import com.aizuda.easy.retry.common.core.enums.IdGeneratorMode; +import com.aizuda.easy.retry.server.enums.IdGeneratorMode; import lombok.Data; import org.hibernate.validator.constraints.NotBlank; diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryDeadLetterResponseVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryDeadLetterResponseVO.java index c9a6ac0f..514ba907 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryDeadLetterResponseVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryDeadLetterResponseVO.java @@ -27,6 +27,8 @@ public class RetryDeadLetterResponseVO { private String extAttrs; + private Integer taskType; + private LocalDateTime createDt; } diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryTaskLogResponseVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryTaskLogResponseVO.java index a11cf644..baa5ed0b 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryTaskLogResponseVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryTaskLogResponseVO.java @@ -33,6 +33,8 @@ public class RetryTaskLogResponseVO { private Integer retryStatus; + private Integer taskType; + private String errorMessage; private LocalDateTime createDt; diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryTaskResponseVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryTaskResponseVO.java index 7d72fac2..e41f0a76 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryTaskResponseVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryTaskResponseVO.java @@ -36,6 +36,8 @@ public class RetryTaskResponseVO { private Integer retryStatus; + private Integer taskType; + private LocalDateTime createDt; private LocalDateTime updateDt; diff --git a/example/src/main/resources/application.yml b/example/src/main/resources/application.yml index 69b5496b..8e42e92b 100644 --- a/example/src/main/resources/application.yml +++ b/example/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8089 + port: 8088 spring: profiles: active: dev diff --git a/frontend/src/views/task/RetryDeadLetterList.vue b/frontend/src/views/task/RetryDeadLetterList.vue index 9d2c02b3..b73c4a83 100644 --- a/frontend/src/views/task/RetryDeadLetterList.vue +++ b/frontend/src/views/task/RetryDeadLetterList.vue @@ -56,6 +56,11 @@ {{ record.id }} + + + {{ taskType[text].name }} + +