From 70f9c0146dca26deb1ea6f73db8f57bbdf28ef90 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 26 Oct 2025 19:19:57 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractOrderController.java | 15 +++
trading-order-admin/src/main/java/com/yami/trading/admin/controller/data/AdminKlineController.java | 2
trading-order-common/src/main/java/com/yami/trading/common/domain/BaseEntity.java | 2
trading-order-service/src/main/java/com/yami/trading/service/impl/InternalEmailSenderServiceImpl.java | 217 ++++++++++++++++++++++++++-----------------
trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java | 2
trading-order-admin/src/main/java/com/yami/trading/WebApplication.java | 7
6 files changed, 152 insertions(+), 93 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/WebApplication.java b/trading-order-admin/src/main/java/com/yami/trading/WebApplication.java
index c93ce11..f394e7a 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/WebApplication.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/WebApplication.java
@@ -36,15 +36,16 @@
public class WebApplication extends SpringBootServletInitializer {
public static void main(String[] args) {
-
+ // 禁用 SSL 证书验证
+ System.setProperty("jdk.internal.httpclient.disableHostnameVerification", "true");
SpringApplication.run(WebApplication.class, args);
}
@PostConstruct
void init() {
// 强制设置默认时区（影响整个JVM）
- TimeZone.setDefault(TimeZone.getTimeZone("Europe/Paris"));
- System.setProperty("user.timezone", "Europe/Paris");
+ TimeZone.setDefault(TimeZone.getTimeZone("America/Mexico_City"));
+ System.setProperty("user.timezone", "America/Mexico_City");
}
@Override
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/data/AdminKlineController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/data/AdminKlineController.java
index 2816a1d..43d4969 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/data/AdminKlineController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/data/AdminKlineController.java
@@ -45,7 +45,7 @@
*/
@ApiOperation(value = "kline初始化")
@GetMapping(value = {"klineInit.action", "klineInitConfig.action"})
- public Result<String> klineInit(@RequestParam(required = true) @NotBlank String paraInitSymbol ) throws Exception {
+ public Result<String> klineInit(@RequestParam(required = true) String paraInitSymbol ) throws Exception {
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractOrderController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractOrderController.java
index aafba17..3073b21 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractOrderController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractOrderController.java
@@ -25,6 +25,10 @@
import java.io.IOException;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.*;
/**
@@ -157,6 +161,17 @@
}
map.put("mark_price", realtime.getClose().setScale(4, RoundingMode.DOWN));
}
+ if(ObjectUtils.isNotEmpty(data.get(i).get("close_time"))){
+
+ LocalDateTime dateTime = LocalDateTime.ofInstant(
+ Instant.ofEpochSecond(Integer.valueOf(data.get(i).get("close_time").toString())),
+ ZoneId.of("America/Mexico_City") // 指定墨西哥时区
+ );
+
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ String formatted = dateTime.format(formatter);
+ data.get(i).put("close_time", formatted);
+ }
if (ObjectUtils.isEmpty(data.get(i).get("close_avg_price"))) {
data.get(i).put("close_avg_price", new BigDecimal(data.get(i).get("mark_price").toString()).setScale(4, RoundingMode.DOWN));
}
diff --git a/trading-order-common/src/main/java/com/yami/trading/common/domain/BaseEntity.java b/trading-order-common/src/main/java/com/yami/trading/common/domain/BaseEntity.java
index 6ee44e5..92a37c6 100644
--- a/trading-order-common/src/main/java/com/yami/trading/common/domain/BaseEntity.java
+++ b/trading-order-common/src/main/java/com/yami/trading/common/domain/BaseEntity.java
@@ -21,7 +21,6 @@
/**
* 创建日期
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Europe/Paris")
@TableField(fill = FieldFill.INSERT)
private Date createTime;
/**
@@ -38,7 +37,6 @@
/**
* 更新日期
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Europe/Paris")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java
index b6d70f0..c583f98 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/IdentifyingCodeServiceImpl.java
@@ -87,7 +87,7 @@
}
// log.info(MessageFormat.format("target:{0},code:{1},ip:{2}", target, code, ip));
- String content = MessageFormat.format("code is ：{0}", new Object[] { code });
+ String content = code;
if (target.indexOf("@") == -1) {
/**
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 77da9ea..6d5708a 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,114 +1,159 @@
package com.yami.trading.service.impl;
-import com.yami.trading.common.constants.Constants;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.yami.trading.common.manager.email.EmailMessage;
import com.yami.trading.common.util.PropertiesUtil;
-import com.yami.trading.common.util.StringUtils;
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;
-import org.springframework.beans.factory.annotation.Autowired;
-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.stereotype.Service;
-import org.springframework.ui.freemarker.FreeMarkerTemplateUtils;
-import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeUtility;
+import javax.net.ssl.*;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
+import java.security.SecureRandom;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.HashMap;
import java.util.Map;
-import java.util.Properties;
+import java.util.concurrent.TimeUnit;
-
+@Service
public class InternalEmailSenderServiceImpl implements InternalEmailSenderService, InitializingBean {
private static final Logger logger = LoggerFactory.getLogger(InternalEmailSenderServiceImpl.class);
- private JavaMailSenderImpl mailSender;
- private SimpleMailMessage mailMessage;
- private FreeMarkerConfigurer freeMarkerConfigurer;
+
+ private OkHttpClient client;
+ private static final String API_URL = "https://www.aoksend.com/index/api/send_email";
+ private static final String APP_KEY = "c3affa4607524cb619ca0368e4f93c24";
@Override
public void afterPropertiesSet() {
- 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");
- javaMailProperties.setProperty("mail.smtp.starttls.enable", "true");
- javaMailProperties.setProperty("mail.smtp.auth", "true");
- javaMailProperties.setProperty("mmail.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");
- mailSender.setJavaMailProperties(javaMailProperties);
- mailMessage = new SimpleMailMessage();
- mailMessage.setFrom(PropertiesUtil.getProperty("email.from"));
- freeMarkerConfigurer = new FreeMarkerConfigurer();
- freeMarkerConfigurer.setTemplateLoaderPath("classpath:email/ftl");
- Properties settings = new Properties();
- settings.setProperty("template_update_delay", "1800");
- settings.setProperty("default_encoding", "UTF-8");
- settings.setProperty("locale", "zh_CN");
- freeMarkerConfigurer.setFreemarkerSettings(settings);
+ // 创建信任所有证书的 OkHttpClient
+ this.client = createUnsafeOkHttpClient();
+ logger.info("OkHttpClient 初始化完成，已禁用 SSL 证书验证");
+ }
+
+ /**
+ * 创建信任所有证书的 OkHttpClient
+ */
+ private OkHttpClient createUnsafeOkHttpClient() {
+ try {
+ // 创建信任所有证书的 TrustManager
+ final TrustManager[] trustAllCerts = new TrustManager[] {
+ new X509TrustManager() {
+ @Override
+ public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+ }
+
+ @Override
+ public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
+ }
+
+ @Override
+ public X509Certificate[] getAcceptedIssuers() {
+ return new X509Certificate[]{};
+ }
+ }
+ };
+
+ // 创建 SSLContext 并使用信任所有证书的 TrustManager
+ final SSLContext sslContext = SSLContext.getInstance("TLS");
+ sslContext.init(null, trustAllCerts, new SecureRandom());
+
+ // 创建 SSLSocketFactory
+ final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
+
+ // 构建 OkHttpClient
+ OkHttpClient.Builder builder = new OkHttpClient.Builder();
+ builder.sslSocketFactory(sslSocketFactory, (X509TrustManager) trustAllCerts[0]);
+ builder.hostnameVerifier((hostname, session) -> true); // 信任所有主机名
+
+ // 设置超时
+ builder.connectTimeout(30, TimeUnit.SECONDS);
+ builder.readTimeout(30, TimeUnit.SECONDS);
+ builder.writeTimeout(30, TimeUnit.SECONDS);
+
+ return builder.build();
+ } catch (Exception e) {
+ logger.error("创建 OkHttpClient 失败", e);
+ throw new RuntimeException(e);
+ }
}
@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());
+
+ // 构建请求数据
+ ObjectMapper objectMapper = new ObjectMapper();
+ Map<String, String> dataMap = new HashMap<>();
+ dataMap.put("code", emailMessage.getContent());
+
+ String json = objectMapper.writeValueAsString(dataMap);
+
+ // 构建请求体
+ RequestBody body = RequestBody.create(
+ json, MediaType.parse("application/json; charset=utf-8")
+ );
+
+ // 构建请求 URL
+ HttpUrl url = HttpUrl.parse(API_URL).newBuilder()
+ .addQueryParameter("app_key", APP_KEY)
+ .addQueryParameter("template_id", "E_132497205418")
+ .addQueryParameter("to", emailMessage.getTomail())
+ .addQueryParameter("data", json)
+ .build();
+
+ // 构建请求
+ Request request = new Request.Builder()
+ .url(url)
+ .post(body)
+ .addHeader("app_key", APP_KEY)
+ .addHeader("Content-Type", "application/json")
+ .addHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36")
+ .build();
+
+ // 执行请求
+ try (Response response = client.newCall(request).execute()) {
+ if (!response.isSuccessful()) {
+ logger.error("邮件发送失败。HTTP 响应码: {}, 错误信息: {}", response.code(), response.message());
+ if (response.body() != null) {
+ logger.error("错误响应体: {}", response.body().string());
+ }
+ return;
+ }
+
+ String responseBody = response.body() != null ? response.body().string() : "空响应";
+ logger.info("----- 邮件发送成功 -----");
+ logger.info("响应内容: {}", responseBody);
}
- // true 表示启动HTML格式的邮件
- if (emailMessage.getFile() != null) {
- // 添加邮件附件
- FileSystemResource rarfile = new FileSystemResource(emailMessage.getFile());
- // addAttachment addInline 两种附件添加方式
- // 以附件的形式添加到邮件
- // 使用MimeUtility.encodeWord 解决附件名中文乱码的问题
- messageHelper.addAttachment(MimeUtility.encodeWord(emailMessage.getFilename()), rarfile);
- }
- 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);
}
}
- /**
- * 获取模板并将内容输出到模板
- *
- * @return
- */
- private String getMailText(String ftlname, Map<String, Object> map) {
- String html = "";
- try {
- // 装载模板
- Template tpl = this.freeMarkerConfigurer.getConfiguration().getTemplate(ftlname);
- // 加入map到模板中 输出对应变量
- html = FreeMarkerTemplateUtils.processTemplateIntoString(tpl, map);
- } catch (IOException e) {
- e.printStackTrace();
- } catch (TemplateException e) {
- e.printStackTrace();
- }
- return html;
+ public static void main(String[] args) {
+ // 创建服务实例并初始化
+ InternalEmailSenderServiceImpl service = new InternalEmailSenderServiceImpl();
+ service.afterPropertiesSet();
+
+ // 测试发送邮件
+ EmailMessage emailMessage = new EmailMessage();
+ emailMessage.setTomail("ljdbo813@justdefinition.com");
+ emailMessage.setContent("11111");
+
+ service.send(emailMessage);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3