From 9396c218329da39926270ba9e79bd9a70d962e3d Mon Sep 17 00:00:00 2001
From: "udf_admin@163.com" <udf_admin@163.com>
Date: Tue, 23 Jan 2018 20:29:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E9=80=81=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/itkk/udf/mail/service/MailService.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/udf-starter-mail/src/main/java/org/itkk/udf/mail/service/MailService.java b/udf-starter-mail/src/main/java/org/itkk/udf/mail/service/MailService.java
index f8c9963..f19f59a 100644
--- a/udf-starter-mail/src/main/java/org/itkk/udf/mail/service/MailService.java
+++ b/udf-starter-mail/src/main/java/org/itkk/udf/mail/service/MailService.java
@@ -28,6 +28,8 @@ import org.springframework.stereotype.Service;
 
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
+import java.net.IDN;
+import java.util.Arrays;
 import java.util.Date;
 
 /**
@@ -70,18 +72,18 @@ public class MailService {
         //构造消息
         MimeMessageHelper helper = new MimeMessageHelper(message, multipart);
         //必要字段
-        helper.setFrom(mailProperties.getFrom());
+        helper.setFrom(IDN.toASCII(mailProperties.getFrom()));
         helper.setSentDate(new Date());
-        helper.setTo(mailInfo.getTo());
+        helper.setTo(Arrays.stream(mailInfo.getTo()).map(to -> IDN.toASCII(to)).toArray(String[]::new));
         helper.setSubject(mailInfo.getSubject());
         helper.setText(mailInfo.getText(), mailInfo.getIsHtmlText());
         //秘密抄送
         if (ArrayUtils.isNotEmpty(mailInfo.getBcc())) {
-            helper.setBcc(mailInfo.getBcc());
+            helper.setBcc(Arrays.stream(mailInfo.getBcc()).map(to -> IDN.toASCII(to)).toArray(String[]::new));
         }
         //抄送
         if (ArrayUtils.isNotEmpty(mailInfo.getCc())) {
-            helper.setCc(mailInfo.getCc());
+            helper.setCc(Arrays.stream(mailInfo.getCc()).map(to -> IDN.toASCII(to)).toArray(String[]::new));
         }
         //优先级
         if (mailInfo.getPriority() != null) {