|
@@ -143,7 +143,7 @@ class Auth
|
|
|
* @param array $extend 扩展参数
|
|
|
* @return boolean
|
|
|
*/
|
|
|
- public function register($username, $password, $email = '', $mobile = '', $extend = [])
|
|
|
+ public function mobile_register($username, $password, $email = '', $mobile = '', $extend = [])
|
|
|
{
|
|
|
// 检测用户名、昵称、邮箱、手机号是否存在
|
|
|
/*if (User::getByUsername($username)) {
|
|
@@ -163,6 +163,12 @@ class Auth
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
+ //尽量用户名也用手机号
|
|
|
+ $mobile_set_username = 1;
|
|
|
+ if (User::getByUsername($mobile)) {
|
|
|
+ $mobile_set_username = 0;
|
|
|
+ }
|
|
|
+
|
|
|
$ip = request()->ip();
|
|
|
$time = time();
|
|
|
|
|
@@ -179,6 +185,9 @@ class Auth
|
|
|
|
|
|
'last_paytime' => $time,
|
|
|
];
|
|
|
+ if($mobile_set_username == 1){
|
|
|
+ $data['username'] = $mobile;
|
|
|
+ }
|
|
|
$params = array_merge($data, [
|
|
|
// 'salt' => Random::alnum(),
|
|
|
'jointime' => $time,
|
|
@@ -209,8 +218,12 @@ class Auth
|
|
|
$user = User::create($params, true);
|
|
|
|
|
|
$this->_user = User::get($user->id);
|
|
|
- $this->_user->username = 'u' . (10000 + $user->id);
|
|
|
- $this->_user->save();
|
|
|
+
|
|
|
+ if($mobile_set_username == 0){
|
|
|
+ $this->_user->username = 'u' . (10000 + $user->id);
|
|
|
+ $this->_user->save();
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
//设置Token
|
|
|
$this->_token = Random::uuid();
|