diff --git a/app/Endpoint/Api/Http/Controllers/LoginController.php b/app/Endpoint/Api/Http/Controllers/LoginController.php index 4bb15ad7..7f720d6e 100644 --- a/app/Endpoint/Api/Http/Controllers/LoginController.php +++ b/app/Endpoint/Api/Http/Controllers/LoginController.php @@ -6,7 +6,6 @@ use App\Constants\Device; use App\Endpoint\Api\Http\Requests\LoginRequest; use App\Exceptions\BizException; use App\Models\User; -use App\Services\CaptchaService; class LoginController extends Controller { @@ -14,16 +13,10 @@ class LoginController extends Controller * 登录 * * @param \App\Endpoint\Api\Http\Requests\LoginRequest $request - * @param \App\Services\CaptchaService $captchaService * @return \Illuminate\Http\JsonResponse */ - public function __invoke(LoginRequest $request, CaptchaService $captchaService) + public function __invoke(LoginRequest $request) { - $captchaService->validatePhrase( - (string) $request->input('captcha_key'), - (string) $request->input('captcha_phrase') - ); - $user = User::where('phone', $request->input('phone'))->first(); if (! $user?->verifyPassword($request->input('password'))) { diff --git a/app/Endpoint/Api/Http/Controllers/SmsCodeController.php b/app/Endpoint/Api/Http/Controllers/SmsCodeController.php index 27e8d559..0cd8fa6d 100644 --- a/app/Endpoint/Api/Http/Controllers/SmsCodeController.php +++ b/app/Endpoint/Api/Http/Controllers/SmsCodeController.php @@ -4,7 +4,6 @@ namespace App\Endpoint\Api\Http\Controllers; use App\Endpoint\Api\Http\Requests\StoreSmsCodeRequest; use App\Exceptions\BizException; -use App\Services\CaptchaService; use App\Services\SmsCodeService; use Throwable; @@ -14,7 +13,6 @@ class SmsCodeController extends Controller * 发送短信验证码 * * @param \App\Endpoint\Api\Http\Requests\StoreSmsCodeRequest $request - * @param \App\Services\CaptchaService $captchaService * @param \App\Services\SmsCodeService $smsCodeService * @return \Illuminate\Http\Response * @@ -22,16 +20,8 @@ class SmsCodeController extends Controller */ public function store( StoreSmsCodeRequest $request, - CaptchaService $captchaService, SmsCodeService $smsCodeService, ) { - if (! app()->isLocal()) { - $captchaService->validatePhrase( - (string) $request->input('captcha_key'), - (string) $request->input('captcha_phrase') - ); - } - try { $smsCodeService->send( $request->input('phone'), diff --git a/app/Endpoint/Api/Http/Requests/LoginRequest.php b/app/Endpoint/Api/Http/Requests/LoginRequest.php index c2aed4fa..d68e95a2 100644 --- a/app/Endpoint/Api/Http/Requests/LoginRequest.php +++ b/app/Endpoint/Api/Http/Requests/LoginRequest.php @@ -26,7 +26,6 @@ class LoginRequest extends FormRequest return [ 'phone' => ['bail', 'required', 'string'], 'password' => ['bail', 'required', 'string'], - 'captcha_phrase' => ['bail', 'required', 'string'], ]; } } diff --git a/app/Endpoint/Api/Http/Requests/StoreSmsCodeRequest.php b/app/Endpoint/Api/Http/Requests/StoreSmsCodeRequest.php index 398d1ff1..1ee9150d 100644 --- a/app/Endpoint/Api/Http/Requests/StoreSmsCodeRequest.php +++ b/app/Endpoint/Api/Http/Requests/StoreSmsCodeRequest.php @@ -27,7 +27,6 @@ class StoreSmsCodeRequest extends FormRequest return [ 'phone' => ['bail', 'required', new PhoneNumber()], 'type' => ['bail', 'required', 'int'], - 'captcha_phrase' => ['bail', 'required', 'string'], ]; } }