Merge branch 'dev-xpy' into dev

app/controller/api/Auth.php

@@ -2134,7 +2134,7 @@ class Auth extends BaseController
 
             $tokenInfo = $repository->createToken($user);
 
-            return app('json')->success(array_merge($repository->returnToken($user, $tokenInfo), ['is_new' => $isnew ? 1 : 0]));
+            return app('json')->success(array_merge($repository->returnToken($user, $tokenInfo), ['is_new' => $isnew ? 1 : 0]));//如果是注册用户,isnew=1
 
         }catch (Exception $exception){
             Db::name('log')->insert(['data'=>'获取手机号失败--'.$exception->getFile().'：'.$exception->getLine().'【'.$exception->getMessage().'】']);