From a731ad70e2d9060079cb8c7b921a185a85fb8b02 Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Fri, 21 Apr 2023 09:08:00 +0800 Subject: [PATCH] =?UTF-8?q?feat:=201.0.0=20=E4=BF=AE=E6=94=B9example?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=86=85=E7=9A=84=E5=8C=85=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/starter/XRetryClientAutoConfiguration.java | 2 +- easy-retry-server/src/main/resources/logback-boot.xml | 3 ++- example/pom.xml | 2 +- .../src/main/java/com/example/ExampleApplication.java | 2 +- .../example/ExampleClientHttpRequestInterceptor.java | 4 ++-- .../com/example/ExampleFeignRequestInterceptor.java | 2 +- .../src/main/java/com/example/client/DemoClient.java | 3 +-- .../src/main/java/com/example/client/FeignConfig.java | 2 +- .../java/com/example/controller/SchoolController.java | 6 +++--- .../java/com/example/controller/StudentController.java | 2 +- .../java/com/example/controller/TeacherController.java | 5 ++--- .../java/com/example/controller/TestDdlController.java | 2 +- .../example/controller/TestStatusCodeController.java | 4 ++-- .../src/main/java/com/example/demo/MyRetryMethod.java | 4 ++-- .../main/java/com/example/demo/NestMethodService.java | 2 +- .../src/main/java/com/example/demo/RemoteService.java | 2 +- .../java/com/example/demo/RetryRegisterService.java | 3 +-- .../demo/TestExistsTransactionalRetryService.java | 4 ++-- .../demo/TestExistsTransactionalRetryService2.java | 4 ++-- .../demo/TestRetryMethodComplexParamaterService.java | 5 ++--- .../java/com/example/demo/TestRetryMethodService.java | 2 +- .../com/example/demo/TestRetryStrategyService.java | 4 ++-- .../test/java/com/example/ExampleApplicationTests.java | 10 +++++----- .../example/ExistsTransactionalRetryServiceTest.java | 2 +- .../test/java/com/example/NestMethodServiceTest.java | 2 +- 25 files changed, 40 insertions(+), 43 deletions(-) diff --git a/easy-retry-client-starter/src/main/java/com/aizuda/easy/retry/client/starter/XRetryClientAutoConfiguration.java b/easy-retry-client-starter/src/main/java/com/aizuda/easy/retry/client/starter/XRetryClientAutoConfiguration.java index 3c50f710e..ffd687697 100644 --- a/easy-retry-client-starter/src/main/java/com/aizuda/easy/retry/client/starter/XRetryClientAutoConfiguration.java +++ b/easy-retry-client-starter/src/main/java/com/aizuda/easy/retry/client/starter/XRetryClientAutoConfiguration.java @@ -5,7 +5,7 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @Configuration -@ComponentScan("com.x.retry.client.core") +@ComponentScan("com.aizuda.easy.retry.client.core") @ConditionalOnProperty(prefix = "easy-retry", name = "enabled", havingValue = "true") public class XRetryClientAutoConfiguration { diff --git a/easy-retry-server/src/main/resources/logback-boot.xml b/easy-retry-server/src/main/resources/logback-boot.xml index 821afc9f8..0d177f6cc 100644 --- a/easy-retry-server/src/main/resources/logback-boot.xml +++ b/easy-retry-server/src/main/resources/logback-boot.xml @@ -23,9 +23,10 @@ log/sys.%d.%i.log 30 + true - 1KB + 10MB diff --git a/example/pom.xml b/example/pom.xml index 18fa7bea4..d80a01b23 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -38,7 +38,7 @@ com.aizuda easy-retry-client-starter - 0.0.4.2 + 1.0.0.0 com.baomidou diff --git a/example/src/main/java/com/example/ExampleApplication.java b/example/src/main/java/com/example/ExampleApplication.java index 15a6fd067..21337e444 100644 --- a/example/src/main/java/com/example/ExampleApplication.java +++ b/example/src/main/java/com/example/ExampleApplication.java @@ -1,6 +1,6 @@ package com.example; -import com.x.retry.client.starter.EnableXRetry; +import com.aizuda.easy.retry.client.starter.EnableXRetry; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; diff --git a/example/src/main/java/com/example/ExampleClientHttpRequestInterceptor.java b/example/src/main/java/com/example/ExampleClientHttpRequestInterceptor.java index c0eae99c1..a7d6b820e 100644 --- a/example/src/main/java/com/example/ExampleClientHttpRequestInterceptor.java +++ b/example/src/main/java/com/example/ExampleClientHttpRequestInterceptor.java @@ -1,7 +1,7 @@ package com.example; -import com.x.retry.client.core.plugin.RequestHeaderPlugins; -import com.x.retry.client.core.plugin.ResponseHeaderPlugins; +import com.aizuda.easy.retry.client.core.plugin.RequestHeaderPlugins; +import com.aizuda.easy.retry.client.core.plugin.ResponseHeaderPlugins; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpRequest; import org.springframework.http.client.ClientHttpRequestExecution; diff --git a/example/src/main/java/com/example/ExampleFeignRequestInterceptor.java b/example/src/main/java/com/example/ExampleFeignRequestInterceptor.java index 77b26591c..f7a3a35eb 100644 --- a/example/src/main/java/com/example/ExampleFeignRequestInterceptor.java +++ b/example/src/main/java/com/example/ExampleFeignRequestInterceptor.java @@ -1,6 +1,6 @@ package com.example; -import com.x.retry.client.core.plugin.RequestHeaderPlugins; +import com.aizuda.easy.retry.client.core.plugin.RequestHeaderPlugins; import feign.RequestInterceptor; import feign.RequestTemplate; import org.springframework.stereotype.Component; diff --git a/example/src/main/java/com/example/client/DemoClient.java b/example/src/main/java/com/example/client/DemoClient.java index 89c787852..a287b70e2 100644 --- a/example/src/main/java/com/example/client/DemoClient.java +++ b/example/src/main/java/com/example/client/DemoClient.java @@ -1,7 +1,6 @@ package com.example.client; -//import org.springframework.cloud.netflix.feign.FeignClient; -import com.x.retry.common.core.model.Result; +import com.aizuda.easy.retry.common.core.model.Result; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; diff --git a/example/src/main/java/com/example/client/FeignConfig.java b/example/src/main/java/com/example/client/FeignConfig.java index e80b55cbb..8489a5c3b 100644 --- a/example/src/main/java/com/example/client/FeignConfig.java +++ b/example/src/main/java/com/example/client/FeignConfig.java @@ -1,6 +1,6 @@ package com.example.client; -import com.x.retry.client.core.plugin.ResponseHeaderPlugins; +import com.aizuda.easy.retry.client.core.plugin.ResponseHeaderPlugins; import feign.FeignException; import feign.Response; import feign.codec.DecodeException; diff --git a/example/src/main/java/com/example/controller/SchoolController.java b/example/src/main/java/com/example/controller/SchoolController.java index 13e8fed9c..94104bc8c 100644 --- a/example/src/main/java/com/example/controller/SchoolController.java +++ b/example/src/main/java/com/example/controller/SchoolController.java @@ -1,8 +1,8 @@ package com.example.controller; -import com.x.retry.client.core.intercepter.RetrySiteSnapshot; -import com.x.retry.common.core.constant.SystemConstants; -import com.x.retry.common.core.model.Result; +import com.aizuda.easy.retry.client.core.intercepter.RetrySiteSnapshot; +import com.aizuda.easy.retry.common.core.constant.SystemConstants; +import com.aizuda.easy.retry.common.core.model.Result; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/example/src/main/java/com/example/controller/StudentController.java b/example/src/main/java/com/example/controller/StudentController.java index 7cade2bdc..55d5adb86 100644 --- a/example/src/main/java/com/example/controller/StudentController.java +++ b/example/src/main/java/com/example/controller/StudentController.java @@ -1,8 +1,8 @@ package com.example.controller; +import com.aizuda.easy.retry.common.core.annotation.OriginalControllerReturnValue; import com.example.demo.TestExistsTransactionalRetryService; -import com.x.retry.common.core.annotation.OriginalControllerReturnValue; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/example/src/main/java/com/example/controller/TeacherController.java b/example/src/main/java/com/example/controller/TeacherController.java index fd6f304d6..cb6feec5c 100644 --- a/example/src/main/java/com/example/controller/TeacherController.java +++ b/example/src/main/java/com/example/controller/TeacherController.java @@ -1,8 +1,7 @@ package com.example.controller; - -import com.x.retry.client.core.annotation.Retryable; -import com.x.retry.common.core.model.Result; +import com.aizuda.easy.retry.client.core.annotation.Retryable; +import com.aizuda.easy.retry.common.core.model.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/example/src/main/java/com/example/controller/TestDdlController.java b/example/src/main/java/com/example/controller/TestDdlController.java index 461eab1b6..350651de9 100644 --- a/example/src/main/java/com/example/controller/TestDdlController.java +++ b/example/src/main/java/com/example/controller/TestDdlController.java @@ -1,7 +1,7 @@ package com.example.controller; +import com.aizuda.easy.retry.common.core.model.Result; import com.example.client.DemoClient; -import com.x.retry.common.core.model.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/example/src/main/java/com/example/controller/TestStatusCodeController.java b/example/src/main/java/com/example/controller/TestStatusCodeController.java index af8ee1e16..c236722a7 100644 --- a/example/src/main/java/com/example/controller/TestStatusCodeController.java +++ b/example/src/main/java/com/example/controller/TestStatusCodeController.java @@ -1,8 +1,8 @@ package com.example.controller; +import com.aizuda.easy.retry.client.core.annotation.Retryable; +import com.aizuda.easy.retry.common.core.model.Result; import com.example.client.DemoClient; -import com.x.retry.client.core.annotation.Retryable; -import com.x.retry.common.core.model.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/example/src/main/java/com/example/demo/MyRetryMethod.java b/example/src/main/java/com/example/demo/MyRetryMethod.java index 629423c37..1ada88e44 100644 --- a/example/src/main/java/com/example/demo/MyRetryMethod.java +++ b/example/src/main/java/com/example/demo/MyRetryMethod.java @@ -1,7 +1,7 @@ package com.example.demo; -import com.x.retry.client.core.strategy.RetryMethod; -import com.x.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.client.core.strategy.RetryMethod; +import com.aizuda.easy.retry.common.core.util.JsonUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/example/src/main/java/com/example/demo/NestMethodService.java b/example/src/main/java/com/example/demo/NestMethodService.java index 6fa3d8372..b2b75bd59 100644 --- a/example/src/main/java/com/example/demo/NestMethodService.java +++ b/example/src/main/java/com/example/demo/NestMethodService.java @@ -1,6 +1,6 @@ package com.example.demo; -import com.x.retry.client.core.annotation.Retryable; +import com.aizuda.easy.retry.client.core.annotation.Retryable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/example/src/main/java/com/example/demo/RemoteService.java b/example/src/main/java/com/example/demo/RemoteService.java index 7614b58b5..aabd430b7 100644 --- a/example/src/main/java/com/example/demo/RemoteService.java +++ b/example/src/main/java/com/example/demo/RemoteService.java @@ -1,6 +1,6 @@ package com.example.demo; -import com.x.retry.common.core.model.Result; +import com.aizuda.easy.retry.common.core.model.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; diff --git a/example/src/main/java/com/example/demo/RetryRegisterService.java b/example/src/main/java/com/example/demo/RetryRegisterService.java index eca9c475a..4863bf7ff 100644 --- a/example/src/main/java/com/example/demo/RetryRegisterService.java +++ b/example/src/main/java/com/example/demo/RetryRegisterService.java @@ -1,8 +1,7 @@ package com.example.demo; import cn.hutool.core.lang.UUID; -import com.x.retry.client.core.annotation.Retryable; -import com.x.retry.client.core.retryer.RetryType; +import com.aizuda.easy.retry.client.core.annotation.Retryable; import org.springframework.stereotype.Service; /** diff --git a/example/src/main/java/com/example/demo/TestExistsTransactionalRetryService.java b/example/src/main/java/com/example/demo/TestExistsTransactionalRetryService.java index 3099d70ce..98c48c10e 100644 --- a/example/src/main/java/com/example/demo/TestExistsTransactionalRetryService.java +++ b/example/src/main/java/com/example/demo/TestExistsTransactionalRetryService.java @@ -1,11 +1,11 @@ package com.example.demo; +import com.aizuda.easy.retry.client.core.annotation.Retryable; +import com.aizuda.easy.retry.common.core.model.Result; import com.example.mapper.SchoolMapper; import com.example.mapper.StudentMapper; import com.example.po.School; import com.example.po.Student; -import com.x.retry.client.core.annotation.Retryable; -import com.x.retry.common.core.model.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/example/src/main/java/com/example/demo/TestExistsTransactionalRetryService2.java b/example/src/main/java/com/example/demo/TestExistsTransactionalRetryService2.java index 913dac49c..6b8be3a2f 100644 --- a/example/src/main/java/com/example/demo/TestExistsTransactionalRetryService2.java +++ b/example/src/main/java/com/example/demo/TestExistsTransactionalRetryService2.java @@ -1,12 +1,12 @@ package com.example.demo; +import com.aizuda.easy.retry.client.core.annotation.Retryable; +import com.aizuda.easy.retry.common.core.model.Result; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.example.mapper.SchoolMapper; import com.example.mapper.StudentMapper; import com.example.po.School; import com.example.po.Student; -import com.x.retry.client.core.annotation.Retryable; -import com.x.retry.common.core.model.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; diff --git a/example/src/main/java/com/example/demo/TestRetryMethodComplexParamaterService.java b/example/src/main/java/com/example/demo/TestRetryMethodComplexParamaterService.java index 143c9c3c0..7fecbb680 100644 --- a/example/src/main/java/com/example/demo/TestRetryMethodComplexParamaterService.java +++ b/example/src/main/java/com/example/demo/TestRetryMethodComplexParamaterService.java @@ -1,10 +1,9 @@ package com.example.demo; +import com.aizuda.easy.retry.client.core.annotation.Retryable; +import com.aizuda.easy.retry.common.core.log.LogUtils; import com.example.model.Dog; import com.example.model.Zoo; -import com.x.retry.client.core.annotation.Retryable; -import com.x.retry.client.core.retryer.RetryType; -import com.x.retry.common.core.log.LogUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/example/src/main/java/com/example/demo/TestRetryMethodService.java b/example/src/main/java/com/example/demo/TestRetryMethodService.java index 46ccc1c47..2cfb3b5f5 100644 --- a/example/src/main/java/com/example/demo/TestRetryMethodService.java +++ b/example/src/main/java/com/example/demo/TestRetryMethodService.java @@ -1,6 +1,6 @@ package com.example.demo; -import com.x.retry.client.core.annotation.Retryable; +import com.aizuda.easy.retry.client.core.annotation.Retryable; import org.springframework.stereotype.Component; /** diff --git a/example/src/main/java/com/example/demo/TestRetryStrategyService.java b/example/src/main/java/com/example/demo/TestRetryStrategyService.java index f3ce3e367..c86692780 100644 --- a/example/src/main/java/com/example/demo/TestRetryStrategyService.java +++ b/example/src/main/java/com/example/demo/TestRetryStrategyService.java @@ -1,7 +1,7 @@ package com.example.demo; -import com.x.retry.client.core.annotation.Retryable; -import com.x.retry.client.core.retryer.RetryType; +import com.aizuda.easy.retry.client.core.annotation.Retryable; +import com.aizuda.easy.retry.client.core.retryer.RetryType; import org.springframework.stereotype.Component; /** diff --git a/example/src/test/java/com/example/ExampleApplicationTests.java b/example/src/test/java/com/example/ExampleApplicationTests.java index 4aca3d020..934e692bd 100644 --- a/example/src/test/java/com/example/ExampleApplicationTests.java +++ b/example/src/test/java/com/example/ExampleApplicationTests.java @@ -1,12 +1,12 @@ package com.example; +import com.aizuda.easy.retry.client.core.report.ReportHandler; +import com.aizuda.easy.retry.client.core.window.RetryLeapArray; +import com.aizuda.easy.retry.common.core.model.Result; +import com.aizuda.easy.retry.server.model.dto.RetryTaskDTO; import com.example.client.DemoClient; import com.example.mapper.SchoolMapper; import com.example.po.School; -import com.x.retry.client.core.report.ReportHandler; -import com.x.retry.client.core.window.RetryLeapArray; -import com.x.retry.common.core.model.Result; -import com.x.retry.server.model.dto.RetryTaskDTO; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; @@ -54,7 +54,7 @@ public class ExampleApplicationTests { @SneakyThrows @Test public void windows() { - + for (int i = 0; i < 100000; i++) { int finalI = i; new Thread(() -> { diff --git a/example/src/test/java/com/example/ExistsTransactionalRetryServiceTest.java b/example/src/test/java/com/example/ExistsTransactionalRetryServiceTest.java index 24eba4785..1f4acc3a1 100644 --- a/example/src/test/java/com/example/ExistsTransactionalRetryServiceTest.java +++ b/example/src/test/java/com/example/ExistsTransactionalRetryServiceTest.java @@ -1,9 +1,9 @@ package com.example; +import com.aizuda.easy.retry.common.core.model.Result; import com.example.demo.RemoteService; import com.example.demo.TestExistsTransactionalRetryService; import com.example.demo.TestExistsTransactionalRetryService2; -import com.x.retry.common.core.model.Result; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; diff --git a/example/src/test/java/com/example/NestMethodServiceTest.java b/example/src/test/java/com/example/NestMethodServiceTest.java index 159ea77d7..a846aeee0 100644 --- a/example/src/test/java/com/example/NestMethodServiceTest.java +++ b/example/src/test/java/com/example/NestMethodServiceTest.java @@ -1,8 +1,8 @@ package com.example; +import com.aizuda.easy.retry.common.core.model.Result; import com.example.demo.NestMethodService; import com.example.demo.RemoteService; -import com.x.retry.common.core.model.Result; import lombok.SneakyThrows; import org.junit.jupiter.api.Test; import org.mockito.Mockito;