|
|
@@ -2134,11 +2134,8 @@ class Auth extends BaseController
|
|
2134
|
2134
|
|
|
2135
|
2135
|
$tokenInfo = $repository->createToken($user);
|
|
2136
|
2136
|
|
|
2137
|
|
- if($isnew){
|
|
2138
|
|
- return app('json')->success(['usernew' => 1]);
|
|
2139
|
|
- }
|
|
|
2137
|
+ return app('json')->success(array_merge($repository->returnToken($user, $tokenInfo), ['is_new' => $isnew ? 1 : 0]));
|
|
2140
|
2138
|
|
|
2141
|
|
- return app('json')->success($repository->returnToken($user, $tokenInfo));
|
|
2142
|
2139
|
}catch (Exception $exception){
|
|
2143
|
2140
|
Db::name('log')->insert(['data'=>'获取手机号失败--'.$exception->getFile().':'.$exception->getLine().'【'.$exception->getMessage().'】']);
|
|
2144
|
2141
|
}
|