From 0b077806196ceb8a68af93f00880ccc70aee50c2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 07 七月 2022 18:08:14 +0800
Subject: [PATCH] add 整合 springdoc 移除 knife4j
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java | 36 ++++++++++++++++++++++--------------
1 files changed, 22 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..c9e51b1 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,9 @@
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 io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -18,12 +18,13 @@
/**
* 鐭俊婕旂ず妗堜緥
+ * 璇峰厛闃呰鏂囨。 鍚﹀垯鏃犳硶浣跨敤
*
* @author Lion Li
* @version 4.2.0
*/
@Validated
-@Api(value = "鐭俊婕旂ず妗堜緥", tags = {"鐭俊婕旂ず妗堜緥"})
+@Tag(name ="鐭俊婕旂ず妗堜緥", description = "鐭俊婕旂ず妗堜緥")
@RequiredArgsConstructor
@RestController
@RequestMapping("/demo/sms")
@@ -31,13 +32,17 @@
private final SmsProperties smsProperties;
// private final SmsTemplate smsTemplate; // 鍙互浣跨敤spring娉ㄥ叆
+// private final AliyunSmsTemplate smsTemplate; // 涔熷彲浠ユ敞鍏ユ煇涓巶瀹剁殑妯℃澘宸ュ叿
- @ApiOperation("鍙戦�佺煭淇liyun")
+ @Operation(summary = "鍙戦�佺煭淇liyun")
@GetMapping("/sendAliyun")
- public R<Object> sendAliyun(@ApiParam("鐢佃瘽鍙�") String phones,
- @ApiParam("妯℃澘ID") String templateId) {
- if (smsProperties.getEnabled()) {
- R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
+ public R<Object> sendAliyun(@Parameter(name = "鐢佃瘽鍙�") String phones,
+ @Parameter(name = "妯℃澘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);
@@ -46,12 +51,15 @@
return R.ok(send);
}
- @ApiOperation("鍙戦�佺煭淇encent")
+ @Operation(summary = "鍙戦�佺煭淇encent")
@GetMapping("/sendTencent")
- public R<Object> sendTencent(@ApiParam("鐢佃瘽鍙�") String phones,
- @ApiParam("妯℃澘ID") String templateId) {
- if (smsProperties.getEnabled()) {
- R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
+ public R<Object> sendTencent(@Parameter(name = "鐢佃瘽鍙�") String phones,
+ @Parameter(name = "妯℃澘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);
--
Gitblit v1.9.3