From 8bfa7b12516e70491dee643504a1e7ae96cdb2e2 Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Fri, 1 Sep 2023 22:33:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=203.0.0=201.=20=E5=8D=87=E7=BA=A7Spring?= =?UTF-8?q?=20Boot=E7=89=88=E6=9C=AC=E4=B8=BA3.1.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- easy-retry-client-core/pom.xml | 2 +- .../client/core/client/RetryEndPoint.java | 3 ++- easy-retry-client-starter/pom.xml | 2 +- .../easy-retry-common-client-api/pom.xml | 2 +- .../retry/client/model/DispatchRetryDTO.java | 4 ++-- .../model/GenerateRetryIdempotentIdDTO.java | 2 +- .../retry/client/model/RetryCallbackDTO.java | 4 ++-- .../easy-retry-common-core/pom.xml | 20 +++++++++++-------- .../core/handler/RestExceptionHandler.java | 13 ++++-------- .../easy-retry-common-server-api/pom.xml | 2 +- easy-retry-common/pom.xml | 2 +- .../easy-retry-datasource-template/pom.xml | 2 +- .../easy-retry-mariadb-datasource/pom.xml | 2 +- .../easy-retry-mysql-datasource/pom.xml | 2 +- .../easy-retry-postgres-datasource/pom.xml | 2 +- easy-retry-datasource/pom.xml | 2 +- easy-retry-server/pom.xml | 2 +- .../request/BatchDeleteRetryDeadLetterVO.java | 6 +++--- .../model/request/BatchDeleteRetryTaskVO.java | 6 +++--- .../BatchRollBackRetryDeadLetterVO.java | 6 +++--- .../web/model/request/GroupConfigQueryVO.java | 6 +++--- .../model/request/GroupConfigRequestVO.java | 2 +- .../server/web/model/request/ParseLogsVO.java | 6 +++--- .../RetryTaskUpdateExecutorNameRequestVO.java | 6 +++--- .../RetryTaskUpdateStatusRequestVO.java | 4 ++-- .../model/request/SystemUserRequestVO.java | 6 +++--- example/pom.xml | 0 pom.xml | 4 ++-- 28 files changed, 60 insertions(+), 60 deletions(-) create mode 100644 example/pom.xml diff --git a/easy-retry-client-core/pom.xml b/easy-retry-client-core/pom.xml index ad644f202..4f387f026 100644 --- a/easy-retry-client-core/pom.xml +++ b/easy-retry-client-core/pom.xml @@ -15,7 +15,7 @@ jar - 1.8 + 17 diff --git a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/RetryEndPoint.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/RetryEndPoint.java index d2f50c7c7..0eb294c74 100644 --- a/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/RetryEndPoint.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/RetryEndPoint.java @@ -26,6 +26,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; 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 jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +40,6 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; import java.util.Objects; @@ -83,6 +83,7 @@ public class RetryEndPoint { try { ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + // TODO 此处用ThreadLocal替换 HttpServletRequest request = Objects.requireNonNull(attributes).getRequest(); request.setAttribute("attemptNumber", executeReqDto.getRetryCount()); diff --git a/easy-retry-client-starter/pom.xml b/easy-retry-client-starter/pom.xml index 33139eb17..f1e350b6d 100644 --- a/easy-retry-client-starter/pom.xml +++ b/easy-retry-client-starter/pom.xml @@ -14,7 +14,7 @@ easy-retry-client-starter - 1.8 + 17 diff --git a/easy-retry-common/easy-retry-common-client-api/pom.xml b/easy-retry-common/easy-retry-common-client-api/pom.xml index 0cda974e7..543e6e70f 100644 --- a/easy-retry-common/easy-retry-common-client-api/pom.xml +++ b/easy-retry-common/easy-retry-common-client-api/pom.xml @@ -15,7 +15,7 @@ jar - 1.8 + 17 diff --git a/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/DispatchRetryDTO.java b/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/DispatchRetryDTO.java index 5c930f425..0221b38cc 100644 --- a/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/DispatchRetryDTO.java +++ b/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/DispatchRetryDTO.java @@ -1,9 +1,9 @@ package com.aizuda.easy.retry.client.model; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; /** * 服务端调度重试入参 diff --git a/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/GenerateRetryIdempotentIdDTO.java b/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/GenerateRetryIdempotentIdDTO.java index 9bcd1bef4..d2ed78883 100644 --- a/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/GenerateRetryIdempotentIdDTO.java +++ b/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/GenerateRetryIdempotentIdDTO.java @@ -2,7 +2,7 @@ package com.aizuda.easy.retry.client.model; import lombok.Data; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; /** * 生成idempotentId模型 diff --git a/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/RetryCallbackDTO.java b/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/RetryCallbackDTO.java index 28e7c3898..b95932190 100644 --- a/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/RetryCallbackDTO.java +++ b/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/RetryCallbackDTO.java @@ -2,8 +2,8 @@ package com.aizuda.easy.retry.client.model; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; /** * 服务端调度重试入参 diff --git a/easy-retry-common/easy-retry-common-core/pom.xml b/easy-retry-common/easy-retry-common-core/pom.xml index f3536cbcf..e145ac6cf 100644 --- a/easy-retry-common/easy-retry-common-core/pom.xml +++ b/easy-retry-common/easy-retry-common-core/pom.xml @@ -15,7 +15,7 @@ jar - 1.8 + 17 @@ -33,15 +33,15 @@ com.aliyun alibaba-dingtalk-service-sdk - - - - - - javax.validation - validation-api + commons-configuration + commons-configuration + 1.10 + + + + cn.hutool hutool-http @@ -54,6 +54,10 @@ cn.hutool hutool-crypto + + jakarta.validation + jakarta.validation-api + diff --git a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/handler/RestExceptionHandler.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/handler/RestExceptionHandler.java index ca04e52f8..091508074 100644 --- a/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/handler/RestExceptionHandler.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/handler/RestExceptionHandler.java @@ -3,6 +3,8 @@ package com.aizuda.easy.retry.common.core.handler; import com.aizuda.easy.retry.common.core.exception.AbstractError; import com.aizuda.easy.retry.common.core.exception.BaseEasyRetryException; import com.aizuda.easy.retry.common.core.model.Result; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.TypeMismatchException; import org.springframework.http.converter.HttpMessageNotReadableException; @@ -17,9 +19,6 @@ import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; -import javax.servlet.http.HttpServletRequest; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; import java.util.List; import java.util.Objects; import java.util.Set; @@ -77,13 +76,11 @@ public class RestExceptionHandler { /** * validation 异常处理 * - * @param request 请求体 * @param e ConstraintViolationException * @return HttpResult */ @ExceptionHandler(ConstraintViolationException.class) - public Result onConstraintViolationException(HttpServletRequest request, - ConstraintViolationException e) { + public Result onConstraintViolationException(ConstraintViolationException e) { Set> constraintViolations = e.getConstraintViolations(); if (!CollectionUtils.isEmpty(constraintViolations)) { String errorMessage = constraintViolations @@ -99,13 +96,11 @@ public class RestExceptionHandler { /** * validation 异常处理 * - * @param request 请求体 * @param e MethodArgumentNotValidException * @return HttpResult */ @ExceptionHandler(MethodArgumentNotValidException.class) - public Result onMethodArgumentNotValidException(HttpServletRequest request, - MethodArgumentNotValidException e) { + public Result onMethodArgumentNotValidException(MethodArgumentNotValidException e) { BindingResult result = e.getBindingResult(); if (result != null && result.hasErrors()) { StringBuilder sb = new StringBuilder(); diff --git a/easy-retry-common/easy-retry-common-server-api/pom.xml b/easy-retry-common/easy-retry-common-server-api/pom.xml index fb1c59f8c..6ba8cbfad 100644 --- a/easy-retry-common/easy-retry-common-server-api/pom.xml +++ b/easy-retry-common/easy-retry-common-server-api/pom.xml @@ -15,7 +15,7 @@ jar - 1.8 + 17 diff --git a/easy-retry-common/pom.xml b/easy-retry-common/pom.xml index 7df93c6a3..2953d94d7 100644 --- a/easy-retry-common/pom.xml +++ b/easy-retry-common/pom.xml @@ -15,7 +15,7 @@ pom - 1.8 + 17 diff --git a/easy-retry-datasource/easy-retry-datasource-template/pom.xml b/easy-retry-datasource/easy-retry-datasource-template/pom.xml index b61dcc342..4a7215616 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/pom.xml +++ b/easy-retry-datasource/easy-retry-datasource-template/pom.xml @@ -15,7 +15,7 @@ jar - 1.8 + 17 diff --git a/easy-retry-datasource/easy-retry-mariadb-datasource/pom.xml b/easy-retry-datasource/easy-retry-mariadb-datasource/pom.xml index ead58fc41..bc55edf25 100644 --- a/easy-retry-datasource/easy-retry-mariadb-datasource/pom.xml +++ b/easy-retry-datasource/easy-retry-mariadb-datasource/pom.xml @@ -15,7 +15,7 @@ jar - 1.8 + 17 3.1.4 diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/pom.xml b/easy-retry-datasource/easy-retry-mysql-datasource/pom.xml index 3b46f3129..da6fa3221 100644 --- a/easy-retry-datasource/easy-retry-mysql-datasource/pom.xml +++ b/easy-retry-datasource/easy-retry-mysql-datasource/pom.xml @@ -15,7 +15,7 @@ jar - 1.8 + 17 8.0.33 diff --git a/easy-retry-datasource/easy-retry-postgres-datasource/pom.xml b/easy-retry-datasource/easy-retry-postgres-datasource/pom.xml index 09becbc17..817cad1f2 100644 --- a/easy-retry-datasource/easy-retry-postgres-datasource/pom.xml +++ b/easy-retry-datasource/easy-retry-postgres-datasource/pom.xml @@ -15,7 +15,7 @@ jar - 1.8 + 17 42.2.24 diff --git a/easy-retry-datasource/pom.xml b/easy-retry-datasource/pom.xml index b2f8d8d92..985fcf0cc 100644 --- a/easy-retry-datasource/pom.xml +++ b/easy-retry-datasource/pom.xml @@ -15,7 +15,7 @@ pom - 1.8 + 17 diff --git a/easy-retry-server/pom.xml b/easy-retry-server/pom.xml index 1c1dd3e9e..0ebae7771 100644 --- a/easy-retry-server/pom.xml +++ b/easy-retry-server/pom.xml @@ -15,7 +15,7 @@ easy-retry-server - 1.8 + 17 true 1.5.3.Final 2.6.21 diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/BatchDeleteRetryDeadLetterVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/BatchDeleteRetryDeadLetterVO.java index 96ce8f918..c6b12d478 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/BatchDeleteRetryDeadLetterVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/BatchDeleteRetryDeadLetterVO.java @@ -2,9 +2,9 @@ package com.aizuda.easy.retry.server.web.model.request; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Pattern; import java.util.List; /** 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 3e4035598..95aaeb7bd 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,9 +1,9 @@ package com.aizuda.easy.retry.server.web.model.request; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Pattern; import java.util.List; /** diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/BatchRollBackRetryDeadLetterVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/BatchRollBackRetryDeadLetterVO.java index 803b07e92..65bd716c3 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/BatchRollBackRetryDeadLetterVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/BatchRollBackRetryDeadLetterVO.java @@ -2,9 +2,9 @@ package com.aizuda.easy.retry.server.web.model.request; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Pattern; import java.util.List; /** diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/GroupConfigQueryVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/GroupConfigQueryVO.java index 36ddcc2ff..b0f703780 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/GroupConfigQueryVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/GroupConfigQueryVO.java @@ -3,9 +3,9 @@ package com.aizuda.easy.retry.server.web.model.request; import com.aizuda.easy.retry.server.web.model.base.BaseQueryVO; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; /** 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 9c8c858f6..842bcefdd 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 @@ -4,7 +4,7 @@ import com.aizuda.easy.retry.common.core.constant.SystemConstants; import com.aizuda.easy.retry.server.enums.IdGeneratorMode; import lombok.Data; -import javax.validation.constraints.*; +import jakarta.validation.constraints.*; import java.util.List; /** diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/ParseLogsVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/ParseLogsVO.java index 8bed2ef04..b6614b9ba 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/ParseLogsVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/ParseLogsVO.java @@ -2,9 +2,9 @@ package com.aizuda.easy.retry.server.web.model.request; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; /** * 解析参数模型 diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskUpdateExecutorNameRequestVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskUpdateExecutorNameRequestVO.java index 241e279dc..bc1daefff 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskUpdateExecutorNameRequestVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskUpdateExecutorNameRequestVO.java @@ -2,10 +2,10 @@ package com.aizuda.easy.retry.server.web.model.request; import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.Pattern; import java.util.List; /** diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskUpdateStatusRequestVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskUpdateStatusRequestVO.java index f845de043..c2f5cba31 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskUpdateStatusRequestVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskUpdateStatusRequestVO.java @@ -3,8 +3,8 @@ package com.aizuda.easy.retry.server.web.model.request; import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; /** * 更新重试任务模型 diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/SystemUserRequestVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/SystemUserRequestVO.java index 71d9f78a5..cc335ed19 100644 --- a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/SystemUserRequestVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/SystemUserRequestVO.java @@ -4,9 +4,9 @@ import lombok.Data; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import java.util.List; /** diff --git a/example/pom.xml b/example/pom.xml new file mode 100644 index 000000000..e69de29bb diff --git a/pom.xml b/pom.xml index 2939561db..2b77757b3 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.8 + 3.1.3 @@ -18,7 +18,7 @@ easy-retry - 1.8 + 17 1.8 1.8 2.3.0-SNAPSHOT