From 11d96540100d7b7b33ba3700e62524b5241082f1 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 4 Jan 2020 17:46:53 +0800 Subject: [PATCH] update --- app/Http/Controllers/Admin/ConfigController.php | 2 +- .../Controllers/Passport/RegisterController.php | 15 +++++++++++++++ app/Http/Requests/Admin/ConfigSave.php | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/ConfigController.php b/app/Http/Controllers/Admin/ConfigController.php index 8becc418..636ae240 100755 --- a/app/Http/Controllers/Admin/ConfigController.php +++ b/app/Http/Controllers/Admin/ConfigController.php @@ -32,7 +32,7 @@ class ConfigController extends Controller 'subscribe_url' => config('v2board.subscribe_url'), 'plan_update_fee' => config('v2board.plan_update_fee', 0.5), 'plan_is_update' => (int)config('v2board.plan_is_update', 1), - 'try_out_register' => (int)config('v2board.try_out_register', 0), + 'try_out_enable' => (int)config('v2board.try_out_enable', 0), 'try_out_plan_id' => (int)config('v2board.try_out_plan_id'), 'try_out_day' => (int)config('v2board.try_out_day', 1) ], diff --git a/app/Http/Controllers/Passport/RegisterController.php b/app/Http/Controllers/Passport/RegisterController.php index ed9c5117..937bf4fe 100755 --- a/app/Http/Controllers/Passport/RegisterController.php +++ b/app/Http/Controllers/Passport/RegisterController.php @@ -7,6 +7,7 @@ use App\Http\Requests\Passport\RegisterSendEmailVerify; use Illuminate\Http\Request; use App\Http\Controllers\Controller; use App\Models\User; +use App\Models\Plan; use Illuminate\Http\Exceptions\HttpResponseException; use Illuminate\Support\Facades\Redis; use App\Utils\Helper; @@ -14,6 +15,10 @@ use App\Models\InviteCode; class RegisterController extends Controller { + private function setTryOut () { + + } + public function index (RegisterIndex $request) { if ((int)config('v2board.stop_register', 0)) { abort(500, '本站已关闭注册'); @@ -60,6 +65,16 @@ class RegisterController extends Controller } } + // try out + if (config('v2board.try_out_enable', 0)) { + $plan = Plan::find(config('v2board.try_out_plan_id')); + if ($plan) { + $user->plan_id = $plan->id; + $user->group_id = $plan->group_id; + $user->expired_at = time() + (config('v2board.try_out_day', 1) * 86400); + } + } + if (!$user->save()) { abort(500, '注册失败'); } diff --git a/app/Http/Requests/Admin/ConfigSave.php b/app/Http/Requests/Admin/ConfigSave.php index 9fe58ae3..f858b039 100755 --- a/app/Http/Requests/Admin/ConfigSave.php +++ b/app/Http/Requests/Admin/ConfigSave.php @@ -18,7 +18,7 @@ class ConfigSave extends FormRequest 'subscribe_url' => 'url', 'plan_update_fee' => 'numeric', 'plan_is_update' => 'in:0,1', - 'try_out_register' => 'in:0,1', + 'try_out_enable' => 'in:0,1', 'try_out_plan_id' => 'integer', 'try_out_day' => 'integer', // server