Merge branch 'gq' of ssh://git.9026.com:2212/roobe/miao into gq

server/app/Http/Controllers/Api/V1/AuthController.php

@@ -108,7 +108,14 @@ class AuthController extends Controller
         $code = Cache::store('file')->get($key);
         $password = 123456;
         if ($request->verify_code != $code) return $this->error(ErrorCode::SERVICE_CODE_FAILED);
-        if(empty($user))$user = UserInfoModel::where('phone',$phone)->first();
+        if(empty($user)){
+            $user = UserInfoModel::where('phone',$phone)->first();
+        }else{
+            $phone_user = UserInfoModel::where('phone',$phone)->first();
+            if(!empty($phone_user)){
+                return $this->error(ErrorCode::USER_DOES_EXIST);
+            }
+        }
         if (empty($user)) {
             $user = UserInfoModel::create([
                 'phone'=>$phone,