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

修改统一版本号，添加springBoot3支持

Browse Source
This commit is contained in:
wind 2023-04-04 20:57:19 +08:00
parent b16a05e130
commit 8965527f6e
15 changed files with 117 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
pom.xml
View File

@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.3</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/the-wind-is-like-a-song/sms_aggregation</url> <url>https://gitee.com/MR-wind/sms_aggregation</url>
<modules> <modules>
<module>sms-aggregation-api</module> <module>sms-aggregation-api</module>
@ -42,15 +42,14 @@
<!-- 仓库信息 --> <!-- 仓库信息 -->
<scm> <scm>
<tag>master</tag> <tag>master</tag>
<url>https://gitee.com/the-wind-is-like-a-song/sms_aggregation.git</url> <url>https://gitee.com/MR-wind/sms_aggregation.git</url>
<connection>scm:git:https://gitee.com/the-wind-is-like-a-song/sms_aggregation.git</connection> <connection>scm:git:https://gitee.com/MR-wind/sms_aggregation.git</connection>
<developerConnection>scm:git:https://gitee.com/the-wind-is-like-a-song/sms_aggregation.git</developerConnection> <developerConnection>scm:git:https://gitee.com/MR-wind/sms_aggregation.git</developerConnection>
</scm> </scm>
<properties> <properties>
<java.version>1.8</java.version> <spring.boot.version>3.0.5</spring.boot.version>
<spring.boot.version>2.7.10</spring.boot.version> <revision>1.0.3</revision>
<modules.version>1.0.3</modules.version>
<aliyun.version>2.0.23</aliyun.version> <aliyun.version>2.0.23</aliyun.version>
<json.version>2.0.15</json.version> <json.version>2.0.15</json.version>
<okhttp.version>3.14.9</okhttp.version> <okhttp.version>3.14.9</okhttp.version>
@ -79,57 +78,57 @@
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms-aggregation-aliyun</artifactId> <artifactId>sms-aggregation-aliyun</artifactId>
<version>${modules.version}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms-aggregation-tencent</artifactId> <artifactId>sms-aggregation-tencent</artifactId>
<version>${modules.version}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms-aggregation-unisms</artifactId> <artifactId>sms-aggregation-unisms</artifactId>
<version>${modules.version}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms-aggregation-yunpian</artifactId> <artifactId>sms-aggregation-yunpian</artifactId>
<version>${modules.version}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms-aggregation-huawei</artifactId> <artifactId>sms-aggregation-huawei</artifactId>
<version>${modules.version}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms-aggregation-spring-boot-starter</artifactId> <artifactId>sms-aggregation-spring-boot-starter</artifactId>
<version>${modules.version}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms-aggregation-autoimmit</artifactId> <artifactId>sms-aggregation-autoimmit</artifactId>
<version>${modules.version}</version> <version>${revision}</version>
</dependency> </dependency>
<!--通用模块--> <!--通用模块-->
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms-aggregation-comm</artifactId>
<version>${modules.version}</version> <version>${revision}</version>
</dependency> </dependency>
<!--api模块--> <!--api模块-->
<dependency> <dependency>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms-aggregation-api</artifactId> <artifactId>sms-aggregation-api</artifactId>
<version>${modules.version}</version> <version>${revision}</version>
</dependency> </dependency>
<!-- 阿里云短信依赖--> <!-- 阿里云短信依赖-->
@ -297,6 +296,32 @@
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
<!-- version number -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.2.7</version>
<configuration>
<updatePomFile>true</updatePomFile>
<flattenMode>resolveCiFriendliesOnly</flattenMode>
</configuration>
<executions>
<execution>
<id>flatten</id>
<phase>process-resources</phase>
<goals>
<goal>flatten</goal>
</goals>
</execution>
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>

4
sms-aggregation-aliyun/pom.xml
View File

@ -5,13 +5,13 @@
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.3</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-aliyun</artifactId> <artifactId>sms-aggregation-aliyun</artifactId>
<name>sms-aggregation-aliyun</name> <name>sms-aggregation-aliyun</name>
<description>sms-aggregation-aliyun</description> <description>sms-aggregation-aliyun</description>
<version>1.0.3</version> <version>${revision}</version>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
</properties> </properties>

4
sms-aggregation-api/pom.xml
View File

@ -5,13 +5,13 @@
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.3</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-api</artifactId> <artifactId>sms-aggregation-api</artifactId>
<name>sms-aggregation-api</name> <name>sms-aggregation-api</name>
<description>sms-aggregation-api</description> <description>sms-aggregation-api</description>
<version>1.0.3</version> <version>${revision}</version>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>

4
sms-aggregation-autoimmit/pom.xml
View File

@ -5,11 +5,11 @@
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.3</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-autoimmit</artifactId> <artifactId>sms-aggregation-autoimmit</artifactId>
<version>1.0.3</version> <version>${revision}</version>
<name>sms-aggregation-autoimmit</name> <name>sms-aggregation-autoimmit</name>
<description>sms-aggregation-autoimmit</description> <description>sms-aggregation-autoimmit</description>

14
sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/config/SmsAutowiredConfig.java
View File

@ -1,10 +1,8 @@
package kim.wind.sms.autoimmit.config; package kim.wind.sms.autoimmit.config;
import kim.wind.sms.autoimmit.aop.AopAdvice; import kim.wind.sms.autoimmit.aop.AopAdvice;
import kim.wind.sms.comm.config.SmsBanner;
import kim.wind.sms.comm.delayedTime.DelayedTime; import kim.wind.sms.comm.delayedTime.DelayedTime;
import kim.wind.sms.comm.utils.RedisUtils; import kim.wind.sms.comm.utils.RedisUtils;
import lombok.Data;
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;
@ -13,13 +11,10 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
@Data
public class SmsAutowiredConfig {
public void init(){
SmsBanner.PrintBanner("V1.0.3");
}
@Bean public class SmsAutowiredConfig {
@Bean(initMethod = "init")
@ConfigurationProperties(prefix = "sms") //指定配置文件注入属性前缀 @ConfigurationProperties(prefix = "sms") //指定配置文件注入属性前缀
public SmsConfig smsConfig(){ public SmsConfig smsConfig(){
return new SmsConfig(); return new SmsConfig();
@ -62,7 +57,4 @@ public class SmsAutowiredConfig {
executor.initialize(); executor.initialize();
return executor; return executor;
} }
} }

57
sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/config/SmsConfig.java
View File

@ -1,43 +1,72 @@
package kim.wind.sms.autoimmit.config; package kim.wind.sms.autoimmit.config;
import kim.wind.sms.comm.config.SmsBanner;
import lombok.Data; import lombok.Data;
@Data @Data
public class SmsConfig { public class SmsConfig {
/** 短信服务商*/ /**
* 短信服务商
*/
private String supplier; private String supplier;
/** 打印banner*/ /**
private String isPrint = "true"; * 打印banner
*/
private Boolean isPrint = true;
/** 是否开启短信限制*/ /**
* 是否开启短信限制
*/
private String restricted; private String restricted;
/** 是否使用redis进行缓存*/ /**
* 是否使用redis进行缓存
*/
private String redisCache = "false"; private String redisCache = "false";
/** 单账号每日最大发送量*/ /**
* 单账号每日最大发送量
*/
private Integer accountMax; private Integer accountMax;
/** 单账号每分钟最大发送*/ /**
* 单账号每分钟最大发送
*/
private Integer minuteMax; private Integer minuteMax;
/**核心线程池大小*/ /**
* 核心线程池大小
*/
private Integer corePoolSize = 10; private Integer corePoolSize = 10;
/** 最大线程数*/ /**
* 最大线程数
*/
private Integer maxPoolSize = 30; private Integer maxPoolSize = 30;
/** 队列容量*/ /**
* 队列容量
*/
private Integer queueCapacity = 50; private Integer queueCapacity = 50;
/** 活跃时间*/ /**
* 活跃时间
*/
private Integer keepAliveSeconds = 60; private Integer keepAliveSeconds = 60;
/** 线程名字前缀*/ /**
* 线程名字前缀
*/
private String threadNamePrefix = "sms-executor-"; private String threadNamePrefix = "sms-executor-";
/** 设置线程池关闭的时候等待所有任务都完成再继续销毁其他的Bean*/ /**
* 设置线程池关闭的时候等待所有任务都完成再继续销毁其他的Bean
*/
private Boolean shutdownStrategy = true; private Boolean shutdownStrategy = true;
void init(){
if (isPrint) {
SmsBanner.PrintBanner("v1.0.3");
}
}
} }

4
sms-aggregation-comm/pom.xml
View File

@ -5,13 +5,13 @@
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.3</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-comm</artifactId> <artifactId>sms-aggregation-comm</artifactId>
<name>sms-aggregation-comm</name> <name>sms-aggregation-comm</name>
<description>sms-aggregation-comm</description> <description>sms-aggregation-comm</description>
<version>1.0.3</version> <version>${revision}</version>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
</properties> </properties>

4
sms-aggregation-comm/src/main/java/kim/wind/sms/comm/config/SmsBanner.java
View File

@ -1,9 +1,6 @@
package kim.wind.sms.comm.config; package kim.wind.sms.comm.config;
import kim.wind.sms.comm.constant.Constant;
public class SmsBanner { public class SmsBanner {
private static final String banner = private static final String banner =
" _____ __ __ _____ _____ _____ _____ ______ _____ _______ _____ ____ _ _ \n" + " _____ __ __ _____ _____ _____ _____ ______ _____ _______ _____ ____ _ _ \n" +
" / ____| | \\/ | / ____| /\\ / ____| / ____| | __ \\ | ____| / ____| /\\ |__ __| |_ _| / __ \\ | \\ | |\n" + " / ____| | \\/ | / ____| /\\ / ____| / ____| | __ \\ | ____| / ____| /\\ |__ __| |_ _| / __ \\ | \\ | |\n" +
@ -13,6 +10,7 @@ public class SmsBanner {
" |_____/ |_| |_| |_____/ /_/ \\_\\ \\_____| \\_____| |_| \\_\\ |______| \\_____| /_/ \\_\\ |_| |_____| \\____/ |_| \\_|\n" + " |_____/ |_| |_| |_____/ /_/ \\_\\ \\_____| \\_____| |_| \\_\\ |______| \\_____| /_/ \\_\\ |_| |_____| \\____/ |_| \\_|\n" +
" \n" + " \n" +
" "; " ";
/** 初始化配置文件时打印banner*/
public static void PrintBanner(String version) { public static void PrintBanner(String version) {
System.out.println(banner+version); System.out.println(banner+version);
} }

6
sms-aggregation-huawei/pom.xml
View File

@ -5,16 +5,16 @@
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.3</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-huawei</artifactId> <artifactId>sms-aggregation-huawei</artifactId>
<version>1.0.3</version> <version>${revision}</version>
<name>sms-aggregation-huawei</name> <name>sms-aggregation-huawei</name>
<description>sms-aggregation-huawei</description> <description>sms-aggregation-huawei</description>
<properties> <properties>
<java.version>1.8</java.version>
</properties> </properties>
<dependencies> <dependencies>

11
sms-aggregation-spring-boot-starter/pom.xml
View File

@ -5,17 +5,17 @@
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.3</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-spring-boot-starter</artifactId> <artifactId>sms-aggregation-spring-boot-starter</artifactId>
<name>sms-aggregation-spring-boot-starter</name> <name>sms-aggregation-spring-boot-starter</name>
<description>sms-aggregation-spring-boot-starter</description> <description>sms-aggregation-spring-boot-starter</description>
<version>1.0.3</version> <version>${revision}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<java.version>1.8</java.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
@ -36,11 +36,6 @@
<artifactId>spring-boot-starter</artifactId> <artifactId>spring-boot-starter</artifactId>
</dependency> </dependency>
<dependency>
<groupId>kim.wind</groupId>
<artifactId>sms-aggregation-autoimmit</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>

2
sms-aggregation-spring-boot-starter/src/main/java/kim/wind/sms/starter/config/SmsMainConfig.java
View File

@ -18,7 +18,7 @@ public class SmsMainConfig {
} }
/** 主要配置注入*/ /** 主要配置注入*/
@Bean(initMethod = "init") @Bean
public SmsAutowiredConfig smsAutowiredConfig(){ public SmsAutowiredConfig smsAutowiredConfig(){
return new SmsAutowiredConfig(); return new SmsAutowiredConfig();
} }

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

@ -0,0 +1,7 @@
kim.wind.sms.starter.config.SmsMainConfig
kim.wind.sms.autoimmit.config.SmsAutowiredConfig
kim.wind.sms.aliyun.config.AlibabaSmsConfig
kim.wind.sms.huawei.config.HuaweiSmsConfig
kim.wind.sms.tencent.config.TencentSmsConfig
kim.wind.sms.unisms.config.UniSmsConfig
kim.wind.sms.yunpian.config.YunPianSmsConfig

4
sms-aggregation-tencent/pom.xml
View File

@ -5,13 +5,13 @@
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.3</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-tencent</artifactId> <artifactId>sms-aggregation-tencent</artifactId>
<name>sms-aggregation-tencent</name> <name>sms-aggregation-tencent</name>
<description>sms-aggregation-tencent</description> <description>sms-aggregation-tencent</description>
<version>1.0.3</version> <version>${revision}</version>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
</properties> </properties>

4
sms-aggregation-unisms/pom.xml
View File

@ -5,13 +5,13 @@
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.3</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-unisms</artifactId> <artifactId>sms-aggregation-unisms</artifactId>
<name>sms-aggregation-unisms</name> <name>sms-aggregation-unisms</name>
<description>sms-aggregation-unisms</description> <description>sms-aggregation-unisms</description>
<version>1.0.3</version> <version>${revision}</version>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
</properties> </properties>

4
sms-aggregation-yunpian/pom.xml
View File

@ -5,14 +5,14 @@
<parent> <parent>
<groupId>kim.wind</groupId> <groupId>kim.wind</groupId>
<artifactId>sms_aggregation</artifactId> <artifactId>sms_aggregation</artifactId>
<version>1.0.3</version> <version>${revision}</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<artifactId>sms-aggregation-yunpian</artifactId> <artifactId>sms-aggregation-yunpian</artifactId>
<name>sms-aggregation-yunpian</name> <name>sms-aggregation-yunpian</name>
<description>sms-aggregation-yunpian</description> <description>sms-aggregation-yunpian</description>
<version>1.0.3</version> <version>${revision}</version>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
</properties> </properties>