From 19d0fd2c0e7860e2d5d075f926df0d190ebb34cc Mon Sep 17 00:00:00 2001
From: peternameyakj <908253177@qq.com>
Date: Tue, 15 Oct 2024 10:40:15 +0800
Subject: [PATCH] 邮箱

---
 src/main/java/email/internal/InternalEmailSenderServiceImpl.java |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/main/java/email/internal/InternalEmailSenderServiceImpl.java b/src/main/java/email/internal/InternalEmailSenderServiceImpl.java
index b17f757..cddf095 100644
--- a/src/main/java/email/internal/InternalEmailSenderServiceImpl.java
+++ b/src/main/java/email/internal/InternalEmailSenderServiceImpl.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.net.URL;
 import java.security.GeneralSecurityException;
 import java.util.Date;
 import java.util.Map;
@@ -10,6 +11,7 @@
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeUtility;
+import javax.net.ssl.HttpsURLConnection;
 
 import com.sun.mail.util.MailSSLSocketFactory;
 import email.EmailPropertiesUtil;
@@ -36,25 +38,26 @@
 
 	@Override
 	public void afterPropertiesSet() throws GeneralSecurityException {
+		// 设置 TLS 协议
+		System.setProperty("https.protocols", "TLSv1.2,TLSv1.3");
+
 		mailSender = new JavaMailSenderImpl();
 		mailSender.setUsername(EmailPropertiesUtil.getProperty("email.username"));
 		mailSender.setPassword(EmailPropertiesUtil.getProperty("email.password"));
 		mailSender.setHost(EmailPropertiesUtil.getProperty("email.host"));
+
 		Properties javaMailProperties = new Properties();
 		javaMailProperties.setProperty("mail.smtp.port", "465");
-		javaMailProperties.setProperty("mail.smtp.starttls.enable", "true");
 		javaMailProperties.setProperty("mail.smtp.auth", "true");
-		javaMailProperties.setProperty("mmail.debug", "true");
+		javaMailProperties.setProperty("mail.smtp.ssl.enable", "true");
+		javaMailProperties.setProperty("mail.debug", "true");
 		javaMailProperties.setProperty("mail.smtp.host", "smtp.gmail.com");
-		javaMailProperties.setProperty("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
-		javaMailProperties.setProperty("mail.smtp.socketFactory.port", "465");
-		MailSSLSocketFactory sf = new MailSSLSocketFactory("TLSv1.2");
-		sf.setTrustAllHosts(true);
-		javaMailProperties.put("mail.smtp.ssl.socketFactory",sf);
-		javaMailProperties.setProperty("mail.smtp.ssl.portocols","TLSv1.2");
+
 		mailSender.setJavaMailProperties(javaMailProperties);
+
 		mailMessage = new SimpleMailMessage();
 		mailMessage.setFrom(EmailPropertiesUtil.getProperty("email.from"));
+
 		freeMarkerConfigurer = new FreeMarkerConfigurer();
 		freeMarkerConfigurer.setTemplateLoaderPath("classpath:email/ftl");
 		Properties settings = new Properties();
@@ -67,9 +70,9 @@
 	@Override
 	public void send(EmailMessage emailMessage) {
 		try {
-			logger.info("-----进到邮件发送-----");
+			System.out.println("-----进到邮件发送-----");
 			MimeMessage mailMsg = this.mailSender.createMimeMessage();
-			logger.info("----------邮件发送,接收邮箱:"+emailMessage.getTomail()+"发送邮箱:"+this.mailMessage.getFrom());
+			System.out.println("----------邮件发送,接收邮箱:"+emailMessage.getTomail()+"发送邮箱:"+this.mailMessage.getFrom());
 			MimeMessageHelper messageHelper = new MimeMessageHelper(mailMsg, true, "UTF-8");
 			messageHelper.setTo(emailMessage.getTomail());// 接收邮箱
 			messageHelper.setFrom(this.mailMessage.getFrom());// 发送邮箱
@@ -81,7 +84,7 @@
 			} else {
 				messageHelper.setText(this.getMailText(emailMessage.getFtlname(), emailMessage.getMap()), true);// 邮件内容
 			}
-			logger.info("-----1111111-----");
+			System.out.println("-----1111111-----");
 			// true 表示启动HTML格式的邮件
 			if (emailMessage.getFile() != null) {
 				// 添加邮件附件
@@ -92,15 +95,18 @@
 				// 使用MimeUtility.encodeWord 解决附件名中文乱码的问题
 				messageHelper.addAttachment(MimeUtility.encodeWord(emailMessage.getFilename()), rarfile);
 			}
-			logger.info("-----邮件开始发送-----开始");
+			System.out.println("-----邮件开始发送-----开始");
 			this.mailSender.send(mailMsg);// 发送
-			logger.info("-----邮件开始发送-----成功");
+			System.out.println("-----邮件开始发送-----成功");
 		} catch (MessagingException e) {
 			logger.error("邮件发送失败【MessagingException】"+e.getMessage(), e);
+			System.out.println(e.getMessage());
 		} catch (UnsupportedEncodingException e) {
 			logger.error("邮件发送失败【UnsupportedEncodingException】"+e.getMessage(), e);
+			System.out.println(e.getMessage());
 		}catch (Exception e){
 			logger.error("邮件发送失败【Exception】"+"邮件发送失败"+e.getMessage(), e);
+			System.out.println(e.getMessage());
 		}
 
 	}

--
Gitblit v1.9.3