| xqd
@@ -74,9 +74,9 @@ class LoginController extends Controller
|
|
|
public function login(Request $request)
|
|
|
{
|
|
|
$data = $request->input();
|
|
|
- $app = Factory::miniProgram($this->config);
|
|
|
- //$res = $app->auth->session($data['code']);
|
|
|
- /* if (!$res || empty($res['openid'])) {
|
|
|
+ /* $app = Factory::miniProgram($this->config);
|
|
|
+ $res = $app->auth->session($data['code']);
|
|
|
+ if (!$res || empty($res['openid'])) {
|
|
|
$user= [
|
|
|
'code' => 1,
|
|
|
'msg' => '获取用户OpenId失败',
|
| xqd
@@ -88,21 +88,13 @@ class LoginController extends Controller
|
|
|
//dd($check_user);
|
|
|
if($check_user && Auth::loginUsingId($check_user->id)) {
|
|
|
$user = Auth::user();
|
|
|
- //dd($user);
|
|
|
- //dd($check_user->nickname);
|
|
|
- $success['token'] = $user->createToken('555')->accessToken;
|
|
|
- dd($success);
|
|
|
- }else {
|
|
|
- echo 2;
|
|
|
- }
|
|
|
- /* if(){
|
|
|
+ $success['token'] = $user->createToken($user->id . '-' . $user->openid)->accessToken;
|
|
|
$add['nickname'] = preg_replace('/[\xf0-\xf7].{3}/', '', $data['nickname']);
|
|
|
- $add['wechat_open_id'] = $res['openid'];
|
|
|
+ $add['wechat_open_id'] = $data['openid'];
|
|
|
$add['avatar'] = $data['avatar'];
|
|
|
- $res = UserInfoModel::create($add);
|
|
|
- if($res){
|
|
|
- $data_user = UserInfoModel::where('wechat_open_id',$res['openid'])->first();
|
|
|
- session(['user_id'=>$check_user->id]);
|
|
|
+ $res_add = UserInfoModel::create($add);
|
|
|
+ if($res_add){
|
|
|
+ $data_user = UserInfoModel::where('wechat_open_id',$data['openid'])->first();
|
|
|
$user = [
|
|
|
'user_id'=>$data_user['id'],
|
|
|
'avatar'=>$data_user['avatar'],
|
| xqd
@@ -114,14 +106,12 @@ class LoginController extends Controller
|
|
|
'msg' => '登陆失败',
|
|
|
];
|
|
|
}
|
|
|
- } else {
|
|
|
- //print_r($check);die;
|
|
|
+ }else {
|
|
|
$save['username'] = preg_replace('/[\xf0-\xf7].{3}/', '', $data['nickname']);
|
|
|
$save['avatar'] = $data['avatar'];
|
|
|
- $res = UserInfoModel::where('wechat_open_id',$res['openid'])->update($save);
|
|
|
+ $res = UserInfoModel::where('wechat_open_id',$data['openid'])->update($save);
|
|
|
//echo 111;
|
|
|
if($res){
|
|
|
- session(['user_id'=>$check_user->id]);
|
|
|
$user = [
|
|
|
'user_id'=>$check_user->id,
|
|
|
'avatar'=>$data['avatar'],
|
| xqd
@@ -131,6 +121,6 @@ class LoginController extends Controller
|
|
|
];
|
|
|
}
|
|
|
}
|
|
|
- $this->api($user);*/
|
|
|
+ $this->api($user);
|
|
|
}
|
|
|
}
|