From fea5f137364939b2448e5bdb6c85a5b82da171e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=BD=AC=E5=BD=AC?= <18216219659@163.com>
Date: Thu, 30 Mar 2023 13:26:19 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=9F=AD=E4=BF=A1=E5=BC=80=E5=85=B3?=
 =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=95=B0=E6=8D=AE=E5=BA=93=202=E3=80=81demo?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BE=9D=E8=B5=96=E7=B3=BB=E7=BB=9F=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/web/controller/common/CaptchaController.java |  6 +++---
 ruoyi-demo/pom.xml                                     |  5 +++++
 .../java/com/ruoyi/demo/controller/SmsController.java  | 10 ++++++----
 .../com/ruoyi/sms/config/properties/SmsProperties.java |  2 --
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
index b8b72ec1a..5cbd70b02 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.common;
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.captcha.AbstractCaptcha;
 import cn.hutool.captcha.generator.CodeGenerator;
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.ruoyi.common.constant.CacheConstants;
@@ -14,7 +15,6 @@ import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.common.utils.reflect.ReflectUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.config.properties.CaptchaProperties;
-import com.ruoyi.sms.config.properties.SmsProperties;
 import com.ruoyi.sms.core.SmsTemplate;
 import com.ruoyi.sms.entity.SmsResult;
 import com.ruoyi.system.service.ISysConfigService;
@@ -45,7 +45,6 @@ import java.util.Map;
 public class CaptchaController {
 
     private final CaptchaProperties captchaProperties;
-    private final SmsProperties smsProperties;
     private final ISysConfigService configService;
 
     /**
@@ -53,10 +52,11 @@ public class CaptchaController {
      *
      * @param phonenumber 用户手机号
      */
+    @SaIgnore
     @GetMapping("/captchaSms")
     public R<Void> smsCaptcha(@NotBlank(message = "{user.phonenumber.not.blank}")
                               String phonenumber) {
-        if (!smsProperties.getEnabled()) {
+        if (!Convert.toBool(configService.selectConfigByKey("sys.account.smsEnabled"))) {
             return R.fail("当前系统没有开启短信功能！");
         }
         String key = CacheConstants.CAPTCHA_CODE_KEY + phonenumber;
diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml
index b64625d34..ab1f96d30 100644
--- a/ruoyi-demo/pom.xml
+++ b/ruoyi-demo/pom.xml
@@ -28,6 +28,11 @@
             <artifactId>ruoyi-sms</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
+
         <!-- 短信 用哪个导入哪个依赖 -->
 <!--        <dependency>-->
 <!--            <groupId>com.aliyun</groupId>-->
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java
index cc6012f44..436d4694e 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java
@@ -1,9 +1,10 @@
 package com.ruoyi.demo.controller;
 
+import cn.hutool.core.convert.Convert;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.sms.config.properties.SmsProperties;
 import com.ruoyi.sms.core.SmsTemplate;
+import com.ruoyi.system.service.ISysConfigService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,7 +27,8 @@ import java.util.Map;
 @RequestMapping("/demo/sms")
 public class SmsController {
 
-    private final SmsProperties smsProperties;
+    private final ISysConfigService configService;
+
 //    private final SmsTemplate smsTemplate; // 可以使用spring注入
 //    private final AliyunSmsTemplate smsTemplate; // 也可以注入某个厂家的模板工具
 
@@ -38,7 +40,7 @@ public class SmsController {
      */
     @GetMapping("/sendAliyun")
     public R<Object> sendAliyun(String phones, String templateId) {
-        if (!smsProperties.getEnabled()) {
+        if (!Convert.toBool(configService.selectConfigByKey("sys.account.smsEnabled"))) {
             return R.fail("当前系统没有开启短信功能！");
         }
         if (!SpringUtils.containsBean("aliyunSmsTemplate")) {
@@ -59,7 +61,7 @@ public class SmsController {
      */
     @GetMapping("/sendTencent")
     public R<Object> sendTencent(String phones, String templateId) {
-        if (!smsProperties.getEnabled()) {
+        if (!Convert.toBool(configService.selectConfigByKey("sys.account.smsEnabled"))) {
             return R.fail("当前系统没有开启短信功能！");
         }
         if (!SpringUtils.containsBean("tencentSmsTemplate")) {
diff --git a/ruoyi-sms/src/main/java/com/ruoyi/sms/config/properties/SmsProperties.java b/ruoyi-sms/src/main/java/com/ruoyi/sms/config/properties/SmsProperties.java
index 39359cdfd..c4f57f1f0 100644
--- a/ruoyi-sms/src/main/java/com/ruoyi/sms/config/properties/SmsProperties.java
+++ b/ruoyi-sms/src/main/java/com/ruoyi/sms/config/properties/SmsProperties.java
@@ -15,8 +15,6 @@ import org.springframework.stereotype.Component;
 @ConfigurationProperties(prefix = "sms")
 public class SmsProperties {
 
-    private Boolean enabled;
-
     /**
      * 配置节点
      * 阿里云 dysmsapi.aliyuncs.com