更新验证码逻辑

app/Http/Controllers/Web/Auth/LoginController.php

@@ -127,9 +127,9 @@ class LoginController extends WebBaseController
 
     public function loginBySms(AuthValidatorRequest $request)
     {
-        if(!$this->tencentCaptchaService->check($request->input('randstr'),$request->input('ticket'),$request->ip())){
-            return $this->sendErrorResponse("验证码不通过,请重新验证");
-        }
+//        if(!$this->tencentCaptchaService->check($request->input('randstr'),$request->input('ticket'),$request->ip())){
+//            return $this->sendErrorResponse("验证码不通过,请重新验证");
+//        }
 
 //        if (!$this->geetestService->checkGeetest(config('aix.system.site_safety.site_vo_code.members_login'))) {
 //            return $this->sendErrorResponse("验证码不通过,请重新验证", ['is_need_geetest'=>1]);
@@ -139,16 +139,16 @@ class LoginController extends WebBaseController
             Smser::TEMPLATE_AUTH_LOGIN,
             $request->code
         )) {
-            $data['is_need_geetest']=$this->geetestService->isNeedGeetest(
-                config('aix.system.site_safety.site_vo_code.members_login')
-            );
-            return $this->sendErrorResponse("短信验证码不对", $data);
+//            $data['is_need_geetest']=$this->geetestService->isNeedGeetest(
+//                config('aix.system.site_safety.site_vo_code.members_login')
+//            );
+            return $this->sendErrorResponse("短信验证码不对");
         }
         if (!$member=$this->authService->loginByAccount($request->mobile, '', $request->autoLogin)) {
-            $data['is_need_geetest']=$this->geetestService->isNeedGeetest(
-                config('aix.system.site_safety.site_vo_code.members_login')
-            );
-            return $this->sendErrorResponse("用户不存在,请先注册账号", $data);
+//            $data['is_need_geetest']=$this->geetestService->isNeedGeetest(
+//                config('aix.system.site_safety.site_vo_code.members_login')
+//            );
+            return $this->sendErrorResponse("用户不存在,请先注册账号");
         }
         if ($member->status == 0) {
             Auth::guard('web-member')->logout();

app/Http/Controllers/Web/Common/SmsController.php

@@ -6,6 +6,7 @@ use App\Http\Controllers\Web\WebBaseController;
 use App\Services\Auth\AuthService;
 use App\Services\Common\GeetestService;
 use App\Services\Common\SmsService;
+use App\Services\Common\TencentCaptchaService;
 use App\Validators\SmsValidatorRequest;
 
 class SmsController extends WebBaseController
@@ -23,17 +24,20 @@ class SmsController extends WebBaseController
      */
     private $authService;
 
+    private $tencentCaptchaService;
+
     /**
      * CommonController constructor.
      * @param AuthService $authService
      * @param SmsService $smsService
      * @param GeetestService $geetestService
      */
-    public function __construct(AuthService $authService, SmsService $smsService, GeetestService $geetestService)
+    public function __construct(AuthService $authService, SmsService $smsService, GeetestService $geetestService, TencentCaptchaService $tencentCaptchaService)
     {
         $this->smsService = $smsService;
         $this->geetestService = $geetestService;
         $this->authService = $authService;
+        $this->tencentCaptchaService = $tencentCaptchaService;
     }
 
     public function sendSms(SmsValidatorRequest $smsValidatorRequest)
@@ -72,6 +76,10 @@ class SmsController extends WebBaseController
 //                return $this->sendErrorResponse("验证码不通过,请重新验证");
 //            }
 //        }
+
+        if(!$this->tencentCaptchaService->check(request()->input('randstr'),request()->input('ticket'),request()->ip())){
+            return $this->sendErrorResponse("验证码不通过,请重新验证");
+        }
         $this->smsService->sendAuthSms($mobile, Smser::TEMPLATE_AUTH_CHECK);
         return $this->sendSuccessResponse();
     }

public/themes/default/views/app/auth/login.blade.php

@@ -182,6 +182,7 @@
                 }
                 if(res.ret == 0){
                     console.log('行为验证通过');
+
                     $("#ticket").val(res.ticket);
                     $("#bizState").val(res.bizState);
                     $("#randstr").val(res.randstr);
@@ -205,7 +206,10 @@
                     $("#randstr1").val(res.randstr);
                     submit_data={
                         "mobile":$("input[name='mobile']").val(),
-                        "type":"login"
+                        "type":"login",
+                        "ticket": res.ticket,
+                        "bizState": res.bizState,
+                        "randstr": res.randstr
                     };
                     $.ajax({
                         method: 'post',

public/themes/default/views/mobile/app/auth/password_mobile.blade.php

@@ -90,7 +90,7 @@
             $("#ticket").val(res.ticket);
             $("#bizState").val(res.bizState);
             $("#randstr").val(res.randstr);
-            ajax_login(1);
+            toSetSms(result);
         }else{
             console.log('用户主动关闭验证码')
         }