From caaa5f9cc3175a40282aa78fc154bdf9fe804423 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Fri, 19 Apr 2024 18:30:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E4=BC=98=E5=8C=96=E9=87=8D?= =?UTF-8?q?=E8=AF=95=E5=91=8A=E8=AD=A6=E5=9C=BA=E6=99=AF=E7=B1=BB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/core/intercepter/SnailRetryInterceptor.java | 4 ++-- .../snailjob/client/core/report/ReportListener.java | 5 ++--- .../aizuda/snailjob/client/core/report/SyncReport.java | 5 ++--- .../client/core/strategy/AbstractRetryStrategies.java | 4 ++-- .../{NotifySceneEnum.java => RetryNotifySceneEnum.java} | 8 ++++---- .../com/aizuda/snailjob/server/model/dto/ConfigDTO.java | 4 ++-- .../snailjob/template/datasource/access/ConfigAccess.java | 6 +++--- .../datasource/access/config/AbstractConfigAccess.java | 4 ++-- .../listener/RetryTaskFailDeadLetterAlarmListener.java | 4 ++-- .../listener/RetryTaskFailMoreThresholdAlarmListener.java | 4 ++-- .../schedule/RetryErrorMoreThresholdAlarmSchedule.java | 4 ++-- .../schedule/RetryTaskMoreThresholdAlarmSchedule.java | 4 ++-- 12 files changed, 27 insertions(+), 29 deletions(-) rename snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/{NotifySceneEnum.java => RetryNotifySceneEnum.java} (82%) diff --git a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/intercepter/SnailRetryInterceptor.java b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/intercepter/SnailRetryInterceptor.java index fd7153da..2dd27db2 100644 --- a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/intercepter/SnailRetryInterceptor.java +++ b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/intercepter/SnailRetryInterceptor.java @@ -14,7 +14,7 @@ import com.aizuda.snailjob.common.core.alarm.Alarm; import com.aizuda.snailjob.common.core.alarm.AlarmContext; import com.aizuda.snailjob.common.core.alarm.SnailJobAlarmFactory; import com.aizuda.snailjob.common.core.context.SpringContext; -import com.aizuda.snailjob.common.core.enums.NotifySceneEnum; +import com.aizuda.snailjob.common.core.enums.RetryNotifySceneEnum; import com.aizuda.snailjob.common.core.enums.RetryResultStatusEnum; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.common.core.model.SnailJobHeaders; @@ -212,7 +212,7 @@ public class SnailRetryInterceptor implements MethodInterceptor, AfterAdvice, Se try { ConfigDTO.Notify notifyAttribute = GroupVersionCache.getNotifyAttribute( - NotifySceneEnum.CLIENT_COMPONENT_ERROR.getNotifyScene()); + RetryNotifySceneEnum.CLIENT_COMPONENT_ERROR.getNotifyScene()); if (Objects.nonNull(notifyAttribute)) { AlarmContext context = AlarmContext.build() .text(retryErrorMoreThresholdTextMessageFormatter, diff --git a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/ReportListener.java b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/ReportListener.java index 2a84e27e..bf45153b 100644 --- a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/ReportListener.java +++ b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/ReportListener.java @@ -11,7 +11,7 @@ import com.aizuda.snailjob.common.core.alarm.Alarm; import com.aizuda.snailjob.common.core.alarm.AlarmContext; import com.aizuda.snailjob.common.core.alarm.SnailJobAlarmFactory; import com.aizuda.snailjob.common.core.context.SpringContext; -import com.aizuda.snailjob.common.core.enums.NotifySceneEnum; +import com.aizuda.snailjob.common.core.enums.RetryNotifySceneEnum; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.common.core.model.NettyResult; import com.aizuda.snailjob.common.core.util.EnvironmentUtils; @@ -20,7 +20,6 @@ import com.aizuda.snailjob.common.core.util.JsonUtil; import com.aizuda.snailjob.common.core.window.Listener; import com.aizuda.snailjob.server.model.dto.ConfigDTO; import com.aizuda.snailjob.server.model.dto.RetryTaskDTO; -import com.aizuda.snailjob.client.common.rpc.client.RequestBuilder; import com.github.rholder.retry.*; import lombok.extern.slf4j.Slf4j; @@ -108,7 +107,7 @@ public class ReportListener implements Listener { private void sendMessage(Throwable e) { try { - ConfigDTO.Notify notifyAttribute = GroupVersionCache.getNotifyAttribute(NotifySceneEnum.CLIENT_REPORT_ERROR.getNotifyScene()); + ConfigDTO.Notify notifyAttribute = GroupVersionCache.getNotifyAttribute(RetryNotifySceneEnum.CLIENT_REPORT_ERROR.getNotifyScene()); if (Objects.isNull(notifyAttribute)) { return; } diff --git a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/SyncReport.java b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/SyncReport.java index 8a793102..1a9905f0 100644 --- a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/SyncReport.java +++ b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/report/SyncReport.java @@ -9,7 +9,7 @@ import com.aizuda.snailjob.common.core.alarm.Alarm; import com.aizuda.snailjob.common.core.alarm.AlarmContext; import com.aizuda.snailjob.common.core.alarm.SnailJobAlarmFactory; import com.aizuda.snailjob.common.core.context.SpringContext; -import com.aizuda.snailjob.common.core.enums.NotifySceneEnum; +import com.aizuda.snailjob.common.core.enums.RetryNotifySceneEnum; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.common.core.model.NettyResult; import com.aizuda.snailjob.common.core.util.EnvironmentUtils; @@ -17,7 +17,6 @@ import com.aizuda.snailjob.common.core.util.NetUtil; import com.aizuda.snailjob.common.core.util.JsonUtil; import com.aizuda.snailjob.server.model.dto.ConfigDTO; import com.aizuda.snailjob.server.model.dto.RetryTaskDTO; -import com.aizuda.snailjob.client.common.rpc.client.RequestBuilder; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -92,7 +91,7 @@ public class SyncReport extends AbstractReport { private void sendMessage(Throwable e) { try { - ConfigDTO.Notify notifyAttribute = GroupVersionCache.getNotifyAttribute(NotifySceneEnum.CLIENT_REPORT_ERROR.getNotifyScene()); + ConfigDTO.Notify notifyAttribute = GroupVersionCache.getNotifyAttribute(RetryNotifySceneEnum.CLIENT_REPORT_ERROR.getNotifyScene()); if (Objects.isNull(notifyAttribute)) { return; } diff --git a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/strategy/AbstractRetryStrategies.java b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/strategy/AbstractRetryStrategies.java index 3405bdee..1250c09f 100644 --- a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/strategy/AbstractRetryStrategies.java +++ b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/strategy/AbstractRetryStrategies.java @@ -14,7 +14,7 @@ import com.aizuda.snailjob.client.core.retryer.RetryerResultContext; import com.aizuda.snailjob.common.core.alarm.Alarm; import com.aizuda.snailjob.common.core.alarm.AlarmContext; import com.aizuda.snailjob.common.core.alarm.SnailJobAlarmFactory; -import com.aizuda.snailjob.common.core.enums.NotifySceneEnum; +import com.aizuda.snailjob.common.core.enums.RetryNotifySceneEnum; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.common.core.util.EnvironmentUtils; import com.aizuda.snailjob.common.core.util.NetUtil; @@ -175,7 +175,7 @@ public abstract class AbstractRetryStrategies implements RetryStrategy { private void sendMessage(Exception e) { try { - ConfigDTO.Notify notifyAttribute = GroupVersionCache.getNotifyAttribute(NotifySceneEnum.CLIENT_COMPONENT_ERROR.getNotifyScene()); + ConfigDTO.Notify notifyAttribute = GroupVersionCache.getNotifyAttribute(RetryNotifySceneEnum.CLIENT_COMPONENT_ERROR.getNotifyScene()); if (Objects.nonNull(notifyAttribute)) { AlarmContext context = AlarmContext.build() .text(retryErrorMoreThresholdTextMessageFormatter, diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/NotifySceneEnum.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryNotifySceneEnum.java similarity index 82% rename from snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/NotifySceneEnum.java rename to snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryNotifySceneEnum.java index 0dd94a38..a32b0477 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/NotifySceneEnum.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryNotifySceneEnum.java @@ -10,7 +10,7 @@ import lombok.Getter; * @since : 1.0.0 */ @Getter -public enum NotifySceneEnum { +public enum RetryNotifySceneEnum { MAX_RETRY(1, "场景重试数量超过阈值", NodeTypeEnum.SERVER), @@ -40,7 +40,7 @@ public enum NotifySceneEnum { */ private final String desc; - NotifySceneEnum(int notifyScene, String desc, NodeTypeEnum nodeType) { + RetryNotifySceneEnum(int notifyScene, String desc, NodeTypeEnum nodeType) { this.notifyScene = notifyScene; this.desc = desc; this.nodeType = nodeType; @@ -53,8 +53,8 @@ public enum NotifySceneEnum { * @param nodeType 触发通知节点类型 * @return this */ - public static NotifySceneEnum getNotifyScene(int notifyScene, NodeTypeEnum nodeType) { - for (NotifySceneEnum sceneEnum : NotifySceneEnum.values()) { + public static RetryNotifySceneEnum getNotifyScene(int notifyScene, NodeTypeEnum nodeType) { + for (RetryNotifySceneEnum sceneEnum : RetryNotifySceneEnum.values()) { if (sceneEnum.getNotifyScene() == notifyScene && sceneEnum.nodeType.getType().equals(nodeType.getType())) { return sceneEnum; } diff --git a/snail-job-common/snail-job-common-server-api/src/main/java/com/aizuda/snailjob/server/model/dto/ConfigDTO.java b/snail-job-common/snail-job-common-server-api/src/main/java/com/aizuda/snailjob/server/model/dto/ConfigDTO.java index 0ca41cc9..91cfbf70 100644 --- a/snail-job-common/snail-job-common-server-api/src/main/java/com/aizuda/snailjob/server/model/dto/ConfigDTO.java +++ b/snail-job-common/snail-job-common-server-api/src/main/java/com/aizuda/snailjob/server/model/dto/ConfigDTO.java @@ -2,7 +2,7 @@ package com.aizuda.snailjob.server.model.dto; import com.aizuda.snailjob.common.core.constant.SystemConstants; import com.aizuda.snailjob.common.core.enums.AlarmTypeEnum; -import com.aizuda.snailjob.common.core.enums.NotifySceneEnum; +import com.aizuda.snailjob.common.core.enums.RetryNotifySceneEnum; import lombok.Data; import java.util.List; import java.util.Set; @@ -69,7 +69,7 @@ public class ConfigDTO { private Integer notifyThreshold; /** - * 场景场景 {@link NotifySceneEnum} + * 场景场景 {@link RetryNotifySceneEnum} */ private Integer notifyScene; } diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/ConfigAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/ConfigAccess.java index 6ae60234..4f17297f 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/ConfigAccess.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/ConfigAccess.java @@ -1,6 +1,6 @@ package com.aizuda.snailjob.template.datasource.access; -import com.aizuda.snailjob.common.core.enums.NotifySceneEnum; +import com.aizuda.snailjob.common.core.enums.RetryNotifySceneEnum; import com.aizuda.snailjob.server.model.dto.ConfigDTO; import com.aizuda.snailjob.template.datasource.persistence.po.GroupConfig; import com.aizuda.snailjob.template.datasource.persistence.po.NotifyConfig; @@ -48,7 +48,7 @@ public interface ConfigAccess extends Access { * 获取通知配置 * * @param groupName 组名称 - * @param notifyScene {@link NotifySceneEnum} 场景类型 + * @param notifyScene {@link RetryNotifySceneEnum} 场景类型 * @return {@link NotifyConfig} 场景配置 */ List getNotifyConfigByGroupName(String groupName,Integer notifyScene, String namespaceId); @@ -59,7 +59,7 @@ public interface ConfigAccess extends Access { * * @param groupName 组名称 * @param groupName 场景名称 - * @param notifyScene {@link NotifySceneEnum} 场景类型 + * @param notifyScene {@link RetryNotifySceneEnum} 场景类型 * @return {@link NotifyConfig} 场景配置 */ @Deprecated diff --git a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/config/AbstractConfigAccess.java b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/config/AbstractConfigAccess.java index 38353dda..6c82cf2e 100644 --- a/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/config/AbstractConfigAccess.java +++ b/snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/access/config/AbstractConfigAccess.java @@ -1,7 +1,7 @@ package com.aizuda.snailjob.template.datasource.access.config; import com.aizuda.snailjob.common.core.enums.NodeTypeEnum; -import com.aizuda.snailjob.common.core.enums.NotifySceneEnum; +import com.aizuda.snailjob.common.core.enums.RetryNotifySceneEnum; import com.aizuda.snailjob.server.model.dto.ConfigDTO; import com.aizuda.snailjob.template.datasource.access.ConfigAccess; import com.aizuda.snailjob.template.datasource.enums.DbTypeEnum; @@ -200,7 +200,7 @@ public abstract class AbstractConfigAccess implements ConfigAccess { for (NotifyConfig notifyConfig : notifyList) { // 只选择客户端的通知配置即可 - NotifySceneEnum notifyScene = NotifySceneEnum.getNotifyScene(notifyConfig.getNotifyScene(), + RetryNotifySceneEnum notifyScene = RetryNotifySceneEnum.getNotifyScene(notifyConfig.getNotifyScene(), NodeTypeEnum.CLIENT); if (Objects.isNull(notifyScene)) { continue; diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java index fe1eeff4..462282e7 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java @@ -1,7 +1,7 @@ package com.aizuda.snailjob.server.retry.task.support.listener; import com.aizuda.snailjob.common.core.alarm.AlarmContext; -import com.aizuda.snailjob.common.core.enums.NotifySceneEnum; +import com.aizuda.snailjob.common.core.enums.RetryNotifySceneEnum; import com.aizuda.snailjob.common.log.SnailJobLog; import com.aizuda.snailjob.common.core.util.EnvironmentUtils; import com.aizuda.snailjob.server.common.AlarmInfoConverter; @@ -94,6 +94,6 @@ public class RetryTaskFailDeadLetterAlarmListener extends AbstractRetryAlarm notifyConfigs = accessTemplate.getNotifyConfigAccess() .listPage(new PageDTO<>(startId, 1000), new LambdaQueryWrapper() .eq(NotifyConfig::getNotifyStatus, StatusEnum.YES.getStatus()) - .eq(NotifyConfig::getNotifyScene, NotifySceneEnum.MAX_RETRY_ERROR.getNotifyScene())) + .eq(NotifyConfig::getNotifyScene, RetryNotifySceneEnum.MAX_RETRY_ERROR.getNotifyScene())) .getRecords(); return RetryTaskConverter.INSTANCE.toNotifyConfigPartitionTask(notifyConfigs); diff --git a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryTaskMoreThresholdAlarmSchedule.java b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryTaskMoreThresholdAlarmSchedule.java index 89dab929..e4a6eca0 100644 --- a/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryTaskMoreThresholdAlarmSchedule.java +++ b/snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/schedule/RetryTaskMoreThresholdAlarmSchedule.java @@ -3,7 +3,7 @@ package com.aizuda.snailjob.server.retry.task.support.schedule; import com.aizuda.snailjob.common.core.alarm.Alarm; import com.aizuda.snailjob.common.core.alarm.AlarmContext; import com.aizuda.snailjob.common.core.alarm.SnailJobAlarmFactory; -import com.aizuda.snailjob.common.core.enums.NotifySceneEnum; +import com.aizuda.snailjob.common.core.enums.RetryNotifySceneEnum; import com.aizuda.snailjob.common.core.enums.RetryStatusEnum; import com.aizuda.snailjob.common.core.enums.StatusEnum; import com.aizuda.snailjob.common.log.SnailJobLog; @@ -105,7 +105,7 @@ public class RetryTaskMoreThresholdAlarmSchedule extends AbstractSchedule implem List notifyConfigs = accessTemplate.getNotifyConfigAccess() .listPage(new PageDTO<>(startId, 1000), new LambdaQueryWrapper() .eq(NotifyConfig::getNotifyStatus, StatusEnum.YES.getStatus()) - .eq(NotifyConfig::getNotifyScene, NotifySceneEnum.MAX_RETRY.getNotifyScene()) + .eq(NotifyConfig::getNotifyScene, RetryNotifySceneEnum.MAX_RETRY.getNotifyScene()) .orderByDesc(NotifyConfig::getId)) // SQLServer 分页必须 ORDER BY .getRecords();