From 92e15c2f16fb5e7fc7426241557da55a7fdcf136 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 30 三月 2023 22:53:00 +0800
Subject: [PATCH] reset !pr324 有逻辑性问题 暂时回滚
---
ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java
index 6584a78..bda9955 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java
@@ -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 @@
@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 @@
*/
@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 @@
*/
@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")) {
--
Gitblit v1.9.3