gq 7 years ago
parent
commit
20bb542e21

+ 4 - 9
server/app/Http/Controllers/Api/V1/AuthController.php

xqd
@@ -113,15 +113,10 @@ class AuthController extends Controller
         }else{
             $phone_user = UserInfoModel::where('phone',$phone)->first();
             if(!empty($phone_user)){
-                return $this->error(ErrorCode::USER_DOES_EXIST);
-//                if (Auth::attempt(['phone'=>$phone,'password'=>$password])) {
-//                    $user = Auth::user();
-//                    \Log::info($user);
-//                    $token = $user->createToken($user->phone)->accessToken;
-//                    return $this->api(compact( 'user', 'code','token'));
-//                }else{
-//                    return $this->error(ErrorCode::INCORRECT_USER_OR_PASS);
-//                }
+//                return $this->error(ErrorCode::USER_DOES_EXIST);
+                $user = $phone_user;
+                $token = $user->createToken($user->phone)->accessToken;
+                return $this->api(compact( 'user', 'code','token'));
             }
         }
         if (empty($user)) {

+ 2 - 0
server/app/Http/Controllers/Api/V1/DreamController.php

xqd
@@ -198,6 +198,8 @@ class DreamController extends Controller
     public function show(Request $request)
     {
         $user = $this->getUser();
+        Log::info($user);
+        dd(123);
         if (!empty($request->input('dream_user_id'))) {
 //            查看梦想后 最新最新梦想为0
 //            UserCareUser::where('user_id',$user->id)->where('other_user_id',$request->input('dream_user_id'))->update(['dream_id'=>0,'dream_number'=>0]);