diff --git a/app/Http/Controllers/Api/V1/LoginController.php b/app/Http/Controllers/Api/V1/LoginController.php index 1ee52c0..abadb91 100644 --- a/app/Http/Controllers/Api/V1/LoginController.php +++ b/app/Http/Controllers/Api/V1/LoginController.php @@ -15,6 +15,8 @@ use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; use Jenssegers\Agent\Agent; +use Illuminate\Support\Facades\Log; +use Mews\Captcha\Facades\Captcha; class LoginController extends ApiController { @@ -138,6 +140,9 @@ class LoginController extends ApiController //发送注册邮箱验证码 public function sendEmailCode(Request $request, User $user) { + if(!$request->input('gc_code') || !$request->input('gc_key')){ + exit(); + } if ($vr = $this->verifyField($request->all(), [ 'email' => 'required|string', 'type' => 'integer|in:1', //1注册验证码 @@ -145,6 +150,10 @@ class LoginController extends ApiController ])) return $vr; $account = $request->input('email'); + if(!captcha_api_check($request->input('gc_code'),$request->input('gc_key'),'math')){ + return $this->error(4001, "GraphicalVerificationCodeError"); + exit(); + } // if($this->agent->isDesktop()){ // $token = $request->input('token'); // if( ($checkResult = checkSliderVerify($account,$token)) !== true ) return $this->error(0,$checkResult); @@ -171,6 +180,15 @@ class LoginController extends ApiController return $this->error(4001, $sendResult); } + /** + * 图形验证码 + * 返回base64 + * @return \Illuminate\Http\JsonResponse + */ + public function Graph_che(){ + return $this->successWithData(Captcha::create("math", true)); + } + public function register(Request $request, User $user) { if ($vr = $this->verifyField($request->all(), [ diff --git a/app/Http/Controllers/Appapi/V1/LoginController.php b/app/Http/Controllers/Appapi/V1/LoginController.php index 4467549..44692b9 100644 --- a/app/Http/Controllers/Appapi/V1/LoginController.php +++ b/app/Http/Controllers/Appapi/V1/LoginController.php @@ -16,6 +16,8 @@ use Illuminate\Support\Facades\DB; use Jenssegers\Agent\Agent; use Illuminate\Support\Facades\App; +use Illuminate\Support\Facades\Log; +use Mews\Captcha\Facades\Captcha; class LoginController extends ApiController { @@ -160,11 +162,18 @@ class LoginController extends ApiController //发送注册邮箱验证码 public function sendEmailCode(Request $request, User $user) { + if(!$request->input('gc_code') || !$request->input('gc_key')){ + exit(); + } if ($vr = $this->verifyField($request->all(), [ 'email' => 'required|string', 'type' => 'integer|in:1', //1注册验证码 'token' => '', ])) return $vr; + if(!captcha_api_check($request->input('gc_code'),$request->input('gc_key'),'math')){ + return $this->error(4001, "GraphicalVerificationCodeError"); + exit(); + } $account = $request->input('email'); // if($this->agent->isDesktop()){ @@ -185,6 +194,15 @@ class LoginController extends ApiController return $this->error(4001, $sendResult); } + /** + * 图像验证码 + * 返回base64 + * @return \Illuminate\Http\JsonResponse + */ + public function Graph_che(){ + return $this->successWithData(Captcha::create("math", true)); + } + public function register(Request $request, User $user) { if ($vr = $this->verifyField($request->all(), [ diff --git a/routes/yx_api.php b/routes/yx_api.php index 47b0562..48c065c 100644 --- a/routes/yx_api.php +++ b/routes/yx_api.php @@ -17,6 +17,7 @@ $api->group(['namespace' => 'V1'], function ($api) { $api->post('register/sendSmsCode','LoginController@sendSmsCode');//注册发送短信验证码 $api->post('login/sendSmsCodeBeforeLogin','LoginController@sendSmsCodeBeforeLogin');//登陆发送短信验证码 $api->post('register/sendEmailCode','LoginController@sendEmailCode');//注册发送邮箱验证码 + $api->get('register/Graph_che','LoginController@Graph_che');//注册发送邮箱验证码 $api->post('login/sendEmailCodeBeforeLogin','LoginController@sendEmailCodeBeforeLogin');//登陆发送邮箱验证码 $api->post('user/register','LoginController@register');//注册 $api->post('user/login','LoginController@login');//登录 @@ -176,7 +177,7 @@ $api->group(['namespace' => 'V1','middleware'=>'auth.api'], function ($api) { $api->get('user/batchReadNotifiables','UserController@batchReadNotifiables'); - + //用户意见反馈 $api->get('user/advices','UserController@advices'); $api->get('user/adviceDetail','UserController@adviceDetail'); @@ -190,7 +191,7 @@ $api->group(['namespace' => 'V1','middleware'=>'auth.api'], function ($api) { //用户钱包流水 $api->get('user/getWalletLogs','UserWalletController@getWalletLogs'); - + //购买期权 $api->get('option/getUserCoinBalance','OptionSceneController@getUserCoinBalance');//获取用户账户资金余额 $api->get('option/getOptionHistoryOrders','OptionSceneController@getOptionHistoryOrders');//获取用户期权购买记录 diff --git a/routes/yx_appapi.php b/routes/yx_appapi.php index 5a7a08a..da5e7e4 100644 --- a/routes/yx_appapi.php +++ b/routes/yx_appapi.php @@ -12,6 +12,7 @@ $api->group(['namespace' => 'V1'], function ($api) { $api->post('register/sendSmsCode', 'LoginController@sendSmsCode'); //注册发送短信验证码 $api->post('login/sendSmsCodeBeforeLogin', 'LoginController@sendSmsCodeBeforeLogin'); //登陆发送短信验证码 $api->post('register/sendEmailCode', 'LoginController@sendEmailCode'); //注册发送邮箱验证码 + $api->get('register/Graph_che', 'LoginController@Graph_che'); //图形验证码 $api->post('login/sendEmailCodeBeforeLogin', 'LoginController@sendEmailCodeBeforeLogin'); //登陆发送邮箱验证码 $api->post('user/register', 'LoginController@register'); //注册 $api->post('user/login', 'LoginController@login'); //登录