From f7bde8a9d9bf8e3c67c0912cbd8c50fe4f7097aa Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 13 May 2026 20:17:51 +0800
Subject: [PATCH] 1

---
 trading-order-service/src/main/java/com/yami/trading/service/impl/InternalEmailSenderServiceImpl.java |   87 +++++++++++++++++++++++++++++++++----------
 1 files changed, 66 insertions(+), 21 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 dbdbab6..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;
@@ -63,32 +65,75 @@
         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 | UnsupportedEncodingException e) {
-            logger.error(e.getMessage(), e);
+
+        } catch (IOException e) {
+            logger.error("邮件发送失败【IOException】", e);
+        } catch (Exception e) {
+            logger.error("邮件发送失败【Exception】", e);
         }
     }
 

--
Gitblit v1.9.3