用户注册，靓号

application/api/controller/User.php

@@ -74,13 +74,16 @@ class User extends Api
         if (!Validate::regex($mobile, "^1\d{10}$")) {
             $this->error(__('Mobile is incorrect'));
         }
-        if (!Sms::check($mobile, $captcha, 'mobilelogin') && $captcha != '1212') {
+        if (!Sms::check($mobile, $captcha, 'mobilelogin')) {
             $this->error(__('Captcha is incorrect'));
         }
         $user = \app\common\model\User::getByMobile($mobile);
 
         if ($user) {
-            if ($user->status != 'normal') {
+            if ($user->status == -1) {
+                $this->error('账户已注销');
+            }
+            if ($user->status != 1) {
                 $this->error(__('Account is locked'));
             }
             //如果已经有账号则直接登录

application/common/library/Auth.php

@@ -179,11 +179,11 @@ class Auth
             }
         }
 
-        $ids = User::column("u_id");
         $invite_no = User::column("invite_no");
-        $uidsale = config("site.uidsale");
-        $uidsale = explode(",", $uidsale);
-        if (is_array($uidsale) && $uidsale && $ids) $ids = array_merge($ids, $uidsale);
+
+        $ids = User::column("u_id");
+        $uidsale = Db::name('uidsale')->column('new_id');
+        $ids = array_merge($ids, $uidsale);
 
         $ip = request()->ip();
         $time = time();
@@ -205,12 +205,12 @@ class Auth
         }
         //https://bansheng-1304213176.cos.ap-guangzhou.myqcloud.com/
         $params = array_merge($data, [
-            'nickname' => "gg_" . $data["u_id"],
+            'nickname' => "K歌_" . $data["u_id"],
             'salt'     => Random::alnum(),
             'joinip'    => $ip,
             'logintime' => $time,
             'loginip'   => $ip,
-            'status'   => 'normal'
+            'status'   => 1
         ]);
 //        $params['password'] = $this->getEncryptPassword($password, $params['salt']);
         $extend && $params = array_merge($params, $extend);
@@ -228,20 +228,22 @@ class Auth
 
             //设置登录状态
             $this->_logined = true;
-            //初始化权限
-            $userPowerWhere['user_id'] = $user->id;
-            $userPowerData = Db::name('user_power')->where($userPowerWhere)->find();
-            if (empty($userPowerData)) {
-                $powerData = ['user_id' => $user->id];
-                Db::name('user_power')->insertGetId($powerData);
-            }
-            $userpower = UserPower::getByUserId($user->id);
-            $this->_user->power = $userpower;
-            //注册到钱包
+
+
             $wallet_data = [
                 'user_id' => $user->id,
             ];
+            //注册到钱包
             Db::name('user_wallet')->insertGetId($wallet_data);
+            //注册用户活跃
+            Db::name('user_active')->insertGetId($wallet_data);
+            //注册到权限
+            Db::name('user_power')->insertGetId($wallet_data);
+
+            //初始化权限
+            $userpower = UserPower::getByUserId($user->id);
+            $this->_user->power = $userpower;
+
             //注册成功的事件
             Hook::listen("user_register_successed", $this->_user, $data);
             \app\common\model\NewBagHave::insert(["user_id" => $user->id, "createtime" => time()]);