From 4b8f2a3313aeb7c173bf924827ff6baeaddd3277 Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Thu, 17 Aug 2023 18:29:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=202.2.0=201.=20=E4=BC=98=E5=8C=96pom?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- easy-retry-client-core/pom.xml | 4 ---- easy-retry-common/easy-retry-common-core/pom.xml | 11 ++++++++++- .../easy-retry-datasource-template/pom.xml | 2 +- .../retry/template/datasource/enums/DbTypeEnum.java | 4 ++-- .../template/datasource/utils/RequestDataHelper.java | 6 +++--- .../easy-retry-mariadb-datasource/pom.xml | 4 ---- .../easy-retry-mysql-datasource/pom.xml | 8 -------- .../easy-retry-postgres-datasource/pom.xml | 8 -------- easy-retry-server/pom.xml | 4 ---- pom.xml | 12 +++++++++++- 10 files changed, 27 insertions(+), 36 deletions(-) diff --git a/easy-retry-client-core/pom.xml b/easy-retry-client-core/pom.xml index 6c85a449..6c334736 100644 --- a/easy-retry-client-core/pom.xml +++ b/easy-retry-client-core/pom.xml @@ -38,10 +38,6 @@ com.github.rholder guava-retrying - - cn.hutool - hutool-all - com.aizuda easy-retry-common-core diff --git a/easy-retry-common/easy-retry-common-core/pom.xml b/easy-retry-common/easy-retry-common-core/pom.xml index 3acf7b30..8e10b8f4 100644 --- a/easy-retry-common/easy-retry-common-core/pom.xml +++ b/easy-retry-common/easy-retry-common-core/pom.xml @@ -22,6 +22,7 @@ org.springframework.boot spring-boot-starter-web + provided org.projectlombok @@ -43,7 +44,15 @@ cn.hutool - hutool-all + hutool-http + + + cn.hutool + hutool-extra + + + cn.hutool + hutool-crypto diff --git a/easy-retry-datasource/easy-retry-datasource-template/pom.xml b/easy-retry-datasource/easy-retry-datasource-template/pom.xml index 556851a4..b61dcc34 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/pom.xml +++ b/easy-retry-datasource/easy-retry-datasource-template/pom.xml @@ -38,7 +38,7 @@ com.aizuda - easy-retry-client-core + easy-retry-common-server-api diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/enums/DbTypeEnum.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/enums/DbTypeEnum.java index 4ad5acde..79a6e546 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/enums/DbTypeEnum.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/enums/DbTypeEnum.java @@ -1,6 +1,6 @@ package com.aizuda.easy.retry.template.datasource.enums; -import com.aizuda.easy.retry.client.core.exception.EasyRetryClientException; +import com.aizuda.easy.retry.template.datasource.exception.EasyRetryDatasourceException; import com.baomidou.mybatisplus.annotation.DbType; import lombok.AllArgsConstructor; import lombok.Getter; @@ -32,6 +32,6 @@ public enum DbTypeEnum { } } - throw new EasyRetryClientException("暂不支持此数据库 [{}]", db); + throw new EasyRetryDatasourceException("暂不支持此数据库 [{}]", db); } } diff --git a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/utils/RequestDataHelper.java b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/utils/RequestDataHelper.java index ede409f2..1998d8e7 100644 --- a/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/utils/RequestDataHelper.java +++ b/easy-retry-datasource/easy-retry-datasource-template/src/main/java/com/aizuda/easy/retry/template/datasource/utils/RequestDataHelper.java @@ -1,6 +1,6 @@ package com.aizuda.easy.retry.template.datasource.utils; -import com.aizuda.easy.retry.client.core.exception.EasyRetryClientException; +import com.aizuda.easy.retry.template.datasource.exception.EasyRetryDatasourceException; import com.aizuda.easy.retry.template.datasource.persistence.mapper.GroupConfigMapper; import com.aizuda.easy.retry.template.datasource.persistence.po.GroupConfig; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -58,7 +58,7 @@ public class RequestDataHelper { public static void setPartition(String groupName) { if (StringUtils.isBlank(groupName)) { - throw new EasyRetryClientException("组名称不能为空"); + throw new EasyRetryDatasourceException("组名称不能为空"); } GroupConfigMapper groupConfigMapper = SpringContext.getBeanByType(GroupConfigMapper.class); @@ -66,7 +66,7 @@ public class RequestDataHelper { GroupConfig groupConfig = groupConfigMapper.selectOne(new LambdaQueryWrapper() .eq(GroupConfig::getGroupName, groupName)); if (Objects.isNull(groupConfig)) { - throw new EasyRetryClientException("groupName:[{}]不存在", groupName); + throw new EasyRetryDatasourceException("groupName:[{}]不存在", groupName); } setPartition(groupConfig.getGroupPartition()); diff --git a/easy-retry-datasource/easy-retry-mariadb-datasource/pom.xml b/easy-retry-datasource/easy-retry-mariadb-datasource/pom.xml index b24dd88b..ead58fc4 100644 --- a/easy-retry-datasource/easy-retry-mariadb-datasource/pom.xml +++ b/easy-retry-datasource/easy-retry-mariadb-datasource/pom.xml @@ -25,10 +25,6 @@ lombok true - - com.aizuda - easy-retry-common-core - com.aizuda easy-retry-datasource-template diff --git a/easy-retry-datasource/easy-retry-mysql-datasource/pom.xml b/easy-retry-datasource/easy-retry-mysql-datasource/pom.xml index b2a92d5e..3b46f312 100644 --- a/easy-retry-datasource/easy-retry-mysql-datasource/pom.xml +++ b/easy-retry-datasource/easy-retry-mysql-datasource/pom.xml @@ -25,14 +25,6 @@ lombok true - - com.aizuda - easy-retry-common-core - - - com.baomidou - mybatis-plus-boot-starter - mysql mysql-connector-java diff --git a/easy-retry-datasource/easy-retry-postgres-datasource/pom.xml b/easy-retry-datasource/easy-retry-postgres-datasource/pom.xml index aa1d5b9f..09becbc1 100644 --- a/easy-retry-datasource/easy-retry-postgres-datasource/pom.xml +++ b/easy-retry-datasource/easy-retry-postgres-datasource/pom.xml @@ -25,14 +25,6 @@ lombok true - - com.aizuda - easy-retry-common-core - - - com.baomidou - mybatis-plus-boot-starter - com.aizuda easy-retry-datasource-template diff --git a/easy-retry-server/pom.xml b/easy-retry-server/pom.xml index dd245433..1c1dd3e9 100644 --- a/easy-retry-server/pom.xml +++ b/easy-retry-server/pom.xml @@ -77,10 +77,6 @@ com.aizuda easy-retry-common-client-api - - cn.hutool - hutool-all - com.auth0 java-jwt diff --git a/pom.xml b/pom.xml index 53ed7fa9..cf8d257f 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,17 @@ cn.hutool - hutool-all + hutool-http + ${hutool-all.version} + + + cn.hutool + hutool-extra + ${hutool-all.version} + + + cn.hutool + hutool-crypto ${hutool-all.version}