|
@@ -85,7 +85,7 @@ class User
|
|
|
event('UserRegister',['user_id' => $userInfo['user_id'], 'realname' => $userInfo['realname']]);
|
|
event('UserRegister',['user_id' => $userInfo['user_id'], 'realname' => $userInfo['realname']]);
|
|
|
|
|
|
|
|
} else {
|
|
} else {
|
|
|
- $userInfo['avatar']=avatarUrl($userInfo['avatar'],$userInfo['realname'],$userInfo['user_id']);
|
|
|
|
|
|
|
+ //$userInfo['avatar']=avatarUrl($userInfo['avatar'],$userInfo['realname'],$userInfo['user_id']);
|
|
|
// 如果用户已经有设置
|
|
// 如果用户已经有设置
|
|
|
$setting=$userInfo['setting'] ?: '';
|
|
$setting=$userInfo['setting'] ?: '';
|
|
|
if($setting){
|
|
if($setting){
|
|
@@ -117,8 +117,12 @@ class User
|
|
|
$update=[
|
|
$update=[
|
|
|
'last_login_time'=>time(),
|
|
'last_login_time'=>time(),
|
|
|
'last_login_ip'=>$this->request->ip(),
|
|
'last_login_ip'=>$this->request->ip(),
|
|
|
- 'login_count'=>Db::raw('login_count+1')
|
|
|
|
|
|
|
+ 'login_count'=>Db::raw('login_count+1'),
|
|
|
|
|
+ 'avatar' => !empty($params['avatar']) ? $params['avatar'] : '',
|
|
|
];
|
|
];
|
|
|
|
|
+ if (!empty($params['realname'])) {
|
|
|
|
|
+ $update['realname'] = $params['realname'];
|
|
|
|
|
+ }
|
|
|
UserModel::where('user_id',$userInfo['user_id'])->update($update);
|
|
UserModel::where('user_id',$userInfo['user_id'])->update($update);
|
|
|
$userInfo['qrUrl']=getMainHost().'/scan/u/'.encryptIds($userInfo['user_id']);
|
|
$userInfo['qrUrl']=getMainHost().'/scan/u/'.encryptIds($userInfo['user_id']);
|
|
|
unset($userInfo['password'],$userInfo['salt']);
|
|
unset($userInfo['password'],$userInfo['salt']);
|