From dd64fed0172395dae2edf72446a4c2cb57c2d56f Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期三, 19 三月 2025 10:52:20 +0800
Subject: [PATCH] 修改邮件

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java |   43 +++++++++++++++++--------------------------
 1 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java
index 4ce4421..1420362 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java
@@ -12,13 +12,13 @@
 import javax.activation.URLDataSource;
 import javax.mail.*;
 import javax.mail.internet.*;
+import javax.net.ssl.*;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Properties;
+import java.nio.charset.StandardCharsets;
+import java.security.cert.X509Certificate;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 
 @Component
@@ -121,27 +121,20 @@
         try {
             // 创建邮件会话
             Session mailSession = Session.getInstance(getMailProperties(), getAuthenticator());
-
             // 创建邮件消息
             MimeMessage message = new MimeMessage(mailSession);
-
             // 设置发件人
             InternetAddress from = new InternetAddress(properties.getUserAddr(), properties.getUserName());
             message.setFrom(from);
-
             // 设置收件人
             InternetAddress to = new InternetAddress(emailAddress);
             message.setRecipient(MimeMessage.RecipientType.TO, to);
-
             // 设置邮件标题
             message.setSubject("发票");
-
             // 创建邮件内容
             Multipart multipart = createMultipart(list);
-
             // 设置邮件内容
             message.setContent(multipart);
-
             // 发送邮件
             Transport.send(message);
         } catch (MessagingException | UnsupportedEncodingException | MalformedURLException e) {
@@ -160,7 +153,8 @@
         props.put("mail.user", properties.getUserAddr());
         props.put("mail.password", properties.getPassword());
         props.setProperty("mail.smtp.socketFactory.fallback", "false");
-        props.put("mail.smtp.ssl.enable", "false");
+        props.put("mail.smtp.ssl.enable", "true");
+        props.put("mail.smtp.ssl.protocols", "TLSv1.2");
         return props;
     }
 
@@ -175,42 +169,39 @@
         };
     }
 
-
-
-
     private Multipart createMultipart(List<Map<String, String>> list) throws MessagingException, UnsupportedEncodingException, MalformedURLException {
         Multipart multipart = new MimeMultipart();
-
         // 添加文本消息部分
         BodyPart messageBodyPart = new MimeBodyPart();
         messageBodyPart.setHeader("Content-Type", "text/plain;charset=utf-8");
+        messageBodyPart.setContent("您在小程序提交的开票申请已开票成功,请查看附件内容","text/html;charset=UTF-8");
         multipart.addBodyPart(messageBodyPart);
-
         // 添加附件部分
         for (Map<String, String> map : list) {
             messageBodyPart = new MimeBodyPart();
             String url = map.get("url");
             String fileName = map.get("fileName");
-
             URLDataSource source = new URLDataSource(new URL(url));
             messageBodyPart.setDataHandler(new DataHandler(source));
-
             String filenameEncode = MimeUtility.encodeText(fileName, "UTF-8", "base64");
+            // String encodedFileName = Base64.getEncoder().encodeToString(fileName.getBytes(StandardCharsets.UTF_8));
+            // String filenameEncode = MimeUtility.encodeText(encodedFileName);
             messageBodyPart.setFileName(filenameEncode);
             messageBodyPart.setHeader("Content-Transfer-Encoding", "base64");
             messageBodyPart.setHeader("Content-Disposition", "attachment");
             messageBodyPart.setHeader("Content-Type", "application/octet-stream;name=\"" + filenameEncode + "\"");
-
             multipart.addBodyPart(messageBodyPart);
         }
 
         return multipart;
     }
 
-   public static void main(String[] args) throws UnsupportedEncodingException {
-       TencentMailUtil tencentMailUtil = new TencentMailUtil();
-       MailProperties properties = new MailProperties();
-       tencentMailUtil.properties = properties;
-       tencentMailUtil.send("645025773@qq.com","大学城揽院24栋");
-   }
+
+
+   // public static void main(String[] args) throws UnsupportedEncodingException {
+   //     TencentMailUtil tencentMailUtil = new TencentMailUtil();
+   //     MailProperties properties = new MailProperties();
+   //     tencentMailUtil.properties = properties;
+   //     tencentMailUtil.send("645025773@qq.com","大学城揽院24栋");
+   // }
 }

--
Gitblit v1.7.1