Merge branch 'dev-2.x' of https://gitee.com/dromara/sms_aggregation into newDev

This commit is contained in:
wind 2023-04-20 23:25:38 +08:00
commit b650e706c0
4 changed files with 16 additions and 7 deletions

View File

@ -55,7 +55,7 @@
<properties> <properties>
<spring.boot.version>2.7.10</spring.boot.version> <spring.boot.version>2.7.10</spring.boot.version>
<revision>1.0.5</revision> <revision>2.0.1</revision>
<aliyun.version>2.0.23</aliyun.version> <aliyun.version>2.0.23</aliyun.version>
<tencent.version>3.1.622</tencent.version> <tencent.version>3.1.622</tencent.version>
<unisms.version>0.0.4</unisms.version> <unisms.version>0.0.4</unisms.version>

View File

@ -65,7 +65,7 @@ public class SmsAutowiredConfig {
@Bean @Bean
@ConditionalOnProperty(prefix = "sms", name = "config-type", havingValue = "sql_config") @ConditionalOnProperty(prefix = "sms", name = "config-type", havingValue = "sql_config")
protected void supplierSqlConfig(){ protected void supplierSqlConfig(){
SupplierSqlConfig.newSupplierSqlConfig(); SupplierSqlConfig.refreshSqlConfig();
} }

View File

@ -24,16 +24,22 @@ import java.util.Map;
public class SupplierSqlConfig { public class SupplierSqlConfig {
private static Map<String, String> select; private static Map<String, String> select;
static { /**
* readSqlConfig
* <p>读取数据库配置信息
* @author :Wind
*/
public static void readSqlConfig(){
select = JDBCTool.selectConfig(); select = JDBCTool.selectConfig();
} }
/** /**
* SupplierSqlConfig * refreshSqlConfig
* <p>在类初始化是完成方法调用 * <p>读取并刷新数据库配置
* @author :Wind * @author :Wind
*/ */
private SupplierSqlConfig() { public static void refreshSqlConfig(){
readSqlConfig();
alibaba(); alibaba();
huawei(); huawei();
jingdong(); jingdong();

View File

@ -1,5 +1,8 @@
package org.dromara.sms4j.core.factory; package org.dromara.sms4j.core.factory;
import org.dromara.sms4j.comm.config.SmsConfig;
import org.dromara.sms4j.comm.enumerate.ConfigType;
import org.dromara.sms4j.comm.factory.BeanFactory;
import org.dromara.sms4j.core.SupplierSqlConfig; import org.dromara.sms4j.core.SupplierSqlConfig;
import org.dromara.sms4j.emay.config.EmaySmsConfig; import org.dromara.sms4j.emay.config.EmaySmsConfig;
import org.dromara.sms4j.aliyun.config.AlibabaSmsConfig; import org.dromara.sms4j.aliyun.config.AlibabaSmsConfig;
@ -101,6 +104,6 @@ public class SmsFactory {
* @author :Wind * @author :Wind
*/ */
public static void refreshSqlConfig() { public static void refreshSqlConfig() {
SupplierSqlConfig.newSupplierSqlConfig(); SupplierSqlConfig.refreshSqlConfig();
} }
} }