admin/sms4j
1
0
Fork 0
mirror of https://gitee.com/dromara/sms4j.git synced 2025-12-07 09:29:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

!10 调整项目结构信息

Browse Source 
Merge pull request !10 from Charles7c/dev-test
贡献者：Charles7c
This commit is contained in:
风如歌 2023-04-12 14:21:40 +00:00 committed by Gitee
commit b1388958f6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
122 changed files with 899 additions and 919 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
.flattened-pom.xml
View File

@ -2,7 +2,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
<packaging>pom</packaging> <packaging>pom</packaging>
@ -24,18 +24,19 @@
</developer> </developer>
</developers> </developers>
<modules> <modules>
<module>sms-aggregation-comm</module> <module>sms4j-comm</module>
<module>sms-aggregation-api</module> <module>sms4j-api</module>
<module>sms-aggregation-core</module> <module>sms4j-core</module>
<module>sms-aggregation-autoimmit</module> <module>sms4j-autoimmit</module>
<module>sms-aggregation-spring-boot-starter</module> <module>sms4j-spring-boot-starter</module>
<module>sms-aggregation-aliyun</module> <module>sms4j-aliyun</module>
<module>sms-aggregation-tencent</module> <module>sms4j-tencent</module>
<module>sms-aggregation-unisms</module> <module>sms4j-unisms</module>
<module>sms-aggregation-yunpian</module> <module>sms4j-yunpian</module>
<module>sms-aggregation-huawei</module> <module>sms4j-huawei</module>
<module>sms-aggregation-jdcloud</module> <module>sms4j-jdcloud</module>
<module>sms-aggregation-cloopen</module> <module>sms4j-cloopen</module>
<module>sms4j-emay</module>
</modules> </modules>
<scm> <scm>
<connection>scm:git:https://gitee.com/MR-wind/sms_aggregation.git</connection> <connection>scm:git:https://gitee.com/MR-wind/sms_aggregation.git</connection>
@ -81,63 +82,68 @@
<version>${spring.boot.version}</version> <version>${spring.boot.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-spring-boot-starter</artifactId> <artifactId>sms4j-spring-boot-starter</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-autoimmit</artifactId> <artifactId>sms4j-autoimmit</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-core</artifactId> <artifactId>sms4j-core</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms4j-comm</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-api</artifactId> <artifactId>sms4j-api</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-aliyun</artifactId> <artifactId>sms4j-aliyun</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-tencent</artifactId> <artifactId>sms4j-tencent</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-unisms</artifactId> <artifactId>sms4j-unisms</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-yunpian</artifactId> <artifactId>sms4j-yunpian</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-huawei</artifactId> <artifactId>sms4j-huawei</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-jdcloud</artifactId> <artifactId>sms4j-jdcloud</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-cloopen</artifactId> <artifactId>sms4j-cloopen</artifactId>
<version>1.0.5</version>
</dependency>
<dependency>
<groupId>org.dromara.sms4j</groupId>
<artifactId>sms4j-emay</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
@ -146,8 +152,8 @@
<version>${aliyun.version}</version> <version>${aliyun.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId> <artifactId>okhttp</artifactId>
<groupId>com.squareup.okhttp3</groupId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@ -178,8 +184,8 @@
<version>${unisms.version}</version> <version>${unisms.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId> <artifactId>okhttp</artifactId>
<groupId>com.squareup.okhttp3</groupId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@ -189,8 +195,8 @@
<version>${tencent.version}</version> <version>${tencent.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId> <artifactId>okhttp</artifactId>
<groupId>com.squareup.okhttp3</groupId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>

4
README.md
View File

@ -37,8 +37,8 @@
```xml ```xml
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-spring-boot-starter</artifactId> <artifactId>sms4j-spring-boot-starter</artifactId>
<version> version </version> <version> version </version>
</dependency> </dependency>
``` ```

81
pom.xml
View File

@ -2,28 +2,29 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>${revision}</version> <version>${revision}</version>
<name>sms-aggregation</name> <name>sms-aggregation</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>sms_aggregation</description> <description>sms_aggregation</description>
<url>https://gitee.com/dromara/sms_aggregation</url> <url>https://gitee.com/dromara/sms_aggregation</url>
<modules> <modules>
<module>sms-aggregation-comm</module> <module>sms4j-comm</module>
<module>sms-aggregation-api</module> <module>sms4j-api</module>
<module>sms-aggregation-core</module> <module>sms4j-core</module>
<module>sms-aggregation-autoimmit</module> <module>sms4j-autoimmit</module>
<module>sms-aggregation-spring-boot-starter</module> <module>sms4j-spring-boot-starter</module>
<module>sms-aggregation-aliyun</module> <module>sms4j-aliyun</module>
<module>sms-aggregation-tencent</module> <module>sms4j-tencent</module>
<module>sms-aggregation-unisms</module> <module>sms4j-unisms</module>
<module>sms-aggregation-yunpian</module> <module>sms4j-yunpian</module>
<module>sms-aggregation-huawei</module> <module>sms4j-huawei</module>
<module>sms-aggregation-jdcloud</module> <module>sms4j-jdcloud</module>
<module>sms-aggregation-cloopen</module> <module>sms4j-cloopen</module>
<module>sms-aggregation-emay</module> <module>sms4j-emay</module>
</modules> </modules>
<!-- 开源协议 apache 2.0 --> <!-- 开源协议 apache 2.0 -->
<licenses> <licenses>
@ -85,82 +86,82 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-spring-boot-starter</artifactId> <artifactId>sms4j-spring-boot-starter</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-autoimmit</artifactId> <artifactId>sms4j-autoimmit</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-core</artifactId> <artifactId>sms4j-core</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!--通用模块--> <!--通用模块-->
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms4j-comm</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<!--api模块--> <!--api模块-->
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-api</artifactId> <artifactId>sms4j-api</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-aliyun</artifactId> <artifactId>sms4j-aliyun</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-tencent</artifactId> <artifactId>sms4j-tencent</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-unisms</artifactId> <artifactId>sms4j-unisms</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-yunpian</artifactId> <artifactId>sms4j-yunpian</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-huawei</artifactId> <artifactId>sms4j-huawei</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-jdcloud</artifactId> <artifactId>sms4j-jdcloud</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-cloopen</artifactId> <artifactId>sms4j-cloopen</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-emay</artifactId> <artifactId>sms4j-emay</artifactId>
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>

4
sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring.factories
View File

@ -1,4 +0,0 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
org.dromara.sms.starter.config.SmsMainConfig,\
org.dromara.sms.autoimmit.config.SmsAutowiredConfig,\
org.dromara.sms.autoimmit.config.SupplierConfig

3
sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@ -1,3 +0,0 @@
org.dromara.sms.starter.config.SmsMainConfig
org.dromara.sms.autoimmit.config.SmsAutowiredConfig
org.dromara.sms.autoimmit.config.SupplierConfig

20
sms-aggregation-aliyun/.flattened-pom.xml → sms4j-aliyun/.flattened-pom.xml
View File

@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</parent> </parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-aliyun</artifactId> <artifactId>sms4j-aliyun</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
<name>sms-aggregation-aliyun</name> <name>sms4j-aliyun</name>
<description>sms-aggregation-aliyun</description> <description>sms4j-aliyun</description>
<licenses> <licenses>
<license> <license>
<name>Apache 2</name> <name>Apache 2</name>
@ -26,8 +26,8 @@
<artifactId>dysmsapi20170525</artifactId> <artifactId>dysmsapi20170525</artifactId>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId> <artifactId>okhttp</artifactId>
<groupId>com.squareup.okhttp3</groupId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
@ -36,12 +36,12 @@
<artifactId>okhttp</artifactId> <artifactId>okhttp</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms4j-comm</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-api</artifactId> <artifactId>sms4j-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp3</groupId> <groupId>com.squareup.okhttp3</groupId>

0
sms-aggregation-aliyun/.mvn/wrapper/maven-wrapper.jar → sms4j-aliyun/.mvn/wrapper/maven-wrapper.jar vendored
View File

0
sms-aggregation-aliyun/.mvn/wrapper/maven-wrapper.properties → sms4j-aliyun/.mvn/wrapper/maven-wrapper.properties vendored
View File

23
sms-aggregation-aliyun/pom.xml → sms4j-aliyun/pom.xml
View File

@ -3,17 +3,18 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-aliyun</artifactId>
<name>sms-aggregation-aliyun</name>
<description>sms-aggregation-aliyun</description>
<version>${revision}</version>
<properties>
<artifactId>sms4j-aliyun</artifactId>
<name>sms4j-aliyun</name>
<description>sms4j-aliyun</description>
<version>${revision}</version>
<properties>
</properties> </properties>
<dependencies> <dependencies>
@ -35,13 +36,13 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms4j-comm</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-api</artifactId> <artifactId>sms4j-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
@ -50,6 +51,4 @@
<version>3.14.9</version> <version>3.14.9</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
sms-aggregation-aliyun/src/main/java/org/dromara/sms/aliyun/config/AlibabaConfig.java → sms4j-aliyun/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaConfig.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.aliyun.config; package org.dromara.sms4j.aliyun.config;
import lombok.Data; import lombok.Data;

8
sms-aggregation-aliyun/src/main/java/org/dromara/sms/aliyun/config/AlibabaSmsConfig.java → sms4j-aliyun/src/main/java/org/dromara/sms4j/aliyun/config/AlibabaSmsConfig.java
View File

@ -1,10 +1,10 @@
package org.dromara.sms.aliyun.config; package org.dromara.sms4j.aliyun.config;
import com.aliyun.dysmsapi20170525.Client; import com.aliyun.dysmsapi20170525.Client;
import com.aliyun.teaopenapi.models.Config; import com.aliyun.teaopenapi.models.Config;
import org.dromara.sms.aliyun.service.AlibabaSmsImpl; import org.dromara.sms4j.aliyun.service.AlibabaSmsImpl;
import org.dromara.sms.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.exception.SmsBlendException;
import org.dromara.sms.comm.factory.BeanFactory; import org.dromara.sms4j.comm.factory.BeanFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

18
sms-aggregation-aliyun/src/main/java/org/dromara/sms/aliyun/service/AlibabaSmsImpl.java → sms4j-aliyun/src/main/java/org/dromara/sms4j/aliyun/service/AlibabaSmsImpl.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.aliyun.service; package org.dromara.sms4j.aliyun.service;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.aliyun.dysmsapi20170525.Client; import com.aliyun.dysmsapi20170525.Client;
@ -8,14 +8,14 @@ import com.aliyun.dysmsapi20170525.models.SendSmsRequest;
import com.aliyun.dysmsapi20170525.models.SendSmsResponse; import com.aliyun.dysmsapi20170525.models.SendSmsResponse;
import com.aliyun.tea.TeaException; import com.aliyun.tea.TeaException;
import com.aliyun.teautil.models.RuntimeOptions; import com.aliyun.teautil.models.RuntimeOptions;
import org.dromara.sms.aliyun.config.AlibabaConfig; import org.dromara.sms4j.aliyun.config.AlibabaConfig;
import org.dromara.sms.api.SmsBlend; import org.dromara.sms4j.api.SmsBlend;
import org.dromara.sms.api.callback.CallBack; import org.dromara.sms4j.api.callback.CallBack;
import org.dromara.sms.api.entity.SmsResponse; import org.dromara.sms4j.api.entity.SmsResponse;
import org.dromara.sms.comm.annotation.Restricted; import org.dromara.sms4j.comm.annotation.Restricted;
import org.dromara.sms.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.delayedTime.DelayedTime;
import org.dromara.sms.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.exception.SmsBlendException;
import org.dromara.sms.comm.utils.http.HttpJsonTool; import org.dromara.sms4j.comm.utils.http.HttpJsonTool;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;

0
sms-aggregation-aliyun/src/main/resources/application.properties → sms4j-aliyun/src/main/resources/application.properties
View File

14
sms-aggregation-api/.flattened-pom.xml → sms4j-api/.flattened-pom.xml
View File

@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</parent> </parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-api</artifactId> <artifactId>sms4j-api</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
<name>sms-aggregation-api</name> <name>sms4j-api</name>
<description>sms-aggregation-api</description> <description>sms4j-api</description>
<licenses> <licenses>
<license> <license>
<name>Apache 2</name> <name>Apache 2</name>
@ -22,8 +22,8 @@
</licenses> </licenses>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms4j-comm</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

0
sms-aggregation-api/.mvn/wrapper/maven-wrapper.jar → sms4j-api/.mvn/wrapper/maven-wrapper.jar vendored
View File

0
sms-aggregation-api/.mvn/wrapper/maven-wrapper.properties → sms4j-api/.mvn/wrapper/maven-wrapper.properties vendored
View File

16
sms-aggregation-api/pom.xml → sms4j-api/pom.xml
View File

@ -3,26 +3,24 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-api</artifactId>
<name>sms-aggregation-api</name> <artifactId>sms4j-api</artifactId>
<description>sms-aggregation-api</description> <name>sms4j-api</name>
<description>sms4j-api</description>
<version>${revision}</version> <version>${revision}</version>
<properties> <properties>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms4j-comm</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

6
sms-aggregation-api/src/main/java/org/dromara/sms/api/SmsBlend.java → sms4j-api/src/main/java/org/dromara/sms4j/api/SmsBlend.java
View File

@ -1,7 +1,7 @@
package org.dromara.sms.api; package org.dromara.sms4j.api;
import org.dromara.sms.api.callback.CallBack; import org.dromara.sms4j.api.callback.CallBack;
import org.dromara.sms.api.entity.SmsResponse; import org.dromara.sms4j.api.entity.SmsResponse;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;

4
sms-aggregation-api/src/main/java/org/dromara/sms/api/callback/CallBack.java → sms4j-api/src/main/java/org/dromara/sms4j/api/callback/CallBack.java
View File

@ -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 @FunctionalInterface
public interface CallBack { public interface CallBack {

2
sms-aggregation-api/src/main/java/org/dromara/sms/api/entity/SmsResponse.java → sms4j-api/src/main/java/org/dromara/sms4j/api/entity/SmsResponse.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.api.entity; package org.dromara.sms4j.api.entity;
import lombok.Data; import lombok.Data;

0
sms-aggregation-api/src/main/resources/application.properties → sms4j-api/src/main/resources/application.properties
View File

15
sms-aggregation-autoimmit/.flattened-pom.xml → sms4j-autoimmit/.flattened-pom.xml
View File

@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</parent> </parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-autoimmit</artifactId> <artifactId>sms4j-autoimmit</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
<name>sms-aggregation-autoimmit</name> <name>sms4j-autoimmit</name>
<description>sms-aggregation-autoimmit</description> <description>sms4j-autoimmit</description>
<licenses> <licenses>
<license> <license>
<name>Apache 2</name> <name>Apache 2</name>
@ -30,8 +30,8 @@
<artifactId>spring-boot-starter-data-redis</artifactId> <artifactId>spring-boot-starter-data-redis</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-core</artifactId> <artifactId>sms4j-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -40,5 +40,4 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
</dependencies> </dependencies>
<build />
</project> </project>

0
sms-aggregation-autoimmit/.mvn/wrapper/maven-wrapper.jar → sms4j-autoimmit/.mvn/wrapper/maven-wrapper.jar vendored
View File

0
sms-aggregation-autoimmit/.mvn/wrapper/maven-wrapper.properties → sms4j-autoimmit/.mvn/wrapper/maven-wrapper.properties vendored
View File

20
sms-aggregation-autoimmit/pom.xml → sms4j-autoimmit/pom.xml
View File

@ -3,22 +3,21 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-autoimmit</artifactId>
<artifactId>sms4j-autoimmit</artifactId>
<version>${revision}</version> <version>${revision}</version>
<name>sms-aggregation-autoimmit</name> <name>sms4j-autoimmit</name>
<description>sms-aggregation-autoimmit</description> <description>sms4j-autoimmit</description>
<properties> <properties>
</properties> </properties>
<dependencies> <dependencies>
<!--aop依赖--> <!--aop依赖-->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -31,8 +30,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-core</artifactId> <artifactId>sms4j-core</artifactId>
</dependency> </dependency>
<!--配置文件提示--> <!--配置文件提示-->
@ -43,9 +42,4 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
</dependencies> </dependencies>
<build>
</build>
</project> </project>

16
sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/aop/AopAdvice.java → sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/aop/AopAdvice.java
View File

@ -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.sms4j.comm.exception.SmsBlendException;
import org.dromara.sms.comm.config.SmsConfig; import org.dromara.sms4j.comm.config.SmsConfig;
import org.dromara.sms.autoimmit.utils.RedisUtils; import org.dromara.sms4j.autoimmit.utils.RedisUtils;
import org.dromara.sms.comm.utils.SmsUtil; import org.dromara.sms4j.comm.utils.SmsUtil;
import org.dromara.sms.comm.utils.TimeExpiredPoolCache; import org.dromara.sms4j.comm.utils.TimeExpiredPoolCache;
import org.dromara.sms.autoimmit.utils.SpringUtil; import org.dromara.sms4j.autoimmit.utils.SpringUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Around;
@ -32,7 +32,7 @@ public class AopAdvice {
private SpringUtil springUtil; private SpringUtil springUtil;
@Pointcut("@annotation(org.dromara.sms.comm.annotation.Restricted)") @Pointcut("@annotation(org.dromara.sms4j.comm.annotation.Restricted)")
public void restricted() { public void restricted() {
} }

22
sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/config/SmsAutowiredConfig.java → sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java
View File

@ -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.sms4j.autoimmit.aop.AopAdvice;
import org.dromara.sms.autoimmit.utils.ConfigUtil; import org.dromara.sms4j.autoimmit.utils.ConfigUtil;
import org.dromara.sms.autoimmit.utils.RedisUtils; import org.dromara.sms4j.autoimmit.utils.RedisUtils;
import org.dromara.sms.autoimmit.utils.SpringUtil; import org.dromara.sms4j.autoimmit.utils.SpringUtil;
import org.dromara.sms.comm.config.SmsBanner; import org.dromara.sms4j.comm.config.SmsBanner;
import org.dromara.sms.comm.config.SmsConfig; import org.dromara.sms4j.comm.config.SmsConfig;
import org.dromara.sms.comm.config.SmsSqlConfig; import org.dromara.sms4j.comm.config.SmsSqlConfig;
import org.dromara.sms.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.delayedTime.DelayedTime;
import org.dromara.sms.comm.factory.BeanFactory; import org.dromara.sms4j.comm.factory.BeanFactory;
import lombok.extern.slf4j.Slf4j; 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.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;

21
sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/config/SupplierConfig.java → sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SupplierConfig.java
View File

@ -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.sms4j.emay.config.EmayConfig;
import org.dromara.sms.aliyun.config.AlibabaConfig; import org.dromara.sms4j.aliyun.config.AlibabaConfig;
import org.dromara.sms.cloopen.config.CloopenConfig; import org.dromara.sms4j.cloopen.config.CloopenConfig;
import org.dromara.sms.comm.config.SmsConfig; import org.dromara.sms4j.core.config.SupplierFactory;
import org.dromara.sms.core.config.SupplierFactory; import org.dromara.sms4j.huawei.config.HuaweiConfig;
import org.dromara.sms.huawei.config.HuaweiConfig; import org.dromara.sms4j.jdcloud.config.JdCloudConfig;
import org.dromara.sms.jdcloud.config.JdCloudConfig; import org.dromara.sms4j.tencent.config.TencentConfig;
import org.dromara.sms.tencent.config.TencentConfig; import org.dromara.sms4j.unisms.config.UniConfig;
import org.dromara.sms.unisms.config.UniConfig; import org.dromara.sms4j.yunpian.config.YunpianConfig;
import org.dromara.sms.yunpian.config.YunpianConfig;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;

2
sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/utils/ConfigUtil.java → sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/ConfigUtil.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.autoimmit.utils; package org.dromara.sms4j.autoimmit.utils;
import org.springframework.core.env.Environment; import org.springframework.core.env.Environment;

2
sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/utils/RedisUtils.java → sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/RedisUtils.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.autoimmit.utils; package org.dromara.sms4j.autoimmit.utils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

2
sms-aggregation-autoimmit/src/main/java/org/dromara/sms/autoimmit/utils/SpringUtil.java → sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/utils/SpringUtil.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.autoimmit.utils; package org.dromara.sms4j.autoimmit.utils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;

0
sms-aggregation-autoimmit/src/main/resources/application.properties → sms4j-autoimmit/src/main/resources/application.properties
View File

18
sms-aggregation-cloopen/.flattened-pom.xml → sms4j-cloopen/.flattened-pom.xml
View File

@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</parent> </parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-cloopen</artifactId> <artifactId>sms4j-cloopen</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
<name>sms-aggregation-cloopen</name> <name>sms4j-cloopen</name>
<description>sms-aggregation-cloopen</description> <description>sms4j-cloopen</description>
<licenses> <licenses>
<license> <license>
<name>Apache 2</name> <name>Apache 2</name>
@ -26,12 +26,12 @@
<artifactId>java-sms-sdk</artifactId> <artifactId>java-sms-sdk</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms4j-comm</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-api</artifactId> <artifactId>sms4j-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

0
sms-aggregation-cloopen/.mvn/wrapper/maven-wrapper.jar → sms4j-cloopen/.mvn/wrapper/maven-wrapper.jar vendored
View File

0
sms-aggregation-cloopen/.mvn/wrapper/maven-wrapper.properties → sms4j-cloopen/.mvn/wrapper/maven-wrapper.properties vendored
View File

16
sms-aggregation-cloopen/pom.xml → sms4j-cloopen/pom.xml
View File

@ -4,15 +4,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-cloopen</artifactId> <artifactId>sms4j-cloopen</artifactId>
<name>sms-aggregation-cloopen</name> <name>sms4j-cloopen</name>
<description>sms-aggregation-cloopen</description> <description>sms4j-cloopen</description>
<version>${revision}</version> <version>${revision}</version>
<dependencies> <dependencies>
@ -23,13 +23,13 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms4j-comm</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-api</artifactId> <artifactId>sms4j-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
sms-aggregation-cloopen/src/main/java/org/dromara/sms/cloopen/config/CloopenConfig.java → sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/config/CloopenConfig.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.cloopen.config; package org.dromara.sms4j.cloopen.config;
import lombok.Data; import lombok.Data;

6
sms-aggregation-cloopen/src/main/java/org/dromara/sms/cloopen/config/CloopenSmsConfig.java → sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/config/CloopenSmsConfig.java
View File

@ -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.BodyType;
import com.cloopen.rest.sdk.CCPRestSmsSDK; import com.cloopen.rest.sdk.CCPRestSmsSDK;
import org.dromara.sms.cloopen.service.CloopenSmsImpl; import org.dromara.sms4j.cloopen.service.CloopenSmsImpl;
import org.dromara.sms.comm.factory.BeanFactory; import org.dromara.sms4j.comm.factory.BeanFactory;
/** /**
* 容联云短信配置 * 容联云短信配置

16
sms-aggregation-cloopen/src/main/java/org/dromara/sms/cloopen/service/CloopenSmsImpl.java → sms4j-cloopen/src/main/java/org/dromara/sms4j/cloopen/service/CloopenSmsImpl.java
View File

@ -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.convert.Convert;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.cloopen.rest.sdk.CCPRestSmsSDK; import com.cloopen.rest.sdk.CCPRestSmsSDK;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms.api.SmsBlend; import org.dromara.sms4j.api.SmsBlend;
import org.dromara.sms.api.callback.CallBack; import org.dromara.sms4j.api.callback.CallBack;
import org.dromara.sms.api.entity.SmsResponse; import org.dromara.sms4j.api.entity.SmsResponse;
import org.dromara.sms.cloopen.config.CloopenConfig; import org.dromara.sms4j.cloopen.config.CloopenConfig;
import org.dromara.sms.comm.annotation.Restricted; import org.dromara.sms4j.comm.annotation.Restricted;
import org.dromara.sms.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.delayedTime.DelayedTime;
import org.dromara.sms.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.exception.SmsBlendException;
import java.util.*; import java.util.*;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;

0
sms-aggregation-cloopen/src/main/resources/application.properties → sms4j-cloopen/src/main/resources/application.properties
View File

10
sms-aggregation-comm/.flattened-pom.xml → sms4j-comm/.flattened-pom.xml
View File

@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</parent> </parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms4j-comm</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
<name>sms-aggregation-comm</name> <name>sms4j-comm</name>
<description>sms-aggregation-comm</description> <description>sms4j-comm</description>
<licenses> <licenses>
<license> <license>
<name>Apache 2</name> <name>Apache 2</name>

0
sms-aggregation-comm/.mvn/wrapper/maven-wrapper.jar → sms4j-comm/.mvn/wrapper/maven-wrapper.jar vendored
View File

0
sms-aggregation-comm/.mvn/wrapper/maven-wrapper.properties → sms4j-comm/.mvn/wrapper/maven-wrapper.properties vendored
View File

14
sms-aggregation-comm/pom.xml → sms4j-comm/pom.xml
View File

@ -3,17 +3,18 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-comm</artifactId>
<name>sms-aggregation-comm</name>
<description>sms-aggregation-comm</description>
<version>${revision}</version>
<properties>
<artifactId>sms4j-comm</artifactId>
<name>sms4j-comm</name>
<description>sms4j-comm</description>
<version>${revision}</version>
<properties>
</properties> </properties>
<dependencies> <dependencies>
@ -28,5 +29,4 @@
<artifactId>forest-core</artifactId> <artifactId>forest-core</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/annotation/Restricted.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/annotation/Restricted.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.comm.annotation; package org.dromara.sms4j.comm.annotation;
import java.lang.annotation.ElementType; import java.lang.annotation.ElementType;

2
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/config/SmsBanner.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/config/SmsBanner.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.comm.config; package org.dromara.sms4j.comm.config;
public class SmsBanner { public class SmsBanner {
private static final String banner = private static final String banner =

4
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/config/SmsConfig.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/config/SmsConfig.java
View File

@ -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; import lombok.Data;
@Data @Data

2
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/config/SmsSqlConfig.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/config/SmsSqlConfig.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.comm.config; package org.dromara.sms4j.comm.config;
import lombok.Data; import lombok.Data;

2
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/constant/Constant.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/constant/Constant.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.comm.constant; package org.dromara.sms4j.comm.constant;
/** /**

2
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/delayedTime/DelayedTime.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/DelayedTime.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.comm.delayedTime; package org.dromara.sms4j.comm.delayedTime;
import java.util.*; import java.util.*;

2
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/delayedTime/Task.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/delayedTime/Task.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.comm.delayedTime; package org.dromara.sms4j.comm.delayedTime;
import lombok.Data; import lombok.Data;

2
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/enumerate/ConfigType.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/enumerate/ConfigType.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.comm.enumerate; package org.dromara.sms4j.comm.enumerate;
/** /**
* ConfigType * ConfigType

2
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/enumerate/SupplierType.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/enumerate/SupplierType.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.comm.enumerate; package org.dromara.sms4j.comm.enumerate;
/** /**
* SupplierType * SupplierType

2
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/exception/SmsBlendException.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsBlendException.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.comm.exception; package org.dromara.sms4j.comm.exception;
public class SmsBlendException extends RuntimeException{ public class SmsBlendException extends RuntimeException{
public String code; public String code;

2
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/exception/SmsSqlException.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/exception/SmsSqlException.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.comm.exception; package org.dromara.sms4j.comm.exception;
public class SmsSqlException extends RuntimeException{ public class SmsSqlException extends RuntimeException{
private String message; private String message;

10
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/factory/BeanFactory.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/factory/BeanFactory.java
View File

@ -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.Forest;
import com.dtflys.forest.config.ForestConfiguration; import com.dtflys.forest.config.ForestConfiguration;
import org.dromara.sms.comm.config.SmsConfig; import org.dromara.sms4j.comm.config.SmsConfig;
import org.dromara.sms.comm.config.SmsSqlConfig; import org.dromara.sms4j.comm.config.SmsSqlConfig;
import org.dromara.sms.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.delayedTime.DelayedTime;
import org.dromara.sms.comm.utils.JDBCTool; import org.dromara.sms4j.comm.utils.JDBCTool;
import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;

2
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/FileTool.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/FileTool.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.comm.utils; package org.dromara.sms4j.comm.utils;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileWriter;

8
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/JDBCTool.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/JDBCTool.java
View File

@ -1,9 +1,9 @@
package org.dromara.sms.comm.utils; package org.dromara.sms4j.comm.utils;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import org.dromara.sms.comm.config.SmsSqlConfig; import org.dromara.sms4j.comm.config.SmsSqlConfig;
import org.dromara.sms.comm.exception.SmsSqlException; import org.dromara.sms4j.comm.exception.SmsSqlException;
import org.dromara.sms.comm.factory.BeanFactory; import org.dromara.sms4j.comm.factory.BeanFactory;
import java.sql.*; import java.sql.*;
import java.util.Hashtable; import java.util.Hashtable;

2
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/SettingUtil.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/SettingUtil.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.comm.utils; package org.dromara.sms4j.comm.utils;
import cn.hutool.core.io.file.FileReader; import cn.hutool.core.io.file.FileReader;

4
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/SmsUtil.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/SmsUtil.java
View File

@ -1,9 +1,9 @@
package org.dromara.sms.comm.utils; package org.dromara.sms4j.comm.utils;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONException; import com.alibaba.fastjson.JSONException;
import com.alibaba.fastjson.JSONObject; 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.NoSuchAlgorithmException;
import java.security.SecureRandom; import java.security.SecureRandom;

4
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/TimeExpiredPoolCache.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/TimeExpiredPoolCache.java
View File

@ -1,8 +1,8 @@
package org.dromara.sms.comm.utils; package org.dromara.sms4j.comm.utils;
import com.alibaba.fastjson.JSONObject; 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 lombok.extern.slf4j.Slf4j;
import java.io.File; import java.io.File;

2
sms-aggregation-comm/src/main/java/org/dromara/sms/comm/utils/http/HttpJsonTool.java → sms4j-comm/src/main/java/org/dromara/sms4j/comm/utils/http/HttpJsonTool.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.comm.utils.http; package org.dromara.sms4j.comm.utils.http;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;

0
sms-aggregation-comm/src/main/resources/application.properties → sms4j-comm/src/main/resources/application.properties
View File

42
sms-aggregation-core/.flattened-pom.xml → sms4j-core/.flattened-pom.xml
View File

@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</parent> </parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-core</artifactId> <artifactId>sms4j-core</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
<name>sms-aggregation-core</name> <name>sms4j-core</name>
<description>sms-aggregation-core</description> <description>sms4j-core</description>
<licenses> <licenses>
<license> <license>
<name>Apache 2</name> <name>Apache 2</name>
@ -22,32 +22,36 @@
</licenses> </licenses>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-aliyun</artifactId> <artifactId>sms4j-aliyun</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-tencent</artifactId> <artifactId>sms4j-tencent</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-unisms</artifactId> <artifactId>sms4j-unisms</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-yunpian</artifactId> <artifactId>sms4j-yunpian</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-huawei</artifactId> <artifactId>sms4j-huawei</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-jdcloud</artifactId> <artifactId>sms4j-jdcloud</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-cloopen</artifactId> <artifactId>sms4j-emay</artifactId>
</dependency>
<dependency>
<groupId>org.dromara.sms4j</groupId>
<artifactId>sms4j-cloopen</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build /> <build />

48
sms-aggregation-core/pom.xml → sms4j-core/pom.xml
View File

@ -3,64 +3,64 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-core</artifactId>
<version>${revision}</version>
<name>sms-aggregation-core</name>
<description>sms-aggregation-core</description>
<properties>
<artifactId>sms4j-core</artifactId>
<version>${revision}</version>
<name>sms4j-core</name>
<description>sms4j-core</description>
<properties>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-aliyun</artifactId> <artifactId>sms4j-aliyun</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-tencent</artifactId> <artifactId>sms4j-tencent</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-unisms</artifactId> <artifactId>sms4j-unisms</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-yunpian</artifactId> <artifactId>sms4j-yunpian</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-huawei</artifactId> <artifactId>sms4j-huawei</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-jdcloud</artifactId> <artifactId>sms4j-jdcloud</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-emay</artifactId> <artifactId>sms4j-emay</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-cloopen</artifactId> <artifactId>sms4j-cloopen</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
</plugins> </plugins>
</build> </build>
</project> </project>

24
sms-aggregation-core/src/main/java/org/dromara/sms/core/SupplierSqlConfig.java → sms4j-core/src/main/java/org/dromara/sms4j/core/SupplierSqlConfig.java
View File

@ -1,16 +1,16 @@
package org.dromara.sms.core; package org.dromara.sms4j.core;
import org.dromara.sms.aliyun.config.AlibabaConfig; import org.dromara.sms4j.aliyun.config.AlibabaConfig;
import org.dromara.sms.cloopen.config.CloopenConfig; import org.dromara.sms4j.cloopen.config.CloopenConfig;
import org.dromara.sms.comm.enumerate.SupplierType; import org.dromara.sms4j.comm.enumerate.SupplierType;
import org.dromara.sms.comm.utils.JDBCTool; import org.dromara.sms4j.comm.utils.JDBCTool;
import org.dromara.sms.comm.utils.SmsUtil; import org.dromara.sms4j.comm.utils.SmsUtil;
import org.dromara.sms.core.config.SupplierFactory; import org.dromara.sms4j.core.config.SupplierFactory;
import org.dromara.sms.huawei.config.HuaweiConfig; import org.dromara.sms4j.huawei.config.HuaweiConfig;
import org.dromara.sms.jdcloud.config.JdCloudConfig; import org.dromara.sms4j.jdcloud.config.JdCloudConfig;
import org.dromara.sms.tencent.config.TencentConfig; import org.dromara.sms4j.tencent.config.TencentConfig;
import org.dromara.sms.unisms.config.UniConfig; import org.dromara.sms4j.unisms.config.UniConfig;
import org.dromara.sms.yunpian.config.YunpianConfig; import org.dromara.sms4j.yunpian.config.YunpianConfig;
import java.util.Map; import java.util.Map;

18
sms-aggregation-core/src/main/java/org/dromara/sms/core/config/SupplierFactory.java → sms4j-core/src/main/java/org/dromara/sms4j/core/config/SupplierFactory.java
View File

@ -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.sms4j.emay.config.EmayConfig;
import org.dromara.sms.aliyun.config.AlibabaConfig; import org.dromara.sms4j.aliyun.config.AlibabaConfig;
import org.dromara.sms.cloopen.config.CloopenConfig; import org.dromara.sms4j.cloopen.config.CloopenConfig;
import org.dromara.sms.huawei.config.HuaweiConfig; import org.dromara.sms4j.huawei.config.HuaweiConfig;
import org.dromara.sms.jdcloud.config.JdCloudConfig; import org.dromara.sms4j.jdcloud.config.JdCloudConfig;
import org.dromara.sms.tencent.config.TencentConfig; import org.dromara.sms4j.tencent.config.TencentConfig;
import org.dromara.sms.unisms.config.UniConfig; import org.dromara.sms4j.unisms.config.UniConfig;
import org.dromara.sms.yunpian.config.YunpianConfig; import org.dromara.sms4j.yunpian.config.YunpianConfig;
/** /**
* SupplierFactory * SupplierFactory

24
sms-aggregation-core/src/main/java/org/dromara/sms/core/factory/SmsFactory.java → sms4j-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java
View File

@ -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.sms4j.emay.config.EmaySmsConfig;
import org.dromara.sms.aliyun.config.AlibabaSmsConfig; import org.dromara.sms4j.aliyun.config.AlibabaSmsConfig;
import org.dromara.sms.api.SmsBlend; import org.dromara.sms4j.api.SmsBlend;
import org.dromara.sms.cloopen.config.CloopenSmsConfig; import org.dromara.sms4j.cloopen.config.CloopenSmsConfig;
import org.dromara.sms.comm.enumerate.SupplierType; import org.dromara.sms4j.comm.enumerate.SupplierType;
import org.dromara.sms.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.exception.SmsBlendException;
import org.dromara.sms.core.config.SupplierFactory; import org.dromara.sms4j.core.config.SupplierFactory;
import org.dromara.sms.huawei.config.HuaweiSmsConfig; import org.dromara.sms4j.huawei.config.HuaweiSmsConfig;
import org.dromara.sms.jdcloud.config.JdCloudSmsConfig; import org.dromara.sms4j.jdcloud.config.JdCloudSmsConfig;
import org.dromara.sms.tencent.config.TencentSmsConfig; import org.dromara.sms4j.tencent.config.TencentSmsConfig;
import org.dromara.sms.unisms.config.UniSmsConfig; import org.dromara.sms4j.unisms.config.UniSmsConfig;
/** /**
* SmsFactory * SmsFactory

0
sms-aggregation-core/src/main/resources/application.properties → sms4j-core/src/main/resources/application.properties
View File

18
sms-aggregation-yunpian/.flattened-pom.xml → sms4j-emay/.flattened-pom.xml
View File

@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</parent> </parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-yunpian</artifactId> <artifactId>sms4j-emay</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
<name>sms-aggregation-yunpian</name> <name>sms4j-emay</name>
<description>sms-aggregation-yunpian</description> <description>sms4j-emay</description>
<licenses> <licenses>
<license> <license>
<name>Apache 2</name> <name>Apache 2</name>
@ -22,12 +22,12 @@
</licenses> </licenses>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms4j-comm</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-api</artifactId> <artifactId>sms4j-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

0
sms-aggregation-emay/.mvn/wrapper/maven-wrapper.jar → sms4j-emay/.mvn/wrapper/maven-wrapper.jar vendored
View File

0
sms-aggregation-emay/.mvn/wrapper/maven-wrapper.properties → sms4j-emay/.mvn/wrapper/maven-wrapper.properties vendored
View File

21
sms-aggregation-yunpian/pom.xml → sms4j-emay/pom.xml
View File

@ -3,30 +3,29 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-yunpian</artifactId> <artifactId>sms4j-emay</artifactId>
<name>sms-aggregation-yunpian</name>
<description>sms-aggregation-yunpian</description>
<version>${revision}</version> <version>${revision}</version>
<properties> <name>sms4j-emay</name>
<description>sms4j-emay</description>
<properties>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms4j-comm</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-api</artifactId> <artifactId>sms4j-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

34
sms-aggregation-emay/src/main/java/kim/wind/emay/config/EmayConfig.java → sms4j-emay/src/main/java/org/dromara/sms4j/emay/config/EmayConfig.java
View File

@ -1,17 +1,17 @@
package kim.wind.emay.config; package org.dromara.sms4j.emay.config;
import lombok.Data; import lombok.Data;
/** /**
* @author Richard * @author Richard
* @date 2023-04-11 12:00 * @date 2023-04-11 12:00
*/ */
@Data @Data
public class EmayConfig { public class EmayConfig {
/** appKey*/ /** appKey*/
private String appId ; private String appId ;
/** appSecret */ /** appSecret */
private String secretKey ; private String secretKey ;
/** APP接入地址*/ /** APP接入地址*/
private String requestUrl; private String requestUrl;
} }

80
sms-aggregation-emay/src/main/java/kim/wind/emay/config/EmaySmsConfig.java → sms4j-emay/src/main/java/org/dromara/sms4j/emay/config/EmaySmsConfig.java
View File

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

386
sms-aggregation-emay/src/main/java/kim/wind/emay/service/EmaySmsImpl.java → sms4j-emay/src/main/java/org/dromara/sms4j/emay/service/EmaySmsImpl.java
View File

@ -1,193 +1,193 @@
package kim.wind.emay.service; package org.dromara.sms4j.emay.service;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.dtflys.forest.config.ForestConfiguration; import com.dtflys.forest.config.ForestConfiguration;
import kim.wind.emay.config.EmayConfig; import org.dromara.sms4j.emay.config.EmayConfig;
import kim.wind.emay.util.EmayBuilder; import org.dromara.sms4j.emay.util.EmayBuilder;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms.api.SmsBlend; import org.dromara.sms4j.api.SmsBlend;
import org.dromara.sms.api.callback.CallBack; import org.dromara.sms4j.api.callback.CallBack;
import org.dromara.sms.api.entity.SmsResponse; import org.dromara.sms4j.api.entity.SmsResponse;
import org.dromara.sms.comm.annotation.Restricted; import org.dromara.sms4j.comm.annotation.Restricted;
import org.dromara.sms.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.delayedTime.DelayedTime;
import org.dromara.sms.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.exception.SmsBlendException;
import org.dromara.sms.comm.factory.BeanFactory; import org.dromara.sms4j.comm.factory.BeanFactory;
import java.util.*; import java.util.*;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import static org.dromara.sms.comm.utils.SmsUtil.listToString; import static org.dromara.sms4j.comm.utils.SmsUtil.listToString;
/** /**
* @author Richard * @author Richard
* @date 2023-04-11 12:00 * @date 2023-04-11 12:00
*/ */
@Slf4j @Slf4j
public class EmaySmsImpl implements SmsBlend { public class EmaySmsImpl implements SmsBlend {
public EmaySmsImpl(EmayConfig config, Executor pool, DelayedTime delayed) { public EmaySmsImpl(EmayConfig config, Executor pool, DelayedTime delayed) {
this.config = config; this.config = config;
this.pool = pool; this.pool = pool;
this.delayed = delayed; this.delayed = delayed;
} }
private EmayConfig config; private EmayConfig config;
private Executor pool; private Executor pool;
private DelayedTime delayed; private DelayedTime delayed;
private final ForestConfiguration http = BeanFactory.getForestConfiguration(); private final ForestConfiguration http = BeanFactory.getForestConfiguration();
@Override @Override
@Restricted @Restricted
public SmsResponse sendMessage(String phone, String message) { public SmsResponse sendMessage(String phone, String message) {
String url = config.getRequestUrl(); String url = config.getRequestUrl();
Map<String, Object> params; Map<String, Object> params;
try { try {
params = EmayBuilder.buildRequestBody(config.getAppId(), config.getSecretKey(), phone, message); params = EmayBuilder.buildRequestBody(config.getAppId(), config.getSecretKey(), phone, message);
} catch (SmsBlendException e) { } catch (SmsBlendException e) {
SmsResponse smsResponse = new SmsResponse(); SmsResponse smsResponse = new SmsResponse();
smsResponse.setErrMessage(e.getMessage()); smsResponse.setErrMessage(e.getMessage());
return smsResponse; return smsResponse;
} }
return getSendResponse(params, url); return getSendResponse(params, url);
} }
@Override @Override
@Restricted @Restricted
public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse sendMessage(String phone, String templateId, LinkedHashMap<String, String> messages) {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
for (Map.Entry<String, String> entry : messages.entrySet()) { for (Map.Entry<String, String> entry : messages.entrySet()) {
list.add(entry.getValue()); list.add(entry.getValue());
} }
return sendMessage(phone, EmayBuilder.listToString(list)); return sendMessage(phone, EmayBuilder.listToString(list));
} }
@Override @Override
@Restricted @Restricted
public SmsResponse massTexting(List<String> phones, String message) { public SmsResponse massTexting(List<String> phones, String message) {
if (phones.size() > 500) { if (phones.size() > 500) {
throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于500"); throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于500");
} }
return sendMessage(listToString(phones), message); return sendMessage(listToString(phones), message);
} }
@Override @Override
@Restricted @Restricted
public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) { public SmsResponse massTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages) {
if (phones.size() > 500) { if (phones.size() > 500) {
throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于500"); throw new SmsBlendException("单次发送超过最大发送上限，建议每次群发短信人数低于500");
} }
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
for (Map.Entry<String, String> entry : messages.entrySet()) { for (Map.Entry<String, String> entry : messages.entrySet()) {
list.add(entry.getValue()); list.add(entry.getValue());
} }
return sendMessage(listToString(phones), EmayBuilder.listToString(list)); return sendMessage(listToString(phones), EmayBuilder.listToString(list));
} }
@Override @Override
@Restricted @Restricted
public void sendMessageAsync(String phone, String message, CallBack callBack) { public void sendMessageAsync(String phone, String message, CallBack callBack) {
pool.execute(() -> { pool.execute(() -> {
SmsResponse smsResponse = sendMessage(phone, message); SmsResponse smsResponse = sendMessage(phone, message);
callBack.callBack(smsResponse); callBack.callBack(smsResponse);
}); });
} }
@Override @Override
@Restricted @Restricted
public void sendMessageAsync(String phone, String message) { public void sendMessageAsync(String phone, String message) {
pool.execute(() -> sendMessage(phone, message)); pool.execute(() -> sendMessage(phone, message));
} }
@Override @Override
@Restricted @Restricted
public void sendMessageAsync(String phone, String templateId, LinkedHashMap<String, String> messages, CallBack callBack) { public void sendMessageAsync(String phone, String templateId, LinkedHashMap<String, String> messages, CallBack callBack) {
pool.execute(() -> { pool.execute(() -> {
SmsResponse smsResponse = sendMessage(phone, templateId, messages); SmsResponse smsResponse = sendMessage(phone, templateId, messages);
callBack.callBack(smsResponse); callBack.callBack(smsResponse);
}); });
} }
@Override @Override
@Restricted @Restricted
public void sendMessageAsync(String phone, String templateId, LinkedHashMap<String, String> messages) { public void sendMessageAsync(String phone, String templateId, LinkedHashMap<String, String> messages) {
pool.execute(() -> sendMessage(phone, templateId, messages)); pool.execute(() -> sendMessage(phone, templateId, messages));
} }
@Override @Override
@Restricted @Restricted
public void delayedMessage(String phone, String message, Long delayedTime) { public void delayedMessage(String phone, String message, Long delayedTime) {
this.delayed.schedule(new TimerTask() { this.delayed.schedule(new TimerTask() {
@Override @Override
public void run() { public void run() {
sendMessage(phone, message); sendMessage(phone, message);
} }
}, delayedTime); }, delayedTime);
} }
@Override @Override
@Restricted @Restricted
public void delayedMessage(String phone, String templateId, LinkedHashMap<String, String> messages, Long delayedTime) { public void delayedMessage(String phone, String templateId, LinkedHashMap<String, String> messages, Long delayedTime) {
this.delayed.schedule(new TimerTask() { this.delayed.schedule(new TimerTask() {
@Override @Override
public void run() { public void run() {
sendMessage(phone, templateId, messages); sendMessage(phone, templateId, messages);
} }
}, delayedTime); }, delayedTime);
} }
@Override @Override
@Restricted @Restricted
public void delayMassTexting(List<String> phones, String message, Long delayedTime) { public void delayMassTexting(List<String> phones, String message, Long delayedTime) {
this.delayed.schedule(new TimerTask() { this.delayed.schedule(new TimerTask() {
@Override @Override
public void run() { public void run() {
massTexting(phones, message); massTexting(phones, message);
} }
}, delayedTime); }, delayedTime);
} }
@Override @Override
@Restricted @Restricted
public void delayMassTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages, Long delayedTime) { public void delayMassTexting(List<String> phones, String templateId, LinkedHashMap<String, String> messages, Long delayedTime) {
this.delayed.schedule(new TimerTask() { this.delayed.schedule(new TimerTask() {
@Override @Override
public void run() { public void run() {
massTexting(phones, templateId, messages); massTexting(phones, templateId, messages);
} }
}, delayedTime); }, delayedTime);
} }
private SmsResponse getSendResponse(Map<String, Object> body, String requestUrl) { private SmsResponse getSendResponse(Map<String, Object> body, String requestUrl) {
AtomicReference<SmsResponse> smsResponse = new AtomicReference<>(); AtomicReference<SmsResponse> smsResponse = new AtomicReference<>();
http.post(requestUrl) http.post(requestUrl)
.addBody(body) .addBody(body)
.onSuccess(((data, req, res) -> { .onSuccess(((data, req, res) -> {
JSONObject jsonBody = res.get(JSONObject.class); JSONObject jsonBody = res.get(JSONObject.class);
smsResponse.set(getSmsResponse(jsonBody)); smsResponse.set(getSmsResponse(jsonBody));
})) }))
.onError((ex, req, res) -> { .onError((ex, req, res) -> {
JSONObject jsonBody = res.get(JSONObject.class); JSONObject jsonBody = res.get(JSONObject.class);
smsResponse.set(getSmsResponse(jsonBody)); smsResponse.set(getSmsResponse(jsonBody));
}) })
.execute(); .execute();
return smsResponse.get(); return smsResponse.get();
} }
private static SmsResponse getSmsResponse(JSONObject execute) { private static SmsResponse getSmsResponse(JSONObject execute) {
SmsResponse smsResponse = new SmsResponse(); SmsResponse smsResponse = new SmsResponse();
String code = execute.getString("code"); String code = execute.getString("code");
smsResponse.setCode(code); smsResponse.setCode(code);
if ("success".equalsIgnoreCase(code)) { if ("success".equalsIgnoreCase(code)) {
JSONObject data = execute.getJSONObject("data"); JSONObject data = execute.getJSONObject("data");
String smsId = data.getString("smsId"); String smsId = data.getString("smsId");
smsResponse.setBizId(smsId); smsResponse.setBizId(smsId);
} }
smsResponse.setData(execute); smsResponse.setData(execute);
return smsResponse; return smsResponse;
} }
} }

154
sms-aggregation-emay/src/main/java/kim/wind/emay/util/EmayBuilder.java → sms4j-emay/src/main/java/org/dromara/sms4j/emay/util/EmayBuilder.java
View File

@ -1,77 +1,77 @@
package kim.wind.emay.util; package org.dromara.sms4j.emay.util;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SecureUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.exception.SmsBlendException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* @author Richard * @author Richard
* @version 1.0 * @version 1.0
* @date 2023/4/11 15:11 * @date 2023/4/11 15:11
*/ */
@Slf4j @Slf4j
public class EmayBuilder { public class EmayBuilder {
public static Map<String, Object> buildRequestBody(String appId, String secretKey, String phone, public static Map<String, Object> buildRequestBody(String appId, String secretKey, String phone,
String message) throws SmsBlendException { String message) throws SmsBlendException {
return getParamsMap(appId, secretKey, phone, message); return getParamsMap(appId, secretKey, phone, message);
} }
/** /**
* @param appId 用户Appid(必填) * @param appId 用户Appid(必填)
* @param secretKey 加密key * @param secretKey 加密key
* @param phone * @param phone
* @param message * @param message
* @param customSmsId 自定义消息ID(选填) 最长64位 * @param customSmsId 自定义消息ID(选填) 最长64位
* @return * @return
* @throws SmsBlendException * @throws SmsBlendException
*/ */
public static Map<String, Object> buildRequestBody(String appId, String secretKey, String phone, public static Map<String, Object> buildRequestBody(String appId, String secretKey, String phone,
String message, String customSmsId) throws SmsBlendException { String message, String customSmsId) throws SmsBlendException {
Map<String, Object> params = getParamsMap(appId, secretKey, phone, message); Map<String, Object> params = getParamsMap(appId, secretKey, phone, message);
params.put("customSmsId", customSmsId); params.put("customSmsId", customSmsId);
return params; return params;
} }
private static Map<String, Object> getParamsMap(String appId, String secretKey, String phone, String message) { private static Map<String, Object> getParamsMap(String appId, String secretKey, String phone, String message) {
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
// 时间戳(必填) 格式：yyyyMMddHHmmss // 时间戳(必填) 格式：yyyyMMddHHmmss
String timestamp = DateUtil.format(new Date(), DateTimeFormatter.ofPattern("yyyyMMddHHmmss")); String timestamp = DateUtil.format(new Date(), DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
String sign = SecureUtil.md5(appId + secretKey + timestamp); String sign = SecureUtil.md5(appId + secretKey + timestamp);
params.put("appId", appId); params.put("appId", appId);
params.put("timestamp", timestamp); params.put("timestamp", timestamp);
params.put("sign", sign); params.put("sign", sign);
params.put("mobiles", phone); params.put("mobiles", phone);
try { try {
params.put("content", URLEncoder.encode(message, "utf-8")); params.put("content", URLEncoder.encode(message, "utf-8"));
} catch (Exception e) { } catch (Exception e) {
log.error("EmaySmsImpl urlEncode content error", e); log.error("EmaySmsImpl urlEncode content error", e);
throw new SmsBlendException(e.getMessage()); throw new SmsBlendException(e.getMessage());
} }
return params; return params;
} }
public static String listToString(List<String> list) { public static String listToString(List<String> list) {
StringBuilder stringBuffer = new StringBuilder(); StringBuilder stringBuffer = new StringBuilder();
stringBuffer.append("[\""); stringBuffer.append("[\"");
for (String s : list) { for (String s : list) {
stringBuffer.append(s); stringBuffer.append(s);
stringBuffer.append("\""); stringBuffer.append("\"");
stringBuffer.append(","); stringBuffer.append(",");
} }
stringBuffer.deleteCharAt(stringBuffer.length() - 1); stringBuffer.deleteCharAt(stringBuffer.length() - 1);
stringBuffer.append("]"); stringBuffer.append("]");
return stringBuffer.toString(); return stringBuffer.toString();
} }
} }

0
sms-aggregation-emay/src/main/resources/application.properties → sms4j-emay/src/main/resources/application.properties
View File

18
sms-aggregation-huawei/.flattened-pom.xml → sms4j-huawei/.flattened-pom.xml
View File

@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</parent> </parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-huawei</artifactId> <artifactId>sms4j-huawei</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
<name>sms-aggregation-huawei</name> <name>sms4j-huawei</name>
<description>sms-aggregation-huawei</description> <description>sms4j-huawei</description>
<licenses> <licenses>
<license> <license>
<name>Apache 2</name> <name>Apache 2</name>
@ -22,12 +22,12 @@
</licenses> </licenses>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms4j-comm</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-api</artifactId> <artifactId>sms4j-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build /> <build />

0
sms-aggregation-huawei/.mvn/wrapper/maven-wrapper.jar → sms4j-huawei/.mvn/wrapper/maven-wrapper.jar vendored
View File

0
sms-aggregation-huawei/.mvn/wrapper/maven-wrapper.properties → sms4j-huawei/.mvn/wrapper/maven-wrapper.properties vendored
View File

21
sms-aggregation-emay/pom.xml → sms4j-huawei/pom.xml
View File

@ -3,35 +3,32 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-emay</artifactId>
<artifactId>sms4j-huawei</artifactId>
<version>${revision}</version> <version>${revision}</version>
<name>sms-aggregation-emay</name> <name>sms4j-huawei</name>
<description>sms-aggregation-emay</description> <description>sms4j-huawei</description>
<properties> <properties>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms4j-comm</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-api</artifactId> <artifactId>sms4j-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
</build> </build>
</project> </project>

2
sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/config/HuaweiConfig.java → sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiConfig.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.huawei.config; package org.dromara.sms4j.huawei.config;
import lombok.Data; import lombok.Data;

6
sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/config/HuaweiSmsConfig.java → sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/config/HuaweiSmsConfig.java
View File

@ -1,6 +1,6 @@
package org.dromara.sms.huawei.config; package org.dromara.sms4j.huawei.config;
import org.dromara.sms.comm.factory.BeanFactory; import org.dromara.sms4j.comm.factory.BeanFactory;
import org.dromara.sms.huawei.service.HuaweiSmsImpl; import org.dromara.sms4j.huawei.service.HuaweiSmsImpl;
/** /**
* HuaweiSmsConfig * HuaweiSmsConfig

2
sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/HuaweiError.java → sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiError.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.huawei.entity; package org.dromara.sms4j.huawei.entity;
/** /**
* HuaweiError * HuaweiError

2
sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/HuaweiResponse.java → sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/HuaweiResponse.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.huawei.entity; package org.dromara.sms4j.huawei.entity;
import lombok.Data; import lombok.Data;

2
sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/entity/SmsId.java → sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/entity/SmsId.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.huawei.entity; package org.dromara.sms4j.huawei.entity;
import lombok.Data; import lombok.Data;

25
sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/service/HuaweiSmsImpl.java → sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/service/HuaweiSmsImpl.java
View File

@ -1,22 +1,23 @@
package org.dromara.sms.huawei.service; package org.dromara.sms4j.huawei.service;
import com.dtflys.forest.config.ForestConfiguration; import com.dtflys.forest.config.ForestConfiguration;
import org.dromara.sms.api.callback.CallBack; import org.dromara.sms4j.api.callback.CallBack;
import org.dromara.sms.api.entity.SmsResponse; import org.dromara.sms4j.api.entity.SmsResponse;
import org.dromara.sms.comm.annotation.Restricted; import org.dromara.sms4j.comm.annotation.Restricted;
import org.dromara.sms.comm.constant.Constant; import org.dromara.sms4j.comm.constant.Constant;
import org.dromara.sms.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.delayedTime.DelayedTime;
import org.dromara.sms.comm.factory.BeanFactory; import org.dromara.sms4j.comm.factory.BeanFactory;
import org.dromara.sms.huawei.config.HuaweiConfig; import org.dromara.sms4j.huawei.config.HuaweiConfig;
import org.dromara.sms.huawei.entity.HuaweiResponse; import org.dromara.sms4j.huawei.entity.HuaweiResponse;
import org.dromara.sms.huawei.utils.HuaweiBuilder; import org.dromara.sms4j.huawei.utils.HuaweiBuilder;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms.api.SmsBlend; import org.dromara.sms4j.api.SmsBlend;
import java.util.*; import java.util.*;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import static org.dromara.sms.huawei.utils.HuaweiBuilder.listToString; import static org.dromara.sms4j.huawei.utils.HuaweiBuilder.listToString;
@Slf4j @Slf4j

4
sms-aggregation-huawei/src/main/java/org/dromara/sms/huawei/utils/HuaweiBuilder.java → sms4j-huawei/src/main/java/org/dromara/sms4j/huawei/utils/HuaweiBuilder.java
View File

@ -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.HttpsURLConnection;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;

0
sms-aggregation-huawei/src/main/resources/application.properties → sms4j-huawei/src/main/resources/application.properties
View File

18
sms-aggregation-jdcloud/.flattened-pom.xml → sms4j-jdcloud/.flattened-pom.xml
View File

@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</parent> </parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-jdcloud</artifactId> <artifactId>sms4j-jdcloud</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
<name>sms-aggregation-jdcloud</name> <name>sms4j-jdcloud</name>
<description>sms-aggregation-jdcloud</description> <description>sms4j-jdcloud</description>
<licenses> <licenses>
<license> <license>
<name>Apache 2</name> <name>Apache 2</name>
@ -26,12 +26,12 @@
<artifactId>sms</artifactId> <artifactId>sms</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms4j-comm</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-api</artifactId> <artifactId>sms4j-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

0
sms-aggregation-jdcloud/.mvn/wrapper/maven-wrapper.jar → sms4j-jdcloud/.mvn/wrapper/maven-wrapper.jar vendored
View File

0
sms-aggregation-jdcloud/.mvn/wrapper/maven-wrapper.properties → sms4j-jdcloud/.mvn/wrapper/maven-wrapper.properties vendored
View File

16
sms-aggregation-jdcloud/pom.xml → sms4j-jdcloud/pom.xml
View File

@ -4,15 +4,15 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-jdcloud</artifactId> <artifactId>sms4j-jdcloud</artifactId>
<name>sms-aggregation-jdcloud</name> <name>sms4j-jdcloud</name>
<description>sms-aggregation-jdcloud</description> <description>sms4j-jdcloud</description>
<version>${revision}</version> <version>${revision}</version>
<dependencies> <dependencies>
@ -23,13 +23,13 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms4j-comm</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-api</artifactId> <artifactId>sms4j-api</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/config/JdCloudConfig.java → sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudConfig.java
View File

@ -1,4 +1,4 @@
package org.dromara.sms.jdcloud.config; package org.dromara.sms4j.jdcloud.config;
import lombok.Data; import lombok.Data;

6
sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/config/JdCloudSmsConfig.java → sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/config/JdCloudSmsConfig.java
View File

@ -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.CredentialsProvider;
import com.jdcloud.sdk.auth.StaticCredentialsProvider; import com.jdcloud.sdk.auth.StaticCredentialsProvider;
import com.jdcloud.sdk.http.HttpRequestConfig; import com.jdcloud.sdk.http.HttpRequestConfig;
import com.jdcloud.sdk.http.Protocol; import com.jdcloud.sdk.http.Protocol;
import com.jdcloud.sdk.service.sms.client.SmsClient; import com.jdcloud.sdk.service.sms.client.SmsClient;
import org.dromara.sms.comm.factory.BeanFactory; import org.dromara.sms4j.comm.factory.BeanFactory;
import org.dromara.sms.jdcloud.service.JdCloudSmsImpl; import org.dromara.sms4j.jdcloud.service.JdCloudSmsImpl;
/** /**
* 京东云短信配置 * 京东云短信配置

16
sms-aggregation-jdcloud/src/main/java/org/dromara/sms/jdcloud/service/JdCloudSmsImpl.java → sms4j-jdcloud/src/main/java/org/dromara/sms4j/jdcloud/service/JdCloudSmsImpl.java
View File

@ -1,17 +1,17 @@
package org.dromara.sms.jdcloud.service; package org.dromara.sms4j.jdcloud.service;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.jdcloud.sdk.service.sms.client.SmsClient; import com.jdcloud.sdk.service.sms.client.SmsClient;
import com.jdcloud.sdk.service.sms.model.BatchSendRequest; import com.jdcloud.sdk.service.sms.model.BatchSendRequest;
import com.jdcloud.sdk.service.sms.model.BatchSendResult; import com.jdcloud.sdk.service.sms.model.BatchSendResult;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.sms.api.SmsBlend; import org.dromara.sms4j.api.SmsBlend;
import org.dromara.sms.api.callback.CallBack; import org.dromara.sms4j.api.callback.CallBack;
import org.dromara.sms.api.entity.SmsResponse; import org.dromara.sms4j.api.entity.SmsResponse;
import org.dromara.sms.comm.annotation.Restricted; import org.dromara.sms4j.comm.annotation.Restricted;
import org.dromara.sms.comm.delayedTime.DelayedTime; import org.dromara.sms4j.comm.delayedTime.DelayedTime;
import org.dromara.sms.comm.exception.SmsBlendException; import org.dromara.sms4j.comm.exception.SmsBlendException;
import org.dromara.sms.jdcloud.config.JdCloudConfig; import org.dromara.sms4j.jdcloud.config.JdCloudConfig;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;

0
sms-aggregation-jdcloud/src/main/resources/application.properties → sms4j-jdcloud/src/main/resources/application.properties
View File

14
sms-aggregation-spring-boot-starter/.flattened-pom.xml → sms4j-spring-boot-starter/.flattened-pom.xml
View File

@ -3,15 +3,15 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
</parent> </parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-spring-boot-starter</artifactId> <artifactId>sms4j-spring-boot-starter</artifactId>
<version>1.0.5</version> <version>1.0.5</version>
<name>sms-aggregation-spring-boot-starter</name> <name>sms4j-spring-boot-starter</name>
<description>sms-aggregation-spring-boot-starter</description> <description>sms4j-spring-boot-starter</description>
<licenses> <licenses>
<license> <license>
<name>Apache 2</name> <name>Apache 2</name>
@ -29,8 +29,8 @@
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-autoimmit</artifactId> <artifactId>sms4j-autoimmit</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

18
sms-aggregation-spring-boot-starter/pom.xml → sms4j-spring-boot-starter/pom.xml
View File

@ -3,20 +3,21 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>${revision}</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-spring-boot-starter</artifactId>
<name>sms-aggregation-spring-boot-starter</name> <artifactId>sms4j-spring-boot-starter</artifactId>
<description>sms-aggregation-spring-boot-starter</description> <name>sms4j-spring-boot-starter</name>
<description>sms4j-spring-boot-starter</description>
<version>${revision}</version> <version>${revision}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -27,19 +28,18 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>org.dromara.sms4j</groupId>
<artifactId>sms-aggregation-autoimmit</artifactId> <artifactId>sms4j-autoimmit</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId> <artifactId>spring-boot-starter</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
</plugins> </plugins>
</build> </build>
</project> </project>

Some files were not shown because too many files have changed in this diff Show More