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 | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 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 de8f212..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 @@ -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; @@ -16,6 +18,7 @@ /** * 鐭俊婕旂ず妗堜緥 + * 璇峰厛闃呰鏂囨。 鍚﹀垯鏃犳硶浣跨敤 * * @author Lion Li * @version 4.2.0 @@ -27,12 +30,21 @@ @RequestMapping("/demo/sms") public class SmsController { - private final SmsTemplate smsTemplate; + private final SmsProperties smsProperties; +// private final SmsTemplate smsTemplate; // 鍙互浣跨敤spring娉ㄥ叆 +// private final AliyunSmsTemplate smsTemplate; // 涔熷彲浠ユ敞鍏ユ煇涓巶瀹剁殑妯℃澘宸ュ叿 @ApiOperation("鍙戦�佺煭淇liyun") @GetMapping("/sendAliyun") - public R<Object> sendSimpleMessage(@ApiParam("鐢佃瘽鍙�") String phones, + public R<Object> sendAliyun(@ApiParam("鐢佃瘽鍙�") String phones, @ApiParam("妯℃澘ID") 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); map.put("code", "1234"); Object send = smsTemplate.send(phones, templateId, map); @@ -41,8 +53,15 @@ @ApiOperation("鍙戦�佺煭淇encent") @GetMapping("/sendTencent") - public R<Object> sendMessageWithAttachment(@ApiParam("鐢佃瘽鍙�") String phones, + public R<Object> sendTencent(@ApiParam("鐢佃瘽鍙�") String phones, @ApiParam("妯℃澘ID") 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); // map.put("2", "娴嬭瘯娴嬭瘯"); map.put("1", "1234"); -- Gitblit v1.9.3