diff --git a/app/api/controller/AccountController.php b/app/api/controller/AccountController.php index efc9793..dec71ef 100644 --- a/app/api/controller/AccountController.php +++ b/app/api/controller/AccountController.php @@ -253,7 +253,12 @@ class AccountController extends BaseApiController return $this->fail('参数缺失'); } $data = LoginLogic::authLogin($post); - return $this->success("登录成功",$data); + if($data){ + return $this->success("登录成功",$data); + }else{ + return $this->fail("登录失败"); + } + } /** diff --git a/app/api/logic/LoginLogic.php b/app/api/logic/LoginLogic.php index 663009c..b3bde3c 100755 --- a/app/api/logic/LoginLogic.php +++ b/app/api/logic/LoginLogic.php @@ -664,9 +664,9 @@ class LoginLogic extends LogicBase $user_id = self::getUserByWechatResponse($response); } catch (Exception $e) { - return self::dataError('登录失败:' . $e->getMessage()); + return false; } catch (\think\Exception $e) { - return self::dataError('登录失败:' . $e->getMessage()); + return false; } if (empty($user_id)) { @@ -678,14 +678,14 @@ class LoginLogic extends LogicBase //验证用户信息 $check_res = self::checkUserInfo($user_info); if (true !== $check_res) { - return self::dataError($check_res); + return false; } //创建会话 $user_info['token'] = self::createSession($user_info['id'], Client_::mnp); unset($user_info['id'], $user_info['disable']); - return self::dataSuccess('登录成功', $user_info); + return $user_info; } /**