|
@@ -146,8 +146,6 @@ class Auth
|
|
'mobile' => $mobile,
|
|
'mobile' => $mobile,
|
|
'avatar' => config('default_avatar'),
|
|
'avatar' => config('default_avatar'),
|
|
'nickname' => $this->get_rand_nick_name(),
|
|
'nickname' => $this->get_rand_nick_name(),
|
|
- 'password' => $password,
|
|
|
|
- 'salt' => Random::alnum(),
|
|
|
|
];
|
|
];
|
|
$params = array_merge($data, [
|
|
$params = array_merge($data, [
|
|
'jointime' => $time,
|
|
'jointime' => $time,
|
|
@@ -157,7 +155,6 @@ class Auth
|
|
'prevtime' => $time,
|
|
'prevtime' => $time,
|
|
'status' => 1
|
|
'status' => 1
|
|
]);
|
|
]);
|
|
- $params['password'] = $this->getEncryptPassword($password, $params['salt']);
|
|
|
|
$params = array_merge($params, $extend);
|
|
$params = array_merge($params, $extend);
|
|
|
|
|
|
//账号注册时需要开启事务,避免出现垃圾数据
|
|
//账号注册时需要开启事务,避免出现垃圾数据
|
|
@@ -338,18 +335,12 @@ class Auth
|
|
$ip = request()->ip();
|
|
$ip = request()->ip();
|
|
$time = time();
|
|
$time = time();
|
|
|
|
|
|
- //判断连续登录和最大连续登录
|
|
|
|
- if ($user->logintime < \fast\Date::unixtime('day')) {
|
|
|
|
- $user->successions = $user->logintime < \fast\Date::unixtime('day', -1) ? 1 : $user->successions + 1;
|
|
|
|
- $user->maxsuccessions = max($user->successions, $user->maxsuccessions);
|
|
|
|
- }
|
|
|
|
|
|
|
|
$user->prevtime = $user->logintime;
|
|
$user->prevtime = $user->logintime;
|
|
//记录本次登录的IP和时间
|
|
//记录本次登录的IP和时间
|
|
$user->loginip = $ip;
|
|
$user->loginip = $ip;
|
|
$user->logintime = $time;
|
|
$user->logintime = $time;
|
|
//重置登录失败次数
|
|
//重置登录失败次数
|
|
- $user->loginfailure = 0;
|
|
|
|
|
|
|
|
$user->save();
|
|
$user->save();
|
|
|
|
|