From f31fc9f42f78de0808e7f4bdc797c5e622df09e3 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 10 Jun 2026 11:22:37 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/impl/InternalEmailSenderServiceImpl.java | 112 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 73 insertions(+), 39 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/InternalEmailSenderServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/InternalEmailSenderServiceImpl.java
index 29d82b4..af3bf96 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/InternalEmailSenderServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/InternalEmailSenderServiceImpl.java
@@ -1,5 +1,6 @@
package com.yami.trading.service.impl;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.yami.trading.common.constants.Constants;
import com.yami.trading.common.manager.email.EmailMessage;
import com.yami.trading.common.util.PropertiesUtil;
@@ -7,6 +8,7 @@
import com.yami.trading.service.InternalEmailSenderService;
import freemarker.template.Template;
import freemarker.template.TemplateException;
+import okhttp3.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
@@ -25,6 +27,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.Date;
+import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -36,31 +39,22 @@
private FreeMarkerConfigurer freeMarkerConfigurer;
@Override
- public void afterPropertiesSet() {
+ public void afterPropertiesSet() throws Exception {
mailSender = new JavaMailSenderImpl();
mailSender.setUsername(PropertiesUtil.getProperty("email.username"));
mailSender.setPassword(PropertiesUtil.getProperty("email.password"));
mailSender.setHost(PropertiesUtil.getProperty("email.host"));
- // 邮件服务器属性配置
Properties javaMailProperties = new Properties();
+ javaMailProperties.setProperty("mail.smtp.port", "465");
- // 场景B：加密端口（465）- 启用SSL，对应服务器加密规则
+ javaMailProperties.setProperty("mail.smtp.auth", "true");
javaMailProperties.setProperty("mail.smtp.ssl.enable", "true");
- javaMailProperties.setProperty("mail.smtp.ssl.protocols", "TLSv1.2"); // 兼容服务器加密协议
- // 配置SSL Socket工厂（仅加密端口需要）
- javaMailProperties.setProperty("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
- javaMailProperties.setProperty("mail.smtp.socketFactory.port", "465"); // 端口与smtp.port一致（465）
- javaMailProperties.setProperty("mail.smtp.socketFactory.fallback", "false"); // 禁用非SSL降级
- // 465端口禁用STARTTLS（服务器不支持）
- javaMailProperties.setProperty("mail.smtp.starttls.enable", "false");
+ javaMailProperties.setProperty("mail.smtp.ssl.protocols", "TLSv1.2");
- // 调试模式（生产环境建议改为false）
javaMailProperties.setProperty("mail.debug", "true");
mailSender.setJavaMailProperties(javaMailProperties);
-
mailMessage = new SimpleMailMessage();
mailMessage.setFrom(PropertiesUtil.getProperty("email.from"));
-
freeMarkerConfigurer = new FreeMarkerConfigurer();
freeMarkerConfigurer.setTemplateLoaderPath("classpath:email/ftl");
Properties settings = new Properties();
@@ -68,36 +62,78 @@
settings.setProperty("default_encoding", "UTF-8");
settings.setProperty("locale", "zh_CN");
freeMarkerConfigurer.setFreemarkerSettings(settings);
+ freeMarkerConfigurer.afterPropertiesSet();
}
+
+ 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://apiv2.aoksend.com/index/api/send_email";
+ private static final String APP_KEY = "a437b8c8c89d17a67c74751c3bc7dbbd";
+ private static final String TEMPLATE_ID_REGISTER = "E_145471003444";
@Override
public void send(EmailMessage emailMessage) {
+ // 验证邮件信息数据的有效性
+ if (emailMessage == null || emailMessage.getTomail() == null || emailMessage.getContent() == null) {
+ logger.error("无效的邮件信息数据。");
+ return;
+ }
+
try {
- MimeMessage mailMsg = this.mailSender.createMimeMessage();
- 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());// 邮件标题
- if (StringUtils.isNullOrEmpty(emailMessage.getFtlname())) {
- messageHelper.setText(emailMessage.getContent());// 邮件内容
- } else {
- messageHelper.setText(this.getMailText(emailMessage.getFtlname(), emailMessage.getMap()), true);// 邮件内容
+ logger.info("----- 开始发送邮件 -----");
+ logger.info("发送邮件到: " + emailMessage.getTomail() + ", 来自: " + emailMessage.getContent());
+
+ String codeValue = emailMessage.getContent();
+ if (codeValue == null) {
+ codeValue = "";
}
- // true 表示启动HTML格式的邮件
- if (emailMessage.getFile() != null) {
- // 添加邮件附件
- FileSystemResource rarfile = new FileSystemResource(emailMessage.getFile());
- // addAttachment addInline 两种附件添加方式
- // 以附件的形式添加到邮件
- // 使用MimeUtility.encodeWord 解决附件名中文乱码的问题
- messageHelper.addAttachment(MimeUtility.encodeWord(emailMessage.getFilename()), rarfile);
+
+ // 使用 URL 构建器构建带有查询参数的 URL
+ HttpUrl.Builder urlBuilder = HttpUrl.parse(API_URL).newBuilder();
+ urlBuilder.addQueryParameter("app_key", APP_KEY);
+ urlBuilder.addQueryParameter("template_id", TEMPLATE_ID_REGISTER);
+ urlBuilder.addQueryParameter("to", emailMessage.getTomail());
+
+ ObjectMapper objectMapper = new ObjectMapper();
+ Map<String, String> dataMap = new HashMap<>();
+ dataMap.put("code", codeValue);
+
+ String json = objectMapper.writeValueAsString(dataMap);
+ 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.info("响应内容: " + response.body().string());
}
- this.mailSender.send(mailMsg);// 发送
- } catch (MessagingException e) {
- logger.error(e.getMessage(), e);
- } catch (UnsupportedEncodingException e) {
- logger.error(e.getMessage(), e);
+
+ } catch (IOException e) {
+ logger.error("邮件发送失败【IOException】", e);
+ } catch (Exception e) {
+ logger.error("邮件发送失败【Exception】", e);
}
}
@@ -113,9 +149,7 @@
Template tpl = this.freeMarkerConfigurer.getConfiguration().getTemplate(ftlname);
// 加入map到模板中 输出对应变量
html = FreeMarkerTemplateUtils.processTemplateIntoString(tpl, map);
- } catch (IOException e) {
- e.printStackTrace();
- } catch (TemplateException e) {
+ } catch (IOException | TemplateException e) {
e.printStackTrace();
}
return html;
--
Gitblit v1.9.3