From 6f9eb4c7447321068442348720360bf17b21b04e Mon Sep 17 00:00:00 2001
From: Henry <open@twhmr.cn>
Date: Thu, 15 Apr 2021 14:13:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=81=E9=82=AE=E4=BB=B6=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=9C=8D=E5=8A=A1=E5=95=86=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=B3=BB=E7=BB=9F500=E9=94=99=E8=AF=AF?=
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 7636d761d..4ddb0b651 100644
--- a/application/common/library/Email.php
+++ b/application/common/library/Email.php
@@ -219,6 +219,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', 'GBK,GB2312,BIG5');
                 $this->setError($message);
             } catch (\Exception $e) {
                 $this->setError($e->getMessage());
-- 
Gitee