From ac3b7294ee317980f2d1e5f1ffa14cc278e42932 Mon Sep 17 00:00:00 2001
From: Henry <open@twhmr.cn>
Date: Tue, 2 Mar 2021 13:16:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8F=91=E9=80=81=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E6=97=B6=EF=BC=8C=E9=82=AE=E4=BB=B6=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=95=86=E8=BF=94=E5=9B=9E=E7=9A=84=E9=94=99=E8=AF=AF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=BC=96=E7=A0=81=E5=AF=BC=E8=87=B4=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/common/library/Email.php b/application/common/library/Email.php
index 8d186fc35..dde93a8b2 100644
--- a/application/common/library/Email.php
+++ b/application/common/library/Email.php
@@ -214,6 +214,7 @@ class Email
                 preg_match_all("/Expected: (\d+)\, Got: (\d+)( \| (.*))?\$/i", $e->getMessage(), $matches);
                 $code = isset($matches[2][3]) ? $matches[2][3] : 0;
                 $message = isset($matches[2][0]) ? $matches[4][0] : $e->getMessage();
+                $message = mb_convert_encoding($message, 'UTF-8', 'UTF-8,GBK,GB2312,BIG5');
                 $this->setError($message);
             } catch (\Exception $e) {
                 $this->setError($e->getMessage());
-- 
Gitee