From 3e87b0e12690465fa430d1338e770d40f55f9cbd Mon Sep 17 00:00:00 2001
From: liapples <liapples@163.com>
Date: Fri, 23 Jul 2021 17:17:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/LoginController.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Api/LoginController.php b/app/Http/Controllers/Api/LoginController.php
index 1734716..39f87a8 100644
--- a/app/Http/Controllers/Api/LoginController.php
+++ b/app/Http/Controllers/Api/LoginController.php
@@ -37,14 +37,22 @@ class LoginController extends Controller
 		$url = sprintf($base_url, $agent['appid'], $agent['appsecret']);
 
 		$res = Http::get($url)->json();
-		if (array_key_exists('errcode', $res) || $res['errcode'] != 0 || empty($res['openid'])) {
-			$res['openid'] = session_create_id();
-//			return $this->error($res['errmsg'] ?? 'login fail!'); TODO 测试时注释掉
+		if (!array_key_exists('errcode', $res) || $res['errcode'] != 0 || empty($res['openid'])) {
+			$msg = $res['errcode'] ? $res['errcode'] . ': ' : '';
+			$msg .= $res['errmsg'] ?? '登录失败';
+			return $this->error($msg); //TODO 测试时注释掉
 		}
 
 		// TODO 登录部分待优化
 		$userModel = new User();
-		$userModel->firstOrCreate(['openid' => $res['openid'], 'agent_id' => $agent_id], ['nickname' => '未设置昵称', 'avatar' => '/static/images/avatar.png']);
+		$userModel->firstOrCreate([
+			'openid' => $res['openid'],
+			'unionid' => $res['unionid'],
+			'agent_id' => $agent_id
+		], [
+			'nickname' => '未设置昵称',
+			'avatar' => '/static/images/avatar.png'
+		]);
 
 		// TODO 用于测试
 		$token_key = md5($userModel->id);