From 5ab531e0ecafe731b30da0502d315e238897db2e Mon Sep 17 00:00:00 2001
From: Henry <open@twhmr.cn>
Date: Tue, 2 Mar 2021 13:44:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E8=87=AA=E5=B8=A6Email=E7=B1=BB=E5=8F=91=E9=80=81=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E6=97=B6=EF=BC=8C=E6=94=B6=E4=BB=B6=E4=BA=BA=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=90=8D=E6=98=AF=E6=95=B0=E7=BB=84=E7=B4=A2=E5=BC=95?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/library/Email.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/common/library/Email.php b/application/common/library/Email.php
index 8d186fc3..458ae09d 100644
--- a/application/common/library/Email.php
+++ b/application/common/library/Email.php
@@ -176,7 +176,12 @@ class Email
      */
     protected function buildAddress($emails)
     {
-        $emails = is_array($emails) ? $emails : array_flip(explode(',', str_replace(";", ",", $emails)));
+        if (!is_array($emails)) {
+            $emails = array_flip(explode(',', str_replace(";", ",", $emails)));
+            foreach ($emails as $key => $value) {
+                $emails[$key] = strstr($key, '@', true);
+            }
+        }
         return $emails;
     }
 
-- 
Gitee


From 5d7181fe1d13116f302157405b05528536f2c54f Mon Sep 17 00:00:00 2001
From: Henry <open@twhmr.cn>
Date: Tue, 2 Mar 2021 13:45:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=BB=E9=99=A4to=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E4=BB=8E=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84$name=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/library/Email.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/common/library/Email.php b/application/common/library/Email.php
index 458ae09d..5b3a3327 100644
--- a/application/common/library/Email.php
+++ b/application/common/library/Email.php
@@ -96,10 +96,9 @@ class Email
     /**
      * 设置收件人
      * @param mixed  $email 收件人,多个收件人以,进行分隔
-     * @param string $name  收件人名称
      * @return $this
      */
-    public function to($email, $name = '')
+    public function to($email)
     {
         $emailArr = $this->buildAddress($email);
         foreach ($emailArr as $address => $name) {
-- 
Gitee