Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
zelong.shao
1cdd98e2 1 parent 4821cccc

task|邮件调整

Inline Side-by-side
Showing 2 changed files with 14 additions and 11 deletions
...@@ -197,16 +197,16 @@ public class ConFileEmailUtil { ...@@ -197,16 +197,16 @@ public class ConFileEmailUtil {
197 srcFiles.add(new MailAttachmentBo(file, portFileDto.getFileName())); 197 srcFiles.add(new MailAttachmentBo(file, portFileDto.getFileName()));
198 mailConfigDto.setFileList(srcFiles); 198 mailConfigDto.setFileList(srcFiles);
199 } 199 }
200 + //发件人
201 + mailConfigDto.setFrom(propertiesConfig.getEmailAccount());
202 + mailConfigDto.setMailAccountFlag(propertiesConfig.getMailAccountFlag());
203 + mailConfigDto.setSenderAccount(propertiesConfig.getEmailAccount());
200 204
201 if (propertiesConfig.getEnv().equalsIgnoreCase("dev") 205 if (propertiesConfig.getEnv().equalsIgnoreCase("dev")
202 || propertiesConfig.getEnv().equalsIgnoreCase("test") 206 || propertiesConfig.getEnv().equalsIgnoreCase("test")
203 ) { 207 ) {
204 - //发件人
205 - mailConfigDto.setFrom(propertiesConfig.getEmailAccount());
206 //发件人密码 208 //发件人密码
207 mailConfigDto.setPassword(propertiesConfig.getEmailPassword()); 209 mailConfigDto.setPassword(propertiesConfig.getEmailPassword());
208 - mailConfigDto.setMailAccountFlag(propertiesConfig.getMailAccountFlag());
209 - mailConfigDto.setSenderAccount(propertiesConfig.getEmailAccount());
210 mailConfigDto.setSenderPassword(propertiesConfig.getEmailPassword()); 210 mailConfigDto.setSenderPassword(propertiesConfig.getEmailPassword());
211 } 211 }
212 return mailConfigDto; 212 return mailConfigDto;
......
...@@ -228,20 +228,23 @@ public class SendFailedEmailUtil { ...@@ -228,20 +228,23 @@ public class SendFailedEmailUtil {
228 //设置邮件标题 228 //设置邮件标题
229 mailConfigDto.setSubject(sendFailedEmailTemplate.getTitle()); 229 mailConfigDto.setSubject(sendFailedEmailTemplate.getTitle());
230 mailConfigDto.setContent(body); 230 mailConfigDto.setContent(body);
231 - 231 + //发件人
232 + mailConfigDto.setFrom(propertiesConfig.getEmailAccount());
233 + mailConfigDto.setSenderAccount(propertiesConfig.getEmailAccount());
234 + mailConfigDto.setMailAccountFlag(propertiesConfig.getMailAccountFlag());
235 + //ce接收人
236 + mailConfigDto.setTo("zhenwei.yang@fedex.com,chun.xu@fedex.com");
237 + mailConfigDto.setCcAccount("ice-iclear-support@erry.com");
238 + mailConfigDto.setReceiveAccount("zhenwei.yang@fedex.com,chun.xu@fedex.com");
232 if (propertiesConfig.getEnv().equalsIgnoreCase("dev") 239 if (propertiesConfig.getEnv().equalsIgnoreCase("dev")
233 || propertiesConfig.getEnv().equalsIgnoreCase("test") 240 || propertiesConfig.getEnv().equalsIgnoreCase("test")
234 ) { 241 ) {
235 //ce接收人 242 //ce接收人
236 - mailConfigDto.setTo("zelong.shao@erry.com,jialiang.song@erry.com"); 243 + mailConfigDto.setTo("jialiang.song@erry.com");
237 mailConfigDto.setCcAccount(""); 244 mailConfigDto.setCcAccount("");
238 - mailConfigDto.setReceiveAccount("zelong.shao@erry.com,jialiang.song@erry.com"); 245 + mailConfigDto.setReceiveAccount("jialiang.song@erry.com");
239 - //发件人
240 - mailConfigDto.setFrom(propertiesConfig.getEmailAccount());
241 //发件人密码 246 //发件人密码
242 mailConfigDto.setPassword(propertiesConfig.getEmailPassword()); 247 mailConfigDto.setPassword(propertiesConfig.getEmailPassword());
243 - mailConfigDto.setMailAccountFlag(propertiesConfig.getMailAccountFlag());
244 - mailConfigDto.setSenderAccount(propertiesConfig.getEmailAccount());
245 mailConfigDto.setSenderPassword(propertiesConfig.getEmailPassword()); 248 mailConfigDto.setSenderPassword(propertiesConfig.getEmailPassword());
246 } 249 }
247 return mailConfigDto; 250 return mailConfigDto;
......