diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsAutoConfiguration.java b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsAutoConfiguration.java index d58e127c..0b73ce36 100644 --- a/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-sms/src/main/java/com/ruoyi/common/sms/config/SmsAutoConfiguration.java @@ -17,11 +17,11 @@ import org.springframework.context.annotation.Configuration; * @version 4.2.0 */ @Configuration -@ConditionalOnProperty(value = "sms.enabled", havingValue = "true") @EnableConfigurationProperties(SmsProperties.class) public class SmsAutoConfiguration { @Configuration + @ConditionalOnProperty(value = "sms.enabled", havingValue = "true") @ConditionalOnClass(com.aliyun.dysmsapi20170525.Client.class) static class AliyunSmsConfiguration { @@ -33,6 +33,7 @@ public class SmsAutoConfiguration { } @Configuration + @ConditionalOnProperty(value = "sms.enabled", havingValue = "true") @ConditionalOnClass(com.tencentcloudapi.sms.v20190711.SmsClient.class) static class TencentSmsConfiguration { diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/controller/SysSmsController.java b/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/controller/SysSmsController.java index fb097d38..0388f867 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/controller/SysSmsController.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/com/ruoyi/resource/controller/SysSmsController.java @@ -4,6 +4,7 @@ package com.ruoyi.resource.controller; import cn.hutool.core.util.RandomUtil; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.utils.SpringUtils; import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.redis.utils.RedisUtils; import com.ruoyi.common.sms.config.properties.SmsProperties; @@ -38,7 +39,6 @@ import java.util.Map; public class SysSmsController extends BaseController { private final SmsProperties smsProperties; - private final SmsTemplate smsTemplate; /** * 短信验证码 @@ -58,6 +58,7 @@ public class SysSmsController extends BaseController { String templateId = ""; Map map = new HashMap<>(1); map.put("code", code); + SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class); SmsResult result = smsTemplate.send(phonenumber, templateId, map); if (!result.isSuccess()) { log.error("验证码短信发送异常 => {}", result);