From f1f519b5d186f786f25a987fc870fe9f568ecfcc Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 20 May 2025 20:25:19 +0800
Subject: [PATCH] 1
---
src/main/java/email/internal/InternalEmailSenderServiceImpl.java | 105 ++++++++++++++++++++++------------------------------
1 files changed, 44 insertions(+), 61 deletions(-)
diff --git a/src/main/java/email/internal/InternalEmailSenderServiceImpl.java b/src/main/java/email/internal/InternalEmailSenderServiceImpl.java
index ee7f839..5ad961c 100644
--- a/src/main/java/email/internal/InternalEmailSenderServiceImpl.java
+++ b/src/main/java/email/internal/InternalEmailSenderServiceImpl.java
@@ -1,30 +1,33 @@
package email.internal;
-import java.io.BufferedReader;
import java.io.IOException;
-import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
import java.security.GeneralSecurityException;
+import java.util.Date;
import java.util.Map;
import java.util.Properties;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeUtility;
+
import com.sun.mail.util.MailSSLSocketFactory;
import email.EmailPropertiesUtil;
-import okhttp3.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
+import org.springframework.core.io.FileSystemResource;
import org.springframework.mail.SimpleMailMessage;
import org.springframework.mail.javamail.JavaMailSenderImpl;
+import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.ui.freemarker.FreeMarkerTemplateUtils;
import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
import email.sender.EmailMessage;
import freemarker.template.Template;
import freemarker.template.TemplateException;
-import javax.net.ssl.*;
-import java.security.cert.X509Certificate;
+import kernel.util.StringUtils;
+
public class InternalEmailSenderServiceImpl implements InternalEmailSenderService, InitializingBean {
private JavaMailSenderImpl mailSender;
private static final Logger logger = LoggerFactory.getLogger(InternalEmailSenderServiceImpl.class);
@@ -61,70 +64,50 @@
freeMarkerConfigurer.setFreemarkerSettings(settings);
}
- private static final OkHttpClient client = new OkHttpClient.Builder()
- .connectTimeout(10, java.util.concurrent.TimeUnit.SECONDS) // 设置连接超时
- .readTimeout(30, java.util.concurrent.TimeUnit.SECONDS) // 设置读取超时
- .writeTimeout(30, java.util.concurrent.TimeUnit.SECONDS) // 设置写入超时
- .build();
-
- private static final String API_URL = "https://www.aoksend.com/index/api/send_email";
- private static final String APP_KEY = "d30ca7063ad44bd832bc934ff94a443b"; // 从环境变量或配置文件中获取
@Override
public void send(EmailMessage emailMessage) {
- // 验证邮件信息数据的有效性
- if (emailMessage == null || emailMessage.getTomail() == null || emailMessage.getContent() == null) {
- logger.error("无效的邮件信息数据。");
- return;
- }
-
try {
- logger.info("----- 开始发送邮件 -----");
- logger.info("发送邮件到: " + emailMessage.getTomail() + ", 来自: " + emailMessage.getContent());
+ logger.info("-----进到邮件发送-----");
+ MimeMessage mailMsg = this.mailSender.createMimeMessage();
+ logger.info("----------邮件发送,接收邮箱："+emailMessage.getTomail()+"发送邮箱："+this.mailMessage.getFrom());
+ MimeMessageHelper messageHelper = new MimeMessageHelper(mailMsg, true, "UTF-8");
+ messageHelper.setTo(emailMessage.getTomail());// 接收邮箱
+ messageHelper.setFrom(this.mailMessage.getFrom());// 发送邮箱
+ messageHelper.setSentDate(new Date());// 发送时间
+ messageHelper.setSubject(emailMessage.getSubject());// 邮件标题
- // 使用 URL 构建器构建带有查询参数的 URL
- HttpUrl.Builder urlBuilder = HttpUrl.parse(API_URL).newBuilder();
- urlBuilder.addQueryParameter("app_key", APP_KEY);
- urlBuilder.addQueryParameter("template_id", "E_117228484621");
- urlBuilder.addQueryParameter("to", emailMessage.getTomail());
-
- // 将邮件内容以 JSON 形式传递
- String json = "{\"code\":\"" + emailMessage.getContent() + "\"}";
- urlBuilder.addQueryParameter("data", json); // 确保正确编码
-
- // 构建请求体，使用 POST 方法
- RequestBody body = RequestBody.create(
- json, MediaType.parse("application/json; charset=utf-8")
- );
-
- // 构建 POST 请求
- Request request = new Request.Builder()
- .url(urlBuilder.build())
- .post(body) // 使用 POST 方法，并传递请求体
- .addHeader("app_key", APP_KEY)
- .build();
-
- // 执行请求
- try (Response response = client.newCall(request).execute()) {
- if (!response.isSuccessful()) {
- logger.error("邮件发送失败。HTTP 响应码: " + response.code());
- return;
- }
-
- logger.info("----- 邮件发送成功 -----");
- // 可选：记录响应体的内容（如果需要）
- logger.debug("响应内容: " + response.body().string());
+ if (StringUtils.isNullOrEmpty(emailMessage.getFtlname())) {
+ messageHelper.setText(emailMessage.getContent());// 邮件内容
+ } else {
+ messageHelper.setText(this.getMailText(emailMessage.getFtlname(), emailMessage.getMap()), true);// 邮件内容
}
+ logger.info("-----1111111-----");
+ // true 表示启动HTML格式的邮件
+ if (emailMessage.getFile() != null) {
+ // 添加邮件附件
+ FileSystemResource rarfile = new FileSystemResource(emailMessage.getFile());
- } catch (IOException e) {
- logger.error("邮件发送失败【IOException】", e);
- } catch (Exception e) {
- logger.error("邮件发送失败【Exception】", e);
+ // addAttachment addInline 两种附件添加方式
+ // 以附件的形式添加到邮件
+ // 使用MimeUtility.encodeWord 解决附件名中文乱码的问题
+ messageHelper.addAttachment(MimeUtility.encodeWord(emailMessage.getFilename()), rarfile);
+ }
+ logger.info("-----邮件开始发送-----开始");
+ this.mailSender.send(mailMsg);// 发送
+ logger.info("-----邮件开始发送-----成功");
+ } catch (MessagingException e) {
+ logger.error("邮件发送失败【MessagingException】"+e.getMessage(), e);
+ } catch (UnsupportedEncodingException e) {
+ logger.error("邮件发送失败【UnsupportedEncodingException】"+e.getMessage(), e);
+ }catch (Exception e){
+ logger.error("邮件发送失败【Exception】"+"邮件发送失败"+e.getMessage(), e);
}
+
}
/**
* 获取模板并将内容输出到模板
- *
+ *
* @param content
* @return
*/
--
Gitblit v1.9.3