From b27e55f4de22d27588033ef369048ed2e23f93b5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 06 六月 2022 15:16:20 +0800
Subject: [PATCH] add 增加 Excel 模板导出 测试类
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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..b920786 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
@@ -18,6 +18,7 @@
/**
* 鐭俊婕旂ず妗堜緥
+ * 璇峰厛闃呰鏂囨。 鍚﹀垯鏃犳硶浣跨敤
*
* @author Lion Li
* @version 4.2.0
@@ -31,13 +32,17 @@
private final SmsProperties smsProperties;
// private final SmsTemplate smsTemplate; // 鍙互浣跨敤spring娉ㄥ叆
+// private final AliyunSmsTemplate smsTemplate; // 涔熷彲浠ユ敞鍏ユ煇涓巶瀹剁殑妯℃澘宸ュ叿
@ApiOperation("鍙戦�佺煭淇liyun")
@GetMapping("/sendAliyun")
public R<Object> sendAliyun(@ApiParam("鐢佃瘽鍙�") String phones,
@ApiParam("妯℃澘ID") String templateId) {
- if (smsProperties.getEnabled()) {
- R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
+ 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);
@@ -50,8 +55,11 @@
@GetMapping("/sendTencent")
public R<Object> sendTencent(@ApiParam("鐢佃瘽鍙�") String phones,
@ApiParam("妯℃澘ID") String templateId) {
- if (smsProperties.getEnabled()) {
- R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
+ 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