|
...
|
...
|
@@ -492,9 +492,19 @@ class WechatService extends BaseService |
|
|
|
// 正在申请
|
|
|
|
$user_info = session('wechat.oauth_user.default')->original; // 拿到授权用户资料
|
|
|
|
record_log('wechat-auth', '授权用户信息：' .json_encode($user_info));
|
|
|
|
//{
|
|
|
|
//"openid":"oPWfywhfTBVSJTLLTX-bqwZi7Jn4",
|
|
|
|
//"nickname":"Yogurt.\ud83c\udf52",
|
|
|
|
//"sex":0,
|
|
|
|
//"language":"",
|
|
|
|
//"city":"",
|
|
|
|
//"province":"",
|
|
|
|
//"country":"",
|
|
|
|
//"headimgurl":"https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/rryRSUHjPng6RZ337uNlpylDUxWR8OMlmu5k0FE2ugaUxcQNR7TiacEib0ZgsTxpzyWJ6AQhbrcALfDEsqXOZZtQ\/132",
|
|
|
|
//"privilege":[]}
|
|
|
|
|
|
|
|
// $factory = app(WechatFactory::class);
|
|
|
|
// // 公众号好手气
|
|
|
|
// // 公众号
|
|
|
|
// $user_info = $factory->setOfficialAccountConfigure()->loginOfficialAccount()->original;
|
|
|
|
//
|
|
|
|
// // 拿到静默获取的openid, 静默获取只能获取openid 点击按钮可以获取详细信息
|
|
...
|
...
|
@@ -518,28 +528,17 @@ class WechatService extends BaseService |
|
|
|
}
|
|
|
|
|
|
|
|
if ($user_info) {
|
|
|
|
$pid = $request->inviter_id ? : 0; // 邀请人id
|
|
|
|
$gid = 0;
|
|
|
|
if ($pid) {
|
|
|
|
$inviter = User::find($pid);
|
|
|
|
$gid = optional($inviter)->pid;
|
|
|
|
if (Arr::get($user_info, 'headimgurl')) {
|
|
|
|
$user->avatar = Arr::get($user_info, 'headimgurl');
|
|
|
|
}
|
|
|
|
$user->avatar = Arr::get($user_info, 'avatarUrl');
|
|
|
|
$user->nickname = Arr::get($user_info, 'nickName');
|
|
|
|
$user->gender = Arr::get($user_info, 'gender');
|
|
|
|
if (Arr::get($user_info, 'nickname')) {
|
|
|
|
$user->nickname = Arr::get($user_info, 'nickname');
|
|
|
|
}
|
|
|
|
// $user->nickname = Arr::get($user_info, 'nickName');
|
|
|
|
$user->gender = Arr::get($user_info, 'sex');
|
|
|
|
$user->country = Arr::get($user_info, 'country');
|
|
|
|
$user->province = Arr::get($user_info, 'province');
|
|
|
|
$user->city = Arr::get($user_info, 'city');
|
|
|
|
$user->times = 10; // 新用户注册赠送 10 条
|
|
|
|
$user->invite_qr_code = 'mini_program_code/'.$user->id .'.png';
|
|
|
|
$user->pid = $pid;
|
|
|
|
$user->gid = $gid;
|
|
|
|
$user->openid = $openid;
|
|
|
|
$user->password = bcrypt(config('constants.PASSWORD'));
|
|
|
|
$user->role = Role::GENERAL;
|
|
|
|
$user->password = bcrypt(config('constants.PASSWORD'));
|
|
|
|
$user->registered_at = date('Y-m-d H:i:s');
|
|
|
|
$user->registered_ip = $request->ip();
|
|
|
|
}
|
|
|
|
$user->token = JWTAuth::fromuser($user);
|
|
|
|
$user->save();
|
|
...
|
...
|
@@ -566,10 +565,9 @@ class WechatService extends BaseService |
|
|
|
$gid = 0;
|
|
|
|
if ($pid) {
|
|
|
|
$inviter = User::find($pid);
|
|
|
|
$gid = optional($inviter)->pid;
|
|
|
|
$gid = optional($inviter)->pid ?? 0;
|
|
|
|
}
|
|
|
|
$user->times = 10; // 新用户注册赠送 10 条
|
|
|
|
$user->username = $mobile;
|
|
|
|
$user->pid = $pid;
|
|
|
|
$user->gid = $gid;
|
|
|
|
$user->username = $mobile;
|
|
...
|
...
|
@@ -580,6 +578,10 @@ class WechatService extends BaseService |
|
|
|
$user->password = bcrypt(config('constants.PASSWORD'));
|
|
|
|
$user->registered_at = date('Y-m-d H:i:s');
|
|
|
|
$user->registered_ip = $request->ip();
|
|
|
|
// add by Richer 于 2023年5月16日09:47:42 设置默认的昵称和头像
|
|
|
|
$user->nickname = '昵称' . $user->id;
|
|
|
|
$user->avatar = 'avatar/'. rand(1, 20) .'.png';
|
|
|
|
|
|
|
|
|
|
|
|
return $user;
|
|
|
|
}
|
...
|
...
|
|
