dyjh 6 years ago
parent
commit
92f4030cd0
1 changed files with 15 additions and 14 deletions
  1. 15 14
      app/Http/Controllers/Api/V1/LoginController.php

+ 15 - 14
app/Http/Controllers/Api/V1/LoginController.php

xqd xqd
@@ -89,6 +89,20 @@ class LoginController extends Controller
         if($check_user && Auth::loginUsingId($check_user->id)) {
             $user = Auth::user();
             $success['token'] =  $user->createToken($user->id . '-' . $user->openid)->accessToken;
+            $save['username'] = preg_replace('/[\xf0-\xf7].{3}/', '', $data['nickname']);
+            $save['avatar'] = $data['avatar'];
+            $res = UserInfoModel::where('openid',$data['openid'])->update($save);
+            echo 111;die;
+            if($res){
+                $user = [
+                    'user_id'=>$check_user->id,
+                    'avatar'=>$data['avatar'],
+                    //'avatar'=>$check_user->avatar,
+                    'username'=>$data['nickname'],
+                    //'username'=>$check_user->naciname,
+                ];
+            }
+        }else {
             $add['nickname'] = preg_replace('/[\xf0-\xf7].{3}/', '', $data['nickname']);
             $add['wechat_open_id'] = $data['openid'];
             $add['avatar'] = $data['avatar'];
@@ -106,20 +120,7 @@ class LoginController extends Controller
                     'msg' => '登陆失败',
                 ];
             }
-        }else {
-            $save['username'] = preg_replace('/[\xf0-\xf7].{3}/', '', $data['nickname']);
-            $save['avatar'] = $data['avatar'];
-            $res = UserInfoModel::where('openid',$data['openid'])->update($save);
-            //echo 111;
-            if($res){
-                $user = [
-                    'user_id'=>$check_user->id,
-                    'avatar'=>$data['avatar'],
-                    //'avatar'=>$check_user->avatar,
-                    'username'=>$data['nickname'],
-                    //'username'=>$check_user->naciname,
-                ];
-            }
+
         }
         $this->api($user);
     }