From 71a2a8245db4c04be3f96a9eb9b47931d3130650 Mon Sep 17 00:00:00 2001
From: zlyx <1242874891@qq.com>
Date: 星期三, 18 一月 2023 17:09:43 +0800
Subject: [PATCH] refactor 重构 common, framework 包结构, 参照 cloud 版本拆分子模块 ; update 更新模块包名 ; delete 移除 sms 模块, oss 模块, framework 模块 (并入 common 模块) ;
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 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..3d890ac 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
@@ -1,10 +1,8 @@
package com.ruoyi.demo.controller;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.utils.email.MailUtils;
-import io.swagger.annotations.Api;
+import com.ruoyi.common.mail.utils.MailUtils;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,15 +12,14 @@
/**
- * 娴嬭瘯閭欢鍙戦�� Controller
+ * 閭欢鍙戦�佹渚�
*
* @author Michelle.Chung
*/
@Validated
-@Api(value = "閭欢鎺у埗鍣�", tags = {"娴嬭瘯閭欢鍙戦��"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
-@RequestMapping("/demo/mail")
+@RequiredArgsConstructor
@RestController
+@RequestMapping("/demo/mail")
public class MailController {
/**
@@ -34,21 +31,22 @@
*/
@GetMapping("/sendSimpleMessage")
public R<Void> sendSimpleMessage(String to, String subject, String text) {
- MailUtils.send(to, subject, text, false);
- return R.ok("鎿嶄綔鎴愬姛");
+ MailUtils.sendText(to, subject, text);
+ return R.ok();
}
/**
* 鍙戦�侀偖浠讹紙甯﹂檮浠讹級
*
- * @param to 鎺ユ敹浜�
- * @param subject 鏍囬
- * @param text 鍐呭
+ * @param to 鎺ユ敹浜�
+ * @param subject 鏍囬
+ * @param text 鍐呭
+ * @param filePath 闄勪欢璺緞
*/
@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("鎿嶄綔鎴愬姛");
+ MailUtils.sendText(to, subject, text, new File(filePath));
+ return R.ok();
}
}
--
Gitblit v1.9.3