Merge branch 'dev-xpy' into dev

app/controller/api/Auth.php

@@ -503,6 +503,13 @@ class Auth extends BaseController
 
         // return "=====";
         $data = $this->request->params(['phone', 'sms_code', 'spread', 'password',"spread_phone","type","mer_id"]);
+        $lockKey = 'lock:register:' . $data['phone'];
+        $redis = \think\facade\Cache::store('redis')->handler();
+        $acquired = $redis->set($lockKey, 1, ['nx', 'ex' => 15]);
+        if (!$acquired) {
+            return app('json')->fail('正在注册，请稍后');
+        }
+        try {
         $type=$data['type']??'';
         unset($data['type']);
         $validate->sceneSmslogin()->check($data);
@@ -574,6 +581,10 @@ class Auth extends BaseController
         $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
         return app('json')->success($result);
 
+        } finally {
+            $redis->del($lockKey);
+        }
+
     }
 
     /**