From e1e26d53e6c802bdf0766d92297c7deabd49ed5e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 07 五月 2022 15:21:50 +0800
Subject: [PATCH] !174 fix 修复 短信验证码校验逻辑错误 Merge pull request !174 from SPPan/dev
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
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 51472de2..8331445 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,6 +1,8 @@
package com.ruoyi.demo.controller;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -27,12 +29,17 @@
@RequestMapping("/demo/sms")
public class SmsController {
- private final SmsTemplate smsTemplate;
+ private final SmsProperties smsProperties;
+// private final SmsTemplate smsTemplate; // 鍙互浣跨敤spring娉ㄥ叆
@ApiOperation("鍙戦�佺煭淇liyun")
@GetMapping("/sendAliyun")
public R<Object> sendAliyun(@ApiParam("鐢佃瘽鍙�") String phones,
@ApiParam("妯℃澘ID") String templateId) {
+ if (smsProperties.getEnabled()) {
+ R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
+ }
+ SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class);
Map<String, String> map = new HashMap<>(1);
map.put("code", "1234");
Object send = smsTemplate.send(phones, templateId, map);
@@ -43,6 +50,10 @@
@GetMapping("/sendTencent")
public R<Object> sendTencent(@ApiParam("鐢佃瘽鍙�") String phones,
@ApiParam("妯℃澘ID") String templateId) {
+ if (smsProperties.getEnabled()) {
+ R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
+ }
+ SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class);
Map<String, String> map = new HashMap<>(1);
// map.put("2", "娴嬭瘯娴嬭瘯");
map.put("1", "1234");
--
Gitblit v1.9.3