From ca73d5f923bcf849ebe4fab5bb035f57c3451148 Mon Sep 17 00:00:00 2001 From: dhb52 Date: Sun, 16 Jun 2024 18:07:21 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sj=5F1.1.0-beta1):=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8SystemConstants=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=B8=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/core/intercepter/SnailRetryInterceptor.java | 6 ++++-- .../aizuda/snailjob/client/core/report/ReportListener.java | 6 ++++-- .../com/aizuda/snailjob/client/core/report/SyncReport.java | 6 ++++-- .../client/core/strategy/AbstractRetryStrategies.java | 6 ++++-- .../com/aizuda/snailjob/common/core/util/JsonUtil.java | 7 ++++--- .../com/aizuda/snailjob/server/common/util/DateUtils.java | 7 +++++-- 6 files changed, 25 insertions(+), 13 deletions(-) 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 c97c5f849..f20285d42 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 @@ -30,7 +30,6 @@ import org.aopalliance.intercept.MethodInvocation; import org.springframework.aop.AfterAdvice; import org.springframework.core.Ordered; import org.springframework.core.annotation.AnnotatedElementUtils; -import org.springframework.core.env.StandardEnvironment; import java.io.Serializable; import java.lang.reflect.Method; @@ -38,6 +37,8 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.*; +import static com.aizuda.snailjob.common.core.constant.SystemConstants.YYYY_MM_DD_HH_MM_SS; + /** * @author opensnail * @date 2023-08-23 @@ -45,7 +46,7 @@ import java.util.*; @Slf4j public class SnailRetryInterceptor implements MethodInterceptor, AfterAdvice, Serializable, Ordered { - private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM_SS); private static final String retryErrorMoreThresholdTextMessageFormatter = "{}环境 重试组件异常 \n" + "> IP:{} \n" + @@ -56,6 +57,7 @@ public class SnailRetryInterceptor implements MethodInterceptor, AfterAdvice, Se private final RetryStrategy retryStrategy; private final int order; + public SnailRetryInterceptor(int order, RetryStrategy localRetryStrategies) { this.order = order; this.retryStrategy = localRetryStrategies; 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 a447163ea..8658957e1 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 @@ -32,6 +32,8 @@ import java.util.Objects; import java.util.Optional; import java.util.concurrent.TimeUnit; +import static com.aizuda.snailjob.common.core.constant.SystemConstants.YYYY_MM_DD_HH_MM_SS; + /** * 批量异步上报 * @@ -41,8 +43,8 @@ import java.util.concurrent.TimeUnit; */ @Slf4j public class ReportListener implements Listener { - private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - private static String reportErrorTextMessageFormatter = + private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM_SS); + private static final String reportErrorTextMessageFormatter = "{}环境 异步批量上报异常 \n" + "> IP:{} \n" + "> 空间ID:{} \n" + 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 0a9333415..a9a6c7f38 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 @@ -29,6 +29,8 @@ import java.util.Objects; import java.util.Optional; import java.util.concurrent.TimeUnit; +import static com.aizuda.snailjob.common.core.constant.SystemConstants.YYYY_MM_DD_HH_MM_SS; + /** * 同步上报数据 * @@ -40,9 +42,9 @@ import java.util.concurrent.TimeUnit; @Slf4j public class SyncReport extends AbstractReport { - private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM_SS); - private static String reportErrorTextMessageFormatter = + private static final String reportErrorTextMessageFormatter = "{}环境 同步上报异常 \n" + "> IP:{} \n" + "> 空间ID:{} \n" + 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 3d8fb946c..88deb43a5 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 @@ -34,14 +34,16 @@ import java.util.Optional; import java.util.concurrent.Callable; import java.util.function.Consumer; +import static com.aizuda.snailjob.common.core.constant.SystemConstants.YYYY_MM_DD_HH_MM_SS; + /** * @author: opensnail * @date : 2022-03-04 14:40 */ @Slf4j public abstract class AbstractRetryStrategies implements RetryStrategy { - private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - private static String TEXT_MESSAGE_FORMATTER = + private static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM_SS); + private static final String TEXT_MESSAGE_FORMATTER = "{}环境 重试组件异常 \n" + "> IP:{} \n" + "> 空间ID:{} \n" + diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/JsonUtil.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/JsonUtil.java index 80911376d..6332bcdb2 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/JsonUtil.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/JsonUtil.java @@ -18,6 +18,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import static com.aizuda.snailjob.common.core.constant.SystemConstants.YYYY_MM_DD; +import static com.aizuda.snailjob.common.core.constant.SystemConstants.YYYY_MM_DD_HH_MM_SS; + /** * @author: byteblogs * @date: 2019/8/3 14:57 @@ -124,10 +127,8 @@ public class JsonUtil { * 内部类，处理Json */ public static class JsonMapper { - private final static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; - private final static String YYYY_MM_DD = "yyyy-MM-dd"; - private static ObjectMapper objectMapper = jacksonObjectMapper(); + private static final ObjectMapper objectMapper = jacksonObjectMapper(); public static ObjectMapper jacksonObjectMapper() { diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/util/DateUtils.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/util/DateUtils.java index 3c74217d9..fddbfe181 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/util/DateUtils.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/util/DateUtils.java @@ -6,6 +6,9 @@ import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.util.Date; +import static com.aizuda.snailjob.common.core.constant.SystemConstants.YYYYMMDDHHMMSS; +import static com.aizuda.snailjob.common.core.constant.SystemConstants.YYYY_MM_DD_HH_MM_SS; + /** * @author opensnail * @date 2023-11-02 23:42:53 @@ -13,9 +16,9 @@ import java.util.Date; */ public class DateUtils { - public static final DateTimeFormatter NORM_DATETIME_PATTERN = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + public static final DateTimeFormatter NORM_DATETIME_PATTERN = DateTimeFormatter.ofPattern(YYYY_MM_DD_HH_MM_SS); - public static final DateTimeFormatter PURE_DATETIME_MS_PATTERN = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"); + public static final DateTimeFormatter PURE_DATETIME_MS_PATTERN = DateTimeFormatter.ofPattern(YYYYMMDDHHMMSS); private static final ZoneOffset zoneOffset = ZoneOffset.of("+8");