From 7fdacaeb7c683ad9dcf6ed17d3a6adc7a1c7b17c Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Mon, 11 Dec 2023 14:35:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?TASK:=20=E8=AF=95=E7=94=A8=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/common/utils/SendEmailUtil.java | 3 +-- src/main/java/com/ai/da/model/enums/AutoApproved.java | 2 +- .../java/com/ai/da/service/impl/AccountServiceImpl.java | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java index f5dc406a..35011007 100644 --- a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java +++ b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java @@ -128,7 +128,7 @@ public class SendEmailUtil { private final static Long YOUR_TRIAL_TEMPLATE_ID = 117214L; private final static Long APPROVAL_TEMPLATE_ID = 117215L; private final static Long NOTIFICATION_TEMPLATE_ID = 117216L; - public static Boolean sendCustomEmail(String receiverAddress, String senderAddress, TrialOrder trialOrder, int emailType) { + public static void sendCustomEmail(String receiverAddress, String senderAddress, TrialOrder trialOrder, int emailType) { try { // 实例化一个认证对象 Credential cred = new Credential(SECRET_ID, SECRET_KEy); @@ -173,7 +173,6 @@ public class SendEmailUtil { // 发送邮件 SendEmailResponse resp = client.SendEmail(req); log.info("短信发送结果res###{}", SendEmailResponse.toJsonString(resp)); - return Boolean.TRUE; } catch (TencentCloudSDKException e) { log.info("邮件发送失败###{}", e.toString()); throw new BusinessException("failed.to.send.mail"); diff --git a/src/main/java/com/ai/da/model/enums/AutoApproved.java b/src/main/java/com/ai/da/model/enums/AutoApproved.java index c1910745..823ee725 100644 --- a/src/main/java/com/ai/da/model/enums/AutoApproved.java +++ b/src/main/java/com/ai/da/model/enums/AutoApproved.java @@ -2,7 +2,7 @@ package com.ai.da.model.enums; public class AutoApproved { // 静态变量，整个应用程序共享 - private static boolean status = false; + private static boolean status = true; // 获取当前状态 public static boolean getStatus() { diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index b28b5a9d..9020e098 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -477,6 +477,7 @@ public class AccountServiceImpl extends ServiceImpl impl trialOrder.setCreateTime(LocalDateTime.now()); trialOrder.setStatus(0); trialOrderMapper.insert(trialOrder); + SendEmailUtil.sendCustomEmail("1023316923@qq.com", null, trialOrder,1); // 判断当前的试用订单是否自动批准 if (AutoApproved.getStatus()) { // 改变试用订单状态，新增试用用户 @@ -487,7 +488,7 @@ public class AccountServiceImpl extends ServiceImpl impl account.setUserName(trialOrder.getUserName()); account.setUserPassword("Third-000000"); account.setUserEmail(trialOrder.getEmail()); - account.setLanguage(Language.ENGLISH.getValue()); + account.setLanguage(Language.ENGLISH.name()); account.setValidStartTime(System.currentTimeMillis()); account.setValidEndTime(Instant.now().plus(3, ChronoUnit.DAYS).toEpochMilli()); account.setCreateDate(new Date()); @@ -495,9 +496,8 @@ public class AccountServiceImpl extends ServiceImpl impl account.setIsBeginner(1); accountMapper.insert(account); // 发送邮件提醒用户试用用户已创建 -// if (SendEmailUtil.sendCustomEmail("1023316923@qq.com", null, trialOrder,1)) { -// return Boolean.TRUE; -// } + SendEmailUtil.sendCustomEmail("1023316923@qq.com", null, trialOrder,2); + SendEmailUtil.sendCustomEmail(account.getUserEmail(), null, trialOrder, 3); } return Boolean.TRUE; } From f80e5ce455a93584e67cd83a0b950822e6a20af3 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Mon, 11 Dec 2023 15:11:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?TASK:=20=E8=AF=95=E7=94=A8=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/common/utils/SendEmailUtil.java | 1 + src/main/java/com/ai/da/mapper/entity/TrialOrder.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java index 35011007..b157fb48 100644 --- a/src/main/java/com/ai/da/common/utils/SendEmailUtil.java +++ b/src/main/java/com/ai/da/common/utils/SendEmailUtil.java @@ -207,6 +207,7 @@ public class SendEmailUtil { private static String buildNotificationData(TrialOrder trialOrder) { JSONObject jsonObject = new JSONObject(); // 设置试用订单通过通知相关数据 + jsonObject.put("title", trialOrder.getTitle()); jsonObject.put("surname", trialOrder.getSurname()); jsonObject.put("givenName", trialOrder.getGivenName()); jsonObject.put("userName", trialOrder.getUserName()); diff --git a/src/main/java/com/ai/da/mapper/entity/TrialOrder.java b/src/main/java/com/ai/da/mapper/entity/TrialOrder.java index 598a6089..904d1a75 100644 --- a/src/main/java/com/ai/da/mapper/entity/TrialOrder.java +++ b/src/main/java/com/ai/da/mapper/entity/TrialOrder.java @@ -25,6 +25,9 @@ public class TrialOrder implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Long id; + @ApiModelProperty("surname") + private String title; + @ApiModelProperty("surname") private String surname;