Pārlūkot izejas kodu

feat:除了方正外,其他家大赛的邮箱启用ssl连接

mozuwen 4 mēneši atpakaļ
vecāks
revīzija
fdd301bdf8

+ 7 - 2
service-base/src/main/java/com/simuwang/base/common/util/EmailUtil.java

@@ -352,8 +352,13 @@ public class EmailUtil {
             properties.put("mail.smtp.host", mailboxInfoDTO.getHost());
             properties.put("mail.smtp.auth", true);
             properties.setProperty("mail.smtp.port", mailboxInfoDTO.getPort());
-            properties.put("mail.smtp.ssl.enable", true);
-            properties.put("mail.smtp.ssl.required", true);
+            if (mailboxInfoDTO.getCompetitionId() == null || mailboxInfoDTO.getCompetitionId() != 48) {
+                properties.put("mail.smtp.ssl.enable", false);
+                properties.put("mail.smtp.ssl.required", false);
+            } else {
+                properties.put("mail.smtp.ssl.enable", true);
+                properties.put("mail.smtp.ssl.required", true);
+            }
             // 根据邮件的会话属性构造一个发送邮件的Session,
             JakartaUserPassAuthenticator authenticator = new JakartaUserPassAuthenticator(mailboxInfoDTO.getAccount(), mailboxInfoDTO.getPassword());
             Session session = Session.getInstance(properties, authenticator);

+ 1 - 0
service-base/src/main/java/com/simuwang/base/pojo/dto/MailboxInfoDTO.java

@@ -35,4 +35,5 @@ public class MailboxInfoDTO {
      */
     private String protocol;
 
+    private Integer competitionId;
 }

+ 1 - 0
service-manage/src/main/java/com/simuwang/manage/task/CompetitionTask.java

@@ -160,6 +160,7 @@ public class CompetitionTask {
                 log.info("未配置发件箱和收件箱,无法发送基金净值采集结果明细邮件");
                 return;
             }
+            mailboxInfoDTO.setCompetitionId(competitionId);
             try {
                 EmailUtil.senEmail(mailboxInfoDTO, receivingMailbox, new File(filePath), "基金净值采集结果明细", "", period + "_基金净值采集结果明细");
                 log.info("基金净值采集结果明细表 -> 邮件已发送");