Showing
2 changed files
with
4 additions
and
5 deletions
| ... | @@ -58,16 +58,15 @@ public class DuplicateEmailUtil { | ... | @@ -58,16 +58,15 @@ public class DuplicateEmailUtil { |
| 58 | mailConfigDto.setSubject(duplicateEmailTemplate.getTitle(email.getBizCode())); | 58 | mailConfigDto.setSubject(duplicateEmailTemplate.getTitle(email.getBizCode())); |
| 59 | String emailBody = this.createEmailBody(email.getBizCode()); | 59 | String emailBody = this.createEmailBody(email.getBizCode()); |
| 60 | mailConfigDto.setContent(emailBody); | 60 | mailConfigDto.setContent(emailBody); |
| 61 | + mailConfigDto.setSenderAccount(propertiesConfig.getEmailAccount()); | ||
| 62 | + mailConfigDto.setMailAccountFlag(propertiesConfig.getMailAccountFlag()); | ||
| 63 | + mailConfigDto.setFrom(propertiesConfig.getEmailAccount()); | ||
| 61 | 64 | ||
| 62 | if (propertiesConfig.getEnv().equalsIgnoreCase("dev") | 65 | if (propertiesConfig.getEnv().equalsIgnoreCase("dev") |
| 63 | || propertiesConfig.getEnv().equalsIgnoreCase("test") | 66 | || propertiesConfig.getEnv().equalsIgnoreCase("test") |
| 64 | ) { | 67 | ) { |
| 65 | - //发件人 | ||
| 66 | - mailConfigDto.setFrom(propertiesConfig.getEmailAccount()); | ||
| 67 | //发件人密码 | 68 | //发件人密码 |
| 68 | mailConfigDto.setPassword(propertiesConfig.getEmailPassword()); | 69 | mailConfigDto.setPassword(propertiesConfig.getEmailPassword()); |
| 69 | - mailConfigDto.setMailAccountFlag(propertiesConfig.getMailAccountFlag()); | ||
| 70 | - mailConfigDto.setSenderAccount(propertiesConfig.getEmailAccount()); | ||
| 71 | mailConfigDto.setSenderPassword(propertiesConfig.getEmailPassword()); | 70 | mailConfigDto.setSenderPassword(propertiesConfig.getEmailPassword()); |
| 72 | } | 71 | } |
| 73 | return mailConfigDto; | 72 | return mailConfigDto; | ... | ... |
-
Please register or login to post a comment