From 02072a4ce8fe7c586f5ca988b04fb60875251460 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 12 Apr 2023 21:55:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B9=E7=9B=AE=20grou?= =?UTF-8?q?pId=20=E4=B8=BA=20org.dromara.sms4j?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .flattened-pom.xml | 38 +++++++++++-------- README.md | 2 +- pom.xml | 29 +++++++------- sms-aggregation-aliyun/.flattened-pom.xml | 10 ++--- sms-aggregation-aliyun/pom.xml | 11 +++--- sms-aggregation-api/.flattened-pom.xml | 6 +-- sms-aggregation-api/pom.xml | 8 ++-- sms-aggregation-autoimmit/.flattened-pom.xml | 7 ++-- sms-aggregation-autoimmit/pom.xml | 12 ++---- sms-aggregation-cloopen/.flattened-pom.xml | 8 ++-- sms-aggregation-cloopen/pom.xml | 6 +-- sms-aggregation-comm/.flattened-pom.xml | 4 +- sms-aggregation-comm/pom.xml | 6 +-- sms-aggregation-core/.flattened-pom.xml | 22 ++++++----- sms-aggregation-core/pom.xml | 24 ++++++------ sms-aggregation-emay/.flattened-pom.xml | 9 ++--- sms-aggregation-emay/pom.xml | 14 ++----- sms-aggregation-huawei/.flattened-pom.xml | 8 ++-- sms-aggregation-huawei/pom.xml | 11 ++---- sms-aggregation-jdcloud/.flattened-pom.xml | 8 ++-- sms-aggregation-jdcloud/pom.xml | 6 +-- .../.flattened-pom.xml | 6 +-- sms-aggregation-spring-boot-starter/pom.xml | 10 ++--- sms-aggregation-tencent/.flattened-pom.xml | 11 ++---- sms-aggregation-tencent/pom.xml | 11 +++--- sms-aggregation-unisms/.flattened-pom.xml | 11 ++---- sms-aggregation-unisms/pom.xml | 12 +++--- sms-aggregation-yunpian/.flattened-pom.xml | 8 ++-- sms-aggregation-yunpian/pom.xml | 10 ++--- 29 files changed, 154 insertions(+), 174 deletions(-) diff --git a/.flattened-pom.xml b/.flattened-pom.xml index d5388bcf..56422eb2 100644 --- a/.flattened-pom.xml +++ b/.flattened-pom.xml @@ -2,7 +2,7 @@ 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation 1.0.5 pom @@ -36,6 +36,7 @@ sms-aggregation-huawei sms-aggregation-jdcloud sms-aggregation-cloopen + sms-aggregation-emay scm:git:https://gitee.com/MR-wind/sms_aggregation.git @@ -81,73 +82,78 @@ ${spring.boot.version} - kim.wind + org.dromara.sms4j sms-aggregation-spring-boot-starter 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-autoimmit 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-core 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-comm 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-api 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-aliyun 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-tencent 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-unisms 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-yunpian 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-huawei 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-jdcloud 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-cloopen 1.0.5 + + org.dromara.sms4j + sms-aggregation-emay + 1.0.5 + com.aliyun dysmsapi20170525 ${aliyun.version} - com.squareup.okhttp3 okhttp + com.squareup.okhttp3 @@ -178,8 +184,8 @@ ${unisms.version} - com.squareup.okhttp3 okhttp + com.squareup.okhttp3 @@ -189,8 +195,8 @@ ${tencent.version} - com.squareup.okhttp3 okhttp + com.squareup.okhttp3 diff --git a/README.md b/README.md index 9b8b420c..787219da 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ ```xml - kim.wind + org.dromara.sms4j sms-aggregation-spring-boot-starter version diff --git a/pom.xml b/pom.xml index 2c905845..7a4a9a6b 100644 --- a/pom.xml +++ b/pom.xml @@ -2,9 +2,10 @@ 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation ${revision} + sms-aggregation pom sms_aggregation @@ -85,81 +86,81 @@ - kim.wind + org.dromara.sms4j sms-aggregation-spring-boot-starter ${revision} - kim.wind + org.dromara.sms4j sms-aggregation-autoimmit ${revision} - kim.wind + org.dromara.sms4j sms-aggregation-core ${revision} - kim.wind + org.dromara.sms4j sms-aggregation-comm ${revision} - kim.wind + org.dromara.sms4j sms-aggregation-api ${revision} - kim.wind + org.dromara.sms4j sms-aggregation-aliyun ${revision} - kim.wind + org.dromara.sms4j sms-aggregation-tencent ${revision} - kim.wind + org.dromara.sms4j sms-aggregation-unisms ${revision} - kim.wind + org.dromara.sms4j sms-aggregation-yunpian ${revision} - kim.wind + org.dromara.sms4j sms-aggregation-huawei ${revision} - kim.wind + org.dromara.sms4j sms-aggregation-jdcloud ${revision} - kim.wind + org.dromara.sms4j sms-aggregation-cloopen ${revision} - kim.wind + org.dromara.sms4j sms-aggregation-emay ${revision} diff --git a/sms-aggregation-aliyun/.flattened-pom.xml b/sms-aggregation-aliyun/.flattened-pom.xml index bf2addea..4f03d3c3 100644 --- a/sms-aggregation-aliyun/.flattened-pom.xml +++ b/sms-aggregation-aliyun/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-aliyun 1.0.5 sms-aggregation-aliyun @@ -26,8 +26,8 @@ dysmsapi20170525 - com.squareup.okhttp3 okhttp + com.squareup.okhttp3 @@ -36,11 +36,11 @@ okhttp - kim.wind + org.dromara.sms4j sms-aggregation-comm - kim.wind + org.dromara.sms4j sms-aggregation-api diff --git a/sms-aggregation-aliyun/pom.xml b/sms-aggregation-aliyun/pom.xml index 27b4fc23..3142a043 100644 --- a/sms-aggregation-aliyun/pom.xml +++ b/sms-aggregation-aliyun/pom.xml @@ -3,17 +3,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation ${revision} ../pom.xml + sms-aggregation-aliyun sms-aggregation-aliyun sms-aggregation-aliyun ${revision} - + @@ -35,12 +36,12 @@ - kim.wind + org.dromara.sms4j sms-aggregation-comm - kim.wind + org.dromara.sms4j sms-aggregation-api @@ -50,6 +51,4 @@ 3.14.9 - - diff --git a/sms-aggregation-api/.flattened-pom.xml b/sms-aggregation-api/.flattened-pom.xml index 6f861c26..849205f3 100644 --- a/sms-aggregation-api/.flattened-pom.xml +++ b/sms-aggregation-api/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-api 1.0.5 sms-aggregation-api @@ -22,7 +22,7 @@ - kim.wind + org.dromara.sms4j sms-aggregation-comm diff --git a/sms-aggregation-api/pom.xml b/sms-aggregation-api/pom.xml index 073aefa0..10ae0946 100644 --- a/sms-aggregation-api/pom.xml +++ b/sms-aggregation-api/pom.xml @@ -3,26 +3,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation ${revision} ../pom.xml + sms-aggregation-api sms-aggregation-api sms-aggregation-api ${revision} - - - kim.wind + org.dromara.sms4j sms-aggregation-comm - diff --git a/sms-aggregation-autoimmit/.flattened-pom.xml b/sms-aggregation-autoimmit/.flattened-pom.xml index 11a313d1..efc683cf 100644 --- a/sms-aggregation-autoimmit/.flattened-pom.xml +++ b/sms-aggregation-autoimmit/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-autoimmit 1.0.5 sms-aggregation-autoimmit @@ -30,7 +30,7 @@ spring-boot-starter-data-redis - kim.wind + org.dromara.sms4j sms-aggregation-core @@ -40,5 +40,4 @@ true - diff --git a/sms-aggregation-autoimmit/pom.xml b/sms-aggregation-autoimmit/pom.xml index 56d17721..fb132ea4 100644 --- a/sms-aggregation-autoimmit/pom.xml +++ b/sms-aggregation-autoimmit/pom.xml @@ -3,22 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation ${revision} ../pom.xml + sms-aggregation-autoimmit ${revision} sms-aggregation-autoimmit sms-aggregation-autoimmit - - org.springframework.boot @@ -31,7 +30,7 @@ - kim.wind + org.dromara.sms4j sms-aggregation-core @@ -43,9 +42,4 @@ true - - - - - diff --git a/sms-aggregation-cloopen/.flattened-pom.xml b/sms-aggregation-cloopen/.flattened-pom.xml index 603d047f..ab08ea53 100644 --- a/sms-aggregation-cloopen/.flattened-pom.xml +++ b/sms-aggregation-cloopen/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-cloopen 1.0.5 sms-aggregation-cloopen @@ -26,11 +26,11 @@ java-sms-sdk - kim.wind + org.dromara.sms4j sms-aggregation-comm - kim.wind + org.dromara.sms4j sms-aggregation-api diff --git a/sms-aggregation-cloopen/pom.xml b/sms-aggregation-cloopen/pom.xml index be278bd1..b682eb46 100644 --- a/sms-aggregation-cloopen/pom.xml +++ b/sms-aggregation-cloopen/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation ${revision} ../pom.xml @@ -23,12 +23,12 @@ - kim.wind + org.dromara.sms4j sms-aggregation-comm - kim.wind + org.dromara.sms4j sms-aggregation-api diff --git a/sms-aggregation-comm/.flattened-pom.xml b/sms-aggregation-comm/.flattened-pom.xml index 3dec9797..13bd85ee 100644 --- a/sms-aggregation-comm/.flattened-pom.xml +++ b/sms-aggregation-comm/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-comm 1.0.5 sms-aggregation-comm diff --git a/sms-aggregation-comm/pom.xml b/sms-aggregation-comm/pom.xml index 71f3c87a..1c3436f8 100644 --- a/sms-aggregation-comm/pom.xml +++ b/sms-aggregation-comm/pom.xml @@ -3,17 +3,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation ${revision} ../pom.xml + sms-aggregation-comm sms-aggregation-comm sms-aggregation-comm ${revision} - + @@ -28,5 +29,4 @@ forest-core - diff --git a/sms-aggregation-core/.flattened-pom.xml b/sms-aggregation-core/.flattened-pom.xml index 1f3a3a56..b954e2eb 100644 --- a/sms-aggregation-core/.flattened-pom.xml +++ b/sms-aggregation-core/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-core 1.0.5 sms-aggregation-core @@ -22,31 +22,35 @@ - kim.wind + org.dromara.sms4j sms-aggregation-aliyun - kim.wind + org.dromara.sms4j sms-aggregation-tencent - kim.wind + org.dromara.sms4j sms-aggregation-unisms - kim.wind + org.dromara.sms4j sms-aggregation-yunpian - kim.wind + org.dromara.sms4j sms-aggregation-huawei - kim.wind + org.dromara.sms4j sms-aggregation-jdcloud - kim.wind + org.dromara.sms4j + sms-aggregation-emay + + + org.dromara.sms4j sms-aggregation-cloopen diff --git a/sms-aggregation-core/pom.xml b/sms-aggregation-core/pom.xml index 2f27a4af..891267fc 100644 --- a/sms-aggregation-core/pom.xml +++ b/sms-aggregation-core/pom.xml @@ -3,64 +3,64 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation ${revision} ../pom.xml + sms-aggregation-core ${revision} sms-aggregation-core sms-aggregation-core - + + - kim.wind + org.dromara.sms4j sms-aggregation-aliyun - kim.wind + org.dromara.sms4j sms-aggregation-tencent - kim.wind + org.dromara.sms4j sms-aggregation-unisms - kim.wind + org.dromara.sms4j sms-aggregation-yunpian - kim.wind + org.dromara.sms4j sms-aggregation-huawei - kim.wind + org.dromara.sms4j sms-aggregation-jdcloud - kim.wind + org.dromara.sms4j sms-aggregation-emay - kim.wind + org.dromara.sms4j sms-aggregation-cloopen - - diff --git a/sms-aggregation-emay/.flattened-pom.xml b/sms-aggregation-emay/.flattened-pom.xml index 06687730..10c39077 100644 --- a/sms-aggregation-emay/.flattened-pom.xml +++ b/sms-aggregation-emay/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-emay 1.0.5 sms-aggregation-emay @@ -22,13 +22,12 @@ - kim.wind + org.dromara.sms4j sms-aggregation-comm - kim.wind + org.dromara.sms4j sms-aggregation-api - diff --git a/sms-aggregation-emay/pom.xml b/sms-aggregation-emay/pom.xml index 0228d4aa..6a49627d 100644 --- a/sms-aggregation-emay/pom.xml +++ b/sms-aggregation-emay/pom.xml @@ -3,35 +3,29 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation ${revision} ../pom.xml + sms-aggregation-emay ${revision} sms-aggregation-emay sms-aggregation-emay - - - kim.wind + org.dromara.sms4j sms-aggregation-comm - kim.wind + org.dromara.sms4j sms-aggregation-api - - - - - diff --git a/sms-aggregation-huawei/.flattened-pom.xml b/sms-aggregation-huawei/.flattened-pom.xml index 6603f9bb..c4b21c7a 100644 --- a/sms-aggregation-huawei/.flattened-pom.xml +++ b/sms-aggregation-huawei/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-huawei 1.0.5 sms-aggregation-huawei @@ -22,11 +22,11 @@ - kim.wind + org.dromara.sms4j sms-aggregation-comm - kim.wind + org.dromara.sms4j sms-aggregation-api diff --git a/sms-aggregation-huawei/pom.xml b/sms-aggregation-huawei/pom.xml index bf3bd148..8cd6cb55 100644 --- a/sms-aggregation-huawei/pom.xml +++ b/sms-aggregation-huawei/pom.xml @@ -3,35 +3,32 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation ${revision} ../pom.xml + sms-aggregation-huawei ${revision} sms-aggregation-huawei sms-aggregation-huawei - - - kim.wind + org.dromara.sms4j sms-aggregation-comm - kim.wind + org.dromara.sms4j sms-aggregation-api - - diff --git a/sms-aggregation-jdcloud/.flattened-pom.xml b/sms-aggregation-jdcloud/.flattened-pom.xml index a89983e6..721b63c1 100644 --- a/sms-aggregation-jdcloud/.flattened-pom.xml +++ b/sms-aggregation-jdcloud/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-jdcloud 1.0.5 sms-aggregation-jdcloud @@ -26,11 +26,11 @@ sms - kim.wind + org.dromara.sms4j sms-aggregation-comm - kim.wind + org.dromara.sms4j sms-aggregation-api diff --git a/sms-aggregation-jdcloud/pom.xml b/sms-aggregation-jdcloud/pom.xml index 73c27fac..ccdcba8d 100644 --- a/sms-aggregation-jdcloud/pom.xml +++ b/sms-aggregation-jdcloud/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation ${revision} ../pom.xml @@ -23,12 +23,12 @@ - kim.wind + org.dromara.sms4j sms-aggregation-comm - kim.wind + org.dromara.sms4j sms-aggregation-api diff --git a/sms-aggregation-spring-boot-starter/.flattened-pom.xml b/sms-aggregation-spring-boot-starter/.flattened-pom.xml index 6208a1f5..01216e59 100644 --- a/sms-aggregation-spring-boot-starter/.flattened-pom.xml +++ b/sms-aggregation-spring-boot-starter/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-spring-boot-starter 1.0.5 sms-aggregation-spring-boot-starter @@ -29,7 +29,7 @@ import - kim.wind + org.dromara.sms4j sms-aggregation-autoimmit diff --git a/sms-aggregation-spring-boot-starter/pom.xml b/sms-aggregation-spring-boot-starter/pom.xml index 4fa0e523..efe51590 100644 --- a/sms-aggregation-spring-boot-starter/pom.xml +++ b/sms-aggregation-spring-boot-starter/pom.xml @@ -3,11 +3,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation ${revision} ../pom.xml + sms-aggregation-spring-boot-starter sms-aggregation-spring-boot-starter sms-aggregation-spring-boot-starter @@ -15,8 +16,8 @@ jar - + org.springframework.boot @@ -27,7 +28,7 @@ - kim.wind + org.dromara.sms4j sms-aggregation-autoimmit @@ -35,11 +36,10 @@ org.springframework.boot spring-boot-starter - + - diff --git a/sms-aggregation-tencent/.flattened-pom.xml b/sms-aggregation-tencent/.flattened-pom.xml index b9e32fba..56e934f3 100644 --- a/sms-aggregation-tencent/.flattened-pom.xml +++ b/sms-aggregation-tencent/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-tencent 1.0.5 sms-aggregation-tencent @@ -20,16 +20,13 @@ A business-friendly OSS license - - 1.8 - - kim.wind + org.dromara.sms4j sms-aggregation-comm - kim.wind + org.dromara.sms4j sms-aggregation-api diff --git a/sms-aggregation-tencent/pom.xml b/sms-aggregation-tencent/pom.xml index 54228a93..ca94890b 100644 --- a/sms-aggregation-tencent/pom.xml +++ b/sms-aggregation-tencent/pom.xml @@ -3,26 +3,27 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation ${revision} ../pom.xml + sms-aggregation-tencent sms-aggregation-tencent sms-aggregation-tencent ${revision} + - 1.8 - kim.wind + org.dromara.sms4j sms-aggregation-comm - kim.wind + org.dromara.sms4j sms-aggregation-api @@ -34,6 +35,4 @@ okhttp - - diff --git a/sms-aggregation-unisms/.flattened-pom.xml b/sms-aggregation-unisms/.flattened-pom.xml index 08416cb6..9fa5dc9d 100644 --- a/sms-aggregation-unisms/.flattened-pom.xml +++ b/sms-aggregation-unisms/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-unisms 1.0.5 sms-aggregation-unisms @@ -20,9 +20,6 @@ A business-friendly OSS license - - 1.8 - com.apistd.uni @@ -33,11 +30,11 @@ okhttp - kim.wind + org.dromara.sms4j sms-aggregation-comm - kim.wind + org.dromara.sms4j sms-aggregation-api diff --git a/sms-aggregation-unisms/pom.xml b/sms-aggregation-unisms/pom.xml index e190fb34..3f0ad30b 100644 --- a/sms-aggregation-unisms/pom.xml +++ b/sms-aggregation-unisms/pom.xml @@ -3,22 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation ${revision} ../pom.xml + sms-aggregation-unisms sms-aggregation-unisms sms-aggregation-unisms ${revision} + - 1.8 - - com.apistd.uni uni-sdk @@ -30,14 +29,13 @@ - kim.wind + org.dromara.sms4j sms-aggregation-comm - kim.wind + org.dromara.sms4j sms-aggregation-api - diff --git a/sms-aggregation-yunpian/.flattened-pom.xml b/sms-aggregation-yunpian/.flattened-pom.xml index 563f3ee8..b41ec100 100644 --- a/sms-aggregation-yunpian/.flattened-pom.xml +++ b/sms-aggregation-yunpian/.flattened-pom.xml @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation 1.0.5 - kim.wind + org.dromara.sms4j sms-aggregation-yunpian 1.0.5 sms-aggregation-yunpian @@ -22,11 +22,11 @@ - kim.wind + org.dromara.sms4j sms-aggregation-comm - kim.wind + org.dromara.sms4j sms-aggregation-api diff --git a/sms-aggregation-yunpian/pom.xml b/sms-aggregation-yunpian/pom.xml index dcbdced5..f0843522 100644 --- a/sms-aggregation-yunpian/pom.xml +++ b/sms-aggregation-yunpian/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - kim.wind + org.dromara.sms4j sms_aggregation ${revision} ../pom.xml @@ -13,20 +13,18 @@ sms-aggregation-yunpian sms-aggregation-yunpian ${revision} - + - kim.wind + org.dromara.sms4j sms-aggregation-comm - kim.wind + org.dromara.sms4j sms-aggregation-api - - From 90f92c87d4fa1a976dfb8c676a04da04937d7410 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 12 Apr 2023 22:03:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8C=85=E5=89=8D=E7=BC=80=20=E4=B8=BA=20org.dromara.sms4j?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aliyun/config/AlibabaConfig.java | 2 +- .../aliyun/config/AlibabaSmsConfig.java | 8 +- .../aliyun/service/AlibabaSmsImpl.java | 18 +- .../dromara/{sms => sms4j}/api/SmsBlend.java | 6 +- .../{sms => sms4j}/api/callback/CallBack.java | 4 +- .../api/entity/SmsResponse.java | 2 +- .../autoimmit/aop/AopAdvice.java | 16 +- .../autoimmit/config/SmsAutowiredConfig.java | 22 +- .../autoimmit/config/SupplierConfig.java | 21 +- .../autoimmit/utils/ConfigUtil.java | 2 +- .../autoimmit/utils/RedisUtils.java | 2 +- .../autoimmit/utils/SpringUtil.java | 2 +- .../cloopen/config/CloopenConfig.java | 2 +- .../cloopen/config/CloopenSmsConfig.java | 6 +- .../cloopen/service/CloopenSmsImpl.java | 16 +- .../comm/annotation/Restricted.java | 2 +- .../{sms => sms4j}/comm/config/SmsBanner.java | 2 +- .../{sms => sms4j}/comm/config/SmsConfig.java | 4 +- .../comm/config/SmsSqlConfig.java | 2 +- .../comm/constant/Constant.java | 2 +- .../comm/delayedTime/DelayedTime.java | 2 +- .../{sms => sms4j}/comm/delayedTime/Task.java | 2 +- .../comm/enumerate/ConfigType.java | 2 +- .../comm/enumerate/SupplierType.java | 2 +- .../comm/exception/SmsBlendException.java | 2 +- .../comm/exception/SmsSqlException.java | 2 +- .../comm/factory/BeanFactory.java | 10 +- .../{sms => sms4j}/comm/utils/FileTool.java | 2 +- .../{sms => sms4j}/comm/utils/JDBCTool.java | 8 +- .../comm/utils/SettingUtil.java | 2 +- .../{sms => sms4j}/comm/utils/SmsUtil.java | 4 +- .../comm/utils/TimeExpiredPoolCache.java | 4 +- .../comm/utils/http/HttpJsonTool.java | 2 +- .../core/SupplierSqlConfig.java | 24 +- .../core/config/SupplierFactory.java | 18 +- .../core/factory/SmsFactory.java | 24 +- .../sms4j}/emay/config/EmayConfig.java | 34 +- .../sms4j}/emay/config/EmaySmsConfig.java | 80 ++-- .../sms4j}/emay/service/EmaySmsImpl.java | 386 +++++++++--------- .../dromara/sms4j}/emay/util/EmayBuilder.java | 154 +++---- .../huawei/config/HuaweiConfig.java | 2 +- .../huawei/config/HuaweiSmsConfig.java | 6 +- .../huawei/entity/HuaweiError.java | 2 +- .../huawei/entity/HuaweiResponse.java | 2 +- .../{sms => sms4j}/huawei/entity/SmsId.java | 2 +- .../huawei/service/HuaweiSmsImpl.java | 25 +- .../huawei/utils/HuaweiBuilder.java | 4 +- .../jdcloud/config/JdCloudConfig.java | 2 +- .../jdcloud/config/JdCloudSmsConfig.java | 6 +- .../jdcloud/service/JdCloudSmsImpl.java | 16 +- .../starter/config/SmsMainConfig.java | 6 +- .../main/resources/META-INF/spring.factories | 6 +- ...ot.autoconfigure.AutoConfiguration.imports | 6 +- .../tencent/config/TencentConfig.java | 2 +- .../tencent/config/TencentSmsConfig.java | 6 +- .../tencent/service/TencentSmsImpl.java | 16 +- .../unisms/config/UniConfig.java | 2 +- .../unisms/config/UniSmsConfig.java | 6 +- .../unisms/service/UniSmsImpl.java | 18 +- .../yunpian/config/YunPianSmsConfig.java | 6 +- .../yunpian/config/YunpianConfig.java | 2 +- .../yunpian/service/YunPianSmsImpl.java | 20 +- 62 files changed, 534 insertions(+), 534 deletions(-) rename sms-aggregation-aliyun/src/main/java/org/dromara/{sms => sms4j}/aliyun/config/AlibabaConfig.java (91%) rename sms-aggregation-aliyun/src/main/java/org/dromara/{sms => sms4j}/aliyun/config/AlibabaSmsConfig.java (91%) rename sms-aggregation-aliyun/src/main/java/org/dromara/{sms => sms4j}/aliyun/service/AlibabaSmsImpl.java (94%) rename sms-aggregation-api/src/main/java/org/dromara/{sms => sms4j}/api/SmsBlend.java (97%) rename sms-aggregation-api/src/main/java/org/dromara/{sms => sms4j}/api/callback/CallBack.java (52%) rename sms-aggregation-api/src/main/java/org/dromara/{sms => sms4j}/api/entity/SmsResponse.java (93%) rename sms-aggregation-autoimmit/src/main/java/org/dromara/{sms => sms4j}/autoimmit/aop/AopAdvice.java (91%) rename sms-aggregation-autoimmit/src/main/java/org/dromara/{sms => sms4j}/autoimmit/config/SmsAutowiredConfig.java (80%) rename sms-aggregation-autoimmit/src/main/java/org/dromara/{sms => sms4j}/autoimmit/config/SupplierConfig.java (77%) rename sms-aggregation-autoimmit/src/main/java/org/dromara/{sms => sms4j}/autoimmit/utils/ConfigUtil.java (92%) rename sms-aggregation-autoimmit/src/main/java/org/dromara/{sms => sms4j}/autoimmit/utils/RedisUtils.java (99%) rename sms-aggregation-autoimmit/src/main/java/org/dromara/{sms => sms4j}/autoimmit/utils/SpringUtil.java (98%) rename sms-aggregation-cloopen/src/main/java/org/dromara/{sms => sms4j}/cloopen/config/CloopenConfig.java (92%) rename sms-aggregation-cloopen/src/main/java/org/dromara/{sms => sms4j}/cloopen/config/CloopenSmsConfig.java (92%) rename sms-aggregation-cloopen/src/main/java/org/dromara/{sms => sms4j}/cloopen/service/CloopenSmsImpl.java (92%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/annotation/Restricted.java (89%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/config/SmsBanner.java (97%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/config/SmsConfig.java (91%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/config/SmsSqlConfig.java (95%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/constant/Constant.java (96%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/delayedTime/DelayedTime.java (88%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/delayedTime/Task.java (82%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/enumerate/ConfigType.java (92%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/enumerate/SupplierType.java (94%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/exception/SmsBlendException.java (93%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/exception/SmsSqlException.java (89%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/factory/BeanFactory.java (92%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/utils/FileTool.java (97%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/utils/JDBCTool.java (95%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/utils/SettingUtil.java (92%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/utils/SmsUtil.java (97%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/utils/TimeExpiredPoolCache.java (98%) rename sms-aggregation-comm/src/main/java/org/dromara/{sms => sms4j}/comm/utils/http/HttpJsonTool.java (91%) rename sms-aggregation-core/src/main/java/org/dromara/{sms => sms4j}/core/SupplierSqlConfig.java (82%) rename sms-aggregation-core/src/main/java/org/dromara/{sms => sms4j}/core/config/SupplierFactory.java (84%) rename sms-aggregation-core/src/main/java/org/dromara/{sms => sms4j}/core/factory/SmsFactory.java (67%) rename sms-aggregation-emay/src/main/java/{kim/wind => org/dromara/sms4j}/emay/config/EmayConfig.java (84%) rename sms-aggregation-emay/src/main/java/{kim/wind => org/dromara/sms4j}/emay/config/EmaySmsConfig.java (85%) rename sms-aggregation-emay/src/main/java/{kim/wind => org/dromara/sms4j}/emay/service/EmaySmsImpl.java (89%) rename sms-aggregation-emay/src/main/java/{kim/wind => org/dromara/sms4j}/emay/util/EmayBuilder.java (94%) rename sms-aggregation-huawei/src/main/java/org/dromara/{sms => sms4j}/huawei/config/HuaweiConfig.java (91%) rename sms-aggregation-huawei/src/main/java/org/dromara/{sms => sms4j}/huawei/config/HuaweiSmsConfig.java (87%) rename sms-aggregation-huawei/src/main/java/org/dromara/{sms => sms4j}/huawei/entity/HuaweiError.java (97%) rename sms-aggregation-huawei/src/main/java/org/dromara/{sms => sms4j}/huawei/entity/HuaweiResponse.java (92%) rename sms-aggregation-huawei/src/main/java/org/dromara/{sms => sms4j}/huawei/entity/SmsId.java (92%) rename sms-aggregation-huawei/src/main/java/org/dromara/{sms => sms4j}/huawei/service/HuaweiSmsImpl.java (89%) rename sms-aggregation-huawei/src/main/java/org/dromara/{sms => sms4j}/huawei/utils/HuaweiBuilder.java (98%) rename sms-aggregation-jdcloud/src/main/java/org/dromara/{sms => sms4j}/jdcloud/config/JdCloudConfig.java (91%) rename sms-aggregation-jdcloud/src/main/java/org/dromara/{sms => sms4j}/jdcloud/config/JdCloudSmsConfig.java (93%) rename sms-aggregation-jdcloud/src/main/java/org/dromara/{sms => sms4j}/jdcloud/service/JdCloudSmsImpl.java (93%) rename sms-aggregation-spring-boot-starter/src/main/java/org/dromara/{sms => sms4j}/starter/config/SmsMainConfig.java (82%) rename sms-aggregation-tencent/src/main/java/org/dromara/{sms => sms4j}/tencent/config/TencentConfig.java (92%) rename sms-aggregation-tencent/src/main/java/org/dromara/{sms => sms4j}/tencent/config/TencentSmsConfig.java (93%) rename sms-aggregation-tencent/src/main/java/org/dromara/{sms => sms4j}/tencent/service/TencentSmsImpl.java (94%) rename sms-aggregation-unisms/src/main/java/org/dromara/{sms => sms4j}/unisms/config/UniConfig.java (91%) rename sms-aggregation-unisms/src/main/java/org/dromara/{sms => sms4j}/unisms/config/UniSmsConfig.java (91%) rename sms-aggregation-unisms/src/main/java/org/dromara/{sms => sms4j}/unisms/service/UniSmsImpl.java (92%) rename sms-aggregation-yunpian/src/main/java/org/dromara/{sms => sms4j}/yunpian/config/YunPianSmsConfig.java (76%) rename sms-aggregation-yunpian/src/main/java/org/dromara/{sms => sms4j}/yunpian/config/YunpianConfig.java (90%) rename sms-aggregation-yunpian/src/main/java/org/dromara/{sms => sms4j}/yunpian/service/YunPianSmsImpl.java (92%) diff --git a/sms-aggregation-aliyun/src/main/java/org/dromara/sms/aliyun/config/AlibabaConfig.java b/sms-aggregation-aliyun/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaConfig.java similarity index 91% rename from sms-aggregation-aliyun/src/main/java/org/dromara/sms/aliyun/config/AlibabaConfig.java rename to sms-aggregation-aliyun/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaConfig.java index 8b8976b9..672ead5f 100644 --- a/sms-aggregation-aliyun/src/main/java/org/dromara/sms/aliyun/config/AlibabaConfig.java +++ b/sms-aggregation-aliyun/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaConfig.java @@ -1,4 +1,4 @@ -package org.dromara.sms.aliyun.config; +package org.dromara.sms4j.aliyun.config; import lombok.Data; diff --git a/sms-aggregation-aliyun/src/main/java/org/dromara/sms/aliyun/config/AlibabaSmsConfig.java b/sms-aggregation-aliyun/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaSmsConfig.java similarity index 91% rename from sms-aggregation-aliyun/src/main/java/org/dromara/sms/aliyun/config/AlibabaSmsConfig.java rename to sms-aggregation-aliyun/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaSmsConfig.java index 1aba362d..3100cad2 100644 --- a/sms-aggregation-aliyun/src/main/java/org/dromara/sms/aliyun/config/AlibabaSmsConfig.java +++ b/sms-aggregation-aliyun/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaSmsConfig.java @@ -1,10 +1,10 @@ -package org.dromara.sms.aliyun.config; +package org.dromara.sms4j.aliyun.config; import com.aliyun.dysmsapi20170525.Client; import com.aliyun.teaopenapi.models.Config; -import org.dromara.sms.aliyun.service.AlibabaSmsImpl; -import org.dromara.sms.comm.exception.SmsBlendException; -import org.dromara.sms.comm.factory.BeanFactory; +import org.dromara.sms4j.aliyun.service.AlibabaSmsImpl; +import org.dromara.sms4j.comm.exception.SmsBlendException; +import org.dromara.sms4j.comm.factory.BeanFactory; import lombok.extern.slf4j.Slf4j; diff --git a/sms-aggregation-aliyun/src/main/java/org/dromara/sms/aliyun/service/AlibabaSmsImpl.java b/sms-aggregation-aliyun/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java similarity index 94% rename from sms-aggregation-aliyun/src/main/java/org/dromara/sms/aliyun/service/AlibabaSmsImpl.java rename to sms-aggregation-aliyun/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java index cee56027..1ff7405c 100644 --- a/sms-aggregation-aliyun/src/main/java/org/dromara/sms/aliyun/service/AlibabaSmsImpl.java +++ b/sms-aggregation-aliyun/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java @@ -1,4 +1,4 @@ -package org.dromara.sms.aliyun.service; +package org.dromara.sms4j.aliyun.service; import com.alibaba.fastjson.JSONObject; import com.aliyun.dysmsapi20170525.Client; @@ -8,14 +8,14 @@ import com.aliyun.dysmsapi20170525.models.SendSmsRequest; import com.aliyun.dysmsapi20170525.models.SendSmsResponse; import com.aliyun.tea.TeaException; import com.aliyun.teautil.models.RuntimeOptions; -import org.dromara.sms.aliyun.config.AlibabaConfig; -import org.dromara.sms.api.SmsBlend; -import org.dromara.sms.api.callback.CallBack; -import org.dromara.sms.api.entity.SmsResponse; -import org.dromara.sms.comm.annotation.Restricted; -import org.dromara.sms.comm.delayedTime.DelayedTime; -import org.dromara.sms.comm.exception.SmsBlendException; -import org.dromara.sms.comm.utils.http.HttpJsonTool; +import org.dromara.sms4j.aliyun.config.AlibabaConfig; +import org.dromara.sms4j.api.SmsBlend; +import org.dromara.sms4j.api.callback.CallBack; +import org.dromara.sms4j.api.entity.SmsResponse; +import org.dromara.sms4j.comm.annotation.Restricted; +import org.dromara.sms4j.comm.delayedTime.DelayedTime; +import org.dromara.sms4j.comm.exception.SmsBlendException; +import org.dromara.sms4j.comm.utils.http.HttpJsonTool; import lombok.extern.slf4j.Slf4j; import java.util.LinkedHashMap; diff --git a/sms-aggregation-api/src/main/java/org/dromara/sms/api/SmsBlend.java b/sms-aggregation-api/src/main/java/org/dromara/sms4j/api/SmsBlend.java similarity index 97% rename from sms-aggregation-api/src/main/java/org/dromara/sms/api/SmsBlend.java rename to sms-aggregation-api/src/main/java/org/dromara/sms4j/api/SmsBlend.java index 7f3659e3..31042825 100644 --- a/sms-aggregation-api/src/main/java/org/dromara/sms/api/SmsBlend.java +++ b/sms-aggregation-api/src/main/java/org/dromara/sms4j/api/SmsBlend.java @@ -1,7 +1,7 @@ -package org.dromara.sms.api; +package org.dromara.sms4j.api; -import org.dromara.sms.api.callback.CallBack; -import org.dromara.sms.api.entity.SmsResponse; +import org.dromara.sms4j.api.callback.CallBack; +import org.dromara.sms4j.api.entity.SmsResponse; import java.util.LinkedHashMap; import java.util.List; diff --git a/sms-aggregation-api/src/main/java/org/dromara/sms/api/callback/CallBack.java b/sms-aggregation-api/src/main/java/org/dromara/sms4j/api/callback/CallBack.java similarity index 52% rename from sms-aggregation-api/src/main/java/org/dromara/sms/api/callback/CallBack.java rename to sms-aggregation-api/src/main/java/org/dromara/sms4j/api/callback/CallBack.java index 10ef32f2..1a5b92cc 100644 --- a/sms-aggregation-api/src/main/java/org/dromara/sms/api/callback/CallBack.java +++ b/sms-aggregation-api/src/main/java/org/dromara/sms4j/api/callback/CallBack.java @@ -1,6 +1,6 @@ -package org.dromara.sms.api.callback; +package org.dromara.sms4j.api.callback; -import org.dromara.sms.api.entity.SmsResponse; +import org.dromara.sms4j.api.entity.SmsResponse; @FunctionalInterface public interface CallBack { diff --git a/sms-aggregation-api/src/main/java/org/dromara/sms/api/entity/SmsResponse.java b/sms-aggregation-api/src/main/java/org/dromara/sms4j/api/entity/SmsResponse.java similarity index 93% rename from sms-aggregation-api/src/main/java/org/dromara/sms/api/entity/SmsResponse.java rename to sms-aggregation-api/src/main/java/org/dromara/sms4j/api/entity/SmsResponse.java index 56b5bf80..19cde79c 100644 --- a/sms-aggregation-api/src/main/java/org/dromara/sms/api/entity/SmsResponse.java +++ b/sms-aggregation-api/src/main/java/org/dromara/sms4j/api/entity/SmsResponse.java @@ -1,4 +1,4 @@ -package org.dromara.sms.api.entity; +package org.dromara.sms4j.api.entity; import lombok.Data; diff --git a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/aop/AopAdvice.java b/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/aop/AopAdvice.java similarity index 91% rename from sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/aop/AopAdvice.java rename to sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/aop/AopAdvice.java index 57ca5c98..19ebdd54 100644 --- a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/aop/AopAdvice.java +++ b/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/aop/AopAdvice.java @@ -1,12 +1,12 @@ -package org.dromara.sms.autoimmit.aop; +package org.dromara.sms4j.autoimmit.aop; -import org.dromara.sms.comm.exception.SmsBlendException; -import org.dromara.sms.comm.config.SmsConfig; -import org.dromara.sms.autoimmit.utils.RedisUtils; -import org.dromara.sms.comm.utils.SmsUtil; -import org.dromara.sms.comm.utils.TimeExpiredPoolCache; -import org.dromara.sms.autoimmit.utils.SpringUtil; +import org.dromara.sms4j.comm.exception.SmsBlendException; +import org.dromara.sms4j.comm.config.SmsConfig; +import org.dromara.sms4j.autoimmit.utils.RedisUtils; +import org.dromara.sms4j.comm.utils.SmsUtil; +import org.dromara.sms4j.comm.utils.TimeExpiredPoolCache; +import org.dromara.sms4j.autoimmit.utils.SpringUtil; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -32,7 +32,7 @@ public class AopAdvice { private SpringUtil springUtil; - @Pointcut("@annotation(org.dromara.sms.comm.annotation.Restricted)") + @Pointcut("@annotation(org.dromara.sms4j.comm.annotation.Restricted)") public void restricted() { } diff --git a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/config/SmsAutowiredConfig.java b/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java similarity index 80% rename from sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/config/SmsAutowiredConfig.java rename to sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java index e4a8013f..af4ed2fd 100644 --- a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/config/SmsAutowiredConfig.java +++ b/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java @@ -1,16 +1,16 @@ -package org.dromara.sms.autoimmit.config; +package org.dromara.sms4j.autoimmit.config; -import org.dromara.sms.autoimmit.aop.AopAdvice; -import org.dromara.sms.autoimmit.utils.ConfigUtil; -import org.dromara.sms.autoimmit.utils.RedisUtils; -import org.dromara.sms.autoimmit.utils.SpringUtil; -import org.dromara.sms.comm.config.SmsBanner; -import org.dromara.sms.comm.config.SmsConfig; -import org.dromara.sms.comm.config.SmsSqlConfig; -import org.dromara.sms.comm.delayedTime.DelayedTime; -import org.dromara.sms.comm.factory.BeanFactory; +import org.dromara.sms4j.autoimmit.aop.AopAdvice; +import org.dromara.sms4j.autoimmit.utils.ConfigUtil; +import org.dromara.sms4j.autoimmit.utils.RedisUtils; +import org.dromara.sms4j.autoimmit.utils.SpringUtil; +import org.dromara.sms4j.comm.config.SmsBanner; +import org.dromara.sms4j.comm.config.SmsConfig; +import org.dromara.sms4j.comm.config.SmsSqlConfig; +import org.dromara.sms4j.comm.delayedTime.DelayedTime; +import org.dromara.sms4j.comm.factory.BeanFactory; import lombok.extern.slf4j.Slf4j; -import org.dromara.sms.core.SupplierSqlConfig; +import org.dromara.sms4j.core.SupplierSqlConfig; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/config/SupplierConfig.java b/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SupplierConfig.java similarity index 77% rename from sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/config/SupplierConfig.java rename to sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SupplierConfig.java index 3f3274e1..543d568d 100644 --- a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/config/SupplierConfig.java +++ b/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SupplierConfig.java @@ -1,15 +1,14 @@ -package org.dromara.sms.autoimmit.config; +package org.dromara.sms4j.autoimmit.config; -import kim.wind.emay.config.EmayConfig; -import org.dromara.sms.aliyun.config.AlibabaConfig; -import org.dromara.sms.cloopen.config.CloopenConfig; -import org.dromara.sms.comm.config.SmsConfig; -import org.dromara.sms.core.config.SupplierFactory; -import org.dromara.sms.huawei.config.HuaweiConfig; -import org.dromara.sms.jdcloud.config.JdCloudConfig; -import org.dromara.sms.tencent.config.TencentConfig; -import org.dromara.sms.unisms.config.UniConfig; -import org.dromara.sms.yunpian.config.YunpianConfig; +import org.dromara.sms4j.emay.config.EmayConfig; +import org.dromara.sms4j.aliyun.config.AlibabaConfig; +import org.dromara.sms4j.cloopen.config.CloopenConfig; +import org.dromara.sms4j.core.config.SupplierFactory; +import org.dromara.sms4j.huawei.config.HuaweiConfig; +import org.dromara.sms4j.jdcloud.config.JdCloudConfig; +import org.dromara.sms4j.tencent.config.TencentConfig; +import org.dromara.sms4j.unisms.config.UniConfig; +import org.dromara.sms4j.yunpian.config.YunpianConfig; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/utils/ConfigUtil.java b/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/ConfigUtil.java similarity index 92% rename from sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/utils/ConfigUtil.java rename to sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/ConfigUtil.java index d4c1c2f8..4e58876a 100644 --- a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/utils/ConfigUtil.java +++ b/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/ConfigUtil.java @@ -1,4 +1,4 @@ -package org.dromara.sms.autoimmit.utils; +package org.dromara.sms4j.autoimmit.utils; import org.springframework.core.env.Environment; diff --git a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/utils/RedisUtils.java b/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/RedisUtils.java similarity index 99% rename from sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/utils/RedisUtils.java rename to sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/RedisUtils.java index da797745..0331e52f 100644 --- a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/utils/RedisUtils.java +++ b/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/RedisUtils.java @@ -1,4 +1,4 @@ -package org.dromara.sms.autoimmit.utils; +package org.dromara.sms4j.autoimmit.utils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/utils/SpringUtil.java b/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/SpringUtil.java similarity index 98% rename from sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/utils/SpringUtil.java rename to sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/SpringUtil.java index f68c23fe..fc199c2d 100644 --- a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/utils/SpringUtil.java +++ b/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/SpringUtil.java @@ -1,4 +1,4 @@ -package org.dromara.sms.autoimmit.utils; +package org.dromara.sms4j.autoimmit.utils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/sms-aggregation-cloopen/src/main/java/org/dromara/sms/cloopen/config/CloopenConfig.java b/sms-aggregation-cloopen/src/main/java/org/dromara/sms4j/cloopen/config/CloopenConfig.java similarity index 92% rename from sms-aggregation-cloopen/src/main/java/org/dromara/sms/cloopen/config/CloopenConfig.java rename to sms-aggregation-cloopen/src/main/java/org/dromara/sms4j/cloopen/config/CloopenConfig.java index d11f6b21..30e5a0a1 100644 --- a/sms-aggregation-cloopen/src/main/java/org/dromara/sms/cloopen/config/CloopenConfig.java +++ b/sms-aggregation-cloopen/src/main/java/org/dromara/sms4j/cloopen/config/CloopenConfig.java @@ -1,4 +1,4 @@ -package org.dromara.sms.cloopen.config; +package org.dromara.sms4j.cloopen.config; import lombok.Data; diff --git a/sms-aggregation-cloopen/src/main/java/org/dromara/sms/cloopen/config/CloopenSmsConfig.java b/sms-aggregation-cloopen/src/main/java/org/dromara/sms4j/cloopen/config/CloopenSmsConfig.java similarity index 92% rename from sms-aggregation-cloopen/src/main/java/org/dromara/sms/cloopen/config/CloopenSmsConfig.java rename to sms-aggregation-cloopen/src/main/java/org/dromara/sms4j/cloopen/config/CloopenSmsConfig.java index 59f45508..c99f48e8 100644 --- a/sms-aggregation-cloopen/src/main/java/org/dromara/sms/cloopen/config/CloopenSmsConfig.java +++ b/sms-aggregation-cloopen/src/main/java/org/dromara/sms4j/cloopen/config/CloopenSmsConfig.java @@ -1,9 +1,9 @@ -package org.dromara.sms.cloopen.config; +package org.dromara.sms4j.cloopen.config; import com.cloopen.rest.sdk.BodyType; import com.cloopen.rest.sdk.CCPRestSmsSDK; -import org.dromara.sms.cloopen.service.CloopenSmsImpl; -import org.dromara.sms.comm.factory.BeanFactory; +import org.dromara.sms4j.cloopen.service.CloopenSmsImpl; +import org.dromara.sms4j.comm.factory.BeanFactory; /** * 容联云短信配置 diff --git a/sms-aggregation-cloopen/src/main/java/org/dromara/sms/cloopen/service/CloopenSmsImpl.java b/sms-aggregation-cloopen/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java similarity index 92% rename from sms-aggregation-cloopen/src/main/java/org/dromara/sms/cloopen/service/CloopenSmsImpl.java rename to sms-aggregation-cloopen/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java index 6834a674..201026d6 100644 --- a/sms-aggregation-cloopen/src/main/java/org/dromara/sms/cloopen/service/CloopenSmsImpl.java +++ b/sms-aggregation-cloopen/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java @@ -1,17 +1,17 @@ -package org.dromara.sms.cloopen.service; +package org.dromara.sms4j.cloopen.service; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; import cn.hutool.json.JSONUtil; import com.cloopen.rest.sdk.CCPRestSmsSDK; import lombok.extern.slf4j.Slf4j; -import org.dromara.sms.api.SmsBlend; -import org.dromara.sms.api.callback.CallBack; -import org.dromara.sms.api.entity.SmsResponse; -import org.dromara.sms.cloopen.config.CloopenConfig; -import org.dromara.sms.comm.annotation.Restricted; -import org.dromara.sms.comm.delayedTime.DelayedTime; -import org.dromara.sms.comm.exception.SmsBlendException; +import org.dromara.sms4j.api.SmsBlend; +import org.dromara.sms4j.api.callback.CallBack; +import org.dromara.sms4j.api.entity.SmsResponse; +import org.dromara.sms4j.cloopen.config.CloopenConfig; +import org.dromara.sms4j.comm.annotation.Restricted; +import org.dromara.sms4j.comm.delayedTime.DelayedTime; +import org.dromara.sms4j.comm.exception.SmsBlendException; import java.util.*; import java.util.concurrent.Executor; diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/annotation/Restricted.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/annotation/Restricted.java similarity index 89% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/annotation/Restricted.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/annotation/Restricted.java index 309035d2..9a5966bc 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/annotation/Restricted.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/annotation/Restricted.java @@ -1,4 +1,4 @@ -package org.dromara.sms.comm.annotation; +package org.dromara.sms4j.comm.annotation; import java.lang.annotation.ElementType; diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/config/SmsBanner.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/config/SmsBanner.java similarity index 97% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/config/SmsBanner.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/config/SmsBanner.java index 5b5cb32c..088664a5 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/config/SmsBanner.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/config/SmsBanner.java @@ -1,4 +1,4 @@ -package org.dromara.sms.comm.config; +package org.dromara.sms4j.comm.config; public class SmsBanner { private static final String banner = diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/config/SmsConfig.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/config/SmsConfig.java similarity index 91% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/config/SmsConfig.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/config/SmsConfig.java index 8d25ea24..5db5bc13 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/config/SmsConfig.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/config/SmsConfig.java @@ -1,7 +1,7 @@ -package org.dromara.sms.comm.config; +package org.dromara.sms4j.comm.config; -import org.dromara.sms.comm.enumerate.ConfigType; +import org.dromara.sms4j.comm.enumerate.ConfigType; import lombok.Data; @Data diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/config/SmsSqlConfig.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/config/SmsSqlConfig.java similarity index 95% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/config/SmsSqlConfig.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/config/SmsSqlConfig.java index 5f561f22..647e1487 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/config/SmsSqlConfig.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/config/SmsSqlConfig.java @@ -1,4 +1,4 @@ -package org.dromara.sms.comm.config; +package org.dromara.sms4j.comm.config; import lombok.Data; diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/constant/Constant.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java similarity index 96% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/constant/Constant.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java index b638c4ec..7f1010bb 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/constant/Constant.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java @@ -1,4 +1,4 @@ -package org.dromara.sms.comm.constant; +package org.dromara.sms4j.comm.constant; /** diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/delayedTime/DelayedTime.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/DelayedTime.java similarity index 88% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/delayedTime/DelayedTime.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/DelayedTime.java index 80c89904..621b3cfd 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/delayedTime/DelayedTime.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/DelayedTime.java @@ -1,4 +1,4 @@ -package org.dromara.sms.comm.delayedTime; +package org.dromara.sms4j.comm.delayedTime; import java.util.*; diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/delayedTime/Task.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/Task.java similarity index 82% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/delayedTime/Task.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/Task.java index dbf3252e..6e1d9142 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/delayedTime/Task.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/Task.java @@ -1,4 +1,4 @@ -package org.dromara.sms.comm.delayedTime; +package org.dromara.sms4j.comm.delayedTime; import lombok.Data; diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/enumerate/ConfigType.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/enumerate/ConfigType.java similarity index 92% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/enumerate/ConfigType.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/enumerate/ConfigType.java index 72ed6bed..4d11952b 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/enumerate/ConfigType.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/enumerate/ConfigType.java @@ -1,4 +1,4 @@ -package org.dromara.sms.comm.enumerate; +package org.dromara.sms4j.comm.enumerate; /** * ConfigType diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/enumerate/SupplierType.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/enumerate/SupplierType.java similarity index 94% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/enumerate/SupplierType.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/enumerate/SupplierType.java index b6c1b46e..d096515d 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/enumerate/SupplierType.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/enumerate/SupplierType.java @@ -1,4 +1,4 @@ -package org.dromara.sms.comm.enumerate; +package org.dromara.sms4j.comm.enumerate; /** * SupplierType diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/exception/SmsBlendException.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsBlendException.java similarity index 93% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/exception/SmsBlendException.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsBlendException.java index 4072b4d1..255f13ac 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/exception/SmsBlendException.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsBlendException.java @@ -1,4 +1,4 @@ -package org.dromara.sms.comm.exception; +package org.dromara.sms4j.comm.exception; public class SmsBlendException extends RuntimeException{ public String code; diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/exception/SmsSqlException.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsSqlException.java similarity index 89% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/exception/SmsSqlException.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsSqlException.java index f314528c..29b6ecf2 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/exception/SmsSqlException.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsSqlException.java @@ -1,4 +1,4 @@ -package org.dromara.sms.comm.exception; +package org.dromara.sms4j.comm.exception; public class SmsSqlException extends RuntimeException{ private String message; diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/factory/BeanFactory.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/factory/BeanFactory.java similarity index 92% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/factory/BeanFactory.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/factory/BeanFactory.java index 9a6141fb..6462957b 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/factory/BeanFactory.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/factory/BeanFactory.java @@ -1,11 +1,11 @@ -package org.dromara.sms.comm.factory; +package org.dromara.sms4j.comm.factory; import com.dtflys.forest.Forest; import com.dtflys.forest.config.ForestConfiguration; -import org.dromara.sms.comm.config.SmsConfig; -import org.dromara.sms.comm.config.SmsSqlConfig; -import org.dromara.sms.comm.delayedTime.DelayedTime; -import org.dromara.sms.comm.utils.JDBCTool; +import org.dromara.sms4j.comm.config.SmsConfig; +import org.dromara.sms4j.comm.config.SmsSqlConfig; +import org.dromara.sms4j.comm.delayedTime.DelayedTime; +import org.dromara.sms4j.comm.utils.JDBCTool; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.Executor; diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/FileTool.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/FileTool.java similarity index 97% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/FileTool.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/FileTool.java index dbe6e911..29fa7ed4 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/FileTool.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/FileTool.java @@ -1,4 +1,4 @@ -package org.dromara.sms.comm.utils; +package org.dromara.sms4j.comm.utils; import java.io.File; import java.io.FileWriter; diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/JDBCTool.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/JDBCTool.java similarity index 95% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/JDBCTool.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/JDBCTool.java index b90389fc..7678e9c5 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/JDBCTool.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/JDBCTool.java @@ -1,9 +1,9 @@ -package org.dromara.sms.comm.utils; +package org.dromara.sms4j.comm.utils; import cn.hutool.core.util.StrUtil; -import org.dromara.sms.comm.config.SmsSqlConfig; -import org.dromara.sms.comm.exception.SmsSqlException; -import org.dromara.sms.comm.factory.BeanFactory; +import org.dromara.sms4j.comm.config.SmsSqlConfig; +import org.dromara.sms4j.comm.exception.SmsSqlException; +import org.dromara.sms4j.comm.factory.BeanFactory; import java.sql.*; import java.util.Hashtable; diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/SettingUtil.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/SettingUtil.java similarity index 92% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/SettingUtil.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/SettingUtil.java index 889e9127..5c8b53ea 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/SettingUtil.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/SettingUtil.java @@ -1,4 +1,4 @@ -package org.dromara.sms.comm.utils; +package org.dromara.sms4j.comm.utils; import cn.hutool.core.io.file.FileReader; diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/SmsUtil.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/SmsUtil.java similarity index 97% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/SmsUtil.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/SmsUtil.java index 83ef38d8..3a43859e 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/SmsUtil.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/SmsUtil.java @@ -1,9 +1,9 @@ -package org.dromara.sms.comm.utils; +package org.dromara.sms4j.comm.utils; import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONObject; -import org.dromara.sms.comm.exception.SmsSqlException; +import org.dromara.sms4j.comm.exception.SmsSqlException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/TimeExpiredPoolCache.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/TimeExpiredPoolCache.java similarity index 98% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/TimeExpiredPoolCache.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/TimeExpiredPoolCache.java index 28808cdf..0eccf02c 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/TimeExpiredPoolCache.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/TimeExpiredPoolCache.java @@ -1,8 +1,8 @@ -package org.dromara.sms.comm.utils; +package org.dromara.sms4j.comm.utils; import com.alibaba.fastjson.JSONObject; -import org.dromara.sms.comm.exception.SmsBlendException; +import org.dromara.sms4j.comm.exception.SmsBlendException; import lombok.extern.slf4j.Slf4j; import java.io.File; diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/http/HttpJsonTool.java b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/http/HttpJsonTool.java similarity index 91% rename from sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/http/HttpJsonTool.java rename to sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/http/HttpJsonTool.java index 6ec5f09a..c3137437 100644 --- a/sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/http/HttpJsonTool.java +++ b/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/http/HttpJsonTool.java @@ -1,4 +1,4 @@ -package org.dromara.sms.comm.utils.http; +package org.dromara.sms4j.comm.utils.http; import com.alibaba.fastjson.JSONObject; diff --git a/sms-aggregation-core/src/main/java/org/dromara/sms/core/SupplierSqlConfig.java b/sms-aggregation-core/src/main/java/org/dromara/sms4j/core/SupplierSqlConfig.java similarity index 82% rename from sms-aggregation-core/src/main/java/org/dromara/sms/core/SupplierSqlConfig.java rename to sms-aggregation-core/src/main/java/org/dromara/sms4j/core/SupplierSqlConfig.java index 8da617fc..9d88abdd 100644 --- a/sms-aggregation-core/src/main/java/org/dromara/sms/core/SupplierSqlConfig.java +++ b/sms-aggregation-core/src/main/java/org/dromara/sms4j/core/SupplierSqlConfig.java @@ -1,16 +1,16 @@ -package org.dromara.sms.core; +package org.dromara.sms4j.core; -import org.dromara.sms.aliyun.config.AlibabaConfig; -import org.dromara.sms.cloopen.config.CloopenConfig; -import org.dromara.sms.comm.enumerate.SupplierType; -import org.dromara.sms.comm.utils.JDBCTool; -import org.dromara.sms.comm.utils.SmsUtil; -import org.dromara.sms.core.config.SupplierFactory; -import org.dromara.sms.huawei.config.HuaweiConfig; -import org.dromara.sms.jdcloud.config.JdCloudConfig; -import org.dromara.sms.tencent.config.TencentConfig; -import org.dromara.sms.unisms.config.UniConfig; -import org.dromara.sms.yunpian.config.YunpianConfig; +import org.dromara.sms4j.aliyun.config.AlibabaConfig; +import org.dromara.sms4j.cloopen.config.CloopenConfig; +import org.dromara.sms4j.comm.enumerate.SupplierType; +import org.dromara.sms4j.comm.utils.JDBCTool; +import org.dromara.sms4j.comm.utils.SmsUtil; +import org.dromara.sms4j.core.config.SupplierFactory; +import org.dromara.sms4j.huawei.config.HuaweiConfig; +import org.dromara.sms4j.jdcloud.config.JdCloudConfig; +import org.dromara.sms4j.tencent.config.TencentConfig; +import org.dromara.sms4j.unisms.config.UniConfig; +import org.dromara.sms4j.yunpian.config.YunpianConfig; import java.util.Map; diff --git a/sms-aggregation-core/src/main/java/org/dromara/sms/core/config/SupplierFactory.java b/sms-aggregation-core/src/main/java/org/dromara/sms4j/core/config/SupplierFactory.java similarity index 84% rename from sms-aggregation-core/src/main/java/org/dromara/sms/core/config/SupplierFactory.java rename to sms-aggregation-core/src/main/java/org/dromara/sms4j/core/config/SupplierFactory.java index e54c223d..2080725d 100644 --- a/sms-aggregation-core/src/main/java/org/dromara/sms/core/config/SupplierFactory.java +++ b/sms-aggregation-core/src/main/java/org/dromara/sms4j/core/config/SupplierFactory.java @@ -1,13 +1,13 @@ -package org.dromara.sms.core.config; +package org.dromara.sms4j.core.config; -import kim.wind.emay.config.EmayConfig; -import org.dromara.sms.aliyun.config.AlibabaConfig; -import org.dromara.sms.cloopen.config.CloopenConfig; -import org.dromara.sms.huawei.config.HuaweiConfig; -import org.dromara.sms.jdcloud.config.JdCloudConfig; -import org.dromara.sms.tencent.config.TencentConfig; -import org.dromara.sms.unisms.config.UniConfig; -import org.dromara.sms.yunpian.config.YunpianConfig; +import org.dromara.sms4j.emay.config.EmayConfig; +import org.dromara.sms4j.aliyun.config.AlibabaConfig; +import org.dromara.sms4j.cloopen.config.CloopenConfig; +import org.dromara.sms4j.huawei.config.HuaweiConfig; +import org.dromara.sms4j.jdcloud.config.JdCloudConfig; +import org.dromara.sms4j.tencent.config.TencentConfig; +import org.dromara.sms4j.unisms.config.UniConfig; +import org.dromara.sms4j.yunpian.config.YunpianConfig; /** * SupplierFactory diff --git a/sms-aggregation-core/src/main/java/org/dromara/sms/core/factory/SmsFactory.java b/sms-aggregation-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java similarity index 67% rename from sms-aggregation-core/src/main/java/org/dromara/sms/core/factory/SmsFactory.java rename to sms-aggregation-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java index 5f25c5ea..ddfcf8dd 100644 --- a/sms-aggregation-core/src/main/java/org/dromara/sms/core/factory/SmsFactory.java +++ b/sms-aggregation-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java @@ -1,16 +1,16 @@ -package org.dromara.sms.core.factory; +package org.dromara.sms4j.core.factory; -import kim.wind.emay.config.EmaySmsConfig; -import org.dromara.sms.aliyun.config.AlibabaSmsConfig; -import org.dromara.sms.api.SmsBlend; -import org.dromara.sms.cloopen.config.CloopenSmsConfig; -import org.dromara.sms.comm.enumerate.SupplierType; -import org.dromara.sms.comm.exception.SmsBlendException; -import org.dromara.sms.core.config.SupplierFactory; -import org.dromara.sms.huawei.config.HuaweiSmsConfig; -import org.dromara.sms.jdcloud.config.JdCloudSmsConfig; -import org.dromara.sms.tencent.config.TencentSmsConfig; -import org.dromara.sms.unisms.config.UniSmsConfig; +import org.dromara.sms4j.emay.config.EmaySmsConfig; +import org.dromara.sms4j.aliyun.config.AlibabaSmsConfig; +import org.dromara.sms4j.api.SmsBlend; +import org.dromara.sms4j.cloopen.config.CloopenSmsConfig; +import org.dromara.sms4j.comm.enumerate.SupplierType; +import org.dromara.sms4j.comm.exception.SmsBlendException; +import org.dromara.sms4j.core.config.SupplierFactory; +import org.dromara.sms4j.huawei.config.HuaweiSmsConfig; +import org.dromara.sms4j.jdcloud.config.JdCloudSmsConfig; +import org.dromara.sms4j.tencent.config.TencentSmsConfig; +import org.dromara.sms4j.unisms.config.UniSmsConfig; /** * SmsFactory diff --git a/sms-aggregation-emay/src/main/java/kim/wind/emay/config/EmayConfig.java b/sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/config/EmayConfig.java similarity index 84% rename from sms-aggregation-emay/src/main/java/kim/wind/emay/config/EmayConfig.java rename to sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/config/EmayConfig.java index a2b27ed4..513daf53 100644 --- a/sms-aggregation-emay/src/main/java/kim/wind/emay/config/EmayConfig.java +++ b/sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/config/EmayConfig.java @@ -1,17 +1,17 @@ -package kim.wind.emay.config; - -import lombok.Data; - -/** - * @author Richard - * @date 2023-04-11 12:00 - */ -@Data -public class EmayConfig { - /** appKey*/ - private String appId ; - /** appSecret */ - private String secretKey ; - /** APP接入地址*/ - private String requestUrl; -} +package org.dromara.sms4j.emay.config; + +import lombok.Data; + +/** + * @author Richard + * @date 2023-04-11 12:00 + */ +@Data +public class EmayConfig { + /** appKey*/ + private String appId ; + /** appSecret */ + private String secretKey ; + /** APP接入地址*/ + private String requestUrl; +} diff --git a/sms-aggregation-emay/src/main/java/kim/wind/emay/config/EmaySmsConfig.java b/sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/config/EmaySmsConfig.java similarity index 85% rename from sms-aggregation-emay/src/main/java/kim/wind/emay/config/EmaySmsConfig.java rename to sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/config/EmaySmsConfig.java index 5e3b065f..d9c7db2e 100644 --- a/sms-aggregation-emay/src/main/java/kim/wind/emay/config/EmaySmsConfig.java +++ b/sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/config/EmaySmsConfig.java @@ -1,40 +1,40 @@ -package kim.wind.emay.config; - -import kim.wind.emay.service.EmaySmsImpl; -import org.dromara.sms.comm.factory.BeanFactory; - -/** - * EmaySmsConfig - *

Emay短信对象建造 - * - * @author Richard - * @date 2023/04/11 12:00 - * */ -public class EmaySmsConfig { - private static EmaySmsImpl emaySms; - private static EmaySmsConfig emaySmsConfig; - - private EmaySmsConfig() { - } - - /** 建造一个亿美软通短信实现*/ - public static EmaySmsImpl createEmaySms(EmayConfig emayConfig) { - if (emaySmsConfig == null){ - emaySmsConfig = new EmaySmsConfig(); - } - if (emaySms == null){ - emaySms = new EmaySmsImpl(emayConfig, BeanFactory.getExecutor(),BeanFactory.getDelayedTime()); - } - return emaySms; - } - - /** 刷新对象*/ - public static EmaySmsImpl refresh(EmayConfig emayConfig){ - if (emaySmsConfig == null){ - emaySmsConfig = new EmaySmsConfig(); - } - emaySms = new EmaySmsImpl(emayConfig, BeanFactory.getExecutor(),BeanFactory.getDelayedTime()); - return emaySms; - } - -} +package org.dromara.sms4j.emay.config; + +import org.dromara.sms4j.emay.service.EmaySmsImpl; +import org.dromara.sms4j.comm.factory.BeanFactory; + +/** + * EmaySmsConfig + *

Emay短信对象建造 + * + * @author Richard + * @date 2023/04/11 12:00 + * */ +public class EmaySmsConfig { + private static EmaySmsImpl emaySms; + private static EmaySmsConfig emaySmsConfig; + + private EmaySmsConfig() { + } + + /** 建造一个亿美软通短信实现*/ + public static EmaySmsImpl createEmaySms(EmayConfig emayConfig) { + if (emaySmsConfig == null){ + emaySmsConfig = new EmaySmsConfig(); + } + if (emaySms == null){ + emaySms = new EmaySmsImpl(emayConfig, BeanFactory.getExecutor(),BeanFactory.getDelayedTime()); + } + return emaySms; + } + + /** 刷新对象*/ + public static EmaySmsImpl refresh(EmayConfig emayConfig){ + if (emaySmsConfig == null){ + emaySmsConfig = new EmaySmsConfig(); + } + emaySms = new EmaySmsImpl(emayConfig, BeanFactory.getExecutor(),BeanFactory.getDelayedTime()); + return emaySms; + } + +} diff --git a/sms-aggregation-emay/src/main/java/kim/wind/emay/service/EmaySmsImpl.java b/sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java similarity index 89% rename from sms-aggregation-emay/src/main/java/kim/wind/emay/service/EmaySmsImpl.java rename to sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java index d925233e..920d4a73 100644 --- a/sms-aggregation-emay/src/main/java/kim/wind/emay/service/EmaySmsImpl.java +++ b/sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java @@ -1,193 +1,193 @@ -package kim.wind.emay.service; - -import com.alibaba.fastjson.JSONObject; -import com.dtflys.forest.config.ForestConfiguration; -import kim.wind.emay.config.EmayConfig; -import kim.wind.emay.util.EmayBuilder; -import lombok.extern.slf4j.Slf4j; -import org.dromara.sms.api.SmsBlend; -import org.dromara.sms.api.callback.CallBack; -import org.dromara.sms.api.entity.SmsResponse; -import org.dromara.sms.comm.annotation.Restricted; -import org.dromara.sms.comm.delayedTime.DelayedTime; -import org.dromara.sms.comm.exception.SmsBlendException; -import org.dromara.sms.comm.factory.BeanFactory; - -import java.util.*; -import java.util.concurrent.Executor; -import java.util.concurrent.atomic.AtomicReference; - -import static org.dromara.sms.comm.utils.SmsUtil.listToString; - -/** - * @author Richard - * @date 2023-04-11 12:00 - */ -@Slf4j -public class EmaySmsImpl implements SmsBlend { - public EmaySmsImpl(EmayConfig config, Executor pool, DelayedTime delayed) { - this.config = config; - this.pool = pool; - this.delayed = delayed; - } - - private EmayConfig config; - - private Executor pool; - - private DelayedTime delayed; - - private final ForestConfiguration http = BeanFactory.getForestConfiguration(); - - @Override - @Restricted - public SmsResponse sendMessage(String phone, String message) { - String url = config.getRequestUrl(); - Map params; - try { - params = EmayBuilder.buildRequestBody(config.getAppId(), config.getSecretKey(), phone, message); - } catch (SmsBlendException e) { - SmsResponse smsResponse = new SmsResponse(); - smsResponse.setErrMessage(e.getMessage()); - return smsResponse; - } - return getSendResponse(params, url); - } - - @Override - @Restricted - public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { - List list = new ArrayList<>(); - for (Map.Entry entry : messages.entrySet()) { - list.add(entry.getValue()); - } - return sendMessage(phone, EmayBuilder.listToString(list)); - } - - @Override - @Restricted - public SmsResponse massTexting(List phones, String message) { - if (phones.size() > 500) { - throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于500"); - } - return sendMessage(listToString(phones), message); - } - - @Override - @Restricted - public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { - if (phones.size() > 500) { - throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于500"); - } - List list = new ArrayList<>(); - for (Map.Entry entry : messages.entrySet()) { - list.add(entry.getValue()); - } - return sendMessage(listToString(phones), EmayBuilder.listToString(list)); - } - - @Override - @Restricted - public void sendMessageAsync(String phone, String message, CallBack callBack) { - pool.execute(() -> { - SmsResponse smsResponse = sendMessage(phone, message); - callBack.callBack(smsResponse); - }); - } - - @Override - @Restricted - public void sendMessageAsync(String phone, String message) { - pool.execute(() -> sendMessage(phone, message)); - } - - @Override - @Restricted - public void sendMessageAsync(String phone, String templateId, LinkedHashMap messages, CallBack callBack) { - pool.execute(() -> { - SmsResponse smsResponse = sendMessage(phone, templateId, messages); - callBack.callBack(smsResponse); - }); - } - - @Override - @Restricted - public void sendMessageAsync(String phone, String templateId, LinkedHashMap messages) { - pool.execute(() -> sendMessage(phone, templateId, messages)); - } - - @Override - @Restricted - public void delayedMessage(String phone, String message, Long delayedTime) { - this.delayed.schedule(new TimerTask() { - @Override - public void run() { - sendMessage(phone, message); - } - }, delayedTime); - } - - @Override - @Restricted - public void delayedMessage(String phone, String templateId, LinkedHashMap messages, Long delayedTime) { - this.delayed.schedule(new TimerTask() { - @Override - public void run() { - sendMessage(phone, templateId, messages); - } - }, delayedTime); - } - - @Override - @Restricted - public void delayMassTexting(List phones, String message, Long delayedTime) { - this.delayed.schedule(new TimerTask() { - @Override - public void run() { - massTexting(phones, message); - } - }, delayedTime); - } - - @Override - @Restricted - public void delayMassTexting(List phones, String templateId, LinkedHashMap messages, Long delayedTime) { - this.delayed.schedule(new TimerTask() { - @Override - public void run() { - massTexting(phones, templateId, messages); - } - }, delayedTime); - } - - private SmsResponse getSendResponse(Map body, String requestUrl) { - AtomicReference smsResponse = new AtomicReference<>(); - http.post(requestUrl) - .addBody(body) - .onSuccess(((data, req, res) -> { - JSONObject jsonBody = res.get(JSONObject.class); - smsResponse.set(getSmsResponse(jsonBody)); - })) - .onError((ex, req, res) -> { - JSONObject jsonBody = res.get(JSONObject.class); - smsResponse.set(getSmsResponse(jsonBody)); - }) - .execute(); - - return smsResponse.get(); - } - - - private static SmsResponse getSmsResponse(JSONObject execute) { - SmsResponse smsResponse = new SmsResponse(); - String code = execute.getString("code"); - smsResponse.setCode(code); - if ("success".equalsIgnoreCase(code)) { - JSONObject data = execute.getJSONObject("data"); - String smsId = data.getString("smsId"); - smsResponse.setBizId(smsId); - } - smsResponse.setData(execute); - return smsResponse; - } -} +package org.dromara.sms4j.emay.service; + +import com.alibaba.fastjson.JSONObject; +import com.dtflys.forest.config.ForestConfiguration; +import org.dromara.sms4j.emay.config.EmayConfig; +import org.dromara.sms4j.emay.util.EmayBuilder; +import lombok.extern.slf4j.Slf4j; +import org.dromara.sms4j.api.SmsBlend; +import org.dromara.sms4j.api.callback.CallBack; +import org.dromara.sms4j.api.entity.SmsResponse; +import org.dromara.sms4j.comm.annotation.Restricted; +import org.dromara.sms4j.comm.delayedTime.DelayedTime; +import org.dromara.sms4j.comm.exception.SmsBlendException; +import org.dromara.sms4j.comm.factory.BeanFactory; + +import java.util.*; +import java.util.concurrent.Executor; +import java.util.concurrent.atomic.AtomicReference; + +import static org.dromara.sms4j.comm.utils.SmsUtil.listToString; + +/** + * @author Richard + * @date 2023-04-11 12:00 + */ +@Slf4j +public class EmaySmsImpl implements SmsBlend { + public EmaySmsImpl(EmayConfig config, Executor pool, DelayedTime delayed) { + this.config = config; + this.pool = pool; + this.delayed = delayed; + } + + private EmayConfig config; + + private Executor pool; + + private DelayedTime delayed; + + private final ForestConfiguration http = BeanFactory.getForestConfiguration(); + + @Override + @Restricted + public SmsResponse sendMessage(String phone, String message) { + String url = config.getRequestUrl(); + Map params; + try { + params = EmayBuilder.buildRequestBody(config.getAppId(), config.getSecretKey(), phone, message); + } catch (SmsBlendException e) { + SmsResponse smsResponse = new SmsResponse(); + smsResponse.setErrMessage(e.getMessage()); + return smsResponse; + } + return getSendResponse(params, url); + } + + @Override + @Restricted + public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap messages) { + List list = new ArrayList<>(); + for (Map.Entry entry : messages.entrySet()) { + list.add(entry.getValue()); + } + return sendMessage(phone, EmayBuilder.listToString(list)); + } + + @Override + @Restricted + public SmsResponse massTexting(List phones, String message) { + if (phones.size() > 500) { + throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于500"); + } + return sendMessage(listToString(phones), message); + } + + @Override + @Restricted + public SmsResponse massTexting(List phones, String templateId, LinkedHashMap messages) { + if (phones.size() > 500) { + throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于500"); + } + List list = new ArrayList<>(); + for (Map.Entry entry : messages.entrySet()) { + list.add(entry.getValue()); + } + return sendMessage(listToString(phones), EmayBuilder.listToString(list)); + } + + @Override + @Restricted + public void sendMessageAsync(String phone, String message, CallBack callBack) { + pool.execute(() -> { + SmsResponse smsResponse = sendMessage(phone, message); + callBack.callBack(smsResponse); + }); + } + + @Override + @Restricted + public void sendMessageAsync(String phone, String message) { + pool.execute(() -> sendMessage(phone, message)); + } + + @Override + @Restricted + public void sendMessageAsync(String phone, String templateId, LinkedHashMap messages, CallBack callBack) { + pool.execute(() -> { + SmsResponse smsResponse = sendMessage(phone, templateId, messages); + callBack.callBack(smsResponse); + }); + } + + @Override + @Restricted + public void sendMessageAsync(String phone, String templateId, LinkedHashMap messages) { + pool.execute(() -> sendMessage(phone, templateId, messages)); + } + + @Override + @Restricted + public void delayedMessage(String phone, String message, Long delayedTime) { + this.delayed.schedule(new TimerTask() { + @Override + public void run() { + sendMessage(phone, message); + } + }, delayedTime); + } + + @Override + @Restricted + public void delayedMessage(String phone, String templateId, LinkedHashMap messages, Long delayedTime) { + this.delayed.schedule(new TimerTask() { + @Override + public void run() { + sendMessage(phone, templateId, messages); + } + }, delayedTime); + } + + @Override + @Restricted + public void delayMassTexting(List phones, String message, Long delayedTime) { + this.delayed.schedule(new TimerTask() { + @Override + public void run() { + massTexting(phones, message); + } + }, delayedTime); + } + + @Override + @Restricted + public void delayMassTexting(List phones, String templateId, LinkedHashMap messages, Long delayedTime) { + this.delayed.schedule(new TimerTask() { + @Override + public void run() { + massTexting(phones, templateId, messages); + } + }, delayedTime); + } + + private SmsResponse getSendResponse(Map body, String requestUrl) { + AtomicReference smsResponse = new AtomicReference<>(); + http.post(requestUrl) + .addBody(body) + .onSuccess(((data, req, res) -> { + JSONObject jsonBody = res.get(JSONObject.class); + smsResponse.set(getSmsResponse(jsonBody)); + })) + .onError((ex, req, res) -> { + JSONObject jsonBody = res.get(JSONObject.class); + smsResponse.set(getSmsResponse(jsonBody)); + }) + .execute(); + + return smsResponse.get(); + } + + + private static SmsResponse getSmsResponse(JSONObject execute) { + SmsResponse smsResponse = new SmsResponse(); + String code = execute.getString("code"); + smsResponse.setCode(code); + if ("success".equalsIgnoreCase(code)) { + JSONObject data = execute.getJSONObject("data"); + String smsId = data.getString("smsId"); + smsResponse.setBizId(smsId); + } + smsResponse.setData(execute); + return smsResponse; + } +} diff --git a/sms-aggregation-emay/src/main/java/kim/wind/emay/util/EmayBuilder.java b/sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/util/EmayBuilder.java similarity index 94% rename from sms-aggregation-emay/src/main/java/kim/wind/emay/util/EmayBuilder.java rename to sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/util/EmayBuilder.java index ae49bb8e..78b342dc 100644 --- a/sms-aggregation-emay/src/main/java/kim/wind/emay/util/EmayBuilder.java +++ b/sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/util/EmayBuilder.java @@ -1,77 +1,77 @@ -package kim.wind.emay.util; - -import cn.hutool.core.date.DateUtil; -import cn.hutool.crypto.SecureUtil; -import lombok.extern.slf4j.Slf4j; -import org.dromara.sms.comm.exception.SmsBlendException; - -import java.net.URLEncoder; -import java.time.format.DateTimeFormatter; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author Richard - * @version 1.0 - * @date 2023/4/11 15:11 - */ -@Slf4j -public class EmayBuilder { - - - public static Map buildRequestBody(String appId, String secretKey, String phone, - String message) throws SmsBlendException { - return getParamsMap(appId, secretKey, phone, message); - } - - - /** - * @param appId 用户Appid(必填) - * @param secretKey 加密key - * @param phone - * @param message - * @param customSmsId 自定义消息ID(选填) 最长64位 - * @return - * @throws SmsBlendException - */ - public static Map buildRequestBody(String appId, String secretKey, String phone, - String message, String customSmsId) throws SmsBlendException { - Map params = getParamsMap(appId, secretKey, phone, message); - params.put("customSmsId", customSmsId); - return params; - } - - private static Map getParamsMap(String appId, String secretKey, String phone, String message) { - Map params = new HashMap<>(); - // 时间戳(必填) 格式：yyyyMMddHHmmss - String timestamp = DateUtil.format(new Date(), DateTimeFormatter.ofPattern("yyyyMMddHHmmss")); - String sign = SecureUtil.md5(appId + secretKey + timestamp); - params.put("appId", appId); - params.put("timestamp", timestamp); - params.put("sign", sign); - params.put("mobiles", phone); - try { - params.put("content", URLEncoder.encode(message, "utf-8")); - } catch (Exception e) { - log.error("EmaySmsImpl urlEncode content error", e); - throw new SmsBlendException(e.getMessage()); - } - return params; - } - - public static String listToString(List list) { - StringBuilder stringBuffer = new StringBuilder(); - stringBuffer.append("[\""); - for (String s : list) { - stringBuffer.append(s); - stringBuffer.append("\""); - stringBuffer.append(","); - } - stringBuffer.deleteCharAt(stringBuffer.length() - 1); - stringBuffer.append("]"); - return stringBuffer.toString(); - } - -} +package org.dromara.sms4j.emay.util; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.crypto.SecureUtil; +import lombok.extern.slf4j.Slf4j; +import org.dromara.sms4j.comm.exception.SmsBlendException; + +import java.net.URLEncoder; +import java.time.format.DateTimeFormatter; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * @author Richard + * @version 1.0 + * @date 2023/4/11 15:11 + */ +@Slf4j +public class EmayBuilder { + + + public static Map buildRequestBody(String appId, String secretKey, String phone, + String message) throws SmsBlendException { + return getParamsMap(appId, secretKey, phone, message); + } + + + /** + * @param appId 用户Appid(必填) + * @param secretKey 加密key + * @param phone + * @param message + * @param customSmsId 自定义消息ID(选填) 最长64位 + * @return + * @throws SmsBlendException + */ + public static Map buildRequestBody(String appId, String secretKey, String phone, + String message, String customSmsId) throws SmsBlendException { + Map params = getParamsMap(appId, secretKey, phone, message); + params.put("customSmsId", customSmsId); + return params; + } + + private static Map getParamsMap(String appId, String secretKey, String phone, String message) { + Map params = new HashMap<>(); + // 时间戳(必填) 格式：yyyyMMddHHmmss + String timestamp = DateUtil.format(new Date(), DateTimeFormatter.ofPattern("yyyyMMddHHmmss")); + String sign = SecureUtil.md5(appId + secretKey + timestamp); + params.put("appId", appId); + params.put("timestamp", timestamp); + params.put("sign", sign); + params.put("mobiles", phone); + try { + params.put("content", URLEncoder.encode(message, "utf-8")); + } catch (Exception e) { + log.error("EmaySmsImpl urlEncode content error", e); + throw new SmsBlendException(e.getMessage()); + } + return params; + } + + public static String listToString(List list) { + StringBuilder stringBuffer = new StringBuilder(); + stringBuffer.append("[\""); + for (String s : list) { + stringBuffer.append(s); + stringBuffer.append("\""); + stringBuffer.append(","); + } + stringBuffer.deleteCharAt(stringBuffer.length() - 1); + stringBuffer.append("]"); + return stringBuffer.toString(); + } + +} diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/config/HuaweiConfig.java b/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiConfig.java similarity index 91% rename from sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/config/HuaweiConfig.java rename to sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiConfig.java index 4963e4ea..aaed40a7 100644 --- a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/config/HuaweiConfig.java +++ b/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiConfig.java @@ -1,4 +1,4 @@ -package org.dromara.sms.huawei.config; +package org.dromara.sms4j.huawei.config; import lombok.Data; diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/config/HuaweiSmsConfig.java b/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiSmsConfig.java similarity index 87% rename from sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/config/HuaweiSmsConfig.java rename to sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiSmsConfig.java index fb9b1b29..3aed8b40 100644 --- a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/config/HuaweiSmsConfig.java +++ b/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiSmsConfig.java @@ -1,6 +1,6 @@ -package org.dromara.sms.huawei.config; -import org.dromara.sms.comm.factory.BeanFactory; -import org.dromara.sms.huawei.service.HuaweiSmsImpl; +package org.dromara.sms4j.huawei.config; +import org.dromara.sms4j.comm.factory.BeanFactory; +import org.dromara.sms4j.huawei.service.HuaweiSmsImpl; /** * HuaweiSmsConfig diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/HuaweiError.java b/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiError.java similarity index 97% rename from sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/HuaweiError.java rename to sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiError.java index 135c5cf1..58e12a06 100644 --- a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/HuaweiError.java +++ b/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiError.java @@ -1,4 +1,4 @@ -package org.dromara.sms.huawei.entity; +package org.dromara.sms4j.huawei.entity; /** * HuaweiError diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/HuaweiResponse.java b/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiResponse.java similarity index 92% rename from sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/HuaweiResponse.java rename to sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiResponse.java index 9cbed389..d28f54a1 100644 --- a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/HuaweiResponse.java +++ b/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiResponse.java @@ -1,4 +1,4 @@ -package org.dromara.sms.huawei.entity; +package org.dromara.sms4j.huawei.entity; import lombok.Data; diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/SmsId.java b/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/entity/SmsId.java similarity index 92% rename from sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/SmsId.java rename to sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/entity/SmsId.java index 16baea41..185611d3 100644 --- a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/SmsId.java +++ b/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/entity/SmsId.java @@ -1,4 +1,4 @@ -package org.dromara.sms.huawei.entity; +package org.dromara.sms4j.huawei.entity; import lombok.Data; diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/service/HuaweiSmsImpl.java b/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java similarity index 89% rename from sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/service/HuaweiSmsImpl.java rename to sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java index 226aaac9..61db2caa 100644 --- a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/service/HuaweiSmsImpl.java +++ b/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java @@ -1,22 +1,23 @@ -package org.dromara.sms.huawei.service; +package org.dromara.sms4j.huawei.service; import com.dtflys.forest.config.ForestConfiguration; -import org.dromara.sms.api.callback.CallBack; -import org.dromara.sms.api.entity.SmsResponse; -import org.dromara.sms.comm.annotation.Restricted; -import org.dromara.sms.comm.constant.Constant; -import org.dromara.sms.comm.delayedTime.DelayedTime; -import org.dromara.sms.comm.factory.BeanFactory; -import org.dromara.sms.huawei.config.HuaweiConfig; -import org.dromara.sms.huawei.entity.HuaweiResponse; -import org.dromara.sms.huawei.utils.HuaweiBuilder; +import org.dromara.sms4j.api.callback.CallBack; +import org.dromara.sms4j.api.entity.SmsResponse; +import org.dromara.sms4j.comm.annotation.Restricted; +import org.dromara.sms4j.comm.constant.Constant; +import org.dromara.sms4j.comm.delayedTime.DelayedTime; +import org.dromara.sms4j.comm.factory.BeanFactory; +import org.dromara.sms4j.huawei.config.HuaweiConfig; +import org.dromara.sms4j.huawei.entity.HuaweiResponse; +import org.dromara.sms4j.huawei.utils.HuaweiBuilder; import lombok.extern.slf4j.Slf4j; -import org.dromara.sms.api.SmsBlend; +import org.dromara.sms4j.api.SmsBlend; + import java.util.*; import java.util.concurrent.Executor; -import static org.dromara.sms.huawei.utils.HuaweiBuilder.listToString; +import static org.dromara.sms4j.huawei.utils.HuaweiBuilder.listToString; @Slf4j diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/utils/HuaweiBuilder.java b/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/utils/HuaweiBuilder.java similarity index 98% rename from sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/utils/HuaweiBuilder.java rename to sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/utils/HuaweiBuilder.java index 70ad9651..27a05b14 100644 --- a/sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/utils/HuaweiBuilder.java +++ b/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/utils/HuaweiBuilder.java @@ -1,6 +1,6 @@ -package org.dromara.sms.huawei.utils; +package org.dromara.sms4j.huawei.utils; -import org.dromara.sms.comm.constant.Constant; +import org.dromara.sms4j.comm.constant.Constant; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; diff --git a/sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/config/JdCloudConfig.java b/sms-aggregation-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudConfig.java similarity index 91% rename from sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/config/JdCloudConfig.java rename to sms-aggregation-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudConfig.java index 83982ad5..a48e50dc 100644 --- a/sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/config/JdCloudConfig.java +++ b/sms-aggregation-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudConfig.java @@ -1,4 +1,4 @@ -package org.dromara.sms.jdcloud.config; +package org.dromara.sms4j.jdcloud.config; import lombok.Data; diff --git a/sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/config/JdCloudSmsConfig.java b/sms-aggregation-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudSmsConfig.java similarity index 93% rename from sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/config/JdCloudSmsConfig.java rename to sms-aggregation-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudSmsConfig.java index 7b10b746..cf29b5ca 100644 --- a/sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/config/JdCloudSmsConfig.java +++ b/sms-aggregation-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudSmsConfig.java @@ -1,12 +1,12 @@ -package org.dromara.sms.jdcloud.config; +package org.dromara.sms4j.jdcloud.config; import com.jdcloud.sdk.auth.CredentialsProvider; import com.jdcloud.sdk.auth.StaticCredentialsProvider; import com.jdcloud.sdk.http.HttpRequestConfig; import com.jdcloud.sdk.http.Protocol; import com.jdcloud.sdk.service.sms.client.SmsClient; -import org.dromara.sms.comm.factory.BeanFactory; -import org.dromara.sms.jdcloud.service.JdCloudSmsImpl; +import org.dromara.sms4j.comm.factory.BeanFactory; +import org.dromara.sms4j.jdcloud.service.JdCloudSmsImpl; /** * 京东云短信配置 diff --git a/sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/service/JdCloudSmsImpl.java b/sms-aggregation-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java similarity index 93% rename from sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/service/JdCloudSmsImpl.java rename to sms-aggregation-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java index 2c0836a2..a1bdcee8 100644 --- a/sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/service/JdCloudSmsImpl.java +++ b/sms-aggregation-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java @@ -1,17 +1,17 @@ -package org.dromara.sms.jdcloud.service; +package org.dromara.sms4j.jdcloud.service; import cn.hutool.core.util.IdUtil; import com.jdcloud.sdk.service.sms.client.SmsClient; import com.jdcloud.sdk.service.sms.model.BatchSendRequest; import com.jdcloud.sdk.service.sms.model.BatchSendResult; import lombok.extern.slf4j.Slf4j; -import org.dromara.sms.api.SmsBlend; -import org.dromara.sms.api.callback.CallBack; -import org.dromara.sms.api.entity.SmsResponse; -import org.dromara.sms.comm.annotation.Restricted; -import org.dromara.sms.comm.delayedTime.DelayedTime; -import org.dromara.sms.comm.exception.SmsBlendException; -import org.dromara.sms.jdcloud.config.JdCloudConfig; +import org.dromara.sms4j.api.SmsBlend; +import org.dromara.sms4j.api.callback.CallBack; +import org.dromara.sms4j.api.entity.SmsResponse; +import org.dromara.sms4j.comm.annotation.Restricted; +import org.dromara.sms4j.comm.delayedTime.DelayedTime; +import org.dromara.sms4j.comm.exception.SmsBlendException; +import org.dromara.sms4j.jdcloud.config.JdCloudConfig; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/sms-aggregation-spring-boot-starter/src/main/java/org/dromara/sms/starter/config/SmsMainConfig.java b/sms-aggregation-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java similarity index 82% rename from sms-aggregation-spring-boot-starter/src/main/java/org/dromara/sms/starter/config/SmsMainConfig.java rename to sms-aggregation-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java index 7fa23f94..216f81af 100644 --- a/sms-aggregation-spring-boot-starter/src/main/java/org/dromara/sms/starter/config/SmsMainConfig.java +++ b/sms-aggregation-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java @@ -1,8 +1,8 @@ -package org.dromara.sms.starter.config; +package org.dromara.sms4j.starter.config; import lombok.Data; -import org.dromara.sms.autoimmit.config.SmsAutowiredConfig; -import org.dromara.sms.autoimmit.utils.SpringUtil; +import org.dromara.sms4j.autoimmit.config.SmsAutowiredConfig; +import org.dromara.sms4j.autoimmit.utils.SpringUtil; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring.factories b/sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring.factories index 85613ae6..5a6c4d6a 100644 --- a/sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - org.dromara.sms.starter.config.SmsMainConfig,\ - org.dromara.sms.autoimmit.config.SmsAutowiredConfig,\ - org.dromara.sms.autoimmit.config.SupplierConfig + org.dromara.sms4j.starter.config.SmsMainConfig,\ + org.dromara.sms4j.autoimmit.config.SmsAutowiredConfig,\ + org.dromara.sms4j.autoimmit.config.SupplierConfig diff --git a/sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index ab88c98e..e4020a36 100644 --- a/sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,3 @@ -org.dromara.sms.starter.config.SmsMainConfig -org.dromara.sms.autoimmit.config.SmsAutowiredConfig -org.dromara.sms.autoimmit.config.SupplierConfig \ No newline at end of file +org.dromara.sms4j.starter.config.SmsMainConfig +org.dromara.sms4j.autoimmit.config.SmsAutowiredConfig +org.dromara.sms4j.autoimmit.config.SupplierConfig \ No newline at end of file diff --git a/sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/config/TencentConfig.java b/sms-aggregation-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentConfig.java similarity index 92% rename from sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/config/TencentConfig.java rename to sms-aggregation-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentConfig.java index f00a6406..1aa3c277 100644 --- a/sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/config/TencentConfig.java +++ b/sms-aggregation-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentConfig.java @@ -1,4 +1,4 @@ -package org.dromara.sms.tencent.config; +package org.dromara.sms4j.tencent.config; import lombok.Data; diff --git a/sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/config/TencentSmsConfig.java b/sms-aggregation-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentSmsConfig.java similarity index 93% rename from sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/config/TencentSmsConfig.java rename to sms-aggregation-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentSmsConfig.java index f2a3226d..94a798eb 100644 --- a/sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/config/TencentSmsConfig.java +++ b/sms-aggregation-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentSmsConfig.java @@ -1,11 +1,11 @@ -package org.dromara.sms.tencent.config; +package org.dromara.sms4j.tencent.config; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.common.profile.ClientProfile; import com.tencentcloudapi.common.profile.HttpProfile; import com.tencentcloudapi.sms.v20210111.SmsClient; -import org.dromara.sms.comm.factory.BeanFactory; -import org.dromara.sms.tencent.service.TencentSmsImpl; +import org.dromara.sms4j.comm.factory.BeanFactory; +import org.dromara.sms4j.tencent.service.TencentSmsImpl; /** * TencentSmsConfig diff --git a/sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/service/TencentSmsImpl.java b/sms-aggregation-tencent/src/main/java/org/dromara/sms4j/tencent/service/TencentSmsImpl.java similarity index 94% rename from sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/service/TencentSmsImpl.java rename to sms-aggregation-tencent/src/main/java/org/dromara/sms4j/tencent/service/TencentSmsImpl.java index cb574035..b572297b 100644 --- a/sms-aggregation-tencent/src/main/java/org/dromara/sms/tencent/service/TencentSmsImpl.java +++ b/sms-aggregation-tencent/src/main/java/org/dromara/sms4j/tencent/service/TencentSmsImpl.java @@ -1,4 +1,4 @@ -package org.dromara.sms.tencent.service; +package org.dromara.sms4j.tencent.service; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -6,13 +6,13 @@ import com.tencentcloudapi.common.exception.TencentCloudSDKException; import com.tencentcloudapi.sms.v20210111.SmsClient; import com.tencentcloudapi.sms.v20210111.models.SendSmsRequest; import com.tencentcloudapi.sms.v20210111.models.SendSmsResponse; -import org.dromara.sms.api.SmsBlend; -import org.dromara.sms.api.callback.CallBack; -import org.dromara.sms.api.entity.SmsResponse; -import org.dromara.sms.comm.annotation.Restricted; -import org.dromara.sms.comm.delayedTime.DelayedTime; -import org.dromara.sms.comm.exception.SmsBlendException; -import org.dromara.sms.tencent.config.TencentConfig; +import org.dromara.sms4j.api.SmsBlend; +import org.dromara.sms4j.api.callback.CallBack; +import org.dromara.sms4j.api.entity.SmsResponse; +import org.dromara.sms4j.comm.annotation.Restricted; +import org.dromara.sms4j.comm.delayedTime.DelayedTime; +import org.dromara.sms4j.comm.exception.SmsBlendException; +import org.dromara.sms4j.tencent.config.TencentConfig; import lombok.extern.slf4j.Slf4j; import java.util.*; diff --git a/sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/config/UniConfig.java b/sms-aggregation-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniConfig.java similarity index 91% rename from sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/config/UniConfig.java rename to sms-aggregation-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniConfig.java index 7380dc82..ac977936 100644 --- a/sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/config/UniConfig.java +++ b/sms-aggregation-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniConfig.java @@ -1,4 +1,4 @@ -package org.dromara.sms.unisms.config; +package org.dromara.sms4j.unisms.config; import lombok.Data; diff --git a/sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/config/UniSmsConfig.java b/sms-aggregation-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniSmsConfig.java similarity index 91% rename from sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/config/UniSmsConfig.java rename to sms-aggregation-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniSmsConfig.java index 96b07a3b..c8cb9661 100644 --- a/sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/config/UniSmsConfig.java +++ b/sms-aggregation-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniSmsConfig.java @@ -1,8 +1,8 @@ -package org.dromara.sms.unisms.config; +package org.dromara.sms4j.unisms.config; import com.apistd.uni.Uni; -import org.dromara.sms.comm.factory.BeanFactory; -import org.dromara.sms.unisms.service.UniSmsImpl; +import org.dromara.sms4j.comm.factory.BeanFactory; +import org.dromara.sms4j.unisms.service.UniSmsImpl; /** * UniSmsConfig diff --git a/sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/service/UniSmsImpl.java b/sms-aggregation-unisms/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java similarity index 92% rename from sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/service/UniSmsImpl.java rename to sms-aggregation-unisms/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java index 663be54f..8314e0c9 100644 --- a/sms-aggregation-unisms/src/main/java/org/dromara/sms/unisms/service/UniSmsImpl.java +++ b/sms-aggregation-unisms/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java @@ -1,16 +1,16 @@ -package org.dromara.sms.unisms.service; +package org.dromara.sms4j.unisms.service; import com.apistd.uni.UniResponse; import com.apistd.uni.sms.UniMessage; import com.apistd.uni.sms.UniSMS; -import org.dromara.sms.api.SmsBlend; -import org.dromara.sms.api.callback.CallBack; -import org.dromara.sms.api.entity.SmsResponse; -import org.dromara.sms.comm.annotation.Restricted; -import org.dromara.sms.comm.delayedTime.DelayedTime; -import org.dromara.sms.comm.exception.SmsBlendException; -import org.dromara.sms.comm.utils.http.HttpJsonTool; -import org.dromara.sms.unisms.config.UniConfig; +import org.dromara.sms4j.api.SmsBlend; +import org.dromara.sms4j.api.callback.CallBack; +import org.dromara.sms4j.api.entity.SmsResponse; +import org.dromara.sms4j.comm.annotation.Restricted; +import org.dromara.sms4j.comm.delayedTime.DelayedTime; +import org.dromara.sms4j.comm.exception.SmsBlendException; +import org.dromara.sms4j.comm.utils.http.HttpJsonTool; +import org.dromara.sms4j.unisms.config.UniConfig; import lombok.extern.slf4j.Slf4j; import java.util.LinkedHashMap; diff --git a/sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/config/YunPianSmsConfig.java b/sms-aggregation-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunPianSmsConfig.java similarity index 76% rename from sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/config/YunPianSmsConfig.java rename to sms-aggregation-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunPianSmsConfig.java index 90106ade..e796117e 100644 --- a/sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/config/YunPianSmsConfig.java +++ b/sms-aggregation-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunPianSmsConfig.java @@ -1,9 +1,9 @@ -package org.dromara.sms.yunpian.config; +package org.dromara.sms4j.yunpian.config; import com.dtflys.forest.Forest; import com.dtflys.forest.config.ForestConfiguration; -import org.dromara.sms.api.SmsBlend; -import org.dromara.sms.yunpian.service.YunPianSmsImpl; +import org.dromara.sms4j.api.SmsBlend; +import org.dromara.sms4j.yunpian.service.YunPianSmsImpl; public class YunPianSmsConfig { diff --git a/sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/config/YunpianConfig.java b/sms-aggregation-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunpianConfig.java similarity index 90% rename from sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/config/YunpianConfig.java rename to sms-aggregation-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunpianConfig.java index ebf2a407..ee3791ec 100644 --- a/sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/config/YunpianConfig.java +++ b/sms-aggregation-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunpianConfig.java @@ -1,4 +1,4 @@ -package org.dromara.sms.yunpian.config; +package org.dromara.sms4j.yunpian.config; import lombok.Data; diff --git a/sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/service/YunPianSmsImpl.java b/sms-aggregation-yunpian/src/main/java/org/dromara/sms4j/yunpian/service/YunPianSmsImpl.java similarity index 92% rename from sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/service/YunPianSmsImpl.java rename to sms-aggregation-yunpian/src/main/java/org/dromara/sms4j/yunpian/service/YunPianSmsImpl.java index dff2fb08..9bcf24c8 100644 --- a/sms-aggregation-yunpian/src/main/java/org/dromara/sms/yunpian/service/YunPianSmsImpl.java +++ b/sms-aggregation-yunpian/src/main/java/org/dromara/sms4j/yunpian/service/YunPianSmsImpl.java @@ -1,21 +1,21 @@ -package org.dromara.sms.yunpian.service; +package org.dromara.sms4j.yunpian.service; import com.alibaba.fastjson.JSONObject; import com.dtflys.forest.config.ForestConfiguration; -import org.dromara.sms.api.SmsBlend; -import org.dromara.sms.api.callback.CallBack; -import org.dromara.sms.api.entity.SmsResponse; -import org.dromara.sms.comm.annotation.Restricted; -import org.dromara.sms.comm.constant.Constant; -import org.dromara.sms.comm.delayedTime.DelayedTime; -import org.dromara.sms.comm.exception.SmsBlendException; -import org.dromara.sms.yunpian.config.YunpianConfig; +import org.dromara.sms4j.api.SmsBlend; +import org.dromara.sms4j.api.callback.CallBack; +import org.dromara.sms4j.api.entity.SmsResponse; +import org.dromara.sms4j.comm.annotation.Restricted; +import org.dromara.sms4j.comm.constant.Constant; +import org.dromara.sms4j.comm.delayedTime.DelayedTime; +import org.dromara.sms4j.comm.exception.SmsBlendException; +import org.dromara.sms4j.yunpian.config.YunpianConfig; import java.util.*; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicReference; -import static org.dromara.sms.comm.utils.SmsUtil.listToString; +import static org.dromara.sms4j.comm.utils.SmsUtil.listToString; public class YunPianSmsImpl implements SmsBlend { From a2099cd842e2af7e5e1ec0f3f4a094c48a91f484 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 12 Apr 2023 22:18:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=90=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=20artifactId=20=E5=89=8D=E7=BC=80=E4=B8=BA=20sms4j?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .flattened-pom.xml | 52 +++++++------- README.md | 2 +- pom.xml | 52 +++++++------- .../.flattened-pom.xml | 10 +-- .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../pom.xml | 10 +-- .../sms4j/aliyun/config/AlibabaConfig.java | 0 .../sms4j/aliyun/config/AlibabaSmsConfig.java | 0 .../sms4j/aliyun/service/AlibabaSmsImpl.java | 0 .../src/main/resources/application.properties | 0 .../.flattened-pom.xml | 8 +-- .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 {sms-aggregation-api => sms4j-api}/pom.xml | 8 +-- .../java/org/dromara/sms4j/api/SmsBlend.java | 0 .../dromara/sms4j/api/callback/CallBack.java | 0 .../dromara/sms4j/api/entity/SmsResponse.java | 0 .../src/main/resources/application.properties | 0 .../.flattened-pom.xml | 8 +-- .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../pom.xml | 8 +-- .../sms4j/autoimmit/aop/AopAdvice.java | 0 .../autoimmit/config/SmsAutowiredConfig.java | 0 .../autoimmit/config/SupplierConfig.java | 0 .../sms4j/autoimmit/utils/ConfigUtil.java | 0 .../sms4j/autoimmit/utils/RedisUtils.java | 0 .../sms4j/autoimmit/utils/SpringUtil.java | 0 .../src/main/resources/application.properties | 0 .../.flattened-pom.xml | 10 +-- .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../pom.xml | 10 +-- .../sms4j/cloopen/config/CloopenConfig.java | 0 .../cloopen/config/CloopenSmsConfig.java | 0 .../sms4j/cloopen/service/CloopenSmsImpl.java | 0 .../src/main/resources/application.properties | 0 .../.flattened-pom.xml | 6 +- .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 {sms-aggregation-comm => sms4j-comm}/pom.xml | 6 +- .../sms4j/comm/annotation/Restricted.java | 0 .../dromara/sms4j/comm/config/SmsBanner.java | 0 .../dromara/sms4j/comm/config/SmsConfig.java | 0 .../sms4j/comm/config/SmsSqlConfig.java | 0 .../dromara/sms4j/comm/constant/Constant.java | 0 .../sms4j/comm/delayedTime/DelayedTime.java | 0 .../dromara/sms4j/comm/delayedTime/Task.java | 0 .../sms4j/comm/enumerate/ConfigType.java | 0 .../sms4j/comm/enumerate/SupplierType.java | 0 .../comm/exception/SmsBlendException.java | 0 .../sms4j/comm/exception/SmsSqlException.java | 0 .../sms4j/comm/factory/BeanFactory.java | 0 .../dromara/sms4j/comm/utils/FileTool.java | 0 .../dromara/sms4j/comm/utils/JDBCTool.java | 0 .../dromara/sms4j/comm/utils/SettingUtil.java | 0 .../org/dromara/sms4j/comm/utils/SmsUtil.java | 0 .../comm/utils/TimeExpiredPoolCache.java | 0 .../sms4j/comm/utils/http/HttpJsonTool.java | 0 .../src/main/resources/application.properties | 0 .../.flattened-pom.xml | 22 +++--- {sms-aggregation-core => sms4j-core}/pom.xml | 22 +++--- .../dromara/sms4j/core/SupplierSqlConfig.java | 0 .../sms4j/core/config/SupplierFactory.java | 0 .../sms4j/core/factory/SmsFactory.java | 0 .../src/main/resources/application.properties | 0 .../.flattened-pom.xml | 10 +-- .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 {sms-aggregation-emay => sms4j-emay}/pom.xml | 10 +-- .../dromara/sms4j/emay/config/EmayConfig.java | 0 .../sms4j/emay/config/EmaySmsConfig.java | 0 .../sms4j/emay/service/EmaySmsImpl.java | 0 .../dromara/sms4j/emay/util/EmayBuilder.java | 0 .../src/main/resources/application.properties | 0 .../.flattened-pom.xml | 10 +-- .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../pom.xml | 10 +-- .../sms4j/huawei/config/HuaweiConfig.java | 0 .../sms4j/huawei/config/HuaweiSmsConfig.java | 0 .../sms4j/huawei/entity/HuaweiError.java | 0 .../sms4j/huawei/entity/HuaweiResponse.java | 0 .../dromara/sms4j/huawei/entity/SmsId.java | 0 .../sms4j/huawei/service/HuaweiSmsImpl.java | 0 .../sms4j/huawei/utils/HuaweiBuilder.java | 0 .../src/main/resources/application.properties | 0 .../.flattened-pom.xml | 10 +-- .../.mvn/wrapper/maven-wrapper.jar | Bin .../.mvn/wrapper/maven-wrapper.properties | 0 .../pom.xml | 10 +-- .../sms4j/jdcloud/config/JdCloudConfig.java | 0 .../jdcloud/config/JdCloudSmsConfig.java | 0 .../sms4j/jdcloud/service/JdCloudSmsImpl.java | 0 .../src/main/resources/application.properties | 0 .../.flattened-pom.xml | 8 +-- .../pom.xml | 8 +-- .../sms4j/starter/config/SmsMainConfig.java | 0 .../main/resources/META-INF/spring.factories | 0 ...ot.autoconfigure.AutoConfiguration.imports | 0 .../src/main/resources/application.properties | 0 .../.flattened-pom.xml | 10 +-- .../pom.xml | 10 +-- .../sms4j/tencent/config/TencentConfig.java | 0 .../tencent/config/TencentSmsConfig.java | 0 .../sms4j/tencent/service/TencentSmsImpl.java | 0 .../src/main/resources/application.properties | 0 .../.flattened-pom.xml | 10 +-- .../pom.xml | 10 +-- .../sms4j/unisms/config/UniConfig.java | 0 .../sms4j/unisms/config/UniSmsConfig.java | 0 .../sms4j/unisms/service/UniSmsImpl.java | 0 .../src/main/resources/application.properties | 0 .../.flattened-pom.xml | 66 +++++++++--------- .../pom.xml | 10 +-- .../yunpian/config/YunPianSmsConfig.java | 0 .../sms4j/yunpian/config/YunpianConfig.java | 0 .../sms4j/yunpian/service/YunPianSmsImpl.java | 0 .../src/main/resources/application.properties | 0 120 files changed, 213 insertions(+), 213 deletions(-) rename {sms-aggregation-aliyun => sms4j-aliyun}/.flattened-pom.xml (86%) rename {sms-aggregation-aliyun => sms4j-aliyun}/.mvn/wrapper/maven-wrapper.jar (100%) rename {sms-aggregation-aliyun => sms4j-aliyun}/.mvn/wrapper/maven-wrapper.properties (100%) rename {sms-aggregation-aliyun => sms4j-aliyun}/pom.xml (85%) rename {sms-aggregation-aliyun => sms4j-aliyun}/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaConfig.java (100%) rename {sms-aggregation-aliyun => sms4j-aliyun}/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaSmsConfig.java (100%) rename {sms-aggregation-aliyun => sms4j-aliyun}/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java (100%) rename {sms-aggregation-aliyun => sms4j-aliyun}/src/main/resources/application.properties (100%) rename {sms-aggregation-api => sms4j-api}/.flattened-pom.xml (82%) rename {sms-aggregation-api => sms4j-api}/.mvn/wrapper/maven-wrapper.jar (100%) rename {sms-aggregation-api => sms4j-api}/.mvn/wrapper/maven-wrapper.properties (100%) rename {sms-aggregation-api => sms4j-api}/pom.xml (78%) rename {sms-aggregation-api => sms4j-api}/src/main/java/org/dromara/sms4j/api/SmsBlend.java (100%) rename {sms-aggregation-api => sms4j-api}/src/main/java/org/dromara/sms4j/api/callback/CallBack.java (100%) rename {sms-aggregation-api => sms4j-api}/src/main/java/org/dromara/sms4j/api/entity/SmsResponse.java (100%) rename {sms-aggregation-api => sms4j-api}/src/main/resources/application.properties (100%) rename {sms-aggregation-autoimmit => sms4j-autoimmit}/.flattened-pom.xml (87%) rename {sms-aggregation-autoimmit => sms4j-autoimmit}/.mvn/wrapper/maven-wrapper.jar (100%) rename {sms-aggregation-autoimmit => sms4j-autoimmit}/.mvn/wrapper/maven-wrapper.properties (100%) rename {sms-aggregation-autoimmit => sms4j-autoimmit}/pom.xml (85%) rename {sms-aggregation-autoimmit => sms4j-autoimmit}/src/main/java/org/dromara/sms4j/autoimmit/aop/AopAdvice.java (100%) rename {sms-aggregation-autoimmit => sms4j-autoimmit}/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java (100%) rename {sms-aggregation-autoimmit => sms4j-autoimmit}/src/main/java/org/dromara/sms4j/autoimmit/config/SupplierConfig.java (100%) rename {sms-aggregation-autoimmit => sms4j-autoimmit}/src/main/java/org/dromara/sms4j/autoimmit/utils/ConfigUtil.java (100%) rename {sms-aggregation-autoimmit => sms4j-autoimmit}/src/main/java/org/dromara/sms4j/autoimmit/utils/RedisUtils.java (100%) rename {sms-aggregation-autoimmit => sms4j-autoimmit}/src/main/java/org/dromara/sms4j/autoimmit/utils/SpringUtil.java (100%) rename {sms-aggregation-autoimmit => sms4j-autoimmit}/src/main/resources/application.properties (100%) rename {sms-aggregation-cloopen => sms4j-cloopen}/.flattened-pom.xml (81%) rename {sms-aggregation-cloopen => sms4j-cloopen}/.mvn/wrapper/maven-wrapper.jar (100%) rename {sms-aggregation-cloopen => sms4j-cloopen}/.mvn/wrapper/maven-wrapper.properties (100%) rename {sms-aggregation-cloopen => sms4j-cloopen}/pom.xml (78%) rename {sms-aggregation-cloopen => sms4j-cloopen}/src/main/java/org/dromara/sms4j/cloopen/config/CloopenConfig.java (100%) rename {sms-aggregation-cloopen => sms4j-cloopen}/src/main/java/org/dromara/sms4j/cloopen/config/CloopenSmsConfig.java (100%) rename {sms-aggregation-cloopen => sms4j-cloopen}/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java (100%) rename {sms-aggregation-cloopen => sms4j-cloopen}/src/main/resources/application.properties (100%) rename {sms-aggregation-comm => sms4j-comm}/.flattened-pom.xml (88%) rename {sms-aggregation-comm => sms4j-comm}/.mvn/wrapper/maven-wrapper.jar (100%) rename {sms-aggregation-comm => sms4j-comm}/.mvn/wrapper/maven-wrapper.properties (100%) rename {sms-aggregation-comm => sms4j-comm}/pom.xml (86%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/annotation/Restricted.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/config/SmsBanner.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/config/SmsConfig.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/config/SmsSqlConfig.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/constant/Constant.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/delayedTime/DelayedTime.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/delayedTime/Task.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/enumerate/ConfigType.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/enumerate/SupplierType.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/exception/SmsBlendException.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/exception/SmsSqlException.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/factory/BeanFactory.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/utils/FileTool.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/utils/JDBCTool.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/utils/SettingUtil.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/utils/SmsUtil.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/utils/TimeExpiredPoolCache.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/java/org/dromara/sms4j/comm/utils/http/HttpJsonTool.java (100%) rename {sms-aggregation-comm => sms4j-comm}/src/main/resources/application.properties (100%) rename {sms-aggregation-core => sms4j-core}/.flattened-pom.xml (71%) rename {sms-aggregation-core => sms4j-core}/pom.xml (68%) rename {sms-aggregation-core => sms4j-core}/src/main/java/org/dromara/sms4j/core/SupplierSqlConfig.java (100%) rename {sms-aggregation-core => sms4j-core}/src/main/java/org/dromara/sms4j/core/config/SupplierFactory.java (100%) rename {sms-aggregation-core => sms4j-core}/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java (100%) rename {sms-aggregation-core => sms4j-core}/src/main/resources/application.properties (100%) rename {sms-aggregation-yunpian => sms4j-emay}/.flattened-pom.xml (79%) rename {sms-aggregation-emay => sms4j-emay}/.mvn/wrapper/maven-wrapper.jar (100%) rename {sms-aggregation-emay => sms4j-emay}/.mvn/wrapper/maven-wrapper.properties (100%) rename {sms-aggregation-emay => sms4j-emay}/pom.xml (76%) rename {sms-aggregation-emay => sms4j-emay}/src/main/java/org/dromara/sms4j/emay/config/EmayConfig.java (100%) rename {sms-aggregation-emay => sms4j-emay}/src/main/java/org/dromara/sms4j/emay/config/EmaySmsConfig.java (100%) rename {sms-aggregation-emay => sms4j-emay}/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java (100%) rename {sms-aggregation-emay => sms4j-emay}/src/main/java/org/dromara/sms4j/emay/util/EmayBuilder.java (100%) rename {sms-aggregation-emay => sms4j-emay}/src/main/resources/application.properties (100%) rename {sms-aggregation-huawei => sms4j-huawei}/.flattened-pom.xml (79%) rename {sms-aggregation-huawei => sms4j-huawei}/.mvn/wrapper/maven-wrapper.jar (100%) rename {sms-aggregation-huawei => sms4j-huawei}/.mvn/wrapper/maven-wrapper.properties (100%) rename {sms-aggregation-huawei => sms4j-huawei}/pom.xml (76%) rename {sms-aggregation-huawei => sms4j-huawei}/src/main/java/org/dromara/sms4j/huawei/config/HuaweiConfig.java (100%) rename {sms-aggregation-huawei => sms4j-huawei}/src/main/java/org/dromara/sms4j/huawei/config/HuaweiSmsConfig.java (100%) rename {sms-aggregation-huawei => sms4j-huawei}/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiError.java (100%) rename {sms-aggregation-huawei => sms4j-huawei}/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiResponse.java (100%) rename {sms-aggregation-huawei => sms4j-huawei}/src/main/java/org/dromara/sms4j/huawei/entity/SmsId.java (100%) rename {sms-aggregation-huawei => sms4j-huawei}/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java (100%) rename {sms-aggregation-huawei => sms4j-huawei}/src/main/java/org/dromara/sms4j/huawei/utils/HuaweiBuilder.java (100%) rename {sms-aggregation-huawei => sms4j-huawei}/src/main/resources/application.properties (100%) rename {sms-aggregation-jdcloud => sms4j-jdcloud}/.flattened-pom.xml (81%) rename {sms-aggregation-jdcloud => sms4j-jdcloud}/.mvn/wrapper/maven-wrapper.jar (100%) rename {sms-aggregation-jdcloud => sms4j-jdcloud}/.mvn/wrapper/maven-wrapper.properties (100%) rename {sms-aggregation-jdcloud => sms4j-jdcloud}/pom.xml (78%) rename {sms-aggregation-jdcloud => sms4j-jdcloud}/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudConfig.java (100%) rename {sms-aggregation-jdcloud => sms4j-jdcloud}/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudSmsConfig.java (100%) rename {sms-aggregation-jdcloud => sms4j-jdcloud}/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java (100%) rename {sms-aggregation-jdcloud => sms4j-jdcloud}/src/main/resources/application.properties (100%) rename {sms-aggregation-spring-boot-starter => sms4j-spring-boot-starter}/.flattened-pom.xml (84%) rename {sms-aggregation-spring-boot-starter => sms4j-spring-boot-starter}/pom.xml (83%) rename {sms-aggregation-spring-boot-starter => sms4j-spring-boot-starter}/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java (100%) rename {sms-aggregation-spring-boot-starter => sms4j-spring-boot-starter}/src/main/resources/META-INF/spring.factories (100%) rename {sms-aggregation-spring-boot-starter => sms4j-spring-boot-starter}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%) rename {sms-aggregation-spring-boot-starter => sms4j-spring-boot-starter}/src/main/resources/application.properties (100%) rename {sms-aggregation-tencent => sms4j-tencent}/.flattened-pom.xml (82%) rename {sms-aggregation-tencent => sms4j-tencent}/pom.xml (80%) rename {sms-aggregation-tencent => sms4j-tencent}/src/main/java/org/dromara/sms4j/tencent/config/TencentConfig.java (100%) rename {sms-aggregation-tencent => sms4j-tencent}/src/main/java/org/dromara/sms4j/tencent/config/TencentSmsConfig.java (100%) rename {sms-aggregation-tencent => sms4j-tencent}/src/main/java/org/dromara/sms4j/tencent/service/TencentSmsImpl.java (100%) rename {sms-aggregation-tencent => sms4j-tencent}/src/main/resources/application.properties (100%) rename {sms-aggregation-unisms => sms4j-unisms}/.flattened-pom.xml (82%) rename {sms-aggregation-unisms => sms4j-unisms}/pom.xml (80%) rename {sms-aggregation-unisms => sms4j-unisms}/src/main/java/org/dromara/sms4j/unisms/config/UniConfig.java (100%) rename {sms-aggregation-unisms => sms4j-unisms}/src/main/java/org/dromara/sms4j/unisms/config/UniSmsConfig.java (100%) rename {sms-aggregation-unisms => sms4j-unisms}/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java (100%) rename {sms-aggregation-unisms => sms4j-unisms}/src/main/resources/application.properties (100%) rename {sms-aggregation-emay => sms4j-yunpian}/.flattened-pom.xml (77%) rename {sms-aggregation-yunpian => sms4j-yunpian}/pom.xml (75%) rename {sms-aggregation-yunpian => sms4j-yunpian}/src/main/java/org/dromara/sms4j/yunpian/config/YunPianSmsConfig.java (100%) rename {sms-aggregation-yunpian => sms4j-yunpian}/src/main/java/org/dromara/sms4j/yunpian/config/YunpianConfig.java (100%) rename {sms-aggregation-yunpian => sms4j-yunpian}/src/main/java/org/dromara/sms4j/yunpian/service/YunPianSmsImpl.java (100%) rename {sms-aggregation-yunpian => sms4j-yunpian}/src/main/resources/application.properties (100%) diff --git a/.flattened-pom.xml b/.flattened-pom.xml index 56422eb2..a9c9fa1b 100644 --- a/.flattened-pom.xml +++ b/.flattened-pom.xml @@ -24,19 +24,19 @@ - sms-aggregation-comm - sms-aggregation-api - sms-aggregation-core - sms-aggregation-autoimmit - sms-aggregation-spring-boot-starter - sms-aggregation-aliyun - sms-aggregation-tencent - sms-aggregation-unisms - sms-aggregation-yunpian - sms-aggregation-huawei - sms-aggregation-jdcloud - sms-aggregation-cloopen - sms-aggregation-emay + sms4j-comm + sms4j-api + sms4j-core + sms4j-autoimmit + sms4j-spring-boot-starter + sms4j-aliyun + sms4j-tencent + sms4j-unisms + sms4j-yunpian + sms4j-huawei + sms4j-jdcloud + sms4j-cloopen + sms4j-emay scm:git:https://gitee.com/MR-wind/sms_aggregation.git @@ -83,67 +83,67 @@ org.dromara.sms4j - sms-aggregation-spring-boot-starter + sms4j-spring-boot-starter 1.0.5 org.dromara.sms4j - sms-aggregation-autoimmit + sms4j-autoimmit 1.0.5 org.dromara.sms4j - sms-aggregation-core + sms4j-core 1.0.5 org.dromara.sms4j - sms-aggregation-comm + sms4j-comm 1.0.5 org.dromara.sms4j - sms-aggregation-api + sms4j-api 1.0.5 org.dromara.sms4j - sms-aggregation-aliyun + sms4j-aliyun 1.0.5 org.dromara.sms4j - sms-aggregation-tencent + sms4j-tencent 1.0.5 org.dromara.sms4j - sms-aggregation-unisms + sms4j-unisms 1.0.5 org.dromara.sms4j - sms-aggregation-yunpian + sms4j-yunpian 1.0.5 org.dromara.sms4j - sms-aggregation-huawei + sms4j-huawei 1.0.5 org.dromara.sms4j - sms-aggregation-jdcloud + sms4j-jdcloud 1.0.5 org.dromara.sms4j - sms-aggregation-cloopen + sms4j-cloopen 1.0.5 org.dromara.sms4j - sms-aggregation-emay + sms4j-emay 1.0.5 diff --git a/README.md b/README.md index 787219da..2604c5c9 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ ```xml org.dromara.sms4j - sms-aggregation-spring-boot-starter + sms4j-spring-boot-starter version ``` diff --git a/pom.xml b/pom.xml index 7a4a9a6b..65b3a25c 100644 --- a/pom.xml +++ b/pom.xml @@ -12,19 +12,19 @@ https://gitee.com/dromara/sms_aggregation - sms-aggregation-comm - sms-aggregation-api - sms-aggregation-core - sms-aggregation-autoimmit - sms-aggregation-spring-boot-starter - sms-aggregation-aliyun - sms-aggregation-tencent - sms-aggregation-unisms - sms-aggregation-yunpian - sms-aggregation-huawei - sms-aggregation-jdcloud - sms-aggregation-cloopen - sms-aggregation-emay + sms4j-comm + sms4j-api + sms4j-core + sms4j-autoimmit + sms4j-spring-boot-starter + sms4j-aliyun + sms4j-tencent + sms4j-unisms + sms4j-yunpian + sms4j-huawei + sms4j-jdcloud + sms4j-cloopen + sms4j-emay @@ -87,81 +87,81 @@ org.dromara.sms4j - sms-aggregation-spring-boot-starter + sms4j-spring-boot-starter ${revision} org.dromara.sms4j - sms-aggregation-autoimmit + sms4j-autoimmit ${revision} org.dromara.sms4j - sms-aggregation-core + sms4j-core ${revision} org.dromara.sms4j - sms-aggregation-comm + sms4j-comm ${revision} org.dromara.sms4j - sms-aggregation-api + sms4j-api ${revision} org.dromara.sms4j - sms-aggregation-aliyun + sms4j-aliyun ${revision} org.dromara.sms4j - sms-aggregation-tencent + sms4j-tencent ${revision} org.dromara.sms4j - sms-aggregation-unisms + sms4j-unisms ${revision} org.dromara.sms4j - sms-aggregation-yunpian + sms4j-yunpian ${revision} org.dromara.sms4j - sms-aggregation-huawei + sms4j-huawei ${revision} org.dromara.sms4j - sms-aggregation-jdcloud + sms4j-jdcloud ${revision} org.dromara.sms4j - sms-aggregation-cloopen + sms4j-cloopen ${revision} org.dromara.sms4j - sms-aggregation-emay + sms4j-emay ${revision} diff --git a/sms-aggregation-aliyun/.flattened-pom.xml b/sms4j-aliyun/.flattened-pom.xml similarity index 86% rename from sms-aggregation-aliyun/.flattened-pom.xml rename to sms4j-aliyun/.flattened-pom.xml index 4f03d3c3..33083ab0 100644 --- a/sms-aggregation-aliyun/.flattened-pom.xml +++ b/sms4j-aliyun/.flattened-pom.xml @@ -8,10 +8,10 @@ 1.0.5 org.dromara.sms4j - sms-aggregation-aliyun + sms4j-aliyun 1.0.5 - sms-aggregation-aliyun - sms-aggregation-aliyun + sms4j-aliyun + sms4j-aliyun Apache 2 @@ -37,11 +37,11 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm org.dromara.sms4j - sms-aggregation-api + sms4j-api com.squareup.okhttp3 diff --git a/sms-aggregation-aliyun/.mvn/wrapper/maven-wrapper.jar b/sms4j-aliyun/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from sms-aggregation-aliyun/.mvn/wrapper/maven-wrapper.jar rename to sms4j-aliyun/.mvn/wrapper/maven-wrapper.jar diff --git a/sms-aggregation-aliyun/.mvn/wrapper/maven-wrapper.properties b/sms4j-aliyun/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from sms-aggregation-aliyun/.mvn/wrapper/maven-wrapper.properties rename to sms4j-aliyun/.mvn/wrapper/maven-wrapper.properties diff --git a/sms-aggregation-aliyun/pom.xml b/sms4j-aliyun/pom.xml similarity index 85% rename from sms-aggregation-aliyun/pom.xml rename to sms4j-aliyun/pom.xml index 3142a043..9c1574d7 100644 --- a/sms-aggregation-aliyun/pom.xml +++ b/sms4j-aliyun/pom.xml @@ -9,9 +9,9 @@ ../pom.xml - sms-aggregation-aliyun - sms-aggregation-aliyun - sms-aggregation-aliyun + sms4j-aliyun + sms4j-aliyun + sms4j-aliyun ${revision} @@ -37,12 +37,12 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm org.dromara.sms4j - sms-aggregation-api + sms4j-api diff --git a/sms-aggregation-aliyun/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaConfig.java b/sms4j-aliyun/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaConfig.java similarity index 100% rename from sms-aggregation-aliyun/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaConfig.java rename to sms4j-aliyun/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaConfig.java diff --git a/sms-aggregation-aliyun/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaSmsConfig.java b/sms4j-aliyun/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaSmsConfig.java similarity index 100% rename from sms-aggregation-aliyun/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaSmsConfig.java rename to sms4j-aliyun/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaSmsConfig.java diff --git a/sms-aggregation-aliyun/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java b/sms4j-aliyun/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java similarity index 100% rename from sms-aggregation-aliyun/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java rename to sms4j-aliyun/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java diff --git a/sms-aggregation-aliyun/src/main/resources/application.properties b/sms4j-aliyun/src/main/resources/application.properties similarity index 100% rename from sms-aggregation-aliyun/src/main/resources/application.properties rename to sms4j-aliyun/src/main/resources/application.properties diff --git a/sms-aggregation-api/.flattened-pom.xml b/sms4j-api/.flattened-pom.xml similarity index 82% rename from sms-aggregation-api/.flattened-pom.xml rename to sms4j-api/.flattened-pom.xml index 849205f3..8841bd64 100644 --- a/sms-aggregation-api/.flattened-pom.xml +++ b/sms4j-api/.flattened-pom.xml @@ -8,10 +8,10 @@ 1.0.5 org.dromara.sms4j - sms-aggregation-api + sms4j-api 1.0.5 - sms-aggregation-api - sms-aggregation-api + sms4j-api + sms4j-api Apache 2 @@ -23,7 +23,7 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm diff --git a/sms-aggregation-api/.mvn/wrapper/maven-wrapper.jar b/sms4j-api/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from sms-aggregation-api/.mvn/wrapper/maven-wrapper.jar rename to sms4j-api/.mvn/wrapper/maven-wrapper.jar diff --git a/sms-aggregation-api/.mvn/wrapper/maven-wrapper.properties b/sms4j-api/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from sms-aggregation-api/.mvn/wrapper/maven-wrapper.properties rename to sms4j-api/.mvn/wrapper/maven-wrapper.properties diff --git a/sms-aggregation-api/pom.xml b/sms4j-api/pom.xml similarity index 78% rename from sms-aggregation-api/pom.xml rename to sms4j-api/pom.xml index 10ae0946..215d99dd 100644 --- a/sms-aggregation-api/pom.xml +++ b/sms4j-api/pom.xml @@ -9,9 +9,9 @@ ../pom.xml - sms-aggregation-api - sms-aggregation-api - sms-aggregation-api + sms4j-api + sms4j-api + sms4j-api ${revision} @@ -20,7 +20,7 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm diff --git a/sms-aggregation-api/src/main/java/org/dromara/sms4j/api/SmsBlend.java b/sms4j-api/src/main/java/org/dromara/sms4j/api/SmsBlend.java similarity index 100% rename from sms-aggregation-api/src/main/java/org/dromara/sms4j/api/SmsBlend.java rename to sms4j-api/src/main/java/org/dromara/sms4j/api/SmsBlend.java diff --git a/sms-aggregation-api/src/main/java/org/dromara/sms4j/api/callback/CallBack.java b/sms4j-api/src/main/java/org/dromara/sms4j/api/callback/CallBack.java similarity index 100% rename from sms-aggregation-api/src/main/java/org/dromara/sms4j/api/callback/CallBack.java rename to sms4j-api/src/main/java/org/dromara/sms4j/api/callback/CallBack.java diff --git a/sms-aggregation-api/src/main/java/org/dromara/sms4j/api/entity/SmsResponse.java b/sms4j-api/src/main/java/org/dromara/sms4j/api/entity/SmsResponse.java similarity index 100% rename from sms-aggregation-api/src/main/java/org/dromara/sms4j/api/entity/SmsResponse.java rename to sms4j-api/src/main/java/org/dromara/sms4j/api/entity/SmsResponse.java diff --git a/sms-aggregation-api/src/main/resources/application.properties b/sms4j-api/src/main/resources/application.properties similarity index 100% rename from sms-aggregation-api/src/main/resources/application.properties rename to sms4j-api/src/main/resources/application.properties diff --git a/sms-aggregation-autoimmit/.flattened-pom.xml b/sms4j-autoimmit/.flattened-pom.xml similarity index 87% rename from sms-aggregation-autoimmit/.flattened-pom.xml rename to sms4j-autoimmit/.flattened-pom.xml index efc683cf..a14a033f 100644 --- a/sms-aggregation-autoimmit/.flattened-pom.xml +++ b/sms4j-autoimmit/.flattened-pom.xml @@ -8,10 +8,10 @@ 1.0.5 org.dromara.sms4j - sms-aggregation-autoimmit + sms4j-autoimmit 1.0.5 - sms-aggregation-autoimmit - sms-aggregation-autoimmit + sms4j-autoimmit + sms4j-autoimmit Apache 2 @@ -31,7 +31,7 @@ org.dromara.sms4j - sms-aggregation-core + sms4j-core org.springframework.boot diff --git a/sms-aggregation-autoimmit/.mvn/wrapper/maven-wrapper.jar b/sms4j-autoimmit/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from sms-aggregation-autoimmit/.mvn/wrapper/maven-wrapper.jar rename to sms4j-autoimmit/.mvn/wrapper/maven-wrapper.jar diff --git a/sms-aggregation-autoimmit/.mvn/wrapper/maven-wrapper.properties b/sms4j-autoimmit/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from sms-aggregation-autoimmit/.mvn/wrapper/maven-wrapper.properties rename to sms4j-autoimmit/.mvn/wrapper/maven-wrapper.properties diff --git a/sms-aggregation-autoimmit/pom.xml b/sms4j-autoimmit/pom.xml similarity index 85% rename from sms-aggregation-autoimmit/pom.xml rename to sms4j-autoimmit/pom.xml index fb132ea4..2b21aba6 100644 --- a/sms-aggregation-autoimmit/pom.xml +++ b/sms4j-autoimmit/pom.xml @@ -9,10 +9,10 @@ ../pom.xml - sms-aggregation-autoimmit + sms4j-autoimmit ${revision} - sms-aggregation-autoimmit - sms-aggregation-autoimmit + sms4j-autoimmit + sms4j-autoimmit @@ -31,7 +31,7 @@ org.dromara.sms4j - sms-aggregation-core + sms4j-core diff --git a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/aop/AopAdvice.java b/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/aop/AopAdvice.java similarity index 100% rename from sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/aop/AopAdvice.java rename to sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/aop/AopAdvice.java diff --git a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java b/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java similarity index 100% rename from sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java rename to sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java diff --git a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SupplierConfig.java b/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SupplierConfig.java similarity index 100% rename from sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SupplierConfig.java rename to sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SupplierConfig.java diff --git a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/ConfigUtil.java b/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/ConfigUtil.java similarity index 100% rename from sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/ConfigUtil.java rename to sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/ConfigUtil.java diff --git a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/RedisUtils.java b/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/RedisUtils.java similarity index 100% rename from sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/RedisUtils.java rename to sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/RedisUtils.java diff --git a/sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/SpringUtil.java b/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/SpringUtil.java similarity index 100% rename from sms-aggregation-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/SpringUtil.java rename to sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/SpringUtil.java diff --git a/sms-aggregation-autoimmit/src/main/resources/application.properties b/sms4j-autoimmit/src/main/resources/application.properties similarity index 100% rename from sms-aggregation-autoimmit/src/main/resources/application.properties rename to sms4j-autoimmit/src/main/resources/application.properties diff --git a/sms-aggregation-cloopen/.flattened-pom.xml b/sms4j-cloopen/.flattened-pom.xml similarity index 81% rename from sms-aggregation-cloopen/.flattened-pom.xml rename to sms4j-cloopen/.flattened-pom.xml index ab08ea53..9e998a2e 100644 --- a/sms-aggregation-cloopen/.flattened-pom.xml +++ b/sms4j-cloopen/.flattened-pom.xml @@ -8,10 +8,10 @@ 1.0.5 org.dromara.sms4j - sms-aggregation-cloopen + sms4j-cloopen 1.0.5 - sms-aggregation-cloopen - sms-aggregation-cloopen + sms4j-cloopen + sms4j-cloopen Apache 2 @@ -27,11 +27,11 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm org.dromara.sms4j - sms-aggregation-api + sms4j-api diff --git a/sms-aggregation-cloopen/.mvn/wrapper/maven-wrapper.jar b/sms4j-cloopen/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from sms-aggregation-cloopen/.mvn/wrapper/maven-wrapper.jar rename to sms4j-cloopen/.mvn/wrapper/maven-wrapper.jar diff --git a/sms-aggregation-cloopen/.mvn/wrapper/maven-wrapper.properties b/sms4j-cloopen/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from sms-aggregation-cloopen/.mvn/wrapper/maven-wrapper.properties rename to sms4j-cloopen/.mvn/wrapper/maven-wrapper.properties diff --git a/sms-aggregation-cloopen/pom.xml b/sms4j-cloopen/pom.xml similarity index 78% rename from sms-aggregation-cloopen/pom.xml rename to sms4j-cloopen/pom.xml index b682eb46..1a825cda 100644 --- a/sms-aggregation-cloopen/pom.xml +++ b/sms4j-cloopen/pom.xml @@ -10,9 +10,9 @@ ../pom.xml - sms-aggregation-cloopen - sms-aggregation-cloopen - sms-aggregation-cloopen + sms4j-cloopen + sms4j-cloopen + sms4j-cloopen ${revision} @@ -24,12 +24,12 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm org.dromara.sms4j - sms-aggregation-api + sms4j-api \ No newline at end of file diff --git a/sms-aggregation-cloopen/src/main/java/org/dromara/sms4j/cloopen/config/CloopenConfig.java b/sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/config/CloopenConfig.java similarity index 100% rename from sms-aggregation-cloopen/src/main/java/org/dromara/sms4j/cloopen/config/CloopenConfig.java rename to sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/config/CloopenConfig.java diff --git a/sms-aggregation-cloopen/src/main/java/org/dromara/sms4j/cloopen/config/CloopenSmsConfig.java b/sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/config/CloopenSmsConfig.java similarity index 100% rename from sms-aggregation-cloopen/src/main/java/org/dromara/sms4j/cloopen/config/CloopenSmsConfig.java rename to sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/config/CloopenSmsConfig.java diff --git a/sms-aggregation-cloopen/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java b/sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java similarity index 100% rename from sms-aggregation-cloopen/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java rename to sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java diff --git a/sms-aggregation-cloopen/src/main/resources/application.properties b/sms4j-cloopen/src/main/resources/application.properties similarity index 100% rename from sms-aggregation-cloopen/src/main/resources/application.properties rename to sms4j-cloopen/src/main/resources/application.properties diff --git a/sms-aggregation-comm/.flattened-pom.xml b/sms4j-comm/.flattened-pom.xml similarity index 88% rename from sms-aggregation-comm/.flattened-pom.xml rename to sms4j-comm/.flattened-pom.xml index 13bd85ee..3e49c5ae 100644 --- a/sms-aggregation-comm/.flattened-pom.xml +++ b/sms4j-comm/.flattened-pom.xml @@ -8,10 +8,10 @@ 1.0.5 org.dromara.sms4j - sms-aggregation-comm + sms4j-comm 1.0.5 - sms-aggregation-comm - sms-aggregation-comm + sms4j-comm + sms4j-comm Apache 2 diff --git a/sms-aggregation-comm/.mvn/wrapper/maven-wrapper.jar b/sms4j-comm/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from sms-aggregation-comm/.mvn/wrapper/maven-wrapper.jar rename to sms4j-comm/.mvn/wrapper/maven-wrapper.jar diff --git a/sms-aggregation-comm/.mvn/wrapper/maven-wrapper.properties b/sms4j-comm/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from sms-aggregation-comm/.mvn/wrapper/maven-wrapper.properties rename to sms4j-comm/.mvn/wrapper/maven-wrapper.properties diff --git a/sms-aggregation-comm/pom.xml b/sms4j-comm/pom.xml similarity index 86% rename from sms-aggregation-comm/pom.xml rename to sms4j-comm/pom.xml index 1c3436f8..8aa0daf7 100644 --- a/sms-aggregation-comm/pom.xml +++ b/sms4j-comm/pom.xml @@ -9,9 +9,9 @@ ../pom.xml - sms-aggregation-comm - sms-aggregation-comm - sms-aggregation-comm + sms4j-comm + sms4j-comm + sms4j-comm ${revision} diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/annotation/Restricted.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/annotation/Restricted.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/annotation/Restricted.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/annotation/Restricted.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/config/SmsBanner.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/config/SmsBanner.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/config/SmsBanner.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/config/SmsBanner.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/config/SmsConfig.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/config/SmsConfig.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/config/SmsConfig.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/config/SmsConfig.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/config/SmsSqlConfig.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/config/SmsSqlConfig.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/config/SmsSqlConfig.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/config/SmsSqlConfig.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/DelayedTime.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/DelayedTime.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/DelayedTime.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/DelayedTime.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/Task.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/Task.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/Task.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/Task.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/enumerate/ConfigType.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/enumerate/ConfigType.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/enumerate/ConfigType.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/enumerate/ConfigType.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/enumerate/SupplierType.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/enumerate/SupplierType.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/enumerate/SupplierType.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/enumerate/SupplierType.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsBlendException.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsBlendException.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsBlendException.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsBlendException.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsSqlException.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsSqlException.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsSqlException.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsSqlException.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/factory/BeanFactory.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/factory/BeanFactory.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/factory/BeanFactory.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/factory/BeanFactory.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/FileTool.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/FileTool.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/FileTool.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/FileTool.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/JDBCTool.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/JDBCTool.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/JDBCTool.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/JDBCTool.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/SettingUtil.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/SettingUtil.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/SettingUtil.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/SettingUtil.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/SmsUtil.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/SmsUtil.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/SmsUtil.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/SmsUtil.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/TimeExpiredPoolCache.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/TimeExpiredPoolCache.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/TimeExpiredPoolCache.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/TimeExpiredPoolCache.java diff --git a/sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/http/HttpJsonTool.java b/sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/http/HttpJsonTool.java similarity index 100% rename from sms-aggregation-comm/src/main/java/org/dromara/sms4j/comm/utils/http/HttpJsonTool.java rename to sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/http/HttpJsonTool.java diff --git a/sms-aggregation-comm/src/main/resources/application.properties b/sms4j-comm/src/main/resources/application.properties similarity index 100% rename from sms-aggregation-comm/src/main/resources/application.properties rename to sms4j-comm/src/main/resources/application.properties diff --git a/sms-aggregation-core/.flattened-pom.xml b/sms4j-core/.flattened-pom.xml similarity index 71% rename from sms-aggregation-core/.flattened-pom.xml rename to sms4j-core/.flattened-pom.xml index b954e2eb..46978c3d 100644 --- a/sms-aggregation-core/.flattened-pom.xml +++ b/sms4j-core/.flattened-pom.xml @@ -8,10 +8,10 @@ 1.0.5 org.dromara.sms4j - sms-aggregation-core + sms4j-core 1.0.5 - sms-aggregation-core - sms-aggregation-core + sms4j-core + sms4j-core Apache 2 @@ -23,35 +23,35 @@ org.dromara.sms4j - sms-aggregation-aliyun + sms4j-aliyun org.dromara.sms4j - sms-aggregation-tencent + sms4j-tencent org.dromara.sms4j - sms-aggregation-unisms + sms4j-unisms org.dromara.sms4j - sms-aggregation-yunpian + sms4j-yunpian org.dromara.sms4j - sms-aggregation-huawei + sms4j-huawei org.dromara.sms4j - sms-aggregation-jdcloud + sms4j-jdcloud org.dromara.sms4j - sms-aggregation-emay + sms4j-emay org.dromara.sms4j - sms-aggregation-cloopen + sms4j-cloopen diff --git a/sms-aggregation-core/pom.xml b/sms4j-core/pom.xml similarity index 68% rename from sms-aggregation-core/pom.xml rename to sms4j-core/pom.xml index 891267fc..222fa41f 100644 --- a/sms-aggregation-core/pom.xml +++ b/sms4j-core/pom.xml @@ -9,10 +9,10 @@ ../pom.xml - sms-aggregation-core + sms4j-core ${revision} - sms-aggregation-core - sms-aggregation-core + sms4j-core + sms4j-core @@ -20,42 +20,42 @@ org.dromara.sms4j - sms-aggregation-aliyun + sms4j-aliyun org.dromara.sms4j - sms-aggregation-tencent + sms4j-tencent org.dromara.sms4j - sms-aggregation-unisms + sms4j-unisms org.dromara.sms4j - sms-aggregation-yunpian + sms4j-yunpian org.dromara.sms4j - sms-aggregation-huawei + sms4j-huawei org.dromara.sms4j - sms-aggregation-jdcloud + sms4j-jdcloud org.dromara.sms4j - sms-aggregation-emay + sms4j-emay org.dromara.sms4j - sms-aggregation-cloopen + sms4j-cloopen diff --git a/sms-aggregation-core/src/main/java/org/dromara/sms4j/core/SupplierSqlConfig.java b/sms4j-core/src/main/java/org/dromara/sms4j/core/SupplierSqlConfig.java similarity index 100% rename from sms-aggregation-core/src/main/java/org/dromara/sms4j/core/SupplierSqlConfig.java rename to sms4j-core/src/main/java/org/dromara/sms4j/core/SupplierSqlConfig.java diff --git a/sms-aggregation-core/src/main/java/org/dromara/sms4j/core/config/SupplierFactory.java b/sms4j-core/src/main/java/org/dromara/sms4j/core/config/SupplierFactory.java similarity index 100% rename from sms-aggregation-core/src/main/java/org/dromara/sms4j/core/config/SupplierFactory.java rename to sms4j-core/src/main/java/org/dromara/sms4j/core/config/SupplierFactory.java diff --git a/sms-aggregation-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java b/sms4j-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java similarity index 100% rename from sms-aggregation-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java rename to sms4j-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java diff --git a/sms-aggregation-core/src/main/resources/application.properties b/sms4j-core/src/main/resources/application.properties similarity index 100% rename from sms-aggregation-core/src/main/resources/application.properties rename to sms4j-core/src/main/resources/application.properties diff --git a/sms-aggregation-yunpian/.flattened-pom.xml b/sms4j-emay/.flattened-pom.xml similarity index 79% rename from sms-aggregation-yunpian/.flattened-pom.xml rename to sms4j-emay/.flattened-pom.xml index b41ec100..e0a7b153 100644 --- a/sms-aggregation-yunpian/.flattened-pom.xml +++ b/sms4j-emay/.flattened-pom.xml @@ -8,10 +8,10 @@ 1.0.5 org.dromara.sms4j - sms-aggregation-yunpian + sms4j-emay 1.0.5 - sms-aggregation-yunpian - sms-aggregation-yunpian + sms4j-emay + sms4j-emay Apache 2 @@ -23,11 +23,11 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm org.dromara.sms4j - sms-aggregation-api + sms4j-api diff --git a/sms-aggregation-emay/.mvn/wrapper/maven-wrapper.jar b/sms4j-emay/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from sms-aggregation-emay/.mvn/wrapper/maven-wrapper.jar rename to sms4j-emay/.mvn/wrapper/maven-wrapper.jar diff --git a/sms-aggregation-emay/.mvn/wrapper/maven-wrapper.properties b/sms4j-emay/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from sms-aggregation-emay/.mvn/wrapper/maven-wrapper.properties rename to sms4j-emay/.mvn/wrapper/maven-wrapper.properties diff --git a/sms-aggregation-emay/pom.xml b/sms4j-emay/pom.xml similarity index 76% rename from sms-aggregation-emay/pom.xml rename to sms4j-emay/pom.xml index 6a49627d..8aebafbd 100644 --- a/sms-aggregation-emay/pom.xml +++ b/sms4j-emay/pom.xml @@ -9,10 +9,10 @@ ../pom.xml - sms-aggregation-emay + sms4j-emay ${revision} - sms-aggregation-emay - sms-aggregation-emay + sms4j-emay + sms4j-emay @@ -20,12 +20,12 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm org.dromara.sms4j - sms-aggregation-api + sms4j-api diff --git a/sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/config/EmayConfig.java b/sms4j-emay/src/main/java/org/dromara/sms4j/emay/config/EmayConfig.java similarity index 100% rename from sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/config/EmayConfig.java rename to sms4j-emay/src/main/java/org/dromara/sms4j/emay/config/EmayConfig.java diff --git a/sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/config/EmaySmsConfig.java b/sms4j-emay/src/main/java/org/dromara/sms4j/emay/config/EmaySmsConfig.java similarity index 100% rename from sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/config/EmaySmsConfig.java rename to sms4j-emay/src/main/java/org/dromara/sms4j/emay/config/EmaySmsConfig.java diff --git a/sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java b/sms4j-emay/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java similarity index 100% rename from sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java rename to sms4j-emay/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java diff --git a/sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/util/EmayBuilder.java b/sms4j-emay/src/main/java/org/dromara/sms4j/emay/util/EmayBuilder.java similarity index 100% rename from sms-aggregation-emay/src/main/java/org/dromara/sms4j/emay/util/EmayBuilder.java rename to sms4j-emay/src/main/java/org/dromara/sms4j/emay/util/EmayBuilder.java diff --git a/sms-aggregation-emay/src/main/resources/application.properties b/sms4j-emay/src/main/resources/application.properties similarity index 100% rename from sms-aggregation-emay/src/main/resources/application.properties rename to sms4j-emay/src/main/resources/application.properties diff --git a/sms-aggregation-huawei/.flattened-pom.xml b/sms4j-huawei/.flattened-pom.xml similarity index 79% rename from sms-aggregation-huawei/.flattened-pom.xml rename to sms4j-huawei/.flattened-pom.xml index c4b21c7a..60e871da 100644 --- a/sms-aggregation-huawei/.flattened-pom.xml +++ b/sms4j-huawei/.flattened-pom.xml @@ -8,10 +8,10 @@ 1.0.5 org.dromara.sms4j - sms-aggregation-huawei + sms4j-huawei 1.0.5 - sms-aggregation-huawei - sms-aggregation-huawei + sms4j-huawei + sms4j-huawei Apache 2 @@ -23,11 +23,11 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm org.dromara.sms4j - sms-aggregation-api + sms4j-api diff --git a/sms-aggregation-huawei/.mvn/wrapper/maven-wrapper.jar b/sms4j-huawei/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from sms-aggregation-huawei/.mvn/wrapper/maven-wrapper.jar rename to sms4j-huawei/.mvn/wrapper/maven-wrapper.jar diff --git a/sms-aggregation-huawei/.mvn/wrapper/maven-wrapper.properties b/sms4j-huawei/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from sms-aggregation-huawei/.mvn/wrapper/maven-wrapper.properties rename to sms4j-huawei/.mvn/wrapper/maven-wrapper.properties diff --git a/sms-aggregation-huawei/pom.xml b/sms4j-huawei/pom.xml similarity index 76% rename from sms-aggregation-huawei/pom.xml rename to sms4j-huawei/pom.xml index 8cd6cb55..5b57f8ef 100644 --- a/sms-aggregation-huawei/pom.xml +++ b/sms4j-huawei/pom.xml @@ -9,10 +9,10 @@ ../pom.xml - sms-aggregation-huawei + sms4j-huawei ${revision} - sms-aggregation-huawei - sms-aggregation-huawei + sms4j-huawei + sms4j-huawei @@ -20,12 +20,12 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm org.dromara.sms4j - sms-aggregation-api + sms4j-api diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiConfig.java b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiConfig.java similarity index 100% rename from sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiConfig.java rename to sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiConfig.java diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiSmsConfig.java b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiSmsConfig.java similarity index 100% rename from sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiSmsConfig.java rename to sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiSmsConfig.java diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiError.java b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiError.java similarity index 100% rename from sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiError.java rename to sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiError.java diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiResponse.java b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiResponse.java similarity index 100% rename from sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiResponse.java rename to sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiResponse.java diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/entity/SmsId.java b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/SmsId.java similarity index 100% rename from sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/entity/SmsId.java rename to sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/SmsId.java diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java similarity index 100% rename from sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java rename to sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java diff --git a/sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/utils/HuaweiBuilder.java b/sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/utils/HuaweiBuilder.java similarity index 100% rename from sms-aggregation-huawei/src/main/java/org/dromara/sms4j/huawei/utils/HuaweiBuilder.java rename to sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/utils/HuaweiBuilder.java diff --git a/sms-aggregation-huawei/src/main/resources/application.properties b/sms4j-huawei/src/main/resources/application.properties similarity index 100% rename from sms-aggregation-huawei/src/main/resources/application.properties rename to sms4j-huawei/src/main/resources/application.properties diff --git a/sms-aggregation-jdcloud/.flattened-pom.xml b/sms4j-jdcloud/.flattened-pom.xml similarity index 81% rename from sms-aggregation-jdcloud/.flattened-pom.xml rename to sms4j-jdcloud/.flattened-pom.xml index 721b63c1..cfa36d16 100644 --- a/sms-aggregation-jdcloud/.flattened-pom.xml +++ b/sms4j-jdcloud/.flattened-pom.xml @@ -8,10 +8,10 @@ 1.0.5 org.dromara.sms4j - sms-aggregation-jdcloud + sms4j-jdcloud 1.0.5 - sms-aggregation-jdcloud - sms-aggregation-jdcloud + sms4j-jdcloud + sms4j-jdcloud Apache 2 @@ -27,11 +27,11 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm org.dromara.sms4j - sms-aggregation-api + sms4j-api diff --git a/sms-aggregation-jdcloud/.mvn/wrapper/maven-wrapper.jar b/sms4j-jdcloud/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from sms-aggregation-jdcloud/.mvn/wrapper/maven-wrapper.jar rename to sms4j-jdcloud/.mvn/wrapper/maven-wrapper.jar diff --git a/sms-aggregation-jdcloud/.mvn/wrapper/maven-wrapper.properties b/sms4j-jdcloud/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from sms-aggregation-jdcloud/.mvn/wrapper/maven-wrapper.properties rename to sms4j-jdcloud/.mvn/wrapper/maven-wrapper.properties diff --git a/sms-aggregation-jdcloud/pom.xml b/sms4j-jdcloud/pom.xml similarity index 78% rename from sms-aggregation-jdcloud/pom.xml rename to sms4j-jdcloud/pom.xml index ccdcba8d..57ab2a2c 100644 --- a/sms-aggregation-jdcloud/pom.xml +++ b/sms4j-jdcloud/pom.xml @@ -10,9 +10,9 @@ ../pom.xml - sms-aggregation-jdcloud - sms-aggregation-jdcloud - sms-aggregation-jdcloud + sms4j-jdcloud + sms4j-jdcloud + sms4j-jdcloud ${revision} @@ -24,12 +24,12 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm org.dromara.sms4j - sms-aggregation-api + sms4j-api \ No newline at end of file diff --git a/sms-aggregation-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudConfig.java b/sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudConfig.java similarity index 100% rename from sms-aggregation-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudConfig.java rename to sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudConfig.java diff --git a/sms-aggregation-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudSmsConfig.java b/sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudSmsConfig.java similarity index 100% rename from sms-aggregation-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudSmsConfig.java rename to sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudSmsConfig.java diff --git a/sms-aggregation-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java b/sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java similarity index 100% rename from sms-aggregation-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java rename to sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java diff --git a/sms-aggregation-jdcloud/src/main/resources/application.properties b/sms4j-jdcloud/src/main/resources/application.properties similarity index 100% rename from sms-aggregation-jdcloud/src/main/resources/application.properties rename to sms4j-jdcloud/src/main/resources/application.properties diff --git a/sms-aggregation-spring-boot-starter/.flattened-pom.xml b/sms4j-spring-boot-starter/.flattened-pom.xml similarity index 84% rename from sms-aggregation-spring-boot-starter/.flattened-pom.xml rename to sms4j-spring-boot-starter/.flattened-pom.xml index 01216e59..ee72ad27 100644 --- a/sms-aggregation-spring-boot-starter/.flattened-pom.xml +++ b/sms4j-spring-boot-starter/.flattened-pom.xml @@ -8,10 +8,10 @@ 1.0.5 org.dromara.sms4j - sms-aggregation-spring-boot-starter + sms4j-spring-boot-starter 1.0.5 - sms-aggregation-spring-boot-starter - sms-aggregation-spring-boot-starter + sms4j-spring-boot-starter + sms4j-spring-boot-starter Apache 2 @@ -30,7 +30,7 @@ org.dromara.sms4j - sms-aggregation-autoimmit + sms4j-autoimmit org.springframework.boot diff --git a/sms-aggregation-spring-boot-starter/pom.xml b/sms4j-spring-boot-starter/pom.xml similarity index 83% rename from sms-aggregation-spring-boot-starter/pom.xml rename to sms4j-spring-boot-starter/pom.xml index efe51590..ef7b84c4 100644 --- a/sms-aggregation-spring-boot-starter/pom.xml +++ b/sms4j-spring-boot-starter/pom.xml @@ -9,9 +9,9 @@ ../pom.xml - sms-aggregation-spring-boot-starter - sms-aggregation-spring-boot-starter - sms-aggregation-spring-boot-starter + sms4j-spring-boot-starter + sms4j-spring-boot-starter + sms4j-spring-boot-starter ${revision} jar @@ -29,7 +29,7 @@ org.dromara.sms4j - sms-aggregation-autoimmit + sms4j-autoimmit diff --git a/sms-aggregation-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java similarity index 100% rename from sms-aggregation-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java rename to sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java diff --git a/sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring.factories b/sms4j-spring-boot-starter/src/main/resources/META-INF/spring.factories similarity index 100% rename from sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring.factories rename to sms4j-spring-boot-starter/src/main/resources/META-INF/spring.factories diff --git a/sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sms4j-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to sms4j-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/sms-aggregation-spring-boot-starter/src/main/resources/application.properties b/sms4j-spring-boot-starter/src/main/resources/application.properties similarity index 100% rename from sms-aggregation-spring-boot-starter/src/main/resources/application.properties rename to sms4j-spring-boot-starter/src/main/resources/application.properties diff --git a/sms-aggregation-tencent/.flattened-pom.xml b/sms4j-tencent/.flattened-pom.xml similarity index 82% rename from sms-aggregation-tencent/.flattened-pom.xml rename to sms4j-tencent/.flattened-pom.xml index 56e934f3..337929a5 100644 --- a/sms-aggregation-tencent/.flattened-pom.xml +++ b/sms4j-tencent/.flattened-pom.xml @@ -8,10 +8,10 @@ 1.0.5 org.dromara.sms4j - sms-aggregation-tencent + sms4j-tencent 1.0.5 - sms-aggregation-tencent - sms-aggregation-tencent + sms4j-tencent + sms4j-tencent Apache 2 @@ -23,11 +23,11 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm org.dromara.sms4j - sms-aggregation-api + sms4j-api com.tencentcloudapi diff --git a/sms-aggregation-tencent/pom.xml b/sms4j-tencent/pom.xml similarity index 80% rename from sms-aggregation-tencent/pom.xml rename to sms4j-tencent/pom.xml index ca94890b..f75d8546 100644 --- a/sms-aggregation-tencent/pom.xml +++ b/sms4j-tencent/pom.xml @@ -9,9 +9,9 @@ ../pom.xml - sms-aggregation-tencent - sms-aggregation-tencent - sms-aggregation-tencent + sms4j-tencent + sms4j-tencent + sms4j-tencent ${revision} @@ -20,11 +20,11 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm org.dromara.sms4j - sms-aggregation-api + sms4j-api com.tencentcloudapi diff --git a/sms-aggregation-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentConfig.java b/sms4j-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentConfig.java similarity index 100% rename from sms-aggregation-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentConfig.java rename to sms4j-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentConfig.java diff --git a/sms-aggregation-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentSmsConfig.java b/sms4j-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentSmsConfig.java similarity index 100% rename from sms-aggregation-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentSmsConfig.java rename to sms4j-tencent/src/main/java/org/dromara/sms4j/tencent/config/TencentSmsConfig.java diff --git a/sms-aggregation-tencent/src/main/java/org/dromara/sms4j/tencent/service/TencentSmsImpl.java b/sms4j-tencent/src/main/java/org/dromara/sms4j/tencent/service/TencentSmsImpl.java similarity index 100% rename from sms-aggregation-tencent/src/main/java/org/dromara/sms4j/tencent/service/TencentSmsImpl.java rename to sms4j-tencent/src/main/java/org/dromara/sms4j/tencent/service/TencentSmsImpl.java diff --git a/sms-aggregation-tencent/src/main/resources/application.properties b/sms4j-tencent/src/main/resources/application.properties similarity index 100% rename from sms-aggregation-tencent/src/main/resources/application.properties rename to sms4j-tencent/src/main/resources/application.properties diff --git a/sms-aggregation-unisms/.flattened-pom.xml b/sms4j-unisms/.flattened-pom.xml similarity index 82% rename from sms-aggregation-unisms/.flattened-pom.xml rename to sms4j-unisms/.flattened-pom.xml index 9fa5dc9d..e6ea72cc 100644 --- a/sms-aggregation-unisms/.flattened-pom.xml +++ b/sms4j-unisms/.flattened-pom.xml @@ -8,10 +8,10 @@ 1.0.5 org.dromara.sms4j - sms-aggregation-unisms + sms4j-unisms 1.0.5 - sms-aggregation-unisms - sms-aggregation-unisms + sms4j-unisms + sms4j-unisms Apache 2 @@ -31,11 +31,11 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm org.dromara.sms4j - sms-aggregation-api + sms4j-api diff --git a/sms-aggregation-unisms/pom.xml b/sms4j-unisms/pom.xml similarity index 80% rename from sms-aggregation-unisms/pom.xml rename to sms4j-unisms/pom.xml index 3f0ad30b..788d7c53 100644 --- a/sms-aggregation-unisms/pom.xml +++ b/sms4j-unisms/pom.xml @@ -9,9 +9,9 @@ ../pom.xml - sms-aggregation-unisms - sms-aggregation-unisms - sms-aggregation-unisms + sms4j-unisms + sms4j-unisms + sms4j-unisms ${revision} @@ -30,12 +30,12 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm org.dromara.sms4j - sms-aggregation-api + sms4j-api diff --git a/sms-aggregation-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniConfig.java b/sms4j-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniConfig.java similarity index 100% rename from sms-aggregation-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniConfig.java rename to sms4j-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniConfig.java diff --git a/sms-aggregation-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniSmsConfig.java b/sms4j-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniSmsConfig.java similarity index 100% rename from sms-aggregation-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniSmsConfig.java rename to sms4j-unisms/src/main/java/org/dromara/sms4j/unisms/config/UniSmsConfig.java diff --git a/sms-aggregation-unisms/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java b/sms4j-unisms/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java similarity index 100% rename from sms-aggregation-unisms/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java rename to sms4j-unisms/src/main/java/org/dromara/sms4j/unisms/service/UniSmsImpl.java diff --git a/sms-aggregation-unisms/src/main/resources/application.properties b/sms4j-unisms/src/main/resources/application.properties similarity index 100% rename from sms-aggregation-unisms/src/main/resources/application.properties rename to sms4j-unisms/src/main/resources/application.properties diff --git a/sms-aggregation-emay/.flattened-pom.xml b/sms4j-yunpian/.flattened-pom.xml similarity index 77% rename from sms-aggregation-emay/.flattened-pom.xml rename to sms4j-yunpian/.flattened-pom.xml index 10c39077..76156058 100644 --- a/sms-aggregation-emay/.flattened-pom.xml +++ b/sms4j-yunpian/.flattened-pom.xml @@ -1,33 +1,33 @@ - - - 4.0.0 - - org.dromara.sms4j - sms_aggregation - 1.0.5 - - org.dromara.sms4j - sms-aggregation-emay - 1.0.5 - sms-aggregation-emay - sms-aggregation-emay - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - A business-friendly OSS license - - - - - org.dromara.sms4j - sms-aggregation-comm - - - org.dromara.sms4j - sms-aggregation-api - - - + + + 4.0.0 + + org.dromara.sms4j + sms_aggregation + 1.0.5 + + org.dromara.sms4j + sms4j-yunpian + 1.0.5 + sms4j-yunpian + sms4j-yunpian + + + Apache 2 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + A business-friendly OSS license + + + + + org.dromara.sms4j + sms4j-comm + + + org.dromara.sms4j + sms4j-api + + + diff --git a/sms-aggregation-yunpian/pom.xml b/sms4j-yunpian/pom.xml similarity index 75% rename from sms-aggregation-yunpian/pom.xml rename to sms4j-yunpian/pom.xml index f0843522..69daa770 100644 --- a/sms-aggregation-yunpian/pom.xml +++ b/sms4j-yunpian/pom.xml @@ -9,9 +9,9 @@ ../pom.xml - sms-aggregation-yunpian - sms-aggregation-yunpian - sms-aggregation-yunpian + sms4j-yunpian + sms4j-yunpian + sms4j-yunpian ${revision} @@ -20,11 +20,11 @@ org.dromara.sms4j - sms-aggregation-comm + sms4j-comm org.dromara.sms4j - sms-aggregation-api + sms4j-api diff --git a/sms-aggregation-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunPianSmsConfig.java b/sms4j-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunPianSmsConfig.java similarity index 100% rename from sms-aggregation-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunPianSmsConfig.java rename to sms4j-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunPianSmsConfig.java diff --git a/sms-aggregation-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunpianConfig.java b/sms4j-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunpianConfig.java similarity index 100% rename from sms-aggregation-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunpianConfig.java rename to sms4j-yunpian/src/main/java/org/dromara/sms4j/yunpian/config/YunpianConfig.java diff --git a/sms-aggregation-yunpian/src/main/java/org/dromara/sms4j/yunpian/service/YunPianSmsImpl.java b/sms4j-yunpian/src/main/java/org/dromara/sms4j/yunpian/service/YunPianSmsImpl.java similarity index 100% rename from sms-aggregation-yunpian/src/main/java/org/dromara/sms4j/yunpian/service/YunPianSmsImpl.java rename to sms4j-yunpian/src/main/java/org/dromara/sms4j/yunpian/service/YunPianSmsImpl.java diff --git a/sms-aggregation-yunpian/src/main/resources/application.properties b/sms4j-yunpian/src/main/resources/application.properties similarity index 100% rename from sms-aggregation-yunpian/src/main/resources/application.properties rename to sms4j-yunpian/src/main/resources/application.properties