From 0e39f6fa2d67de9d956f3e043f68b7bd7a030db2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 02 九月 2022 17:55:02 +0800
Subject: [PATCH] remove 移除部署脚本 使用idea功能替代
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 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 8331445..cc6012f 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
@@ -4,9 +4,6 @@
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;
-import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -18,12 +15,12 @@
/**
* 鐭俊婕旂ず妗堜緥
+ * 璇峰厛闃呰鏂囨。 鍚﹀垯鏃犳硶浣跨敤
*
* @author Lion Li
* @version 4.2.0
*/
@Validated
-@Api(value = "鐭俊婕旂ず妗堜緥", tags = {"鐭俊婕旂ず妗堜緥"})
@RequiredArgsConstructor
@RestController
@RequestMapping("/demo/sms")
@@ -31,13 +28,21 @@
private final SmsProperties smsProperties;
// private final SmsTemplate smsTemplate; // 鍙互浣跨敤spring娉ㄥ叆
+// private final AliyunSmsTemplate smsTemplate; // 涔熷彲浠ユ敞鍏ユ煇涓巶瀹剁殑妯℃澘宸ュ叿
- @ApiOperation("鍙戦�佺煭淇liyun")
+ /**
+ * 鍙戦�佺煭淇liyun
+ *
+ * @param phones 鐢佃瘽鍙�
+ * @param templateId 妯℃澘ID
+ */
@GetMapping("/sendAliyun")
- public R<Object> sendAliyun(@ApiParam("鐢佃瘽鍙�") String phones,
- @ApiParam("妯℃澘ID") String templateId) {
- if (smsProperties.getEnabled()) {
- R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
+ public R<Object> sendAliyun(String phones, String templateId) {
+ if (!smsProperties.getEnabled()) {
+ return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
+ }
+ if (!SpringUtils.containsBean("aliyunSmsTemplate")) {
+ return R.fail("闃块噷浜戜緷璧栨湭寮曞叆锛�");
}
SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class);
Map<String, String> map = new HashMap<>(1);
@@ -46,12 +51,19 @@
return R.ok(send);
}
- @ApiOperation("鍙戦�佺煭淇encent")
+ /**
+ * 鍙戦�佺煭淇encent
+ *
+ * @param phones 鐢佃瘽鍙�
+ * @param templateId 妯℃澘ID
+ */
@GetMapping("/sendTencent")
- public R<Object> sendTencent(@ApiParam("鐢佃瘽鍙�") String phones,
- @ApiParam("妯℃澘ID") String templateId) {
- if (smsProperties.getEnabled()) {
- R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
+ public R<Object> sendTencent(String phones, String templateId) {
+ if (!smsProperties.getEnabled()) {
+ return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
+ }
+ if (!SpringUtils.containsBean("tencentSmsTemplate")) {
+ return R.fail("鑵捐浜戜緷璧栨湭寮曞叆锛�");
}
SmsTemplate smsTemplate = SpringUtils.getBean(SmsTemplate.class);
Map<String, String> map = new HashMap<>(1);
--
Gitblit v1.9.3