提交 620577dc 作者: 洪东保

剩下纪要更改

父级 b126f875
...@@ -57,8 +57,6 @@ public class EmailSender { ...@@ -57,8 +57,6 @@ public class EmailSender {
private Boolean pushSwitch; private Boolean pushSwitch;
@Value("${email.environment}") @Value("${email.environment}")
private String environment; private String environment;
@Value("${email.test-receiver}")
private String testReceiver;
@Value("${email.microsoft.clientId}") @Value("${email.microsoft.clientId}")
private String clientId; private String clientId;
@Value("${email.microsoft.clientSecret}") @Value("${email.microsoft.clientSecret}")
...@@ -89,7 +87,7 @@ public class EmailSender { ...@@ -89,7 +87,7 @@ public class EmailSender {
} }
AtomicInteger retryCount = new AtomicInteger(0); AtomicInteger retryCount = new AtomicInteger(0);
Boolean isSent = false; Boolean isSent = false;
String toEmail = "test".equals(environment) ? testReceiver : emailPushBuilder.getToEmail(); String toEmail = emailPushBuilder.getToEmail();
String subject = emailPushBuilder.getSubject(); String subject = emailPushBuilder.getSubject();
String meetingRecordId = emailPushBuilder.getMeetingRecordId(); String meetingRecordId = emailPushBuilder.getMeetingRecordId();
String meetingId = emailPushBuilder.getMeetingId(); String meetingId = emailPushBuilder.getMeetingId();
...@@ -109,7 +107,7 @@ public class EmailSender { ...@@ -109,7 +107,7 @@ public class EmailSender {
if (StringUtils.isEmpty(toEmail)) { if (StringUtils.isEmpty(toEmail)) {
log.error("收件邮箱为空,推送失败"); log.error("收件邮箱为空,推送失败");
processLogService.log(meetingId,subMeetingId,"收件邮箱为空,推送失败。environment->"+environment+",testReceiver->"+testReceiver+",realEmail->"+emailPushBuilder.getToEmail()); processLogService.log(meetingId,subMeetingId,"收件邮箱为空,推送失败。environment->"+environment+",realEmail->"+emailPushBuilder.getToEmail());
throw new RuntimeException("收件邮箱为空,推送失败"); throw new RuntimeException("收件邮箱为空,推送失败");
} }
log.info("准备开始邮件推送..."); log.info("准备开始邮件推送...");
......
...@@ -109,8 +109,7 @@ email: ...@@ -109,8 +109,7 @@ email:
# sender-pwd: ${EMAIL_SENDER_PWD} # sender-pwd: ${EMAIL_SENDER_PWD}
smtp-host: ${EMAIL_SMTP_HOST} smtp-host: ${EMAIL_SMTP_HOST}
push-switch: true #邮件推送总开关,高优先级 push-switch: true #邮件推送总开关,高优先级
environment: test #test推给本公司人员,prod推给用户 environment: prod #test推给本公司人员,prod推给用户
test-receiver: hongdongbao@chatbot.cn #用于测试的收方邮箱
microsoft: microsoft:
clientId: 'rNvsNtIQTUAD7aYik9/1LDpfO+XbM4nuPkpf131H8vHfJg7Uj7HxJJcHFbtmO4uWagelhTsOTSx2PDqjeuqiYw==' clientId: 'rNvsNtIQTUAD7aYik9/1LDpfO+XbM4nuPkpf131H8vHfJg7Uj7HxJJcHFbtmO4uWagelhTsOTSx2PDqjeuqiYw=='
clientSecret: 'DERmPlHbjiN4rjIFHvpe+OypNRCuSwLe/MBy56EFtI7FkzHfOnVjMdCTRG/CmybBBfha6geFbijC6ymeMVSSeg==' clientSecret: 'DERmPlHbjiN4rjIFHvpe+OypNRCuSwLe/MBy56EFtI7FkzHfOnVjMdCTRG/CmybBBfha6geFbijC6ymeMVSSeg=='
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论