From abc9d83b9e0a4e2458ca61e5d4cad37a6d53254f Mon Sep 17 00:00:00 2001 From: dhb52 Date: Fri, 9 Aug 2024 23:49:51 +0800 Subject: [PATCH] feat(sj_1.2.0-beta1): client-jdk8 --- pom.xml | 32 +++++++++++++++---- snail-job-client-starter/pom.xml | 2 +- snail-job-client/pom.xml | 4 +-- .../snail-job-client-common/pom.xml | 4 +-- .../snail-job-client-job-core/pom.xml | 4 +-- .../executor/JobExecutorFutureCallback.java | 15 ++++----- .../snail-job-client-retry-core/pom.xml | 2 +- .../intercepter/SnailRetryHeaderAspect.java | 3 +- snail-job-common/pom.xml | 6 ++-- .../snail-job-common-client-api/pom.xml | 6 ++-- .../snail-job-common-core/pom.xml | 10 ++++-- .../common/core/alarm/email/Mail.java | 2 +- .../common/core/alarm/email/MailAccount.java | 4 +-- .../core/alarm/email/MailException.java | 4 +-- .../common/core/constant/SystemConstants.java | 17 +++++----- .../common/core/enums/RetryStatusEnum.java | 3 +- .../core/handler/RestExceptionHandler.java | 27 +++++++++------- snail-job-common/snail-job-common-log/pom.xml | 6 ++-- .../common/log/dialect/jdk/JdkLog.java | 4 +-- .../common/log/dialect/log4j2/Log4j2Log.java | 4 +-- .../common/log/lang/StackTraceCaller.java | 4 +-- .../common/log/lang/StackWalkerCaller.java | 23 ++++++------- .../snail-job-common-server-api/pom.xml | 6 ++-- 23 files changed, 109 insertions(+), 83 deletions(-) diff --git a/pom.xml b/pom.xml index 57cd84b9e..817c6461b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.2 + 2.7.18 @@ -18,10 +18,10 @@ snail-job - 17 - 17 - 17 - 1.1.0 + 1.8 + 1.8 + 1.8 + 1.1.0-jdk8 4.1.94.Final 5.8.25 3.5.7 @@ -32,14 +32,17 @@ 1.2.17 1.2 3.0.2 + 2.1.3 + 2.0.3 + 2.1.3 32.0.0-jre snail-job-common - snail-job-server + snail-job-client-starter - snail-job-datasource + snail-job-client @@ -150,6 +153,21 @@ jakarta.validation-api ${jakarta-validation.version} + + jakarta.mail + jakarta.mail-api + ${jakarta-mail-api.version} + + + org.eclipse.angus + jakarta.mail + ${jakarta-mail.version} + + + jakarta.activation + jakarta.activation-api + ${jakarta-activation-api.version} + com.github.rholder guava-retrying diff --git a/snail-job-client-starter/pom.xml b/snail-job-client-starter/pom.xml index 84ec1b5dd..bc127154d 100644 --- a/snail-job-client-starter/pom.xml +++ b/snail-job-client-starter/pom.xml @@ -14,7 +14,7 @@ snail-job-client-starter - 17 + 1.8 diff --git a/snail-job-client/pom.xml b/snail-job-client/pom.xml index 1271700cc..1005d731a 100644 --- a/snail-job-client/pom.xml +++ b/snail-job-client/pom.xml @@ -22,8 +22,8 @@ - 17 - 17 + 1.8 + 1.8 UTF-8 diff --git a/snail-job-client/snail-job-client-common/pom.xml b/snail-job-client/snail-job-client-common/pom.xml index 76d4a030e..462d33059 100644 --- a/snail-job-client/snail-job-client-common/pom.xml +++ b/snail-job-client/snail-job-client-common/pom.xml @@ -15,8 +15,8 @@ snail-job-client-common - 17 - 17 + 1.8 + 1.8 UTF-8 diff --git a/snail-job-client/snail-job-client-job-core/pom.xml b/snail-job-client/snail-job-client-job-core/pom.xml index 520344c20..2a6f8ab86 100644 --- a/snail-job-client/snail-job-client-job-core/pom.xml +++ b/snail-job-client/snail-job-client-job-core/pom.xml @@ -15,8 +15,8 @@ snail-job-client-job-core - 17 - 17 + 1.8 + 1.8 UTF-8 diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/JobExecutorFutureCallback.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/JobExecutorFutureCallback.java index 286cbc553..0b7334bf8 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/JobExecutorFutureCallback.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/JobExecutorFutureCallback.java @@ -45,14 +45,13 @@ import java.util.concurrent.CancellationException; @Slf4j public class JobExecutorFutureCallback implements FutureCallback { - private static final String TEXT_MESSAGE_FORMATTER = """ - {}环境 定时任务上报异常 \s - > IP:{} \s - > 空间ID:{} \s - > 名称:{} \s - > 时间:{} \s - > 异常:{} \s - \s"""; + private static final String TEXT_MESSAGE_FORMATTER = + "{}环境 定时任务上报异常 \n" + + " > IP:{} \n" + + " > 空间ID:{} \n" + + " > 名称:{} \n" + + " > 时间:{} \n" + + " > 异常:{} \n\n"; private static final JobNettyClient CLIENT = RequestBuilder.newBuilder() .client(JobNettyClient.class) diff --git a/snail-job-client/snail-job-client-retry-core/pom.xml b/snail-job-client/snail-job-client-retry-core/pom.xml index 957cc47ce..4278050de 100644 --- a/snail-job-client/snail-job-client-retry-core/pom.xml +++ b/snail-job-client/snail-job-client-retry-core/pom.xml @@ -15,7 +15,7 @@ jar - 17 + 1.8 diff --git a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/intercepter/SnailRetryHeaderAspect.java b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/intercepter/SnailRetryHeaderAspect.java index 75f8608ad..13b706086 100644 --- a/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/intercepter/SnailRetryHeaderAspect.java +++ b/snail-job-client/snail-job-client-retry-core/src/main/java/com/aizuda/snailjob/client/core/intercepter/SnailRetryHeaderAspect.java @@ -4,7 +4,7 @@ import com.aizuda.snailjob.common.core.constant.SystemConstants; import com.aizuda.snailjob.common.core.model.SnailJobHeaders; import com.aizuda.snailjob.common.core.util.JsonUtil; import com.aizuda.snailjob.common.log.SnailJobLog; -import jakarta.servlet.http.HttpServletResponse; +//import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -13,6 +13,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; +import javax.servlet.http.HttpServletResponse; import java.util.Objects; /** diff --git a/snail-job-common/pom.xml b/snail-job-common/pom.xml index cf5a3715b..4da060be4 100644 --- a/snail-job-common/pom.xml +++ b/snail-job-common/pom.xml @@ -15,9 +15,9 @@ pom - 17 - 17 - 17 + 1.8 + 1.8 + 1.8 diff --git a/snail-job-common/snail-job-common-client-api/pom.xml b/snail-job-common/snail-job-common-client-api/pom.xml index 6d1a65909..caccbd0e8 100644 --- a/snail-job-common/snail-job-common-client-api/pom.xml +++ b/snail-job-common/snail-job-common-client-api/pom.xml @@ -15,9 +15,9 @@ jar - 17 - 17 - 17 + 1.8 + 1.8 + 1.8 diff --git a/snail-job-common/snail-job-common-core/pom.xml b/snail-job-common/snail-job-common-core/pom.xml index 14f1fd271..6345d60ec 100644 --- a/snail-job-common/snail-job-common-core/pom.xml +++ b/snail-job-common/snail-job-common-core/pom.xml @@ -15,9 +15,9 @@ jar - 17 - 17 - 17 + 1.8 + 1.8 + 1.8 @@ -47,6 +47,10 @@ org.eclipse.angus jakarta.mail + + jakarta.activation + jakarta.activation-api + com.googlecode.aviator aviator diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/Mail.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/Mail.java index 471fce60e..233ffbae8 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/Mail.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/Mail.java @@ -31,7 +31,7 @@ import java.util.Date; * @since 3.2.0 */ public class Mail implements Builder { - @Serial + // @Serial private static final long serialVersionUID = 1L; /** diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/MailAccount.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/MailAccount.java index a7c89239b..ed92e1cf2 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/MailAccount.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/MailAccount.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import java.io.Serial; +//import java.io.Serial; import java.io.Serializable; import java.nio.charset.Charset; import java.util.HashMap; @@ -17,7 +17,7 @@ import java.util.Properties; * @author Luxiaolei */ public class MailAccount implements Serializable { - @Serial + // @Serial private static final long serialVersionUID = -6937313421815719204L; private static final String MAIL_PROTOCOL = "mail.transport.protocol"; diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/MailException.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/MailException.java index 2156e3c6e..8fa5d8865 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/MailException.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/MailException.java @@ -3,7 +3,7 @@ package com.aizuda.snailjob.common.core.alarm.email; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.util.StrUtil; -import java.io.Serial; +//import java.io.Serial; /** * 邮件异常 @@ -11,7 +11,7 @@ import java.io.Serial; * @author xiaoleilu */ public class MailException extends RuntimeException { - @Serial + // @Serial private static final long serialVersionUID = 8247610319171014183L; public MailException(Throwable e) { diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/constant/SystemConstants.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/constant/SystemConstants.java index d0b6794df..a244c17ea 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/constant/SystemConstants.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/constant/SystemConstants.java @@ -112,15 +112,14 @@ public interface SystemConstants { } - String LOGO = """ - ______ _ __ _____ __ \s - .' ____ \\ (_)[ | |_ _| [ | \s - | (___ \\_| _ .--. ,--. __ | | | | .--. | |.--. \s - _.____`. [ `.-. |`'_\\ :[ | | | _ | / .'`\\ \\| '/'`\\ \\\s - | \\____) | | | | |// | |,| | | | | |__' | \\__. || \\__/ |\s - \\______.'[___||__]'-;__[___|___] `.____.''.__.'[__;.__.' \s - :: Snail Job :: (v{}) \s - """; + String LOGO = + " ______ _ __ _____ __ \n" + + ".' ____ \\ (_)[ | |_ _| [ | \n" + + "| (___ \\_| _ .--. ,--. __ | | | | .--. | |.--. \n" + + " _.____`. [ `.-. |`'_\\ :[ | | | _ | / .'`\\ \\| '/'`\\ \\\n" + + "| \\____) | | | | |// | |,| | | | |__' | \\__. || \\__/ |\n" + + " \\______.'[___||__]'-;__[___|___] `.____.''.__.'[__;.__.' \n" + + ":: Snail Job :: (v{}) \n"; /** * 调度时长 diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryStatusEnum.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryStatusEnum.java index 98c2013aa..e7987faf1 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryStatusEnum.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/enums/RetryStatusEnum.java @@ -1,5 +1,6 @@ package com.aizuda.snailjob.common.core.enums; +import cn.hutool.core.collection.ListUtil; import lombok.Getter; import org.springframework.lang.NonNull; @@ -38,7 +39,7 @@ public enum RetryStatusEnum { private final Integer status; public static final List ALLOW_DELETE_STATUS = - List.of(RetryStatusEnum.FINISH.getStatus(), RetryStatusEnum.MAX_COUNT.status, RetryStatusEnum.SUSPEND.status); + ListUtil.of(RetryStatusEnum.FINISH.getStatus(), RetryStatusEnum.MAX_COUNT.status, RetryStatusEnum.SUSPEND.status); RetryStatusEnum(int status) { this.status = status; diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/handler/RestExceptionHandler.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/handler/RestExceptionHandler.java index 5e6267d9e..0c5c100c8 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/handler/RestExceptionHandler.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/handler/RestExceptionHandler.java @@ -20,12 +20,14 @@ import org.springframework.web.bind.MissingServletRequestParameterException; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.method.annotation.HandlerMethodValidationException; +//import org.springframework.web.method.annotation.HandlerMethodValidationException; import java.util.List; import java.util.Objects; import java.util.Set; +// TODO: move the server module ? + /** * @description: 400 统一异常处理 * @author: byteblogs @@ -60,7 +62,8 @@ public class RestExceptionHandler { @ExceptionHandler({BaseSnailJobException.class}) public Result onBusinessException(BaseSnailJobException ex) { log.error("异常类 businessException", ex); - if (ex instanceof final SnailJobAuthenticationException authenticationException) { + if (ex instanceof SnailJobAuthenticationException) { + SnailJobAuthenticationException authenticationException = (SnailJobAuthenticationException)ex; return new Result(authenticationException.getErrorCode(), ex.getMessage()); } @@ -140,16 +143,16 @@ public class RestExceptionHandler { * @param e 异常对象 * @return HttpResult */ - @ExceptionHandler(HandlerMethodValidationException.class) - public Result onHandlerMethodValidationException(HandlerMethodValidationException e) { - Object[] detailMessageArguments = e.getDetailMessageArguments(); - if (detailMessageArguments != null && detailMessageArguments.length > 0) { - return new Result(0, detailMessageArguments[0].toString()); - } - - return new Result<>("参数校验失败"); - - } +// @ExceptionHandler(HandlerMethodValidationException.class) +// public Result onHandlerMethodValidationException(HandlerMethodValidationException e) { +// Object[] detailMessageArguments = e.getDetailMessageArguments(); +// if (detailMessageArguments != null && detailMessageArguments.length > 0) { +// return new Result(0, detailMessageArguments[0].toString()); +// } +// +// return new Result<>("参数校验失败"); +// +// } /** * 400错误 diff --git a/snail-job-common/snail-job-common-log/pom.xml b/snail-job-common/snail-job-common-log/pom.xml index 9a8ca31ce..52ef27263 100644 --- a/snail-job-common/snail-job-common-log/pom.xml +++ b/snail-job-common/snail-job-common-log/pom.xml @@ -16,9 +16,9 @@ jar - 17 - 17 - 17 + 1.8 + 1.8 + 1.8 diff --git a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/jdk/JdkLog.java b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/jdk/JdkLog.java index 10e260fda..c50f9ec65 100644 --- a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/jdk/JdkLog.java +++ b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/jdk/JdkLog.java @@ -3,7 +3,7 @@ package com.aizuda.snailjob.common.log.dialect.jdk; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.log.dialect.AbstractLog; -import java.io.Serial; +// import java.io.Serial; import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; @@ -17,7 +17,7 @@ import static com.aizuda.snailjob.common.log.factory.LogFactory.extractThrowable */ public class JdkLog extends AbstractLog { - @Serial + // @Serial private static final long serialVersionUID = -6843151523380063975L; private final transient Logger logger; diff --git a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j2/Log4j2Log.java b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j2/Log4j2Log.java index 75ec793ee..629b06d48 100644 --- a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j2/Log4j2Log.java +++ b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/log4j2/Log4j2Log.java @@ -10,7 +10,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.spi.AbstractLogger; -import java.io.Serial; +//import java.io.Serial; /** * Apache Log4J 2 log.
@@ -19,7 +19,7 @@ import java.io.Serial; */ public class Log4j2Log extends AbstractLog { - @Serial + // @Serial private static final long serialVersionUID = -6843151523380063975L; private final transient Logger logger; diff --git a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/lang/StackTraceCaller.java b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/lang/StackTraceCaller.java index dca02e5c0..219d042ba 100644 --- a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/lang/StackTraceCaller.java +++ b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/lang/StackTraceCaller.java @@ -2,7 +2,7 @@ package com.aizuda.snailjob.common.log.lang; import cn.hutool.core.exceptions.UtilException; -import java.io.Serial; +//import java.io.Serial; import java.io.Serializable; /** @@ -11,7 +11,7 @@ import java.io.Serializable; * @author wodeyangzipingpingwuqi */ public class StackTraceCaller implements Caller, Serializable { - @Serial + // @Serial private static final long serialVersionUID = 1L; private static final int OFFSET = 2; diff --git a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/lang/StackWalkerCaller.java b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/lang/StackWalkerCaller.java index 9d6f42866..93aa25e9e 100644 --- a/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/lang/StackWalkerCaller.java +++ b/snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/lang/StackWalkerCaller.java @@ -2,7 +2,7 @@ package com.aizuda.snailjob.common.log.lang; import cn.hutool.core.exceptions.UtilException; -import java.io.Serial; +//import java.io.Serial; import java.io.Serializable; import java.util.function.Function; import java.util.stream.Stream; @@ -13,22 +13,23 @@ import java.util.stream.Stream; * @since 2.6.0 */ public class StackWalkerCaller implements Caller, Serializable { - @Serial + // @Serial private static final long serialVersionUID = 1L; private static final int OFFSET = 2; @Override public Class getCallerCaller() { - - StackWalker instance = StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE); - StackWalker.StackFrame walk = (StackWalker.StackFrame) instance - .walk((Function, Object>) stackFrameStream -> - stackFrameStream.skip(OFFSET + 1).findFirst().get()); - try { - return Class.forName(walk.getClassName()); - } catch (ClassNotFoundException e) { - throw new UtilException(e, "[{}] not found!", walk.getClassName()); + StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace(); + if (stackTrace.length >= OFFSET + 2) { + String className = stackTrace[OFFSET + 1].getClassName(); + try { + return Class.forName(className); + } catch (ClassNotFoundException e) { + throw new UtilException(e, "[%s] not found!", className); + } + } else { + throw new UtilException("Caller's caller not found!"); } } diff --git a/snail-job-common/snail-job-common-server-api/pom.xml b/snail-job-common/snail-job-common-server-api/pom.xml index e456ef963..79ae34249 100644 --- a/snail-job-common/snail-job-common-server-api/pom.xml +++ b/snail-job-common/snail-job-common-server-api/pom.xml @@ -15,9 +15,9 @@ jar - 17 - 17 - 17 + 1.8 + 1.8 + 1.8