From ef50e6cf4b698d648bd5b440b42adb22dddbeb68 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 17 Feb 2023 14:56:52 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=9B=9E=E6=BB=9A=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=80=9A=E7=94=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SendMessageServiceImpl.java | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index 241cdf00..1e55f0c6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -110,29 +110,28 @@ public class SendMessageServiceImpl implements SendMessageService { throw new JeroBootException("邮件发送，邮箱地址不能为空！"); } try { - throw new JeroBootException("邮件发送失败，发件人的邮箱或邮箱授权码错误！"); - //String email = loginUser.getEmail(); - //String emailPassword = loginUser.getEmailPassword(); - ////如果发件人没有邮箱或邮箱授权码则使用admin账户的邮箱授权码 - //if (StringUtils.isBlank(email) || StringUtils.isBlank(emailPassword)) { - // loginUser = sysBaseAPI.getUserByName(env.getProperty("message.systemEmailUser")); - // email = loginUser.getEmail(); - // emailPassword = loginUser.getEmailPassword(); - //} - //email = PasswordUtil.decrypt(email); - //emailPassword = PasswordUtil.decrypt(emailPassword); - //EmailSendMsgHandle emailHandle = new EmailSendMsgHandle(email,emailPassword); - //// 发送带附件邮箱 - //if(!CollectionUtils.isEmpty(sendMessageDTO.getListFile())){ - // emailHandle.SendMsgAndFile(sendMessageDTO.getEmail(), title, content,sendMessageDTO.getListFile()); - //}else{ - // //如果有通知内容就替换 - // if (StringUtils.isNotBlank(sendMessageDTO.getMeetingNotice())){ - // emailHandle.SendMsg(sendMessageDTO.getEmail(), title, sendMessageDTO.getMeetingNotice()); - // }else { - // emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content); - // } - //} + String email = loginUser.getEmail(); + String emailPassword = loginUser.getEmailPassword(); + //如果发件人没有邮箱或邮箱授权码则使用admin账户的邮箱授权码 + if (StringUtils.isBlank(email) || StringUtils.isBlank(emailPassword)) { + loginUser = sysBaseAPI.getUserByName(env.getProperty("message.systemEmailUser")); + email = loginUser.getEmail(); + emailPassword = loginUser.getEmailPassword(); + } + email = PasswordUtil.decrypt(email); + emailPassword = PasswordUtil.decrypt(emailPassword); + EmailSendMsgHandle emailHandle = new EmailSendMsgHandle(email,emailPassword); + // 发送带附件邮箱 + if(!CollectionUtils.isEmpty(sendMessageDTO.getListFile())){ + emailHandle.SendMsgAndFile(sendMessageDTO.getEmail(), title, content,sendMessageDTO.getListFile()); + }else{ + //如果有通知内容就替换 + if (StringUtils.isNotBlank(sendMessageDTO.getMeetingNotice())){ + emailHandle.SendMsg(sendMessageDTO.getEmail(), title, sendMessageDTO.getMeetingNotice()); + }else { + emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content); + } + } }catch (Exception e){ log.error("发送邮件异常",e); if (e.getMessage() !=null){