From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java
index 47b4349..01f5044 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/MailController.java
@@ -1,14 +1,16 @@
package org.dromara.demo.controller;
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.mail.utils.MailUtils;
-import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.io.File;
+import java.util.Arrays;
/**
@@ -16,6 +18,7 @@
*
* @author Michelle.Chung
*/
+@SaIgnore
@Validated
@RequiredArgsConstructor
@RestController
@@ -49,4 +52,19 @@
return R.ok();
}
+ /**
+ * 鍙戦�侀偖浠讹紙澶氶檮浠讹級
+ *
+ * @param to 鎺ユ敹浜�
+ * @param subject 鏍囬
+ * @param text 鍐呭
+ * @param paths 闄勪欢璺緞
+ */
+ @GetMapping("/sendMessageWithAttachments")
+ public R<Void> sendMessageWithAttachments(String to, String subject, String text, String[] paths) {
+ File[] array = Arrays.stream(paths).map(File::new).toArray(File[]::new);
+ MailUtils.sendText(to, subject, text, array);
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.3