From 2e61830665cefa0efb1b2e5d873768aaeac0a9b1 Mon Sep 17 00:00:00 2001
From: koogua <xiaochong0302@gmail.com>
Date: Sat, 5 Dec 2020 21:31:25 +0800
Subject: [PATCH] =?UTF-8?q?!28=20=E5=BC=80=E6=94=BE=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=B5=8B=E8=AF=954=20*=20=E5=88=9D=E6=AD=A5?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=BC=80=E6=94=BE=E7=99=BB=E5=BD=95=EF=BC=8C?=
 =?UTF-8?q?=E5=BE=85=E7=BA=BF=E4=B8=8A=E6=B5=8B=E8=AF=954=20*=20=E5=88=9D?=
 =?UTF-8?q?=E6=AD=A5=E5=AE=8C=E6=88=90=E5=BC=80=E6=94=BE=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=EF=BC=8C=E5=BE=85=E7=BA=BF=E4=B8=8A=E6=B5=8B=E8=AF=953=20*=20?=
 =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90=E5=BC=80=E6=94=BE=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E5=BE=85=E7=BA=BF=E4=B8=8A=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Library/OAuth/QQ.php     | 3 +--
 app/Library/OAuth/WeiBo.php  | 1 -
 app/Library/OAuth/WeiXin.php | 9 ++++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/Library/OAuth/QQ.php b/app/Library/OAuth/QQ.php
index 69d488df..59a8f10d 100644
--- a/app/Library/OAuth/QQ.php
+++ b/app/Library/OAuth/QQ.php
@@ -105,8 +105,7 @@ class QQ extends OAuth
 
         $userInfo['id'] = $this->openId;
         $userInfo['name'] = $data['nickname'];
-        $userInfo['nick'] = $data['nickname'];
-        $userInfo['avatar'] = $data['figureurl_2'];
+        $userInfo['avatar'] = $data['figureurl'];
 
         return $userInfo;
     }
diff --git a/app/Library/OAuth/WeiBo.php b/app/Library/OAuth/WeiBo.php
index 88f69948..5e47cc0b 100644
--- a/app/Library/OAuth/WeiBo.php
+++ b/app/Library/OAuth/WeiBo.php
@@ -80,7 +80,6 @@ class WeiBo extends OAuth
 
         $userInfo['id'] = $this->openId;
         $userInfo['name'] = $data['name'];
-        $userInfo['nick'] = $data['screen_name'];
         $userInfo['avatar'] = $data['avatar_large'];
 
         return $userInfo;
diff --git a/app/Library/OAuth/WeiXin.php b/app/Library/OAuth/WeiXin.php
index 114a42ba..41cf3f63 100644
--- a/app/Library/OAuth/WeiXin.php
+++ b/app/Library/OAuth/WeiXin.php
@@ -18,7 +18,7 @@ class WeiXin extends OAuth
             'redirect_uri' => $this->redirectUri,
             'state' => $this->getState(),
             'response_type' => 'code',
-            'scope' => 'snsapi_login',
+            'scope' => 'snsapi_userinfo',
         ];
         
         return self::AUTHORIZE_URL . '?' . http_build_query($params);
@@ -78,10 +78,9 @@ class WeiXin extends OAuth
             throw new \Exception("Fetch User Info Failed:{$response}");
         }
 
-        $userInfo['id'] = $this->openId;
-        $userInfo['name'] = $data['name'];
-        $userInfo['nick'] = $data['screen_name'];
-        $userInfo['avatar'] = $data['avatar_large'];
+        $userInfo['id'] = $data['openid'];
+        $userInfo['name'] = $data['nickname'];
+        $userInfo['avatar'] = $data['headimgurl'];
 
         return $userInfo;
     }