移除图形验证码
parent
d2b8a37d6e
commit
a4560e69ab
|
|
@ -6,7 +6,6 @@ use App\Constants\Device;
|
||||||
use App\Endpoint\Api\Http\Requests\LoginRequest;
|
use App\Endpoint\Api\Http\Requests\LoginRequest;
|
||||||
use App\Exceptions\BizException;
|
use App\Exceptions\BizException;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use App\Services\CaptchaService;
|
|
||||||
|
|
||||||
class LoginController extends Controller
|
class LoginController extends Controller
|
||||||
{
|
{
|
||||||
|
|
@ -14,16 +13,10 @@ class LoginController extends Controller
|
||||||
* 登录
|
* 登录
|
||||||
*
|
*
|
||||||
* @param \App\Endpoint\Api\Http\Requests\LoginRequest $request
|
* @param \App\Endpoint\Api\Http\Requests\LoginRequest $request
|
||||||
* @param \App\Services\CaptchaService $captchaService
|
|
||||||
* @return \Illuminate\Http\JsonResponse
|
* @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();
|
$user = User::where('phone', $request->input('phone'))->first();
|
||||||
|
|
||||||
if (! $user?->verifyPassword($request->input('password'))) {
|
if (! $user?->verifyPassword($request->input('password'))) {
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@ namespace App\Endpoint\Api\Http\Controllers;
|
||||||
|
|
||||||
use App\Endpoint\Api\Http\Requests\StoreSmsCodeRequest;
|
use App\Endpoint\Api\Http\Requests\StoreSmsCodeRequest;
|
||||||
use App\Exceptions\BizException;
|
use App\Exceptions\BizException;
|
||||||
use App\Services\CaptchaService;
|
|
||||||
use App\Services\SmsCodeService;
|
use App\Services\SmsCodeService;
|
||||||
use Throwable;
|
use Throwable;
|
||||||
|
|
||||||
|
|
@ -14,7 +13,6 @@ class SmsCodeController extends Controller
|
||||||
* 发送短信验证码
|
* 发送短信验证码
|
||||||
*
|
*
|
||||||
* @param \App\Endpoint\Api\Http\Requests\StoreSmsCodeRequest $request
|
* @param \App\Endpoint\Api\Http\Requests\StoreSmsCodeRequest $request
|
||||||
* @param \App\Services\CaptchaService $captchaService
|
|
||||||
* @param \App\Services\SmsCodeService $smsCodeService
|
* @param \App\Services\SmsCodeService $smsCodeService
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
*
|
*
|
||||||
|
|
@ -22,16 +20,8 @@ class SmsCodeController extends Controller
|
||||||
*/
|
*/
|
||||||
public function store(
|
public function store(
|
||||||
StoreSmsCodeRequest $request,
|
StoreSmsCodeRequest $request,
|
||||||
CaptchaService $captchaService,
|
|
||||||
SmsCodeService $smsCodeService,
|
SmsCodeService $smsCodeService,
|
||||||
) {
|
) {
|
||||||
if (! app()->isLocal()) {
|
|
||||||
$captchaService->validatePhrase(
|
|
||||||
(string) $request->input('captcha_key'),
|
|
||||||
(string) $request->input('captcha_phrase')
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$smsCodeService->send(
|
$smsCodeService->send(
|
||||||
$request->input('phone'),
|
$request->input('phone'),
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,6 @@ class LoginRequest extends FormRequest
|
||||||
return [
|
return [
|
||||||
'phone' => ['bail', 'required', 'string'],
|
'phone' => ['bail', 'required', 'string'],
|
||||||
'password' => ['bail', 'required', 'string'],
|
'password' => ['bail', 'required', 'string'],
|
||||||
'captcha_phrase' => ['bail', 'required', 'string'],
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,6 @@ class StoreSmsCodeRequest extends FormRequest
|
||||||
return [
|
return [
|
||||||
'phone' => ['bail', 'required', new PhoneNumber()],
|
'phone' => ['bail', 'required', new PhoneNumber()],
|
||||||
'type' => ['bail', 'required', 'int'],
|
'type' => ['bail', 'required', 'int'],
|
||||||
'captcha_phrase' => ['bail', 'required', 'string'],
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue