| xqd
@@ -92,14 +92,11 @@ class LoginController extends Controller
|
|
|
$save['nickname'] = preg_replace('/[\xf0-\xf7].{3}/', '', $data['nickname']);
|
|
|
$save['avatar'] = $data['avatar'];
|
|
|
$res = UserInfoModel::where('openid',$data['openid'])->update($save);
|
|
|
- echo 111;die;
|
|
|
+ //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,
|
|
|
+ $message = [
|
|
|
+ 'msg'=>'登录成功',
|
|
|
+ 'token'=>$success['token'],
|
|
|
];
|
|
|
}
|
|
|
}else {
|
| xqd
@@ -109,19 +106,21 @@ class LoginController extends Controller
|
|
|
$res_add = UserInfoModel::create($add);
|
|
|
if($res_add){
|
|
|
$data_user = UserInfoModel::where('openid',$data['openid'])->first();
|
|
|
- $user = [
|
|
|
- 'user_id'=>$data_user['id'],
|
|
|
- 'avatar'=>$data_user['avatar'],
|
|
|
- 'username'=>$data_user['nickname'],
|
|
|
- ];
|
|
|
+ if(Auth::loginUsingId($data_user->id)){
|
|
|
+ $user = Auth::user();
|
|
|
+ $success['token'] = $user->createToken($user->id . '-' . $user->openid)->accessToken;
|
|
|
+ $message = [
|
|
|
+ 'msg'=>'登录成功',
|
|
|
+ 'token'=>$success['token'],
|
|
|
+ ];
|
|
|
+ }
|
|
|
} else {
|
|
|
- $user= [
|
|
|
- 'code' => 1,
|
|
|
+ $message= [
|
|
|
'msg' => '登陆失败',
|
|
|
];
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- $this->api($user);
|
|
|
+ $this->api($message);
|
|
|
}
|
|
|
}
|