Преглед изворни кода

add:注册重复做版本判断;

Wang Chen пре 4 година
родитељ
комит
890663e67c

+ 2 - 1
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');

+ 9 - 5
app/Modules/User/Services/QappUserService.php

@@ -27,17 +27,21 @@ 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);
         if (!$qapp_user) {
-            // 加锁3秒,否则报错
-            $lockToken = md5($device_no . ':' . $channel_id);
-            $lock      = LockCache::getLock($lockToken, 3);
-            if (!$lock) {
-                Utils::throwError(ErrorConst::QAPP_LOGIN_FREQUENTLY);
+            // 判断版本号,大于等于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);
+                }
             }
 
             // 初始化新用户