From 5c92db2f669f2bbd24a74d79031dde5e13787fec Mon Sep 17 00:00:00 2001
From: "PC-202103311945\\Administrator" <464401240@qq.com>
Date: Mon, 9 May 2022 22:45:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D$this->=5Fuser=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E7=9A=84=E6=97=B6=E5=80=99=E4=BC=9A=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=EF=BC=9A=E8=87=B4=E5=91=BD=E9=94=99=E8=AF=AF:=20Call=20to=20a?=
 =?UTF-8?q?=20member=20function=20toArray()=20on=20null?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/application/common/library/Auth.php b/application/common/library/Auth.php
index 38a19a061..49ec1fa1a 100644
--- a/application/common/library/Auth.php
+++ b/application/common/library/Auth.php
@@ -385,7 +385,11 @@ class Auth
      */
     public function getUserinfo()
     {
-        $data = $this->_user->toArray();
+	    if (!empty($this->_user)) {
+		    $data = $this->_user->toArray();
+	    } else {
+		    return [];
+	    }
         $allowFields = $this->getAllowFields();
         $userinfo = array_intersect_key($data, array_flip($allowFields));
         $userinfo = array_merge($userinfo, Token::get($this->_token));
-- 
Gitee


From f56df89f9d359526c74209d7e55663f65330d315 Mon Sep 17 00:00:00 2001
From: sixXing <464401240@qq.com>
Date: Tue, 10 May 2022 05:27:12 +0000
Subject: [PATCH 2/2] update application/common/library/Auth.php.

---
 application/common/library/Auth.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/application/common/library/Auth.php b/application/common/library/Auth.php
index 49ec1fa1a..b24f1667b 100644
--- a/application/common/library/Auth.php
+++ b/application/common/library/Auth.php
@@ -385,11 +385,10 @@ class Auth
      */
     public function getUserinfo()
     {
-	    if (!empty($this->_user)) {
-		    $data = $this->_user->toArray();
-	    } else {
+	    if (empty($this->_user)) {
 		    return [];
 	    }
+        $data = $this->_user->toArray();
         $allowFields = $this->getAllowFields();
         $userinfo = array_intersect_key($data, array_flip($allowFields));
         $userinfo = array_merge($userinfo, Token::get($this->_token));
-- 
Gitee