Browse Source

fix: 邮箱配置调整

chenjianhua 6 months ago
parent
commit
2d3e26771f

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

@@ -298,12 +298,12 @@ public class EmailUtil {
         return props;
         return props;
     }
     }
 
 
-    public static void senEmail(MailboxInfoDTO mailboxInfoDTO, String emails, File file,String htmlText) throws Exception {
+    public static void senEmail(MailboxInfoDTO mailboxInfoDTO, String emails, File file,String htmlText,String host) throws Exception {
         logger.info("send email begin .........");
         logger.info("send email begin .........");
         // 根据Session 构建邮件信息
         // 根据Session 构建邮件信息
         MimeMessage message = new MimeMessage(getSession(mailboxInfoDTO));
         MimeMessage message = new MimeMessage(getSession(mailboxInfoDTO));
         // 创建邮件发送者地址
         // 创建邮件发送者地址
-        Address from = new InternetAddress(mailboxInfoDTO.getAccount());
+        Address from = new InternetAddress(mailboxInfoDTO.getAccount()+host);
         String[] emailArr = emails.split(";");
         String[] emailArr = emails.split(";");
         Address[] toArr = new Address[emailArr.length];
         Address[] toArr = new Address[emailArr.length];
         for (int idx = 0; idx < emailArr.length; idx++) {
         for (int idx = 0; idx < emailArr.length; idx++) {

+ 1 - 1
service-manage/src/main/java/com/simuwang/manage/service/impl/CompanyEmailConfigServiceImpl.java

@@ -166,7 +166,7 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
                 MailboxInfoDTO dto = getFromEmailInfo();
                 MailboxInfoDTO dto = getFromEmailInfo();
                 // "<p>您好,附件为产品的数据未发送到最新,麻烦尽快发送缺失的数据。若是产品清算或者有其他原因不再发送数据,还请将产品的清算日期或者不再发送数据的原因发送给我们,非常感谢~\n</p>";
                 // "<p>您好,附件为产品的数据未发送到最新,麻烦尽快发送缺失的数据。若是产品清算或者有其他原因不再发送数据,还请将产品的清算日期或者不再发送数据的原因发送给我们,非常感谢~\n</p>";
                 String htmlText = sysConfigMapper.selectConfigByKey("deletion_email_body");
                 String htmlText = sysConfigMapper.selectConfigByKey("deletion_email_body");
-                EmailUtil.senEmail(dto,emails,file,htmlText);
+                EmailUtil.senEmail(dto,emails,file,htmlText,sysConfigMapper.selectConfigByKey("email.host")==null?"":sysConfigMapper.selectConfigByKey("email.host"));
                 //发送成功之后修改数据为已发送
                 //发送成功之后修改数据为已发送
                 deletionInfoMapper.updateSendStatusByFundId(fundIdList);
                 deletionInfoMapper.updateSendStatusByFundId(fundIdList);
                 //写入发送历史
                 //写入发送历史