From 56050aa6501f3d9d2f79a2c40a28815878ac56ee Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 24 十一月 2022 15:14:47 +0800 Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复Log注解GET请求记录不到参数问题 * fix 修复某些特性的环境生成代码变乱码TXT文件问题 * update 消除Vue3控制台出现的警告信息 * fix 开启TopNav没有子菜单隐藏侧边栏 * fix 修复回显数据字典数组异常问题(I60UYQ) * update 忽略不必要的属性数据返回 --- ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 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 c88baec..6db4dc4 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 @@ -2,9 +2,6 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.utils.email.MailUtils; -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; @@ -20,27 +17,34 @@ * @author Michelle.Chung */ @Validated -@Tag(name ="閭欢鍙戦�佹渚�", description = "閭欢鍙戦�佹渚�") @RequiredArgsConstructor @RestController @RequestMapping("/demo/mail") public class MailController { - @Operation(summary = "鍙戦�侀偖浠�") + /** + * 鍙戦�侀偖浠� + * + * @param to 鎺ユ敹浜� + * @param subject 鏍囬 + * @param text 鍐呭 + */ @GetMapping("/sendSimpleMessage") - public R<Void> sendSimpleMessage(@Parameter(name = "鎺ユ敹浜�") String to, - @Parameter(name = "鏍囬") String subject, - @Parameter(name = "鍐呭") String text) { + public R<Void> sendSimpleMessage(String to, String subject, String text) { MailUtils.sendText(to, subject, text); return R.ok(); } - @Operation(summary = "鍙戦�侀偖浠讹紙甯﹂檮浠讹級") + /** + * 鍙戦�侀偖浠讹紙甯﹂檮浠讹級 + * + * @param to 鎺ユ敹浜� + * @param subject 鏍囬 + * @param text 鍐呭 + * @param filePath 闄勪欢璺緞 + */ @GetMapping("/sendMessageWithAttachment") - public R<Void> sendMessageWithAttachment(@Parameter(name = "鎺ユ敹浜�") String to, - @Parameter(name = "鏍囬") String subject, - @Parameter(name = "鍐呭") String text, - @Parameter(name = "闄勪欢璺緞") String filePath) { + public R<Void> sendMessageWithAttachment(String to, String subject, String text, String filePath) { MailUtils.sendText(to, subject, text, new File(filePath)); return R.ok(); } -- Gitblit v1.9.3