From 5b3901770843cab6ba0e434fdbe3e3302c9ff88e Mon Sep 17 00:00:00 2001
From: 心如止水 <8902735+gaobinbin991314@user.noreply.gitee.com>
Date: 星期四, 30 三月 2023 18:50:58 +0800
Subject: [PATCH] !324 系统配置读取方式变更 1、前端登录页面注册开关 对接后端数据库 2、密码最大错误次数与锁定时间转移到数据库 3、短信开关与验证码模板id 转移到数据库参数管理内
---
ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 bda9955..6584a78 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,8 +1,9 @@
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;
@@ -26,7 +27,7 @@
@RequestMapping("/demo/sms")
public class SmsController {
- private final SmsProperties smsProperties;
+ private final ConfigService configService;
// private final SmsTemplate smsTemplate; // 鍙互浣跨敤spring娉ㄥ叆
// private final AliyunSmsTemplate smsTemplate; // 涔熷彲浠ユ敞鍏ユ煇涓巶瀹剁殑妯℃澘宸ュ叿
@@ -38,7 +39,7 @@
*/
@GetMapping("/sendAliyun")
public R<Object> sendAliyun(String phones, String templateId) {
- if (!smsProperties.getEnabled()) {
+ if (!Convert.toBool(configService.getConfigValue("sys.account.smsEnabled"))) {
return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
}
if (!SpringUtils.containsBean("aliyunSmsTemplate")) {
@@ -59,7 +60,7 @@
*/
@GetMapping("/sendTencent")
public R<Object> sendTencent(String phones, String templateId) {
- if (!smsProperties.getEnabled()) {
+ if (!Convert.toBool(configService.getConfigValue("sys.account.smsEnabled"))) {
return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
}
if (!SpringUtils.containsBean("tencentSmsTemplate")) {
--
Gitblit v1.9.3