From aa6e30dce8df62f08ddd7c580906d1cb83f550a3 Mon Sep 17 00:00:00 2001 From: wind Date: Thu, 20 Apr 2023 22:59:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2sql=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=BA=90=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sms4j/autoimmit/config/SmsAutowiredConfig.java | 2 +- .../org/dromara/sms4j/core/SupplierSqlConfig.java | 14 ++++++++++---- .../org/dromara/sms4j/core/factory/SmsFactory.java | 5 ++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java b/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java index 8fdd9d11..87d50ade 100644 --- a/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java +++ b/sms4j-autoimmit/src/main/java/org/dromara/sms4j/autoimmit/config/SmsAutowiredConfig.java @@ -65,7 +65,7 @@ public class SmsAutowiredConfig { @Bean @ConditionalOnProperty(prefix = "sms", name = "config-type", havingValue = "sql_config") protected void supplierSqlConfig(){ - SupplierSqlConfig.newSupplierSqlConfig(); + SupplierSqlConfig.refreshSqlConfig(); } diff --git a/sms4j-core/src/main/java/org/dromara/sms4j/core/SupplierSqlConfig.java b/sms4j-core/src/main/java/org/dromara/sms4j/core/SupplierSqlConfig.java index 2f19cbd7..e7f413fb 100644 --- a/sms4j-core/src/main/java/org/dromara/sms4j/core/SupplierSqlConfig.java +++ b/sms4j-core/src/main/java/org/dromara/sms4j/core/SupplierSqlConfig.java @@ -24,16 +24,22 @@ import java.util.Map; public class SupplierSqlConfig { private static Map select; - static { + /** + * readSqlConfig + *

读取数据库配置信息 + * @author :Wind + */ + public static void readSqlConfig(){ select = JDBCTool.selectConfig(); } /** - * SupplierSqlConfig - *

在类初始化是完成方法调用 + * refreshSqlConfig + *

读取并刷新数据库配置 * @author :Wind */ - private SupplierSqlConfig() { + public static void refreshSqlConfig(){ + readSqlConfig(); alibaba(); huawei(); jingdong(); diff --git a/sms4j-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java b/sms4j-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java index f3b720e8..8ae31120 100644 --- a/sms4j-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java +++ b/sms4j-core/src/main/java/org/dromara/sms4j/core/factory/SmsFactory.java @@ -1,5 +1,8 @@ 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.emay.config.EmaySmsConfig; import org.dromara.sms4j.aliyun.config.AlibabaSmsConfig; @@ -101,6 +104,6 @@ public class SmsFactory { * @author :Wind */ public static void refreshSqlConfig() { - SupplierSqlConfig.newSupplierSqlConfig(); + SupplierSqlConfig.refreshSqlConfig(); } }