From 8965527f6e17b1632e69f91c49aae2c558578e30 Mon Sep 17 00:00:00 2001 From: wind Date: Tue, 4 Apr 2023 20:57:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E4=B8=80=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=EF=BC=8C=E6=B7=BB=E5=8A=A0springBoot3?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 59 +++++++++++++------ sms-aggregation-aliyun/pom.xml | 4 +- sms-aggregation-api/pom.xml | 4 +- sms-aggregation-autoimmit/pom.xml | 4 +- .../autoimmit/config/SmsAutowiredConfig.java | 14 +---- .../wind/sms/autoimmit/config/SmsConfig.java | 57 +++++++++++++----- sms-aggregation-comm/pom.xml | 4 +- .../kim/wind/sms/comm/config/SmsBanner.java | 4 +- sms-aggregation-huawei/pom.xml | 6 +- sms-aggregation-spring-boot-starter/pom.xml | 11 +--- .../sms/starter/config/SmsMainConfig.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 7 +++ sms-aggregation-tencent/pom.xml | 4 +- sms-aggregation-unisms/pom.xml | 4 +- sms-aggregation-yunpian/pom.xml | 4 +- 15 files changed, 117 insertions(+), 71 deletions(-) create mode 100644 sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/pom.xml b/pom.xml index 59578d01..73580d02 100644 --- a/pom.xml +++ b/pom.xml @@ -4,11 +4,11 @@ 4.0.0 kim.wind sms_aggregation - 1.0.3 + ${revision} sms-aggregation pom sms_aggregation - https://gitee.com/the-wind-is-like-a-song/sms_aggregation + https://gitee.com/MR-wind/sms_aggregation sms-aggregation-api @@ -42,15 +42,14 @@ master - https://gitee.com/the-wind-is-like-a-song/sms_aggregation.git - scm:git:https://gitee.com/the-wind-is-like-a-song/sms_aggregation.git - scm:git:https://gitee.com/the-wind-is-like-a-song/sms_aggregation.git + https://gitee.com/MR-wind/sms_aggregation.git + scm:git:https://gitee.com/MR-wind/sms_aggregation.git + scm:git:https://gitee.com/MR-wind/sms_aggregation.git - 1.8 - 2.7.10 - 1.0.3 + 3.0.5 + 1.0.3 2.0.23 2.0.15 3.14.9 @@ -79,57 +78,57 @@ kim.wind sms-aggregation-aliyun - ${modules.version} + ${revision} kim.wind sms-aggregation-tencent - ${modules.version} + ${revision} kim.wind sms-aggregation-unisms - ${modules.version} + ${revision} kim.wind sms-aggregation-yunpian - ${modules.version} + ${revision} kim.wind sms-aggregation-huawei - ${modules.version} + ${revision} kim.wind sms-aggregation-spring-boot-starter - ${modules.version} + ${revision} kim.wind sms-aggregation-autoimmit - ${modules.version} + ${revision} kim.wind sms-aggregation-comm - ${modules.version} + ${revision} kim.wind sms-aggregation-api - ${modules.version} + ${revision} @@ -297,6 +296,32 @@ + + + org.codehaus.mojo + flatten-maven-plugin + 1.2.7 + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + diff --git a/sms-aggregation-aliyun/pom.xml b/sms-aggregation-aliyun/pom.xml index fab65767..ac2e02e6 100644 --- a/sms-aggregation-aliyun/pom.xml +++ b/sms-aggregation-aliyun/pom.xml @@ -5,13 +5,13 @@ kim.wind sms_aggregation - 1.0.3 + ${revision} ../pom.xml sms-aggregation-aliyun sms-aggregation-aliyun sms-aggregation-aliyun - 1.0.3 + ${revision} 1.8 diff --git a/sms-aggregation-api/pom.xml b/sms-aggregation-api/pom.xml index b1dccb3d..3d12cb66 100644 --- a/sms-aggregation-api/pom.xml +++ b/sms-aggregation-api/pom.xml @@ -5,13 +5,13 @@ kim.wind sms_aggregation - 1.0.3 + ${revision} ../pom.xml sms-aggregation-api sms-aggregation-api sms-aggregation-api - 1.0.3 + ${revision} 1.8 diff --git a/sms-aggregation-autoimmit/pom.xml b/sms-aggregation-autoimmit/pom.xml index b64e59f2..06005bc1 100644 --- a/sms-aggregation-autoimmit/pom.xml +++ b/sms-aggregation-autoimmit/pom.xml @@ -5,11 +5,11 @@ kim.wind sms_aggregation - 1.0.3 + ${revision} ../pom.xml sms-aggregation-autoimmit - 1.0.3 + ${revision} sms-aggregation-autoimmit sms-aggregation-autoimmit diff --git a/sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/config/SmsAutowiredConfig.java b/sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/config/SmsAutowiredConfig.java index 3c2a1524..4a7ba37b 100644 --- a/sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/config/SmsAutowiredConfig.java +++ b/sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/config/SmsAutowiredConfig.java @@ -1,10 +1,8 @@ package kim.wind.sms.autoimmit.config; 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.utils.RedisUtils; -import lombok.Data; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; 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.ThreadPoolExecutor; -@Data -public class SmsAutowiredConfig { - public void init(){ - SmsBanner.PrintBanner("V1.0.3"); - } - @Bean +public class SmsAutowiredConfig { + + @Bean(initMethod = "init") @ConfigurationProperties(prefix = "sms") //指定配置文件注入属性前缀 public SmsConfig smsConfig(){ return new SmsConfig(); @@ -62,7 +57,4 @@ public class SmsAutowiredConfig { executor.initialize(); return executor; } - - - } diff --git a/sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/config/SmsConfig.java b/sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/config/SmsConfig.java index 643b6e50..3e97e2a2 100644 --- a/sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/config/SmsConfig.java +++ b/sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/config/SmsConfig.java @@ -1,43 +1,72 @@ package kim.wind.sms.autoimmit.config; +import kim.wind.sms.comm.config.SmsBanner; import lombok.Data; @Data public class SmsConfig { - /** 短信服务商*/ + /** + * 短信服务商 + */ private String supplier; - /** 打印banner*/ - private String isPrint = "true"; + /** + * 打印banner + */ + private Boolean isPrint = true; - /** 是否开启短信限制*/ + /** + * 是否开启短信限制 + */ private String restricted; - /** 是否使用redis进行缓存*/ + /** + * 是否使用redis进行缓存 + */ private String redisCache = "false"; - /** 单账号每日最大发送量*/ + /** + * 单账号每日最大发送量 + */ private Integer accountMax; - /** 单账号每分钟最大发送*/ + /** + * 单账号每分钟最大发送 + */ private Integer minuteMax; - /**核心线程池大小*/ + /** + * 核心线程池大小 + */ private Integer corePoolSize = 10; - /** 最大线程数*/ + /** + * 最大线程数 + */ private Integer maxPoolSize = 30; - /** 队列容量*/ + /** + * 队列容量 + */ private Integer queueCapacity = 50; - /** 活跃时间*/ + /** + * 活跃时间 + */ private Integer keepAliveSeconds = 60; - /** 线程名字前缀*/ + /** + * 线程名字前缀 + */ private String threadNamePrefix = "sms-executor-"; - /** 设置线程池关闭的时候等待所有任务都完成再继续销毁其他的Bean*/ + /** + * 设置线程池关闭的时候等待所有任务都完成再继续销毁其他的Bean + */ private Boolean shutdownStrategy = true; - +void init(){ + if (isPrint) { + SmsBanner.PrintBanner("v1.0.3"); + } +} } diff --git a/sms-aggregation-comm/pom.xml b/sms-aggregation-comm/pom.xml index 1c44076b..13a0a837 100644 --- a/sms-aggregation-comm/pom.xml +++ b/sms-aggregation-comm/pom.xml @@ -5,13 +5,13 @@ kim.wind sms_aggregation - 1.0.3 + ${revision} ../pom.xml sms-aggregation-comm sms-aggregation-comm sms-aggregation-comm - 1.0.3 + ${revision} 1.8 diff --git a/sms-aggregation-comm/src/main/java/kim/wind/sms/comm/config/SmsBanner.java b/sms-aggregation-comm/src/main/java/kim/wind/sms/comm/config/SmsBanner.java index f1078a48..62c16119 100644 --- a/sms-aggregation-comm/src/main/java/kim/wind/sms/comm/config/SmsBanner.java +++ b/sms-aggregation-comm/src/main/java/kim/wind/sms/comm/config/SmsBanner.java @@ -1,9 +1,6 @@ package kim.wind.sms.comm.config; -import kim.wind.sms.comm.constant.Constant; - public class SmsBanner { - private static final String banner = " _____ __ __ _____ _____ _____ _____ ______ _____ _______ _____ ____ _ _ \n" + " / ____| | \\/ | / ____| /\\ / ____| / ____| | __ \\ | ____| / ____| /\\ |__ __| |_ _| / __ \\ | \\ | |\n" + @@ -13,6 +10,7 @@ public class SmsBanner { " |_____/ |_| |_| |_____/ /_/ \\_\\ \\_____| \\_____| |_| \\_\\ |______| \\_____| /_/ \\_\\ |_| |_____| \\____/ |_| \\_|\n" + " \n" + " "; + /** 初始化配置文件时打印banner*/ public static void PrintBanner(String version) { System.out.println(banner+version); } diff --git a/sms-aggregation-huawei/pom.xml b/sms-aggregation-huawei/pom.xml index ae9c8186..bf3bd148 100644 --- a/sms-aggregation-huawei/pom.xml +++ b/sms-aggregation-huawei/pom.xml @@ -5,16 +5,16 @@ kim.wind sms_aggregation - 1.0.3 + ${revision} ../pom.xml sms-aggregation-huawei - 1.0.3 + ${revision} sms-aggregation-huawei sms-aggregation-huawei - 1.8 + diff --git a/sms-aggregation-spring-boot-starter/pom.xml b/sms-aggregation-spring-boot-starter/pom.xml index a2bcb191..4fa0e523 100644 --- a/sms-aggregation-spring-boot-starter/pom.xml +++ b/sms-aggregation-spring-boot-starter/pom.xml @@ -5,17 +5,17 @@ kim.wind sms_aggregation - 1.0.3 + ${revision} ../pom.xml sms-aggregation-spring-boot-starter sms-aggregation-spring-boot-starter sms-aggregation-spring-boot-starter - 1.0.3 + ${revision} jar - 1.8 + @@ -36,11 +36,6 @@ spring-boot-starter - - kim.wind - sms-aggregation-autoimmit - - diff --git a/sms-aggregation-spring-boot-starter/src/main/java/kim/wind/sms/starter/config/SmsMainConfig.java b/sms-aggregation-spring-boot-starter/src/main/java/kim/wind/sms/starter/config/SmsMainConfig.java index c3c8c2fa..de9b3fc7 100644 --- a/sms-aggregation-spring-boot-starter/src/main/java/kim/wind/sms/starter/config/SmsMainConfig.java +++ b/sms-aggregation-spring-boot-starter/src/main/java/kim/wind/sms/starter/config/SmsMainConfig.java @@ -18,7 +18,7 @@ public class SmsMainConfig { } /** 主要配置注入*/ - @Bean(initMethod = "init") + @Bean public SmsAutowiredConfig smsAutowiredConfig(){ return new SmsAutowiredConfig(); } diff --git a/sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..00ae3b12 --- /dev/null +++ b/sms-aggregation-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -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 diff --git a/sms-aggregation-tencent/pom.xml b/sms-aggregation-tencent/pom.xml index 85d4924e..2a9bc02f 100644 --- a/sms-aggregation-tencent/pom.xml +++ b/sms-aggregation-tencent/pom.xml @@ -5,13 +5,13 @@ kim.wind sms_aggregation - 1.0.3 + ${revision} ../pom.xml sms-aggregation-tencent sms-aggregation-tencent sms-aggregation-tencent - 1.0.3 + ${revision} 1.8 diff --git a/sms-aggregation-unisms/pom.xml b/sms-aggregation-unisms/pom.xml index 924d099c..af1fd97a 100644 --- a/sms-aggregation-unisms/pom.xml +++ b/sms-aggregation-unisms/pom.xml @@ -5,13 +5,13 @@ kim.wind sms_aggregation - 1.0.3 + ${revision} ../pom.xml sms-aggregation-unisms sms-aggregation-unisms sms-aggregation-unisms - 1.0.3 + ${revision} 1.8 diff --git a/sms-aggregation-yunpian/pom.xml b/sms-aggregation-yunpian/pom.xml index e19a9efd..2cc5e673 100644 --- a/sms-aggregation-yunpian/pom.xml +++ b/sms-aggregation-yunpian/pom.xml @@ -5,14 +5,14 @@ kim.wind sms_aggregation - 1.0.3 + ${revision} ../pom.xml sms-aggregation-yunpian sms-aggregation-yunpian sms-aggregation-yunpian - 1.0.3 + ${revision} 1.8