From 3c93dbd3d0a1a54e29c74357699a549efa5894b4 Mon Sep 17 00:00:00 2001
From: Jason <chenjxlg@163.com>
Date: Wed, 14 Sep 2022 16:40:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/Wechat.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/controller/Wechat.php b/app/controller/Wechat.php
index 4f38ca4..43e7108 100644
--- a/app/controller/Wechat.php
+++ b/app/controller/Wechat.php
@@ -54,17 +54,18 @@ class Wechat
     public function code()
     {
         $this->initWechat();
-        $user     = $this->app->oauth->user();
-        $callback = Request::get('callback');
+        $code       = Request::get('code');
+        $wechatUser = $this->app->oauth->userFromCode($code);
+        $callback   = Request::get('callback');
 
-        $user = AppUser::where('openid', $user->getId())->find();
+        $user = AppUser::where('openid', $wechatUser->getId())->find();
 
         if (! $user) {
             $user = AppUser::create([
-                'nickname' => $user->getNickname(),
-                'avatar'   => $user->getAvatar(),
+                'nickname' => $wechatUser->getNickname(),
+                'avatar'   => $wechatUser->getAvatar(),
                 'identity' => 0,
-                'openid'   => $user->getId(),
+                'openid'   => $wechatUser->getId(),
             ]);
         }
         $tokenData = ['userid' => $user->id, 'loginTime' => time(), 'rankStr' => strRand(5)];