APP小程序-注册登录功能改进-测试登录注册分开

app/controller/api/Auth.php

@@ -1364,22 +1364,42 @@ class Auth extends BaseController
         $data = $this->request->params(['phone', 'code', 'key',"type"]);
         $validate->sceneVerify()->check($data);
         log::info("发送短信方法");
+        if ($data['type']=="login"){
+            $count=Db::name("user")->where("phone", $data["phone"])->count();
+            if (!$count){
+                return app('json')->make(405, '该手机号未注册,请去注册');
+            }
+            $sms_num_key = 'api.auth.num.' . $data['phone'];
+            $num = Cache::get($sms_num_key) ?: 0;
+            log::info("num{$num}");
+
+            if ($num > 9) {
+                if (!$data['code'])
+                    return app('json')->make(402, '操作过于频繁，请稍后重试~');
+                if (!$this->smslogin($data['phone'], $data['code'])) {
+                    return app('json')->fail('登录验证码输入有误');
+                }
+            }
+        }
+
         if ($data['type']=="register"){
             $count=Db::name("user")->where("phone", $data["phone"])->count();
             if ($count){
-                return app('json')->make(405, '该手机号已注册');
+                return app('json')->make(405, '该手机号已注册,请直接登录');
+            }
+            $sms_num_key = 'api.auth.num.' . $data['phone'];
+            $num = Cache::get($sms_num_key) ?: 0;
+            log::info("num{$num}");
+
+            if ($num > 9) {
+                if (!$data['code'])
+                    return app('json')->make(402, '操作过于频繁，请稍后重试~');
+                if (!$this->registersmscode($data['phone'], $data['code'])) {
+                    return app('json')->fail('注册验证码输入有误');
+                }
             }
         }
-        $sms_num_key = 'api.auth.num.' . $data['phone'];
         $sms_key = 'api.auth.sms.' . $data['phone'];
-        $num = Cache::get($sms_num_key) ? Cache::get($sms_num_key) : 0;
-        log::info("num{$num}" );
-        if ($num > 9) {
-            if (!$data['code'])
-                return app('json')->make(402, '操作过于频繁，请稍后重试~');
-            if (!$this->checkCaptcha($data['key'], $data['code']))
-                return app('json')->fail('验证码输入有误');
-        }
         $sms_code = str_pad(random_int(1, 9999), 4, 0, STR_PAD_LEFT);
         $sms_time = systemConfig('sms_time') ? systemConfig('sms_time') : 30 ;
         $res = app()->make(AliYunSmsService::class)->send($data['phone'],  $sms_code);
@@ -1533,14 +1553,8 @@ class Auth extends BaseController
 
         $user = $repository->accountByUser($data['phone']);
         if (!$user){
-            $data['spread_uid'] = 0;
-            if (intval($data['share_id'])) {
-                $spread_uid = Db::name('product_share')->where('id', $data['share_id'])->value('uid');
-                $data['spread_uid'] = $spread_uid;
-            }
-            $user = $repository->registr($data['phone'], null, 'h5', '','',1, $data['spread_uid']);
+            return app('json')->fail('手机号未注册，请先注册');
         }
-        $user = $repository->mainUser($user);
 
         // if($this->source=='yhc' && $this->merId){
         //     $where=['mer_id'=>$this->merId,'uid'=>$user->uid];
@@ -1569,6 +1583,27 @@ class Auth extends BaseController
         return app('json')->success($repository->returnToken($user, $tokenInfo));
     }
 
+    public function registerSmscode(UserAuthValidate $validate, UserRepository $repository)
+    {
+        $data = $this->request->params(['phone', 'sms_code', 'spread_uid']);
+        $validate->sceneSmslogin()->check($data);
+
+        $count = Db::name('user')->where('phone', $data['phone'])->count();
+        if ($count > 0) {
+            return app('json')->fail('手机号已注册，请直接登录');
+        }
+
+        if (!$this->checkSmsCode($data['phone'], $data['sms_code'])) {
+            return app('json')->fail('验证码不正确');
+        }
+
+        $user = $repository->registr($data['phone'], null, 'h5', '', '', 1, $data['spread_uid']);
+        $user = $repository->mainUser($user);
+        $tokenInfo = $repository->loginAfter($user);
+        return app('json')->success($repository->returnToken($user, $tokenInfo));
+    }
+
+
     public function merJavaRegister(UserRepository $repository){
         $data = $this->request->params(['phone', 'spread','token','sign']);
         Log::channel("gong")->info("供应链取消商品数据：" . json_encode($data));