From 4941aaa5c1c59f17881d3587f1679b93736bd01e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 02 五月 2022 23:12:16 +0800
Subject: [PATCH] update 重构 pr_172 集成邮件发送功能
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java
index 53f130f..74e9e33 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java
@@ -3,6 +3,8 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.email.MailUtils;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -14,41 +16,34 @@
/**
- * 娴嬭瘯閭欢鍙戦�� Controller
+ * 閭欢鍙戦�佹渚�
*
* @author Michelle.Chung
*/
@Validated
-@Api(value = "閭欢鎺у埗鍣�", tags = {"娴嬭瘯閭欢鍙戦��"})
+@Api(value = "閭欢鍙戦�佹渚�", tags = {"閭欢鍙戦�佹渚�"})
@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RequestMapping("/demo/mail")
@RestController
public class MailController {
- /**
- * 鍙戦�侀偖浠�
- *
- * @param to 鎺ユ敹浜�
- * @param subject 鏍囬
- * @param text 鍐呭
- */
+ @ApiOperation("鍙戦�侀偖浠�")
@GetMapping("/sendSimpleMessage")
- public R<Void> sendSimpleMessage(String to, String subject, String text) {
- MailUtils.send(to, subject, text, false);
- return R.ok("鎿嶄綔鎴愬姛");
+ public R<Void> sendSimpleMessage(@ApiParam("鎺ユ敹浜�") String to,
+ @ApiParam("鏍囬") String subject,
+ @ApiParam("鍐呭") String text) {
+ MailUtils.sendText(to, subject, text);
+ return R.ok();
}
- /**
- * 鍙戦�侀偖浠讹紙甯﹂檮浠讹級
- *
- * @param to 鎺ユ敹浜�
- * @param subject 鏍囬
- * @param text 鍐呭
- */
+ @ApiOperation("鍙戦�侀偖浠讹紙甯﹂檮浠讹級")
@GetMapping("/sendMessageWithAttachment")
- public R<Void> sendMessageWithAttachment(String to, String subject, String text, String filePath) {
- MailUtils.send(to, subject, text, false, new File(filePath));
- return R.ok("鎿嶄綔鎴愬姛");
+ public R<Void> sendMessageWithAttachment(@ApiParam("鎺ユ敹浜�") String to,
+ @ApiParam("鏍囬") String subject,
+ @ApiParam("鍐呭") String text,
+ @ApiParam("闄勪欢璺緞") String filePath) {
+ MailUtils.sendText(to, subject, text, new File(filePath));
+ return R.ok();
}
}
--
Gitblit v1.9.3