From bee4daf6723a6ee595505ee37226051df379d669 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Thu, 10 Dec 2020 15:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9QQ=E7=99=BB=E5=BD=95=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96ACCESS=5FTOKEN=E7=9A=84=E8=AF=B7=E6=B1=82=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Home/Controllers/ConnectController.php | 8 +++++---
 app/Services/OAuth/QQ.php                       | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Http/Home/Controllers/ConnectController.php b/app/Http/Home/Controllers/ConnectController.php
index 10c11e4c..708e3e81 100644
--- a/app/Http/Home/Controllers/ConnectController.php
+++ b/app/Http/Home/Controllers/ConnectController.php
@@ -117,11 +117,13 @@ class ConnectController extends Controller
         $openUser = $service->getOpenUserInfo($code, $state, $provider);
         $connect = $service->getConnectRelation($openUser['id'], $openUser['provider']);
 
-        if ($connect) {
-            if ($this->authUser->id > 0) {
+        if ($this->authUser->id > 0) {
+            if ($openUser) {
                 $service->bindUser($openUser);
                 return $this->response->redirect(['for' => 'home.uc.account']);
-            } else {
+            }
+        } else {
+            if ($connect && $connect->deleted == 0) {
                 $service->authLogin($connect);
                 return $this->response->redirect(['for' => 'home.index']);
             }
diff --git a/app/Services/OAuth/QQ.php b/app/Services/OAuth/QQ.php
index 2c59f144..4e2ba114 100644
--- a/app/Services/OAuth/QQ.php
+++ b/app/Services/OAuth/QQ.php
@@ -36,7 +36,7 @@ class QQ extends OAuth
             'grant_type' => 'authorization_code',
         ];
 
-        $response = $this->httpPost(self::ACCESS_TOKEN_URL, $params);
+        $response = $this->httpGet(self::ACCESS_TOKEN_URL, $params);
 
         $this->accessToken = $this->parseAccessToken($response);