From 8e747a1557909ac005c49e2db1ea264f7080ea4d Mon Sep 17 00:00:00 2001 From: wind Date: Sun, 9 Apr 2023 00:14:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E6=89=93=E5=8D=B0=EF=BC=8C=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .flattened-pom.xml | 2 +- pom.xml | 2 +- .../autoimmit/config/SmsAutowiredConfig.java | 3 +- .../wind/sms/autoimmit/utils/RedisUtils.java | 2 +- .../wind/sms/autoimmit/utils/SpringUtil.java | 1 - .../wind/sms/core/config/ConfigFactory.java | 72 ------------------- 6 files changed, 4 insertions(+), 78 deletions(-) delete mode 100644 sms-aggregation-core/src/main/java/kim/wind/sms/core/config/ConfigFactory.java diff --git a/.flattened-pom.xml b/.flattened-pom.xml index dd811440..22918bc4 100644 --- a/.flattened-pom.xml +++ b/.flattened-pom.xml @@ -8,7 +8,7 @@ pom sms-aggregation sms_aggregation - https://gitee.com/MR-wind/sms_aggregation + https://gitee.com/dromara/sms_aggregation Apache 2 diff --git a/pom.xml b/pom.xml index b983862b..bcd5922a 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ sms-aggregation pom sms_aggregation - https://gitee.com/MR-wind/sms_aggregation + https://gitee.com/dromara/sms_aggregation sms-aggregation-api 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 9b2bd19b..2ae84c27 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 @@ -55,7 +55,6 @@ public class SmsAutowiredConfig { } - void init(){ /* 如果配置中启用了redis，则注入redis工具*/ if (BeanFactory.getSmsConfig().getRedisCache()){ @@ -68,7 +67,7 @@ public class SmsAutowiredConfig { log.debug("SMS restriction is enabled"); } if (BeanFactory.getSmsConfig().getIsPrint()){ - SmsBanner.PrintBanner("V 1.0.4"); + SmsBanner.PrintBanner("V 1.0.5"); } } } diff --git a/sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/utils/RedisUtils.java b/sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/utils/RedisUtils.java index 56a1da4f..0c763987 100644 --- a/sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/utils/RedisUtils.java +++ b/sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/utils/RedisUtils.java @@ -20,7 +20,7 @@ public class RedisUtils { @Autowired public void init(RedisConnectionFactory connectionFactory) { if (connectionFactory == null){ - log.error("RedisConnectionFactory not found"); + log.error("RedisConnectionFactory is not found"); } // 指定相应的序列化方案 StringRedisSerializer keySerializer = new StringRedisSerializer(); diff --git a/sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/utils/SpringUtil.java b/sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/utils/SpringUtil.java index 833c9866..b27d0e44 100644 --- a/sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/utils/SpringUtil.java +++ b/sms-aggregation-autoimmit/src/main/java/kim/wind/sms/autoimmit/utils/SpringUtil.java @@ -65,7 +65,6 @@ public class SpringUtil implements ApplicationContextAware { /** *

说明：创建一个bean - * @param * @name: createBean * @author :Wind */ diff --git a/sms-aggregation-core/src/main/java/kim/wind/sms/core/config/ConfigFactory.java b/sms-aggregation-core/src/main/java/kim/wind/sms/core/config/ConfigFactory.java deleted file mode 100644 index bbad2ddb..00000000 --- a/sms-aggregation-core/src/main/java/kim/wind/sms/core/config/ConfigFactory.java +++ /dev/null @@ -1,72 +0,0 @@ -package kim.wind.sms.core.config; - -import kim.wind.sms.aliyun.config.AlibabaConfig; -import kim.wind.sms.huawei.config.HuaweiConfig; -import kim.wind.sms.tencent.config.TencentConfig; -import kim.wind.sms.unisms.config.UniConfig; -import kim.wind.sms.yunpian.config.YunpianConfig; - -/** - * ConfigFactory - *

差异化配置工厂用于获取差异化配置对象 - * @author :Wind - * 2023/4/8 14:20 - **/ -public class ConfigFactory { - private ConfigFactory(){} - - /** 阿里配置*/ - private static AlibabaConfig alibabaConfig; - - /** 华为配置*/ - private static HuaweiConfig huaweiConfig; - - /** uniSms配置*/ - private static UniConfig uniConfig; - - /** 云片配置*/ - private static YunpianConfig yunpianConfig; - - /** 腾讯配置*/ - private static TencentConfig tencentConfig; - - /** 获取阿里云配置*/ - public static AlibabaConfig getAlibabaConfig() { - if (alibabaConfig == null){ - alibabaConfig = new AlibabaConfig(); - } - return alibabaConfig; - } - - /** 获取华为云配置*/ - public static HuaweiConfig getHuaweiConfig() { - if (huaweiConfig == null){ - huaweiConfig = new HuaweiConfig(); - } - return huaweiConfig; - } - - /** uniSms配置*/ - public static UniConfig getUniConfig() { - if (uniConfig == null){ - uniConfig = new UniConfig(); - } - return uniConfig; - } - - /** 云片配置*/ - public static YunpianConfig getYunpianConfig() { - if (yunpianConfig == null){ - yunpianConfig = new YunpianConfig(); - } - return yunpianConfig; - } - - /** 腾讯云配置*/ - public static TencentConfig getTencentConfig() { - if (tencentConfig == null){ - tencentConfig = new TencentConfig(); - } - return tencentConfig; - } -}