task|邮件调整

@@ -197,16 +197,16 @@ public class ConFileEmailUtil {
             srcFiles.add(new MailAttachmentBo(file, portFileDto.getFileName()));
             mailConfigDto.setFileList(srcFiles);
         }
+        //发件人
+        mailConfigDto.setFrom(propertiesConfig.getEmailAccount());
+        mailConfigDto.setMailAccountFlag(propertiesConfig.getMailAccountFlag());
+        mailConfigDto.setSenderAccount(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;

@@ -228,20 +228,23 @@ public class SendFailedEmailUtil {
         //设置邮件标题
         mailConfigDto.setSubject(sendFailedEmailTemplate.getTitle());
         mailConfigDto.setContent(body);
-
+        //发件人
+        mailConfigDto.setFrom(propertiesConfig.getEmailAccount());
+        mailConfigDto.setSenderAccount(propertiesConfig.getEmailAccount());
+        mailConfigDto.setMailAccountFlag(propertiesConfig.getMailAccountFlag());
+        //ce接收人
+        mailConfigDto.setTo("zhenwei.yang@fedex.com,chun.xu@fedex.com");
+        mailConfigDto.setCcAccount("ice-iclear-support@erry.com");
+        mailConfigDto.setReceiveAccount("zhenwei.yang@fedex.com,chun.xu@fedex.com");
         if (propertiesConfig.getEnv().equalsIgnoreCase("dev")
                 || propertiesConfig.getEnv().equalsIgnoreCase("test")
         ) {
             //ce接收人
-            mailConfigDto.setTo("zelong.shao@erry.com,jialiang.song@erry.com");
+            mailConfigDto.setTo("jialiang.song@erry.com");
             mailConfigDto.setCcAccount("");
-            mailConfigDto.setReceiveAccount("zelong.shao@erry.com,jialiang.song@erry.com");
-            //发件人
-            mailConfigDto.setFrom(propertiesConfig.getEmailAccount());
+            mailConfigDto.setReceiveAccount("jialiang.song@erry.com");
             //发件人密码
             mailConfigDto.setPassword(propertiesConfig.getEmailPassword());
-            mailConfigDto.setMailAccountFlag(propertiesConfig.getMailAccountFlag());
-            mailConfigDto.setSenderAccount(propertiesConfig.getEmailAccount());
             mailConfigDto.setSenderPassword(propertiesConfig.getEmailPassword());
         }
         return mailConfigDto;