From d69b192f6cc83f8a10c685eb0c8c67d7f6d717cc Mon Sep 17 00:00:00 2001
From: wind <wzsf1810@qq.com>
Date: Mon, 18 Sep 2023 23:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9solon=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=94=99=E8=AF=AF=EF=BC=8C=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E8=BF=87=E6=97=B6=E7=9A=84=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/sms4j/provider/config/SmsConfig.java   | 5 -----
 .../org/dromara/sms4j/solon/aop/SolonRestrictedProcess.java | 4 ++++
 .../org/dromara/sms4j/solon/config/SmsAutowiredConfig.java  | 6 ------
 .../dromara/sms4j/starter/aop/SpringRestrictedProcess.java  | 4 ++++
 .../org/dromara/sms4j/starter/config/SmsMainConfig.java     | 1 +
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/sms4j-provider/src/main/java/org/dromara/sms4j/provider/config/SmsConfig.java b/sms4j-provider/src/main/java/org/dromara/sms4j/provider/config/SmsConfig.java
index b2441f29..7c3d05c0 100644
--- a/sms4j-provider/src/main/java/org/dromara/sms4j/provider/config/SmsConfig.java
+++ b/sms4j-provider/src/main/java/org/dromara/sms4j/provider/config/SmsConfig.java
@@ -20,11 +20,6 @@ public class SmsConfig {
      */
     private Boolean restricted = false;
 
-    /**
-     * 是否使用redis进行缓存
-     */
-    private Boolean redisCache = false;
-
     /**
      * 单账号每日最大发送量
      */
diff --git a/sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/aop/SolonRestrictedProcess.java b/sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/aop/SolonRestrictedProcess.java
index 3c36eee4..29aca011 100644
--- a/sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/aop/SolonRestrictedProcess.java
+++ b/sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/aop/SolonRestrictedProcess.java
@@ -2,6 +2,7 @@ package org.dromara.sms4j.solon.aop;
 
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.sms4j.api.dao.SmsDao;
+import org.dromara.sms4j.api.dao.SmsDaoDefaultImpl;
 import org.dromara.sms4j.api.proxy.RestrictedProcess;
 import org.dromara.sms4j.comm.exception.SmsBlendException;
 import org.dromara.sms4j.comm.utils.SmsUtils;
@@ -23,6 +24,9 @@ public class SolonRestrictedProcess implements RestrictedProcess {
 
     @Override
     public SmsBlendException process(String phone) {
+        if (SmsUtils.isEmpty(smsDao)){
+            smsDao = SmsDaoDefaultImpl.getInstance();
+        }
         SmsConfig config = BeanFactory.getSmsConfig();
         Integer accountMax = config.getAccountMax(); // 每日最大发送量
         Integer minuteMax = config.getMinuteMax(); // 每分钟最大发送量
diff --git a/sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/config/SmsAutowiredConfig.java b/sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/config/SmsAutowiredConfig.java
index fdd435f6..bc97f444 100644
--- a/sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/config/SmsAutowiredConfig.java
+++ b/sms4j-solon-plugin/src/main/java/org/dromara/sms4j/solon/config/SmsAutowiredConfig.java
@@ -54,12 +54,6 @@ public class SmsAutowiredConfig implements LifecycleBean {
     //是在 solon 容器扫描完成之后执行的
     @Override
     public void start() {
-        /* 如果配置中启用了redis，则注入redis工具*/
-        if (BeanFactory.getSmsConfig().getRedisCache()) {
-            SmsInvocationHandler.setRestrictedProcess(new SolonRestrictedProcess(context));
-            log.debug("The redis cache is enabled for sms4j");
-        }
-
         //打印banner
         if (BeanFactory.getSmsConfig().getIsPrint()) {
             SmsBanner.PrintBanner(Constant.VERSION);
diff --git a/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/aop/SpringRestrictedProcess.java b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/aop/SpringRestrictedProcess.java
index 39d2b4b7..387a0f92 100644
--- a/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/aop/SpringRestrictedProcess.java
+++ b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/aop/SpringRestrictedProcess.java
@@ -2,6 +2,7 @@ package org.dromara.sms4j.starter.aop;
 
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.sms4j.api.dao.SmsDao;
+import org.dromara.sms4j.api.dao.SmsDaoDefaultImpl;
 import org.dromara.sms4j.api.proxy.RestrictedProcess;
 import org.dromara.sms4j.comm.exception.SmsBlendException;
 import org.dromara.sms4j.comm.utils.SmsUtils;
@@ -20,6 +21,9 @@ public class SpringRestrictedProcess implements RestrictedProcess {
     public SmsBlendException process(String phone) {
         SmsConfig config = BeanFactory.getSmsConfig();
         SmsDao smsDao = SmsSpringUtils.getBean(SmsDao.class);
+        if (SmsUtils.isEmpty(smsDao)){
+            smsDao = SmsDaoDefaultImpl.getInstance();
+        }
         Integer accountMax = config.getAccountMax(); // 每日最大发送量
         Integer minuteMax = config.getMinuteMax(); // 每分钟最大发送量
         if (SmsUtils.isNotEmpty(accountMax)) {   // 是否配置了每日限制
diff --git a/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java
index fb18ebf1..752655eb 100644
--- a/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java
+++ b/sms4j-spring-boot-starter/src/main/java/org/dromara/sms4j/starter/config/SmsMainConfig.java
@@ -1,6 +1,7 @@
 package org.dromara.sms4j.starter.config;
 
 import lombok.Data;
+import org.dromara.sms4j.api.dao.SmsDaoDefaultImpl;
 import org.dromara.sms4j.comm.constant.Constant;
 import org.dromara.sms4j.comm.delayedTime.DelayedTime;
 import org.dromara.sms4j.provider.config.SmsBanner;