fix:用户重复注册;

app/Consts/ErrorConst.php

@@ -36,4 +36,7 @@ class ErrorConst
     const PUSH_TASK_LOGS_NOT_FOUND          = '10006:无有效子任务';
     const PUSH_APP_NOT_SET                  = '10007:未设置推送应用';
     const PUSH_FAIELD                       = '10008:推送失败，请联系管理员';
+
+    // 业务相关
+    const QAPP_LOGIN_FREQUENTLY              = '10028:并发登录限制';
 }

app/Http/Controllers/QuickApp/Oauth/UsersController.php

@@ -46,6 +46,7 @@ class UsersController extends Controller
      */
     public function index(Request $request)
     {
+        $codeVersion = $request->header('x-codeversion', '');
         $package = $request->input('package', '');
         $send_order_id = $request->input('send_order_id', 0);
         $device_no = $request->input('device_no', '');
@@ -54,7 +55,7 @@ class UsersController extends Controller
         $mac = $request->input('mac', '');
         $device_info = $request->input('device_info', '');
         if ($device_no) {
-            $data = (new QappUserService)->login(compact('package', 'send_order_id', 'device_no', 'androidid', 'mac', 'device_info', 'imei'));
+            $data = (new QappUserService)->login(compact('package', 'send_order_id', 'device_no', 'androidid', 'mac', 'device_info', 'imei', 'codeVersion'));
             return response()->success($data);
         } else {
             return response()->error('PARAM_ERROR');

app/Http/Routes/QuickApp/QuickAppRoutes.php

@@ -15,23 +15,33 @@ Route::group(['domain' => env('QUICKAPP_DOMAIN'), 'namespace' => 'App\Http\Contr
         Route::post('login', 'Oauth\UsersController@index');
     });
 
-    // 全局配置
-    Route::get('api/options', 'WelcomeController@getOptions');
+    // 无需登录的接口
+    Route::group(['prefix' => 'api'], function () {
+        // 全局配置
+        Route::get('options', 'WelcomeController@getOptions');
 
-    Route::group(['prefix' => 'api', 'middleware' => 'jwttoken'], function () {
-        //首页
+        // 首页
         Route::get('books/{sex}/index', 'Book\BookController@getBookLists');
-        //书库
-        Route::get('books/recommen', 'Book\BookController@recommen');
+
+        // 书库
         Route::get('books/library', 'Book\BookController@library');
-        //相似推荐
+
+        // 分类列表
+        Route::get('books/getCategory', 'Book\BookCategoryController@getCategory');
+
+        // 相似推荐
         Route::get('books/similar', 'Book\BookController@similarRecom');
+    });
+
+    Route::group(['prefix' => 'api', 'middleware' => 'jwttoken'], function () {
+        // 客服相关
+        Route::get('customer_img', 'WelcomeController@getCustomerServiceImg');
+        //书库
+        Route::get('books/recommen', 'Book\BookController@recommen');
         //阅读完后的推荐
         Route::get('books/readOverRecommend', 'Book\BookController@readOverRecommend');
         //排行榜
         Route::get('books/rank', 'Book\BookController@rank');
-        //分类列表
-        Route::get('books/getCategory', 'Book\BookCategoryController@getCategory');
         //图书详情
         Route::get('book/{bid}', 'Book\BookController@index');
         //目录不分页
@@ -93,7 +103,6 @@ Route::group(['domain' => env('QUICKAPP_DOMAIN'), 'namespace' => 'App\Http\Contr
         //删除快捷方式
         Route::get('shortcut/delete', 'User\ShortcutController@delete');
 
-        Route::get('customer_img', 'WelcomeController@getCustomerServiceImg');
     });
 
     // 推送

app/Modules/User/Services/QappUserService.php

@@ -3,8 +3,11 @@
 
 namespace App\Modules\User\Services;
 
+use App\Cache\Lock\LockCache;
+use App\Consts\ErrorConst;
 use App\Consts\QuickConst;
 use App\Jobs\QappTikTokUser;
+use App\Libs\Utils;
 use App\Modules\User\Models\QappPackage;
 use App\Modules\User\Models\QappUser;
 use App\Modules\User\Models\User;
@@ -24,24 +27,43 @@ class QappUserService
      */
     public function login(array $data)
     {
+        $codeVersion   = getProp($data, 'codeVersion');
+        $lockToken     = '';
         $isNewRegister = false;
-        $device_no = $data['device_no'];
-        $channel_id = $this->findChannelId($data['package']);
-        $qapp_user = $this->getQAppUserByDeviceNo($device_no, $channel_id);
+        $device_no     = $data['device_no'];
+        $channel_id    = $this->findChannelId($data['package']);
+        $qapp_user     = $this->getQAppUserByDeviceNo($device_no, $channel_id);
         if (!$qapp_user) {
+            // 判断版本号，大于等于1.0.0才做处理
+            if (version_compare($codeVersion, '1.0.0', '>=')) {
+                // 加锁3秒，否则报错
+                $lockToken = md5($device_no . ':' . $channel_id);
+                $lock      = LockCache::getLock($lockToken, 3);
+                if (!$lock) {
+                    Utils::throwError(ErrorConst::QAPP_LOGIN_FREQUENTLY);
+                }
+            }
+
+            // 初始化新用户
             $isNewRegister = true;
             $qapp_user     = $this->createQuickAppUser($data);
         }
-        $user = $qapp_user->user;
-        $uid = $user->id;
-        $time = strtotime("+1 month");
+        $user  = $qapp_user->user;
+        $uid   = $user->id;
+        $time  = strtotime("+1 month");
         $token = JWTAuth::fromUser($user);
         if ($data['send_order_id']) {
             UserService::setUserSendOrder($uid, $data['send_order_id']);
         }
         // 新注册统计
         if ($isNewRegister && $qapp_user) {
+            // 注册统计
             QappAddDeskTopService::incrAddDeskTop($uid, QuickConst::FIELD_REGISTER);
+
+            // 释放锁
+            if ($lockToken) {
+                LockCache::releaseLock($lockToken);
+            }
         }
         return compact('token', 'time', 'uid');
     }
@@ -69,7 +91,7 @@ class QappUserService
                     if ($version == "1.0") {
                         User::where('id', $uid)->update(
                             [
-                                'balance' => DB::raw('balance+' . $reward),
+                                'balance'        => DB::raw('balance+' . $reward),
                                 'reward_balance' => DB::raw('reward_balance+' . $reward)
                             ]
                         );
@@ -89,17 +111,17 @@ class QappUserService
 
     public function setGolableUser(int $uid)
     {
-        $user_info = $this->getQAppUserByUid($uid);
-        $qapp_user = app()->make('qapp_user');
-        $qapp_user->id = $user_info->id;
-        $qapp_user->uid = $user_info->uid;
-        $qapp_user->send_order_id = $user_info->send_order_id;
-        $qapp_user->device_no = $user_info->device_no;
-        $qapp_user->device_info = $user_info->device_info;
-        $qapp_user->phone = $user_info->phone;
-        $qapp_user->user = $user_info->user;
+        $user_info                     = $this->getQAppUserByUid($uid);
+        $qapp_user                     = app()->make('qapp_user');
+        $qapp_user->id                 = $user_info->id;
+        $qapp_user->uid                = $user_info->uid;
+        $qapp_user->send_order_id      = $user_info->send_order_id;
+        $qapp_user->device_no          = $user_info->device_no;
+        $qapp_user->device_info        = $user_info->device_info;
+        $qapp_user->phone              = $user_info->phone;
+        $qapp_user->user               = $user_info->user;
         $qapp_user->app_pay_merchat_id = $user_info->app_pay_merchat_id;
-        $qapp_user->h5_pay_merchat_id = $user_info->h5_pay_merchat_id;
+        $qapp_user->h5_pay_merchat_id  = $user_info->h5_pay_merchat_id;
         $qapp_user->ali_pay_merchat_id = $user_info->ali_pay_merchat_id;
     }
 
@@ -110,7 +132,7 @@ class QappUserService
     {
         $qapp_user = QappUser::where('device_no', $device_no)->where('channel_id', $channel_id)->first();
         if ($qapp_user) {
-            $user = User::find($qapp_user->uid);
+            $user            = User::find($qapp_user->uid);
             $qapp_user->user = $user;
         }
         return $qapp_user;
@@ -123,12 +145,12 @@ class QappUserService
     {
         $qapp_user = QappUser::where('uid', $uid)->first();
         if ($qapp_user) {
-            $user = User::find($uid);
-            $qapp_user->user = $user;
-            $qapp_user->send_order_id = UserService::getUserSendOrder($uid);
-            $package_info = QappPackage::where('channel_id', $user->distribution_channel_id)->first();
+            $user                          = User::find($uid);
+            $qapp_user->user               = $user;
+            $qapp_user->send_order_id      = UserService::getUserSendOrder($uid);
+            $package_info                  = QappPackage::where('channel_id', $user->distribution_channel_id)->first();
             $qapp_user->app_pay_merchat_id = $package_info->app_pay_merchat_id;
-            $qapp_user->h5_pay_merchat_id = $package_info->h5_pay_merchat_id;
+            $qapp_user->h5_pay_merchat_id  = $package_info->h5_pay_merchat_id;
             $qapp_user->ali_pay_merchat_id = $package_info->ali_pay_merchat_id;
         }
         return $qapp_user;
@@ -142,16 +164,16 @@ class QappUserService
     {
         try {
             DB::beginTransaction();
-            $user = $this->createUser($data);
-            $channel_id = $user->distribution_channel_id;
-            $qapp_user = QappUser::firstOrCreate([
-                'device_no' => $data['device_no'],
+            $user            = $this->createUser($data);
+            $channel_id      = $user->distribution_channel_id;
+            $qapp_user       = QappUser::firstOrCreate([
+                'device_no'  => $data['device_no'],
                 'channel_id' => $channel_id,
             ], [
-                'imei' => $data['imei'],
-                'androidid' => $data['androidid'],
-                'mac' => $data['mac'],
-                'uid' => $user->id,
+                'imei'        => $data['imei'],
+                'androidid'   => $data['androidid'],
+                'mac'         => $data['mac'],
+                'uid'         => $user->id,
                 'device_info' => $data['device_info'],
             ]);
             $qapp_user->user = $user;
@@ -170,7 +192,7 @@ class QappUserService
         $channel_id = env('QUICKAPP_SITE');
         if ($package) {
             $package_info = QappPackage::where('package', $package)->first();
-            $channel_id = $package_info ? $package_info->channel_id : $channel_id;
+            $channel_id   = $package_info ? $package_info->channel_id : $channel_id;
         }
         return $channel_id;
     }
@@ -180,13 +202,13 @@ class QappUserService
      */
     private function createUser(array $data)
     {
-        $openid = $data['device_no'];
-        $unionid = $data['device_no'];
-        $register_ip = _getIp();
+        $openid                  = $data['device_no'];
+        $unionid                 = $data['device_no'];
+        $register_ip             = _getIp();
         $distribution_channel_id = $this->findChannelId($data['package']);
-        $send_order_id = $data['send_order_id'];
-        $unique_key = compact('unionid', 'distribution_channel_id');
-        $data = compact('openid', 'register_ip', 'send_order_id');
+        $send_order_id           = $data['send_order_id'];
+        $unique_key              = compact('unionid', 'distribution_channel_id');
+        $data                    = compact('openid', 'register_ip', 'send_order_id');
         return User::firstOrCreate($unique_key, $data);
     }
 }

config/error.php

@@ -216,4 +216,5 @@ return [
         'APP_CREATE_WECHAT_ORDER_FAIL' => ['code' => 10025, 'msg' => '微信订单创建失败'],
         'NO_REWARD' => ['code' => 10026, 'msg' => '不符合领取条件！'],
         'REWARD_GOTTEN_ERROR' => ['code' => 10027, 'msg' => '获取奖励失败！'],
+        'QAPP_LOGIN_FREQUENTLY_ERROR' => ['code' => 10028, 'msg' => '并发登录限制！'],
 ];