gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

feat: 3.0.0

Browse Source 
1. 升级Spring Boot版本为3.1.3
This commit is contained in:
byteblogs168 2023-09-01 22:33:26 +08:00
parent 6ca58cd907
commit 8bfa7b1251
28 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
easy-retry-client-core/pom.xml
View File

@ -15,7 +15,7 @@
<packaging>jar</packaging>
<properties>
<java.version>1.8</java.version>
<java.version>17</java.version>
</properties>
<dependencies>

3
easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/RetryEndPoint.java
View File

@ -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());

2
easy-retry-client-starter/pom.xml
View File

@ -14,7 +14,7 @@
<description>easy-retry-client-starter</description>
<properties>
<java.version>1.8</java.version>
<java.version>17</java.version>
</properties>
<dependencies>

2
easy-retry-common/easy-retry-common-client-api/pom.xml
View File

@ -15,7 +15,7 @@
<packaging>jar</packaging>
<properties>
<java.version>1.8</java.version>
<java.version>17</java.version>
</properties>
<dependencies>

4
easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/DispatchRetryDTO.java
View File

@ -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;
/**
* 服务端调度重试入参

2
easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/GenerateRetryIdempotentIdDTO.java
View File

@ -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模型

4
easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/RetryCallbackDTO.java
View File

@ -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;
/**
* 服务端调度重试入参

20
easy-retry-common/easy-retry-common-core/pom.xml
View File

@ -15,7 +15,7 @@
<packaging>jar</packaging>
<properties>
<java.version>1.8</java.version>
<java.version>17</java.version>
</properties>
<dependencies>
@ -33,15 +33,15 @@
<groupId>com.aliyun</groupId>
<artifactId>alibaba-dingtalk-service-sdk</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>commons-configuration</groupId>-->
<!-- <artifactId>commons-configuration</artifactId>-->
<!-- <version>1.10</version>-->
<!-- </dependency>-->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.10</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>javax.validation</groupId>-->
<!-- <artifactId>validation-api</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-http</artifactId>
@ -54,6 +54,10 @@
<groupId>cn.hutool</groupId>
<artifactId>hutool-crypto</artifactId>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>
</dependencies>
<build>

13
easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/handler/RestExceptionHandler.java
View File

@ -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<ConstraintViolation<?>> 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();

2
easy-retry-common/easy-retry-common-server-api/pom.xml
View File

@ -15,7 +15,7 @@
<packaging>jar</packaging>
<properties>
<java.version>1.8</java.version>
<java.version>17</java.version>
</properties>
<dependencies>

2
easy-retry-common/pom.xml
View File

@ -15,7 +15,7 @@
<packaging>pom</packaging>
<properties>
<java.version>1.8</java.version>
<java.version>17</java.version>
</properties>
<modules>

2
easy-retry-datasource/easy-retry-datasource-template/pom.xml
View File

@ -15,7 +15,7 @@
<packaging>jar</packaging>
<properties>
<java.version>1.8</java.version>
<java.version>17</java.version>
</properties>
<dependencies>

2
easy-retry-datasource/easy-retry-mariadb-datasource/pom.xml
View File

@ -15,7 +15,7 @@
<packaging>jar</packaging>
<properties>
<java.version>1.8</java.version>
<java.version>17</java.version>
<mariadb.version>3.1.4</mariadb.version>
</properties>

2
easy-retry-datasource/easy-retry-mysql-datasource/pom.xml
View File

@ -15,7 +15,7 @@
<packaging>jar</packaging>
<properties>
<java.version>1.8</java.version>
<java.version>17</java.version>
<mysql.version>8.0.33</mysql.version>
</properties>

2
easy-retry-datasource/easy-retry-postgres-datasource/pom.xml
View File

@ -15,7 +15,7 @@
<packaging>jar</packaging>
<properties>
<java.version>1.8</java.version>
<java.version>17</java.version>
<postgresql.version>42.2.24</postgresql.version>
</properties>

2
easy-retry-datasource/pom.xml
View File

@ -15,7 +15,7 @@
<packaging>pom</packaging>
<properties>
<java.version>1.8</java.version>
<java.version>17</java.version>
</properties>
<modules>

2
easy-retry-server/pom.xml
View File

@ -15,7 +15,7 @@
<description>easy-retry-server</description>
<properties>
<java.version>1.8</java.version>
<java.version>17</java.version>
<maven.deploy.skip>true</maven.deploy.skip>
<org.mapstruct.version>1.5.3.Final</org.mapstruct.version>
<akka.version>2.6.21</akka.version>

6
easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/BatchDeleteRetryDeadLetterVO.java
View File

@ -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;
/**

6
easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/BatchDeleteRetryTaskVO.java
View File

@ -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;
/**

6
easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/BatchRollBackRetryDeadLetterVO.java
View File

@ -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;
/**

6
easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/GroupConfigQueryVO.java
View File

@ -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;
/**

2
easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/GroupConfigRequestVO.java
View File

@ -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;
/**

6
easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/ParseLogsVO.java
View File

@ -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;
/**
* 解析参数模型

6
easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskUpdateExecutorNameRequestVO.java
View File

@ -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;
/**

4
easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskUpdateStatusRequestVO.java
View File

@ -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;
/**
* 更新重试任务模型

6
easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/SystemUserRequestVO.java
View File

@ -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;
/**

0
example/pom.xml Normal file
View File

4
pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.8</version>
<version>3.1.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@ -18,7 +18,7 @@
<description>easy-retry</description>
<properties>
<java.version>1.8</java.version>
<java.version>17</java.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<revision>2.3.0-SNAPSHOT</revision>