From bf2acefcf5ba801d3e4a4f507c5f064fc93625cc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 21 八月 2025 00:25:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/EmailUtil.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/EmailUtil.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/EmailUtil.java
index e09f2dd..ac957b0 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/EmailUtil.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/EmailUtil.java
@@ -8,8 +8,11 @@
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import javax.mail.MessagingException;
+import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeUtility;
import java.io.File;
+import java.io.UnsupportedEncodingException;
@Component
public class EmailUtil {
@@ -24,19 +27,32 @@
this.javaMailSender = javaMailSender;
}
- public void sendEmailWithAttachment(String to, String subject, String text, File attachment) throws MessagingException {
+ public void sendEmailWithAttachment(String to, String subject, String text, File attachment,String displayFileName) throws MessagingException, UnsupportedEncodingException {
MimeMessage message = javaMailSender.createMimeMessage();
MimeMessageHelper helper = new MimeMessageHelper(message, true);
// 设置发件人（必须与配置的spring.mail.username一致）
- helper.setFrom(fromEmail);
+ String nick="";
+ try {
+ nick=javax.mail.internet.MimeUtility.encodeText("贵人家园出行");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ // 设置发件人
+ helper.setFrom(new InternetAddress(nick + " <" + fromEmail + ">"));
// 设置收件人
helper.setTo(to);
// 设置邮件主题和内容
helper.setSubject(subject);
helper.setText(text);
- // 添加附件
- helper.addAttachment(attachment.getName(), attachment);
+ if(null != attachment){
+ // 使用显示文件名而非原文件名
+ helper.addAttachment(
+ MimeUtility.encodeWord(displayFileName), // 编码避免中文乱码
+ attachment
+ );
+ }
+
// 发送邮件
javaMailSender.send(message);
--
Gitblit v1.7.1