zelong.shao

task|邮件调整

......@@ -58,16 +58,15 @@ public class DuplicateEmailUtil {
mailConfigDto.setSubject(duplicateEmailTemplate.getTitle(email.getBizCode()));
String emailBody = this.createEmailBody(email.getBizCode());
mailConfigDto.setContent(emailBody);
mailConfigDto.setSenderAccount(propertiesConfig.getEmailAccount());
mailConfigDto.setMailAccountFlag(propertiesConfig.getMailAccountFlag());
mailConfigDto.setFrom(propertiesConfig.getEmailAccount());
if (propertiesConfig.getEnv().equalsIgnoreCase("dev")
|| propertiesConfig.getEnv().equalsIgnoreCase("test")
) {
//发件人
mailConfigDto.setFrom(propertiesConfig.getEmailAccount());
//发件人密码
mailConfigDto.setPassword(propertiesConfig.getEmailPassword());
mailConfigDto.setMailAccountFlag(propertiesConfig.getMailAccountFlag());
mailConfigDto.setSenderAccount(propertiesConfig.getEmailAccount());
mailConfigDto.setSenderPassword(propertiesConfig.getEmailPassword());
}
return mailConfigDto;
......
......@@ -29,7 +29,7 @@ export:
port: 3128
mailAccountFlag: false
sendEmail:
account:
account: noreply@fedex.com
password:
rpc:
url:
......