Merge branch 'develop'

This commit is contained in:
monanxiao 2023-03-23 10:40:35 +08:00
commit bda4fd4c09

View File

@ -367,8 +367,8 @@ class Auth extends BaseController
{
$data = $this->request->params(['phone', 'sms_code', 'spread', 'auth_token',['user_type','h5']]);
$validate->sceneSmslogin()->check($data);
// $sms_code = app()->make(SmsService::class)->checkSmsCode($data['phone'], $data['sms_code'], 'login');
// if (!$sms_code) return app('json')->fail('验证码不正确');
$sms_code = app()->make(SmsService::class)->checkSmsCode($data['phone'], $data['sms_code'], 'login');
if (!$sms_code) return app('json')->fail('验证码不正确');
$user = $repository->accountByUser($data['phone']);
$auth = $this->parseAuthToken($data['auth_token']);
Db::startTrans();