jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

reset !pr324 有逻辑性问题 暂时回滚

Browse Source
This commit is contained in:
疯狂的狮子Li
2023-03-30 22:53:00 +08:00
parent ae21e0c3d0
commit 92e15c2f16
12 changed files with 47 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java
View File

@ -1,9 +1,8 @@
package com.ruoyi.demo.controller;
import cn.hutool.core.convert.Convert;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.service.ConfigService;
import com.ruoyi.common.core.utils.SpringUtils;
import com.ruoyi.common.sms.config.properties.SmsProperties;
import com.ruoyi.common.sms.core.SmsTemplate;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@ -27,7 +26,7 @@ import java.util.Map;
@RequestMapping("/demo/sms")
public class SmsController {
private final ConfigService configService;
private final SmsProperties smsProperties;
// private final SmsTemplate smsTemplate; // 可以使用spring注入
// private final AliyunSmsTemplate smsTemplate; // 也可以注入某个厂家的模板工具
@ -39,7 +38,7 @@ public class SmsController {
*/
@GetMapping("/sendAliyun")
public R<Object> sendAliyun(String phones, String templateId) {
if (!Convert.toBool(configService.getConfigValue("sys.account.smsEnabled"))) {
if (!smsProperties.getEnabled()) {
return R.fail("当前系统没有开启短信功能！");
}
if (!SpringUtils.containsBean("aliyunSmsTemplate")) {
@ -60,7 +59,7 @@ public class SmsController {
*/
@GetMapping("/sendTencent")
public R<Object> sendTencent(String phones, String templateId) {
if (!Convert.toBool(configService.getConfigValue("sys.account.smsEnabled"))) {
if (!smsProperties.getEnabled()) {
return R.fail("当前系统没有开启短信功能！");
}
if (!SpringUtils.containsBean("tencentSmsTemplate")) {