From 94289b9f46e579327d721f6d32c72b417b77f4db Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Fri, 26 Dec 2025 14:42:03 +0800
Subject: [PATCH] 邮箱
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIdentifyingCodeController.java | 18 ++++++++
trading-order-service/src/main/java/com/yami/trading/service/impl/InternalEmailSenderServiceImpl.java | 70 ++++++++++++++++++++++++++++++++++-
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIndexController.java | 10 ++++
trading-order-service/src/main/java/com/yami/trading/EmailServer.java | 2
trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java | 1
5 files changed, 96 insertions(+), 5 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIdentifyingCodeController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIdentifyingCodeController.java
index 6f47fbb..9b9d94a 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIdentifyingCodeController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIdentifyingCodeController.java
@@ -1,13 +1,18 @@
package com.yami.trading.api.controller;
import com.yami.trading.common.domain.Result;
+import com.yami.trading.common.manager.email.EmailMessage;
import com.yami.trading.common.util.IPHelper;
import com.yami.trading.service.IdentifyingCodeService;
+import com.yami.trading.service.IdentifyingCodeTimeWindowService;
+import com.yami.trading.service.InternalEmailSenderService;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Random;
@RequestMapping("api/idcode")
@RestController
@@ -16,10 +21,21 @@
@Autowired
private IdentifyingCodeService identifyingCodeService;
+ @Autowired
+ private InternalEmailSenderService internalEmailSenderService;
+ @Autowired
+ private IdentifyingCodeTimeWindowService identifyingCodeTimeWindowService;
@RequestMapping("execute")
public Result execute(@RequestParam String target) {
- identifyingCodeService.send(target, IPHelper.getIpAddr());
+// identifyingCodeService.send(target, IPHelper.getIpAddr());
+ Random random = new Random();
+ String code = String.valueOf(random.nextInt(999999) % 900000 + 100000);
+ this.identifyingCodeTimeWindowService.putAuthCode(target, code);
+ EmailMessage emailMessage = new EmailMessage();
+ emailMessage.setContent(code);
+ emailMessage.setTomail(target);
+ internalEmailSenderService.aokSend(emailMessage);
return Result.succeed(null);
}
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIndexController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIndexController.java
index a1ff910..df3ae24 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIndexController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiIndexController.java
@@ -22,6 +22,7 @@
import com.yami.trading.security.common.manager.PasswordManager;
import com.yami.trading.security.common.manager.TokenStore;
import com.yami.trading.security.common.vo.TokenInfoVO;
+import com.yami.trading.service.IdentifyingCodeTimeWindowService;
import com.yami.trading.service.WalletService;
import com.yami.trading.service.syspara.SysparaService;
import com.yami.trading.service.system.LogService;
@@ -29,6 +30,7 @@
import com.yami.trading.service.user.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.security.crypto.password.PasswordEncoder;
@@ -71,6 +73,8 @@
@Autowired
UserDataService userDataService;
+ @Autowired
+ IdentifyingCodeTimeWindowService identifyingCodeTimeWindowService;
@PostMapping("/login")
@@ -189,7 +193,11 @@
String usercode = model.getUserCode();
// 注册类型：1/手机；2/邮箱；3/用户名；
int type = model.getType();
-
+ String key = username;
+ String authcode = identifyingCodeTimeWindowService.getAuthCode(key);
+ if (StringUtils.isBlank(model.getEmailCode()) ||(authcode == null) || (!authcode.equals(model.getEmailCode()))) {
+ throw new YamiShopBindException("验证码不正确");
+ }
User user = userService.register(model.getUserName(),
passwordEncoder.encode(password)
, model.getUserCode(), model.getType(),false);
diff --git a/trading-order-service/src/main/java/com/yami/trading/EmailServer.java b/trading-order-service/src/main/java/com/yami/trading/EmailServer.java
index 91e1bc6..b7fbdd4 100644
--- a/trading-order-service/src/main/java/com/yami/trading/EmailServer.java
+++ b/trading-order-service/src/main/java/com/yami/trading/EmailServer.java
@@ -90,7 +90,7 @@
public void run() {
try {
- internalEmailSenderService.send(item);
+ internalEmailSenderService.aokSend(item);
} catch (Throwable t) {
logger.error("EmailServer taskExecutor.execute() fail", t);
}
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 33fbcd3..ab7a157 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
@@ -69,8 +69,74 @@
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 = "741338dcd2fd58d93fadf74c350cb15b"; // 从环境变量或配置文件中获取
+ private static final String APP_KEY = "9897279416428ea3d940063f76deaed9"; // 从环境变量或配置文件中获取
+
+ public static void main(String[] args) {
+ EmailMessage emailMessage = new EmailMessage();
+ emailMessage.setContent("58889");
+ emailMessage.setTomail("oykegx@swagpapa.com");
+ aokSendTest(emailMessage);
+ }
+ public static void aokSendTest(EmailMessage emailMessage) {
+ // 验证邮件信息数据的有效性
+ if (emailMessage == null || emailMessage.getTomail() == null || emailMessage.getContent() == null) {
+ logger.error("无效的邮件信息数据。");
+ return;
+ }
+
+ try {
+ logger.info("----- 开始发送邮件 -----");
+ logger.info("发送邮件到: " + emailMessage.getTomail() + ", 来自: " + emailMessage.getContent());
+
+ // 使用 URL 构建器构建带有查询参数的 URL
+ HttpUrl.Builder urlBuilder = HttpUrl.parse(API_URL).newBuilder();
+ urlBuilder.addQueryParameter("app_key", APP_KEY);
+ urlBuilder.addQueryParameter("template_id", "E_136625161409");
+ urlBuilder.addQueryParameter("to", emailMessage.getTomail());
+
+ ObjectMapper objectMapper = new ObjectMapper();
+ Map<String, String> dataMap = new HashMap<>();
+ dataMap.put("code", emailMessage.getContent());
+
+ 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());
+ }
+
+ } catch (IOException e) {
+ logger.error("邮件发送失败【IOException】", e);
+ } catch (Exception e) {
+ logger.error("邮件发送失败【Exception】", e);
+ }
+ }
@Override
public void aokSend(EmailMessage emailMessage) {
// 验证邮件信息数据的有效性
@@ -86,7 +152,7 @@
// 使用 URL 构建器构建带有查询参数的 URL
HttpUrl.Builder urlBuilder = HttpUrl.parse(API_URL).newBuilder();
urlBuilder.addQueryParameter("app_key", APP_KEY);
- urlBuilder.addQueryParameter("template_id", "E_132465345657");
+ urlBuilder.addQueryParameter("template_id", "E_136625161409");
urlBuilder.addQueryParameter("to", emailMessage.getTomail());
ObjectMapper objectMapper = new ObjectMapper();
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
index ea4d3b6..973edc8 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/UserServiceImpl.java
@@ -1293,6 +1293,7 @@
user = new User();
user.setUserName(userName);
}
+
if (user == null) {
throw new YamiShopBindException("注册失败!");
}
--
Gitblit v1.9.3