From b60f19541e822c124df5e49271c4f339f467a5de Mon Sep 17 00:00:00 2001 From: "www.byteblogs.com" <598092184@qq.com> Date: Tue, 18 Apr 2023 23:03:33 +0800 Subject: [PATCH] =?UTF-8?q?feat:=201.0.0=20=E4=BB=8Ex-retry=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E9=A1=B9=E7=9B=AE=E5=88=B0easy-retry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 32 ++++++------ .../.gitignore | 0 .../pom.xml | 22 ++++---- .../retry/client/core/BizIdGenerate.java | 2 +- .../easy/retry/client/core}/Lifecycle.java | 2 +- .../retry/client/core/RetryArgSerializer.java | 2 +- .../retry/client/core/RetryExecutor.java | 4 +- .../client/core/RetryExecutorParameter.java | 3 +- .../easy}/retry/client/core/Scanner.java | 4 +- .../client/core/annotation/Retryable.java | 16 +++--- .../client/core/cache/GroupVersionCache.java | 20 ++++---- .../client/core/cache/RetryerInfoCache.java | 5 +- .../core/callback/RetryCompleteCallback.java | 2 +- .../callback/SimpleRetryCompleteCallback.java | 2 +- .../core/client/NettyHttpClientHandler.java | 24 ++++----- .../core/client/NettyHttpConnectClient.java | 16 +++--- .../client/core/client/RetryEndPoint.java | 45 ++++++++-------- .../request/BeatHttpRequestHandler.java | 8 +-- .../request/ConfigHttpRequestHandler.java | 14 ++--- .../client/request/GetHttpRequestHandler.java | 2 +- .../client/request/HttpRequestHandler.java | 6 +-- .../request/PostHttpRequestHandler.java | 2 +- .../ReportRetryInfoHttpRequestHandler.java | 10 ++-- .../core/client/request/RequestParam.java | 4 +- .../core/client/response/ResponsePool.java | 2 +- .../core/client/response/XRetryResponse.java | 8 +-- .../client/core/config/XRetryProperties.java | 7 ++- .../core/event/SimpleXRetryListener.java | 4 +- .../client/core/event/XRetryListener.java | 2 +- .../core/exception/XRetryClientException.java | 4 +- .../core/executor/AbstractRetryExecutor.java | 19 +++---- .../core/executor/GuavaRetryExecutor.java | 8 +-- .../core/generator/SimpleBizIdGenerate.java | 6 +-- .../retry/client/core/init/EndListener.java | 8 +-- .../retry/client/core/init/StartListener.java | 8 +-- .../client/core/intercepter/HeaderAspect.java | 15 +++--- .../client/core/intercepter/RetryAspect.java | 33 ++++++------ .../core/intercepter/RetrySiteSnapshot.java | 6 +-- .../core/plugin/RequestHeaderPlugins.java | 14 ++--- .../core/plugin/ResponseHeaderPlugins.java | 6 +-- .../core/register/RetryableRegistrar.java | 12 ++--- .../core/register/scan/RetryableScanner.java | 19 ++++--- .../client/core/report/ReportHandler.java | 28 +++++----- .../client/core/report/ReportListener.java | 48 +++++++++--------- .../retry/client/core/retryer/RetryType.java | 2 +- .../client/core/retryer/RetryerInfo.java | 8 +-- .../core/retryer/RetryerResultContext.java | 4 +- .../core/serializer/HessianSerializer.java | 4 +- .../core/serializer/JacksonSerializer.java | 6 +-- .../client/core/spel/SPELParamFunction.java | 2 +- .../strategy/AbstractRetryStrategies.java | 17 +++---- .../core/strategy/LocalRetryStrategies.java | 24 ++++----- .../core/strategy/RemoteRetryStrategies.java | 22 ++++---- .../core/strategy/RetryAnnotationMethod.java | 8 +-- .../client/core/strategy/RetryMethod.java | 2 +- .../client/core/strategy/RetryResult.java | 2 +- .../client/core/strategy/RetryStrategy.java | 6 +-- .../client/core/window/RetryLeapArray.java | 12 ++--- .../src/main/resources/application.properties | 0 .../XRetryClientCoreApplicationTests.java | 4 -- .../.gitignore | 0 .../pom.xml | 14 ++--- .../retry/client/starter/EnableXRetry.java | 2 +- .../XRetryClientAutoConfiguration.java | 4 +- .../starter/XRetryClientsRegistrar.java | 6 +-- .../main/resources/META-INF/spring.factories | 2 + .../XRetryClientStarterApplicationTests.java | 0 .../.gitignore | 0 .../easy-retry-common-client-api}/.gitignore | 0 .../easy-retry-common-client-api}/pom.xml | 14 ++--- .../retry/client/model/DispatchRetryDTO.java | 2 +- .../client/model/DispatchRetryResultDTO.java | 2 +- .../retry/client/model/RetryCallbackDTO.java | 2 +- .../src/main/resources/application.properties | 0 .../easy-retry-common-core}/.gitignore | 0 .../easy-retry-common-core}/pom.xml | 10 ++-- .../common/core/CommonCoreConfigure.java | 2 +- .../easy}/retry/common/core/alarm/Alarm.java | 2 +- .../retry/common/core/alarm/AlarmContext.java | 2 +- .../common/core/alarm/AltinAlarmFactory.java | 2 +- .../common/core/alarm/DingDingAttribute.java | 2 +- .../common/core/alarm/EmailAttribute.java | 4 +- .../core/alarm/strategy/AbstractAlarm.java | 4 +- .../core/alarm/strategy/DingdingAlarm.java | 12 ++--- .../core/alarm/strategy/EmailAlarm.java | 10 ++-- .../OriginalControllerReturnValue.java | 2 +- .../common/core/constant/SystemConstants.java | 6 +-- .../common/core/context/SpringContext.java | 2 +- .../common/core/covert/AbstractConverter.java | 4 +- .../retry/common/core/covert/Converter.java | 2 +- .../common/core/enums/AlarmTypeEnum.java | 2 +- .../core/enums/AllocationAlgorithmEnum.java | 2 +- .../common/core/enums/DelayLevelEnum.java | 4 +- .../retry/common/core/enums/HeadersEnum.java | 2 +- .../retry/common/core/enums/NodeTypeEnum.java | 2 +- .../common/core/enums/NotifySceneEnum.java | 2 +- .../common/core/enums/NotifyTypeEnum.java | 2 +- .../core/enums/RetryResultStatusEnum.java | 2 +- .../common/core/enums/RetryStatusEnum.java | 2 +- .../retry/common/core/enums/StatusEnum.java | 2 +- .../common/core/enums/StorageTypeEnum.java | 2 +- .../common/core/exception/AbstractError.java | 2 +- .../core/exception/BaseXRetryException.java | 2 +- .../core/exception/XRetryCommonException.java | 2 +- .../GlobalRestfulResponseBodyAdvice.java | 6 +-- .../core/handler/RestExceptionHandler.java | 8 +-- .../easy}/retry/common/core/log/LogUtils.java | 5 +- .../retry/common/core/model/NettyResult.java | 3 +- .../easy}/retry/common/core/model/Result.java | 2 +- .../common/core/model/XRetryHeaders.java | 4 +- .../common/core/model/XRetryRequest.java | 2 +- .../easy}/retry/common/core/util/Assert.java | 2 +- .../easy}/retry/common/core/util/Asserts.java | 7 ++- .../common/core/util/CronExpression.java | 2 +- .../retry/common/core/util/DingDingUtils.java | 4 +- .../common/core/util/EnvironmentUtils.java | 4 +- .../retry/common/core/util/HostUtils.java | 4 +- .../retry/common/core/util/JsonUtil.java | 4 +- .../retry/common/core/window/LeapArray.java | 2 +- .../retry/common/core/window/Listener.java | 2 +- .../retry/common/core/window/WindowWrap.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- .../easy-retry-common-server-api}/.gitignore | 0 .../easy-retry-common-server-api}/pom.xml | 14 ++--- .../retry/server/model/dto/ConfigDTO.java | 6 +-- .../retry/server/model/dto/RetryTaskDTO.java | 2 +- .../src/main/resources/application.properties | 0 {x-retry-common => easy-retry-common}/pom.xml | 16 +++--- .../.gitignore | 0 easy-retry-server/Dockerfile | 13 +++++ {x-retry-server => easy-retry-server}/pom.xml | 47 +++++++++-------- .../retry/server/XRetryServerApplication.java | 4 +- .../retry/server/akka/ActorGenerator.java | 16 +++--- .../retry/server/akka/AkkaConfiguration.java | 2 +- .../server/akka/SpringActorProducer.java | 2 +- .../retry/server/akka/SpringExtension.java | 2 +- .../retry/server/config/JacksonConfig.java | 4 +- .../server/config/MyBatisPlusConfig.java | 5 +- .../server/config/RequestDataHelper.java | 10 ++-- .../server/config/RestTemplateConfig.java | 2 +- .../retry/server/config/ShedlockConfig.java | 4 +- .../retry/server/config/SystemProperties.java | 4 +- .../exception/XRetryServerException.java | 4 +- .../mybatis/mapper/GroupConfigMapper.java | 8 +++ .../mybatis/mapper/NotifyConfigMapper.java | 7 +++ .../mybatis/mapper/RetryDeadLetterMapper.java | 8 +-- .../mybatis/mapper/RetryTaskLogMapper.java | 9 ++-- .../mybatis/mapper/RetryTaskMapper.java | 6 +-- .../mybatis/mapper/SceneConfigMapper.java | 4 +- .../mybatis/mapper/ServerNodeMapper.java | 5 +- .../mybatis/mapper/SystemUserMapper.java | 4 +- .../mapper/SystemUserPermissionMapper.java | 4 +- .../persistence/mybatis/po/GroupConfig.java | 2 +- .../persistence/mybatis/po/NotifyConfig.java | 2 +- .../mybatis/po/RetryDeadLetter.java | 2 +- .../persistence/mybatis/po/RetryTask.java | 2 +- .../persistence/mybatis/po/RetryTaskLog.java | 2 +- .../persistence/mybatis/po/SceneConfig.java | 2 +- .../persistence/mybatis/po/ServerNode.java | 2 +- .../persistence/mybatis/po/SystemUser.java | 2 +- .../mybatis/po/SystemUserPermission.java | 2 +- .../persistence/support/ConfigAccess.java | 12 ++--- .../persistence/support/RetryTaskAccess.java | 2 +- .../access/config/AbstractConfigAccess.java | 18 +++---- .../access/config/MybatisConfigAccess.java | 10 ++-- .../access/retry/AbstractRetryTaskAccess.java | 8 +-- .../access/retry/MybatisRetryTaskAccess.java | 14 ++--- .../processor/ConfigAccessProcessor.java | 18 +++---- .../processor/RetryTaskAccessProcessor.java | 12 ++--- .../retry/server/server/NettyHttpServer.java | 18 +++---- .../server/server/NettyHttpServerHandler.java | 19 +++---- .../handler/BeatHttpRequestHandler.java | 10 ++-- .../handler/ConfigHttpRequestHandler.java | 14 ++--- .../server/handler/GetHttpRequestHandler.java | 2 +- .../server/handler/HttpRequestHandler.java | 2 +- .../handler/PostHttpRequestHandler.java | 2 +- .../ReportRetryInfoHttpRequestHandler.java | 17 +++---- .../server/service/DashBoardService.java | 10 ++-- .../server/service/GroupConfigService.java | 11 ++-- .../server/service/NotifyConfigService.java | 4 +- .../service/RetryDeadLetterService.java | 8 +-- .../retry/server/service/RetryService.java | 4 +- .../server/service/RetryTaskLogService.java | 8 +-- .../server/service/RetryTaskService.java | 10 ++-- .../server/service/SceneConfigService.java | 8 +-- .../server/service/SystemUserService.java | 12 ++--- .../service/convert/GroupConfigConverter.java | 8 +-- .../GroupConfigResponseVOConverter.java | 8 +-- .../convert/NotifyConfigConverter.java | 8 +-- .../NotifyConfigResponseVOConverter.java | 8 +-- .../RetryDeadLetterResponseVOConverter.java | 8 +-- .../service/convert/RetryTaskConverter.java | 10 ++-- .../RetryTaskLogResponseVOConverter.java | 8 +-- .../convert/RetryTaskResponseVOConverter.java | 8 +-- .../service/convert/SceneConfigConverter.java | 8 +-- .../SceneConfigResponseVOConverter.java | 8 +-- .../SystemUserResponseVOConverter.java | 8 +-- .../service/impl/DashBoardServiceImpl.java | 26 +++++----- .../service/impl/GroupConfigServiceImpl.java | 46 ++++++++--------- .../service/impl/NotifyConfigServiceImpl.java | 12 ++--- .../impl/RetryDeadLetterServiceImpl.java | 29 +++++------ .../server/service/impl/RetryServiceImpl.java | 34 ++++++------- .../service/impl/RetryTaskLogServiceImpl.java | 16 +++--- .../service/impl/RetryTaskServiceImpl.java | 28 +++++----- .../service/impl/SceneConfigServiceImpl.java | 16 +++--- .../service/impl/SystemUserServiceImpl.java | 30 +++++------ .../server/support/ClientLoadBalance.java | 2 +- .../retry/server/support/FilterStrategy.java | 2 +- .../server/support/IdempotentStrategy.java | 2 +- .../easy/retry/server/support}/Lifecycle.java | 2 +- .../retry/server/support/RetryContext.java | 4 +- .../server/support/ServerLoadBalance.java | 4 +- .../retry/server/support/StopStrategy.java | 2 +- .../retry/server/support/WaitStrategy.java | 2 +- .../ClientLoadBalanceConsistentHash.java | 10 ++-- .../allocate/client/ClientLoadBalanceLRU.java | 5 +- .../client/ClientLoadBalanceManager.java | 4 +- .../client/ClientLoadBalanceRandom.java | 6 +-- .../allocate/common/ConsistentHashRouter.java | 2 +- .../support/allocate/common/HashFunction.java | 2 +- .../server/support/allocate/common/Node.java | 2 +- .../support/allocate/common/VirtualNode.java | 2 +- .../AllocateMessageQueueConsistentHash.java | 12 ++--- .../support/cache/CacheGroupRateLimiter.java | 8 ++- .../support/cache/CacheGroupScanActor.java | 6 +-- .../MaxAttemptsPersistenceRetryContext.java | 10 ++-- .../support/dispatch/DispatchService.java | 30 +++++------ .../callback/CallbackRetryResultActor.java | 20 ++++---- .../dispatch/actor/exec/ExecUnitActor.java | 30 +++++------ .../dispatch/actor/result/FailureActor.java | 24 ++++----- .../dispatch/actor/result/FinishActor.java | 20 ++++---- .../dispatch/actor/result/NoRetryActor.java | 14 ++--- .../dispatch/actor/scan/ScanGroupActor.java | 47 ++++++++--------- .../handler/ClientNodeAllocateHandler.java | 16 +++--- .../handler/ClientRegisterHandler.java | 18 +++---- .../handler/ServerRegisterNodeHandler.java | 17 +++---- .../BitSetIdempotentStrategyHandler.java | 6 +-- .../server/support/listener/EndListener.java | 8 +-- .../support/listener/StartListener.java | 8 +-- .../server/support/retry/RetryBuilder.java | 12 ++--- .../server/support/retry/RetryExecutor.java | 12 ++--- .../schedule/AlarmNotifyThreadSchedule.java | 28 +++++----- .../support/schedule/ClearThreadSchedule.java | 12 ++--- .../support/strategy/FilterStrategies.java | 22 ++++---- .../support/strategy/StopStrategies.java | 14 ++--- .../support/strategy/WaitStrategies.java | 22 ++++---- .../server/web/annotation/LoginRequired.java | 2 +- .../server/web/annotation/LoginUser.java | 2 +- .../retry/server/web/annotation/RoleEnum.java | 2 +- .../web/controller/DashBoardController.java | 14 ++--- .../web/controller/GroupConfigController.java | 16 +++--- .../controller/NotifyConfigController.java | 9 ++-- .../controller/RetryDeadLetterController.java | 12 ++--- .../web/controller/RetryTaskController.java | 14 ++--- .../controller/RetryTaskLogController.java | 12 ++--- .../SceneConfigSceneController.java | 12 ++--- .../web/controller/SystemUserController.java | 21 ++++---- .../server/web/controller/WebController.java | 2 +- .../AuthenticationInterceptor.java | 19 +++---- .../web/interceptor/CORSInterceptor.java | 2 +- .../LoginUserMethodArgumentResolver.java | 6 +-- .../XRetryWebMvcConfigurerAdapter.java | 4 +- .../server/web/model/base/BaseQueryVO.java | 2 +- .../server/web/model/base/PageResult.java | 4 +- .../server/web/model/enums/DateTypeEnum.java | 4 +- .../web/model/request/GroupConfigQueryVO.java | 4 +- .../model/request/GroupConfigRequestVO.java | 2 +- .../model/request/RetryDeadLetterQueryVO.java | 4 +- .../model/request/RetryTaskLogQueryVO.java | 4 +- .../web/model/request/RetryTaskQueryVO.java | 4 +- .../web/model/request/RetryTaskRequestVO.java | 4 +- .../web/model/request/SceneConfigQueryVO.java | 4 +- .../web/model/request/SystemUserQueryVO.java | 4 +- .../model/request/SystemUserRequestVO.java | 2 +- .../response/ActivePodQuantityResponseVO.java | 2 +- .../response/DispatchQuantityResponseVO.java | 2 +- .../model/response/GroupConfigResponseVO.java | 2 +- .../response/NotifyConfigResponseVO.java | 2 +- .../response/RetryDeadLetterResponseVO.java | 2 +- .../response/RetryTaskLogResponseVO.java | 2 +- .../model/response/RetryTaskResponseVO.java | 2 +- .../model/response/SceneConfigResponseVO.java | 3 +- .../response/SceneQuantityRankResponseVO.java | 2 +- .../model/response/SystemUserResponseVO.java | 2 +- .../response/TaskQuantityResponseVO.java | 2 +- .../admin/assets/background.6f870c8d.svg | 0 .../src/main/resources/admin/avatar2.jpg | Bin .../main/resources/admin/css/app.4f30d882.css | 0 .../admin/css/chunk-39be5683.cd4961ff.css | 0 .../admin/css/chunk-4a2f6b49.a04e8eb5.css | 0 .../admin/css/chunk-77aaac2a.99cbbcce.css | 0 .../admin/css/chunk-vendors.f716a607.css | 0 .../resources/admin/css/user.6ccd4506.css | 0 .../src/main/resources/admin/index.html | 1 + .../main/resources/admin/js/app.3cd5ed5d.js | 2 +- .../admin/js/chunk-08798c7e.3d1c2217.js | 0 .../admin/js/chunk-1bf36f2c.77dfdf42.js | 0 .../admin/js/chunk-244a93b4.28cf690b.js | 0 .../admin/js/chunk-2515aa86.599bc7f3.js | 0 .../admin/js/chunk-2672acfa.6c879ca6.js | 0 .../admin/js/chunk-2d21a08f.78a44d95.js | 0 .../admin/js/chunk-35f6c8ac.7808eb4b.js | 0 .../admin/js/chunk-39be5683.ab099dd2.js | 0 .../admin/js/chunk-4a2f6b49.f111b6b8.js | 0 .../admin/js/chunk-71608044.f5556476.js | 0 .../admin/js/chunk-77aaac2a.e87b660f.js | 0 .../admin/js/chunk-bf3addda.54791a87.js | 0 .../admin/js/chunk-vendors.dac3d562.js | 0 .../main/resources/admin/js/fail.84b62970.js | 0 .../lang-zh-CN-account-settings.f8f25eaf.js | 0 .../admin/js/lang-zh-CN-account.aa796242.js | 0 .../lang-zh-CN-dashboard-analysis.d7cabd65.js | 0 .../admin/js/lang-zh-CN-dashboard.92d928c3.js | 0 .../js/lang-zh-CN-form-basicForm.ff3088ac.js | 0 .../admin/js/lang-zh-CN-form.4042b6f3.js | 0 .../admin/js/lang-zh-CN-global.bf0df5c8.js | 0 .../admin/js/lang-zh-CN-menu.25425a62.js | 0 .../js/lang-zh-CN-result-fail.232762aa.js | 0 .../js/lang-zh-CN-result-success.3519c60c.js | 0 .../admin/js/lang-zh-CN-result.3bf01153.js | 0 .../admin/js/lang-zh-CN-setting.8c2ce690.js | 0 .../admin/js/lang-zh-CN-user.81513cba.js | 0 .../resources/admin/js/lang-zh-CN.4a7452d2.js | 0 .../main/resources/admin/js/user.98174af1.js | 0 .../src/main/resources/admin/logo.png | Bin .../src/main/resources/application.yml | 2 +- .../resources/mapper/GroupConfigMapper.xml | 4 +- .../resources/mapper/NotifyConfigMapper.xml | 4 +- .../mapper/RetryDeadLetterMapper.xml | 4 +- .../resources/mapper/RetryTaskLogMapper.xml | 8 +-- .../main/resources/mapper/RetryTaskMapper.xml | 4 +- .../resources/mapper/SceneConfigMapper.xml | 4 +- .../resources/mapper/ServerNodeMapper.xml | 6 +-- .../resources/mapper/SystemUserMapper.xml | 4 +- .../mapper/SystemUserPermissionMapper.xml | 4 +- .../server/ClientRegisterHandlerTest.java | 4 +- .../server/XRetryServerApplicationTests.java | 2 +- .../server/mapper/RetryTaskMapperTest.java | 11 ++-- .../mapper/SystemConfigGroupMapperTest.java | 2 +- example/Dockerfile | 4 +- example/pom.xml | 6 +-- .../src/main/java/com/example/CodeGen.java | 4 +- example/src/main/resources/application.yml | 2 +- frontend/package.json | 2 +- frontend/public/index.html | 6 +-- frontend/src/config/defaultSettings.js | 2 +- frontend/src/layouts/UserLayout.vue | 2 +- frontend/src/utils/request.js | 2 +- frontend/vue.config.js | 2 +- pom.xml | 38 +++++++------- .../main/resources/META-INF/spring.factories | 2 - x-retry-server/Dockerfile | 13 ----- .../mybatis/mapper/GroupConfigMapper.java | 11 ---- .../mybatis/mapper/NotifyConfigMapper.java | 10 ---- .../src/main/resources/admin/index.html | 1 - 355 files changed, 1222 insertions(+), 1280 deletions(-) rename {x-retry-client-core => easy-retry-client-core}/.gitignore (100%) rename {x-retry-client-core => easy-retry-client-core}/pom.xml (87%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/BizIdGenerate.java (78%) rename {x-retry-server/src/main/java/com/x/retry/server/support => easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core}/Lifecycle.java (84%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/RetryArgSerializer.java (88%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/RetryExecutor.java (82%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/RetryExecutorParameter.java (80%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/Scanner.java (58%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/annotation/Retryable.java (77%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/cache/GroupVersionCache.java (74%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/cache/RetryerInfoCache.java (82%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/callback/RetryCompleteCallback.java (84%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/callback/SimpleRetryCompleteCallback.java (90%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/client/NettyHttpClientHandler.java (83%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/client/NettyHttpConnectClient.java (91%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/client/RetryEndPoint.java (73%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/client/request/BeatHttpRequestHandler.java (83%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/client/request/ConfigHttpRequestHandler.java (76%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/client/request/GetHttpRequestHandler.java (71%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/client/request/HttpRequestHandler.java (66%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/client/request/PostHttpRequestHandler.java (71%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/client/request/ReportRetryInfoHttpRequestHandler.java (79%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/client/request/RequestParam.java (66%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/client/response/ResponsePool.java (83%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/client/response/XRetryResponse.java (84%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/config/XRetryProperties.java (83%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/event/SimpleXRetryListener.java (90%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/event/XRetryListener.java (87%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/exception/XRetryClientException.java (87%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/executor/AbstractRetryExecutor.java (72%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/executor/GuavaRetryExecutor.java (87%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/generator/SimpleBizIdGenerate.java (64%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/init/EndListener.java (77%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/init/StartListener.java (75%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/intercepter/HeaderAspect.java (84%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/intercepter/RetryAspect.java (87%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/intercepter/RetrySiteSnapshot.java (95%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/plugin/RequestHeaderPlugins.java (75%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/plugin/ResponseHeaderPlugins.java (77%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/register/RetryableRegistrar.java (76%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/register/scan/RetryableScanner.java (87%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/report/ReportHandler.java (80%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/report/ReportListener.java (72%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/retryer/RetryType.java (84%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/retryer/RetryerInfo.java (78%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/retryer/RetryerResultContext.java (72%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/serializer/HessianSerializer.java (93%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/serializer/JacksonSerializer.java (86%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/spel/SPELParamFunction.java (96%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/strategy/AbstractRetryStrategies.java (91%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/strategy/LocalRetryStrategies.java (88%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/strategy/RemoteRetryStrategies.java (80%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/strategy/RetryAnnotationMethod.java (80%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/strategy/RetryMethod.java (73%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/strategy/RetryResult.java (65%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/strategy/RetryStrategy.java (58%) rename {x-retry-client-core/src/main/java/com/x => easy-retry-client-core/src/main/java/com/aizuda/easy}/retry/client/core/window/RetryLeapArray.java (86%) rename {x-retry-client-core => easy-retry-client-core}/src/main/resources/application.properties (100%) rename {x-retry-client-core => easy-retry-client-core}/src/test/java/com/x/retry/common/client/core/xretryclientcore/XRetryClientCoreApplicationTests.java (51%) rename {x-retry-client-starter => easy-retry-client-starter}/.gitignore (100%) rename {x-retry-client-starter => easy-retry-client-starter}/pom.xml (73%) rename {x-retry-client-starter/src/main/java/com/x => easy-retry-client-starter/src/main/java/com/aizuda/easy}/retry/client/starter/EnableXRetry.java (87%) rename {x-retry-client-starter/src/main/java/com/x => easy-retry-client-starter/src/main/java/com/aizuda/easy}/retry/client/starter/XRetryClientAutoConfiguration.java (70%) rename {x-retry-client-starter/src/main/java/com/x => easy-retry-client-starter/src/main/java/com/aizuda/easy}/retry/client/starter/XRetryClientsRegistrar.java (87%) create mode 100644 easy-retry-client-starter/src/main/resources/META-INF/spring.factories rename {x-retry-client-starter => easy-retry-client-starter}/src/test/java/com/x/retry/common/client/starter/xretryclientstarter/XRetryClientStarterApplicationTests.java (100%) rename {x-retry-common => easy-retry-common}/.gitignore (100%) rename {x-retry-common/x-retry-common-client-api => easy-retry-common/easy-retry-common-client-api}/.gitignore (100%) rename {x-retry-common/x-retry-common-client-api => easy-retry-common/easy-retry-common-client-api}/pom.xml (84%) rename {x-retry-common/x-retry-common-client-api/src/main/java/com/x => easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy}/retry/client/model/DispatchRetryDTO.java (92%) rename {x-retry-common/x-retry-common-client-api/src/main/java/com/x => easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy}/retry/client/model/DispatchRetryResultDTO.java (86%) rename {x-retry-common/x-retry-common-client-api/src/main/java/com/x => easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy}/retry/client/model/RetryCallbackDTO.java (93%) rename {x-retry-common/x-retry-common-client-api => easy-retry-common/easy-retry-common-client-api}/src/main/resources/application.properties (100%) rename {x-retry-common/x-retry-common-core => easy-retry-common/easy-retry-common-core}/.gitignore (100%) rename {x-retry-common/x-retry-common-core => easy-retry-common/easy-retry-common-core}/pom.xml (91%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/CommonCoreConfigure.java (86%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/alarm/Alarm.java (84%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/alarm/AlarmContext.java (95%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/alarm/AltinAlarmFactory.java (94%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/alarm/DingDingAttribute.java (76%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/alarm/EmailAttribute.java (90%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/alarm/strategy/AbstractAlarm.java (78%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/alarm/strategy/DingdingAlarm.java (78%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/alarm/strategy/EmailAlarm.java (80%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/annotation/OriginalControllerReturnValue.java (83%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/constant/SystemConstants.java (59%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/context/SpringContext.java (96%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/covert/AbstractConverter.java (88%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/covert/Converter.java (84%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/enums/AlarmTypeEnum.java (89%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/enums/AllocationAlgorithmEnum.java (85%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/enums/DelayLevelEnum.java (93%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/enums/HeadersEnum.java (89%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/enums/NodeTypeEnum.java (87%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/enums/NotifySceneEnum.java (96%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/enums/NotifyTypeEnum.java (89%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/enums/RetryResultStatusEnum.java (92%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/enums/RetryStatusEnum.java (94%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/enums/StatusEnum.java (84%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/enums/StorageTypeEnum.java (85%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/exception/AbstractError.java (93%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/exception/BaseXRetryException.java (96%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/exception/XRetryCommonException.java (93%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/handler/GlobalRestfulResponseBodyAdvice.java (88%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/handler/RestExceptionHandler.java (96%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/log/LogUtils.java (92%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/model/NettyResult.java (87%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/model/Result.java (93%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/model/XRetryHeaders.java (82%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/model/XRetryRequest.java (90%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/util/Assert.java (83%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/util/Asserts.java (95%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/util/CronExpression.java (99%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/util/DingDingUtils.java (94%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/util/EnvironmentUtils.java (90%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/util/HostUtils.java (76%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/util/JsonUtil.java (98%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/window/LeapArray.java (99%) mode change 100755 => 100644 rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/window/Listener.java (85%) rename {x-retry-common/x-retry-common-core/src/main/java/com/x => easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy}/retry/common/core/window/WindowWrap.java (98%) mode change 100755 => 100644 rename {x-retry-common/x-retry-common-core => easy-retry-common/easy-retry-common-core}/src/main/resources/META-INF/spring.factories (54%) rename {x-retry-common/x-retry-common-server-api => easy-retry-common/easy-retry-common-server-api}/.gitignore (100%) rename {x-retry-common/x-retry-common-server-api => easy-retry-common/easy-retry-common-server-api}/pom.xml (84%) rename {x-retry-common/x-retry-common-server-api/src/main/java/com/x => easy-retry-common/easy-retry-common-server-api/src/main/java/com/aizuda/easy}/retry/server/model/dto/ConfigDTO.java (84%) rename {x-retry-common/x-retry-common-server-api/src/main/java/com/x => easy-retry-common/easy-retry-common-server-api/src/main/java/com/aizuda/easy}/retry/server/model/dto/RetryTaskDTO.java (96%) rename {x-retry-common/x-retry-common-server-api => easy-retry-common/easy-retry-common-server-api}/src/main/resources/application.properties (100%) rename {x-retry-common => easy-retry-common}/pom.xml (78%) rename {x-retry-server => easy-retry-server}/.gitignore (100%) create mode 100644 easy-retry-server/Dockerfile rename {x-retry-server => easy-retry-server}/pom.xml (79%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/XRetryServerApplication.java (84%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/akka/ActorGenerator.java (80%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/akka/AkkaConfiguration.java (97%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/akka/SpringActorProducer.java (96%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/akka/SpringExtension.java (95%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/config/JacksonConfig.java (81%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/config/MyBatisPlusConfig.java (92%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/config/RequestDataHelper.java (87%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/config/RestTemplateConfig.java (95%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/config/ShedlockConfig.java (92%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/config/SystemProperties.java (88%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/exception/XRetryServerException.java (73%) create mode 100644 easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/GroupConfigMapper.java create mode 100644 easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/NotifyConfigMapper.java rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/mybatis/mapper/RetryDeadLetterMapper.java (73%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/mybatis/mapper/RetryTaskLogMapper.java (78%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/mybatis/mapper/RetryTaskMapper.java (64%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/mybatis/mapper/SceneConfigMapper.java (62%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/mybatis/mapper/ServerNodeMapper.java (69%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/mybatis/mapper/SystemUserMapper.java (63%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/mybatis/mapper/SystemUserPermissionMapper.java (68%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/mybatis/po/GroupConfig.java (91%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/mybatis/po/NotifyConfig.java (91%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/mybatis/po/RetryDeadLetter.java (91%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/mybatis/po/RetryTask.java (93%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/mybatis/po/RetryTaskLog.java (91%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/mybatis/po/SceneConfig.java (92%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/mybatis/po/ServerNode.java (91%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/mybatis/po/SystemUser.java (92%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/mybatis/po/SystemUserPermission.java (91%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/support/ConfigAccess.java (82%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/support/RetryTaskAccess.java (90%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/support/access/config/AbstractConfigAccess.java (72%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/support/access/config/MybatisConfigAccess.java (88%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/support/access/retry/AbstractRetryTaskAccess.java (61%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/support/access/retry/MybatisRetryTaskAccess.java (84%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/support/processor/ConfigAccessProcessor.java (83%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/persistence/support/processor/RetryTaskAccessProcessor.java (79%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/server/NettyHttpServer.java (82%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/server/NettyHttpServerHandler.java (87%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/server/handler/BeatHttpRequestHandler.java (78%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/server/handler/ConfigHttpRequestHandler.java (76%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/server/handler/GetHttpRequestHandler.java (91%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/server/handler/HttpRequestHandler.java (88%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/server/handler/PostHttpRequestHandler.java (91%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/server/handler/ReportRetryInfoHttpRequestHandler.java (77%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/DashBoardService.java (58%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/GroupConfigService.java (58%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/NotifyConfigService.java (62%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/RetryDeadLetterService.java (61%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/RetryService.java (89%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/RetryTaskLogService.java (52%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/RetryTaskService.java (52%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/SceneConfigService.java (53%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/SystemUserService.java (57%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/convert/GroupConfigConverter.java (71%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/convert/GroupConfigResponseVOConverter.java (66%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/convert/NotifyConfigConverter.java (70%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/convert/NotifyConfigResponseVOConverter.java (66%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/convert/RetryDeadLetterResponseVOConverter.java (67%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/convert/RetryTaskConverter.java (75%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/convert/RetryTaskLogResponseVOConverter.java (66%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/convert/RetryTaskResponseVOConverter.java (68%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/convert/SceneConfigConverter.java (70%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/convert/SceneConfigResponseVOConverter.java (66%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/convert/SystemUserResponseVOConverter.java (66%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/impl/DashBoardServiceImpl.java (86%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/impl/GroupConfigServiceImpl.java (88%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/impl/NotifyConfigServiceImpl.java (67%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/impl/RetryDeadLetterServiceImpl.java (79%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/impl/RetryServiceImpl.java (79%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/impl/RetryTaskLogServiceImpl.java (81%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/impl/RetryTaskServiceImpl.java (81%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/impl/SceneConfigServiceImpl.java (77%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/service/impl/SystemUserServiceImpl.java (89%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/ClientLoadBalance.java (83%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/FilterStrategy.java (92%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/IdempotentStrategy.java (84%) rename {x-retry-client-core/src/main/java/com/x/retry/client/core => easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support}/Lifecycle.java (83%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/RetryContext.java (79%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/ServerLoadBalance.java (92%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/StopStrategy.java (86%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/WaitStrategy.java (89%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/allocate/client/ClientLoadBalanceConsistentHash.java (79%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/allocate/client/ClientLoadBalanceLRU.java (90%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/allocate/client/ClientLoadBalanceManager.java (89%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/allocate/client/ClientLoadBalanceRandom.java (77%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/allocate/common/ConsistentHashRouter.java (98%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/allocate/common/HashFunction.java (93%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/allocate/common/Node.java (94%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/allocate/common/VirtualNode.java (90%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/allocate/server/AllocateMessageQueueConsistentHash.java (89%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/cache/CacheGroupRateLimiter.java (87%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/cache/CacheGroupScanActor.java (86%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/context/MaxAttemptsPersistenceRetryContext.java (69%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/dispatch/DispatchService.java (84%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/dispatch/actor/callback/CallbackRetryResultActor.java (82%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/dispatch/actor/exec/ExecUnitActor.java (83%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/dispatch/actor/result/FailureActor.java (80%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/dispatch/actor/result/FinishActor.java (80%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/dispatch/actor/result/NoRetryActor.java (77%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/dispatch/actor/scan/ScanGroupActor.java (77%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/handler/ClientNodeAllocateHandler.java (72%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/handler/ClientRegisterHandler.java (85%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/handler/ServerRegisterNodeHandler.java (82%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/idempotent/BitSetIdempotentStrategyHandler.java (87%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/listener/EndListener.java (75%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/listener/StartListener.java (75%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/retry/RetryBuilder.java (84%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/retry/RetryExecutor.java (84%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/schedule/AlarmNotifyThreadSchedule.java (85%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/schedule/ClearThreadSchedule.java (82%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/strategy/FilterStrategies.java (88%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/strategy/StopStrategies.java (78%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/support/strategy/WaitStrategies.java (91%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/annotation/LoginRequired.java (89%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/annotation/LoginUser.java (87%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/annotation/RoleEnum.java (94%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/controller/DashBoardController.java (83%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/controller/GroupConfigController.java (73%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/controller/NotifyConfigController.java (72%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/controller/RetryDeadLetterController.java (77%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/controller/RetryTaskController.java (75%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/controller/RetryTaskLogController.java (71%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/controller/SceneConfigSceneController.java (71%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/controller/SystemUserController.java (71%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/controller/WebController.java (86%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/interceptor/AuthenticationInterceptor.java (86%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/interceptor/CORSInterceptor.java (93%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/interceptor/LoginUserMethodArgumentResolver.java (88%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/interceptor/XRetryWebMvcConfigurerAdapter.java (90%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/base/BaseQueryVO.java (77%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/base/PageResult.java (86%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/enums/DateTypeEnum.java (98%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/request/GroupConfigQueryVO.java (77%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/request/GroupConfigRequestVO.java (97%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/request/RetryDeadLetterQueryVO.java (68%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/request/RetryTaskLogQueryVO.java (68%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/request/RetryTaskQueryVO.java (71%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/request/RetryTaskRequestVO.java (74%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/request/SceneConfigQueryVO.java (64%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/request/SystemUserQueryVO.java (60%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/request/SystemUserRequestVO.java (93%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/response/ActivePodQuantityResponseVO.java (79%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/response/DispatchQuantityResponseVO.java (85%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/response/GroupConfigResponseVO.java (90%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/response/NotifyConfigResponseVO.java (90%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/response/RetryDeadLetterResponseVO.java (88%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/response/RetryTaskLogResponseVO.java (90%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/response/RetryTaskResponseVO.java (91%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/response/SceneConfigResponseVO.java (83%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/response/SceneQuantityRankResponseVO.java (80%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/response/SystemUserResponseVO.java (87%) rename {x-retry-server/src/main/java/com/x => easy-retry-server/src/main/java/com/aizuda/easy}/retry/server/web/model/response/TaskQuantityResponseVO.java (81%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/assets/background.6f870c8d.svg (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/avatar2.jpg (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/css/app.4f30d882.css (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/css/chunk-39be5683.cd4961ff.css (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/css/chunk-4a2f6b49.a04e8eb5.css (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/css/chunk-77aaac2a.99cbbcce.css (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/css/chunk-vendors.f716a607.css (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/css/user.6ccd4506.css (100%) create mode 100644 easy-retry-server/src/main/resources/admin/index.html rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/app.3cd5ed5d.js (74%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/chunk-08798c7e.3d1c2217.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/chunk-1bf36f2c.77dfdf42.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/chunk-244a93b4.28cf690b.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/chunk-2515aa86.599bc7f3.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/chunk-2672acfa.6c879ca6.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/chunk-2d21a08f.78a44d95.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/chunk-35f6c8ac.7808eb4b.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/chunk-39be5683.ab099dd2.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/chunk-4a2f6b49.f111b6b8.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/chunk-71608044.f5556476.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/chunk-77aaac2a.e87b660f.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/chunk-bf3addda.54791a87.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/chunk-vendors.dac3d562.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/fail.84b62970.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/lang-zh-CN-account-settings.f8f25eaf.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/lang-zh-CN-account.aa796242.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/lang-zh-CN-dashboard-analysis.d7cabd65.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/lang-zh-CN-dashboard.92d928c3.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/lang-zh-CN-form-basicForm.ff3088ac.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/lang-zh-CN-form.4042b6f3.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/lang-zh-CN-global.bf0df5c8.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/lang-zh-CN-menu.25425a62.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/lang-zh-CN-result-fail.232762aa.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/lang-zh-CN-result-success.3519c60c.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/lang-zh-CN-result.3bf01153.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/lang-zh-CN-setting.8c2ce690.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/lang-zh-CN-user.81513cba.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/lang-zh-CN.4a7452d2.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/js/user.98174af1.js (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/admin/logo.png (100%) rename {x-retry-server => easy-retry-server}/src/main/resources/application.yml (98%) rename {x-retry-server => easy-retry-server}/src/main/resources/mapper/GroupConfigMapper.xml (83%) rename {x-retry-server => easy-retry-server}/src/main/resources/mapper/NotifyConfigMapper.xml (83%) rename {x-retry-server => easy-retry-server}/src/main/resources/mapper/RetryDeadLetterMapper.xml (91%) rename {x-retry-server => easy-retry-server}/src/main/resources/mapper/RetryTaskLogMapper.xml (90%) rename {x-retry-server => easy-retry-server}/src/main/resources/mapper/RetryTaskMapper.xml (94%) rename {x-retry-server => easy-retry-server}/src/main/resources/mapper/SceneConfigMapper.xml (85%) rename {x-retry-server => easy-retry-server}/src/main/resources/mapper/ServerNodeMapper.xml (86%) rename {x-retry-server => easy-retry-server}/src/main/resources/mapper/SystemUserMapper.xml (72%) rename {x-retry-server => easy-retry-server}/src/main/resources/mapper/SystemUserPermissionMapper.xml (69%) rename {x-retry-server/src/test/java/com/x => easy-retry-server/src/test/java/com/aizuda/easy}/retry/server/ClientRegisterHandlerTest.java (82%) rename {x-retry-server/src/test/java/com/x => easy-retry-server/src/test/java/com/aizuda/easy}/retry/server/XRetryServerApplicationTests.java (96%) rename {x-retry-server/src/test/java/com/x => easy-retry-server/src/test/java/com/aizuda/easy}/retry/server/mapper/RetryTaskMapperTest.java (66%) rename {x-retry-server/src/test/java/com/x => easy-retry-server/src/test/java/com/aizuda/easy}/retry/server/mapper/SystemConfigGroupMapperTest.java (81%) delete mode 100644 x-retry-client-starter/src/main/resources/META-INF/spring.factories delete mode 100755 x-retry-server/Dockerfile delete mode 100644 x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/GroupConfigMapper.java delete mode 100644 x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/NotifyConfigMapper.java delete mode 100644 x-retry-server/src/main/resources/admin/index.html diff --git a/README.md b/README.md index 8b6909cde..e6c82e1d1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -## 《分布式异常重试服务平台 X-RETRY》 +## 《分布式异常重试服务平台 easy-retry》 # 简介 -> X-RETRY 基于服务治理的思想我们开发了重试治理的功能，支持动态配置，接入方式基本无需入侵业务代码，并使用多种策略结合的方式在链路层面控制重试放大效应，兼顾易用性、灵活性、安全性的分布式异常重试服务平台 +> easy-retry 基于服务治理的思想我们开发了重试治理的功能，支持动态配置，接入方式基本无需入侵业务代码，并使用多种策略结合的方式在链路层面控制重试放大效应，兼顾易用性、灵活性、安全性的分布式异常重试服务平台 # 后端管理系统预览 地址: @@ -29,14 +29,14 @@ ## 添加依赖 ```java - com.x.retry - x-retry-client-starter + com.aizuda + easy-retry-client-starter 最新版本 ``` ## 配置 -添加注解开启X-RETRY功能 +添加注解开启easy-retry功能 ```java @SpringBootApplication @EnableXRetry(group = "example_group") @@ -87,7 +87,7 @@ doc/sql/x_retry.sql ```yaml spring: datasource: - name: x_retry + name: easy_retry url: jdbc:mysql://localhost:3306/x_retry?useSSL=false&characterEncoding=utf8&useUnicode=true username: root password: root @@ -99,7 +99,7 @@ spring: maximum-pool-size: 20 auto-commit: true idle-timeout: 30000 - pool-name: x_retry + pool-name: easy_retry max-lifetime: 1800000 connection-test-query: SELECT 1 resources: @@ -116,7 +116,7 @@ mybatis-plus: configuration: map-underscore-to-camel-case: true cache-enabled: true -x-retry: +easy-retry: lastDays: 30 # 拉取重试数据的天数 retryPullPageSize: 100 # 拉取重试数据的每批次的大小 nettyPort: 1788 # 服务端netty端口 @@ -128,7 +128,7 @@ x-retry: ### 下载源码部署 - 下载源码 ``` - https://github.com/byteblogs168/x-retry.git + https://github.com/byteblogs168/easy-retry.git ``` - maven 打包镜像 @@ -138,19 +138,19 @@ maven clean install - 修改配置 ``` -/x-retry-server/src/main/resources/application.yml +/easy-retry-server/src/main/resources/application.yml ``` - 启动 ``` -java -jar x-retry-server.jar +java -jar easy-retry-server.jar ``` ### docker 部署 - 下载镜像 - 地址: https://github.com/byteblogs168/x-retry/pkgs/container/x-retry-server + 地址: https://github.com/byteblogs168/easy-retry/pkgs/container/easy-retry-server ``` - docker pull ghcr.io/byteblogs168/x-retry-server:{最新版本} + docker pull ghcr.io/byteblogs168/easy-retry-server:{最新版本} ``` - 创建容器并运行 @@ -158,15 +158,15 @@ java -jar x-retry-server.jar ``` /** * 如需自定义 mysql 等配置，可通过 "-e PARAMS" 指定，参数格式 PARAMS="--key1=value1 --key2=value2" ； -* 配置项参考文件：/x-retry-server/src/main/resources/application.yml +* 配置项参考文件：/easy-retry-server/src/main/resources/application.yml * 如需自定义 JVM内存参数 等配置，可通过 "-e JAVA_OPTS" 指定，参数格式 JAVA_OPTS="-Xmx512m" ； */ docker run \ -e PARAMS="--spring.datasource.username=root --spring.datasource.password=123456 --spring.datasource.url=jdbc:mysql://ip:3306/x_retry?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai " \ -p 8080:8080 \ -p 1788:1788 \ - --name x-retry-server-1 \ - -d registry.cn-shanghai.aliyuncs.com/byteblogs/x-retry:{最新版本} + --name easy-retry-server-1 \ + -d registry.cn-shanghai.aliyuncs.com/byteblogs/easy-retry:{最新版本} ``` diff --git a/x-retry-client-core/.gitignore b/easy-retry-client-core/.gitignore similarity index 100% rename from x-retry-client-core/.gitignore rename to easy-retry-client-core/.gitignore diff --git a/x-retry-client-core/pom.xml b/easy-retry-client-core/pom.xml similarity index 87% rename from x-retry-client-core/pom.xml rename to easy-retry-client-core/pom.xml index 9bad498f7..3bd485971 100644 --- a/x-retry-client-core/pom.xml +++ b/easy-retry-client-core/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.byteblogs - x-retry + com.aizuda + easy-retry ${revision} ../pom.xml - x-retry-client-core - x-retry-client-core - x-retry-client-core + easy-retry-client-core + easy-retry-client-core + easy-retry-client-core jar @@ -54,8 +54,8 @@ test - com.byteblogs - x-retry-common-core + com.aizuda + easy-retry-common-core com.caucho @@ -67,12 +67,12 @@ netty-all - com.byteblogs - x-retry-common-server-api + com.aizuda + easy-retry-common-server-api - com.byteblogs - x-retry-common-client-api + com.aizuda + easy-retry-common-client-api diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/BizIdGenerate.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/BizIdGenerate.java similarity index 78% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/BizIdGenerate.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/BizIdGenerate.java index a8e75b6c6..817aaac9a 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/BizIdGenerate.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/BizIdGenerate.java @@ -1,4 +1,4 @@ -package com.x.retry.client.core; +package com.aizuda.easy.retry.client.core; /** * @author: www.byteblogs.com diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/Lifecycle.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/Lifecycle.java similarity index 84% rename from x-retry-server/src/main/java/com/x/retry/server/support/Lifecycle.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/Lifecycle.java index 78d553163..63d4a6e85 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/Lifecycle.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/Lifecycle.java @@ -1,4 +1,4 @@ -package com.x.retry.server.support; +package com.aizuda.easy.retry.client.core; /** * 组件生命周期 diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/RetryArgSerializer.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/RetryArgSerializer.java similarity index 88% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/RetryArgSerializer.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/RetryArgSerializer.java index 8c491826b..eb8494caa 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/RetryArgSerializer.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/RetryArgSerializer.java @@ -1,4 +1,4 @@ -package com.x.retry.client.core; +package com.aizuda.easy.retry.client.core; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/RetryExecutor.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/RetryExecutor.java similarity index 82% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/RetryExecutor.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/RetryExecutor.java index f3ba0179a..2ee5c69b7 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/RetryExecutor.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/RetryExecutor.java @@ -1,7 +1,7 @@ -package com.x.retry.client.core; +package com.aizuda.easy.retry.client.core; import com.github.rholder.retry.Retryer; -import com.x.retry.client.core.retryer.RetryerInfo; +import com.aizuda.easy.retry.client.core.retryer.RetryerInfo; import java.util.concurrent.Callable; import java.util.function.Consumer; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/RetryExecutorParameter.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/RetryExecutorParameter.java similarity index 80% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/RetryExecutorParameter.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/RetryExecutorParameter.java index 8ea60f37f..f5826a8e1 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/RetryExecutorParameter.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/RetryExecutorParameter.java @@ -1,8 +1,7 @@ -package com.x.retry.client.core; +package com.aizuda.easy.retry.client.core; import com.github.rholder.retry.RetryListener; import com.google.common.base.Predicate; -import com.x.retry.client.core.retryer.RetryerInfo; import java.util.List; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/Scanner.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/Scanner.java similarity index 58% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/Scanner.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/Scanner.java index 42fd9cda7..3e875c1ef 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/Scanner.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/Scanner.java @@ -1,6 +1,6 @@ -package com.x.retry.client.core; +package com.aizuda.easy.retry.client.core; -import com.x.retry.client.core.retryer.RetryerInfo; +import com.aizuda.easy.retry.client.core.retryer.RetryerInfo; import java.util.List; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/annotation/Retryable.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/annotation/Retryable.java similarity index 77% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/annotation/Retryable.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/annotation/Retryable.java index 9bb4152dd..7c7616e7e 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/annotation/Retryable.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/annotation/Retryable.java @@ -1,13 +1,13 @@ -package com.x.retry.client.core.annotation; +package com.aizuda.easy.retry.client.core.annotation; -import com.x.retry.client.core.BizIdGenerate; -import com.x.retry.client.core.callback.RetryCompleteCallback; -import com.x.retry.client.core.callback.SimpleRetryCompleteCallback; -import com.x.retry.client.core.generator.SimpleBizIdGenerate; -import com.x.retry.client.core.retryer.RetryType; -import com.x.retry.client.core.strategy.RetryAnnotationMethod; -import com.x.retry.client.core.strategy.RetryMethod; +import com.aizuda.easy.retry.client.core.BizIdGenerate; +import com.aizuda.easy.retry.client.core.generator.SimpleBizIdGenerate; +import com.aizuda.easy.retry.client.core.strategy.RetryAnnotationMethod; +import com.aizuda.easy.retry.client.core.callback.RetryCompleteCallback; +import com.aizuda.easy.retry.client.core.callback.SimpleRetryCompleteCallback; +import com.aizuda.easy.retry.client.core.retryer.RetryType; +import com.aizuda.easy.retry.client.core.strategy.RetryMethod; import java.lang.annotation.*; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/cache/GroupVersionCache.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/cache/GroupVersionCache.java similarity index 74% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/cache/GroupVersionCache.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/cache/GroupVersionCache.java index 005c192e6..c51843ab1 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/cache/GroupVersionCache.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/cache/GroupVersionCache.java @@ -1,14 +1,14 @@ -package com.x.retry.client.core.cache; +package com.aizuda.easy.retry.client.core.cache; -import com.x.retry.client.core.Lifecycle; -import com.x.retry.client.core.client.NettyHttpConnectClient; -import com.x.retry.client.core.client.request.ConfigHttpRequestHandler; -import com.x.retry.client.core.client.request.RequestParam; -import com.x.retry.client.core.client.response.XRetryResponse; -import com.x.retry.common.core.context.SpringContext; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.model.XRetryRequest; -import com.x.retry.server.model.dto.ConfigDTO; +import com.aizuda.easy.retry.client.core.client.request.ConfigHttpRequestHandler; +import com.aizuda.easy.retry.client.core.client.request.RequestParam; +import com.aizuda.easy.retry.client.core.client.response.XRetryResponse; +import com.aizuda.easy.retry.client.core.Lifecycle; +import com.aizuda.easy.retry.client.core.client.NettyHttpConnectClient; +import com.aizuda.easy.retry.common.core.context.SpringContext; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.model.XRetryRequest; +import com.aizuda.easy.retry.server.model.dto.ConfigDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/cache/RetryerInfoCache.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/cache/RetryerInfoCache.java similarity index 82% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/cache/RetryerInfoCache.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/cache/RetryerInfoCache.java index d44880b2f..a5826e232 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/cache/RetryerInfoCache.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/cache/RetryerInfoCache.java @@ -1,9 +1,8 @@ -package com.x.retry.client.core.cache; +package com.aizuda.easy.retry.client.core.cache; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Table; -import com.x.retry.client.core.retryer.RetryerInfo; -import org.springframework.stereotype.Component; +import com.aizuda.easy.retry.client.core.retryer.RetryerInfo; /** * @author: www.byteblogs.com diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/callback/RetryCompleteCallback.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/callback/RetryCompleteCallback.java similarity index 84% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/callback/RetryCompleteCallback.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/callback/RetryCompleteCallback.java index 6d5c0f7d9..9aac2c29e 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/callback/RetryCompleteCallback.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/callback/RetryCompleteCallback.java @@ -1,4 +1,4 @@ -package com.x.retry.client.core.callback; +package com.aizuda.easy.retry.client.core.callback; /** * @author: www.byteblogs.com diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/callback/SimpleRetryCompleteCallback.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/callback/SimpleRetryCompleteCallback.java similarity index 90% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/callback/SimpleRetryCompleteCallback.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/callback/SimpleRetryCompleteCallback.java index 2019233f9..f88dbd7d0 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/callback/SimpleRetryCompleteCallback.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/callback/SimpleRetryCompleteCallback.java @@ -1,4 +1,4 @@ -package com.x.retry.client.core.callback; +package com.aizuda.easy.retry.client.core.callback; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/client/NettyHttpClientHandler.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/NettyHttpClientHandler.java similarity index 83% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/client/NettyHttpClientHandler.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/NettyHttpClientHandler.java index f465e59e4..c19e13698 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/client/NettyHttpClientHandler.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/client/NettyHttpClientHandler.java @@ -1,15 +1,15 @@ -package com.x.retry.client.core.client; +package com.aizuda.easy.retry.client.core.client; -import com.x.retry.client.core.client.request.BeatHttpRequestHandler; -import com.x.retry.client.core.client.request.RequestParam; -import com.x.retry.client.core.client.response.XRetryResponse; -import com.x.retry.client.core.config.XRetryProperties; -import com.x.retry.common.core.context.SpringContext; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.model.NettyResult; -import com.x.retry.common.core.model.XRetryRequest; -import com.x.retry.common.core.util.HostUtils; -import com.x.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.client.core.client.request.BeatHttpRequestHandler; +import com.aizuda.easy.retry.client.core.client.response.XRetryResponse; +import com.aizuda.easy.retry.client.core.config.XRetryProperties; +import com.aizuda.easy.retry.client.core.client.request.RequestParam; +import com.aizuda.easy.retry.common.core.context.SpringContext; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.model.NettyResult; +import com.aizuda.easy.retry.common.core.model.XRetryRequest; +import com.aizuda.easy.retry.common.core.util.HostUtils; +import com.aizuda.easy.retry.common.core.util.JsonUtil; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import io.netty.handler.codec.http.FullHttpResponse; @@ -95,7 +95,7 @@ public class NettyHttpClientHandler extends SimpleChannelInboundHandler { @Override public void onApplicationEvent(ContextClosedEvent event) { - log.info("X-RETRY-CLIENT 关闭"); + log.info("easy-retry-CLIENT 关闭"); lifecycleList.forEach(Lifecycle::close); - log.info("X-RETRY-CLIENT 关闭成功"); + log.info("easy-retry-CLIENT 关闭成功"); } } diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/init/StartListener.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/init/StartListener.java similarity index 75% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/init/StartListener.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/init/StartListener.java index 10462edd1..0bd7e7f4b 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/init/StartListener.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/init/StartListener.java @@ -1,6 +1,6 @@ -package com.x.retry.client.core.init; +package com.aizuda.easy.retry.client.core.init; -import com.x.retry.client.core.Lifecycle; +import com.aizuda.easy.retry.client.core.Lifecycle; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; @@ -24,8 +24,8 @@ public class StartListener implements ApplicationRunner { @Override public void run(ApplicationArguments args) throws Exception { - log.info("X-RETRY-CLIENT-RETRY 启动"); + log.info("easy-retry-CLIENT-RETRY 启动"); lifecycleList.forEach(Lifecycle::start); - log.info("X-RETRY-CLIENT-RETRY 启动成功"); + log.info("easy-retry-CLIENT-RETRY 启动成功"); } } diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/intercepter/HeaderAspect.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/HeaderAspect.java similarity index 84% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/intercepter/HeaderAspect.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/HeaderAspect.java index 219fbb657..8d2d5d663 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/intercepter/HeaderAspect.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/HeaderAspect.java @@ -1,16 +1,13 @@ -package com.x.retry.client.core.intercepter; +package com.aizuda.easy.retry.client.core.intercepter; -import com.x.retry.common.core.constant.SystemConstants; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.model.XRetryHeaders; -import com.x.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.common.core.constant.SystemConstants; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.model.XRetryHeaders; +import com.aizuda.easy.retry.common.core.util.JsonUtil; import lombok.extern.slf4j.Slf4j; -import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; @@ -36,7 +33,7 @@ public class HeaderAspect { // 标记进入方法的时间 RetrySiteSnapshot.setEntryMethodTime(System.currentTimeMillis()); - LogUtils.info(log, "x-retry 拦截器 xRetry:[{}]", xRetry); + LogUtils.info(log, "easy-retry 拦截器 xRetry:[{}]", xRetry); RetrySiteSnapshot.setRetryHeader(JsonUtil.parseObject(xRetry, XRetryHeaders.class)); } } diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/intercepter/RetryAspect.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/RetryAspect.java similarity index 87% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/intercepter/RetryAspect.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/RetryAspect.java index 8e9559bfd..df6088204 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/intercepter/RetryAspect.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/RetryAspect.java @@ -1,20 +1,20 @@ -package com.x.retry.client.core.intercepter; +package com.aizuda.easy.retry.client.core.intercepter; import cn.hutool.core.util.StrUtil; -import com.x.retry.client.core.annotation.Retryable; -import com.x.retry.client.core.cache.GroupVersionCache; -import com.x.retry.client.core.config.XRetryProperties; -import com.x.retry.client.core.exception.XRetryClientException; -import com.x.retry.client.core.retryer.RetryerResultContext; -import com.x.retry.client.core.strategy.RetryStrategy; -import com.x.retry.common.core.alarm.Alarm; -import com.x.retry.common.core.alarm.AlarmContext; -import com.x.retry.common.core.alarm.AltinAlarmFactory; -import com.x.retry.common.core.enums.NotifySceneEnum; -import com.x.retry.common.core.enums.RetryResultStatusEnum; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.util.EnvironmentUtils; -import com.x.retry.server.model.dto.ConfigDTO; +import com.aizuda.easy.retry.client.core.cache.GroupVersionCache; +import com.aizuda.easy.retry.client.core.config.XRetryProperties; +import com.aizuda.easy.retry.client.core.exception.XRetryClientException; +import com.aizuda.easy.retry.client.core.strategy.RetryStrategy; +import com.aizuda.easy.retry.client.core.annotation.Retryable; +import com.aizuda.easy.retry.client.core.retryer.RetryerResultContext; +import com.aizuda.easy.retry.common.core.alarm.Alarm; +import com.aizuda.easy.retry.common.core.alarm.AlarmContext; +import com.aizuda.easy.retry.common.core.alarm.AltinAlarmFactory; +import com.aizuda.easy.retry.common.core.enums.NotifySceneEnum; +import com.aizuda.easy.retry.common.core.enums.RetryResultStatusEnum; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.util.EnvironmentUtils; +import com.aizuda.easy.retry.server.model.dto.ConfigDTO; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -25,7 +25,6 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.PriorityOrdered; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import org.springframework.transaction.support.TransactionSynchronizationManager; import java.lang.reflect.Method; import java.time.LocalDateTime; @@ -57,7 +56,7 @@ public class RetryAspect { @Autowired private AltinAlarmFactory altinAlarmFactory; - @Around("@annotation(com.x.retry.client.core.annotation.Retryable)") + @Around("@annotation(com.aizuda.easy.retry.client.core.annotation.Retryable)") public Object around(ProceedingJoinPoint point) throws Throwable { String traceId = UUID.randomUUID().toString(); diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/intercepter/RetrySiteSnapshot.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/RetrySiteSnapshot.java similarity index 95% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/intercepter/RetrySiteSnapshot.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/RetrySiteSnapshot.java index 837ad8fbd..73d5eba55 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/intercepter/RetrySiteSnapshot.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/intercepter/RetrySiteSnapshot.java @@ -1,7 +1,7 @@ -package com.x.retry.client.core.intercepter; +package com.aizuda.easy.retry.client.core.intercepter; -import com.x.retry.common.core.constant.SystemConstants; -import com.x.retry.common.core.model.XRetryHeaders; +import com.aizuda.easy.retry.common.core.constant.SystemConstants; +import com.aizuda.easy.retry.common.core.model.XRetryHeaders; import lombok.Getter; import java.util.Objects; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/plugin/RequestHeaderPlugins.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/plugin/RequestHeaderPlugins.java similarity index 75% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/plugin/RequestHeaderPlugins.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/plugin/RequestHeaderPlugins.java index 9ea40cd91..ac45da343 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/plugin/RequestHeaderPlugins.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/plugin/RequestHeaderPlugins.java @@ -1,11 +1,11 @@ -package com.x.retry.client.core.plugin; +package com.aizuda.easy.retry.client.core.plugin; -import com.x.retry.client.core.exception.XRetryClientException; -import com.x.retry.client.core.intercepter.RetrySiteSnapshot; -import com.x.retry.common.core.constant.SystemConstants; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.model.XRetryHeaders; -import com.x.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.client.core.exception.XRetryClientException; +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.log.LogUtils; +import com.aizuda.easy.retry.common.core.model.XRetryHeaders; +import com.aizuda.easy.retry.common.core.util.JsonUtil; import lombok.extern.slf4j.Slf4j; import java.util.HashMap; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/plugin/ResponseHeaderPlugins.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/plugin/ResponseHeaderPlugins.java similarity index 77% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/plugin/ResponseHeaderPlugins.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/plugin/ResponseHeaderPlugins.java index ffd712e54..31469177d 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/plugin/ResponseHeaderPlugins.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/plugin/ResponseHeaderPlugins.java @@ -1,7 +1,7 @@ -package com.x.retry.client.core.plugin; +package com.aizuda.easy.retry.client.core.plugin; -import com.x.retry.client.core.intercepter.RetrySiteSnapshot; -import com.x.retry.common.core.constant.SystemConstants; +import com.aizuda.easy.retry.client.core.intercepter.RetrySiteSnapshot; +import com.aizuda.easy.retry.common.core.constant.SystemConstants; import java.util.List; import java.util.Map; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/register/RetryableRegistrar.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/register/RetryableRegistrar.java similarity index 76% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/register/RetryableRegistrar.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/register/RetryableRegistrar.java index 86d7c8c4a..f059ec499 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/register/RetryableRegistrar.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/register/RetryableRegistrar.java @@ -1,10 +1,10 @@ -package com.x.retry.client.core.register; +package com.aizuda.easy.retry.client.core.register; -import com.x.retry.client.core.Lifecycle; -import com.x.retry.client.core.Scanner; -import com.x.retry.client.core.cache.RetryerInfoCache; -import com.x.retry.client.core.exception.XRetryClientException; -import com.x.retry.client.core.retryer.RetryerInfo; +import com.aizuda.easy.retry.client.core.Lifecycle; +import com.aizuda.easy.retry.client.core.Scanner; +import com.aizuda.easy.retry.client.core.cache.RetryerInfoCache; +import com.aizuda.easy.retry.client.core.exception.XRetryClientException; +import com.aizuda.easy.retry.client.core.retryer.RetryerInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/register/scan/RetryableScanner.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/register/scan/RetryableScanner.java similarity index 87% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/register/scan/RetryableScanner.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/register/scan/RetryableScanner.java index e86aed9da..223fb1540 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/register/scan/RetryableScanner.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/register/scan/RetryableScanner.java @@ -1,14 +1,13 @@ -package com.x.retry.client.core.register.scan; +package com.aizuda.easy.retry.client.core.register.scan; -import com.x.retry.client.core.BizIdGenerate; -import com.x.retry.client.core.annotation.Retryable; -import com.x.retry.client.core.Scanner; -import com.x.retry.client.core.callback.RetryCompleteCallback; -import com.x.retry.client.core.retryer.RetryType; -import com.x.retry.client.core.retryer.RetryerInfo; -import com.x.retry.client.core.strategy.RetryMethod; -import com.x.retry.common.core.context.SpringContext; -import com.x.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.client.core.BizIdGenerate; +import com.aizuda.easy.retry.client.core.Scanner; +import com.aizuda.easy.retry.client.core.annotation.Retryable; +import com.aizuda.easy.retry.client.core.callback.RetryCompleteCallback; +import com.aizuda.easy.retry.client.core.retryer.RetryType; +import com.aizuda.easy.retry.client.core.retryer.RetryerInfo; +import com.aizuda.easy.retry.client.core.strategy.RetryMethod; +import com.aizuda.easy.retry.common.core.log.LogUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.aop.support.AopUtils; import org.springframework.beans.BeansException; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/report/ReportHandler.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportHandler.java similarity index 80% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/report/ReportHandler.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportHandler.java index 09001c268..d83a6ab12 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/report/ReportHandler.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportHandler.java @@ -1,18 +1,17 @@ -package com.x.retry.client.core.report; +package com.aizuda.easy.retry.client.core.report; -import com.x.retry.client.core.BizIdGenerate; -import com.x.retry.client.core.Lifecycle; -import com.x.retry.client.core.RetryArgSerializer; -import com.x.retry.client.core.cache.RetryerInfoCache; -import com.x.retry.client.core.config.XRetryProperties; -import com.x.retry.client.core.exception.XRetryClientException; -import com.x.retry.client.core.intercepter.RetrySiteSnapshot; -import com.x.retry.client.core.retryer.RetryerInfo; -import com.x.retry.client.core.spel.SPELParamFunction; -import com.x.retry.client.core.window.RetryLeapArray; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.window.WindowWrap; -import com.x.retry.server.model.dto.RetryTaskDTO; +import com.aizuda.easy.retry.client.core.BizIdGenerate; +import com.aizuda.easy.retry.client.core.RetryArgSerializer; +import com.aizuda.easy.retry.client.core.config.XRetryProperties; +import com.aizuda.easy.retry.client.core.Lifecycle; +import com.aizuda.easy.retry.client.core.cache.RetryerInfoCache; +import com.aizuda.easy.retry.client.core.exception.XRetryClientException; +import com.aizuda.easy.retry.client.core.intercepter.RetrySiteSnapshot; +import com.aizuda.easy.retry.client.core.retryer.RetryerInfo; +import com.aizuda.easy.retry.client.core.spel.SPELParamFunction; +import com.aizuda.easy.retry.client.core.window.RetryLeapArray; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.server.model.dto.RetryTaskDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -20,7 +19,6 @@ import org.springframework.stereotype.Component; import org.springframework.util.ReflectionUtils; import java.lang.reflect.Method; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/report/ReportListener.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportListener.java similarity index 72% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/report/ReportListener.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportListener.java index 66ecb4e7a..f43185b55 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/report/ReportListener.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/report/ReportListener.java @@ -1,28 +1,28 @@ -package com.x.retry.client.core.report; +package com.aizuda.easy.retry.client.core.report; +import com.aizuda.easy.retry.client.core.RetryExecutor; +import com.aizuda.easy.retry.client.core.RetryExecutorParameter; +import com.aizuda.easy.retry.client.core.client.response.XRetryResponse; +import com.aizuda.easy.retry.client.core.config.XRetryProperties; import com.github.rholder.retry.*; import com.google.common.base.Predicate; -import com.x.retry.client.core.RetryExecutor; -import com.x.retry.client.core.RetryExecutorParameter; -import com.x.retry.client.core.cache.GroupVersionCache; -import com.x.retry.client.core.client.NettyHttpConnectClient; -import com.x.retry.client.core.client.request.ReportRetryInfoHttpRequestHandler; -import com.x.retry.client.core.client.request.RequestParam; -import com.x.retry.client.core.client.response.XRetryResponse; -import com.x.retry.client.core.config.XRetryProperties; -import com.x.retry.client.core.executor.GuavaRetryExecutor; -import com.x.retry.common.core.alarm.Alarm; -import com.x.retry.common.core.alarm.AlarmContext; -import com.x.retry.common.core.alarm.AltinAlarmFactory; -import com.x.retry.common.core.context.SpringContext; -import com.x.retry.common.core.enums.NotifySceneEnum; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.model.XRetryRequest; -import com.x.retry.common.core.util.EnvironmentUtils; -import com.x.retry.common.core.util.JsonUtil; -import com.x.retry.common.core.window.Listener; -import com.x.retry.server.model.dto.ConfigDTO; -import com.x.retry.server.model.dto.RetryTaskDTO; +import com.aizuda.easy.retry.client.core.cache.GroupVersionCache; +import com.aizuda.easy.retry.client.core.client.NettyHttpConnectClient; +import com.aizuda.easy.retry.client.core.client.request.ReportRetryInfoHttpRequestHandler; +import com.aizuda.easy.retry.client.core.client.request.RequestParam; +import com.aizuda.easy.retry.client.core.executor.GuavaRetryExecutor; +import com.aizuda.easy.retry.common.core.alarm.Alarm; +import com.aizuda.easy.retry.common.core.alarm.AlarmContext; +import com.aizuda.easy.retry.common.core.alarm.AltinAlarmFactory; +import com.aizuda.easy.retry.common.core.context.SpringContext; +import com.aizuda.easy.retry.common.core.enums.NotifySceneEnum; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.model.XRetryRequest; +import com.aizuda.easy.retry.common.core.util.EnvironmentUtils; +import com.aizuda.easy.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.common.core.window.Listener; +import com.aizuda.easy.retry.server.model.dto.ConfigDTO; +import com.aizuda.easy.retry.server.model.dto.RetryTaskDTO; import lombok.extern.slf4j.Slf4j; import java.time.LocalDateTime; @@ -96,11 +96,11 @@ public class ReportListener implements Listener { @Override public void onRetry(Attempt attempt) { if (attempt.hasResult()) { - LogUtils.error(log,"x-retry 上报成功，第[{}]次调度", attempt.getAttemptNumber()); + LogUtils.error(log,"easy-retry 上报成功，第[{}]次调度", attempt.getAttemptNumber()); } if (attempt.hasException()) { - LogUtils.error(log,"x-retry 上报失败，第[{}]次调度 ", attempt.getAttemptNumber(), attempt.getExceptionCause()); + LogUtils.error(log,"easy-retry 上报失败，第[{}]次调度 ", attempt.getAttemptNumber(), attempt.getExceptionCause()); } } diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/retryer/RetryType.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/retryer/RetryType.java similarity index 84% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/retryer/RetryType.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/retryer/RetryType.java index 90a8c6fe9..401c7641a 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/retryer/RetryType.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/retryer/RetryType.java @@ -1,4 +1,4 @@ -package com.x.retry.client.core.retryer; +package com.aizuda.easy.retry.client.core.retryer; /** * @author: www.byteblogs.com diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/retryer/RetryerInfo.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/retryer/RetryerInfo.java similarity index 78% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/retryer/RetryerInfo.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/retryer/RetryerInfo.java index eeaea8f92..d3a71bc6e 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/retryer/RetryerInfo.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/retryer/RetryerInfo.java @@ -1,8 +1,8 @@ -package com.x.retry.client.core.retryer; +package com.aizuda.easy.retry.client.core.retryer; -import com.x.retry.client.core.BizIdGenerate; -import com.x.retry.client.core.callback.RetryCompleteCallback; -import com.x.retry.client.core.strategy.RetryMethod; +import com.aizuda.easy.retry.client.core.BizIdGenerate; +import com.aizuda.easy.retry.client.core.strategy.RetryMethod; +import com.aizuda.easy.retry.client.core.callback.RetryCompleteCallback; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/retryer/RetryerResultContext.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/retryer/RetryerResultContext.java similarity index 72% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/retryer/RetryerResultContext.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/retryer/RetryerResultContext.java index 05537024a..84e1e09e0 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/retryer/RetryerResultContext.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/retryer/RetryerResultContext.java @@ -1,6 +1,6 @@ -package com.x.retry.client.core.retryer; +package com.aizuda.easy.retry.client.core.retryer; -import com.x.retry.common.core.enums.RetryResultStatusEnum; +import com.aizuda.easy.retry.common.core.enums.RetryResultStatusEnum; import lombok.Data; /** diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/serializer/HessianSerializer.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/serializer/HessianSerializer.java similarity index 93% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/serializer/HessianSerializer.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/serializer/HessianSerializer.java index 8d7d51fd5..603e63001 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/serializer/HessianSerializer.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/serializer/HessianSerializer.java @@ -1,9 +1,9 @@ -package com.x.retry.client.core.serializer; +package com.aizuda.easy.retry.client.core.serializer; +import com.aizuda.easy.retry.client.core.RetryArgSerializer; import com.caucho.hessian.io.HessianInput; import com.caucho.hessian.io.HessianOutput; import com.fasterxml.jackson.core.JsonProcessingException; -import com.x.retry.client.core.RetryArgSerializer; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Component; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/serializer/JacksonSerializer.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/serializer/JacksonSerializer.java similarity index 86% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/serializer/JacksonSerializer.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/serializer/JacksonSerializer.java index 322b4d74f..7f7b306c7 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/serializer/JacksonSerializer.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/serializer/JacksonSerializer.java @@ -1,10 +1,10 @@ -package com.x.retry.client.core.serializer; +package com.aizuda.easy.retry.client.core.serializer; +import com.aizuda.easy.retry.client.core.RetryArgSerializer; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.x.retry.client.core.RetryArgSerializer; -import com.x.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.common.core.util.JsonUtil; import org.springframework.stereotype.Component; import java.lang.reflect.Method; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/spel/SPELParamFunction.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/spel/SPELParamFunction.java similarity index 96% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/spel/SPELParamFunction.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/spel/SPELParamFunction.java index f8b6de9b9..7913f080d 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/spel/SPELParamFunction.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/spel/SPELParamFunction.java @@ -1,4 +1,4 @@ -package com.x.retry.client.core.spel; +package com.aizuda.easy.retry.client.core.spel; import cn.hutool.core.util.StrUtil; import org.apache.commons.lang.ArrayUtils; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/AbstractRetryStrategies.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/AbstractRetryStrategies.java similarity index 91% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/AbstractRetryStrategies.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/AbstractRetryStrategies.java index 0cbc9e3d8..f274220ce 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/AbstractRetryStrategies.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/AbstractRetryStrategies.java @@ -1,16 +1,15 @@ -package com.x.retry.client.core.strategy; +package com.aizuda.easy.retry.client.core.strategy; +import com.aizuda.easy.retry.client.core.RetryExecutor; +import com.aizuda.easy.retry.client.core.RetryExecutorParameter; +import com.aizuda.easy.retry.client.core.event.XRetryListener; +import com.aizuda.easy.retry.client.core.intercepter.RetrySiteSnapshot; import com.github.rholder.retry.Retryer; import com.github.rholder.retry.StopStrategy; import com.github.rholder.retry.WaitStrategy; -import com.x.retry.client.core.event.XRetryListener; -import com.x.retry.client.core.executor.GuavaRetryExecutor; -import com.x.retry.client.core.RetryExecutor; -import com.x.retry.client.core.RetryExecutorParameter; -import com.x.retry.client.core.intercepter.RetrySiteSnapshot; -import com.x.retry.client.core.retryer.RetryerInfo; -import com.x.retry.client.core.retryer.RetryerResultContext; -import com.x.retry.common.core.enums.RetryResultStatusEnum; +import com.aizuda.easy.retry.client.core.executor.GuavaRetryExecutor; +import com.aizuda.easy.retry.client.core.retryer.RetryerInfo; +import com.aizuda.easy.retry.client.core.retryer.RetryerResultContext; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/LocalRetryStrategies.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/LocalRetryStrategies.java similarity index 88% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/LocalRetryStrategies.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/LocalRetryStrategies.java index ce16c32eb..0b839d985 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/LocalRetryStrategies.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/LocalRetryStrategies.java @@ -1,17 +1,17 @@ -package com.x.retry.client.core.strategy; +package com.aizuda.easy.retry.client.core.strategy; +import com.aizuda.easy.retry.client.core.RetryExecutor; +import com.aizuda.easy.retry.client.core.RetryExecutorParameter; +import com.aizuda.easy.retry.client.core.exception.XRetryClientException; +import com.aizuda.easy.retry.client.core.intercepter.RetrySiteSnapshot; +import com.aizuda.easy.retry.client.core.report.ReportHandler; import com.github.rholder.retry.*; import com.google.common.base.Predicate; -import com.x.retry.client.core.RetryExecutor; -import com.x.retry.client.core.RetryExecutorParameter; -import com.x.retry.client.core.exception.XRetryClientException; -import com.x.retry.client.core.intercepter.RetrySiteSnapshot; -import com.x.retry.client.core.report.ReportHandler; -import com.x.retry.client.core.retryer.RetryType; -import com.x.retry.client.core.retryer.RetryerInfo; -import com.x.retry.client.core.retryer.RetryerResultContext; -import com.x.retry.common.core.enums.RetryResultStatusEnum; -import com.x.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.client.core.retryer.RetryType; +import com.aizuda.easy.retry.client.core.retryer.RetryerInfo; +import com.aizuda.easy.retry.client.core.retryer.RetryerResultContext; +import com.aizuda.easy.retry.common.core.enums.RetryResultStatusEnum; +import com.aizuda.easy.retry.common.core.log.LogUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -170,7 +170,7 @@ public class LocalRetryStrategies extends AbstractRetryStrategies { return Collections.singletonList(new RetryListener() { @Override public void onRetry(Attempt attempt) { - LogUtils.error(log,"x-retry 本地重试，第[{}]次调度", attempt.getAttemptNumber()); + LogUtils.error(log,"easy-retry 本地重试，第[{}]次调度", attempt.getAttemptNumber()); } }); } diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/RemoteRetryStrategies.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RemoteRetryStrategies.java similarity index 80% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/RemoteRetryStrategies.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RemoteRetryStrategies.java index 4e775e188..056c6ba1c 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/RemoteRetryStrategies.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RemoteRetryStrategies.java @@ -1,15 +1,15 @@ -package com.x.retry.client.core.strategy; +package com.aizuda.easy.retry.client.core.strategy; +import com.aizuda.easy.retry.client.core.RetryExecutor; +import com.aizuda.easy.retry.client.core.RetryExecutorParameter; +import com.aizuda.easy.retry.client.core.intercepter.RetrySiteSnapshot; import com.github.rholder.retry.*; import com.google.common.base.Predicate; -import com.x.retry.client.core.RetryExecutor; -import com.x.retry.client.core.RetryExecutorParameter; -import com.x.retry.client.core.intercepter.RetrySiteSnapshot; -import com.x.retry.client.core.retryer.RetryType; -import com.x.retry.client.core.retryer.RetryerInfo; -import com.x.retry.client.core.retryer.RetryerResultContext; -import com.x.retry.common.core.enums.RetryResultStatusEnum; -import com.x.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.client.core.retryer.RetryType; +import com.aizuda.easy.retry.client.core.retryer.RetryerInfo; +import com.aizuda.easy.retry.client.core.retryer.RetryerResultContext; +import com.aizuda.easy.retry.common.core.enums.RetryResultStatusEnum; +import com.aizuda.easy.retry.common.core.log.LogUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -106,11 +106,11 @@ public class RemoteRetryStrategies extends AbstractRetryStrategies { @Override public void onRetry(Attempt attempt) { if (attempt.hasResult()) { - LogUtils.error(log, "x-retry 远程重试成功，第[{}]次调度", attempt.getAttemptNumber()); + LogUtils.error(log, "easy-retry 远程重试成功，第[{}]次调度", attempt.getAttemptNumber()); } if (attempt.hasException()) { - LogUtils.error(log, "x-retry 远程重试失败，第[{}]次调度 ", attempt.getAttemptNumber(), attempt.getExceptionCause()); + LogUtils.error(log, "easy-retry 远程重试失败，第[{}]次调度 ", attempt.getAttemptNumber(), attempt.getExceptionCause()); } } diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/RetryAnnotationMethod.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RetryAnnotationMethod.java similarity index 80% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/RetryAnnotationMethod.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RetryAnnotationMethod.java index 6db8a35e5..0ea0c209c 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/RetryAnnotationMethod.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RetryAnnotationMethod.java @@ -1,8 +1,8 @@ -package com.x.retry.client.core.strategy; +package com.aizuda.easy.retry.client.core.strategy; -import com.x.retry.client.core.retryer.RetryerInfo; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.client.core.retryer.RetryerInfo; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.util.JsonUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.util.ReflectionUtils; diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/RetryMethod.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RetryMethod.java similarity index 73% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/RetryMethod.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RetryMethod.java index 32e380d00..b98fef960 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/RetryMethod.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RetryMethod.java @@ -1,4 +1,4 @@ -package com.x.retry.client.core.strategy; +package com.aizuda.easy.retry.client.core.strategy; /** * @author: www.byteblogs.com diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/RetryResult.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RetryResult.java similarity index 65% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/RetryResult.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RetryResult.java index cc85cd199..885a86079 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/RetryResult.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RetryResult.java @@ -1,4 +1,4 @@ -package com.x.retry.client.core.strategy; +package com.aizuda.easy.retry.client.core.strategy; /** * @author: www.byteblogs.com diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/RetryStrategy.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RetryStrategy.java similarity index 58% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/RetryStrategy.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RetryStrategy.java index c3608aace..3bae8f747 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/strategy/RetryStrategy.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/strategy/RetryStrategy.java @@ -1,7 +1,7 @@ -package com.x.retry.client.core.strategy; +package com.aizuda.easy.retry.client.core.strategy; -import com.x.retry.client.core.retryer.RetryType; -import com.x.retry.client.core.retryer.RetryerResultContext; +import com.aizuda.easy.retry.client.core.retryer.RetryType; +import com.aizuda.easy.retry.client.core.retryer.RetryerResultContext; /** * @author: www.byteblogs.com diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/window/RetryLeapArray.java b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/window/RetryLeapArray.java similarity index 86% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/window/RetryLeapArray.java rename to easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/window/RetryLeapArray.java index accc8a31b..299b145ad 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/window/RetryLeapArray.java +++ b/easy-retry-client-core/src/main/java/com/aizuda/easy/retry/client/core/window/RetryLeapArray.java @@ -1,10 +1,10 @@ -package com.x.retry.client.core.window; +package com.aizuda.easy.retry.client.core.window; -import com.x.retry.common.core.util.JsonUtil; -import com.x.retry.common.core.window.LeapArray; -import com.x.retry.common.core.window.Listener; -import com.x.retry.common.core.window.WindowWrap; -import com.x.retry.server.model.dto.RetryTaskDTO; +import com.aizuda.easy.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.common.core.window.LeapArray; +import com.aizuda.easy.retry.common.core.window.Listener; +import com.aizuda.easy.retry.common.core.window.WindowWrap; +import com.aizuda.easy.retry.server.model.dto.RetryTaskDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.util.CollectionUtils; diff --git a/x-retry-client-core/src/main/resources/application.properties b/easy-retry-client-core/src/main/resources/application.properties similarity index 100% rename from x-retry-client-core/src/main/resources/application.properties rename to easy-retry-client-core/src/main/resources/application.properties diff --git a/x-retry-client-core/src/test/java/com/x/retry/common/client/core/xretryclientcore/XRetryClientCoreApplicationTests.java b/easy-retry-client-core/src/test/java/com/x/retry/common/client/core/xretryclientcore/XRetryClientCoreApplicationTests.java similarity index 51% rename from x-retry-client-core/src/test/java/com/x/retry/common/client/core/xretryclientcore/XRetryClientCoreApplicationTests.java rename to easy-retry-client-core/src/test/java/com/x/retry/common/client/core/xretryclientcore/XRetryClientCoreApplicationTests.java index c9f9a5b6f..b69a8c9da 100644 --- a/x-retry-client-core/src/test/java/com/x/retry/common/client/core/xretryclientcore/XRetryClientCoreApplicationTests.java +++ b/easy-retry-client-core/src/test/java/com/x/retry/common/client/core/xretryclientcore/XRetryClientCoreApplicationTests.java @@ -1,9 +1,5 @@ package com.x.retry.common.client.core.xretryclientcore; -import com.x.retry.client.core.window.RetryLeapArray; -import com.x.retry.server.model.dto.RetryTaskDTO; -import lombok.SneakyThrows; -import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest diff --git a/x-retry-client-starter/.gitignore b/easy-retry-client-starter/.gitignore similarity index 100% rename from x-retry-client-starter/.gitignore rename to easy-retry-client-starter/.gitignore diff --git a/x-retry-client-starter/pom.xml b/easy-retry-client-starter/pom.xml similarity index 73% rename from x-retry-client-starter/pom.xml rename to easy-retry-client-starter/pom.xml index a59a1d6d8..e239be0e9 100644 --- a/x-retry-client-starter/pom.xml +++ b/easy-retry-client-starter/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.byteblogs - x-retry + com.aizuda + easy-retry ${revision} ../pom.xml - x-retry-client-starter - x-retry-client-starter - x-retry-client-starter + easy-retry-client-starter + easy-retry-client-starter + easy-retry-client-starter 1.8 @@ -29,8 +29,8 @@ test - com.byteblogs - x-retry-client-core + com.aizuda + easy-retry-client-core diff --git a/x-retry-client-starter/src/main/java/com/x/retry/client/starter/EnableXRetry.java b/easy-retry-client-starter/src/main/java/com/aizuda/easy/retry/client/starter/EnableXRetry.java similarity index 87% rename from x-retry-client-starter/src/main/java/com/x/retry/client/starter/EnableXRetry.java rename to easy-retry-client-starter/src/main/java/com/aizuda/easy/retry/client/starter/EnableXRetry.java index 8ebd63ce0..f7eb7f450 100644 --- a/x-retry-client-starter/src/main/java/com/x/retry/client/starter/EnableXRetry.java +++ b/easy-retry-client-starter/src/main/java/com/aizuda/easy/retry/client/starter/EnableXRetry.java @@ -1,4 +1,4 @@ -package com.x.retry.client.starter; +package com.aizuda.easy.retry.client.starter; import org.springframework.context.annotation.Import; diff --git a/x-retry-client-starter/src/main/java/com/x/retry/client/starter/XRetryClientAutoConfiguration.java b/easy-retry-client-starter/src/main/java/com/aizuda/easy/retry/client/starter/XRetryClientAutoConfiguration.java similarity index 70% rename from x-retry-client-starter/src/main/java/com/x/retry/client/starter/XRetryClientAutoConfiguration.java rename to easy-retry-client-starter/src/main/java/com/aizuda/easy/retry/client/starter/XRetryClientAutoConfiguration.java index 6bc9fd1e1..3c50f710e 100644 --- a/x-retry-client-starter/src/main/java/com/x/retry/client/starter/XRetryClientAutoConfiguration.java +++ b/easy-retry-client-starter/src/main/java/com/aizuda/easy/retry/client/starter/XRetryClientAutoConfiguration.java @@ -1,4 +1,4 @@ -package com.x.retry.client.starter; +package com.aizuda.easy.retry.client.starter; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.ComponentScan; @@ -6,7 +6,7 @@ import org.springframework.context.annotation.Configuration; @Configuration @ComponentScan("com.x.retry.client.core") -@ConditionalOnProperty(prefix = "x-retry", name = "enabled", havingValue = "true") +@ConditionalOnProperty(prefix = "easy-retry", name = "enabled", havingValue = "true") public class XRetryClientAutoConfiguration { } diff --git a/x-retry-client-starter/src/main/java/com/x/retry/client/starter/XRetryClientsRegistrar.java b/easy-retry-client-starter/src/main/java/com/aizuda/easy/retry/client/starter/XRetryClientsRegistrar.java similarity index 87% rename from x-retry-client-starter/src/main/java/com/x/retry/client/starter/XRetryClientsRegistrar.java rename to easy-retry-client-starter/src/main/java/com/aizuda/easy/retry/client/starter/XRetryClientsRegistrar.java index 5af5ada4f..fc12f7e82 100644 --- a/x-retry-client-starter/src/main/java/com/x/retry/client/starter/XRetryClientsRegistrar.java +++ b/easy-retry-client-starter/src/main/java/com/aizuda/easy/retry/client/starter/XRetryClientsRegistrar.java @@ -1,4 +1,4 @@ -package com.x.retry.client.starter; +package com.aizuda.easy.retry.client.starter; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.EnvironmentAware; @@ -21,7 +21,7 @@ public class XRetryClientsRegistrar implements ImportBeanDefinitionRegistrar, En public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) { Map attrs = importingClassMetadata.getAnnotationAttributes(EnableXRetry.class.getName()); Map systemEnvironment = standardEnvironment.getSystemProperties(); - systemEnvironment.put("x-retry.group", (String) attrs.get("group")); + systemEnvironment.put("easy-retry.group", (String) attrs.get("group")); } @Override @@ -29,6 +29,6 @@ public class XRetryClientsRegistrar implements ImportBeanDefinitionRegistrar, En StandardEnvironment standardEnvironment = (StandardEnvironment) environment; this.standardEnvironment = standardEnvironment; Map systemEnvironment = standardEnvironment.getSystemProperties(); - systemEnvironment.put("x-retry.enabled", true); + systemEnvironment.put("easy-retry.enabled", true); } } diff --git a/easy-retry-client-starter/src/main/resources/META-INF/spring.factories b/easy-retry-client-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 000000000..feaa140b5 --- /dev/null +++ b/easy-retry-client-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + com.aizuda.easy.retry.client.starter.XRetryClientAutoConfiguration diff --git a/x-retry-client-starter/src/test/java/com/x/retry/common/client/starter/xretryclientstarter/XRetryClientStarterApplicationTests.java b/easy-retry-client-starter/src/test/java/com/x/retry/common/client/starter/xretryclientstarter/XRetryClientStarterApplicationTests.java similarity index 100% rename from x-retry-client-starter/src/test/java/com/x/retry/common/client/starter/xretryclientstarter/XRetryClientStarterApplicationTests.java rename to easy-retry-client-starter/src/test/java/com/x/retry/common/client/starter/xretryclientstarter/XRetryClientStarterApplicationTests.java diff --git a/x-retry-common/.gitignore b/easy-retry-common/.gitignore similarity index 100% rename from x-retry-common/.gitignore rename to easy-retry-common/.gitignore diff --git a/x-retry-common/x-retry-common-client-api/.gitignore b/easy-retry-common/easy-retry-common-client-api/.gitignore similarity index 100% rename from x-retry-common/x-retry-common-client-api/.gitignore rename to easy-retry-common/easy-retry-common-client-api/.gitignore diff --git a/x-retry-common/x-retry-common-client-api/pom.xml b/easy-retry-common/easy-retry-common-client-api/pom.xml similarity index 84% rename from x-retry-common/x-retry-common-client-api/pom.xml rename to easy-retry-common/easy-retry-common-client-api/pom.xml index e25220091..32bfd9a54 100644 --- a/x-retry-common/x-retry-common-client-api/pom.xml +++ b/easy-retry-common/easy-retry-common-client-api/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.byteblogs - x-retry-common + com.aizuda + easy-retry-common ${revision} ../pom.xml - x-retry-common-client-api - x-retry-common-client-api - x-retry-common-client-api + easy-retry-common-client-api + easy-retry-common-client-api + easy-retry-common-client-api jar @@ -31,8 +31,8 @@ - com.byteblogs - x-retry-common-core + com.aizuda + easy-retry-common-core org.hibernate diff --git a/x-retry-common/x-retry-common-client-api/src/main/java/com/x/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 similarity index 92% rename from x-retry-common/x-retry-common-client-api/src/main/java/com/x/retry/client/model/DispatchRetryDTO.java rename to easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/DispatchRetryDTO.java index 9090e020d..b1b861222 100644 --- a/x-retry-common/x-retry-common-client-api/src/main/java/com/x/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,4 +1,4 @@ -package com.x.retry.client.model; +package com.aizuda.easy.retry.client.model; import lombok.Data; import org.hibernate.validator.constraints.NotBlank; diff --git a/x-retry-common/x-retry-common-client-api/src/main/java/com/x/retry/client/model/DispatchRetryResultDTO.java b/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/DispatchRetryResultDTO.java similarity index 86% rename from x-retry-common/x-retry-common-client-api/src/main/java/com/x/retry/client/model/DispatchRetryResultDTO.java rename to easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/DispatchRetryResultDTO.java index 083194a50..c0dc9938f 100644 --- a/x-retry-common/x-retry-common-client-api/src/main/java/com/x/retry/client/model/DispatchRetryResultDTO.java +++ b/easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/DispatchRetryResultDTO.java @@ -1,4 +1,4 @@ -package com.x.retry.client.model; +package com.aizuda.easy.retry.client.model; import lombok.Data; diff --git a/x-retry-common/x-retry-common-client-api/src/main/java/com/x/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 similarity index 93% rename from x-retry-common/x-retry-common-client-api/src/main/java/com/x/retry/client/model/RetryCallbackDTO.java rename to easy-retry-common/easy-retry-common-client-api/src/main/java/com/aizuda/easy/retry/client/model/RetryCallbackDTO.java index bbbee2bc9..bd68b0b06 100644 --- a/x-retry-common/x-retry-common-client-api/src/main/java/com/x/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 @@ -1,4 +1,4 @@ -package com.x.retry.client.model; +package com.aizuda.easy.retry.client.model; import lombok.Data; import org.hibernate.validator.constraints.NotBlank; diff --git a/x-retry-common/x-retry-common-client-api/src/main/resources/application.properties b/easy-retry-common/easy-retry-common-client-api/src/main/resources/application.properties similarity index 100% rename from x-retry-common/x-retry-common-client-api/src/main/resources/application.properties rename to easy-retry-common/easy-retry-common-client-api/src/main/resources/application.properties diff --git a/x-retry-common/x-retry-common-core/.gitignore b/easy-retry-common/easy-retry-common-core/.gitignore similarity index 100% rename from x-retry-common/x-retry-common-core/.gitignore rename to easy-retry-common/easy-retry-common-core/.gitignore diff --git a/x-retry-common/x-retry-common-core/pom.xml b/easy-retry-common/easy-retry-common-core/pom.xml similarity index 91% rename from x-retry-common/x-retry-common-core/pom.xml rename to easy-retry-common/easy-retry-common-core/pom.xml index 5cbbb7e03..9f8c09ab8 100644 --- a/x-retry-common/x-retry-common-core/pom.xml +++ b/easy-retry-common/easy-retry-common-core/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.byteblogs - x-retry-common + com.aizuda + easy-retry-common ${revision} ../pom.xml - x-retry-common-core - x-retry-common-core - x-retry-common-core + easy-retry-common-core + easy-retry-common-core + easy-retry-common-core jar diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/CommonCoreConfigure.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/CommonCoreConfigure.java similarity index 86% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/CommonCoreConfigure.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/CommonCoreConfigure.java index e3f4ce0e3..1766c837f 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/CommonCoreConfigure.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/CommonCoreConfigure.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core; +package com.aizuda.easy.retry.common.core; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/Alarm.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/Alarm.java similarity index 84% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/Alarm.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/Alarm.java index 73ffd4214..d9718b064 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/Alarm.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/Alarm.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.alarm; +package com.aizuda.easy.retry.common.core.alarm; import java.util.List; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/AlarmContext.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/AlarmContext.java similarity index 95% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/AlarmContext.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/AlarmContext.java index d7177682a..09994d8f8 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/AlarmContext.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/AlarmContext.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.alarm; +package com.aizuda.easy.retry.common.core.alarm; import lombok.Data; import org.slf4j.helpers.MessageFormatter; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/AltinAlarmFactory.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/AltinAlarmFactory.java similarity index 94% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/AltinAlarmFactory.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/AltinAlarmFactory.java index 37183d985..d4075829f 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/AltinAlarmFactory.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/AltinAlarmFactory.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.alarm; +package com.aizuda.easy.retry.common.core.alarm; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/DingDingAttribute.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/DingDingAttribute.java similarity index 76% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/DingDingAttribute.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/DingDingAttribute.java index e2a08f37b..892f2121a 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/DingDingAttribute.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/DingDingAttribute.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.alarm; +package com.aizuda.easy.retry.common.core.alarm; import lombok.Data; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/EmailAttribute.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/EmailAttribute.java similarity index 90% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/EmailAttribute.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/EmailAttribute.java index 03eb81e5a..2dbf3ee57 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/EmailAttribute.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/EmailAttribute.java @@ -1,7 +1,7 @@ -package com.x.retry.common.core.alarm; +package com.aizuda.easy.retry.common.core.alarm; import cn.hutool.extra.mail.MailAccount; -import com.x.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.log.LogUtils; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/strategy/AbstractAlarm.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/AbstractAlarm.java similarity index 78% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/strategy/AbstractAlarm.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/AbstractAlarm.java index f7dfb55b9..c13ae4d0c 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/strategy/AbstractAlarm.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/AbstractAlarm.java @@ -1,6 +1,6 @@ -package com.x.retry.common.core.alarm.strategy; +package com.aizuda.easy.retry.common.core.alarm.strategy; -import com.x.retry.common.core.alarm.Alarm; +import com.aizuda.easy.retry.common.core.alarm.Alarm; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadPoolExecutor; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/strategy/DingdingAlarm.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/DingdingAlarm.java similarity index 78% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/strategy/DingdingAlarm.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/DingdingAlarm.java index f05fddc6c..ee40463c6 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/strategy/DingdingAlarm.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/DingdingAlarm.java @@ -1,10 +1,10 @@ -package com.x.retry.common.core.alarm.strategy; +package com.aizuda.easy.retry.common.core.alarm.strategy; -import com.x.retry.common.core.alarm.AlarmContext; -import com.x.retry.common.core.alarm.DingDingAttribute; -import com.x.retry.common.core.enums.AlarmTypeEnum; -import com.x.retry.common.core.util.DingDingUtils; -import com.x.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.common.core.enums.AlarmTypeEnum; +import com.aizuda.easy.retry.common.core.alarm.AlarmContext; +import com.aizuda.easy.retry.common.core.alarm.DingDingAttribute; +import com.aizuda.easy.retry.common.core.util.DingDingUtils; +import com.aizuda.easy.retry.common.core.util.JsonUtil; import org.springframework.stereotype.Component; import java.util.List; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/strategy/EmailAlarm.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/EmailAlarm.java similarity index 80% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/strategy/EmailAlarm.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/EmailAlarm.java index 7fed9a854..f1035268c 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/alarm/strategy/EmailAlarm.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/alarm/strategy/EmailAlarm.java @@ -1,10 +1,10 @@ -package com.x.retry.common.core.alarm.strategy; +package com.aizuda.easy.retry.common.core.alarm.strategy; import cn.hutool.extra.mail.MailUtil; -import com.x.retry.common.core.alarm.AlarmContext; -import com.x.retry.common.core.alarm.EmailAttribute; -import com.x.retry.common.core.enums.AlarmTypeEnum; -import com.x.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.common.core.alarm.EmailAttribute; +import com.aizuda.easy.retry.common.core.enums.AlarmTypeEnum; +import com.aizuda.easy.retry.common.core.alarm.AlarmContext; +import com.aizuda.easy.retry.common.core.util.JsonUtil; import org.springframework.stereotype.Component; import java.util.List; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/annotation/OriginalControllerReturnValue.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/annotation/OriginalControllerReturnValue.java similarity index 83% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/annotation/OriginalControllerReturnValue.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/annotation/OriginalControllerReturnValue.java index e4d7d4f42..81bd7fc67 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/annotation/OriginalControllerReturnValue.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/annotation/OriginalControllerReturnValue.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.annotation; +package com.aizuda.easy.retry.common.core.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/constant/SystemConstants.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/constant/SystemConstants.java similarity index 59% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/constant/SystemConstants.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/constant/SystemConstants.java index 0a4de59b7..9a8405800 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/constant/SystemConstants.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/constant/SystemConstants.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.constant; +package com.aizuda.easy.retry.common.core.constant; /** * @author: www.byteblogs.com @@ -9,12 +9,12 @@ public class SystemConstants { /** * 请求头 key */ - public static final String X_RETRY_HEAD_KEY = "x-retry"; + public static final String X_RETRY_HEAD_KEY = "easy-retry"; /** * 异常重试码 key */ - public static final String X_RETRY_STATUS_CODE_KEY = "x-retry-status"; + public static final String X_RETRY_STATUS_CODE_KEY = "easy-retry-status"; /** * 异常重试码 diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/context/SpringContext.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/context/SpringContext.java similarity index 96% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/context/SpringContext.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/context/SpringContext.java index 1f266a4fa..b149b476f 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/context/SpringContext.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/context/SpringContext.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.context; +package com.aizuda.easy.retry.common.core.context; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/covert/AbstractConverter.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/covert/AbstractConverter.java similarity index 88% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/covert/AbstractConverter.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/covert/AbstractConverter.java index 729f0a57b..2bf333320 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/covert/AbstractConverter.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/covert/AbstractConverter.java @@ -1,6 +1,6 @@ -package com.x.retry.common.core.covert; +package com.aizuda.easy.retry.common.core.covert; -import com.x.retry.common.core.exception.XRetryCommonException; +import com.aizuda.easy.retry.common.core.exception.XRetryCommonException; import org.springframework.beans.BeanUtils; import org.springframework.util.CollectionUtils; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/covert/Converter.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/covert/Converter.java similarity index 84% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/covert/Converter.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/covert/Converter.java index 3bec7e96b..983219a52 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/covert/Converter.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/covert/Converter.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.covert; +package com.aizuda.easy.retry.common.core.covert; import java.util.List; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/AlarmTypeEnum.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/AlarmTypeEnum.java similarity index 89% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/AlarmTypeEnum.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/AlarmTypeEnum.java index 430bd1e03..2283187e2 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/AlarmTypeEnum.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/AlarmTypeEnum.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.enums; +package com.aizuda.easy.retry.common.core.enums; /** * 预警类型 diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/AllocationAlgorithmEnum.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/AllocationAlgorithmEnum.java similarity index 85% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/AllocationAlgorithmEnum.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/AllocationAlgorithmEnum.java index 1666aac21..7b71137b7 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/AllocationAlgorithmEnum.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/AllocationAlgorithmEnum.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.enums; +package com.aizuda.easy.retry.common.core.enums; import lombok.Getter; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/DelayLevelEnum.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/DelayLevelEnum.java similarity index 93% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/DelayLevelEnum.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/DelayLevelEnum.java index 7e4aa51f4..12c7d519f 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/DelayLevelEnum.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/DelayLevelEnum.java @@ -1,6 +1,6 @@ -package com.x.retry.common.core.enums; +package com.aizuda.easy.retry.common.core.enums; -import com.x.retry.common.core.exception.XRetryCommonException; +import com.aizuda.easy.retry.common.core.exception.XRetryCommonException; import lombok.Getter; import java.time.temporal.ChronoUnit; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/HeadersEnum.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/HeadersEnum.java similarity index 89% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/HeadersEnum.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/HeadersEnum.java index 70cd40b40..5427276fc 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/HeadersEnum.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/HeadersEnum.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.enums; +package com.aizuda.easy.retry.common.core.enums; import lombok.Getter; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/NodeTypeEnum.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/NodeTypeEnum.java similarity index 87% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/NodeTypeEnum.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/NodeTypeEnum.java index 78bc8d6ea..82cbd48b1 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/NodeTypeEnum.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/NodeTypeEnum.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.enums; +package com.aizuda.easy.retry.common.core.enums; import lombok.Getter; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/NotifySceneEnum.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/NotifySceneEnum.java similarity index 96% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/NotifySceneEnum.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/NotifySceneEnum.java index 0fec82e34..1a5b67675 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/NotifySceneEnum.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/NotifySceneEnum.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.enums; +package com.aizuda.easy.retry.common.core.enums; import lombok.Getter; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/NotifyTypeEnum.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/NotifyTypeEnum.java similarity index 89% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/NotifyTypeEnum.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/NotifyTypeEnum.java index c371995a0..aa43ccc5a 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/NotifyTypeEnum.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/NotifyTypeEnum.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.enums; +package com.aizuda.easy.retry.common.core.enums; import lombok.Getter; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/RetryResultStatusEnum.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/RetryResultStatusEnum.java similarity index 92% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/RetryResultStatusEnum.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/RetryResultStatusEnum.java index b3a52d959..72e6d0f82 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/RetryResultStatusEnum.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/RetryResultStatusEnum.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.enums; +package com.aizuda.easy.retry.common.core.enums; import lombok.Getter; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/RetryStatusEnum.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/RetryStatusEnum.java similarity index 94% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/RetryStatusEnum.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/RetryStatusEnum.java index b6b950263..276bb15a9 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/RetryStatusEnum.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/RetryStatusEnum.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.enums; +package com.aizuda.easy.retry.common.core.enums; import lombok.Getter; import org.springframework.lang.NonNull; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/StatusEnum.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/StatusEnum.java similarity index 84% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/StatusEnum.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/StatusEnum.java index 7f89d246b..9ff43d583 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/StatusEnum.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/StatusEnum.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.enums; +package com.aizuda.easy.retry.common.core.enums; import lombok.Getter; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/StorageTypeEnum.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/StorageTypeEnum.java similarity index 85% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/StorageTypeEnum.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/StorageTypeEnum.java index 00d826855..e56e5597c 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/enums/StorageTypeEnum.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/enums/StorageTypeEnum.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.enums; +package com.aizuda.easy.retry.common.core.enums; import lombok.Getter; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/exception/AbstractError.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/exception/AbstractError.java similarity index 93% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/exception/AbstractError.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/exception/AbstractError.java index c30ce597c..8a511ed5e 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/exception/AbstractError.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/exception/AbstractError.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.exception; +package com.aizuda.easy.retry.common.core.exception; import lombok.Data; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/exception/BaseXRetryException.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/exception/BaseXRetryException.java similarity index 96% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/exception/BaseXRetryException.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/exception/BaseXRetryException.java index ef6332697..5f68eba6a 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/exception/BaseXRetryException.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/exception/BaseXRetryException.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.exception; +package com.aizuda.easy.retry.common.core.exception; import org.slf4j.helpers.MessageFormatter; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/exception/XRetryCommonException.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/exception/XRetryCommonException.java similarity index 93% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/exception/XRetryCommonException.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/exception/XRetryCommonException.java index 9bab03b89..a7f571ad9 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/exception/XRetryCommonException.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/exception/XRetryCommonException.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.exception; +package com.aizuda.easy.retry.common.core.exception; /** diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/handler/GlobalRestfulResponseBodyAdvice.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/handler/GlobalRestfulResponseBodyAdvice.java similarity index 88% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/handler/GlobalRestfulResponseBodyAdvice.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/handler/GlobalRestfulResponseBodyAdvice.java index 9755a3506..eefe1bfae 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/handler/GlobalRestfulResponseBodyAdvice.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/handler/GlobalRestfulResponseBodyAdvice.java @@ -1,7 +1,7 @@ -package com.x.retry.common.core.handler; +package com.aizuda.easy.retry.common.core.handler; -import com.x.retry.common.core.annotation.OriginalControllerReturnValue; -import com.x.retry.common.core.model.Result; +import com.aizuda.easy.retry.common.core.annotation.OriginalControllerReturnValue; +import com.aizuda.easy.retry.common.core.model.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.core.MethodParameter; import org.springframework.http.MediaType; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/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 similarity index 96% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/handler/RestExceptionHandler.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/handler/RestExceptionHandler.java index 32d2b0fdd..8d6cd5d3c 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/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 @@ -1,8 +1,8 @@ -package com.x.retry.common.core.handler; +package com.aizuda.easy.retry.common.core.handler; -import com.x.retry.common.core.exception.AbstractError; -import com.x.retry.common.core.exception.BaseXRetryException; -import com.x.retry.common.core.model.Result; +import com.aizuda.easy.retry.common.core.exception.AbstractError; +import com.aizuda.easy.retry.common.core.exception.BaseXRetryException; +import com.aizuda.easy.retry.common.core.model.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.TypeMismatchException; import org.springframework.http.converter.HttpMessageNotReadableException; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/log/LogUtils.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/log/LogUtils.java similarity index 92% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/log/LogUtils.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/log/LogUtils.java index d27a7a304..3e7e1fb77 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/log/LogUtils.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/log/LogUtils.java @@ -1,7 +1,6 @@ -package com.x.retry.common.core.log; +package com.aizuda.easy.retry.common.core.log; -import com.x.retry.common.core.context.SpringContext; -import lombok.extern.slf4j.Slf4j; +import com.aizuda.easy.retry.common.core.context.SpringContext; import org.slf4j.Logger; import org.springframework.core.env.Environment; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/model/NettyResult.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/model/NettyResult.java similarity index 87% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/model/NettyResult.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/model/NettyResult.java index b424576b4..8211ef236 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/model/NettyResult.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/model/NettyResult.java @@ -1,6 +1,5 @@ -package com.x.retry.common.core.model; +package com.aizuda.easy.retry.common.core.model; -import lombok.AllArgsConstructor; import lombok.Data; /** diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/model/Result.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/model/Result.java similarity index 93% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/model/Result.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/model/Result.java index bcdecb449..312ede23f 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/model/Result.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/model/Result.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.model; +package com.aizuda.easy.retry.common.core.model; import lombok.Data; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/model/XRetryHeaders.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/model/XRetryHeaders.java similarity index 82% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/model/XRetryHeaders.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/model/XRetryHeaders.java index b68f16cb9..fb6534193 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/model/XRetryHeaders.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/model/XRetryHeaders.java @@ -1,9 +1,9 @@ -package com.x.retry.common.core.model; +package com.aizuda.easy.retry.common.core.model; import lombok.Data; /** - * x-retry 请求头信息 + * easy-retry 请求头信息 * * @author: www.byteblogs.com * @date : 2022-04-16 22:20 diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/model/XRetryRequest.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/model/XRetryRequest.java similarity index 90% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/model/XRetryRequest.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/model/XRetryRequest.java index af99510da..d5547e0d3 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/model/XRetryRequest.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/model/XRetryRequest.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.model; +package com.aizuda.easy.retry.common.core.model; import lombok.Data; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/Assert.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/Assert.java similarity index 83% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/Assert.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/Assert.java index 60429986e..ac73b3d7d 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/Assert.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/Assert.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.util; +package com.aizuda.easy.retry.common.core.util; /** * @author: www.byteblogs.com diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/Asserts.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/Asserts.java similarity index 95% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/Asserts.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/Asserts.java index ea35e37ed..4d292d740 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/Asserts.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/Asserts.java @@ -1,11 +1,10 @@ -package com.x.retry.common.core.util; +package com.aizuda.easy.retry.common.core.util; -import com.x.retry.common.core.exception.AbstractError; -import com.x.retry.common.core.exception.BaseXRetryException; +import com.aizuda.easy.retry.common.core.exception.AbstractError; +import com.aizuda.easy.retry.common.core.exception.BaseXRetryException; import org.apache.commons.lang.StringUtils; import org.springframework.util.CollectionUtils; -import java.lang.reflect.Constructor; import java.util.Collection; import java.util.Map; import java.util.Objects; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/CronExpression.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/CronExpression.java similarity index 99% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/CronExpression.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/CronExpression.java index d4bf0d12c..78c83791d 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/CronExpression.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/CronExpression.java @@ -15,7 +15,7 @@ * */ -package com.x.retry.common.core.util; +package com.aizuda.easy.retry.common.core.util; import java.io.Serializable; import java.text.ParseException; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/DingDingUtils.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/DingDingUtils.java similarity index 94% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/DingDingUtils.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/DingDingUtils.java index 0a50f958a..2d4b45d28 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/DingDingUtils.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/DingDingUtils.java @@ -1,6 +1,6 @@ -package com.x.retry.common.core.util; +package com.aizuda.easy.retry.common.core.util; -import com.x.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.log.LogUtils; import com.dingtalk.api.DefaultDingTalkClient; import com.dingtalk.api.DingTalkClient; import com.dingtalk.api.request.OapiRobotSendRequest; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/EnvironmentUtils.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/EnvironmentUtils.java similarity index 90% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/EnvironmentUtils.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/EnvironmentUtils.java index 40d42bbc1..cd5de6c15 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/EnvironmentUtils.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/EnvironmentUtils.java @@ -1,6 +1,6 @@ -package com.x.retry.common.core.util; +package com.aizuda.easy.retry.common.core.util; -import com.x.retry.common.core.context.SpringContext; +import com.aizuda.easy.retry.common.core.context.SpringContext; import org.springframework.core.env.Environment; /** diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/HostUtils.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/HostUtils.java similarity index 76% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/HostUtils.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/HostUtils.java index 3ec25645b..c844dbcc4 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/HostUtils.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/HostUtils.java @@ -1,6 +1,6 @@ -package com.x.retry.common.core.util; +package com.aizuda.easy.retry.common.core.util; -import com.x.retry.common.core.exception.XRetryCommonException; +import com.aizuda.easy.retry.common.core.exception.XRetryCommonException; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/JsonUtil.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/JsonUtil.java similarity index 98% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/JsonUtil.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/JsonUtil.java index e105ec043..16ca4260f 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/util/JsonUtil.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/util/JsonUtil.java @@ -1,6 +1,6 @@ -package com.x.retry.common.core.util; +package com.aizuda.easy.retry.common.core.util; -import com.x.retry.common.core.exception.XRetryCommonException; +import com.aizuda.easy.retry.common.core.exception.XRetryCommonException; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/window/LeapArray.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/window/LeapArray.java old mode 100755 new mode 100644 similarity index 99% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/window/LeapArray.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/window/LeapArray.java index 372136cb5..ad5ccffa5 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/window/LeapArray.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/window/LeapArray.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.window; +package com.aizuda.easy.retry.common.core.window; import lombok.extern.slf4j.Slf4j; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/window/Listener.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/window/Listener.java similarity index 85% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/window/Listener.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/window/Listener.java index 9f70bd3ca..e6e9d27b3 100644 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/window/Listener.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/window/Listener.java @@ -1,4 +1,4 @@ -package com.x.retry.common.core.window; +package com.aizuda.easy.retry.common.core.window; import java.util.List; diff --git a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/window/WindowWrap.java b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/window/WindowWrap.java old mode 100755 new mode 100644 similarity index 98% rename from x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/window/WindowWrap.java rename to easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/window/WindowWrap.java index b6aba36d5..ae361fec0 --- a/x-retry-common/x-retry-common-core/src/main/java/com/x/retry/common/core/window/WindowWrap.java +++ b/easy-retry-common/easy-retry-common-core/src/main/java/com/aizuda/easy/retry/common/core/window/WindowWrap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.x.retry.common.core.window; +package com.aizuda.easy.retry.common.core.window; /** * Wrapper entity class for a period of time window. diff --git a/x-retry-common/x-retry-common-core/src/main/resources/META-INF/spring.factories b/easy-retry-common/easy-retry-common-core/src/main/resources/META-INF/spring.factories similarity index 54% rename from x-retry-common/x-retry-common-core/src/main/resources/META-INF/spring.factories rename to easy-retry-common/easy-retry-common-core/src/main/resources/META-INF/spring.factories index 4c2353fe4..b01f06049 100644 --- a/x-retry-common/x-retry-common-core/src/main/resources/META-INF/spring.factories +++ b/easy-retry-common/easy-retry-common-core/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.x.retry.common.core.CommonCoreConfigure + com.aizuda.easy.retry.common.core.CommonCoreConfigure diff --git a/x-retry-common/x-retry-common-server-api/.gitignore b/easy-retry-common/easy-retry-common-server-api/.gitignore similarity index 100% rename from x-retry-common/x-retry-common-server-api/.gitignore rename to easy-retry-common/easy-retry-common-server-api/.gitignore diff --git a/x-retry-common/x-retry-common-server-api/pom.xml b/easy-retry-common/easy-retry-common-server-api/pom.xml similarity index 84% rename from x-retry-common/x-retry-common-server-api/pom.xml rename to easy-retry-common/easy-retry-common-server-api/pom.xml index ae5b10eb9..c389d8144 100644 --- a/x-retry-common/x-retry-common-server-api/pom.xml +++ b/easy-retry-common/easy-retry-common-server-api/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.byteblogs - x-retry-common + com.aizuda + easy-retry-common ${revision} ../pom.xml - x-retry-common-server-api - x-retry-common-server-api - x-retry-common-server-api + easy-retry-common-server-api + easy-retry-common-server-api + easy-retry-common-server-api jar @@ -33,8 +33,8 @@ hibernate-validator - com.byteblogs - x-retry-common-core + com.aizuda + easy-retry-common-core diff --git a/x-retry-common/x-retry-common-server-api/src/main/java/com/x/retry/server/model/dto/ConfigDTO.java b/easy-retry-common/easy-retry-common-server-api/src/main/java/com/aizuda/easy/retry/server/model/dto/ConfigDTO.java similarity index 84% rename from x-retry-common/x-retry-common-server-api/src/main/java/com/x/retry/server/model/dto/ConfigDTO.java rename to easy-retry-common/easy-retry-common-server-api/src/main/java/com/aizuda/easy/retry/server/model/dto/ConfigDTO.java index bda7e4be0..4db59dcfa 100644 --- a/x-retry-common/x-retry-common-server-api/src/main/java/com/x/retry/server/model/dto/ConfigDTO.java +++ b/easy-retry-common/easy-retry-common-server-api/src/main/java/com/aizuda/easy/retry/server/model/dto/ConfigDTO.java @@ -1,7 +1,7 @@ -package com.x.retry.server.model.dto; +package com.aizuda.easy.retry.server.model.dto; -import com.x.retry.common.core.enums.NotifySceneEnum; -import com.x.retry.common.core.enums.NotifyTypeEnum; +import com.aizuda.easy.retry.common.core.enums.NotifySceneEnum; +import com.aizuda.easy.retry.common.core.enums.NotifyTypeEnum; import lombok.Data; import java.util.List; import java.util.Set; diff --git a/x-retry-common/x-retry-common-server-api/src/main/java/com/x/retry/server/model/dto/RetryTaskDTO.java b/easy-retry-common/easy-retry-common-server-api/src/main/java/com/aizuda/easy/retry/server/model/dto/RetryTaskDTO.java similarity index 96% rename from x-retry-common/x-retry-common-server-api/src/main/java/com/x/retry/server/model/dto/RetryTaskDTO.java rename to easy-retry-common/easy-retry-common-server-api/src/main/java/com/aizuda/easy/retry/server/model/dto/RetryTaskDTO.java index 03bd57ade..6fc55e345 100644 --- a/x-retry-common/x-retry-common-server-api/src/main/java/com/x/retry/server/model/dto/RetryTaskDTO.java +++ b/easy-retry-common/easy-retry-common-server-api/src/main/java/com/aizuda/easy/retry/server/model/dto/RetryTaskDTO.java @@ -1,4 +1,4 @@ -package com.x.retry.server.model.dto; +package com.aizuda.easy.retry.server.model.dto; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/x-retry-common/x-retry-common-server-api/src/main/resources/application.properties b/easy-retry-common/easy-retry-common-server-api/src/main/resources/application.properties similarity index 100% rename from x-retry-common/x-retry-common-server-api/src/main/resources/application.properties rename to easy-retry-common/easy-retry-common-server-api/src/main/resources/application.properties diff --git a/x-retry-common/pom.xml b/easy-retry-common/pom.xml similarity index 78% rename from x-retry-common/pom.xml rename to easy-retry-common/pom.xml index 635f01cb0..84c01b03b 100644 --- a/x-retry-common/pom.xml +++ b/easy-retry-common/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.byteblogs - x-retry + com.aizuda + easy-retry ${revision} ../pom.xml - x-retry-common - x-retry-common - x-retry-common + easy-retry-common + easy-retry-common + easy-retry-common pom @@ -19,9 +19,9 @@ - x-retry-common-server-api - x-retry-common-client-api - x-retry-common-core + easy-retry-common-server-api + easy-retry-common-client-api + easy-retry-common-core diff --git a/x-retry-server/.gitignore b/easy-retry-server/.gitignore similarity index 100% rename from x-retry-server/.gitignore rename to easy-retry-server/.gitignore diff --git a/easy-retry-server/Dockerfile b/easy-retry-server/Dockerfile new file mode 100644 index 000000000..eee3addb5 --- /dev/null +++ b/easy-retry-server/Dockerfile @@ -0,0 +1,13 @@ +FROM openjdk:8-jdk-alpine +MAINTAINER www.byteblogs.com +LABEL server-name=easy-retry-server + +ADD ./target/easy-retry-server.jar easy-retry-server.jar + +#对外暴漏的端口号 +EXPOSE 8080 +EXPOSE 1788 + +WORKDIR / + +ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /easy-retry-server.jar $PARAMS"] diff --git a/x-retry-server/pom.xml b/easy-retry-server/pom.xml similarity index 79% rename from x-retry-server/pom.xml rename to easy-retry-server/pom.xml index 56ca37049..9494008cd 100644 --- a/x-retry-server/pom.xml +++ b/easy-retry-server/pom.xml @@ -3,16 +3,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.byteblogs - x-retry + com.aizuda + easy-retry ${revision} ../pom.xml - x-retry-server + easy-retry-server jar - x-retry-server - x-retry-server + easy-retry-server + easy-retry-server 1.8 @@ -31,23 +31,23 @@ com.typesafe.akka akka-actor-typed_2.13 - 2.6.12 + 2.8.0 ch.qos.logback logback-classic - 1.2.3 + 1.4.6 com.typesafe.akka akka-actor-testkit-typed_2.13 - 2.6.12 + 2.8.0 test com.google.guava guava - 16.0 + 31.1-jre org.projectlombok @@ -57,17 +57,17 @@ net.javacrumbs.shedlock shedlock-provider-jdbc-template - 4.0.1 + 5.2.0 net.javacrumbs.shedlock shedlock-spring - 4.0.1 + 5.2.0 mysql mysql-connector-java - 5.1.46 + 8.0.32 org.springframework.boot @@ -75,16 +75,16 @@ test - com.byteblogs - x-retry-common-server-api + com.aizuda + easy-retry-common-server-api - com.byteblogs - x-retry-common-core + com.aizuda + easy-retry-common-core - com.byteblogs - x-retry-common-client-api + com.aizuda + easy-retry-common-client-api cn.hutool @@ -93,7 +93,7 @@ com.auth0 java-jwt - 3.4.0 + 4.3.0 io.netty @@ -102,12 +102,17 @@ com.squareup.okhttp3 okhttp - 4.2.0 + 4.10.0 + + + commons-lang + commons-lang + 2.6 - x-retry-server + easy-retry-server org.apache.maven.plugins diff --git a/x-retry-server/src/main/java/com/x/retry/server/XRetryServerApplication.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/XRetryServerApplication.java similarity index 84% rename from x-retry-server/src/main/java/com/x/retry/server/XRetryServerApplication.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/XRetryServerApplication.java index 9131ce685..2dc0ef977 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/XRetryServerApplication.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/XRetryServerApplication.java @@ -1,4 +1,4 @@ -package com.x.retry.server; +package com.aizuda.easy.retry.server; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; @@ -8,7 +8,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; import java.util.TimeZone; @SpringBootApplication -@MapperScan("com.x.retry.server.persistence.mybatis.mapper") +@MapperScan("com.aizuda.easy.retry.server.persistence.mybatis.mapper") @EnableTransactionManagement(proxyTargetClass = true) public class XRetryServerApplication { diff --git a/x-retry-server/src/main/java/com/x/retry/server/akka/ActorGenerator.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/akka/ActorGenerator.java similarity index 80% rename from x-retry-server/src/main/java/com/x/retry/server/akka/ActorGenerator.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/akka/ActorGenerator.java index d3b8a4061..2895a01e2 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/akka/ActorGenerator.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/akka/ActorGenerator.java @@ -1,14 +1,14 @@ -package com.x.retry.server.akka; +package com.aizuda.easy.retry.server.akka; import akka.actor.ActorRef; import akka.actor.ActorSystem; -import com.x.retry.common.core.context.SpringContext; -import com.x.retry.server.support.dispatch.actor.callback.CallbackRetryResultActor; -import com.x.retry.server.support.dispatch.actor.exec.ExecUnitActor; -import com.x.retry.server.support.dispatch.actor.result.FailureActor; -import com.x.retry.server.support.dispatch.actor.result.FinishActor; -import com.x.retry.server.support.dispatch.actor.result.NoRetryActor; -import com.x.retry.server.support.dispatch.actor.scan.ScanGroupActor; +import com.aizuda.easy.retry.server.support.dispatch.actor.callback.CallbackRetryResultActor; +import com.aizuda.easy.retry.server.support.dispatch.actor.exec.ExecUnitActor; +import com.aizuda.easy.retry.server.support.dispatch.actor.result.FailureActor; +import com.aizuda.easy.retry.server.support.dispatch.actor.result.FinishActor; +import com.aizuda.easy.retry.server.support.dispatch.actor.result.NoRetryActor; +import com.aizuda.easy.retry.server.support.dispatch.actor.scan.ScanGroupActor; +import com.aizuda.easy.retry.common.core.context.SpringContext; /** * Actor生成器 diff --git a/x-retry-server/src/main/java/com/x/retry/server/akka/AkkaConfiguration.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/akka/AkkaConfiguration.java similarity index 97% rename from x-retry-server/src/main/java/com/x/retry/server/akka/AkkaConfiguration.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/akka/AkkaConfiguration.java index cc9f965ad..5cea66941 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/akka/AkkaConfiguration.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/akka/AkkaConfiguration.java @@ -1,4 +1,4 @@ -package com.x.retry.server.akka; +package com.aizuda.easy.retry.server.akka; import akka.actor.ActorSystem; import org.springframework.beans.factory.annotation.Autowired; diff --git a/x-retry-server/src/main/java/com/x/retry/server/akka/SpringActorProducer.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/akka/SpringActorProducer.java similarity index 96% rename from x-retry-server/src/main/java/com/x/retry/server/akka/SpringActorProducer.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/akka/SpringActorProducer.java index c070f4f3a..147fca05e 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/akka/SpringActorProducer.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/akka/SpringActorProducer.java @@ -1,4 +1,4 @@ -package com.x.retry.server.akka; +package com.aizuda.easy.retry.server.akka; import akka.actor.Actor; import akka.actor.IndirectActorProducer; diff --git a/x-retry-server/src/main/java/com/x/retry/server/akka/SpringExtension.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/akka/SpringExtension.java similarity index 95% rename from x-retry-server/src/main/java/com/x/retry/server/akka/SpringExtension.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/akka/SpringExtension.java index 82cfdde3d..da1dfaa35 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/akka/SpringExtension.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/akka/SpringExtension.java @@ -1,4 +1,4 @@ -package com.x.retry.server.akka; +package com.aizuda.easy.retry.server.akka; import akka.actor.Extension; import akka.actor.Props; diff --git a/x-retry-server/src/main/java/com/x/retry/server/config/JacksonConfig.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/JacksonConfig.java similarity index 81% rename from x-retry-server/src/main/java/com/x/retry/server/config/JacksonConfig.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/JacksonConfig.java index e67f55863..e1a7fcb28 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/config/JacksonConfig.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/JacksonConfig.java @@ -1,7 +1,7 @@ -package com.x.retry.server.config; +package com.aizuda.easy.retry.server.config; import com.fasterxml.jackson.databind.ObjectMapper; -import com.x.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.common.core.util.JsonUtil; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Primary; diff --git a/x-retry-server/src/main/java/com/x/retry/server/config/MyBatisPlusConfig.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/MyBatisPlusConfig.java similarity index 92% rename from x-retry-server/src/main/java/com/x/retry/server/config/MyBatisPlusConfig.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/MyBatisPlusConfig.java index 3e01a7549..22a1b4d4f 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/config/MyBatisPlusConfig.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/MyBatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.x.retry.server.config; +package com.aizuda.easy.retry.server.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; @@ -7,12 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerIntercept import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.stereotype.Service; import java.util.Arrays; import java.util.List; -import java.util.Map; -import java.util.Random; /** * @author www.byteblogs.com diff --git a/x-retry-server/src/main/java/com/x/retry/server/config/RequestDataHelper.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/RequestDataHelper.java similarity index 87% rename from x-retry-server/src/main/java/com/x/retry/server/config/RequestDataHelper.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/RequestDataHelper.java index ff89c1301..56ceeab1e 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/config/RequestDataHelper.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/RequestDataHelper.java @@ -1,11 +1,11 @@ -package com.x.retry.server.config; +package com.aizuda.easy.retry.server.config; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.GroupConfigMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.x.retry.common.core.context.SpringContext; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.persistence.mybatis.mapper.GroupConfigMapper; -import com.x.retry.server.persistence.mybatis.po.GroupConfig; +import com.aizuda.easy.retry.common.core.context.SpringContext; import org.apache.commons.lang.StringUtils; import java.util.HashMap; diff --git a/x-retry-server/src/main/java/com/x/retry/server/config/RestTemplateConfig.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/RestTemplateConfig.java similarity index 95% rename from x-retry-server/src/main/java/com/x/retry/server/config/RestTemplateConfig.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/RestTemplateConfig.java index bf88427f2..ecc375af6 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/config/RestTemplateConfig.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/RestTemplateConfig.java @@ -1,4 +1,4 @@ -package com.x.retry.server.config; +package com.aizuda.easy.retry.server.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/x-retry-server/src/main/java/com/x/retry/server/config/ShedlockConfig.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/ShedlockConfig.java similarity index 92% rename from x-retry-server/src/main/java/com/x/retry/server/config/ShedlockConfig.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/ShedlockConfig.java index d55710ea2..b4e04ab34 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/config/ShedlockConfig.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/ShedlockConfig.java @@ -1,4 +1,4 @@ -package com.x.retry.server.config; +package com.aizuda.easy.retry.server.config; import net.javacrumbs.shedlock.core.LockProvider; import net.javacrumbs.shedlock.provider.jdbctemplate.JdbcTemplateLockProvider; @@ -36,7 +36,7 @@ public class ShedlockConfig { public TaskScheduler scheduledExecutorService() { ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler(); scheduler.setPoolSize(2); - scheduler.setThreadNamePrefix("x-retry-scheduled-thread-"); + scheduler.setThreadNamePrefix("easy-retry-scheduled-thread-"); return scheduler; } } diff --git a/x-retry-server/src/main/java/com/x/retry/server/config/SystemProperties.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/SystemProperties.java similarity index 88% rename from x-retry-server/src/main/java/com/x/retry/server/config/SystemProperties.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/SystemProperties.java index 382c39770..8687dd423 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/config/SystemProperties.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/config/SystemProperties.java @@ -1,4 +1,4 @@ -package com.x.retry.server.config; +package com.aizuda.easy.retry.server.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; * @date : 2021-12-21 10:19 */ @Component -@ConfigurationProperties(value = "x-retry") +@ConfigurationProperties(value = "easy-retry") @Data public class SystemProperties { diff --git a/x-retry-server/src/main/java/com/x/retry/server/exception/XRetryServerException.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/exception/XRetryServerException.java similarity index 73% rename from x-retry-server/src/main/java/com/x/retry/server/exception/XRetryServerException.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/exception/XRetryServerException.java index a7ce55f21..83fd13d23 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/exception/XRetryServerException.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/exception/XRetryServerException.java @@ -1,6 +1,6 @@ -package com.x.retry.server.exception; +package com.aizuda.easy.retry.server.exception; -import com.x.retry.common.core.exception.BaseXRetryException; +import com.aizuda.easy.retry.common.core.exception.BaseXRetryException; /** * @author: www.byteblogs.com diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/GroupConfigMapper.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/GroupConfigMapper.java new file mode 100644 index 000000000..2cccaf204 --- /dev/null +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/GroupConfigMapper.java @@ -0,0 +1,8 @@ +package com.aizuda.easy.retry.server.persistence.mybatis.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; + +public interface GroupConfigMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/NotifyConfigMapper.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/NotifyConfigMapper.java new file mode 100644 index 000000000..ad0960aa0 --- /dev/null +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/NotifyConfigMapper.java @@ -0,0 +1,7 @@ +package com.aizuda.easy.retry.server.persistence.mybatis.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.NotifyConfig; + +public interface NotifyConfigMapper extends BaseMapper { +} \ No newline at end of file diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/RetryDeadLetterMapper.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/RetryDeadLetterMapper.java similarity index 73% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/RetryDeadLetterMapper.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/RetryDeadLetterMapper.java index 64483a74a..2175d8016 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/RetryDeadLetterMapper.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/RetryDeadLetterMapper.java @@ -1,10 +1,10 @@ -package com.x.retry.server.persistence.mybatis.mapper; +package com.aizuda.easy.retry.server.persistence.mybatis.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.x.retry.server.persistence.mybatis.po.RetryDeadLetter; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.web.model.request.RetryDeadLetterQueryVO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryDeadLetter; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.web.model.request.RetryDeadLetterQueryVO; import org.apache.ibatis.annotations.Param; import java.time.LocalDateTime; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/RetryTaskLogMapper.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/RetryTaskLogMapper.java similarity index 78% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/RetryTaskLogMapper.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/RetryTaskLogMapper.java index da91ee6dc..902ca21fa 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/RetryTaskLogMapper.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/RetryTaskLogMapper.java @@ -1,10 +1,9 @@ -package com.x.retry.server.persistence.mybatis.mapper; +package com.aizuda.easy.retry.server.persistence.mybatis.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.x.retry.server.persistence.mybatis.po.RetryTaskLog; -import com.x.retry.server.web.model.response.ActivePodQuantityResponseVO; -import com.x.retry.server.web.model.response.DispatchQuantityResponseVO; -import com.x.retry.server.web.model.response.SceneQuantityRankResponseVO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTaskLog; +import com.aizuda.easy.retry.server.web.model.response.DispatchQuantityResponseVO; +import com.aizuda.easy.retry.server.web.model.response.SceneQuantityRankResponseVO; import org.apache.ibatis.annotations.Param; import java.time.LocalDateTime; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/RetryTaskMapper.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/RetryTaskMapper.java similarity index 64% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/RetryTaskMapper.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/RetryTaskMapper.java index ecf4e52c7..a5b25e6e4 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/RetryTaskMapper.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/RetryTaskMapper.java @@ -1,9 +1,7 @@ -package com.x.retry.server.persistence.mybatis.mapper; +package com.aizuda.easy.retry.server.persistence.mybatis.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.web.model.request.RetryTaskQueryVO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/SceneConfigMapper.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/SceneConfigMapper.java similarity index 62% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/SceneConfigMapper.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/SceneConfigMapper.java index 2bfc1cbb0..b8ea63811 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/SceneConfigMapper.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/SceneConfigMapper.java @@ -1,8 +1,8 @@ -package com.x.retry.server.persistence.mybatis.mapper; +package com.aizuda.easy.retry.server.persistence.mybatis.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.x.retry.server.persistence.mybatis.po.SceneConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SceneConfig; @InterceptorIgnore(tenantLine = "false") public interface SceneConfigMapper extends BaseMapper { diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/ServerNodeMapper.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/ServerNodeMapper.java similarity index 69% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/ServerNodeMapper.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/ServerNodeMapper.java index 8944439be..e1d8d98db 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/ServerNodeMapper.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/ServerNodeMapper.java @@ -1,11 +1,10 @@ -package com.x.retry.server.persistence.mybatis.mapper; +package com.aizuda.easy.retry.server.persistence.mybatis.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.x.retry.server.persistence.mybatis.po.ServerNode; +import com.aizuda.easy.retry.server.persistence.mybatis.po.ServerNode; import org.apache.ibatis.annotations.Param; import java.time.LocalDateTime; -import java.util.List; public interface ServerNodeMapper extends BaseMapper { diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/SystemUserMapper.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/SystemUserMapper.java similarity index 63% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/SystemUserMapper.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/SystemUserMapper.java index 28ee15505..354641a37 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/SystemUserMapper.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/SystemUserMapper.java @@ -1,7 +1,7 @@ -package com.x.retry.server.persistence.mybatis.mapper; +package com.aizuda.easy.retry.server.persistence.mybatis.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.x.retry.server.persistence.mybatis.po.SystemUser; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SystemUser; import org.apache.ibatis.annotations.Mapper; /** diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/SystemUserPermissionMapper.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/SystemUserPermissionMapper.java similarity index 68% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/SystemUserPermissionMapper.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/SystemUserPermissionMapper.java index 25b6b642f..f6274cebc 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/mapper/SystemUserPermissionMapper.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/mapper/SystemUserPermissionMapper.java @@ -1,7 +1,7 @@ -package com.x.retry.server.persistence.mybatis.mapper; +package com.aizuda.easy.retry.server.persistence.mybatis.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.x.retry.server.persistence.mybatis.po.SystemUserPermission; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SystemUserPermission; import org.apache.ibatis.annotations.Mapper; /** diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/GroupConfig.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/GroupConfig.java similarity index 91% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/GroupConfig.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/GroupConfig.java index 21f039cb4..e05132ef3 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/GroupConfig.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/GroupConfig.java @@ -1,4 +1,4 @@ -package com.x.retry.server.persistence.mybatis.po; +package com.aizuda.easy.retry.server.persistence.mybatis.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/NotifyConfig.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/NotifyConfig.java similarity index 91% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/NotifyConfig.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/NotifyConfig.java index 0c863228d..7fc2ec84e 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/NotifyConfig.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/NotifyConfig.java @@ -1,4 +1,4 @@ -package com.x.retry.server.persistence.mybatis.po; +package com.aizuda.easy.retry.server.persistence.mybatis.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/RetryDeadLetter.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/RetryDeadLetter.java similarity index 91% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/RetryDeadLetter.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/RetryDeadLetter.java index 153b12584..a9d8c2414 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/RetryDeadLetter.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/RetryDeadLetter.java @@ -1,4 +1,4 @@ -package com.x.retry.server.persistence.mybatis.po; +package com.aizuda.easy.retry.server.persistence.mybatis.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/RetryTask.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/RetryTask.java similarity index 93% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/RetryTask.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/RetryTask.java index 9d24af8d2..131bcfd9c 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/RetryTask.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/RetryTask.java @@ -1,4 +1,4 @@ -package com.x.retry.server.persistence.mybatis.po; +package com.aizuda.easy.retry.server.persistence.mybatis.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/RetryTaskLog.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/RetryTaskLog.java similarity index 91% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/RetryTaskLog.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/RetryTaskLog.java index 48c77d793..7c6845551 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/RetryTaskLog.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/RetryTaskLog.java @@ -1,4 +1,4 @@ -package com.x.retry.server.persistence.mybatis.po; +package com.aizuda.easy.retry.server.persistence.mybatis.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/SceneConfig.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/SceneConfig.java similarity index 92% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/SceneConfig.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/SceneConfig.java index c6d79425a..125ff71bc 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/SceneConfig.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/SceneConfig.java @@ -1,4 +1,4 @@ -package com.x.retry.server.persistence.mybatis.po; +package com.aizuda.easy.retry.server.persistence.mybatis.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/ServerNode.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/ServerNode.java similarity index 91% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/ServerNode.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/ServerNode.java index 24346064e..3a671ce68 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/ServerNode.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/ServerNode.java @@ -1,4 +1,4 @@ -package com.x.retry.server.persistence.mybatis.po; +package com.aizuda.easy.retry.server.persistence.mybatis.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/SystemUser.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/SystemUser.java similarity index 92% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/SystemUser.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/SystemUser.java index 2f162bfd1..e6ffe12bd 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/SystemUser.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/SystemUser.java @@ -1,4 +1,4 @@ -package com.x.retry.server.persistence.mybatis.po; +package com.aizuda.easy.retry.server.persistence.mybatis.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/SystemUserPermission.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/SystemUserPermission.java similarity index 91% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/SystemUserPermission.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/SystemUserPermission.java index 65e68ccf8..f9109a936 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/mybatis/po/SystemUserPermission.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/mybatis/po/SystemUserPermission.java @@ -1,4 +1,4 @@ -package com.x.retry.server.persistence.mybatis.po; +package com.aizuda.easy.retry.server.persistence.mybatis.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/support/ConfigAccess.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/ConfigAccess.java similarity index 82% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/support/ConfigAccess.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/ConfigAccess.java index 42961150e..ce7f3d925 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/support/ConfigAccess.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/ConfigAccess.java @@ -1,10 +1,10 @@ -package com.x.retry.server.persistence.support; +package com.aizuda.easy.retry.server.persistence.support; -import com.x.retry.common.core.enums.NotifySceneEnum; -import com.x.retry.server.model.dto.ConfigDTO; -import com.x.retry.server.persistence.mybatis.po.GroupConfig; -import com.x.retry.server.persistence.mybatis.po.NotifyConfig; -import com.x.retry.server.persistence.mybatis.po.SceneConfig; +import com.aizuda.easy.retry.common.core.enums.NotifySceneEnum; +import com.aizuda.easy.retry.server.model.dto.ConfigDTO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.NotifyConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SceneConfig; import java.util.List; import java.util.Set; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/support/RetryTaskAccess.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/RetryTaskAccess.java similarity index 90% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/support/RetryTaskAccess.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/RetryTaskAccess.java index 890e73a7c..a7f5995ed 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/support/RetryTaskAccess.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/RetryTaskAccess.java @@ -1,4 +1,4 @@ -package com.x.retry.server.persistence.support; +package com.aizuda.easy.retry.server.persistence.support; import java.time.LocalDateTime; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/support/access/config/AbstractConfigAccess.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/config/AbstractConfigAccess.java similarity index 72% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/support/access/config/AbstractConfigAccess.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/config/AbstractConfigAccess.java index db3d8ea32..96be36afd 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/support/access/config/AbstractConfigAccess.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/config/AbstractConfigAccess.java @@ -1,14 +1,14 @@ -package com.x.retry.server.persistence.support.access.config; +package com.aizuda.easy.retry.server.persistence.support.access.config; +import com.aizuda.easy.retry.server.model.dto.ConfigDTO; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.GroupConfigMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.NotifyConfigMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.SceneConfigMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.NotifyConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SceneConfig; +import com.aizuda.easy.retry.server.persistence.support.ConfigAccess; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.x.retry.server.model.dto.ConfigDTO; -import com.x.retry.server.persistence.mybatis.mapper.GroupConfigMapper; -import com.x.retry.server.persistence.mybatis.mapper.NotifyConfigMapper; -import com.x.retry.server.persistence.mybatis.mapper.SceneConfigMapper; -import com.x.retry.server.persistence.mybatis.po.GroupConfig; -import com.x.retry.server.persistence.mybatis.po.NotifyConfig; -import com.x.retry.server.persistence.mybatis.po.SceneConfig; -import com.x.retry.server.persistence.support.ConfigAccess; import org.springframework.beans.factory.annotation.Autowired; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/support/access/config/MybatisConfigAccess.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/config/MybatisConfigAccess.java similarity index 88% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/support/access/config/MybatisConfigAccess.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/config/MybatisConfigAccess.java index 5ad03a4b9..1b63b8d90 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/support/access/config/MybatisConfigAccess.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/config/MybatisConfigAccess.java @@ -1,10 +1,10 @@ -package com.x.retry.server.persistence.support.access.config; +package com.aizuda.easy.retry.server.persistence.support.access.config; +import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.NotifyConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SceneConfig; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.x.retry.common.core.enums.StatusEnum; -import com.x.retry.server.persistence.mybatis.po.GroupConfig; -import com.x.retry.server.persistence.mybatis.po.NotifyConfig; -import com.x.retry.server.persistence.mybatis.po.SceneConfig; +import com.aizuda.easy.retry.common.core.enums.StatusEnum; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/support/access/retry/AbstractRetryTaskAccess.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/retry/AbstractRetryTaskAccess.java similarity index 61% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/support/access/retry/AbstractRetryTaskAccess.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/retry/AbstractRetryTaskAccess.java index 9475dc654..4825db43f 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/support/access/retry/AbstractRetryTaskAccess.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/retry/AbstractRetryTaskAccess.java @@ -1,8 +1,8 @@ -package com.x.retry.server.persistence.support.access.retry; +package com.aizuda.easy.retry.server.persistence.support.access.retry; -import com.x.retry.server.config.RequestDataHelper; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.persistence.support.RetryTaskAccess; +import com.aizuda.easy.retry.server.config.RequestDataHelper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.persistence.support.RetryTaskAccess; import org.springframework.core.Ordered; /** diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/support/access/retry/MybatisRetryTaskAccess.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/retry/MybatisRetryTaskAccess.java similarity index 84% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/support/access/retry/MybatisRetryTaskAccess.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/retry/MybatisRetryTaskAccess.java index 25d23d00a..b8d63872f 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/support/access/retry/MybatisRetryTaskAccess.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/access/retry/MybatisRetryTaskAccess.java @@ -1,13 +1,13 @@ -package com.x.retry.server.persistence.support.access.retry; +package com.aizuda.easy.retry.server.persistence.support.access.retry; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.x.retry.common.core.enums.RetryStatusEnum; -import com.x.retry.common.core.util.Assert; -import com.x.retry.common.core.util.JsonUtil; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.persistence.mybatis.mapper.RetryTaskMapper; -import com.x.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; +import com.aizuda.easy.retry.common.core.util.Assert; +import com.aizuda.easy.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryTaskMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/support/processor/ConfigAccessProcessor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/processor/ConfigAccessProcessor.java similarity index 83% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/support/processor/ConfigAccessProcessor.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/processor/ConfigAccessProcessor.java index fd843211e..eee4af1e1 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/support/processor/ConfigAccessProcessor.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/processor/ConfigAccessProcessor.java @@ -1,13 +1,13 @@ -package com.x.retry.server.persistence.support.processor; +package com.aizuda.easy.retry.server.persistence.support.processor; -import com.x.retry.common.core.enums.NodeTypeEnum; -import com.x.retry.common.core.enums.NotifySceneEnum; -import com.x.retry.server.model.dto.ConfigDTO; -import com.x.retry.server.persistence.mybatis.po.GroupConfig; -import com.x.retry.server.persistence.mybatis.po.NotifyConfig; -import com.x.retry.server.persistence.mybatis.po.SceneConfig; -import com.x.retry.server.persistence.support.ConfigAccess; -import com.x.retry.server.persistence.support.access.config.AbstractConfigAccess; +import com.aizuda.easy.retry.server.model.dto.ConfigDTO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.NotifyConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SceneConfig; +import com.aizuda.easy.retry.server.persistence.support.ConfigAccess; +import com.aizuda.easy.retry.server.persistence.support.access.config.AbstractConfigAccess; +import com.aizuda.easy.retry.common.core.enums.NodeTypeEnum; +import com.aizuda.easy.retry.common.core.enums.NotifySceneEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; diff --git a/x-retry-server/src/main/java/com/x/retry/server/persistence/support/processor/RetryTaskAccessProcessor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/processor/RetryTaskAccessProcessor.java similarity index 79% rename from x-retry-server/src/main/java/com/x/retry/server/persistence/support/processor/RetryTaskAccessProcessor.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/processor/RetryTaskAccessProcessor.java index 7bbe80d8e..753cff9a6 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/persistence/support/processor/RetryTaskAccessProcessor.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/persistence/support/processor/RetryTaskAccessProcessor.java @@ -1,10 +1,10 @@ -package com.x.retry.server.persistence.support.processor; +package com.aizuda.easy.retry.server.persistence.support.processor; -import com.x.retry.common.core.util.Assert; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.persistence.support.RetryTaskAccess; -import com.x.retry.server.persistence.support.access.retry.AbstractRetryTaskAccess; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.persistence.support.RetryTaskAccess; +import com.aizuda.easy.retry.common.core.util.Assert; +import com.aizuda.easy.retry.server.persistence.support.access.retry.AbstractRetryTaskAccess; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; diff --git a/x-retry-server/src/main/java/com/x/retry/server/server/NettyHttpServer.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/NettyHttpServer.java similarity index 82% rename from x-retry-server/src/main/java/com/x/retry/server/server/NettyHttpServer.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/NettyHttpServer.java index c17260857..8ecf4f0fa 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/server/NettyHttpServer.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/NettyHttpServer.java @@ -1,8 +1,8 @@ -package com.x.retry.server.server; +package com.aizuda.easy.retry.server.server; -import com.x.retry.server.config.SystemProperties; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.support.Lifecycle; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.config.SystemProperties; +import com.aizuda.easy.retry.server.support.Lifecycle; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; @@ -37,8 +37,8 @@ public class NettyHttpServer implements Runnable, Lifecycle { EventLoopGroup workerGroup = new NioEventLoopGroup(); ThreadPoolExecutor serverHandlerPool = new ThreadPoolExecutor(60, 300, 60L, TimeUnit.SECONDS, - new LinkedBlockingQueue<>(2000), r -> new Thread(r, "x-retry-serverHandlerPool-" + r.hashCode()), (r, executor) -> { - throw new XRetryServerException("x-retry thread pool is EXHAUSTED!"); + new LinkedBlockingQueue<>(2000), r -> new Thread(r, "easy-retry-serverHandlerPool-" + r.hashCode()), (r, executor) -> { + throw new XRetryServerException("easy-retry thread pool is EXHAUSTED!"); }); try { @@ -61,15 +61,15 @@ public class NettyHttpServer implements Runnable, Lifecycle { // bind ChannelFuture future = bootstrap.bind(systemProperties.getNettyPort()).sync(); - log.info("------> x-retry remoting server start success, nettype = {}, port = {}", NettyHttpServer.class.getName(), 1788); + log.info("------> easy-retry remoting server start success, nettype = {}, port = {}", NettyHttpServer.class.getName(), 1788); future.channel().closeFuture().sync(); } catch (InterruptedException e) { if (e instanceof InterruptedException) { - log.info("--------> x-retry remoting server stop."); + log.info("--------> easy-retry remoting server stop."); } else { - log.error("--------> x-retry remoting server error.", e); + log.error("--------> easy-retry remoting server error.", e); } } finally { diff --git a/x-retry-server/src/main/java/com/x/retry/server/server/NettyHttpServerHandler.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/NettyHttpServerHandler.java similarity index 87% rename from x-retry-server/src/main/java/com/x/retry/server/server/NettyHttpServerHandler.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/NettyHttpServerHandler.java index d374672ce..8449d5604 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/server/NettyHttpServerHandler.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/NettyHttpServerHandler.java @@ -1,13 +1,13 @@ -package com.x.retry.server.server; +package com.aizuda.easy.retry.server.server; import cn.hutool.core.net.url.UrlBuilder; -import com.x.retry.common.core.context.SpringContext; -import com.x.retry.common.core.enums.HeadersEnum; -import com.x.retry.common.core.model.Result; -import com.x.retry.common.core.util.JsonUtil; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.server.handler.HttpRequestHandler; -import com.x.retry.server.support.handler.ClientRegisterHandler; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.support.handler.ClientRegisterHandler; +import com.aizuda.easy.retry.common.core.context.SpringContext; +import com.aizuda.easy.retry.common.core.enums.HeadersEnum; +import com.aizuda.easy.retry.common.core.model.Result; +import com.aizuda.easy.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.server.server.handler.HttpRequestHandler; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; @@ -15,9 +15,6 @@ import io.netty.handler.codec.http.*; import io.netty.util.CharsetUtil; import org.apache.commons.lang.StringUtils; -import java.net.InetSocketAddress; -import java.net.SocketAddress; -import java.net.URI; import java.util.Collection; import java.util.concurrent.ThreadPoolExecutor; diff --git a/x-retry-server/src/main/java/com/x/retry/server/server/handler/BeatHttpRequestHandler.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/BeatHttpRequestHandler.java similarity index 78% rename from x-retry-server/src/main/java/com/x/retry/server/server/handler/BeatHttpRequestHandler.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/BeatHttpRequestHandler.java index b7f88afaa..d16f739f7 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/server/handler/BeatHttpRequestHandler.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/BeatHttpRequestHandler.java @@ -1,10 +1,10 @@ -package com.x.retry.server.server.handler; +package com.aizuda.easy.retry.server.server.handler; import cn.hutool.core.net.url.UrlQuery; -import com.x.retry.common.core.model.NettyResult; -import com.x.retry.common.core.model.XRetryRequest; -import com.x.retry.common.core.util.JsonUtil; -import com.x.retry.server.support.handler.ClientRegisterHandler; +import com.aizuda.easy.retry.server.support.handler.ClientRegisterHandler; +import com.aizuda.easy.retry.common.core.model.NettyResult; +import com.aizuda.easy.retry.common.core.model.XRetryRequest; +import com.aizuda.easy.retry.common.core.util.JsonUtil; import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpMethod; import lombok.extern.slf4j.Slf4j; diff --git a/x-retry-server/src/main/java/com/x/retry/server/server/handler/ConfigHttpRequestHandler.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/ConfigHttpRequestHandler.java similarity index 76% rename from x-retry-server/src/main/java/com/x/retry/server/server/handler/ConfigHttpRequestHandler.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/ConfigHttpRequestHandler.java index bd7d299a9..fd376bc0f 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/server/handler/ConfigHttpRequestHandler.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/ConfigHttpRequestHandler.java @@ -1,12 +1,12 @@ -package com.x.retry.server.server.handler; +package com.aizuda.easy.retry.server.server.handler; import cn.hutool.core.net.url.UrlQuery; -import com.x.retry.common.core.enums.HeadersEnum; -import com.x.retry.common.core.model.NettyResult; -import com.x.retry.common.core.model.XRetryRequest; -import com.x.retry.common.core.util.JsonUtil; -import com.x.retry.server.model.dto.ConfigDTO; -import com.x.retry.server.persistence.support.ConfigAccess; +import com.aizuda.easy.retry.server.model.dto.ConfigDTO; +import com.aizuda.easy.retry.server.persistence.support.ConfigAccess; +import com.aizuda.easy.retry.common.core.enums.HeadersEnum; +import com.aizuda.easy.retry.common.core.model.NettyResult; +import com.aizuda.easy.retry.common.core.model.XRetryRequest; +import com.aizuda.easy.retry.common.core.util.JsonUtil; import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpMethod; import lombok.extern.slf4j.Slf4j; diff --git a/x-retry-server/src/main/java/com/x/retry/server/server/handler/GetHttpRequestHandler.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/GetHttpRequestHandler.java similarity index 91% rename from x-retry-server/src/main/java/com/x/retry/server/server/handler/GetHttpRequestHandler.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/GetHttpRequestHandler.java index 4cb57d3ee..54e8a99ee 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/server/handler/GetHttpRequestHandler.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/GetHttpRequestHandler.java @@ -1,4 +1,4 @@ -package com.x.retry.server.server.handler; +package com.aizuda.easy.retry.server.server.handler; import cn.hutool.core.net.url.UrlBuilder; import cn.hutool.core.net.url.UrlQuery; diff --git a/x-retry-server/src/main/java/com/x/retry/server/server/handler/HttpRequestHandler.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/HttpRequestHandler.java similarity index 88% rename from x-retry-server/src/main/java/com/x/retry/server/server/handler/HttpRequestHandler.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/HttpRequestHandler.java index 20ac8144d..519bcc121 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/server/handler/HttpRequestHandler.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/HttpRequestHandler.java @@ -1,4 +1,4 @@ -package com.x.retry.server.server.handler; +package com.aizuda.easy.retry.server.server.handler; import cn.hutool.core.net.url.UrlBuilder; import io.netty.handler.codec.http.HttpHeaders; diff --git a/x-retry-server/src/main/java/com/x/retry/server/server/handler/PostHttpRequestHandler.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/PostHttpRequestHandler.java similarity index 91% rename from x-retry-server/src/main/java/com/x/retry/server/server/handler/PostHttpRequestHandler.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/PostHttpRequestHandler.java index 008d9d4db..01defbdb2 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/server/handler/PostHttpRequestHandler.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/PostHttpRequestHandler.java @@ -1,4 +1,4 @@ -package com.x.retry.server.server.handler; +package com.aizuda.easy.retry.server.server.handler; import cn.hutool.core.net.url.UrlBuilder; import cn.hutool.core.net.url.UrlQuery; diff --git a/x-retry-server/src/main/java/com/x/retry/server/server/handler/ReportRetryInfoHttpRequestHandler.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/ReportRetryInfoHttpRequestHandler.java similarity index 77% rename from x-retry-server/src/main/java/com/x/retry/server/server/handler/ReportRetryInfoHttpRequestHandler.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/ReportRetryInfoHttpRequestHandler.java index 58213a04a..f43ff5b95 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/server/handler/ReportRetryInfoHttpRequestHandler.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/server/handler/ReportRetryInfoHttpRequestHandler.java @@ -1,14 +1,13 @@ -package com.x.retry.server.server.handler; +package com.aizuda.easy.retry.server.server.handler; import cn.hutool.core.net.url.UrlQuery; -import com.x.retry.common.core.enums.StatusEnum; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.model.NettyResult; -import com.x.retry.common.core.model.XRetryRequest; -import com.x.retry.common.core.util.JsonUtil; -import com.x.retry.server.model.dto.RetryTaskDTO; -import com.x.retry.server.service.RetryService; -import com.x.retry.server.support.handler.ClientRegisterHandler; +import com.aizuda.easy.retry.server.model.dto.RetryTaskDTO; +import com.aizuda.easy.retry.server.service.RetryService; +import com.aizuda.easy.retry.common.core.enums.StatusEnum; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.model.NettyResult; +import com.aizuda.easy.retry.common.core.model.XRetryRequest; +import com.aizuda.easy.retry.common.core.util.JsonUtil; import io.netty.handler.codec.http.HttpHeaders; import io.netty.handler.codec.http.HttpMethod; import lombok.extern.slf4j.Slf4j; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/DashBoardService.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/DashBoardService.java similarity index 58% rename from x-retry-server/src/main/java/com/x/retry/server/service/DashBoardService.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/DashBoardService.java index 154f7099d..df9ca1fde 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/DashBoardService.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/DashBoardService.java @@ -1,9 +1,9 @@ -package com.x.retry.server.service; +package com.aizuda.easy.retry.server.service; -import com.x.retry.server.web.model.response.ActivePodQuantityResponseVO; -import com.x.retry.server.web.model.response.DispatchQuantityResponseVO; -import com.x.retry.server.web.model.response.SceneQuantityRankResponseVO; -import com.x.retry.server.web.model.response.TaskQuantityResponseVO; +import com.aizuda.easy.retry.server.web.model.response.ActivePodQuantityResponseVO; +import com.aizuda.easy.retry.server.web.model.response.DispatchQuantityResponseVO; +import com.aizuda.easy.retry.server.web.model.response.SceneQuantityRankResponseVO; +import com.aizuda.easy.retry.server.web.model.response.TaskQuantityResponseVO; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/GroupConfigService.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/GroupConfigService.java similarity index 58% rename from x-retry-server/src/main/java/com/x/retry/server/service/GroupConfigService.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/GroupConfigService.java index 3d5e88c39..14d9850a2 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/GroupConfigService.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/GroupConfigService.java @@ -1,10 +1,9 @@ -package com.x.retry.server.service; +package com.aizuda.easy.retry.server.service; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.model.dto.ConfigDTO; -import com.x.retry.server.web.model.request.GroupConfigQueryVO; -import com.x.retry.server.web.model.request.GroupConfigRequestVO; -import com.x.retry.server.web.model.response.GroupConfigResponseVO; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.GroupConfigQueryVO; +import com.aizuda.easy.retry.server.web.model.request.GroupConfigRequestVO; +import com.aizuda.easy.retry.server.web.model.response.GroupConfigResponseVO; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/NotifyConfigService.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/NotifyConfigService.java similarity index 62% rename from x-retry-server/src/main/java/com/x/retry/server/service/NotifyConfigService.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/NotifyConfigService.java index 02fc8d0aa..86b7c9de9 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/NotifyConfigService.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/NotifyConfigService.java @@ -1,6 +1,6 @@ -package com.x.retry.server.service; +package com.aizuda.easy.retry.server.service; -import com.x.retry.server.web.model.response.NotifyConfigResponseVO; +import com.aizuda.easy.retry.server.web.model.response.NotifyConfigResponseVO; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/RetryDeadLetterService.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/RetryDeadLetterService.java similarity index 61% rename from x-retry-server/src/main/java/com/x/retry/server/service/RetryDeadLetterService.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/RetryDeadLetterService.java index 2df4c7e23..10d64963f 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/RetryDeadLetterService.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/RetryDeadLetterService.java @@ -1,8 +1,8 @@ -package com.x.retry.server.service; +package com.aizuda.easy.retry.server.service; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.web.model.request.RetryDeadLetterQueryVO; -import com.x.retry.server.web.model.response.RetryDeadLetterResponseVO; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.RetryDeadLetterQueryVO; +import com.aizuda.easy.retry.server.web.model.response.RetryDeadLetterResponseVO; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/RetryService.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/RetryService.java similarity index 89% rename from x-retry-server/src/main/java/com/x/retry/server/service/RetryService.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/RetryService.java index 681827c5f..aef2c8792 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/RetryService.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/RetryService.java @@ -1,6 +1,6 @@ -package com.x.retry.server.service; +package com.aizuda.easy.retry.server.service; -import com.x.retry.server.model.dto.RetryTaskDTO; +import com.aizuda.easy.retry.server.model.dto.RetryTaskDTO; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/RetryTaskLogService.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/RetryTaskLogService.java similarity index 52% rename from x-retry-server/src/main/java/com/x/retry/server/service/RetryTaskLogService.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/RetryTaskLogService.java index df42012c7..f34bc4eb4 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/RetryTaskLogService.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/RetryTaskLogService.java @@ -1,8 +1,8 @@ -package com.x.retry.server.service; +package com.aizuda.easy.retry.server.service; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.web.model.request.RetryTaskLogQueryVO; -import com.x.retry.server.web.model.response.RetryTaskLogResponseVO; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.RetryTaskLogQueryVO; +import com.aizuda.easy.retry.server.web.model.response.RetryTaskLogResponseVO; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/RetryTaskService.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/RetryTaskService.java similarity index 52% rename from x-retry-server/src/main/java/com/x/retry/server/service/RetryTaskService.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/RetryTaskService.java index 45cbf4bfa..d44162ab7 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/RetryTaskService.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/RetryTaskService.java @@ -1,9 +1,9 @@ -package com.x.retry.server.service; +package com.aizuda.easy.retry.server.service; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.web.model.request.RetryTaskQueryVO; -import com.x.retry.server.web.model.request.RetryTaskRequestVO; -import com.x.retry.server.web.model.response.RetryTaskResponseVO; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.RetryTaskQueryVO; +import com.aizuda.easy.retry.server.web.model.request.RetryTaskRequestVO; +import com.aizuda.easy.retry.server.web.model.response.RetryTaskResponseVO; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/SceneConfigService.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/SceneConfigService.java similarity index 53% rename from x-retry-server/src/main/java/com/x/retry/server/service/SceneConfigService.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/SceneConfigService.java index 17c9bb1e8..f1a76242d 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/SceneConfigService.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/SceneConfigService.java @@ -1,8 +1,8 @@ -package com.x.retry.server.service; +package com.aizuda.easy.retry.server.service; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.web.model.request.SceneConfigQueryVO; -import com.x.retry.server.web.model.response.SceneConfigResponseVO; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.SceneConfigQueryVO; +import com.aizuda.easy.retry.server.web.model.response.SceneConfigResponseVO; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/SystemUserService.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/SystemUserService.java similarity index 57% rename from x-retry-server/src/main/java/com/x/retry/server/service/SystemUserService.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/SystemUserService.java index df1733725..2ad3131d7 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/SystemUserService.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/SystemUserService.java @@ -1,10 +1,10 @@ -package com.x.retry.server.service; +package com.aizuda.easy.retry.server.service; -import com.x.retry.server.persistence.mybatis.po.SystemUser; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.web.model.request.SystemUserQueryVO; -import com.x.retry.server.web.model.request.SystemUserRequestVO; -import com.x.retry.server.web.model.response.SystemUserResponseVO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SystemUser; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.SystemUserQueryVO; +import com.aizuda.easy.retry.server.web.model.request.SystemUserRequestVO; +import com.aizuda.easy.retry.server.web.model.response.SystemUserResponseVO; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/convert/GroupConfigConverter.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/GroupConfigConverter.java similarity index 71% rename from x-retry-server/src/main/java/com/x/retry/server/service/convert/GroupConfigConverter.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/GroupConfigConverter.java index e0fc10a86..31aee5169 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/convert/GroupConfigConverter.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/GroupConfigConverter.java @@ -1,8 +1,8 @@ -package com.x.retry.server.service.convert; +package com.aizuda.easy.retry.server.service.convert; -import com.x.retry.common.core.covert.AbstractConverter; -import com.x.retry.server.persistence.mybatis.po.GroupConfig; -import com.x.retry.server.web.model.request.GroupConfigRequestVO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; +import com.aizuda.easy.retry.common.core.covert.AbstractConverter; +import com.aizuda.easy.retry.server.web.model.request.GroupConfigRequestVO; import java.time.LocalDateTime; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/convert/GroupConfigResponseVOConverter.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/GroupConfigResponseVOConverter.java similarity index 66% rename from x-retry-server/src/main/java/com/x/retry/server/service/convert/GroupConfigResponseVOConverter.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/GroupConfigResponseVOConverter.java index abebf80e2..14d4f99c8 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/convert/GroupConfigResponseVOConverter.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/GroupConfigResponseVOConverter.java @@ -1,8 +1,8 @@ -package com.x.retry.server.service.convert; +package com.aizuda.easy.retry.server.service.convert; -import com.x.retry.common.core.covert.AbstractConverter; -import com.x.retry.server.persistence.mybatis.po.GroupConfig; -import com.x.retry.server.web.model.response.GroupConfigResponseVO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; +import com.aizuda.easy.retry.common.core.covert.AbstractConverter; +import com.aizuda.easy.retry.server.web.model.response.GroupConfigResponseVO; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/convert/NotifyConfigConverter.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/NotifyConfigConverter.java similarity index 70% rename from x-retry-server/src/main/java/com/x/retry/server/service/convert/NotifyConfigConverter.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/NotifyConfigConverter.java index 95027b6a1..0da950bc6 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/convert/NotifyConfigConverter.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/NotifyConfigConverter.java @@ -1,8 +1,8 @@ -package com.x.retry.server.service.convert; +package com.aizuda.easy.retry.server.service.convert; -import com.x.retry.common.core.covert.AbstractConverter; -import com.x.retry.server.persistence.mybatis.po.NotifyConfig; -import com.x.retry.server.web.model.request.GroupConfigRequestVO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.NotifyConfig; +import com.aizuda.easy.retry.common.core.covert.AbstractConverter; +import com.aizuda.easy.retry.server.web.model.request.GroupConfigRequestVO; import java.time.LocalDateTime; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/convert/NotifyConfigResponseVOConverter.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/NotifyConfigResponseVOConverter.java similarity index 66% rename from x-retry-server/src/main/java/com/x/retry/server/service/convert/NotifyConfigResponseVOConverter.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/NotifyConfigResponseVOConverter.java index 2a1d13a1e..34377182d 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/convert/NotifyConfigResponseVOConverter.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/NotifyConfigResponseVOConverter.java @@ -1,8 +1,8 @@ -package com.x.retry.server.service.convert; +package com.aizuda.easy.retry.server.service.convert; -import com.x.retry.common.core.covert.AbstractConverter; -import com.x.retry.server.persistence.mybatis.po.NotifyConfig; -import com.x.retry.server.web.model.response.NotifyConfigResponseVO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.NotifyConfig; +import com.aizuda.easy.retry.common.core.covert.AbstractConverter; +import com.aizuda.easy.retry.server.web.model.response.NotifyConfigResponseVO; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/convert/RetryDeadLetterResponseVOConverter.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/RetryDeadLetterResponseVOConverter.java similarity index 67% rename from x-retry-server/src/main/java/com/x/retry/server/service/convert/RetryDeadLetterResponseVOConverter.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/RetryDeadLetterResponseVOConverter.java index 1e3adb731..0c61b680c 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/convert/RetryDeadLetterResponseVOConverter.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/RetryDeadLetterResponseVOConverter.java @@ -1,8 +1,8 @@ -package com.x.retry.server.service.convert; +package com.aizuda.easy.retry.server.service.convert; -import com.x.retry.common.core.covert.AbstractConverter; -import com.x.retry.server.persistence.mybatis.po.RetryDeadLetter; -import com.x.retry.server.web.model.response.RetryDeadLetterResponseVO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryDeadLetter; +import com.aizuda.easy.retry.common.core.covert.AbstractConverter; +import com.aizuda.easy.retry.server.web.model.response.RetryDeadLetterResponseVO; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/convert/RetryTaskConverter.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/RetryTaskConverter.java similarity index 75% rename from x-retry-server/src/main/java/com/x/retry/server/service/convert/RetryTaskConverter.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/RetryTaskConverter.java index 7b40e7dde..c835fcb02 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/convert/RetryTaskConverter.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/RetryTaskConverter.java @@ -1,9 +1,9 @@ -package com.x.retry.server.service.convert; +package com.aizuda.easy.retry.server.service.convert; -import com.x.retry.common.core.covert.AbstractConverter; -import com.x.retry.server.model.dto.RetryTaskDTO; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.support.strategy.WaitStrategies; +import com.aizuda.easy.retry.server.model.dto.RetryTaskDTO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.support.strategy.WaitStrategies; +import com.aizuda.easy.retry.common.core.covert.AbstractConverter; import org.apache.commons.lang.StringUtils; import java.time.LocalDateTime; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/convert/RetryTaskLogResponseVOConverter.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/RetryTaskLogResponseVOConverter.java similarity index 66% rename from x-retry-server/src/main/java/com/x/retry/server/service/convert/RetryTaskLogResponseVOConverter.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/RetryTaskLogResponseVOConverter.java index 9e4bff259..5b8861446 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/convert/RetryTaskLogResponseVOConverter.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/RetryTaskLogResponseVOConverter.java @@ -1,8 +1,8 @@ -package com.x.retry.server.service.convert; +package com.aizuda.easy.retry.server.service.convert; -import com.x.retry.common.core.covert.AbstractConverter; -import com.x.retry.server.persistence.mybatis.po.RetryTaskLog; -import com.x.retry.server.web.model.response.RetryTaskLogResponseVO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTaskLog; +import com.aizuda.easy.retry.common.core.covert.AbstractConverter; +import com.aizuda.easy.retry.server.web.model.response.RetryTaskLogResponseVO; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/convert/RetryTaskResponseVOConverter.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/RetryTaskResponseVOConverter.java similarity index 68% rename from x-retry-server/src/main/java/com/x/retry/server/service/convert/RetryTaskResponseVOConverter.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/RetryTaskResponseVOConverter.java index 2584ce5ee..585d17401 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/convert/RetryTaskResponseVOConverter.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/RetryTaskResponseVOConverter.java @@ -1,8 +1,8 @@ -package com.x.retry.server.service.convert; +package com.aizuda.easy.retry.server.service.convert; -import com.x.retry.common.core.covert.AbstractConverter; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.web.model.response.RetryTaskResponseVO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.common.core.covert.AbstractConverter; +import com.aizuda.easy.retry.server.web.model.response.RetryTaskResponseVO; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/convert/SceneConfigConverter.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/SceneConfigConverter.java similarity index 70% rename from x-retry-server/src/main/java/com/x/retry/server/service/convert/SceneConfigConverter.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/SceneConfigConverter.java index 5419efd80..6dbc0be53 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/convert/SceneConfigConverter.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/SceneConfigConverter.java @@ -1,8 +1,8 @@ -package com.x.retry.server.service.convert; +package com.aizuda.easy.retry.server.service.convert; -import com.x.retry.common.core.covert.AbstractConverter; -import com.x.retry.server.persistence.mybatis.po.SceneConfig; -import com.x.retry.server.web.model.request.GroupConfigRequestVO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SceneConfig; +import com.aizuda.easy.retry.common.core.covert.AbstractConverter; +import com.aizuda.easy.retry.server.web.model.request.GroupConfigRequestVO; import java.time.LocalDateTime; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/convert/SceneConfigResponseVOConverter.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/SceneConfigResponseVOConverter.java similarity index 66% rename from x-retry-server/src/main/java/com/x/retry/server/service/convert/SceneConfigResponseVOConverter.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/SceneConfigResponseVOConverter.java index efbed2376..31e5d8fdd 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/convert/SceneConfigResponseVOConverter.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/SceneConfigResponseVOConverter.java @@ -1,8 +1,8 @@ -package com.x.retry.server.service.convert; +package com.aizuda.easy.retry.server.service.convert; -import com.x.retry.common.core.covert.AbstractConverter; -import com.x.retry.server.persistence.mybatis.po.SceneConfig; -import com.x.retry.server.web.model.response.SceneConfigResponseVO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SceneConfig; +import com.aizuda.easy.retry.common.core.covert.AbstractConverter; +import com.aizuda.easy.retry.server.web.model.response.SceneConfigResponseVO; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/convert/SystemUserResponseVOConverter.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/SystemUserResponseVOConverter.java similarity index 66% rename from x-retry-server/src/main/java/com/x/retry/server/service/convert/SystemUserResponseVOConverter.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/SystemUserResponseVOConverter.java index ba8ac3122..d1b3ba1ff 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/convert/SystemUserResponseVOConverter.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/convert/SystemUserResponseVOConverter.java @@ -1,8 +1,8 @@ -package com.x.retry.server.service.convert; +package com.aizuda.easy.retry.server.service.convert; -import com.x.retry.common.core.covert.AbstractConverter; -import com.x.retry.server.persistence.mybatis.po.SystemUser; -import com.x.retry.server.web.model.response.SystemUserResponseVO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SystemUser; +import com.aizuda.easy.retry.common.core.covert.AbstractConverter; +import com.aizuda.easy.retry.server.web.model.response.SystemUserResponseVO; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/impl/DashBoardServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/DashBoardServiceImpl.java similarity index 86% rename from x-retry-server/src/main/java/com/x/retry/server/service/impl/DashBoardServiceImpl.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/DashBoardServiceImpl.java index 8bd975291..28a244a85 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/impl/DashBoardServiceImpl.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/DashBoardServiceImpl.java @@ -1,18 +1,18 @@ -package com.x.retry.server.service.impl; +package com.aizuda.easy.retry.server.service.impl; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryTaskLogMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.ServerNodeMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTaskLog; +import com.aizuda.easy.retry.server.persistence.mybatis.po.ServerNode; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.x.retry.common.core.enums.NodeTypeEnum; -import com.x.retry.common.core.enums.RetryStatusEnum; -import com.x.retry.server.persistence.mybatis.mapper.RetryTaskLogMapper; -import com.x.retry.server.persistence.mybatis.mapper.ServerNodeMapper; -import com.x.retry.server.persistence.mybatis.po.RetryTaskLog; -import com.x.retry.server.persistence.mybatis.po.ServerNode; -import com.x.retry.server.service.DashBoardService; -import com.x.retry.server.web.model.enums.DateTypeEnum; -import com.x.retry.server.web.model.response.ActivePodQuantityResponseVO; -import com.x.retry.server.web.model.response.DispatchQuantityResponseVO; -import com.x.retry.server.web.model.response.SceneQuantityRankResponseVO; -import com.x.retry.server.web.model.response.TaskQuantityResponseVO; +import com.aizuda.easy.retry.common.core.enums.NodeTypeEnum; +import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; +import com.aizuda.easy.retry.server.service.DashBoardService; +import com.aizuda.easy.retry.server.web.model.enums.DateTypeEnum; +import com.aizuda.easy.retry.server.web.model.response.ActivePodQuantityResponseVO; +import com.aizuda.easy.retry.server.web.model.response.DispatchQuantityResponseVO; +import com.aizuda.easy.retry.server.web.model.response.SceneQuantityRankResponseVO; +import com.aizuda.easy.retry.server.web.model.response.TaskQuantityResponseVO; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/impl/GroupConfigServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/GroupConfigServiceImpl.java similarity index 88% rename from x-retry-server/src/main/java/com/x/retry/server/service/impl/GroupConfigServiceImpl.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/GroupConfigServiceImpl.java index ddad5d8a3..540421161 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/impl/GroupConfigServiceImpl.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/GroupConfigServiceImpl.java @@ -1,30 +1,30 @@ -package com.x.retry.server.service.impl; +package com.aizuda.easy.retry.server.service.impl; import cn.hutool.core.util.HashUtil; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.GroupConfigMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.NotifyConfigMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.SceneConfigMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.ServerNodeMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.NotifyConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SceneConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.ServerNode; +import com.aizuda.easy.retry.server.support.handler.ClientRegisterHandler; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.x.retry.common.core.util.Assert; -import com.x.retry.common.core.util.JsonUtil; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.persistence.mybatis.mapper.GroupConfigMapper; -import com.x.retry.server.persistence.mybatis.mapper.NotifyConfigMapper; -import com.x.retry.server.persistence.mybatis.mapper.SceneConfigMapper; -import com.x.retry.server.persistence.mybatis.mapper.ServerNodeMapper; -import com.x.retry.server.persistence.mybatis.po.GroupConfig; -import com.x.retry.server.persistence.mybatis.po.NotifyConfig; -import com.x.retry.server.persistence.mybatis.po.SceneConfig; -import com.x.retry.server.persistence.mybatis.po.ServerNode; -import com.x.retry.server.service.GroupConfigService; -import com.x.retry.server.service.convert.GroupConfigConverter; -import com.x.retry.server.service.convert.GroupConfigResponseVOConverter; -import com.x.retry.server.service.convert.NotifyConfigConverter; -import com.x.retry.server.service.convert.SceneConfigConverter; -import com.x.retry.server.support.handler.ClientRegisterHandler; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.web.model.request.GroupConfigQueryVO; -import com.x.retry.server.web.model.request.GroupConfigRequestVO; -import com.x.retry.server.web.model.response.GroupConfigResponseVO; +import com.aizuda.easy.retry.common.core.util.Assert; +import com.aizuda.easy.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.server.service.GroupConfigService; +import com.aizuda.easy.retry.server.service.convert.GroupConfigConverter; +import com.aizuda.easy.retry.server.service.convert.GroupConfigResponseVOConverter; +import com.aizuda.easy.retry.server.service.convert.NotifyConfigConverter; +import com.aizuda.easy.retry.server.service.convert.SceneConfigConverter; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.GroupConfigQueryVO; +import com.aizuda.easy.retry.server.web.model.request.GroupConfigRequestVO; +import com.aizuda.easy.retry.server.web.model.response.GroupConfigResponseVO; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -55,7 +55,7 @@ public class GroupConfigServiceImpl implements GroupConfigService { @Autowired private ClientRegisterHandler clientRegisterHandler; - @Value("${x-retry.total-partition:32}") + @Value("${easy-retry.total-partition:32}") private Integer totalPartition; private GroupConfigConverter groupConfigConverter = new GroupConfigConverter(); diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/impl/NotifyConfigServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/NotifyConfigServiceImpl.java similarity index 67% rename from x-retry-server/src/main/java/com/x/retry/server/service/impl/NotifyConfigServiceImpl.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/NotifyConfigServiceImpl.java index e3ca6fdeb..f70002de0 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/impl/NotifyConfigServiceImpl.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/NotifyConfigServiceImpl.java @@ -1,11 +1,11 @@ -package com.x.retry.server.service.impl; +package com.aizuda.easy.retry.server.service.impl; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.NotifyConfigMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.NotifyConfig; +import com.aizuda.easy.retry.server.service.NotifyConfigService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.x.retry.server.persistence.mybatis.mapper.NotifyConfigMapper; -import com.x.retry.server.persistence.mybatis.po.NotifyConfig; -import com.x.retry.server.service.NotifyConfigService; -import com.x.retry.server.service.convert.NotifyConfigResponseVOConverter; -import com.x.retry.server.web.model.response.NotifyConfigResponseVO; +import com.aizuda.easy.retry.server.service.convert.NotifyConfigResponseVOConverter; +import com.aizuda.easy.retry.server.web.model.response.NotifyConfigResponseVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/impl/RetryDeadLetterServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryDeadLetterServiceImpl.java similarity index 79% rename from x-retry-server/src/main/java/com/x/retry/server/service/impl/RetryDeadLetterServiceImpl.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryDeadLetterServiceImpl.java index e374f05bc..dc8fb877f 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/impl/RetryDeadLetterServiceImpl.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryDeadLetterServiceImpl.java @@ -1,26 +1,25 @@ -package com.x.retry.server.service.impl; +package com.aizuda.easy.retry.server.service.impl; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryDeadLetterMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryTaskMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryDeadLetter; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.service.convert.RetryDeadLetterResponseVOConverter; +import com.aizuda.easy.retry.server.support.strategy.WaitStrategies; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.x.retry.common.core.util.Assert; -import com.x.retry.server.config.RequestDataHelper; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.persistence.mybatis.mapper.RetryDeadLetterMapper; -import com.x.retry.server.persistence.mybatis.mapper.RetryTaskMapper; -import com.x.retry.server.persistence.mybatis.po.RetryDeadLetter; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.service.RetryDeadLetterService; -import com.x.retry.server.service.convert.RetryDeadLetterResponseVOConverter; -import com.x.retry.server.support.strategy.WaitStrategies; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.web.model.request.RetryDeadLetterQueryVO; -import com.x.retry.server.web.model.response.RetryDeadLetterResponseVO; +import com.aizuda.easy.retry.common.core.util.Assert; +import com.aizuda.easy.retry.server.config.RequestDataHelper; +import com.aizuda.easy.retry.server.service.RetryDeadLetterService; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.RetryDeadLetterQueryVO; +import com.aizuda.easy.retry.server.web.model.response.RetryDeadLetterResponseVO; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/impl/RetryServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryServiceImpl.java similarity index 79% rename from x-retry-server/src/main/java/com/x/retry/server/service/impl/RetryServiceImpl.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryServiceImpl.java index 5c819d746..a969682b4 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/impl/RetryServiceImpl.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryServiceImpl.java @@ -1,22 +1,22 @@ -package com.x.retry.server.service.impl; +package com.aizuda.easy.retry.server.service.impl; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.model.dto.RetryTaskDTO; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryDeadLetterMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryTaskMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryDeadLetter; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SceneConfig; +import com.aizuda.easy.retry.server.persistence.support.ConfigAccess; +import com.aizuda.easy.retry.server.persistence.support.RetryTaskAccess; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.x.retry.common.core.enums.RetryStatusEnum; -import com.x.retry.server.config.RequestDataHelper; -import com.x.retry.server.model.dto.RetryTaskDTO; -import com.x.retry.common.core.util.Assert; -import com.x.retry.common.core.util.JsonUtil; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.persistence.mybatis.mapper.RetryDeadLetterMapper; -import com.x.retry.server.persistence.mybatis.mapper.RetryTaskMapper; -import com.x.retry.server.persistence.mybatis.po.GroupConfig; -import com.x.retry.server.persistence.mybatis.po.RetryDeadLetter; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.persistence.mybatis.po.SceneConfig; -import com.x.retry.server.persistence.support.ConfigAccess; -import com.x.retry.server.persistence.support.RetryTaskAccess; -import com.x.retry.server.service.RetryService; -import com.x.retry.server.service.convert.RetryTaskConverter; +import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; +import com.aizuda.easy.retry.server.config.RequestDataHelper; +import com.aizuda.easy.retry.common.core.util.Assert; +import com.aizuda.easy.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.server.service.RetryService; +import com.aizuda.easy.retry.server.service.convert.RetryTaskConverter; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/impl/RetryTaskLogServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryTaskLogServiceImpl.java similarity index 81% rename from x-retry-server/src/main/java/com/x/retry/server/service/impl/RetryTaskLogServiceImpl.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryTaskLogServiceImpl.java index 5c9a74738..c71b9c25a 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/impl/RetryTaskLogServiceImpl.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryTaskLogServiceImpl.java @@ -1,14 +1,14 @@ -package com.x.retry.server.service.impl; +package com.aizuda.easy.retry.server.service.impl; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryTaskLogMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTaskLog; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.persistence.mybatis.mapper.RetryTaskLogMapper; -import com.x.retry.server.persistence.mybatis.po.RetryTaskLog; -import com.x.retry.server.service.RetryTaskLogService; -import com.x.retry.server.service.convert.RetryTaskLogResponseVOConverter; -import com.x.retry.server.web.model.request.RetryTaskLogQueryVO; -import com.x.retry.server.web.model.response.RetryTaskLogResponseVO; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.service.RetryTaskLogService; +import com.aizuda.easy.retry.server.service.convert.RetryTaskLogResponseVOConverter; +import com.aizuda.easy.retry.server.web.model.request.RetryTaskLogQueryVO; +import com.aizuda.easy.retry.server.web.model.response.RetryTaskLogResponseVO; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/impl/RetryTaskServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryTaskServiceImpl.java similarity index 81% rename from x-retry-server/src/main/java/com/x/retry/server/service/impl/RetryTaskServiceImpl.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryTaskServiceImpl.java index 3bb811348..cf6b9bf82 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/impl/RetryTaskServiceImpl.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/RetryTaskServiceImpl.java @@ -1,21 +1,19 @@ -package com.x.retry.server.service.impl; +package com.aizuda.easy.retry.server.service.impl; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryTaskMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.support.strategy.WaitStrategies; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.x.retry.common.core.enums.RetryResultStatusEnum; -import com.x.retry.common.core.enums.RetryStatusEnum; -import com.x.retry.server.config.RequestDataHelper; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.persistence.mybatis.po.RetryTaskLog; -import com.x.retry.server.support.strategy.WaitStrategies; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.persistence.mybatis.mapper.RetryTaskMapper; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.service.RetryTaskService; -import com.x.retry.server.service.convert.RetryTaskResponseVOConverter; -import com.x.retry.server.web.model.request.RetryTaskQueryVO; -import com.x.retry.server.web.model.request.RetryTaskRequestVO; -import com.x.retry.server.web.model.response.RetryTaskResponseVO; +import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; +import com.aizuda.easy.retry.server.config.RequestDataHelper; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.service.RetryTaskService; +import com.aizuda.easy.retry.server.service.convert.RetryTaskResponseVOConverter; +import com.aizuda.easy.retry.server.web.model.request.RetryTaskQueryVO; +import com.aizuda.easy.retry.server.web.model.request.RetryTaskRequestVO; +import com.aizuda.easy.retry.server.web.model.response.RetryTaskResponseVO; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/impl/SceneConfigServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/SceneConfigServiceImpl.java similarity index 77% rename from x-retry-server/src/main/java/com/x/retry/server/service/impl/SceneConfigServiceImpl.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/SceneConfigServiceImpl.java index a325c244e..6109b9830 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/impl/SceneConfigServiceImpl.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/SceneConfigServiceImpl.java @@ -1,14 +1,14 @@ -package com.x.retry.server.service.impl; +package com.aizuda.easy.retry.server.service.impl; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.SceneConfigMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SceneConfig; +import com.aizuda.easy.retry.server.service.convert.SceneConfigResponseVOConverter; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.x.retry.server.persistence.mybatis.mapper.SceneConfigMapper; -import com.x.retry.server.persistence.mybatis.po.SceneConfig; -import com.x.retry.server.service.SceneConfigService; -import com.x.retry.server.service.convert.SceneConfigResponseVOConverter; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.web.model.request.SceneConfigQueryVO; -import com.x.retry.server.web.model.response.SceneConfigResponseVO; +import com.aizuda.easy.retry.server.service.SceneConfigService; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.SceneConfigQueryVO; +import com.aizuda.easy.retry.server.web.model.response.SceneConfigResponseVO; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/x-retry-server/src/main/java/com/x/retry/server/service/impl/SystemUserServiceImpl.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/SystemUserServiceImpl.java similarity index 89% rename from x-retry-server/src/main/java/com/x/retry/server/service/impl/SystemUserServiceImpl.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/SystemUserServiceImpl.java index 36cb0da51..4dfd5e1c6 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/service/impl/SystemUserServiceImpl.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/service/impl/SystemUserServiceImpl.java @@ -1,25 +1,25 @@ -package com.x.retry.server.service.impl; +package com.aizuda.easy.retry.server.service.impl; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.SystemUserMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.SystemUserPermissionMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SystemUser; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SystemUserPermission; +import com.aizuda.easy.retry.server.service.SystemUserService; import com.auth0.jwt.JWT; import com.auth0.jwt.algorithms.Algorithm; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.x.retry.common.core.util.Assert; -import com.x.retry.common.core.util.JsonUtil; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.persistence.mybatis.mapper.SystemUserMapper; -import com.x.retry.server.persistence.mybatis.mapper.SystemUserPermissionMapper; -import com.x.retry.server.persistence.mybatis.po.SystemUser; -import com.x.retry.server.persistence.mybatis.po.SystemUserPermission; -import com.x.retry.server.service.SystemUserService; -import com.x.retry.server.service.convert.SystemUserResponseVOConverter; -import com.x.retry.server.web.annotation.RoleEnum; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.web.model.request.SystemUserQueryVO; -import com.x.retry.server.web.model.request.SystemUserRequestVO; -import com.x.retry.server.web.model.response.SystemUserResponseVO; +import com.aizuda.easy.retry.common.core.util.Assert; +import com.aizuda.easy.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.server.service.convert.SystemUserResponseVOConverter; +import com.aizuda.easy.retry.server.web.annotation.RoleEnum; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.SystemUserQueryVO; +import com.aizuda.easy.retry.server.web.model.request.SystemUserRequestVO; +import com.aizuda.easy.retry.server.web.model.response.SystemUserResponseVO; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/ClientLoadBalance.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/ClientLoadBalance.java similarity index 83% rename from x-retry-server/src/main/java/com/x/retry/server/support/ClientLoadBalance.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/ClientLoadBalance.java index 013f2cca5..e140c75cc 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/ClientLoadBalance.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/ClientLoadBalance.java @@ -1,4 +1,4 @@ -package com.x.retry.server.support; +package com.aizuda.easy.retry.server.support; import java.util.TreeSet; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/FilterStrategy.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/FilterStrategy.java similarity index 92% rename from x-retry-server/src/main/java/com/x/retry/server/support/FilterStrategy.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/FilterStrategy.java index 026f99a68..6adbbc4a1 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/FilterStrategy.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/FilterStrategy.java @@ -1,4 +1,4 @@ -package com.x.retry.server.support; +package com.aizuda.easy.retry.server.support; /** * 重试过滤策略，为了判断哪些重试数据符合条件 diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/IdempotentStrategy.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/IdempotentStrategy.java similarity index 84% rename from x-retry-server/src/main/java/com/x/retry/server/support/IdempotentStrategy.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/IdempotentStrategy.java index 400710ec1..c3fd49de3 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/IdempotentStrategy.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/IdempotentStrategy.java @@ -1,4 +1,4 @@ -package com.x.retry.server.support; +package com.aizuda.easy.retry.server.support; /** * 幂等策略 diff --git a/x-retry-client-core/src/main/java/com/x/retry/client/core/Lifecycle.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/Lifecycle.java similarity index 83% rename from x-retry-client-core/src/main/java/com/x/retry/client/core/Lifecycle.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/Lifecycle.java index fca0e363a..930c70645 100644 --- a/x-retry-client-core/src/main/java/com/x/retry/client/core/Lifecycle.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/Lifecycle.java @@ -1,4 +1,4 @@ -package com.x.retry.client.core; +package com.aizuda.easy.retry.server.support; /** * 组件生命周期 diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/RetryContext.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/RetryContext.java similarity index 79% rename from x-retry-server/src/main/java/com/x/retry/server/support/RetryContext.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/RetryContext.java index 97ae67e99..32ce7ff62 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/RetryContext.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/RetryContext.java @@ -1,6 +1,6 @@ -package com.x.retry.server.support; +package com.aizuda.easy.retry.server.support; -import com.x.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; /** * @author: www.byteblogs.com diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/ServerLoadBalance.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/ServerLoadBalance.java similarity index 92% rename from x-retry-server/src/main/java/com/x/retry/server/support/ServerLoadBalance.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/ServerLoadBalance.java index 64bbf4fa4..2aa311955 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/ServerLoadBalance.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/ServerLoadBalance.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.x.retry.server.support; +package com.aizuda.easy.retry.server.support; -import com.x.retry.server.persistence.mybatis.po.GroupConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; import java.util.List; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/StopStrategy.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/StopStrategy.java similarity index 86% rename from x-retry-server/src/main/java/com/x/retry/server/support/StopStrategy.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/StopStrategy.java index 73f08a36f..5b3855106 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/StopStrategy.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/StopStrategy.java @@ -1,4 +1,4 @@ -package com.x.retry.server.support; +package com.aizuda.easy.retry.server.support; /** * 重试停止策略 diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/WaitStrategy.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/WaitStrategy.java similarity index 89% rename from x-retry-server/src/main/java/com/x/retry/server/support/WaitStrategy.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/WaitStrategy.java index b30901a60..451d663bd 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/WaitStrategy.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/WaitStrategy.java @@ -1,4 +1,4 @@ -package com.x.retry.server.support; +package com.aizuda.easy.retry.server.support; import java.time.LocalDateTime; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/client/ClientLoadBalanceConsistentHash.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceConsistentHash.java similarity index 79% rename from x-retry-server/src/main/java/com/x/retry/server/support/allocate/client/ClientLoadBalanceConsistentHash.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceConsistentHash.java index 123521065..0da4bf0d1 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/client/ClientLoadBalanceConsistentHash.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceConsistentHash.java @@ -1,9 +1,9 @@ -package com.x.retry.server.support.allocate.client; +package com.aizuda.easy.retry.server.support.allocate.client; -import com.x.retry.common.core.enums.AllocationAlgorithmEnum; -import com.x.retry.server.support.allocate.common.ConsistentHashRouter; -import com.x.retry.server.support.allocate.common.Node; -import com.x.retry.server.support.ClientLoadBalance; +import com.aizuda.easy.retry.server.support.allocate.common.ConsistentHashRouter; +import com.aizuda.easy.retry.server.support.allocate.common.Node; +import com.aizuda.easy.retry.common.core.enums.AllocationAlgorithmEnum; +import com.aizuda.easy.retry.server.support.ClientLoadBalance; import java.util.ArrayList; import java.util.Collection; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/client/ClientLoadBalanceLRU.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceLRU.java similarity index 90% rename from x-retry-server/src/main/java/com/x/retry/server/support/allocate/client/ClientLoadBalanceLRU.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceLRU.java index 2d0b311af..0eef8225d 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/client/ClientLoadBalanceLRU.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceLRU.java @@ -1,7 +1,6 @@ -package com.x.retry.server.support.allocate.client; +package com.aizuda.easy.retry.server.support.allocate.client; -import com.x.retry.server.support.ClientLoadBalance; -import org.springframework.stereotype.Component; +import com.aizuda.easy.retry.server.support.ClientLoadBalance; import java.util.LinkedHashMap; import java.util.Map; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/client/ClientLoadBalanceManager.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceManager.java similarity index 89% rename from x-retry-server/src/main/java/com/x/retry/server/support/allocate/client/ClientLoadBalanceManager.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceManager.java index 198b2b99d..2aebf75a8 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/client/ClientLoadBalanceManager.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceManager.java @@ -1,6 +1,6 @@ -package com.x.retry.server.support.allocate.client; +package com.aizuda.easy.retry.server.support.allocate.client; -import com.x.retry.server.support.ClientLoadBalance; +import com.aizuda.easy.retry.server.support.ClientLoadBalance; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/client/ClientLoadBalanceRandom.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceRandom.java similarity index 77% rename from x-retry-server/src/main/java/com/x/retry/server/support/allocate/client/ClientLoadBalanceRandom.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceRandom.java index d61cc5f07..8b2f12a62 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/client/ClientLoadBalanceRandom.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/client/ClientLoadBalanceRandom.java @@ -1,7 +1,7 @@ -package com.x.retry.server.support.allocate.client; +package com.aizuda.easy.retry.server.support.allocate.client; -import com.x.retry.common.core.enums.AllocationAlgorithmEnum; -import com.x.retry.server.support.ClientLoadBalance; +import com.aizuda.easy.retry.common.core.enums.AllocationAlgorithmEnum; +import com.aizuda.easy.retry.server.support.ClientLoadBalance; import org.springframework.stereotype.Component; import java.util.Random; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/common/ConsistentHashRouter.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/common/ConsistentHashRouter.java similarity index 98% rename from x-retry-server/src/main/java/com/x/retry/server/support/allocate/common/ConsistentHashRouter.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/common/ConsistentHashRouter.java index ff129b4ad..f2c6ab42b 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/common/ConsistentHashRouter.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/common/ConsistentHashRouter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.x.retry.server.support.allocate.common; +package com.aizuda.easy.retry.server.support.allocate.common; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/common/HashFunction.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/common/HashFunction.java similarity index 93% rename from x-retry-server/src/main/java/com/x/retry/server/support/allocate/common/HashFunction.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/common/HashFunction.java index 44c23294a..32e48dcac 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/common/HashFunction.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/common/HashFunction.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.x.retry.server.support.allocate.common; +package com.aizuda.easy.retry.server.support.allocate.common; /** * Hash String to long value diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/common/Node.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/common/Node.java similarity index 94% rename from x-retry-server/src/main/java/com/x/retry/server/support/allocate/common/Node.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/common/Node.java index afb98e633..aaea29320 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/common/Node.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/common/Node.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.x.retry.server.support.allocate.common; +package com.aizuda.easy.retry.server.support.allocate.common; /** * Represent a node which should be mapped to a hash ring diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/common/VirtualNode.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/common/VirtualNode.java similarity index 90% rename from x-retry-server/src/main/java/com/x/retry/server/support/allocate/common/VirtualNode.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/common/VirtualNode.java index 04c4d7a1a..e2f6e9081 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/common/VirtualNode.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/common/VirtualNode.java @@ -1,4 +1,4 @@ -package com.x.retry.server.support.allocate.common; +package com.aizuda.easy.retry.server.support.allocate.common; public class VirtualNode implements Node { final T physicalNode; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/server/AllocateMessageQueueConsistentHash.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/server/AllocateMessageQueueConsistentHash.java similarity index 89% rename from x-retry-server/src/main/java/com/x/retry/server/support/allocate/server/AllocateMessageQueueConsistentHash.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/server/AllocateMessageQueueConsistentHash.java index e4d8669ed..873e7f845 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/allocate/server/AllocateMessageQueueConsistentHash.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/allocate/server/AllocateMessageQueueConsistentHash.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.x.retry.server.support.allocate.server; +package com.aizuda.easy.retry.server.support.allocate.server; -import com.x.retry.server.persistence.mybatis.po.GroupConfig; -import com.x.retry.server.support.ServerLoadBalance; -import com.x.retry.server.support.allocate.common.ConsistentHashRouter; -import com.x.retry.server.support.allocate.common.HashFunction; -import com.x.retry.server.support.allocate.common.Node; +import com.aizuda.easy.retry.server.support.allocate.common.ConsistentHashRouter; +import com.aizuda.easy.retry.server.support.allocate.common.HashFunction; +import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; +import com.aizuda.easy.retry.server.support.ServerLoadBalance; +import com.aizuda.easy.retry.server.support.allocate.common.Node; import org.springframework.util.CollectionUtils; import java.util.ArrayList; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/cache/CacheGroupRateLimiter.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/cache/CacheGroupRateLimiter.java similarity index 87% rename from x-retry-server/src/main/java/com/x/retry/server/support/cache/CacheGroupRateLimiter.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/cache/CacheGroupRateLimiter.java index 12d223bb2..782e97628 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/cache/CacheGroupRateLimiter.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/cache/CacheGroupRateLimiter.java @@ -1,16 +1,14 @@ -package com.x.retry.server.support.cache; +package com.aizuda.easy.retry.server.support.cache; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.google.common.util.concurrent.RateLimiter; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.server.support.Lifecycle; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.server.support.Lifecycle; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import java.util.concurrent.TimeUnit; - /** * 缓存组组限流组件 * diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/cache/CacheGroupScanActor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/cache/CacheGroupScanActor.java similarity index 86% rename from x-retry-server/src/main/java/com/x/retry/server/support/cache/CacheGroupScanActor.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/cache/CacheGroupScanActor.java index 571c4d630..816332609 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/cache/CacheGroupScanActor.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/cache/CacheGroupScanActor.java @@ -1,10 +1,10 @@ -package com.x.retry.server.support.cache; +package com.aizuda.easy.retry.server.support.cache; import akka.actor.ActorRef; -import com.x.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.log.LogUtils; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import com.x.retry.server.support.Lifecycle; +import com.aizuda.easy.retry.server.support.Lifecycle; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/context/MaxAttemptsPersistenceRetryContext.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/context/MaxAttemptsPersistenceRetryContext.java similarity index 69% rename from x-retry-server/src/main/java/com/x/retry/server/support/context/MaxAttemptsPersistenceRetryContext.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/context/MaxAttemptsPersistenceRetryContext.java index 18bc61ecd..d2f81dbc0 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/context/MaxAttemptsPersistenceRetryContext.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/context/MaxAttemptsPersistenceRetryContext.java @@ -1,9 +1,9 @@ -package com.x.retry.server.support.context; +package com.aizuda.easy.retry.server.support.context; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.persistence.mybatis.po.ServerNode; -import com.x.retry.server.support.RetryContext; -import com.x.retry.server.support.WaitStrategy; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.persistence.mybatis.po.ServerNode; +import com.aizuda.easy.retry.server.support.RetryContext; +import com.aizuda.easy.retry.server.support.WaitStrategy; import lombok.Data; import java.util.Set; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/dispatch/DispatchService.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/DispatchService.java similarity index 84% rename from x-retry-server/src/main/java/com/x/retry/server/support/dispatch/DispatchService.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/DispatchService.java index af40c3c79..925472c2c 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/dispatch/DispatchService.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/DispatchService.java @@ -1,24 +1,22 @@ -package com.x.retry.server.support.dispatch; +package com.aizuda.easy.retry.server.support.dispatch; import akka.actor.ActorRef; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.google.common.util.concurrent.RateLimiter; -import com.x.retry.common.core.enums.NodeTypeEnum; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.util.HostUtils; +import com.aizuda.easy.retry.common.core.enums.NodeTypeEnum; +import com.aizuda.easy.retry.common.core.log.LogUtils; import com.google.common.cache.Cache; -import com.x.retry.common.core.util.JsonUtil; -import com.x.retry.server.akka.ActorGenerator; -import com.x.retry.server.config.SystemProperties; -import com.x.retry.server.support.allocate.server.AllocateMessageQueueConsistentHash; -import com.x.retry.server.persistence.mybatis.mapper.ServerNodeMapper; -import com.x.retry.server.persistence.mybatis.po.GroupConfig; -import com.x.retry.server.persistence.mybatis.po.ServerNode; -import com.x.retry.server.persistence.support.ConfigAccess; -import com.x.retry.server.support.Lifecycle; -import com.x.retry.server.support.cache.CacheGroupRateLimiter; -import com.x.retry.server.support.cache.CacheGroupScanActor; -import com.x.retry.server.support.handler.ServerRegisterNodeHandler; +import com.aizuda.easy.retry.server.akka.ActorGenerator; +import com.aizuda.easy.retry.server.config.SystemProperties; +import com.aizuda.easy.retry.server.support.allocate.server.AllocateMessageQueueConsistentHash; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.ServerNodeMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.ServerNode; +import com.aizuda.easy.retry.server.persistence.support.ConfigAccess; +import com.aizuda.easy.retry.server.support.Lifecycle; +import com.aizuda.easy.retry.server.support.cache.CacheGroupRateLimiter; +import com.aizuda.easy.retry.server.support.cache.CacheGroupScanActor; +import com.aizuda.easy.retry.server.support.handler.ServerRegisterNodeHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/callback/CallbackRetryResultActor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/callback/CallbackRetryResultActor.java similarity index 82% rename from x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/callback/CallbackRetryResultActor.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/callback/CallbackRetryResultActor.java index bd6482543..c1d4631c7 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/callback/CallbackRetryResultActor.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/callback/CallbackRetryResultActor.java @@ -1,16 +1,16 @@ -package com.x.retry.server.support.dispatch.actor.callback; +package com.aizuda.easy.retry.server.support.dispatch.actor.callback; import akka.actor.AbstractActor; import cn.hutool.core.util.IdUtil; -import com.x.retry.client.model.RetryCallbackDTO; -import com.x.retry.common.core.constant.SystemConstants; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.model.Result; -import com.x.retry.common.core.model.XRetryHeaders; -import com.x.retry.common.core.util.JsonUtil; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.persistence.mybatis.po.ServerNode; -import com.x.retry.server.support.handler.ClientNodeAllocateHandler; +import com.aizuda.easy.retry.client.model.RetryCallbackDTO; +import com.aizuda.easy.retry.common.core.constant.SystemConstants; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.model.Result; +import com.aizuda.easy.retry.common.core.model.XRetryHeaders; +import com.aizuda.easy.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.persistence.mybatis.po.ServerNode; +import com.aizuda.easy.retry.server.support.handler.ClientNodeAllocateHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.ConfigurableBeanFactory; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/exec/ExecUnitActor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecUnitActor.java similarity index 83% rename from x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/exec/ExecUnitActor.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecUnitActor.java index e7eff7e5c..a9933d991 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/exec/ExecUnitActor.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/exec/ExecUnitActor.java @@ -1,23 +1,23 @@ -package com.x.retry.server.support.dispatch.actor.exec; +package com.aizuda.easy.retry.server.support.dispatch.actor.exec; import akka.actor.AbstractActor; import cn.hutool.core.util.IdUtil; import com.x.retry.client.model.DispatchRetryDTO; import com.x.retry.client.model.DispatchRetryResultDTO; -import com.x.retry.common.core.constant.SystemConstants; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.model.Result; -import com.x.retry.common.core.model.XRetryHeaders; -import com.x.retry.common.core.util.Assert; -import com.x.retry.common.core.util.JsonUtil; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.persistence.mybatis.mapper.RetryTaskLogMapper; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.persistence.mybatis.po.RetryTaskLog; -import com.x.retry.server.persistence.mybatis.po.ServerNode; -import com.x.retry.server.support.IdempotentStrategy; -import com.x.retry.server.support.context.MaxAttemptsPersistenceRetryContext; -import com.x.retry.server.support.retry.RetryExecutor; +import com.aizuda.easy.retry.common.core.constant.SystemConstants; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.model.Result; +import com.aizuda.easy.retry.common.core.model.XRetryHeaders; +import com.aizuda.easy.retry.common.core.util.Assert; +import com.aizuda.easy.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryTaskLogMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTaskLog; +import com.aizuda.easy.retry.server.persistence.mybatis.po.ServerNode; +import com.aizuda.easy.retry.server.support.IdempotentStrategy; +import com.aizuda.easy.retry.server.support.context.MaxAttemptsPersistenceRetryContext; +import com.aizuda.easy.retry.server.support.retry.RetryExecutor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/result/FailureActor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/FailureActor.java similarity index 80% rename from x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/result/FailureActor.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/FailureActor.java index 0edbbd947..39d739d97 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/result/FailureActor.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/FailureActor.java @@ -1,20 +1,20 @@ -package com.x.retry.server.support.dispatch.actor.result; +package com.aizuda.easy.retry.server.support.dispatch.actor.result; import akka.actor.AbstractActor; import akka.actor.ActorRef; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.x.retry.common.core.enums.RetryStatusEnum; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.util.Assert; -import com.x.retry.server.akka.ActorGenerator; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.persistence.mybatis.mapper.RetryTaskLogMapper; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.persistence.mybatis.po.RetryTaskLog; -import com.x.retry.server.persistence.mybatis.po.SceneConfig; -import com.x.retry.server.persistence.support.ConfigAccess; -import com.x.retry.server.persistence.support.RetryTaskAccess; +import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.util.Assert; +import com.aizuda.easy.retry.server.akka.ActorGenerator; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryTaskLogMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTaskLog; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SceneConfig; +import com.aizuda.easy.retry.server.persistence.support.ConfigAccess; +import com.aizuda.easy.retry.server.persistence.support.RetryTaskAccess; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/result/FinishActor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/FinishActor.java similarity index 80% rename from x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/result/FinishActor.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/FinishActor.java index f6b2e2b79..5c5b24b43 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/result/FinishActor.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/FinishActor.java @@ -1,18 +1,18 @@ -package com.x.retry.server.support.dispatch.actor.result; +package com.aizuda.easy.retry.server.support.dispatch.actor.result; import akka.actor.AbstractActor; import akka.actor.ActorRef; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.x.retry.common.core.enums.RetryStatusEnum; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.util.Assert; -import com.x.retry.server.akka.ActorGenerator; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.persistence.mybatis.mapper.RetryTaskLogMapper; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.persistence.mybatis.po.RetryTaskLog; -import com.x.retry.server.persistence.support.RetryTaskAccess; +import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.util.Assert; +import com.aizuda.easy.retry.server.akka.ActorGenerator; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryTaskLogMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTaskLog; +import com.aizuda.easy.retry.server.persistence.support.RetryTaskAccess; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/result/NoRetryActor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/NoRetryActor.java similarity index 77% rename from x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/result/NoRetryActor.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/NoRetryActor.java index 6f660921b..004fd9016 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/result/NoRetryActor.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/result/NoRetryActor.java @@ -1,12 +1,12 @@ -package com.x.retry.server.support.dispatch.actor.result; +package com.aizuda.easy.retry.server.support.dispatch.actor.result; import akka.actor.AbstractActor; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.persistence.support.RetryTaskAccess; -import com.x.retry.server.support.WaitStrategy; -import com.x.retry.server.support.context.MaxAttemptsPersistenceRetryContext; -import com.x.retry.server.support.retry.RetryExecutor; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.persistence.support.RetryTaskAccess; +import com.aizuda.easy.retry.server.support.WaitStrategy; +import com.aizuda.easy.retry.server.support.context.MaxAttemptsPersistenceRetryContext; +import com.aizuda.easy.retry.server.support.retry.RetryExecutor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/scan/ScanGroupActor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/scan/ScanGroupActor.java similarity index 77% rename from x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/scan/ScanGroupActor.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/scan/ScanGroupActor.java index 2168f6ff6..c9d7b6d96 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/dispatch/actor/scan/ScanGroupActor.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/dispatch/actor/scan/ScanGroupActor.java @@ -1,32 +1,27 @@ -package com.x.retry.server.support.dispatch.actor.scan; +package com.aizuda.easy.retry.server.support.dispatch.actor.scan; import akka.actor.AbstractActor; import akka.actor.ActorRef; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.x.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.server.support.strategy.FilterStrategies; +import com.aizuda.easy.retry.server.support.strategy.StopStrategies; +import com.aizuda.easy.retry.common.core.log.LogUtils; import com.x.retry.client.model.DispatchRetryResultDTO; -import com.x.retry.common.core.model.Result; -import com.x.retry.server.akka.ActorGenerator; -import com.x.retry.server.config.SystemProperties; -import com.x.retry.server.persistence.mybatis.mapper.ServerNodeMapper; -import com.x.retry.server.persistence.mybatis.po.GroupConfig; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.persistence.mybatis.po.SceneConfig; -import com.x.retry.server.persistence.mybatis.po.ServerNode; -import com.x.retry.server.persistence.support.ConfigAccess; -import com.x.retry.server.persistence.support.RetryTaskAccess; -import com.x.retry.server.support.ClientLoadBalance; -import com.x.retry.server.support.IdempotentStrategy; -import com.x.retry.server.support.WaitStrategy; -import com.x.retry.server.support.allocate.client.ClientLoadBalanceManager; -import com.x.retry.server.support.context.MaxAttemptsPersistenceRetryContext; -import com.x.retry.server.support.dispatch.DispatchService; -import com.x.retry.server.support.handler.ClientNodeAllocateHandler; -import com.x.retry.server.support.retry.RetryBuilder; -import com.x.retry.server.support.retry.RetryExecutor; -import com.x.retry.server.support.strategy.FilterStrategies; -import com.x.retry.server.support.strategy.StopStrategies; -import com.x.retry.server.support.strategy.WaitStrategies; +import com.aizuda.easy.retry.common.core.model.Result; +import com.aizuda.easy.retry.server.akka.ActorGenerator; +import com.aizuda.easy.retry.server.config.SystemProperties; +import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SceneConfig; +import com.aizuda.easy.retry.server.persistence.support.ConfigAccess; +import com.aizuda.easy.retry.server.persistence.support.RetryTaskAccess; +import com.aizuda.easy.retry.server.support.IdempotentStrategy; +import com.aizuda.easy.retry.server.support.WaitStrategy; +import com.aizuda.easy.retry.server.support.context.MaxAttemptsPersistenceRetryContext; +import com.aizuda.easy.retry.server.support.dispatch.DispatchService; +import com.aizuda.easy.retry.server.support.handler.ClientNodeAllocateHandler; +import com.aizuda.easy.retry.server.support.retry.RetryBuilder; +import com.aizuda.easy.retry.server.support.retry.RetryExecutor; +import com.aizuda.easy.retry.server.support.strategy.WaitStrategies; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -37,8 +32,6 @@ import org.springframework.util.CollectionUtils; import java.time.LocalDateTime; import java.util.List; -import java.util.TreeSet; -import java.util.stream.Collectors; /** * @author www.byteblogs.com diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/handler/ClientNodeAllocateHandler.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/handler/ClientNodeAllocateHandler.java similarity index 72% rename from x-retry-server/src/main/java/com/x/retry/server/support/handler/ClientNodeAllocateHandler.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/handler/ClientNodeAllocateHandler.java index b52b8ff2d..90dbc74c6 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/handler/ClientNodeAllocateHandler.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/handler/ClientNodeAllocateHandler.java @@ -1,13 +1,13 @@ -package com.x.retry.server.support.handler; +package com.aizuda.easy.retry.server.support.handler; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.ServerNodeMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.persistence.mybatis.po.ServerNode; +import com.aizuda.easy.retry.server.persistence.support.ConfigAccess; +import com.aizuda.easy.retry.server.support.allocate.client.ClientLoadBalanceManager; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.x.retry.server.persistence.mybatis.mapper.ServerNodeMapper; -import com.x.retry.server.persistence.mybatis.po.GroupConfig; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.persistence.mybatis.po.ServerNode; -import com.x.retry.server.persistence.support.ConfigAccess; -import com.x.retry.server.support.ClientLoadBalance; -import com.x.retry.server.support.allocate.client.ClientLoadBalanceManager; +import com.aizuda.easy.retry.server.support.ClientLoadBalance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/handler/ClientRegisterHandler.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/handler/ClientRegisterHandler.java similarity index 85% rename from x-retry-server/src/main/java/com/x/retry/server/support/handler/ClientRegisterHandler.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/handler/ClientRegisterHandler.java index bc0ff9d5b..7756292ab 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/handler/ClientRegisterHandler.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/handler/ClientRegisterHandler.java @@ -1,13 +1,13 @@ -package com.x.retry.server.support.handler; +package com.aizuda.easy.retry.server.support.handler; -import com.x.retry.common.core.enums.HeadersEnum; -import com.x.retry.common.core.enums.NodeTypeEnum; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.model.Result; -import com.x.retry.server.model.dto.ConfigDTO; -import com.x.retry.server.persistence.mybatis.mapper.ServerNodeMapper; -import com.x.retry.server.persistence.mybatis.po.ServerNode; -import com.x.retry.server.persistence.support.ConfigAccess; +import com.aizuda.easy.retry.common.core.enums.HeadersEnum; +import com.aizuda.easy.retry.common.core.enums.NodeTypeEnum; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.model.Result; +import com.aizuda.easy.retry.server.model.dto.ConfigDTO; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.ServerNodeMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.ServerNode; +import com.aizuda.easy.retry.server.persistence.support.ConfigAccess; import io.netty.handler.codec.http.HttpHeaders; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/handler/ServerRegisterNodeHandler.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/handler/ServerRegisterNodeHandler.java similarity index 82% rename from x-retry-server/src/main/java/com/x/retry/server/support/handler/ServerRegisterNodeHandler.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/handler/ServerRegisterNodeHandler.java index 85872352e..65b5e54e5 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/handler/ServerRegisterNodeHandler.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/handler/ServerRegisterNodeHandler.java @@ -1,21 +1,20 @@ -package com.x.retry.server.support.handler; +package com.aizuda.easy.retry.server.support.handler; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.x.retry.common.core.enums.NodeTypeEnum; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.util.HostUtils; -import com.x.retry.server.config.SystemProperties; -import com.x.retry.server.persistence.mybatis.mapper.ServerNodeMapper; -import com.x.retry.server.persistence.mybatis.po.ServerNode; -import com.x.retry.server.support.Lifecycle; +import com.aizuda.easy.retry.common.core.enums.NodeTypeEnum; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.util.HostUtils; +import com.aizuda.easy.retry.server.config.SystemProperties; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.ServerNodeMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.ServerNode; +import com.aizuda.easy.retry.server.support.Lifecycle; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.time.LocalDateTime; -import java.util.UUID; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/idempotent/BitSetIdempotentStrategyHandler.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/idempotent/BitSetIdempotentStrategyHandler.java similarity index 87% rename from x-retry-server/src/main/java/com/x/retry/server/support/idempotent/BitSetIdempotentStrategyHandler.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/idempotent/BitSetIdempotentStrategyHandler.java index 4bb48e041..7ba3fb6a5 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/idempotent/BitSetIdempotentStrategyHandler.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/idempotent/BitSetIdempotentStrategyHandler.java @@ -1,7 +1,7 @@ -package com.x.retry.server.support.idempotent; +package com.aizuda.easy.retry.server.support.idempotent; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.support.IdempotentStrategy; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.support.IdempotentStrategy; import org.springframework.stereotype.Component; import java.util.BitSet; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/listener/EndListener.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/listener/EndListener.java similarity index 75% rename from x-retry-server/src/main/java/com/x/retry/server/support/listener/EndListener.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/listener/EndListener.java index 2e2eb0235..2af4c1174 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/listener/EndListener.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/listener/EndListener.java @@ -1,7 +1,7 @@ -package com.x.retry.server.support.listener; +package com.aizuda.easy.retry.server.support.listener; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.server.support.Lifecycle; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.server.support.Lifecycle; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; @@ -25,7 +25,7 @@ public class EndListener implements ApplicationListener { @Override public void onApplicationEvent(ContextClosedEvent event) { - LogUtils.info(log, "X-RETRY-SERVER 停止"); + LogUtils.info(log, "easy-retry-SERVER 停止"); lifecycleList.forEach(Lifecycle::close); } } diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/listener/StartListener.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/listener/StartListener.java similarity index 75% rename from x-retry-server/src/main/java/com/x/retry/server/support/listener/StartListener.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/listener/StartListener.java index 5596c5bbc..9a82576a2 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/listener/StartListener.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/listener/StartListener.java @@ -1,7 +1,7 @@ -package com.x.retry.server.support.listener; +package com.aizuda.easy.retry.server.support.listener; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.server.support.Lifecycle; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.server.support.Lifecycle; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; @@ -25,7 +25,7 @@ public class StartListener implements ApplicationListener @Override public void onApplicationEvent(ContextRefreshedEvent event) { - LogUtils.info(log, "X-RETRY-SERVER 启动"); + LogUtils.info(log, "easy-retry-SERVER 启动"); lifecycleList.forEach(Lifecycle::start); } } diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/retry/RetryBuilder.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/retry/RetryBuilder.java similarity index 84% rename from x-retry-server/src/main/java/com/x/retry/server/support/retry/RetryBuilder.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/retry/RetryBuilder.java index db28f6489..aae237222 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/retry/RetryBuilder.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/retry/RetryBuilder.java @@ -1,10 +1,10 @@ -package com.x.retry.server.support.retry; +package com.aizuda.easy.retry.server.support.retry; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.support.FilterStrategy; -import com.x.retry.server.support.RetryContext; -import com.x.retry.server.support.StopStrategy; -import com.x.retry.server.support.WaitStrategy; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.support.FilterStrategy; +import com.aizuda.easy.retry.server.support.RetryContext; +import com.aizuda.easy.retry.server.support.StopStrategy; +import com.aizuda.easy.retry.server.support.WaitStrategy; import org.springframework.util.CollectionUtils; import java.util.*; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/retry/RetryExecutor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/retry/RetryExecutor.java similarity index 84% rename from x-retry-server/src/main/java/com/x/retry/server/support/retry/RetryExecutor.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/retry/RetryExecutor.java index e7b02daef..3abd4ea46 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/retry/RetryExecutor.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/retry/RetryExecutor.java @@ -1,11 +1,11 @@ -package com.x.retry.server.support.retry; +package com.aizuda.easy.retry.server.support.retry; import akka.actor.ActorRef; -import com.x.retry.server.akka.ActorGenerator; -import com.x.retry.server.support.FilterStrategy; -import com.x.retry.server.support.RetryContext; -import com.x.retry.server.support.StopStrategy; -import com.x.retry.server.support.WaitStrategy; +import com.aizuda.easy.retry.server.akka.ActorGenerator; +import com.aizuda.easy.retry.server.support.FilterStrategy; +import com.aizuda.easy.retry.server.support.RetryContext; +import com.aizuda.easy.retry.server.support.StopStrategy; +import com.aizuda.easy.retry.server.support.WaitStrategy; import java.util.List; import java.util.concurrent.Callable; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/schedule/AlarmNotifyThreadSchedule.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/schedule/AlarmNotifyThreadSchedule.java similarity index 85% rename from x-retry-server/src/main/java/com/x/retry/server/support/schedule/AlarmNotifyThreadSchedule.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/schedule/AlarmNotifyThreadSchedule.java index 458f03bbd..92304adc5 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/schedule/AlarmNotifyThreadSchedule.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/schedule/AlarmNotifyThreadSchedule.java @@ -1,18 +1,18 @@ -package com.x.retry.server.support.schedule; +package com.aizuda.easy.retry.server.support.schedule; -import com.x.retry.common.core.alarm.Alarm; -import com.x.retry.common.core.alarm.AlarmContext; -import com.x.retry.common.core.alarm.AltinAlarmFactory; -import com.x.retry.common.core.enums.NotifySceneEnum; -import com.x.retry.common.core.enums.RetryStatusEnum; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.common.core.util.EnvironmentUtils; -import com.x.retry.common.core.util.HostUtils; -import com.x.retry.server.persistence.mybatis.mapper.RetryDeadLetterMapper; -import com.x.retry.server.persistence.mybatis.mapper.RetryTaskMapper; -import com.x.retry.server.persistence.mybatis.po.GroupConfig; -import com.x.retry.server.persistence.mybatis.po.NotifyConfig; -import com.x.retry.server.persistence.support.ConfigAccess; +import com.aizuda.easy.retry.common.core.alarm.Alarm; +import com.aizuda.easy.retry.common.core.alarm.AlarmContext; +import com.aizuda.easy.retry.common.core.alarm.AltinAlarmFactory; +import com.aizuda.easy.retry.common.core.enums.NotifySceneEnum; +import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.common.core.util.EnvironmentUtils; +import com.aizuda.easy.retry.common.core.util.HostUtils; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryDeadLetterMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.RetryTaskMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.GroupConfig; +import com.aizuda.easy.retry.server.persistence.mybatis.po.NotifyConfig; +import com.aizuda.easy.retry.server.persistence.support.ConfigAccess; import lombok.extern.slf4j.Slf4j; import net.javacrumbs.shedlock.spring.annotation.SchedulerLock; import org.springframework.beans.factory.annotation.Autowired; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/schedule/ClearThreadSchedule.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/schedule/ClearThreadSchedule.java similarity index 82% rename from x-retry-server/src/main/java/com/x/retry/server/support/schedule/ClearThreadSchedule.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/schedule/ClearThreadSchedule.java index 8a47b98ac..ac1f714b2 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/schedule/ClearThreadSchedule.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/schedule/ClearThreadSchedule.java @@ -1,10 +1,10 @@ -package com.x.retry.server.support.schedule; +package com.aizuda.easy.retry.server.support.schedule; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.server.persistence.mybatis.mapper.ServerNodeMapper; -import com.x.retry.server.persistence.support.ConfigAccess; -import com.x.retry.server.service.RetryService; -import com.x.retry.server.support.handler.ServerRegisterNodeHandler; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.ServerNodeMapper; +import com.aizuda.easy.retry.server.persistence.support.ConfigAccess; +import com.aizuda.easy.retry.server.service.RetryService; +import com.aizuda.easy.retry.server.support.handler.ServerRegisterNodeHandler; import lombok.extern.slf4j.Slf4j; import net.javacrumbs.shedlock.spring.annotation.SchedulerLock; import org.springframework.beans.factory.annotation.Autowired; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/strategy/FilterStrategies.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/FilterStrategies.java similarity index 88% rename from x-retry-server/src/main/java/com/x/retry/server/support/strategy/FilterStrategies.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/FilterStrategies.java index 8344612ea..57c56294e 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/strategy/FilterStrategies.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/FilterStrategies.java @@ -1,17 +1,17 @@ -package com.x.retry.server.support.strategy; +package com.aizuda.easy.retry.server.support.strategy; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.google.common.util.concurrent.RateLimiter; -import com.x.retry.common.core.context.SpringContext; -import com.x.retry.common.core.log.LogUtils; -import com.x.retry.server.persistence.mybatis.mapper.ServerNodeMapper; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.persistence.mybatis.po.ServerNode; -import com.x.retry.server.support.FilterStrategy; -import com.x.retry.server.support.IdempotentStrategy; -import com.x.retry.server.support.RetryContext; -import com.x.retry.server.support.cache.CacheGroupRateLimiter; -import com.x.retry.server.support.context.MaxAttemptsPersistenceRetryContext; +import com.aizuda.easy.retry.common.core.context.SpringContext; +import com.aizuda.easy.retry.common.core.log.LogUtils; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.ServerNodeMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.persistence.mybatis.po.ServerNode; +import com.aizuda.easy.retry.server.support.FilterStrategy; +import com.aizuda.easy.retry.server.support.IdempotentStrategy; +import com.aizuda.easy.retry.server.support.RetryContext; +import com.aizuda.easy.retry.server.support.cache.CacheGroupRateLimiter; +import com.aizuda.easy.retry.server.support.context.MaxAttemptsPersistenceRetryContext; import lombok.extern.slf4j.Slf4j; import java.time.LocalDateTime; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/strategy/StopStrategies.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/StopStrategies.java similarity index 78% rename from x-retry-server/src/main/java/com/x/retry/server/support/strategy/StopStrategies.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/StopStrategies.java index 15b48d35c..259240385 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/strategy/StopStrategies.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/StopStrategies.java @@ -1,12 +1,12 @@ -package com.x.retry.server.support.strategy; +package com.aizuda.easy.retry.server.support.strategy; import com.x.retry.client.model.DispatchRetryResultDTO; -import com.x.retry.common.core.enums.RetryResultStatusEnum; -import com.x.retry.common.core.enums.StatusEnum; -import com.x.retry.common.core.model.Result; -import com.x.retry.server.support.RetryContext; -import com.x.retry.server.support.StopStrategy; -import com.x.retry.server.support.context.MaxAttemptsPersistenceRetryContext; +import com.aizuda.easy.retry.common.core.enums.RetryResultStatusEnum; +import com.aizuda.easy.retry.common.core.enums.StatusEnum; +import com.aizuda.easy.retry.common.core.model.Result; +import com.aizuda.easy.retry.server.support.RetryContext; +import com.aizuda.easy.retry.server.support.StopStrategy; +import com.aizuda.easy.retry.server.support.context.MaxAttemptsPersistenceRetryContext; import java.util.Objects; diff --git a/x-retry-server/src/main/java/com/x/retry/server/support/strategy/WaitStrategies.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/WaitStrategies.java similarity index 91% rename from x-retry-server/src/main/java/com/x/retry/server/support/strategy/WaitStrategies.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/WaitStrategies.java index 24cd8192f..7fb793e54 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/support/strategy/WaitStrategies.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/support/strategy/WaitStrategies.java @@ -1,16 +1,16 @@ -package com.x.retry.server.support.strategy; +package com.aizuda.easy.retry.server.support.strategy; -import com.x.retry.common.core.context.SpringContext; -import com.x.retry.common.core.enums.DelayLevelEnum; -import com.x.retry.common.core.util.CronExpression; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.persistence.mybatis.po.RetryTask; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SceneConfig; +import com.aizuda.easy.retry.server.persistence.support.ConfigAccess; +import com.aizuda.easy.retry.common.core.context.SpringContext; +import com.aizuda.easy.retry.common.core.enums.DelayLevelEnum; +import com.aizuda.easy.retry.common.core.util.CronExpression; import com.google.common.base.Preconditions; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.persistence.mybatis.po.RetryTask; -import com.x.retry.server.persistence.mybatis.po.SceneConfig; -import com.x.retry.server.persistence.support.ConfigAccess; -import com.x.retry.server.support.RetryContext; -import com.x.retry.server.support.WaitStrategy; -import com.x.retry.server.support.context.MaxAttemptsPersistenceRetryContext; +import com.aizuda.easy.retry.server.support.RetryContext; +import com.aizuda.easy.retry.server.support.WaitStrategy; +import com.aizuda.easy.retry.server.support.context.MaxAttemptsPersistenceRetryContext; import lombok.Data; import java.text.ParseException; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/annotation/LoginRequired.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/annotation/LoginRequired.java similarity index 89% rename from x-retry-server/src/main/java/com/x/retry/server/web/annotation/LoginRequired.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/annotation/LoginRequired.java index e9c7ac83a..c09db1b46 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/annotation/LoginRequired.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/annotation/LoginRequired.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.annotation; +package com.aizuda.easy.retry.server.web.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/annotation/LoginUser.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/annotation/LoginUser.java similarity index 87% rename from x-retry-server/src/main/java/com/x/retry/server/web/annotation/LoginUser.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/annotation/LoginUser.java index 7b1730034..f2b67ddbd 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/annotation/LoginUser.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/annotation/LoginUser.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.annotation; +package com.aizuda.easy.retry.server.web.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/annotation/RoleEnum.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/annotation/RoleEnum.java similarity index 94% rename from x-retry-server/src/main/java/com/x/retry/server/web/annotation/RoleEnum.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/annotation/RoleEnum.java index a72e8d7c2..938b3ab78 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/annotation/RoleEnum.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/annotation/RoleEnum.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.annotation; +package com.aizuda.easy.retry.server.web.annotation; import java.util.HashMap; import java.util.Map; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/controller/DashBoardController.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/DashBoardController.java similarity index 83% rename from x-retry-server/src/main/java/com/x/retry/server/web/controller/DashBoardController.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/DashBoardController.java index 847abb2a9..2ad04396f 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/controller/DashBoardController.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/DashBoardController.java @@ -1,11 +1,11 @@ -package com.x.retry.server.web.controller; +package com.aizuda.easy.retry.server.web.controller; -import com.x.retry.server.service.DashBoardService; -import com.x.retry.server.web.annotation.LoginRequired; -import com.x.retry.server.web.model.response.ActivePodQuantityResponseVO; -import com.x.retry.server.web.model.response.DispatchQuantityResponseVO; -import com.x.retry.server.web.model.response.SceneQuantityRankResponseVO; -import com.x.retry.server.web.model.response.TaskQuantityResponseVO; +import com.aizuda.easy.retry.server.service.DashBoardService; +import com.aizuda.easy.retry.server.web.model.response.ActivePodQuantityResponseVO; +import com.aizuda.easy.retry.server.web.model.response.DispatchQuantityResponseVO; +import com.aizuda.easy.retry.server.web.model.response.SceneQuantityRankResponseVO; +import com.aizuda.easy.retry.server.web.annotation.LoginRequired; +import com.aizuda.easy.retry.server.web.model.response.TaskQuantityResponseVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/controller/GroupConfigController.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/GroupConfigController.java similarity index 73% rename from x-retry-server/src/main/java/com/x/retry/server/web/controller/GroupConfigController.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/GroupConfigController.java index f45d6aaed..aa39d014d 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/controller/GroupConfigController.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/GroupConfigController.java @@ -1,12 +1,12 @@ -package com.x.retry.server.web.controller; +package com.aizuda.easy.retry.server.web.controller; -import com.x.retry.server.web.annotation.LoginRequired; -import com.x.retry.server.web.annotation.RoleEnum; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.service.GroupConfigService; -import com.x.retry.server.web.model.request.GroupConfigQueryVO; -import com.x.retry.server.web.model.request.GroupConfigRequestVO; -import com.x.retry.server.web.model.response.GroupConfigResponseVO; +import com.aizuda.easy.retry.server.service.GroupConfigService; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.GroupConfigQueryVO; +import com.aizuda.easy.retry.server.web.model.request.GroupConfigRequestVO; +import com.aizuda.easy.retry.server.web.model.response.GroupConfigResponseVO; +import com.aizuda.easy.retry.server.web.annotation.LoginRequired; +import com.aizuda.easy.retry.server.web.annotation.RoleEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/controller/NotifyConfigController.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/NotifyConfigController.java similarity index 72% rename from x-retry-server/src/main/java/com/x/retry/server/web/controller/NotifyConfigController.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/NotifyConfigController.java index 5203804ca..9a021bcda 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/controller/NotifyConfigController.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/NotifyConfigController.java @@ -1,9 +1,8 @@ -package com.x.retry.server.web.controller; +package com.aizuda.easy.retry.server.web.controller; -import com.x.retry.server.persistence.mybatis.mapper.NotifyConfigMapper; -import com.x.retry.server.service.NotifyConfigService; -import com.x.retry.server.web.annotation.LoginRequired; -import com.x.retry.server.web.model.response.NotifyConfigResponseVO; +import com.aizuda.easy.retry.server.service.NotifyConfigService; +import com.aizuda.easy.retry.server.web.annotation.LoginRequired; +import com.aizuda.easy.retry.server.web.model.response.NotifyConfigResponseVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/controller/RetryDeadLetterController.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/RetryDeadLetterController.java similarity index 77% rename from x-retry-server/src/main/java/com/x/retry/server/web/controller/RetryDeadLetterController.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/RetryDeadLetterController.java index f1b2eb5fd..82291ceac 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/controller/RetryDeadLetterController.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/RetryDeadLetterController.java @@ -1,10 +1,10 @@ -package com.x.retry.server.web.controller; +package com.aizuda.easy.retry.server.web.controller; -import com.x.retry.server.service.RetryDeadLetterService; -import com.x.retry.server.web.annotation.LoginRequired; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.web.model.request.RetryDeadLetterQueryVO; -import com.x.retry.server.web.model.response.RetryDeadLetterResponseVO; +import com.aizuda.easy.retry.server.service.RetryDeadLetterService; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.RetryDeadLetterQueryVO; +import com.aizuda.easy.retry.server.web.annotation.LoginRequired; +import com.aizuda.easy.retry.server.web.model.response.RetryDeadLetterResponseVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/controller/RetryTaskController.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/RetryTaskController.java similarity index 75% rename from x-retry-server/src/main/java/com/x/retry/server/web/controller/RetryTaskController.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/RetryTaskController.java index c1774ea49..e058fa326 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/controller/RetryTaskController.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/RetryTaskController.java @@ -1,11 +1,11 @@ -package com.x.retry.server.web.controller; +package com.aizuda.easy.retry.server.web.controller; -import com.x.retry.server.service.RetryTaskService; -import com.x.retry.server.web.annotation.LoginRequired; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.web.model.request.RetryTaskQueryVO; -import com.x.retry.server.web.model.request.RetryTaskRequestVO; -import com.x.retry.server.web.model.response.RetryTaskResponseVO; +import com.aizuda.easy.retry.server.service.RetryTaskService; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.RetryTaskQueryVO; +import com.aizuda.easy.retry.server.web.model.request.RetryTaskRequestVO; +import com.aizuda.easy.retry.server.web.annotation.LoginRequired; +import com.aizuda.easy.retry.server.web.model.response.RetryTaskResponseVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/controller/RetryTaskLogController.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/RetryTaskLogController.java similarity index 71% rename from x-retry-server/src/main/java/com/x/retry/server/web/controller/RetryTaskLogController.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/RetryTaskLogController.java index 19f254900..68da4d4c4 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/controller/RetryTaskLogController.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/RetryTaskLogController.java @@ -1,10 +1,10 @@ -package com.x.retry.server.web.controller; +package com.aizuda.easy.retry.server.web.controller; -import com.x.retry.server.service.RetryTaskLogService; -import com.x.retry.server.web.annotation.LoginRequired; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.web.model.request.RetryTaskLogQueryVO; -import com.x.retry.server.web.model.response.RetryTaskLogResponseVO; +import com.aizuda.easy.retry.server.service.RetryTaskLogService; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.RetryTaskLogQueryVO; +import com.aizuda.easy.retry.server.web.annotation.LoginRequired; +import com.aizuda.easy.retry.server.web.model.response.RetryTaskLogResponseVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/controller/SceneConfigSceneController.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/SceneConfigSceneController.java similarity index 71% rename from x-retry-server/src/main/java/com/x/retry/server/web/controller/SceneConfigSceneController.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/SceneConfigSceneController.java index 17b834d9e..9aa4c72db 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/controller/SceneConfigSceneController.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/SceneConfigSceneController.java @@ -1,10 +1,10 @@ -package com.x.retry.server.web.controller; +package com.aizuda.easy.retry.server.web.controller; -import com.x.retry.server.service.SceneConfigService; -import com.x.retry.server.web.annotation.LoginRequired; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.web.model.request.SceneConfigQueryVO; -import com.x.retry.server.web.model.response.SceneConfigResponseVO; +import com.aizuda.easy.retry.server.service.SceneConfigService; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.SceneConfigQueryVO; +import com.aizuda.easy.retry.server.web.model.response.SceneConfigResponseVO; +import com.aizuda.easy.retry.server.web.annotation.LoginRequired; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/controller/SystemUserController.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/SystemUserController.java similarity index 71% rename from x-retry-server/src/main/java/com/x/retry/server/web/controller/SystemUserController.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/SystemUserController.java index 83cdcad24..f2fc5dc7b 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/controller/SystemUserController.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/SystemUserController.java @@ -1,16 +1,15 @@ -package com.x.retry.server.web.controller; +package com.aizuda.easy.retry.server.web.controller; -import com.x.retry.server.persistence.mybatis.po.SystemUser; -import com.x.retry.server.service.SystemUserService; -import com.x.retry.server.web.annotation.LoginUser; -import com.x.retry.server.web.annotation.LoginRequired; -import com.x.retry.server.web.annotation.RoleEnum; -import com.x.retry.server.web.model.base.PageResult; -import com.x.retry.server.web.model.request.SystemUserQueryVO; -import com.x.retry.server.web.model.request.SystemUserRequestVO; -import com.x.retry.server.web.model.response.SystemUserResponseVO; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SystemUser; +import com.aizuda.easy.retry.server.service.SystemUserService; +import com.aizuda.easy.retry.server.web.model.base.PageResult; +import com.aizuda.easy.retry.server.web.model.request.SystemUserQueryVO; +import com.aizuda.easy.retry.server.web.model.request.SystemUserRequestVO; +import com.aizuda.easy.retry.server.web.annotation.LoginUser; +import com.aizuda.easy.retry.server.web.annotation.LoginRequired; +import com.aizuda.easy.retry.server.web.annotation.RoleEnum; +import com.aizuda.easy.retry.server.web.model.response.SystemUserResponseVO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/controller/WebController.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/WebController.java similarity index 86% rename from x-retry-server/src/main/java/com/x/retry/server/web/controller/WebController.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/WebController.java index 9ce5c13fd..c724555d8 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/controller/WebController.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/controller/WebController.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.controller; +package com.aizuda.easy.retry.server.web.controller; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/interceptor/AuthenticationInterceptor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/interceptor/AuthenticationInterceptor.java similarity index 86% rename from x-retry-server/src/main/java/com/x/retry/server/web/interceptor/AuthenticationInterceptor.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/interceptor/AuthenticationInterceptor.java index 3e7ac6304..4bd13a334 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/interceptor/AuthenticationInterceptor.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/interceptor/AuthenticationInterceptor.java @@ -1,21 +1,19 @@ -package com.x.retry.server.web.interceptor; +package com.aizuda.easy.retry.server.web.interceptor; +import com.aizuda.easy.retry.server.exception.XRetryServerException; +import com.aizuda.easy.retry.server.persistence.mybatis.mapper.SystemUserMapper; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SystemUser; import com.auth0.jwt.JWT; import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; import com.auth0.jwt.exceptions.JWTDecodeException; import com.auth0.jwt.exceptions.JWTVerificationException; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.x.retry.common.core.util.JsonUtil; -import com.x.retry.server.exception.XRetryServerException; -import com.x.retry.server.persistence.mybatis.mapper.SystemUserMapper; -import com.x.retry.server.persistence.mybatis.po.SystemUser; -import com.x.retry.server.web.annotation.LoginRequired; -import com.x.retry.server.web.annotation.RoleEnum; +import com.aizuda.easy.retry.common.core.util.JsonUtil; +import com.aizuda.easy.retry.server.web.annotation.LoginRequired; +import com.aizuda.easy.retry.server.web.annotation.RoleEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; @@ -24,7 +22,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.lang.reflect.Method; import java.util.Objects; -import java.util.Optional; /** * @Author:byteblogs @@ -33,7 +30,7 @@ import java.util.Optional; @Configuration public class AuthenticationInterceptor implements HandlerInterceptor { - public static final String AUTHENTICATION = "X-RETRY-AUTH"; + public static final String AUTHENTICATION = "easy-retry-AUTH"; @Autowired private SystemUserMapper systemUserMapper; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/interceptor/CORSInterceptor.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/interceptor/CORSInterceptor.java similarity index 93% rename from x-retry-server/src/main/java/com/x/retry/server/web/interceptor/CORSInterceptor.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/interceptor/CORSInterceptor.java index 28f329e2f..b4ac48c6d 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/interceptor/CORSInterceptor.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/interceptor/CORSInterceptor.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.interceptor; +package com.aizuda.easy.retry.server.web.interceptor; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/interceptor/LoginUserMethodArgumentResolver.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/interceptor/LoginUserMethodArgumentResolver.java similarity index 88% rename from x-retry-server/src/main/java/com/x/retry/server/web/interceptor/LoginUserMethodArgumentResolver.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/interceptor/LoginUserMethodArgumentResolver.java index 2fd478bef..54bd55bdc 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/interceptor/LoginUserMethodArgumentResolver.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/interceptor/LoginUserMethodArgumentResolver.java @@ -1,7 +1,7 @@ -package com.x.retry.server.web.interceptor; +package com.aizuda.easy.retry.server.web.interceptor; -import com.x.retry.server.persistence.mybatis.po.SystemUser; -import com.x.retry.server.web.annotation.LoginUser; +import com.aizuda.easy.retry.server.persistence.mybatis.po.SystemUser; +import com.aizuda.easy.retry.server.web.annotation.LoginUser; import org.springframework.core.MethodParameter; import org.springframework.stereotype.Component; import org.springframework.web.bind.support.WebDataBinderFactory; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/interceptor/XRetryWebMvcConfigurerAdapter.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/interceptor/XRetryWebMvcConfigurerAdapter.java similarity index 90% rename from x-retry-server/src/main/java/com/x/retry/server/web/interceptor/XRetryWebMvcConfigurerAdapter.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/interceptor/XRetryWebMvcConfigurerAdapter.java index 1a5f6201b..4e92b7806 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/interceptor/XRetryWebMvcConfigurerAdapter.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/interceptor/XRetryWebMvcConfigurerAdapter.java @@ -1,10 +1,8 @@ -package com.x.retry.server.web.interceptor; +package com.aizuda.easy.retry.server.web.interceptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; -import org.springframework.stereotype.Component; import org.springframework.web.method.support.HandlerMethodArgumentResolver; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/base/BaseQueryVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/base/BaseQueryVO.java similarity index 77% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/base/BaseQueryVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/base/BaseQueryVO.java index eb17f5953..6424f3d61 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/base/BaseQueryVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/base/BaseQueryVO.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.model.base; +package com.aizuda.easy.retry.server.web.model.base; import lombok.Data; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/base/PageResult.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/base/PageResult.java similarity index 86% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/base/PageResult.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/base/PageResult.java index 6ea7100e4..d4ab1028e 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/base/PageResult.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/base/PageResult.java @@ -1,7 +1,7 @@ -package com.x.retry.server.web.model.base; +package com.aizuda.easy.retry.server.web.model.base; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; -import com.x.retry.common.core.model.Result; +import com.aizuda.easy.retry.common.core.model.Result; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/enums/DateTypeEnum.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/enums/DateTypeEnum.java similarity index 98% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/enums/DateTypeEnum.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/enums/DateTypeEnum.java index 5b727359e..39687a625 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/enums/DateTypeEnum.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/enums/DateTypeEnum.java @@ -1,6 +1,6 @@ -package com.x.retry.server.web.model.enums; +package com.aizuda.easy.retry.server.web.model.enums; -import com.x.retry.server.web.model.response.DispatchQuantityResponseVO; +import com.aizuda.easy.retry.server.web.model.response.DispatchQuantityResponseVO; import java.time.DayOfWeek; import java.time.LocalDate; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/GroupConfigQueryVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/GroupConfigQueryVO.java similarity index 77% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/request/GroupConfigQueryVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/GroupConfigQueryVO.java index 71b11ff29..c28784e78 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/GroupConfigQueryVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/GroupConfigQueryVO.java @@ -1,6 +1,6 @@ -package com.x.retry.server.web.model.request; +package com.aizuda.easy.retry.server.web.model.request; -import com.x.retry.server.web.model.base.BaseQueryVO; +import com.aizuda.easy.retry.server.web.model.base.BaseQueryVO; import lombok.Data; import org.hibernate.validator.constraints.NotBlank; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/GroupConfigRequestVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/GroupConfigRequestVO.java similarity index 97% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/request/GroupConfigRequestVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/GroupConfigRequestVO.java index f5b5998a3..304f42077 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/GroupConfigRequestVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/GroupConfigRequestVO.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.model.request; +package com.aizuda.easy.retry.server.web.model.request; import lombok.Data; import org.hibernate.validator.constraints.NotBlank; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/RetryDeadLetterQueryVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryDeadLetterQueryVO.java similarity index 68% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/request/RetryDeadLetterQueryVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryDeadLetterQueryVO.java index 153db55bd..48dd6ab19 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/RetryDeadLetterQueryVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryDeadLetterQueryVO.java @@ -1,6 +1,6 @@ -package com.x.retry.server.web.model.request; +package com.aizuda.easy.retry.server.web.model.request; -import com.x.retry.server.web.model.base.BaseQueryVO; +import com.aizuda.easy.retry.server.web.model.base.BaseQueryVO; import lombok.Data; /** diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/RetryTaskLogQueryVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskLogQueryVO.java similarity index 68% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/request/RetryTaskLogQueryVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskLogQueryVO.java index 68985b105..b41cb2025 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/RetryTaskLogQueryVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskLogQueryVO.java @@ -1,6 +1,6 @@ -package com.x.retry.server.web.model.request; +package com.aizuda.easy.retry.server.web.model.request; -import com.x.retry.server.web.model.base.BaseQueryVO; +import com.aizuda.easy.retry.server.web.model.base.BaseQueryVO; import lombok.Data; /** diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/RetryTaskQueryVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskQueryVO.java similarity index 71% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/request/RetryTaskQueryVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskQueryVO.java index a9f9d30a8..a7281db6a 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/RetryTaskQueryVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskQueryVO.java @@ -1,6 +1,6 @@ -package com.x.retry.server.web.model.request; +package com.aizuda.easy.retry.server.web.model.request; -import com.x.retry.server.web.model.base.BaseQueryVO; +import com.aizuda.easy.retry.server.web.model.base.BaseQueryVO; import lombok.Data; /** diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/RetryTaskRequestVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskRequestVO.java similarity index 74% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/request/RetryTaskRequestVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskRequestVO.java index d9dee802f..cdfc70941 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/RetryTaskRequestVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/RetryTaskRequestVO.java @@ -1,6 +1,6 @@ -package com.x.retry.server.web.model.request; +package com.aizuda.easy.retry.server.web.model.request; -import com.x.retry.common.core.enums.RetryStatusEnum; +import com.aizuda.easy.retry.common.core.enums.RetryStatusEnum; import lombok.Data; /** diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/SceneConfigQueryVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/SceneConfigQueryVO.java similarity index 64% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/request/SceneConfigQueryVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/SceneConfigQueryVO.java index b75a6dbe7..f491cfe5a 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/SceneConfigQueryVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/SceneConfigQueryVO.java @@ -1,6 +1,6 @@ -package com.x.retry.server.web.model.request; +package com.aizuda.easy.retry.server.web.model.request; -import com.x.retry.server.web.model.base.BaseQueryVO; +import com.aizuda.easy.retry.server.web.model.base.BaseQueryVO; import lombok.Data; /** diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/SystemUserQueryVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/SystemUserQueryVO.java similarity index 60% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/request/SystemUserQueryVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/SystemUserQueryVO.java index 976482dbc..b64b1fd53 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/SystemUserQueryVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/SystemUserQueryVO.java @@ -1,6 +1,6 @@ -package com.x.retry.server.web.model.request; +package com.aizuda.easy.retry.server.web.model.request; -import com.x.retry.server.web.model.base.BaseQueryVO; +import com.aizuda.easy.retry.server.web.model.base.BaseQueryVO; import lombok.Data; /** diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/SystemUserRequestVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/SystemUserRequestVO.java similarity index 93% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/request/SystemUserRequestVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/SystemUserRequestVO.java index 735878ad2..71d9f78a5 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/request/SystemUserRequestVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/request/SystemUserRequestVO.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.model.request; +package com.aizuda.easy.retry.server.web.model.request; import lombok.Data; import org.springframework.web.bind.annotation.PostMapping; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/ActivePodQuantityResponseVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/ActivePodQuantityResponseVO.java similarity index 79% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/response/ActivePodQuantityResponseVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/ActivePodQuantityResponseVO.java index 939a90a1b..e156f8740 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/ActivePodQuantityResponseVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/ActivePodQuantityResponseVO.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.model.response; +package com.aizuda.easy.retry.server.web.model.response; import lombok.Data; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/DispatchQuantityResponseVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/DispatchQuantityResponseVO.java similarity index 85% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/response/DispatchQuantityResponseVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/DispatchQuantityResponseVO.java index 587c9d0c4..7e5040d7f 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/DispatchQuantityResponseVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/DispatchQuantityResponseVO.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.model.response; +package com.aizuda.easy.retry.server.web.model.response; import lombok.Data; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/GroupConfigResponseVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/GroupConfigResponseVO.java similarity index 90% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/response/GroupConfigResponseVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/GroupConfigResponseVO.java index 3000cd553..002e05c15 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/GroupConfigResponseVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/GroupConfigResponseVO.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.model.response; +package com.aizuda.easy.retry.server.web.model.response; import lombok.Data; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/NotifyConfigResponseVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/NotifyConfigResponseVO.java similarity index 90% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/response/NotifyConfigResponseVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/NotifyConfigResponseVO.java index 5a379e170..1dde1a273 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/NotifyConfigResponseVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/NotifyConfigResponseVO.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.model.response; +package com.aizuda.easy.retry.server.web.model.response; import lombok.Data; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/RetryDeadLetterResponseVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryDeadLetterResponseVO.java similarity index 88% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/response/RetryDeadLetterResponseVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryDeadLetterResponseVO.java index 3f51a441a..de2f0bef6 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/RetryDeadLetterResponseVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryDeadLetterResponseVO.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.model.response; +package com.aizuda.easy.retry.server.web.model.response; import lombok.Data; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/RetryTaskLogResponseVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryTaskLogResponseVO.java similarity index 90% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/response/RetryTaskLogResponseVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryTaskLogResponseVO.java index 8ea68e254..f7c0e57d9 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/RetryTaskLogResponseVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryTaskLogResponseVO.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.model.response; +package com.aizuda.easy.retry.server.web.model.response; import lombok.Data; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/RetryTaskResponseVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryTaskResponseVO.java similarity index 91% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/response/RetryTaskResponseVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryTaskResponseVO.java index 72c6f82e6..ad6de9e1d 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/RetryTaskResponseVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/RetryTaskResponseVO.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.model.response; +package com.aizuda.easy.retry.server.web.model.response; import lombok.Data; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/SceneConfigResponseVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/SceneConfigResponseVO.java similarity index 83% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/response/SceneConfigResponseVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/SceneConfigResponseVO.java index 610999975..22967fc8b 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/SceneConfigResponseVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/SceneConfigResponseVO.java @@ -1,6 +1,5 @@ -package com.x.retry.server.web.model.response; +package com.aizuda.easy.retry.server.web.model.response; -import com.x.retry.server.web.model.base.BaseQueryVO; import lombok.Data; import java.time.LocalDateTime; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/SceneQuantityRankResponseVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/SceneQuantityRankResponseVO.java similarity index 80% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/response/SceneQuantityRankResponseVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/SceneQuantityRankResponseVO.java index 99d12c74e..7b5d13918 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/SceneQuantityRankResponseVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/SceneQuantityRankResponseVO.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.model.response; +package com.aizuda.easy.retry.server.web.model.response; import lombok.Data; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/SystemUserResponseVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/SystemUserResponseVO.java similarity index 87% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/response/SystemUserResponseVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/SystemUserResponseVO.java index f2dad5517..5fb7bb589 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/SystemUserResponseVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/SystemUserResponseVO.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.model.response; +package com.aizuda.easy.retry.server.web.model.response; import lombok.Data; diff --git a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/TaskQuantityResponseVO.java b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/TaskQuantityResponseVO.java similarity index 81% rename from x-retry-server/src/main/java/com/x/retry/server/web/model/response/TaskQuantityResponseVO.java rename to easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/TaskQuantityResponseVO.java index 57e76e42e..1dcb4439f 100644 --- a/x-retry-server/src/main/java/com/x/retry/server/web/model/response/TaskQuantityResponseVO.java +++ b/easy-retry-server/src/main/java/com/aizuda/easy/retry/server/web/model/response/TaskQuantityResponseVO.java @@ -1,4 +1,4 @@ -package com.x.retry.server.web.model.response; +package com.aizuda.easy.retry.server.web.model.response; import lombok.Data; diff --git a/x-retry-server/src/main/resources/admin/assets/background.6f870c8d.svg b/easy-retry-server/src/main/resources/admin/assets/background.6f870c8d.svg similarity index 100% rename from x-retry-server/src/main/resources/admin/assets/background.6f870c8d.svg rename to easy-retry-server/src/main/resources/admin/assets/background.6f870c8d.svg diff --git a/x-retry-server/src/main/resources/admin/avatar2.jpg b/easy-retry-server/src/main/resources/admin/avatar2.jpg similarity index 100% rename from x-retry-server/src/main/resources/admin/avatar2.jpg rename to easy-retry-server/src/main/resources/admin/avatar2.jpg diff --git a/x-retry-server/src/main/resources/admin/css/app.4f30d882.css b/easy-retry-server/src/main/resources/admin/css/app.4f30d882.css similarity index 100% rename from x-retry-server/src/main/resources/admin/css/app.4f30d882.css rename to easy-retry-server/src/main/resources/admin/css/app.4f30d882.css diff --git a/x-retry-server/src/main/resources/admin/css/chunk-39be5683.cd4961ff.css b/easy-retry-server/src/main/resources/admin/css/chunk-39be5683.cd4961ff.css similarity index 100% rename from x-retry-server/src/main/resources/admin/css/chunk-39be5683.cd4961ff.css rename to easy-retry-server/src/main/resources/admin/css/chunk-39be5683.cd4961ff.css diff --git a/x-retry-server/src/main/resources/admin/css/chunk-4a2f6b49.a04e8eb5.css b/easy-retry-server/src/main/resources/admin/css/chunk-4a2f6b49.a04e8eb5.css similarity index 100% rename from x-retry-server/src/main/resources/admin/css/chunk-4a2f6b49.a04e8eb5.css rename to easy-retry-server/src/main/resources/admin/css/chunk-4a2f6b49.a04e8eb5.css diff --git a/x-retry-server/src/main/resources/admin/css/chunk-77aaac2a.99cbbcce.css b/easy-retry-server/src/main/resources/admin/css/chunk-77aaac2a.99cbbcce.css similarity index 100% rename from x-retry-server/src/main/resources/admin/css/chunk-77aaac2a.99cbbcce.css rename to easy-retry-server/src/main/resources/admin/css/chunk-77aaac2a.99cbbcce.css diff --git a/x-retry-server/src/main/resources/admin/css/chunk-vendors.f716a607.css b/easy-retry-server/src/main/resources/admin/css/chunk-vendors.f716a607.css similarity index 100% rename from x-retry-server/src/main/resources/admin/css/chunk-vendors.f716a607.css rename to easy-retry-server/src/main/resources/admin/css/chunk-vendors.f716a607.css diff --git a/x-retry-server/src/main/resources/admin/css/user.6ccd4506.css b/easy-retry-server/src/main/resources/admin/css/user.6ccd4506.css similarity index 100% rename from x-retry-server/src/main/resources/admin/css/user.6ccd4506.css rename to easy-retry-server/src/main/resources/admin/css/user.6ccd4506.css diff --git a/easy-retry-server/src/main/resources/admin/index.html b/easy-retry-server/src/main/resources/admin/index.html new file mode 100644 index 000000000..0e47441a3 --- /dev/null +++ b/easy-retry-server/src/main/resources/admin/index.html @@ -0,0 +1 @@ +easy-retry

easy-retry

easy-retry
\ No newline at end of file diff --git a/x-retry-server/src/main/resources/admin/js/app.3cd5ed5d.js b/easy-retry-server/src/main/resources/admin/js/app.3cd5ed5d.js similarity index 74% rename from x-retry-server/src/main/resources/admin/js/app.3cd5ed5d.js rename to easy-retry-server/src/main/resources/admin/js/app.3cd5ed5d.js index f46a62243..ebf8b38f8 100644 --- a/x-retry-server/src/main/resources/admin/js/app.3cd5ed5d.js +++ b/easy-retry-server/src/main/resources/admin/js/app.3cd5ed5d.js @@ -1 +1 @@ -(function(e){function t(t){for(var n,r,i=t[0],c=t[1],l=t[2],u=0,d=[];udiv[type=dialog]");i||(i=document.createElement("div"),i.setAttribute("type","dialog"),document.body.appendChild(i));var c=function(e,t){if(e instanceof Function){var a=e();a instanceof Promise?a.then((function(e){e&&t()})):a&&t()}else e||t()},l=new e({data:function(){return{visible:!0}},router:o.$router,store:o.$store,mounted:function(){var e=this;this.$on("close",(function(t){e.handleClose()}))},methods:{handleClose:function(){var e=this;c(this.$refs._component.onCancel,(function(){e.visible=!1,e.$refs._component.$emit("close"),e.$refs._component.$emit("cancel"),l.$destroy()}))},handleOk:function(){var e=this;c(this.$refs._component.onOK||this.$refs._component.onOk,(function(){e.visible=!1,e.$refs._component.$emit("close"),e.$refs._component.$emit("ok"),l.$destroy()}))}},render:function(e){var o=this,i=s&&s.model;i&&delete s.model;var c=Object.assign({},i&&{model:i}||{},{attrs:Object.assign({},Object(n["a"])({},s.attrs||s),{visible:this.visible}),on:Object.assign({},Object(n["a"])({},s.on||s),{ok:function(){o.handleOk()},cancel:function(){o.handleClose()}})}),l=a&&a.model;l&&delete a.model;var u=Object.assign({},l&&{model:l}||{},{ref:"_component",attrs:Object.assign({},Object(n["a"])({},a&&a.attrs||a)),on:Object.assign({},Object(n["a"])({},a&&a.on||a))});return e(r["a"],c,[e(t,u)])}}).$mount(i)}}Object.defineProperty(e.prototype,"$dialog",{get:function(){return function(){t.apply(this,arguments)}}})}},"29fd":function(e,t,a){"use strict";a.r(t);var n=a("5530"),r=a("4404");t["default"]=Object(n["a"])({},r["default"])},"2a47":function(e,t,a){},"31fc":function(e,t,a){"use strict";var n,r,s=a("8bbf"),o=a.n(s),i=new o.a,c=a("5530"),l=(a("b0c0"),a("7db0"),a("d3b7"),a("4de4"),a("caad"),a("2532"),a("159b"),a("d81d"),{name:"MultiTab",data:function(){return{fullPathList:[],pages:[],activeKey:"",newTabIndex:0}},created:function(){var e=this;i.$on("open",(function(t){if(!t)throw new Error("multi-tab: open tab ".concat(t," err"));e.activeKey=t})).$on("close",(function(t){t?e.closeThat(t):e.closeThat(e.activeKey)})).$on("rename",(function(t){var a=t.key,n=t.name;try{var r=e.pages.find((function(e){return e.path===a}));r.meta.customTitle=n,e.$forceUpdate()}catch(s){}})),this.pages.push(this.$route),this.fullPathList.push(this.$route.fullPath),this.selectedLastPath()},methods:{onEdit:function(e,t){this[t](e)},remove:function(e){this.pages=this.pages.filter((function(t){return t.fullPath!==e})),this.fullPathList=this.fullPathList.filter((function(t){return t!==e})),this.fullPathList.includes(this.activeKey)||this.selectedLastPath()},selectedLastPath:function(){this.activeKey=this.fullPathList[this.fullPathList.length-1]},closeThat:function(e){this.fullPathList.length>1?this.remove(e):this.$message.info("这是最后一个标签了, 无法被关闭")},closeLeft:function(e){var t=this,a=this.fullPathList.indexOf(e);a>0?this.fullPathList.forEach((function(e,n){na&&t.remove(e)})):this.$message.info("右侧没有标签")},closeAll:function(e){var t=this,a=this.fullPathList.indexOf(e);this.fullPathList.forEach((function(e,n){n!==a&&t.remove(e)}))},closeMenuClick:function(e,t){this[e](t)},renderTabPaneMenu:function(e){var t=this,a=this.$createElement;return a("a-menu",{on:Object(c["a"])({},{click:function(a){var n=a.key;a.item,a.domEvent;t.closeMenuClick(n,e)}})},[a("a-menu-item",{key:"closeThat"},["关闭当前标签"]),a("a-menu-item",{key:"closeRight"},["关闭右侧"]),a("a-menu-item",{key:"closeLeft"},["关闭左侧"]),a("a-menu-item",{key:"closeAll"},["关闭全部"])])},renderTabPane:function(e,t){var a=this.$createElement,n=this.renderTabPaneMenu(t);return a("a-dropdown",{attrs:{overlay:n,trigger:["contextmenu"]}},[a("span",{style:{userSelect:"none"}},[e])])}},watch:{$route:function(e){this.activeKey=e.fullPath,this.fullPathList.indexOf(e.fullPath)<0&&(this.fullPathList.push(e.fullPath),this.pages.push(e))},activeKey:function(e){this.$router.push({path:e})}},render:function(){var e=this,t=arguments[0],a=this.onEdit,n=this.$data.pages,r=n.map((function(a){return t("a-tab-pane",{style:{height:0},attrs:{tab:e.renderTabPane(a.meta.customTitle||a.meta.title,a.fullPath),closable:n.length>1},key:a.fullPath})}));return t("div",{class:"ant-pro-multi-tab"},[t("div",{class:"ant-pro-multi-tab-wrapper"},[t("a-tabs",{attrs:{hideAdd:!0,type:"editable-card",tabBarStyle:{background:"#FFF",margin:0,paddingLeft:"16px",paddingTop:"1px"}},on:Object(c["a"])({},{edit:a}),model:{value:e.activeKey,callback:function(t){e.activeKey=t}}},[r])])])}}),u=l,d=a("2877"),f=Object(d["a"])(u,n,r,!1,null,null,null),m=f.exports,h=(a("3489"),{open:function(e){i.$emit("open",e)},rename:function(e,t){i.$emit("rename",{key:e,name:t})},closeCurrentPage:function(){this.close()},close:function(e){i.$emit("close",e)}});m.install=function(e){e.prototype.$multiTab||(h.instance=i,e.prototype.$multiTab=h,e.component("multi-tab",m))};t["a"]=m},3489:function(e,t,a){},"3f88":function(e,t,a){},4360:function(e,t,a){"use strict";var n,r=a("8bbf"),s=a.n(r),o=a("5880"),i=a.n(o),c=a("ade3"),l=(a("d3b7"),a("8ded")),u=a.n(l),d=a("9fb0"),f=a("bf0f"),m={state:{sideCollapsed:!1,isMobile:!1,theme:"dark",layout:"",contentWidth:"",fixedHeader:!1,fixedSidebar:!1,autoHideHeader:!1,color:"",weak:!1,multiTab:!0,lang:"en-US",_antLocale:{}},mutations:(n={},Object(c["a"])(n,d["d"],(function(e,t){e.sideCollapsed=t,u.a.set(d["d"],t)})),Object(c["a"])(n,d["k"],(function(e,t){e.isMobile=t})),Object(c["a"])(n,d["m"],(function(e,t){e.theme=t,u.a.set(d["m"],t)})),Object(c["a"])(n,d["j"],(function(e,t){e.layout=t,u.a.set(d["j"],t)})),Object(c["a"])(n,d["g"],(function(e,t){e.fixedHeader=t,u.a.set(d["g"],t)})),Object(c["a"])(n,d["h"],(function(e,t){e.fixedSidebar=t,u.a.set(d["h"],t)})),Object(c["a"])(n,d["f"],(function(e,t){e.contentWidth=t,u.a.set(d["f"],t)})),Object(c["a"])(n,d["i"],(function(e,t){e.autoHideHeader=t,u.a.set(d["i"],t)})),Object(c["a"])(n,d["e"],(function(e,t){e.color=t,u.a.set(d["e"],t)})),Object(c["a"])(n,d["n"],(function(e,t){e.weak=t,u.a.set(d["n"],t)})),Object(c["a"])(n,d["b"],(function(e,t){var a=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};e.lang=t,e._antLocale=a,u.a.set(d["b"],t)})),Object(c["a"])(n,d["l"],(function(e,t){u.a.set(d["l"],t),e.multiTab=t})),n),actions:{setLang:function(e,t){var a=e.commit;return new Promise((function(e,n){a(d["b"],t),Object(f["c"])(t).then((function(){e()})).catch((function(e){n(e)}))}))}}},h=m,p=(a("b0c0"),a("d81d"),a("b775")),g={Login:"/auth/login",Logout:"/auth/logout",ForgePassword:"/auth/forge-password",Register:"/auth/register",twoStepCode:"/auth/2step-code",SendSms:"/account/sms",SendSmsErr:"/account/sms_err",UserInfo:"/user/info",UserMenu:"/user/nav"};function b(e){return Object(p["b"])({url:g.Login,method:"post",data:e})}function y(){return Object(p["b"])({url:g.UserInfo,method:"get",headers:{"Content-Type":"application/json;charset=UTF-8"}})}var v=a("ca00"),C={state:{token:"",name:"",welcome:"",avatar:"",roles:[],info:{}},mutations:{SET_TOKEN:function(e,t){e.token=t},SET_NAME:function(e,t){var a=t.name,n=t.welcome;e.name=a,e.welcome=n},SET_AVATAR:function(e,t){e.avatar=t},SET_ROLES:function(e,t){e.roles=t},SET_INFO:function(e,t){e.info=t}},actions:{Login:function(e,t){var a=e.commit;return new Promise((function(e,n){b(t).then((function(t){var n=t.data;u.a.set(d["a"],n.token,36e5),a("SET_TOKEN",n.token),e()})).catch((function(e){n(e)}))}))},GetInfo:function(e){var t=e.commit;return new Promise((function(e,a){y().then((function(n){var r=n.data;if(r["role"]={permissions:Object(v["a"])(r.role)},r.role&&r.role.permissions.length>0){var s=r.role;s.permissions=r.role.permissions,s.permissions.map((function(e){if(null!=e.actionEntitySet&&e.actionEntitySet.length>0){var t=e.actionEntitySet.map((function(e){return e.action}));e.actionList=t}})),s.permissionList=s.permissions.map((function(e){return e.permissionId})),t("SET_ROLES",r.role),t("SET_INFO",r)}else a(new Error("getInfo: roles must be a non-null array !"));t("SET_NAME",{name:r.username,welcome:Object(v["c"])()}),e(n)})).catch((function(e){a(e)}))}))},Logout:function(e){var t=e.commit;e.state;return new Promise((function(e){t("SET_TOKEN",""),t("SET_ROLES",[]),u.a.remove(d["a"]),e()}))}}},k=C,w=(a("caad"),a("2532"),a("4de4"),a("99af"),a("d73b")),N=a("cd3f"),S=a.n(N);function z(e,t){if(t.meta&&t.meta.permission){for(var a=!1,n=0,r=e.length;ndiv[type=loading]");a||(a=document.createElement("div"),a.setAttribute("type","loading"),a.setAttribute("class","ant-loading-wrapper"),document.body.appendChild(a));var n=Object.assign({visible:!1,size:"large",tip:"Loading..."},t),r=new e({data:function(){return Object(ze["a"])({},n)},render:function(){var e=arguments[0],t=this.tip,a={};return this.tip&&(a.tip=t),this.visible?e(je,{props:Object(ze["a"])({},a)}):null}}).$mount(a);function s(e){var t=Object(ze["a"])(Object(ze["a"])({},n),e),a=t.visible,s=t.size,o=t.tip;r.$set(r,"visible",a),o&&r.$set(r,"tip",o),s&&r.$set(r,"size",s)}return{instance:r,update:s}}},xe={show:function(e){this.instance.update(Object(ze["a"])(Object(ze["a"])({},e),{},{visible:!0}))},hide:function(){this.instance.update({visible:!1})}},Oe=function(e,t){e.prototype.$loading||(xe.instance=Le.newInstance(e,t),e.prototype.$loading=xe)},Te={version:Pe,install:Oe},Me=a("3835"),_e={add:{key:"add",label:"新增"},delete:{key:"delete",label:"删除"},edit:{key:"edit",label:"修改"},query:{key:"query",label:"查询"},get:{key:"get",label:"详情"},enable:{key:"enable",label:"启用"},disable:{key:"disable",label:"禁用"},import:{key:"import",label:"导入"},export:{key:"export",label:"导出"}};function Ae(e){Ae.installed||(!e.prototype.$auth&&Object.defineProperties(e.prototype,{$auth:{get:function(){var e=this;return function(t){var a=t.split("."),n=Object(Me["a"])(a,2),r=n[0],s=n[1],o=e.$store.getters.roles.permissions,i=o.find((function(e){return e.permissionId===r})).actionList;return!i||i.findIndex((function(e){return e===s}))>-1}}}}),!e.prototype.$enum&&Object.defineProperties(e.prototype,{$enum:{get:function(){return function(e){var t=_e;return e&&e.split(".").forEach((function(e){t=t&&t[e]||null})),t}}}}))}var Fe=Ae;r.a.directive("action",{inserted:function(e,t,a){var n=t.arg,r=k["a"].getters.roles,s=a.context.$route.meta.permission,o=s instanceof String&&[s]||s;r.permissions.forEach((function(t){o.includes(t.permissionId)&&t.actionList&&!t.actionList.includes(n)&&(e.parentNode&&e.parentNode.removeChild(e)||(e.style.display="none"))}))}});r.a.use(ve["a"]),r.a.use(ye["a"]),r.a.use(be["a"]),r.a.use(ge["a"]),r.a.use(pe["a"]),r.a.use(he["a"]),r.a.use(me["a"]),r.a.use(fe["a"]),r.a.use(de["b"]),r.a.use(ue["a"]),r.a.use(le["a"]),r.a.use(ce["a"]),r.a.use(ie["a"]),r.a.use(oe["a"]),r.a.use(se["a"]),r.a.use(re["a"]),r.a.use(ne["a"]),r.a.use(ae["a"]),r.a.use(te["a"]),r.a.use(ee["a"]),r.a.use(J["b"]),r.a.use(Z["a"]),r.a.use(X["a"]),r.a.use(Q["a"]),r.a.use(Y["a"]),r.a.use(K["a"]),r.a.use(H["a"]),r.a.use(G["a"]),r.a.use(W["a"]),r.a.use(V["a"]),r.a.use(q["a"]),r.a.use(B["a"]),r.a.use(D["a"]),r.a.use(I["a"]),r.a.use(U["a"]),r.a.use(R["a"]),r.a.use($["a"]),r.a.use(E["b"]),r.a.use(F["a"]),r.a.use(A["a"]),r.a.use(_["a"]),r.a.use(M["a"]),r.a.prototype.$confirm=oe["a"].confirm,r.a.prototype.$message=T["a"],r.a.prototype.$notification=O["a"],r.a.prototype.$info=oe["a"].info,r.a.prototype.$success=oe["a"].success,r.a.prototype.$error=oe["a"].error,r.a.prototype.$warning=oe["a"].warning,r.a.use(Ce["a"]),r.a.use(Ne["a"]),r.a.use(Se["a"]),r.a.use(Te),r.a.use(Fe),r.a.use(we.a);var Ee=a("323e"),$e=a.n(Ee);a("fddb");$e.a.configure({showSpinner:!1});var Re=["login","register","registerResult"],Ue="/user/login",Ie="/dashboard/workplace";C.beforeEach((function(e,t,a){$e.a.start(),e.meta&&"undefined"!==typeof e.meta.title&&c("".concat(Object(u["b"])(e.meta.title)," - ").concat(l)),j.a.get(P["a"])?e.path===Ue?(a({path:Ie}),$e.a.done()):0===k["a"].getters.roles.length?k["a"].dispatch("GetInfo").then((function(n){var r=n.data&&n.data.role;k["a"].dispatch("GenerateRoutes",{roles:r}).then((function(){k["a"].getters.addRouters.forEach((function(e){C.addRoute(e)}));var n=decodeURIComponent(t.query.redirect||e.path);e.path===n?a(Object(ze["a"])(Object(ze["a"])({},e),{},{replace:!0})):a({path:n})}))})).catch((function(){k["a"].dispatch("Logout").then((function(){a({path:Ue,query:{redirect:e.fullPath}})}))})):a():Re.includes(e.name)?a():(a({path:Ue,query:{redirect:e.fullPath}}),$e.a.done())})),C.afterEach((function(){$e.a.done()}));var De=a("c1df"),Be=a.n(De);a("5c3a");Be.a.locale("zh-cn"),r.a.filter("NumberFormat",(function(e){if(!e)return"0";var t=e.toString().replace(/(\d)(?=(?:\d{3})+$)/g,"$1,");return t})),r.a.filter("dayjs",(function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"YYYY-MM-DD HH:mm:ss";return Be()(e).format(t)})),r.a.filter("moment",(function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"YYYY-MM-DD HH:mm:ss";return Be()(e).format(t)}));a("861f");r.a.config.productionTip=!1,r.a.use(w["a"]),r.a.component("pro-layout",N["d"]),r.a.component("page-container",N["b"]),r.a.component("page-header-wrapper",N["b"]),window.umi_plugin_ant_themeVar=S.theme,new r.a({router:C,store:k["a"],i18n:u["a"],created:x,render:function(e){return e(p)}}).$mount("#app")},5880:function(e,t){e.exports=Vuex},"611e":function(e,t,a){"use strict";a("8151")},6389:function(e,t){e.exports=VueRouter},"69c3":function(e,t,a){"use strict";a.r(t),t["default"]={"result.fail.error.title":"Submission Failed","result.fail.error.description":"Please check and modify the following information before resubmitting.","result.fail.error.hint-title":"The content you submitted has the following error:","result.fail.error.hint-text1":"Your account has been frozen","result.fail.error.hint-btn1":"Thaw immediately","result.fail.error.hint-text2":"Your account is not yet eligible to apply","result.fail.error.hint-btn2":"Upgrade immediately","result.fail.error.btn-text":"Return to modify"}},"6e2f":function(e,t,a){"use strict";a.r(t),t["default"]={submit:"Submit",save:"Save","submit.ok":"Submit successfully","save.ok":"Saved successfully"}},"743d":function(e,t,a){"use strict";a.r(t);var n=a("5530"),r=a("8b45"),s=a("0ff2"),o=a.n(s),i=a("6e2f"),c=a("771d"),l=a("5030"),u=a("928e"),d=a("dea1"),f=a("ffb6"),m=a("78a1"),h=a("29fd"),p={antLocale:r["a"],momentName:"eu",momentLocale:o.a};t["default"]=Object(n["a"])(Object(n["a"])(Object(n["a"])(Object(n["a"])(Object(n["a"])(Object(n["a"])(Object(n["a"])(Object(n["a"])(Object(n["a"])({message:"-","layouts.usermenu.dialog.title":"Message","layouts.usermenu.dialog.content":"Are you sure you would like to logout?","layouts.userLayout.title":"Easy to use distributed exception retry service platform"},p),i["default"]),c["default"]),l["default"]),u["default"]),d["default"]),f["default"]),m["default"]),h["default"])},"771d":function(e,t,a){"use strict";a.r(t),t["default"]={"menu.welcome":"Welcome","menu.home":"Home","menu.dashboard":"Dashboard","menu.dashboard.analysis":"Analysis","menu.dashboard.monitor":"Monitor","menu.dashboard.workplace":"Workplace","menu.form":"Form","menu.form.basic-form":"Basic Form","menu.form.step-form":"Step Form","menu.form.step-form.info":"Step Form(write transfer information)","menu.form.step-form.confirm":"Step Form(confirm transfer information)","menu.form.step-form.result":"Step Form(finished)","menu.form.advanced-form":"Advanced Form","menu.list":"List","menu.list.table-list":"Search Table","menu.list.basic-list":"Basic List","menu.list.card-list":"Card List","menu.list.search-list":"Search List","menu.list.search-list.articles":"Search List(articles)","menu.list.search-list.projects":"Search List(projects)","menu.list.search-list.applications":"Search List(applications)","menu.profile":"Profile","menu.profile.basic":"Basic Profile","menu.profile.advanced":"Advanced Profile","menu.result":"Result","menu.result.success":"Success","menu.result.fail":"Fail","menu.exception":"Exception","menu.exception.not-permission":"403","menu.exception.not-find":"404","menu.exception.server-error":"500","menu.exception.trigger":"Trigger","menu.account":"Account","menu.account.center":"Account Center","menu.account.settings":"Account Settings","menu.account.trigger":"Trigger Error","menu.account.logout":"Logout"}},"78a1":function(e,t,a){"use strict";a.r(t);var n=a("5530"),r=a("44e5"),s=a("69c3");t["default"]=Object(n["a"])(Object(n["a"])({},r["default"]),s["default"])},8151:function(e,t,a){},"861f":function(e,t,a){},"8bbf":function(e,t){e.exports=Vue},"8eeb4":function(e,t,a){var n=a("b2b7");e.exports={__esModule:!0,default:n.svgComponent({tag:"svg",attrsMap:{viewBox:"0 0 128 128",version:"1.1",xmlns:"http://www.w3.org/2000/svg","xmlns:xlink":"http://www.w3.org/1999/xlink"},children:[{tag:"title",children:[{text:"Vue"}]},{tag:"desc",children:[{text:"Created with Sketch."}]},{tag:"defs",children:[{tag:"linearGradient",attrsMap:{x1:"69.644116%",y1:"0%",x2:"69.644116%",y2:"100%",id:"linearGradient-1"},children:[{tag:"stop",attrsMap:{"stop-color":"#29CDFF",offset:"0%"}},{tag:"stop",attrsMap:{"stop-color":"#148EFF",offset:"37.8600687%"}},{tag:"stop",attrsMap:{"stop-color":"#0A60FF",offset:"100%"}}]},{tag:"linearGradient",attrsMap:{x1:"-19.8191553%",y1:"-36.7931464%",x2:"138.57919%",y2:"157.637507%",id:"linearGradient-2"},children:[{tag:"stop",attrsMap:{"stop-color":"#29CDFF",offset:"0%"}},{tag:"stop",attrsMap:{"stop-color":"#0F78FF",offset:"100%"}}]},{tag:"linearGradient",attrsMap:{x1:"68.1279872%",y1:"-35.6905737%",x2:"30.4400914%",y2:"114.942679%",id:"linearGradient-3"},children:[{tag:"stop",attrsMap:{"stop-color":"#FA8E7D",offset:"0%"}},{tag:"stop",attrsMap:{"stop-color":"#F74A5C",offset:"51.2635191%"}},{tag:"stop",attrsMap:{"stop-color":"#F51D2C",offset:"100%"}}]}]},{tag:"g",attrsMap:{id:"Vue",stroke:"none","stroke-width":"1",fill:"none","fill-rule":"evenodd"},children:[{tag:"g",attrsMap:{id:"Group",transform:"translate(19.000000, 9.000000)"},children:[{tag:"path",attrsMap:{d:"M89.96,90.48 C78.58,93.48 68.33,83.36 67.62,82.48 L46.6604487,62.2292258 C45.5023849,61.1103236 44.8426845,59.5728835 44.8296987,57.9626396 L44.5035564,17.5209948 C44.4948861,16.4458744 44.0537714,15.4195095 43.2796864,14.6733517 L29.6459999,1.53153737 C28.055475,-0.00160504005 25.5232423,0.0449126588 23.9900999,1.63543756 C23.2715121,2.38092066 22.87,3.37600834 22.87,4.41143746 L22.87,64.3864751 C22.87,67.0807891 23.9572233,69.6611067 25.885409,71.5429748 L63.6004615,108.352061 C65.9466323,110.641873 69.6963584,110.624605 72.0213403,108.313281",id:"Path-Copy",fill:"url(#linearGradient-1)","fill-rule":"nonzero",transform:"translate(56.415000, 54.831157) scale(-1, 1) translate(-56.415000, -54.831157) "}},{tag:"path",attrsMap:{d:"M68,90.1163122 C56.62,93.1163122 45.46,83.36 44.75,82.48 L23.7904487,62.2292258 C22.6323849,61.1103236 21.9726845,59.5728835 21.9596987,57.9626396 L21.6335564,17.5209948 C21.6248861,16.4458744 21.1837714,15.4195095 20.4096864,14.6733517 L6.7759999,1.53153737 C5.185475,-0.00160504005 2.65324232,0.0449126588 1.12009991,1.63543756 C0.401512125,2.38092066 3.90211878e-13,3.37600834 3.90798505e-13,4.41143746 L3.94351218e-13,64.3864751 C3.94681177e-13,67.0807891 1.08722326,69.6611067 3.01540903,71.5429748 L40.7807092,108.401101 C43.1069304,110.671444 46.8180151,110.676525 49.1504445,108.412561",id:"Path",fill:"url(#linearGradient-2)","fill-rule":"nonzero"}},{tag:"path",attrsMap:{d:"M43.2983488,19.0991931 L27.5566079,3.88246244 C26.7624281,3.11476967 26.7409561,1.84862177 27.5086488,1.05444194 C27.8854826,0.664606611 28.4044438,0.444472651 28.9466386,0.444472651 L60.3925021,0.444472651 C61.4970716,0.444472651 62.3925021,1.33990315 62.3925021,2.44447265 C62.3925021,2.9858375 62.1730396,3.50407742 61.7842512,3.88079942 L46.0801285,19.0975301 C45.3051579,19.8484488 44.0742167,19.8491847 43.2983488,19.0991931 Z",id:"Path",fill:"url(#linearGradient-3)"}}]}]}]})}},"928e":function(e,t,a){"use strict";a.r(t),t["default"]={"user.login.userName":"userName","user.login.password":"password","user.login.username.placeholder":"Please enter the username","user.login.password.placeholder":"Please enter the password","user.login.message-invalid-credentials":"Invalid username or password","user.login.message-invalid-verification-code":"Invalid verification code","user.login.tab-login-credentials":"Credentials","user.login.tab-login-mobile":"Mobile number","user.login.mobile.placeholder":"Mobile number","user.login.mobile.verification-code.placeholder":"Verification code","user.login.remember-me":"Remember me","user.login.forgot-password":"Forgot your password?","user.login.sign-in-with":"Sign in with","user.login.signup":"Sign up","user.login.login":"Login","user.register.register":"Register","user.register.email.placeholder":"Email","user.register.password.placeholder":"Password ","user.register.password.popover-message":"Please enter at least 6 characters. Please do not use passwords that are easy to guess. ","user.register.confirm-password.placeholder":"Confirm password","user.register.get-verification-code":"Get code","user.register.sign-in":"Already have an account?","user.register-result.msg":"Account：registered at {email}","user.register-result.activation-email":"The activation email has been sent to your email address and is valid for 24 hours. Please log in to the email in time and click on the link in the email to activate the account.","user.register-result.back-home":"Back to home","user.register-result.view-mailbox":"View mailbox","user.email.required":"Please enter your email!","user.email.wrong-format":"The email address is in the wrong format!","user.userName.required":"Please enter account name or email address","user.password.required":"Please enter your password!","user.password.twice.msg":"The passwords entered twice do not match!","user.password.strength.msg":"The password is not strong enough","user.password.strength.strong":"Strength: strong","user.password.strength.medium":"Strength: medium","user.password.strength.low":"Strength: low","user.password.strength.short":"Strength: too short","user.confirm-password.required":"Please confirm your password!","user.phone-number.required":"Please enter your phone number!","user.phone-number.wrong-format":"Please enter a valid phone number","user.verification-code.required":"Please enter the verification code!"}},"9fb0":function(e,t,a){"use strict";a.d(t,"a",(function(){return n})),a.d(t,"d",(function(){return r})),a.d(t,"k",(function(){return s})),a.d(t,"m",(function(){return o})),a.d(t,"j",(function(){return i})),a.d(t,"g",(function(){return c})),a.d(t,"h",(function(){return l})),a.d(t,"f",(function(){return u})),a.d(t,"i",(function(){return d})),a.d(t,"e",(function(){return f})),a.d(t,"n",(function(){return m})),a.d(t,"l",(function(){return h})),a.d(t,"b",(function(){return p})),a.d(t,"c",(function(){return g}));var n="Access-Token",r="sidebar_type",s="is_mobile",o="nav_theme",i="layout",c="fixed_header",l="fixed_sidebar",u="content_width",d="auto_hide_header",f="color",m="weak",h="multi_tab",p="app_language",g={Fluid:"Fluid",Fixed:"Fixed"}},b775:function(e,t,a){"use strict";a.d(t,"a",(function(){return m}));a("d3b7");var n=a("cebe"),r=a.n(n),s=a("4360"),o=a("8ded"),i=a.n(o),c=a("56cd"),l={vm:{},install:function(e,t){this.installed||(this.installed=!0,t&&(e.axios=t,Object.defineProperties(e.prototype,{axios:{get:function(){return t}},$http:{get:function(){return t}}})))}},u=a("9fb0"),d=r.a.create({baseURL:"",timeout:6e3}),f=function(e){if(e.response){var t=e.response.data,a=i.a.get(u["a"]);403===e.response.status&&c["a"].error({message:"Forbidden",description:t.message}),401!==e.response.status||t.result&&t.result.isLogin||(c["a"].error({message:"Unauthorized",description:"Authorization verification failed"}),a&&s["a"].dispatch("Logout").then((function(){setTimeout((function(){window.location.reload()}),1500)})))}return Promise.reject(e)};d.interceptors.request.use((function(e){var t=i.a.get(u["a"]);return t&&(e.headers["X-RETRY-AUTH"]=t),e}),f),d.interceptors.response.use((function(e){var t=e.data,a=t.status,n=t.message;return 0===a?(c["a"].error({message:n||"Error",duration:3}),Promise.reject(new Error(n||"Error"))):e.data}),f);var m={vm:{},install:function(e){e.use(l,d)}};t["b"]=d},b781:function(e,t,a){"use strict";a.r(t),t["default"]={"dashboard.analysis.test":"Gongzhuan No.{no} shop","dashboard.analysis.introduce":"Introduce","dashboard.analysis.total-sales":"Total Sales","dashboard.analysis.day-sales":"Daily Sales","dashboard.analysis.visits":"Visits","dashboard.analysis.visits-trend":"Visits Trend","dashboard.analysis.visits-ranking":"Visits Ranking","dashboard.analysis.day-visits":"Daily Visits","dashboard.analysis.week":"WoW Change","dashboard.analysis.day":"DoD Change","dashboard.analysis.payments":"Payments","dashboard.analysis.conversion-rate":"Conversion Rate","dashboard.analysis.operational-effect":"Operational Effect","dashboard.analysis.sales-trend":"Stores Sales Trend","dashboard.analysis.sales-ranking":"Sales Ranking","dashboard.analysis.all-year":"All Year","dashboard.analysis.all-month":"All Month","dashboard.analysis.all-week":"All Week","dashboard.analysis.all-day":"All day","dashboard.analysis.search-users":"Search Users","dashboard.analysis.per-capita-search":"Per Capita Search","dashboard.analysis.online-top-search":"Online Top Search","dashboard.analysis.the-proportion-of-sales":"The Proportion Of Sales","dashboard.analysis.dropdown-option-one":"Operation one","dashboard.analysis.dropdown-option-two":"Operation two","dashboard.analysis.channel.all":"ALL","dashboard.analysis.channel.online":"Online","dashboard.analysis.channel.stores":"Stores","dashboard.analysis.sales":"Sales","dashboard.analysis.traffic":"Traffic","dashboard.analysis.table.rank":"Rank","dashboard.analysis.table.search-keyword":"Keyword","dashboard.analysis.table.users":"Users","dashboard.analysis.table.weekly-range":"Weekly Range"}},bf0f:function(e,t,a){"use strict";a.d(t,"c",(function(){return b})),a.d(t,"b",(function(){return y}));var n=a("5530"),r=(a("d3b7"),a("caad"),a("3ca3"),a("ddb0"),a("8bbf")),s=a.n(r),o=a("a925"),i=a("8ded"),c=a.n(i),l=a("c1df"),u=a.n(l),d=a("743d");s.a.use(o["a"]);var f="en-US",m={"en-US":Object(n["a"])({},d["default"])},h=new o["a"]({silentTranslationWarn:!0,locale:f,fallbackLocale:f,messages:m}),p=[f];function g(e){return h.locale=e,document.querySelector("html").setAttribute("lang",e),e}function b(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:f;return new Promise((function(t){return c.a.set("lang",e),h.locale!==e?p.includes(e)?t(g(e)):a("4aa4")("./".concat(e)).then((function(t){var a=t.default;return h.setLocaleMessage(e,a),p.push(e),u.a.updateLocale(a.momentName,a.momentLocale),g(e)})):t(e)}))}function y(e){return h.t("".concat(e))}t["a"]=h},ca00:function(e,t,a){"use strict";a.d(t,"b",(function(){return n})),a.d(t,"c",(function(){return r})),a.d(t,"a",(function(){return s}));a("ac1f");function n(){var e=new Date,t=e.getHours();return t<9?"早上好":t<=11?"上午好":t<=13?"中午好":t<20?"下午好":"晚上好"}function r(){var e=["休息一会儿吧","准备吃什么呢?","要不要打一把 DOTA","我猜你可能累了"],t=Math.floor(Math.random()*e.length);return e[t]}function s(e){var t={1:[{roleId:1,permissionId:"group",permissionName:"组配置",actionEntitySet:[]},{roleId:1,permissionId:"dashboard",permissionName:"看板"},{roleId:1,permissionId:"retryTask",permissionName:"任务管理"},{roleId:1,permissionId:"retryDeadLetter",permissionName:"死信队列管理"},{roleId:1,permissionId:"retryLog",permissionName:"重试日志管理"},{roleId:1,permissionId:"basicConfig",permissionName:"基础信息配置"}],2:[{roleId:2,permissionId:"group",permissionName:"组配置",actionEntitySet:[{action:"add",describe:"新增",defaultCheck:!1}]},{roleId:2,permissionId:"user",permissionName:"用户"},{roleId:2,permissionId:"userForm",permissionName:"新增或更新用户"},{roleId:2,permissionId:"dashboard",permissionName:"看板"},{roleId:2,permissionId:"retryTask",permissionName:"任务管理"},{roleId:2,permissionId:"retryDeadLetter",permissionName:"死信队列管理"},{roleId:2,permissionId:"retryLog",permissionName:"重试日志管理"},{roleId:2,permissionId:"basicConfig",permissionName:"基础信息配置"}]};return t[e]}},cebe:function(e,t){e.exports=axios},d73b:function(e,t,a){"use strict";a.d(t,"a",(function(){return je})),a.d(t,"b",(function(){return Pe}));a("d3b7"),a("3ca3"),a("ddb0");var n,r,s,o,i=function(){var e=this,t=e._self._c;return t("div",{class:["user-layout-wrapper",e.isMobile&&"mobile"],attrs:{id:"userLayout"}},[t("div",{staticClass:"container"},[t("div",{staticClass:"user-layout-lang"},[t("select-lang",{staticClass:"select-lang-trigger"})],1),t("div",{staticClass:"user-layout-content"},[t("div",{staticClass:"top"},[e._m(0),t("div",{staticClass:"desc"},[e._v(" "+e._s(e.$t("layouts.userLayout.title"))+" ")])]),t("router-view"),e._m(1)],1)])])},c=[function(){var e=this,t=e._self._c;return t("div",{staticClass:"header"},[t("a",{attrs:{href:"/"}},[t("span",{staticClass:"title"},[e._v("X-RETRY")])])])},function(){var e=this,t=e._self._c;return t("div",{staticClass:"footer"},[t("div",{staticClass:"links"},[t("a",{attrs:{href:"_self"}},[e._v("帮助")]),t("a",{attrs:{href:"_self"}},[e._v("隐私")]),t("a",{attrs:{href:"_self"}},[e._v("条款")])]),t("div",{staticClass:"copyright"},[e._v(" Copyright © 2018 vueComponent ")])])}],l=a("5530"),u=a("5880"),d={computed:Object(l["a"])({},Object(u["mapState"])({isMobile:function(e){return e.app.isMobile}}))},f=(a("9d5c"),a("a600")),m=(a("8fb1"),a("0c63")),h=(a("fbd8"),a("55f1")),p=(a("d81d"),a("2a47"),a("bf0f")),g={computed:Object(l["a"])({},Object(u["mapState"])({currentLang:function(e){return e.app.lang}})),methods:{setLang:function(e){this.$store.dispatch("setLang",e)}}},b=g,y=["zh-CN","zh-TW","en-US","pt-BR"],v={"zh-CN":"简体中文","zh-TW":"繁体中文","en-US":"English","pt-BR":"Português"},C={"zh-CN":"🇨🇳","zh-TW":"🇭🇰","en-US":"🇺🇸","pt-BR":"🇧🇷"},k={props:{prefixCls:{type:String,default:"ant-pro-drop-down"}},name:"SelectLang",mixins:[b],render:function(){var e=this,t=arguments[0],a=this.prefixCls,n=function(t){var a=t.key;e.setLang(a)},r=t(h["a"],{class:["menu","ant-pro-header-menu"],attrs:{selectedKeys:[this.currentLang]},on:{click:n}},[y.map((function(e){return t(h["a"].Item,{key:e},[t("span",{attrs:{role:"img","aria-label":v[e]}},[C[e]])," ",v[e]])}))]);return t(f["a"],{attrs:{overlay:r,placement:"bottomRight"}},[t("span",{class:a},[t(m["a"],{attrs:{type:"global",title:Object(p["b"])("navBar.lang")}})])])}},w=k,N={name:"UserLayout",components:{SelectLang:w},mixins:[d],mounted:function(){document.body.classList.add("userLayout")},beforeDestroy:function(){document.body.classList.remove("userLayout")}},S=N,z=(a("611e"),a("2877")),j=Object(z["a"])(S,i,c,!1,null,"001f2100",null),P=j.exports,L=function(){var e=this,t=e._self._c;return t("div",[t("router-view")],1)},x=[],O={name:"BlankLayout"},T=O,M=Object(z["a"])(T,L,x,!1,null,"7f25f9eb",null),_=(M.exports,function(){var e=this,t=e._self._c;return t("pro-layout",e._b({attrs:{menus:e.menus,collapsed:e.collapsed,mediaQuery:e.query,isMobile:e.isMobile,handleMediaQuery:e.handleMediaQuery,handleCollapse:e.handleCollapse,i18nRender:e.i18nRender},scopedSlots:e._u([{key:"menuHeaderRender",fn:function(){return[t("div",[t("h1",[e._v(e._s(e.title))])])]},proxy:!0},{key:"headerContentRender",fn:function(){return[t("div",[t("a-tooltip",{attrs:{title:"刷新页面"}},[t("a-icon",{staticStyle:{"font-size":"18px",cursor:"pointer"},attrs:{type:"reload"},on:{click:function(){e.$router.go(0)}}})],1)],1)]},proxy:!0},{key:"rightContentRender",fn:function(){return[t("right-content",{attrs:{"top-menu":"topmenu"===e.settings.layout,"is-mobile":e.isMobile,theme:e.settings.theme}})]},proxy:!0},{key:"footerRender",fn:function(){return[t("global-footer")]},proxy:!0}])},"pro-layout",e.settings,!1),[e.isProPreviewSite&&!e.collapsed?t("ads"):e._e(),e.isDev?t("setting-drawer",{attrs:{settings:e.settings},on:{change:e.handleSettingChange}},[t("div",{staticStyle:{margin:"12px 0"}},[e._v(" This is SettingDrawer custom footer content. ")])]):e._e(),t("router-view")],1)}),A=[],F=(a("7db0"),a("c0d2")),E=a("9fb0"),$=a("e819"),R=function(){var e=this,t=e._self._c;return t("div",{class:e.wrpCls},[t("avatar-dropdown",{class:e.prefixCls,attrs:{menu:e.showMenu,"current-user":e.currentUser}}),t("select-lang",{class:e.prefixCls})],1)},U=[],I=a("ade3"),D=(a("b0c0"),function(){var e=this,t=e._self._c;return e.currentUser&&e.currentUser.name?t("a-dropdown",{attrs:{placement:"bottomRight"},scopedSlots:e._u([{key:"overlay",fn:function(){return[t("a-menu",{staticClass:"ant-pro-drop-down menu",attrs:{"selected-keys":[]}},[t("a-menu-item",{key:"logout",on:{click:e.handleLogout}},[t("a-icon",{attrs:{type:"logout"}}),e._v(" "+e._s(e.$t("menu.account.logout"))+" ")],1)],1)]},proxy:!0}],null,!1,3699420034)},[t("span",{staticClass:"ant-pro-account-avatar"},[t("a-avatar",{staticClass:"antd-pro-global-header-index-avatar",attrs:{size:"small",src:"https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png"}}),t("span",[e._v(e._s(e.currentUser.name))])],1)]):t("span",[t("a-spin",{style:{marginLeft:8,marginRight:8},attrs:{size:"small"}})],1)}),B=[],q=(a("cd17"),a("ed3b")),V={name:"AvatarDropdown",props:{currentUser:{type:Object,default:function(){return null}},menu:{type:Boolean,default:!0}},methods:{handleToCenter:function(){this.$router.push({path:"/account/center"})},handleToSettings:function(){this.$router.push({path:"/account/settings"})},handleLogout:function(e){var t=this;q["a"].confirm({title:this.$t("layouts.usermenu.dialog.title"),content:this.$t("layouts.usermenu.dialog.content"),onOk:function(){return t.$store.dispatch("Logout").then((function(){t.$router.push({name:"login"})}))},onCancel:function(){}})}}},W=V,G=(a("f4ba"),Object(z["a"])(W,D,B,!1,null,"fd4de960",null)),H=G.exports,K={name:"RightContent",components:{AvatarDropdown:H,SelectLang:w},props:{prefixCls:{type:String,default:"ant-pro-global-header-index-action"},isMobile:{type:Boolean,default:function(){return!1}},topMenu:{type:Boolean,required:!0},theme:{type:String,required:!0}},data:function(){return{showMenu:!0,currentUser:{}}},computed:{wrpCls:function(){return Object(I["a"])({"ant-pro-global-header-index-right":!0},"ant-pro-global-header-index-".concat(this.isMobile||!this.topMenu?"light":this.theme),!0)}},mounted:function(){var e=this;setTimeout((function(){e.currentUser={name:e.$store.getters.nickname}}),1500)}},Y=K,Q=Object(z["a"])(Y,R,U,!1,null,null,null),X=Q.exports,Z=function(){var e=this,t=e._self._c;return t("global-footer",{staticClass:"footer custom-render",scopedSlots:e._u([{key:"links",fn:function(){return[t("a",{attrs:{href:"https://www.github.com/vueComponent/pro-layout",target:"_blank"}},[e._v("Pro Layout")]),t("a",{attrs:{href:"https://www.github.com/vueComponent/ant-design-vue-pro",target:"_blank"}},[e._v("Github")]),t("a",{attrs:{href:"https://www.github.com/sendya/",target:"_blank"}},[e._v("@Sendya")])]},proxy:!0},{key:"copyright",fn:function(){return[t("a",{attrs:{href:"https://github.com/vueComponent",target:"_blank"}},[e._v("vueComponent")])]},proxy:!0}])})},J=[],ee={name:"ProGlobalFooter",components:{GlobalFooter:F["a"]}},te=ee,ae=Object(z["a"])(te,Z,J,!1,null,null,null),ne=ae.exports,re="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js",se={props:{isMobile:Boolean},mounted:function(){},methods:{load:function(){if(re){var e=document.createElement("script");e.id="_adsbygoogle_js",e.src=re,this.$el.appendChild(e),setTimeout((function(){(window.adsbygoogle||[]).push({})}),2e3)}}},render:function(){var e=arguments[0];return e("div",{class:"business-pro-ad"},[e("a",{attrs:{href:"https://store.antdv.com/pro/",target:"_blank"}},["(推荐) 企业级商用版 Admin Pro 现已发售，采用 Vue3 + TS 欢迎购买。"])])}},oe=se,ie=(a("13cf"),Object(z["a"])(oe,n,r,!1,null,"4109f67d",null)),ce=ie.exports,le=a("8eeb4"),ue=a.n(le),de={name:"BasicLayout",components:{SettingDrawer:F["c"],RightContent:X,GlobalFooter:ne,LogoSvg:ue.a,Ads:ce},data:function(){return{isProPreviewSite:!1,isDev:!1,menus:[],collapsed:!1,title:$["a"].title,settings:{layout:$["a"].layout,contentWidth:"sidemenu"===$["a"].layout?E["c"].Fluid:$["a"].contentWidth,theme:$["a"].navTheme,primaryColor:$["a"].primaryColor,fixedHeader:$["a"].fixedHeader,fixSiderbar:$["a"].fixSiderbar,colorWeak:$["a"].colorWeak,hideHintAlert:!1,hideCopyButton:!1},query:{},isMobile:!1}},computed:Object(l["a"])({},Object(u["mapState"])({mainMenu:function(e){return e.permission.addRouters}})),created:function(){var e=this,t=this.mainMenu.find((function(e){return"/"===e.path}));this.menus=t&&t.children||[],this.$watch("collapsed",(function(){e.$store.commit(E["d"],e.collapsed)})),this.$watch("isMobile",(function(){e.$store.commit(E["k"],e.isMobile)}))},mounted:function(){var e=this,t=navigator.userAgent;t.indexOf("Edge")>-1&&this.$nextTick((function(){e.collapsed=!e.collapsed,setTimeout((function(){e.collapsed=!e.collapsed}),16)}))},methods:{i18nRender:p["b"],handleMediaQuery:function(e){this.query=e,!this.isMobile||e["screen-xs"]?!this.isMobile&&e["screen-xs"]&&(this.isMobile=!0,this.collapsed=!1,this.settings.contentWidth=E["c"].Fluid):this.isMobile=!1},handleCollapse:function(e){this.collapsed=e},handleSettingChange:function(e){var t=e.type,a=e.value;switch(t&&(this.settings[t]=a),t){case"contentWidth":this.settings[t]=a;break;case"layout":"sidemenu"===a?this.settings.contentWidth=E["c"].Fluid:(this.settings.fixSiderbar=!1,this.settings.contentWidth=E["c"].Fixed);break}}}},fe=de,me=(a("e1b1"),Object(z["a"])(fe,_,A,!1,null,null,null)),he=me.exports,pe={name:"RouteView",props:{keepAlive:{type:Boolean,default:!0}},data:function(){return{}},render:function(){var e=arguments[0],t=this.$route.meta,a=this.$store.getters,n=e("keep-alive",[e("router-view")]),r=e("router-view");return(a.multiTab||t.keepAlive)&&(this.keepAlive||a.multiTab||t.keepAlive)?n:r}},ge=pe,be=Object(z["a"])(ge,s,o,!1,null,null,null),ye=(be.exports,function(){var e=this,t=e._self._c;return t("page-header-wrapper",[t("router-view")],1)}),ve=[],Ce={name:"PageView"},ke=Ce,we=Object(z["a"])(ke,ye,ve,!1,null,null,null),Ne=(we.exports,a("0dbd")),Se=a.n(Ne),ze={name:"RouteView",render:function(e){return e("router-view")}},je=[{path:"/",name:"index",component:he,meta:{title:"menu.home"},redirect:"/dashboard/analysis",children:[{path:"/dashboard",name:"dashboard",redirect:"/dashboard/analysis",hideChildrenInMenu:!0,component:ze,meta:{title:"menu.dashboard",keepAlive:!0,icon:Se.a,permission:["dashboard"]},children:[{path:"/dashboard/analysis",name:"Analysis",component:function(){return Promise.all([a.e("chunk-39be5683"),a.e("chunk-77aaac2a")]).then(a.bind(null,"2f3a"))},meta:{title:"menu.dashboard.analysis",keepAlive:!0,permission:["dashboard"]}}]},{path:"/basic-config-list",name:"basicConfigList",component:function(){return Promise.all([a.e("chunk-39be5683"),a.e("chunk-2d21a08f")]).then(a.bind(null,"ba93"))},meta:{title:"组管理",icon:"profile",permission:["group"]}},{path:"/basic-config",name:"basicConfig",hidden:!0,component:function(){return Promise.all([a.e("chunk-39be5683"),a.e("chunk-4a2f6b49")]).then(a.bind(null,"e941"))},meta:{title:"基础信息配置",hidden:!0,hideChildrenInMenu:!0,icon:"profile",permission:["basicConfig"]}},{path:"/retry-task",name:"RetryTask",component:ze,hideChildrenInMenu:!0,redirect:"/retry-task/list",meta:{title:"任务管理",icon:"profile",hideChildrenInMenu:!0,keepAlive:!0,permission:["retryTask"]},children:[{path:"/retry-task/info",name:"RetryTaskInfo",component:function(){return a.e("chunk-35f6c8ac").then(a.bind(null,"99f5"))},meta:{title:"任务管理详情",icon:"profile",keepAlive:!0,permission:["retryTask"]}},{path:"/retry-task/list",name:"RetryTaskList",component:function(){return Promise.all([a.e("chunk-39be5683"),a.e("chunk-71608044")]).then(a.bind(null,"9d75"))},meta:{title:"任务管理列表",icon:"profile",keepAlive:!0,permission:["retryTask"]}}]},{path:"/retry-dead-letter",name:"RetryDeadLetter",component:ze,hideChildrenInMenu:!0,redirect:"/retry-dead-letter/list",meta:{title:"死信队列管理",icon:"profile",permission:["retryDeadLetter"]},children:[{path:"/retry-dead-letter/list",name:"RetryDeadLetterList",component:function(){return Promise.all([a.e("chunk-39be5683"),a.e("chunk-244a93b4")]).then(a.bind(null,"dafb"))},meta:{title:"死信队列管理列表",icon:"profile",permission:["retryDeadLetter"]}},{path:"/retry-dead-letter/info",name:"RetryDeadLetterInfo",component:function(){return a.e("chunk-2672acfa").then(a.bind(null,"56bb"))},meta:{title:"死信队列管理详情",icon:"profile",permission:["retryDeadLetter"]}}]},{path:"/retry-log",name:"RetryLog",component:ze,hideChildrenInMenu:!0,redirect:"/retry-log/list",meta:{title:"重试日志管理",icon:"profile",permission:["retryLog"]},children:[{path:"/retry-log/list",name:"RetryLogList",component:function(){return Promise.all([a.e("chunk-39be5683"),a.e("chunk-1bf36f2c")]).then(a.bind(null,"0564"))},meta:{title:"重试日志列表",icon:"profile",permission:["retryLog"]}},{path:"/retry-log/info",name:"RetryLogInfo",component:function(){return a.e("chunk-2515aa86").then(a.bind(null,"5fe2"))},meta:{title:"重试日志详情",icon:"profile",permission:["retryLog"]}}]},{path:"/user-list",name:"UserList",component:function(){return Promise.all([a.e("chunk-39be5683"),a.e("chunk-bf3addda")]).then(a.bind(null,"1faf"))},meta:{title:"用户管理",icon:"profile",permission:["user"]}},{path:"/user-form",name:"UserForm",hidden:!0,component:function(){return a.e("chunk-08798c7e").then(a.bind(null,"bf80"))},meta:{title:"新增或更新用户",icon:"profile",permission:["userForm"]}}]},{path:"*",redirect:"/404",hidden:!0}],Pe=[{path:"/user",component:P,redirect:"/user/login",hidden:!0,children:[{path:"login",name:"login",component:function(){return a.e("user").then(a.bind(null,"ac2a"))}},{path:"recover",name:"recover",component:void 0}]},{path:"/404",component:function(){return a.e("fail").then(a.bind(null,"cc89"))}}]},dea1:function(e,t,a){"use strict";a.r(t);var n=a("5530"),r=a("b781");t["default"]=Object(n["a"])({},r["default"])},e06b:function(e,t,a){},e1b1:function(e,t,a){"use strict";a("3f88")},e819:function(e,t,a){"use strict";t["a"]={navTheme:"dark",primaryColor:"#1890ff",layout:"topmenu",contentWidth:"Fixed",fixedHeader:!1,fixSiderbar:!1,colorWeak:!1,menu:{locale:!0},title:"X-RETRY",pwa:!1,iconfontUrl:"",production:!0}},f4ba:function(e,t,a){"use strict";a("e06b")},fddb:function(e,t,a){},ffb6:function(e,t,a){"use strict";a.r(t);var n=a("5530"),r=a("0af2");t["default"]=Object(n["a"])({},r["default"])}}); \ No newline at end of file +(function(e){function t(t){for(var n,r,i=t[0],c=t[1],l=t[2],u=0,d=[];udiv[type=dialog]");i||(i=document.createElement("div"),i.setAttribute("type","dialog"),document.body.appendChild(i));var c=function(e,t){if(e instanceof Function){var a=e();a instanceof Promise?a.then((function(e){e&&t()})):a&&t()}else e||t()},l=new e({data:function(){return{visible:!0}},router:o.$router,store:o.$store,mounted:function(){var e=this;this.$on("close",(function(t){e.handleClose()}))},methods:{handleClose:function(){var e=this;c(this.$refs._component.onCancel,(function(){e.visible=!1,e.$refs._component.$emit("close"),e.$refs._component.$emit("cancel"),l.$destroy()}))},handleOk:function(){var e=this;c(this.$refs._component.onOK||this.$refs._component.onOk,(function(){e.visible=!1,e.$refs._component.$emit("close"),e.$refs._component.$emit("ok"),l.$destroy()}))}},render:function(e){var o=this,i=s&&s.model;i&&delete s.model;var c=Object.assign({},i&&{model:i}||{},{attrs:Object.assign({},Object(n["a"])({},s.attrs||s),{visible:this.visible}),on:Object.assign({},Object(n["a"])({},s.on||s),{ok:function(){o.handleOk()},cancel:function(){o.handleClose()}})}),l=a&&a.model;l&&delete a.model;var u=Object.assign({},l&&{model:l}||{},{ref:"_component",attrs:Object.assign({},Object(n["a"])({},a&&a.attrs||a)),on:Object.assign({},Object(n["a"])({},a&&a.on||a))});return e(r["a"],c,[e(t,u)])}}).$mount(i)}}Object.defineProperty(e.prototype,"$dialog",{get:function(){return function(){t.apply(this,arguments)}}})}},"29fd":function(e,t,a){"use strict";a.r(t);var n=a("5530"),r=a("4404");t["default"]=Object(n["a"])({},r["default"])},"2a47":function(e,t,a){},"31fc":function(e,t,a){"use strict";var n,r,s=a("8bbf"),o=a.n(s),i=new o.a,c=a("5530"),l=(a("b0c0"),a("7db0"),a("d3b7"),a("4de4"),a("caad"),a("2532"),a("159b"),a("d81d"),{name:"MultiTab",data:function(){return{fullPathList:[],pages:[],activeKey:"",newTabIndex:0}},created:function(){var e=this;i.$on("open",(function(t){if(!t)throw new Error("multi-tab: open tab ".concat(t," err"));e.activeKey=t})).$on("close",(function(t){t?e.closeThat(t):e.closeThat(e.activeKey)})).$on("rename",(function(t){var a=t.key,n=t.name;try{var r=e.pages.find((function(e){return e.path===a}));r.meta.customTitle=n,e.$forceUpdate()}catch(s){}})),this.pages.push(this.$route),this.fullPathList.push(this.$route.fullPath),this.selectedLastPath()},methods:{onEdit:function(e,t){this[t](e)},remove:function(e){this.pages=this.pages.filter((function(t){return t.fullPath!==e})),this.fullPathList=this.fullPathList.filter((function(t){return t!==e})),this.fullPathList.includes(this.activeKey)||this.selectedLastPath()},selectedLastPath:function(){this.activeKey=this.fullPathList[this.fullPathList.length-1]},closeThat:function(e){this.fullPathList.length>1?this.remove(e):this.$message.info("这是最后一个标签了, 无法被关闭")},closeLeft:function(e){var t=this,a=this.fullPathList.indexOf(e);a>0?this.fullPathList.forEach((function(e,n){na&&t.remove(e)})):this.$message.info("右侧没有标签")},closeAll:function(e){var t=this,a=this.fullPathList.indexOf(e);this.fullPathList.forEach((function(e,n){n!==a&&t.remove(e)}))},closeMenuClick:function(e,t){this[e](t)},renderTabPaneMenu:function(e){var t=this,a=this.$createElement;return a("a-menu",{on:Object(c["a"])({},{click:function(a){var n=a.key;a.item,a.domEvent;t.closeMenuClick(n,e)}})},[a("a-menu-item",{key:"closeThat"},["关闭当前标签"]),a("a-menu-item",{key:"closeRight"},["关闭右侧"]),a("a-menu-item",{key:"closeLeft"},["关闭左侧"]),a("a-menu-item",{key:"closeAll"},["关闭全部"])])},renderTabPane:function(e,t){var a=this.$createElement,n=this.renderTabPaneMenu(t);return a("a-dropdown",{attrs:{overlay:n,trigger:["contextmenu"]}},[a("span",{style:{userSelect:"none"}},[e])])}},watch:{$route:function(e){this.activeKey=e.fullPath,this.fullPathList.indexOf(e.fullPath)<0&&(this.fullPathList.push(e.fullPath),this.pages.push(e))},activeKey:function(e){this.$router.push({path:e})}},render:function(){var e=this,t=arguments[0],a=this.onEdit,n=this.$data.pages,r=n.map((function(a){return t("a-tab-pane",{style:{height:0},attrs:{tab:e.renderTabPane(a.meta.customTitle||a.meta.title,a.fullPath),closable:n.length>1},key:a.fullPath})}));return t("div",{class:"ant-pro-multi-tab"},[t("div",{class:"ant-pro-multi-tab-wrapper"},[t("a-tabs",{attrs:{hideAdd:!0,type:"editable-card",tabBarStyle:{background:"#FFF",margin:0,paddingLeft:"16px",paddingTop:"1px"}},on:Object(c["a"])({},{edit:a}),model:{value:e.activeKey,callback:function(t){e.activeKey=t}}},[r])])])}}),u=l,d=a("2877"),f=Object(d["a"])(u,n,r,!1,null,null,null),m=f.exports,h=(a("3489"),{open:function(e){i.$emit("open",e)},rename:function(e,t){i.$emit("rename",{key:e,name:t})},closeCurrentPage:function(){this.close()},close:function(e){i.$emit("close",e)}});m.install=function(e){e.prototype.$multiTab||(h.instance=i,e.prototype.$multiTab=h,e.component("multi-tab",m))};t["a"]=m},3489:function(e,t,a){},"3f88":function(e,t,a){},4360:function(e,t,a){"use strict";var n,r=a("8bbf"),s=a.n(r),o=a("5880"),i=a.n(o),c=a("ade3"),l=(a("d3b7"),a("8ded")),u=a.n(l),d=a("9fb0"),f=a("bf0f"),m={state:{sideCollapsed:!1,isMobile:!1,theme:"dark",layout:"",contentWidth:"",fixedHeader:!1,fixedSidebar:!1,autoHideHeader:!1,color:"",weak:!1,multiTab:!0,lang:"en-US",_antLocale:{}},mutations:(n={},Object(c["a"])(n,d["d"],(function(e,t){e.sideCollapsed=t,u.a.set(d["d"],t)})),Object(c["a"])(n,d["k"],(function(e,t){e.isMobile=t})),Object(c["a"])(n,d["m"],(function(e,t){e.theme=t,u.a.set(d["m"],t)})),Object(c["a"])(n,d["j"],(function(e,t){e.layout=t,u.a.set(d["j"],t)})),Object(c["a"])(n,d["g"],(function(e,t){e.fixedHeader=t,u.a.set(d["g"],t)})),Object(c["a"])(n,d["h"],(function(e,t){e.fixedSidebar=t,u.a.set(d["h"],t)})),Object(c["a"])(n,d["f"],(function(e,t){e.contentWidth=t,u.a.set(d["f"],t)})),Object(c["a"])(n,d["i"],(function(e,t){e.autoHideHeader=t,u.a.set(d["i"],t)})),Object(c["a"])(n,d["e"],(function(e,t){e.color=t,u.a.set(d["e"],t)})),Object(c["a"])(n,d["n"],(function(e,t){e.weak=t,u.a.set(d["n"],t)})),Object(c["a"])(n,d["b"],(function(e,t){var a=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};e.lang=t,e._antLocale=a,u.a.set(d["b"],t)})),Object(c["a"])(n,d["l"],(function(e,t){u.a.set(d["l"],t),e.multiTab=t})),n),actions:{setLang:function(e,t){var a=e.commit;return new Promise((function(e,n){a(d["b"],t),Object(f["c"])(t).then((function(){e()})).catch((function(e){n(e)}))}))}}},h=m,p=(a("b0c0"),a("d81d"),a("b775")),g={Login:"/auth/login",Logout:"/auth/logout",ForgePassword:"/auth/forge-password",Register:"/auth/register",twoStepCode:"/auth/2step-code",SendSms:"/account/sms",SendSmsErr:"/account/sms_err",UserInfo:"/user/info",UserMenu:"/user/nav"};function b(e){return Object(p["b"])({url:g.Login,method:"post",data:e})}function y(){return Object(p["b"])({url:g.UserInfo,method:"get",headers:{"Content-Type":"application/json;charset=UTF-8"}})}var v=a("ca00"),C={state:{token:"",name:"",welcome:"",avatar:"",roles:[],info:{}},mutations:{SET_TOKEN:function(e,t){e.token=t},SET_NAME:function(e,t){var a=t.name,n=t.welcome;e.name=a,e.welcome=n},SET_AVATAR:function(e,t){e.avatar=t},SET_ROLES:function(e,t){e.roles=t},SET_INFO:function(e,t){e.info=t}},actions:{Login:function(e,t){var a=e.commit;return new Promise((function(e,n){b(t).then((function(t){var n=t.data;u.a.set(d["a"],n.token,36e5),a("SET_TOKEN",n.token),e()})).catch((function(e){n(e)}))}))},GetInfo:function(e){var t=e.commit;return new Promise((function(e,a){y().then((function(n){var r=n.data;if(r["role"]={permissions:Object(v["a"])(r.role)},r.role&&r.role.permissions.length>0){var s=r.role;s.permissions=r.role.permissions,s.permissions.map((function(e){if(null!=e.actionEntitySet&&e.actionEntitySet.length>0){var t=e.actionEntitySet.map((function(e){return e.action}));e.actionList=t}})),s.permissionList=s.permissions.map((function(e){return e.permissionId})),t("SET_ROLES",r.role),t("SET_INFO",r)}else a(new Error("getInfo: roles must be a non-null array !"));t("SET_NAME",{name:r.username,welcome:Object(v["c"])()}),e(n)})).catch((function(e){a(e)}))}))},Logout:function(e){var t=e.commit;e.state;return new Promise((function(e){t("SET_TOKEN",""),t("SET_ROLES",[]),u.a.remove(d["a"]),e()}))}}},k=C,w=(a("caad"),a("2532"),a("4de4"),a("99af"),a("d73b")),N=a("cd3f"),S=a.n(N);function z(e,t){if(t.meta&&t.meta.permission){for(var a=!1,n=0,r=e.length;ndiv[type=loading]");a||(a=document.createElement("div"),a.setAttribute("type","loading"),a.setAttribute("class","ant-loading-wrapper"),document.body.appendChild(a));var n=Object.assign({visible:!1,size:"large",tip:"Loading..."},t),r=new e({data:function(){return Object(ze["a"])({},n)},render:function(){var e=arguments[0],t=this.tip,a={};return this.tip&&(a.tip=t),this.visible?e(je,{props:Object(ze["a"])({},a)}):null}}).$mount(a);function s(e){var t=Object(ze["a"])(Object(ze["a"])({},n),e),a=t.visible,s=t.size,o=t.tip;r.$set(r,"visible",a),o&&r.$set(r,"tip",o),s&&r.$set(r,"size",s)}return{instance:r,update:s}}},xe={show:function(e){this.instance.update(Object(ze["a"])(Object(ze["a"])({},e),{},{visible:!0}))},hide:function(){this.instance.update({visible:!1})}},Oe=function(e,t){e.prototype.$loading||(xe.instance=Le.newInstance(e,t),e.prototype.$loading=xe)},Te={version:Pe,install:Oe},Me=a("3835"),_e={add:{key:"add",label:"新增"},delete:{key:"delete",label:"删除"},edit:{key:"edit",label:"修改"},query:{key:"query",label:"查询"},get:{key:"get",label:"详情"},enable:{key:"enable",label:"启用"},disable:{key:"disable",label:"禁用"},import:{key:"import",label:"导入"},export:{key:"export",label:"导出"}};function Ae(e){Ae.installed||(!e.prototype.$auth&&Object.defineProperties(e.prototype,{$auth:{get:function(){var e=this;return function(t){var a=t.split("."),n=Object(Me["a"])(a,2),r=n[0],s=n[1],o=e.$store.getters.roles.permissions,i=o.find((function(e){return e.permissionId===r})).actionList;return!i||i.findIndex((function(e){return e===s}))>-1}}}}),!e.prototype.$enum&&Object.defineProperties(e.prototype,{$enum:{get:function(){return function(e){var t=_e;return e&&e.split(".").forEach((function(e){t=t&&t[e]||null})),t}}}}))}var Fe=Ae;r.a.directive("action",{inserted:function(e,t,a){var n=t.arg,r=k["a"].getters.roles,s=a.context.$route.meta.permission,o=s instanceof String&&[s]||s;r.permissions.forEach((function(t){o.includes(t.permissionId)&&t.actionList&&!t.actionList.includes(n)&&(e.parentNode&&e.parentNode.removeChild(e)||(e.style.display="none"))}))}});r.a.use(ve["a"]),r.a.use(ye["a"]),r.a.use(be["a"]),r.a.use(ge["a"]),r.a.use(pe["a"]),r.a.use(he["a"]),r.a.use(me["a"]),r.a.use(fe["a"]),r.a.use(de["b"]),r.a.use(ue["a"]),r.a.use(le["a"]),r.a.use(ce["a"]),r.a.use(ie["a"]),r.a.use(oe["a"]),r.a.use(se["a"]),r.a.use(re["a"]),r.a.use(ne["a"]),r.a.use(ae["a"]),r.a.use(te["a"]),r.a.use(ee["a"]),r.a.use(J["b"]),r.a.use(Z["a"]),r.a.use(X["a"]),r.a.use(Q["a"]),r.a.use(Y["a"]),r.a.use(K["a"]),r.a.use(H["a"]),r.a.use(G["a"]),r.a.use(W["a"]),r.a.use(V["a"]),r.a.use(q["a"]),r.a.use(B["a"]),r.a.use(D["a"]),r.a.use(I["a"]),r.a.use(U["a"]),r.a.use(R["a"]),r.a.use($["a"]),r.a.use(E["b"]),r.a.use(F["a"]),r.a.use(A["a"]),r.a.use(_["a"]),r.a.use(M["a"]),r.a.prototype.$confirm=oe["a"].confirm,r.a.prototype.$message=T["a"],r.a.prototype.$notification=O["a"],r.a.prototype.$info=oe["a"].info,r.a.prototype.$success=oe["a"].success,r.a.prototype.$error=oe["a"].error,r.a.prototype.$warning=oe["a"].warning,r.a.use(Ce["a"]),r.a.use(Ne["a"]),r.a.use(Se["a"]),r.a.use(Te),r.a.use(Fe),r.a.use(we.a);var Ee=a("323e"),$e=a.n(Ee);a("fddb");$e.a.configure({showSpinner:!1});var Re=["login","register","registerResult"],Ue="/user/login",Ie="/dashboard/workplace";C.beforeEach((function(e,t,a){$e.a.start(),e.meta&&"undefined"!==typeof e.meta.title&&c("".concat(Object(u["b"])(e.meta.title)," - ").concat(l)),j.a.get(P["a"])?e.path===Ue?(a({path:Ie}),$e.a.done()):0===k["a"].getters.roles.length?k["a"].dispatch("GetInfo").then((function(n){var r=n.data&&n.data.role;k["a"].dispatch("GenerateRoutes",{roles:r}).then((function(){k["a"].getters.addRouters.forEach((function(e){C.addRoute(e)}));var n=decodeURIComponent(t.query.redirect||e.path);e.path===n?a(Object(ze["a"])(Object(ze["a"])({},e),{},{replace:!0})):a({path:n})}))})).catch((function(){k["a"].dispatch("Logout").then((function(){a({path:Ue,query:{redirect:e.fullPath}})}))})):a():Re.includes(e.name)?a():(a({path:Ue,query:{redirect:e.fullPath}}),$e.a.done())})),C.afterEach((function(){$e.a.done()}));var De=a("c1df"),Be=a.n(De);a("5c3a");Be.a.locale("zh-cn"),r.a.filter("NumberFormat",(function(e){if(!e)return"0";var t=e.toString().replace(/(\d)(?=(?:\d{3})+$)/g,"$1,");return t})),r.a.filter("dayjs",(function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"YYYY-MM-DD HH:mm:ss";return Be()(e).format(t)})),r.a.filter("moment",(function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"YYYY-MM-DD HH:mm:ss";return Be()(e).format(t)}));a("861f");r.a.config.productionTip=!1,r.a.use(w["a"]),r.a.component("pro-layout",N["d"]),r.a.component("page-container",N["b"]),r.a.component("page-header-wrapper",N["b"]),window.umi_plugin_ant_themeVar=S.theme,new r.a({router:C,store:k["a"],i18n:u["a"],created:x,render:function(e){return e(p)}}).$mount("#app")},5880:function(e,t){e.exports=Vuex},"611e":function(e,t,a){"use strict";a("8151")},6389:function(e,t){e.exports=VueRouter},"69c3":function(e,t,a){"use strict";a.r(t),t["default"]={"result.fail.error.title":"Submission Failed","result.fail.error.description":"Please check and modify the following information before resubmitting.","result.fail.error.hint-title":"The content you submitted has the following error:","result.fail.error.hint-text1":"Your account has been frozen","result.fail.error.hint-btn1":"Thaw immediately","result.fail.error.hint-text2":"Your account is not yet eligible to apply","result.fail.error.hint-btn2":"Upgrade immediately","result.fail.error.btn-text":"Return to modify"}},"6e2f":function(e,t,a){"use strict";a.r(t),t["default"]={submit:"Submit",save:"Save","submit.ok":"Submit successfully","save.ok":"Saved successfully"}},"743d":function(e,t,a){"use strict";a.r(t);var n=a("5530"),r=a("8b45"),s=a("0ff2"),o=a.n(s),i=a("6e2f"),c=a("771d"),l=a("5030"),u=a("928e"),d=a("dea1"),f=a("ffb6"),m=a("78a1"),h=a("29fd"),p={antLocale:r["a"],momentName:"eu",momentLocale:o.a};t["default"]=Object(n["a"])(Object(n["a"])(Object(n["a"])(Object(n["a"])(Object(n["a"])(Object(n["a"])(Object(n["a"])(Object(n["a"])(Object(n["a"])({message:"-","layouts.usermenu.dialog.title":"Message","layouts.usermenu.dialog.content":"Are you sure you would like to logout?","layouts.userLayout.title":"Easy to use distributed exception retry service platform"},p),i["default"]),c["default"]),l["default"]),u["default"]),d["default"]),f["default"]),m["default"]),h["default"])},"771d":function(e,t,a){"use strict";a.r(t),t["default"]={"menu.welcome":"Welcome","menu.home":"Home","menu.dashboard":"Dashboard","menu.dashboard.analysis":"Analysis","menu.dashboard.monitor":"Monitor","menu.dashboard.workplace":"Workplace","menu.form":"Form","menu.form.basic-form":"Basic Form","menu.form.step-form":"Step Form","menu.form.step-form.info":"Step Form(write transfer information)","menu.form.step-form.confirm":"Step Form(confirm transfer information)","menu.form.step-form.result":"Step Form(finished)","menu.form.advanced-form":"Advanced Form","menu.list":"List","menu.list.table-list":"Search Table","menu.list.basic-list":"Basic List","menu.list.card-list":"Card List","menu.list.search-list":"Search List","menu.list.search-list.articles":"Search List(articles)","menu.list.search-list.projects":"Search List(projects)","menu.list.search-list.applications":"Search List(applications)","menu.profile":"Profile","menu.profile.basic":"Basic Profile","menu.profile.advanced":"Advanced Profile","menu.result":"Result","menu.result.success":"Success","menu.result.fail":"Fail","menu.exception":"Exception","menu.exception.not-permission":"403","menu.exception.not-find":"404","menu.exception.server-error":"500","menu.exception.trigger":"Trigger","menu.account":"Account","menu.account.center":"Account Center","menu.account.settings":"Account Settings","menu.account.trigger":"Trigger Error","menu.account.logout":"Logout"}},"78a1":function(e,t,a){"use strict";a.r(t);var n=a("5530"),r=a("44e5"),s=a("69c3");t["default"]=Object(n["a"])(Object(n["a"])({},r["default"]),s["default"])},8151:function(e,t,a){},"861f":function(e,t,a){},"8bbf":function(e,t){e.exports=Vue},"8eeb4":function(e,t,a){var n=a("b2b7");e.exports={__esModule:!0,default:n.svgComponent({tag:"svg",attrsMap:{viewBox:"0 0 128 128",version:"1.1",xmlns:"http://www.w3.org/2000/svg","xmlns:xlink":"http://www.w3.org/1999/xlink"},children:[{tag:"title",children:[{text:"Vue"}]},{tag:"desc",children:[{text:"Created with Sketch."}]},{tag:"defs",children:[{tag:"linearGradient",attrsMap:{x1:"69.644116%",y1:"0%",x2:"69.644116%",y2:"100%",id:"linearGradient-1"},children:[{tag:"stop",attrsMap:{"stop-color":"#29CDFF",offset:"0%"}},{tag:"stop",attrsMap:{"stop-color":"#148EFF",offset:"37.8600687%"}},{tag:"stop",attrsMap:{"stop-color":"#0A60FF",offset:"100%"}}]},{tag:"linearGradient",attrsMap:{x1:"-19.8191553%",y1:"-36.7931464%",x2:"138.57919%",y2:"157.637507%",id:"linearGradient-2"},children:[{tag:"stop",attrsMap:{"stop-color":"#29CDFF",offset:"0%"}},{tag:"stop",attrsMap:{"stop-color":"#0F78FF",offset:"100%"}}]},{tag:"linearGradient",attrsMap:{x1:"68.1279872%",y1:"-35.6905737%",x2:"30.4400914%",y2:"114.942679%",id:"linearGradient-3"},children:[{tag:"stop",attrsMap:{"stop-color":"#FA8E7D",offset:"0%"}},{tag:"stop",attrsMap:{"stop-color":"#F74A5C",offset:"51.2635191%"}},{tag:"stop",attrsMap:{"stop-color":"#F51D2C",offset:"100%"}}]}]},{tag:"g",attrsMap:{id:"Vue",stroke:"none","stroke-width":"1",fill:"none","fill-rule":"evenodd"},children:[{tag:"g",attrsMap:{id:"Group",transform:"translate(19.000000, 9.000000)"},children:[{tag:"path",attrsMap:{d:"M89.96,90.48 C78.58,93.48 68.33,83.36 67.62,82.48 L46.6604487,62.2292258 C45.5023849,61.1103236 44.8426845,59.5728835 44.8296987,57.9626396 L44.5035564,17.5209948 C44.4948861,16.4458744 44.0537714,15.4195095 43.2796864,14.6733517 L29.6459999,1.53153737 C28.055475,-0.00160504005 25.5232423,0.0449126588 23.9900999,1.63543756 C23.2715121,2.38092066 22.87,3.37600834 22.87,4.41143746 L22.87,64.3864751 C22.87,67.0807891 23.9572233,69.6611067 25.885409,71.5429748 L63.6004615,108.352061 C65.9466323,110.641873 69.6963584,110.624605 72.0213403,108.313281",id:"Path-Copy",fill:"url(#linearGradient-1)","fill-rule":"nonzero",transform:"translate(56.415000, 54.831157) scale(-1, 1) translate(-56.415000, -54.831157) "}},{tag:"path",attrsMap:{d:"M68,90.1163122 C56.62,93.1163122 45.46,83.36 44.75,82.48 L23.7904487,62.2292258 C22.6323849,61.1103236 21.9726845,59.5728835 21.9596987,57.9626396 L21.6335564,17.5209948 C21.6248861,16.4458744 21.1837714,15.4195095 20.4096864,14.6733517 L6.7759999,1.53153737 C5.185475,-0.00160504005 2.65324232,0.0449126588 1.12009991,1.63543756 C0.401512125,2.38092066 3.90211878e-13,3.37600834 3.90798505e-13,4.41143746 L3.94351218e-13,64.3864751 C3.94681177e-13,67.0807891 1.08722326,69.6611067 3.01540903,71.5429748 L40.7807092,108.401101 C43.1069304,110.671444 46.8180151,110.676525 49.1504445,108.412561",id:"Path",fill:"url(#linearGradient-2)","fill-rule":"nonzero"}},{tag:"path",attrsMap:{d:"M43.2983488,19.0991931 L27.5566079,3.88246244 C26.7624281,3.11476967 26.7409561,1.84862177 27.5086488,1.05444194 C27.8854826,0.664606611 28.4044438,0.444472651 28.9466386,0.444472651 L60.3925021,0.444472651 C61.4970716,0.444472651 62.3925021,1.33990315 62.3925021,2.44447265 C62.3925021,2.9858375 62.1730396,3.50407742 61.7842512,3.88079942 L46.0801285,19.0975301 C45.3051579,19.8484488 44.0742167,19.8491847 43.2983488,19.0991931 Z",id:"Path",fill:"url(#linearGradient-3)"}}]}]}]})}},"928e":function(e,t,a){"use strict";a.r(t),t["default"]={"user.login.userName":"userName","user.login.password":"password","user.login.username.placeholder":"Please enter the username","user.login.password.placeholder":"Please enter the password","user.login.message-invalid-credentials":"Invalid username or password","user.login.message-invalid-verification-code":"Invalid verification code","user.login.tab-login-credentials":"Credentials","user.login.tab-login-mobile":"Mobile number","user.login.mobile.placeholder":"Mobile number","user.login.mobile.verification-code.placeholder":"Verification code","user.login.remember-me":"Remember me","user.login.forgot-password":"Forgot your password?","user.login.sign-in-with":"Sign in with","user.login.signup":"Sign up","user.login.login":"Login","user.register.register":"Register","user.register.email.placeholder":"Email","user.register.password.placeholder":"Password ","user.register.password.popover-message":"Please enter at least 6 characters. Please do not use passwords that are easy to guess. ","user.register.confirm-password.placeholder":"Confirm password","user.register.get-verification-code":"Get code","user.register.sign-in":"Already have an account?","user.register-result.msg":"Account：registered at {email}","user.register-result.activation-email":"The activation email has been sent to your email address and is valid for 24 hours. Please log in to the email in time and click on the link in the email to activate the account.","user.register-result.back-home":"Back to home","user.register-result.view-mailbox":"View mailbox","user.email.required":"Please enter your email!","user.email.wrong-format":"The email address is in the wrong format!","user.userName.required":"Please enter account name or email address","user.password.required":"Please enter your password!","user.password.twice.msg":"The passwords entered twice do not match!","user.password.strength.msg":"The password is not strong enough","user.password.strength.strong":"Strength: strong","user.password.strength.medium":"Strength: medium","user.password.strength.low":"Strength: low","user.password.strength.short":"Strength: too short","user.confirm-password.required":"Please confirm your password!","user.phone-number.required":"Please enter your phone number!","user.phone-number.wrong-format":"Please enter a valid phone number","user.verification-code.required":"Please enter the verification code!"}},"9fb0":function(e,t,a){"use strict";a.d(t,"a",(function(){return n})),a.d(t,"d",(function(){return r})),a.d(t,"k",(function(){return s})),a.d(t,"m",(function(){return o})),a.d(t,"j",(function(){return i})),a.d(t,"g",(function(){return c})),a.d(t,"h",(function(){return l})),a.d(t,"f",(function(){return u})),a.d(t,"i",(function(){return d})),a.d(t,"e",(function(){return f})),a.d(t,"n",(function(){return m})),a.d(t,"l",(function(){return h})),a.d(t,"b",(function(){return p})),a.d(t,"c",(function(){return g}));var n="Access-Token",r="sidebar_type",s="is_mobile",o="nav_theme",i="layout",c="fixed_header",l="fixed_sidebar",u="content_width",d="auto_hide_header",f="color",m="weak",h="multi_tab",p="app_language",g={Fluid:"Fluid",Fixed:"Fixed"}},b775:function(e,t,a){"use strict";a.d(t,"a",(function(){return m}));a("d3b7");var n=a("cebe"),r=a.n(n),s=a("4360"),o=a("8ded"),i=a.n(o),c=a("56cd"),l={vm:{},install:function(e,t){this.installed||(this.installed=!0,t&&(e.axios=t,Object.defineProperties(e.prototype,{axios:{get:function(){return t}},$http:{get:function(){return t}}})))}},u=a("9fb0"),d=r.a.create({baseURL:"",timeout:6e3}),f=function(e){if(e.response){var t=e.response.data,a=i.a.get(u["a"]);403===e.response.status&&c["a"].error({message:"Forbidden",description:t.message}),401!==e.response.status||t.result&&t.result.isLogin||(c["a"].error({message:"Unauthorized",description:"Authorization verification failed"}),a&&s["a"].dispatch("Logout").then((function(){setTimeout((function(){window.location.reload()}),1500)})))}return Promise.reject(e)};d.interceptors.request.use((function(e){var t=i.a.get(u["a"]);return t&&(e.headers["easy-retry-AUTH"]=t),e}),f),d.interceptors.response.use((function(e){var t=e.data,a=t.status,n=t.message;return 0===a?(c["a"].error({message:n||"Error",duration:3}),Promise.reject(new Error(n||"Error"))):e.data}),f);var m={vm:{},install:function(e){e.use(l,d)}};t["b"]=d},b781:function(e,t,a){"use strict";a.r(t),t["default"]={"dashboard.analysis.test":"Gongzhuan No.{no} shop","dashboard.analysis.introduce":"Introduce","dashboard.analysis.total-sales":"Total Sales","dashboard.analysis.day-sales":"Daily Sales","dashboard.analysis.visits":"Visits","dashboard.analysis.visits-trend":"Visits Trend","dashboard.analysis.visits-ranking":"Visits Ranking","dashboard.analysis.day-visits":"Daily Visits","dashboard.analysis.week":"WoW Change","dashboard.analysis.day":"DoD Change","dashboard.analysis.payments":"Payments","dashboard.analysis.conversion-rate":"Conversion Rate","dashboard.analysis.operational-effect":"Operational Effect","dashboard.analysis.sales-trend":"Stores Sales Trend","dashboard.analysis.sales-ranking":"Sales Ranking","dashboard.analysis.all-year":"All Year","dashboard.analysis.all-month":"All Month","dashboard.analysis.all-week":"All Week","dashboard.analysis.all-day":"All day","dashboard.analysis.search-users":"Search Users","dashboard.analysis.per-capita-search":"Per Capita Search","dashboard.analysis.online-top-search":"Online Top Search","dashboard.analysis.the-proportion-of-sales":"The Proportion Of Sales","dashboard.analysis.dropdown-option-one":"Operation one","dashboard.analysis.dropdown-option-two":"Operation two","dashboard.analysis.channel.all":"ALL","dashboard.analysis.channel.online":"Online","dashboard.analysis.channel.stores":"Stores","dashboard.analysis.sales":"Sales","dashboard.analysis.traffic":"Traffic","dashboard.analysis.table.rank":"Rank","dashboard.analysis.table.search-keyword":"Keyword","dashboard.analysis.table.users":"Users","dashboard.analysis.table.weekly-range":"Weekly Range"}},bf0f:function(e,t,a){"use strict";a.d(t,"c",(function(){return b})),a.d(t,"b",(function(){return y}));var n=a("5530"),r=(a("d3b7"),a("caad"),a("3ca3"),a("ddb0"),a("8bbf")),s=a.n(r),o=a("a925"),i=a("8ded"),c=a.n(i),l=a("c1df"),u=a.n(l),d=a("743d");s.a.use(o["a"]);var f="en-US",m={"en-US":Object(n["a"])({},d["default"])},h=new o["a"]({silentTranslationWarn:!0,locale:f,fallbackLocale:f,messages:m}),p=[f];function g(e){return h.locale=e,document.querySelector("html").setAttribute("lang",e),e}function b(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:f;return new Promise((function(t){return c.a.set("lang",e),h.locale!==e?p.includes(e)?t(g(e)):a("4aa4")("./".concat(e)).then((function(t){var a=t.default;return h.setLocaleMessage(e,a),p.push(e),u.a.updateLocale(a.momentName,a.momentLocale),g(e)})):t(e)}))}function y(e){return h.t("".concat(e))}t["a"]=h},ca00:function(e,t,a){"use strict";a.d(t,"b",(function(){return n})),a.d(t,"c",(function(){return r})),a.d(t,"a",(function(){return s}));a("ac1f");function n(){var e=new Date,t=e.getHours();return t<9?"早上好":t<=11?"上午好":t<=13?"中午好":t<20?"下午好":"晚上好"}function r(){var e=["休息一会儿吧","准备吃什么呢?","要不要打一把 DOTA","我猜你可能累了"],t=Math.floor(Math.random()*e.length);return e[t]}function s(e){var t={1:[{roleId:1,permissionId:"group",permissionName:"组配置",actionEntitySet:[]},{roleId:1,permissionId:"dashboard",permissionName:"看板"},{roleId:1,permissionId:"retryTask",permissionName:"任务管理"},{roleId:1,permissionId:"retryDeadLetter",permissionName:"死信队列管理"},{roleId:1,permissionId:"retryLog",permissionName:"重试日志管理"},{roleId:1,permissionId:"basicConfig",permissionName:"基础信息配置"}],2:[{roleId:2,permissionId:"group",permissionName:"组配置",actionEntitySet:[{action:"add",describe:"新增",defaultCheck:!1}]},{roleId:2,permissionId:"user",permissionName:"用户"},{roleId:2,permissionId:"userForm",permissionName:"新增或更新用户"},{roleId:2,permissionId:"dashboard",permissionName:"看板"},{roleId:2,permissionId:"retryTask",permissionName:"任务管理"},{roleId:2,permissionId:"retryDeadLetter",permissionName:"死信队列管理"},{roleId:2,permissionId:"retryLog",permissionName:"重试日志管理"},{roleId:2,permissionId:"basicConfig",permissionName:"基础信息配置"}]};return t[e]}},cebe:function(e,t){e.exports=axios},d73b:function(e,t,a){"use strict";a.d(t,"a",(function(){return je})),a.d(t,"b",(function(){return Pe}));a("d3b7"),a("3ca3"),a("ddb0");var n,r,s,o,i=function(){var e=this,t=e._self._c;return t("div",{class:["user-layout-wrapper",e.isMobile&&"mobile"],attrs:{id:"userLayout"}},[t("div",{staticClass:"container"},[t("div",{staticClass:"user-layout-lang"},[t("select-lang",{staticClass:"select-lang-trigger"})],1),t("div",{staticClass:"user-layout-content"},[t("div",{staticClass:"top"},[e._m(0),t("div",{staticClass:"desc"},[e._v(" "+e._s(e.$t("layouts.userLayout.title"))+" ")])]),t("router-view"),e._m(1)],1)])])},c=[function(){var e=this,t=e._self._c;return t("div",{staticClass:"header"},[t("a",{attrs:{href:"/"}},[t("span",{staticClass:"title"},[e._v("easy-retry")])])])},function(){var e=this,t=e._self._c;return t("div",{staticClass:"footer"},[t("div",{staticClass:"links"},[t("a",{attrs:{href:"_self"}},[e._v("帮助")]),t("a",{attrs:{href:"_self"}},[e._v("隐私")]),t("a",{attrs:{href:"_self"}},[e._v("条款")])]),t("div",{staticClass:"copyright"},[e._v(" Copyright © 2018 vueComponent ")])])}],l=a("5530"),u=a("5880"),d={computed:Object(l["a"])({},Object(u["mapState"])({isMobile:function(e){return e.app.isMobile}}))},f=(a("9d5c"),a("a600")),m=(a("8fb1"),a("0c63")),h=(a("fbd8"),a("55f1")),p=(a("d81d"),a("2a47"),a("bf0f")),g={computed:Object(l["a"])({},Object(u["mapState"])({currentLang:function(e){return e.app.lang}})),methods:{setLang:function(e){this.$store.dispatch("setLang",e)}}},b=g,y=["zh-CN","zh-TW","en-US","pt-BR"],v={"zh-CN":"简体中文","zh-TW":"繁体中文","en-US":"English","pt-BR":"Português"},C={"zh-CN":"🇨🇳","zh-TW":"🇭🇰","en-US":"🇺🇸","pt-BR":"🇧🇷"},k={props:{prefixCls:{type:String,default:"ant-pro-drop-down"}},name:"SelectLang",mixins:[b],render:function(){var e=this,t=arguments[0],a=this.prefixCls,n=function(t){var a=t.key;e.setLang(a)},r=t(h["a"],{class:["menu","ant-pro-header-menu"],attrs:{selectedKeys:[this.currentLang]},on:{click:n}},[y.map((function(e){return t(h["a"].Item,{key:e},[t("span",{attrs:{role:"img","aria-label":v[e]}},[C[e]])," ",v[e]])}))]);return t(f["a"],{attrs:{overlay:r,placement:"bottomRight"}},[t("span",{class:a},[t(m["a"],{attrs:{type:"global",title:Object(p["b"])("navBar.lang")}})])])}},w=k,N={name:"UserLayout",components:{SelectLang:w},mixins:[d],mounted:function(){document.body.classList.add("userLayout")},beforeDestroy:function(){document.body.classList.remove("userLayout")}},S=N,z=(a("611e"),a("2877")),j=Object(z["a"])(S,i,c,!1,null,"001f2100",null),P=j.exports,L=function(){var e=this,t=e._self._c;return t("div",[t("router-view")],1)},x=[],O={name:"BlankLayout"},T=O,M=Object(z["a"])(T,L,x,!1,null,"7f25f9eb",null),_=(M.exports,function(){var e=this,t=e._self._c;return t("pro-layout",e._b({attrs:{menus:e.menus,collapsed:e.collapsed,mediaQuery:e.query,isMobile:e.isMobile,handleMediaQuery:e.handleMediaQuery,handleCollapse:e.handleCollapse,i18nRender:e.i18nRender},scopedSlots:e._u([{key:"menuHeaderRender",fn:function(){return[t("div",[t("h1",[e._v(e._s(e.title))])])]},proxy:!0},{key:"headerContentRender",fn:function(){return[t("div",[t("a-tooltip",{attrs:{title:"刷新页面"}},[t("a-icon",{staticStyle:{"font-size":"18px",cursor:"pointer"},attrs:{type:"reload"},on:{click:function(){e.$router.go(0)}}})],1)],1)]},proxy:!0},{key:"rightContentRender",fn:function(){return[t("right-content",{attrs:{"top-menu":"topmenu"===e.settings.layout,"is-mobile":e.isMobile,theme:e.settings.theme}})]},proxy:!0},{key:"footerRender",fn:function(){return[t("global-footer")]},proxy:!0}])},"pro-layout",e.settings,!1),[e.isProPreviewSite&&!e.collapsed?t("ads"):e._e(),e.isDev?t("setting-drawer",{attrs:{settings:e.settings},on:{change:e.handleSettingChange}},[t("div",{staticStyle:{margin:"12px 0"}},[e._v(" This is SettingDrawer custom footer content. ")])]):e._e(),t("router-view")],1)}),A=[],F=(a("7db0"),a("c0d2")),E=a("9fb0"),$=a("e819"),R=function(){var e=this,t=e._self._c;return t("div",{class:e.wrpCls},[t("avatar-dropdown",{class:e.prefixCls,attrs:{menu:e.showMenu,"current-user":e.currentUser}}),t("select-lang",{class:e.prefixCls})],1)},U=[],I=a("ade3"),D=(a("b0c0"),function(){var e=this,t=e._self._c;return e.currentUser&&e.currentUser.name?t("a-dropdown",{attrs:{placement:"bottomRight"},scopedSlots:e._u([{key:"overlay",fn:function(){return[t("a-menu",{staticClass:"ant-pro-drop-down menu",attrs:{"selected-keys":[]}},[t("a-menu-item",{key:"logout",on:{click:e.handleLogout}},[t("a-icon",{attrs:{type:"logout"}}),e._v(" "+e._s(e.$t("menu.account.logout"))+" ")],1)],1)]},proxy:!0}],null,!1,3699420034)},[t("span",{staticClass:"ant-pro-account-avatar"},[t("a-avatar",{staticClass:"antd-pro-global-header-index-avatar",attrs:{size:"small",src:"https://gw.alipayobjects.com/zos/antfincdn/XAosXuNZyF/BiazfanxmamNRoxxVxka.png"}}),t("span",[e._v(e._s(e.currentUser.name))])],1)]):t("span",[t("a-spin",{style:{marginLeft:8,marginRight:8},attrs:{size:"small"}})],1)}),B=[],q=(a("cd17"),a("ed3b")),V={name:"AvatarDropdown",props:{currentUser:{type:Object,default:function(){return null}},menu:{type:Boolean,default:!0}},methods:{handleToCenter:function(){this.$router.push({path:"/account/center"})},handleToSettings:function(){this.$router.push({path:"/account/settings"})},handleLogout:function(e){var t=this;q["a"].confirm({title:this.$t("layouts.usermenu.dialog.title"),content:this.$t("layouts.usermenu.dialog.content"),onOk:function(){return t.$store.dispatch("Logout").then((function(){t.$router.push({name:"login"})}))},onCancel:function(){}})}}},W=V,G=(a("f4ba"),Object(z["a"])(W,D,B,!1,null,"fd4de960",null)),H=G.exports,K={name:"RightContent",components:{AvatarDropdown:H,SelectLang:w},props:{prefixCls:{type:String,default:"ant-pro-global-header-index-action"},isMobile:{type:Boolean,default:function(){return!1}},topMenu:{type:Boolean,required:!0},theme:{type:String,required:!0}},data:function(){return{showMenu:!0,currentUser:{}}},computed:{wrpCls:function(){return Object(I["a"])({"ant-pro-global-header-index-right":!0},"ant-pro-global-header-index-".concat(this.isMobile||!this.topMenu?"light":this.theme),!0)}},mounted:function(){var e=this;setTimeout((function(){e.currentUser={name:e.$store.getters.nickname}}),1500)}},Y=K,Q=Object(z["a"])(Y,R,U,!1,null,null,null),X=Q.exports,Z=function(){var e=this,t=e._self._c;return t("global-footer",{staticClass:"footer custom-render",scopedSlots:e._u([{key:"links",fn:function(){return[t("a",{attrs:{href:"https://www.github.com/vueComponent/pro-layout",target:"_blank"}},[e._v("Pro Layout")]),t("a",{attrs:{href:"https://www.github.com/vueComponent/ant-design-vue-pro",target:"_blank"}},[e._v("Github")]),t("a",{attrs:{href:"https://www.github.com/sendya/",target:"_blank"}},[e._v("@Sendya")])]},proxy:!0},{key:"copyright",fn:function(){return[t("a",{attrs:{href:"https://github.com/vueComponent",target:"_blank"}},[e._v("vueComponent")])]},proxy:!0}])})},J=[],ee={name:"ProGlobalFooter",components:{GlobalFooter:F["a"]}},te=ee,ae=Object(z["a"])(te,Z,J,!1,null,null,null),ne=ae.exports,re="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js",se={props:{isMobile:Boolean},mounted:function(){},methods:{load:function(){if(re){var e=document.createElement("script");e.id="_adsbygoogle_js",e.src=re,this.$el.appendChild(e),setTimeout((function(){(window.adsbygoogle||[]).push({})}),2e3)}}},render:function(){var e=arguments[0];return e("div",{class:"business-pro-ad"},[e("a",{attrs:{href:"https://store.antdv.com/pro/",target:"_blank"}},["(推荐) 企业级商用版 Admin Pro 现已发售，采用 Vue3 + TS 欢迎购买。"])])}},oe=se,ie=(a("13cf"),Object(z["a"])(oe,n,r,!1,null,"4109f67d",null)),ce=ie.exports,le=a("8eeb4"),ue=a.n(le),de={name:"BasicLayout",components:{SettingDrawer:F["c"],RightContent:X,GlobalFooter:ne,LogoSvg:ue.a,Ads:ce},data:function(){return{isProPreviewSite:!1,isDev:!1,menus:[],collapsed:!1,title:$["a"].title,settings:{layout:$["a"].layout,contentWidth:"sidemenu"===$["a"].layout?E["c"].Fluid:$["a"].contentWidth,theme:$["a"].navTheme,primaryColor:$["a"].primaryColor,fixedHeader:$["a"].fixedHeader,fixSiderbar:$["a"].fixSiderbar,colorWeak:$["a"].colorWeak,hideHintAlert:!1,hideCopyButton:!1},query:{},isMobile:!1}},computed:Object(l["a"])({},Object(u["mapState"])({mainMenu:function(e){return e.permission.addRouters}})),created:function(){var e=this,t=this.mainMenu.find((function(e){return"/"===e.path}));this.menus=t&&t.children||[],this.$watch("collapsed",(function(){e.$store.commit(E["d"],e.collapsed)})),this.$watch("isMobile",(function(){e.$store.commit(E["k"],e.isMobile)}))},mounted:function(){var e=this,t=navigator.userAgent;t.indexOf("Edge")>-1&&this.$nextTick((function(){e.collapsed=!e.collapsed,setTimeout((function(){e.collapsed=!e.collapsed}),16)}))},methods:{i18nRender:p["b"],handleMediaQuery:function(e){this.query=e,!this.isMobile||e["screen-xs"]?!this.isMobile&&e["screen-xs"]&&(this.isMobile=!0,this.collapsed=!1,this.settings.contentWidth=E["c"].Fluid):this.isMobile=!1},handleCollapse:function(e){this.collapsed=e},handleSettingChange:function(e){var t=e.type,a=e.value;switch(t&&(this.settings[t]=a),t){case"contentWidth":this.settings[t]=a;break;case"layout":"sidemenu"===a?this.settings.contentWidth=E["c"].Fluid:(this.settings.fixSiderbar=!1,this.settings.contentWidth=E["c"].Fixed);break}}}},fe=de,me=(a("e1b1"),Object(z["a"])(fe,_,A,!1,null,null,null)),he=me.exports,pe={name:"RouteView",props:{keepAlive:{type:Boolean,default:!0}},data:function(){return{}},render:function(){var e=arguments[0],t=this.$route.meta,a=this.$store.getters,n=e("keep-alive",[e("router-view")]),r=e("router-view");return(a.multiTab||t.keepAlive)&&(this.keepAlive||a.multiTab||t.keepAlive)?n:r}},ge=pe,be=Object(z["a"])(ge,s,o,!1,null,null,null),ye=(be.exports,function(){var e=this,t=e._self._c;return t("page-header-wrapper",[t("router-view")],1)}),ve=[],Ce={name:"PageView"},ke=Ce,we=Object(z["a"])(ke,ye,ve,!1,null,null,null),Ne=(we.exports,a("0dbd")),Se=a.n(Ne),ze={name:"RouteView",render:function(e){return e("router-view")}},je=[{path:"/",name:"index",component:he,meta:{title:"menu.home"},redirect:"/dashboard/analysis",children:[{path:"/dashboard",name:"dashboard",redirect:"/dashboard/analysis",hideChildrenInMenu:!0,component:ze,meta:{title:"menu.dashboard",keepAlive:!0,icon:Se.a,permission:["dashboard"]},children:[{path:"/dashboard/analysis",name:"Analysis",component:function(){return Promise.all([a.e("chunk-39be5683"),a.e("chunk-77aaac2a")]).then(a.bind(null,"2f3a"))},meta:{title:"menu.dashboard.analysis",keepAlive:!0,permission:["dashboard"]}}]},{path:"/basic-config-list",name:"basicConfigList",component:function(){return Promise.all([a.e("chunk-39be5683"),a.e("chunk-2d21a08f")]).then(a.bind(null,"ba93"))},meta:{title:"组管理",icon:"profile",permission:["group"]}},{path:"/basic-config",name:"basicConfig",hidden:!0,component:function(){return Promise.all([a.e("chunk-39be5683"),a.e("chunk-4a2f6b49")]).then(a.bind(null,"e941"))},meta:{title:"基础信息配置",hidden:!0,hideChildrenInMenu:!0,icon:"profile",permission:["basicConfig"]}},{path:"/retry-task",name:"RetryTask",component:ze,hideChildrenInMenu:!0,redirect:"/retry-task/list",meta:{title:"任务管理",icon:"profile",hideChildrenInMenu:!0,keepAlive:!0,permission:["retryTask"]},children:[{path:"/retry-task/info",name:"RetryTaskInfo",component:function(){return a.e("chunk-35f6c8ac").then(a.bind(null,"99f5"))},meta:{title:"任务管理详情",icon:"profile",keepAlive:!0,permission:["retryTask"]}},{path:"/retry-task/list",name:"RetryTaskList",component:function(){return Promise.all([a.e("chunk-39be5683"),a.e("chunk-71608044")]).then(a.bind(null,"9d75"))},meta:{title:"任务管理列表",icon:"profile",keepAlive:!0,permission:["retryTask"]}}]},{path:"/retry-dead-letter",name:"RetryDeadLetter",component:ze,hideChildrenInMenu:!0,redirect:"/retry-dead-letter/list",meta:{title:"死信队列管理",icon:"profile",permission:["retryDeadLetter"]},children:[{path:"/retry-dead-letter/list",name:"RetryDeadLetterList",component:function(){return Promise.all([a.e("chunk-39be5683"),a.e("chunk-244a93b4")]).then(a.bind(null,"dafb"))},meta:{title:"死信队列管理列表",icon:"profile",permission:["retryDeadLetter"]}},{path:"/retry-dead-letter/info",name:"RetryDeadLetterInfo",component:function(){return a.e("chunk-2672acfa").then(a.bind(null,"56bb"))},meta:{title:"死信队列管理详情",icon:"profile",permission:["retryDeadLetter"]}}]},{path:"/retry-log",name:"RetryLog",component:ze,hideChildrenInMenu:!0,redirect:"/retry-log/list",meta:{title:"重试日志管理",icon:"profile",permission:["retryLog"]},children:[{path:"/retry-log/list",name:"RetryLogList",component:function(){return Promise.all([a.e("chunk-39be5683"),a.e("chunk-1bf36f2c")]).then(a.bind(null,"0564"))},meta:{title:"重试日志列表",icon:"profile",permission:["retryLog"]}},{path:"/retry-log/info",name:"RetryLogInfo",component:function(){return a.e("chunk-2515aa86").then(a.bind(null,"5fe2"))},meta:{title:"重试日志详情",icon:"profile",permission:["retryLog"]}}]},{path:"/user-list",name:"UserList",component:function(){return Promise.all([a.e("chunk-39be5683"),a.e("chunk-bf3addda")]).then(a.bind(null,"1faf"))},meta:{title:"用户管理",icon:"profile",permission:["user"]}},{path:"/user-form",name:"UserForm",hidden:!0,component:function(){return a.e("chunk-08798c7e").then(a.bind(null,"bf80"))},meta:{title:"新增或更新用户",icon:"profile",permission:["userForm"]}}]},{path:"*",redirect:"/404",hidden:!0}],Pe=[{path:"/user",component:P,redirect:"/user/login",hidden:!0,children:[{path:"login",name:"login",component:function(){return a.e("user").then(a.bind(null,"ac2a"))}},{path:"recover",name:"recover",component:void 0}]},{path:"/404",component:function(){return a.e("fail").then(a.bind(null,"cc89"))}}]},dea1:function(e,t,a){"use strict";a.r(t);var n=a("5530"),r=a("b781");t["default"]=Object(n["a"])({},r["default"])},e06b:function(e,t,a){},e1b1:function(e,t,a){"use strict";a("3f88")},e819:function(e,t,a){"use strict";t["a"]={navTheme:"dark",primaryColor:"#1890ff",layout:"topmenu",contentWidth:"Fixed",fixedHeader:!1,fixSiderbar:!1,colorWeak:!1,menu:{locale:!0},title:"easy-retry",pwa:!1,iconfontUrl:"",production:!0}},f4ba:function(e,t,a){"use strict";a("e06b")},fddb:function(e,t,a){},ffb6:function(e,t,a){"use strict";a.r(t);var n=a("5530"),r=a("0af2");t["default"]=Object(n["a"])({},r["default"])}}); \ No newline at end of file diff --git a/x-retry-server/src/main/resources/admin/js/chunk-08798c7e.3d1c2217.js b/easy-retry-server/src/main/resources/admin/js/chunk-08798c7e.3d1c2217.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/chunk-08798c7e.3d1c2217.js rename to easy-retry-server/src/main/resources/admin/js/chunk-08798c7e.3d1c2217.js diff --git a/x-retry-server/src/main/resources/admin/js/chunk-1bf36f2c.77dfdf42.js b/easy-retry-server/src/main/resources/admin/js/chunk-1bf36f2c.77dfdf42.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/chunk-1bf36f2c.77dfdf42.js rename to easy-retry-server/src/main/resources/admin/js/chunk-1bf36f2c.77dfdf42.js diff --git a/x-retry-server/src/main/resources/admin/js/chunk-244a93b4.28cf690b.js b/easy-retry-server/src/main/resources/admin/js/chunk-244a93b4.28cf690b.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/chunk-244a93b4.28cf690b.js rename to easy-retry-server/src/main/resources/admin/js/chunk-244a93b4.28cf690b.js diff --git a/x-retry-server/src/main/resources/admin/js/chunk-2515aa86.599bc7f3.js b/easy-retry-server/src/main/resources/admin/js/chunk-2515aa86.599bc7f3.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/chunk-2515aa86.599bc7f3.js rename to easy-retry-server/src/main/resources/admin/js/chunk-2515aa86.599bc7f3.js diff --git a/x-retry-server/src/main/resources/admin/js/chunk-2672acfa.6c879ca6.js b/easy-retry-server/src/main/resources/admin/js/chunk-2672acfa.6c879ca6.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/chunk-2672acfa.6c879ca6.js rename to easy-retry-server/src/main/resources/admin/js/chunk-2672acfa.6c879ca6.js diff --git a/x-retry-server/src/main/resources/admin/js/chunk-2d21a08f.78a44d95.js b/easy-retry-server/src/main/resources/admin/js/chunk-2d21a08f.78a44d95.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/chunk-2d21a08f.78a44d95.js rename to easy-retry-server/src/main/resources/admin/js/chunk-2d21a08f.78a44d95.js diff --git a/x-retry-server/src/main/resources/admin/js/chunk-35f6c8ac.7808eb4b.js b/easy-retry-server/src/main/resources/admin/js/chunk-35f6c8ac.7808eb4b.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/chunk-35f6c8ac.7808eb4b.js rename to easy-retry-server/src/main/resources/admin/js/chunk-35f6c8ac.7808eb4b.js diff --git a/x-retry-server/src/main/resources/admin/js/chunk-39be5683.ab099dd2.js b/easy-retry-server/src/main/resources/admin/js/chunk-39be5683.ab099dd2.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/chunk-39be5683.ab099dd2.js rename to easy-retry-server/src/main/resources/admin/js/chunk-39be5683.ab099dd2.js diff --git a/x-retry-server/src/main/resources/admin/js/chunk-4a2f6b49.f111b6b8.js b/easy-retry-server/src/main/resources/admin/js/chunk-4a2f6b49.f111b6b8.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/chunk-4a2f6b49.f111b6b8.js rename to easy-retry-server/src/main/resources/admin/js/chunk-4a2f6b49.f111b6b8.js diff --git a/x-retry-server/src/main/resources/admin/js/chunk-71608044.f5556476.js b/easy-retry-server/src/main/resources/admin/js/chunk-71608044.f5556476.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/chunk-71608044.f5556476.js rename to easy-retry-server/src/main/resources/admin/js/chunk-71608044.f5556476.js diff --git a/x-retry-server/src/main/resources/admin/js/chunk-77aaac2a.e87b660f.js b/easy-retry-server/src/main/resources/admin/js/chunk-77aaac2a.e87b660f.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/chunk-77aaac2a.e87b660f.js rename to easy-retry-server/src/main/resources/admin/js/chunk-77aaac2a.e87b660f.js diff --git a/x-retry-server/src/main/resources/admin/js/chunk-bf3addda.54791a87.js b/easy-retry-server/src/main/resources/admin/js/chunk-bf3addda.54791a87.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/chunk-bf3addda.54791a87.js rename to easy-retry-server/src/main/resources/admin/js/chunk-bf3addda.54791a87.js diff --git a/x-retry-server/src/main/resources/admin/js/chunk-vendors.dac3d562.js b/easy-retry-server/src/main/resources/admin/js/chunk-vendors.dac3d562.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/chunk-vendors.dac3d562.js rename to easy-retry-server/src/main/resources/admin/js/chunk-vendors.dac3d562.js diff --git a/x-retry-server/src/main/resources/admin/js/fail.84b62970.js b/easy-retry-server/src/main/resources/admin/js/fail.84b62970.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/fail.84b62970.js rename to easy-retry-server/src/main/resources/admin/js/fail.84b62970.js diff --git a/x-retry-server/src/main/resources/admin/js/lang-zh-CN-account-settings.f8f25eaf.js b/easy-retry-server/src/main/resources/admin/js/lang-zh-CN-account-settings.f8f25eaf.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/lang-zh-CN-account-settings.f8f25eaf.js rename to easy-retry-server/src/main/resources/admin/js/lang-zh-CN-account-settings.f8f25eaf.js diff --git a/x-retry-server/src/main/resources/admin/js/lang-zh-CN-account.aa796242.js b/easy-retry-server/src/main/resources/admin/js/lang-zh-CN-account.aa796242.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/lang-zh-CN-account.aa796242.js rename to easy-retry-server/src/main/resources/admin/js/lang-zh-CN-account.aa796242.js diff --git a/x-retry-server/src/main/resources/admin/js/lang-zh-CN-dashboard-analysis.d7cabd65.js b/easy-retry-server/src/main/resources/admin/js/lang-zh-CN-dashboard-analysis.d7cabd65.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/lang-zh-CN-dashboard-analysis.d7cabd65.js rename to easy-retry-server/src/main/resources/admin/js/lang-zh-CN-dashboard-analysis.d7cabd65.js diff --git a/x-retry-server/src/main/resources/admin/js/lang-zh-CN-dashboard.92d928c3.js b/easy-retry-server/src/main/resources/admin/js/lang-zh-CN-dashboard.92d928c3.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/lang-zh-CN-dashboard.92d928c3.js rename to easy-retry-server/src/main/resources/admin/js/lang-zh-CN-dashboard.92d928c3.js diff --git a/x-retry-server/src/main/resources/admin/js/lang-zh-CN-form-basicForm.ff3088ac.js b/easy-retry-server/src/main/resources/admin/js/lang-zh-CN-form-basicForm.ff3088ac.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/lang-zh-CN-form-basicForm.ff3088ac.js rename to easy-retry-server/src/main/resources/admin/js/lang-zh-CN-form-basicForm.ff3088ac.js diff --git a/x-retry-server/src/main/resources/admin/js/lang-zh-CN-form.4042b6f3.js b/easy-retry-server/src/main/resources/admin/js/lang-zh-CN-form.4042b6f3.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/lang-zh-CN-form.4042b6f3.js rename to easy-retry-server/src/main/resources/admin/js/lang-zh-CN-form.4042b6f3.js diff --git a/x-retry-server/src/main/resources/admin/js/lang-zh-CN-global.bf0df5c8.js b/easy-retry-server/src/main/resources/admin/js/lang-zh-CN-global.bf0df5c8.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/lang-zh-CN-global.bf0df5c8.js rename to easy-retry-server/src/main/resources/admin/js/lang-zh-CN-global.bf0df5c8.js diff --git a/x-retry-server/src/main/resources/admin/js/lang-zh-CN-menu.25425a62.js b/easy-retry-server/src/main/resources/admin/js/lang-zh-CN-menu.25425a62.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/lang-zh-CN-menu.25425a62.js rename to easy-retry-server/src/main/resources/admin/js/lang-zh-CN-menu.25425a62.js diff --git a/x-retry-server/src/main/resources/admin/js/lang-zh-CN-result-fail.232762aa.js b/easy-retry-server/src/main/resources/admin/js/lang-zh-CN-result-fail.232762aa.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/lang-zh-CN-result-fail.232762aa.js rename to easy-retry-server/src/main/resources/admin/js/lang-zh-CN-result-fail.232762aa.js diff --git a/x-retry-server/src/main/resources/admin/js/lang-zh-CN-result-success.3519c60c.js b/easy-retry-server/src/main/resources/admin/js/lang-zh-CN-result-success.3519c60c.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/lang-zh-CN-result-success.3519c60c.js rename to easy-retry-server/src/main/resources/admin/js/lang-zh-CN-result-success.3519c60c.js diff --git a/x-retry-server/src/main/resources/admin/js/lang-zh-CN-result.3bf01153.js b/easy-retry-server/src/main/resources/admin/js/lang-zh-CN-result.3bf01153.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/lang-zh-CN-result.3bf01153.js rename to easy-retry-server/src/main/resources/admin/js/lang-zh-CN-result.3bf01153.js diff --git a/x-retry-server/src/main/resources/admin/js/lang-zh-CN-setting.8c2ce690.js b/easy-retry-server/src/main/resources/admin/js/lang-zh-CN-setting.8c2ce690.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/lang-zh-CN-setting.8c2ce690.js rename to easy-retry-server/src/main/resources/admin/js/lang-zh-CN-setting.8c2ce690.js diff --git a/x-retry-server/src/main/resources/admin/js/lang-zh-CN-user.81513cba.js b/easy-retry-server/src/main/resources/admin/js/lang-zh-CN-user.81513cba.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/lang-zh-CN-user.81513cba.js rename to easy-retry-server/src/main/resources/admin/js/lang-zh-CN-user.81513cba.js diff --git a/x-retry-server/src/main/resources/admin/js/lang-zh-CN.4a7452d2.js b/easy-retry-server/src/main/resources/admin/js/lang-zh-CN.4a7452d2.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/lang-zh-CN.4a7452d2.js rename to easy-retry-server/src/main/resources/admin/js/lang-zh-CN.4a7452d2.js diff --git a/x-retry-server/src/main/resources/admin/js/user.98174af1.js b/easy-retry-server/src/main/resources/admin/js/user.98174af1.js similarity index 100% rename from x-retry-server/src/main/resources/admin/js/user.98174af1.js rename to easy-retry-server/src/main/resources/admin/js/user.98174af1.js diff --git a/x-retry-server/src/main/resources/admin/logo.png b/easy-retry-server/src/main/resources/admin/logo.png similarity index 100% rename from x-retry-server/src/main/resources/admin/logo.png rename to easy-retry-server/src/main/resources/admin/logo.png diff --git a/x-retry-server/src/main/resources/application.yml b/easy-retry-server/src/main/resources/application.yml similarity index 98% rename from x-retry-server/src/main/resources/application.yml rename to easy-retry-server/src/main/resources/application.yml index ac5ad8237..97704d1a4 100644 --- a/x-retry-server/src/main/resources/application.yml +++ b/easy-retry-server/src/main/resources/application.yml @@ -32,7 +32,7 @@ mybatis-plus: map-underscore-to-camel-case: true cache-enabled: true -x-retry: +easy-retry: lastDays: 30 # 拉取重试数据的天数 retryPullPageSize: 100 # 拉取重试数据的每批次的大小 nettyPort: 1788 # 服务端netty端口 diff --git a/x-retry-server/src/main/resources/mapper/GroupConfigMapper.xml b/easy-retry-server/src/main/resources/mapper/GroupConfigMapper.xml similarity index 83% rename from x-retry-server/src/main/resources/mapper/GroupConfigMapper.xml rename to easy-retry-server/src/main/resources/mapper/GroupConfigMapper.xml index 73b2ea2bb..eed3952ea 100644 --- a/x-retry-server/src/main/resources/mapper/GroupConfigMapper.xml +++ b/easy-retry-server/src/main/resources/mapper/GroupConfigMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/x-retry-server/src/main/resources/mapper/NotifyConfigMapper.xml b/easy-retry-server/src/main/resources/mapper/NotifyConfigMapper.xml similarity index 83% rename from x-retry-server/src/main/resources/mapper/NotifyConfigMapper.xml rename to easy-retry-server/src/main/resources/mapper/NotifyConfigMapper.xml index 738aba605..bb2c17873 100644 --- a/x-retry-server/src/main/resources/mapper/NotifyConfigMapper.xml +++ b/easy-retry-server/src/main/resources/mapper/NotifyConfigMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/x-retry-server/src/main/resources/mapper/RetryDeadLetterMapper.xml b/easy-retry-server/src/main/resources/mapper/RetryDeadLetterMapper.xml similarity index 91% rename from x-retry-server/src/main/resources/mapper/RetryDeadLetterMapper.xml rename to easy-retry-server/src/main/resources/mapper/RetryDeadLetterMapper.xml index 7d9fb0158..d2077f4e0 100644 --- a/x-retry-server/src/main/resources/mapper/RetryDeadLetterMapper.xml +++ b/easy-retry-server/src/main/resources/mapper/RetryDeadLetterMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/x-retry-server/src/main/resources/mapper/RetryTaskLogMapper.xml b/easy-retry-server/src/main/resources/mapper/RetryTaskLogMapper.xml similarity index 90% rename from x-retry-server/src/main/resources/mapper/RetryTaskLogMapper.xml rename to easy-retry-server/src/main/resources/mapper/RetryTaskLogMapper.xml index c80ba8612..e854e4a01 100644 --- a/x-retry-server/src/main/resources/mapper/RetryTaskLogMapper.xml +++ b/easy-retry-server/src/main/resources/mapper/RetryTaskLogMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -40,7 +40,7 @@