diff --git a/app/Http/Controllers/Admin/ConfigController.php b/app/Http/Controllers/Admin/ConfigController.php index d2f99ba8..e3db029a 100755 --- a/app/Http/Controllers/Admin/ConfigController.php +++ b/app/Http/Controllers/Admin/ConfigController.php @@ -8,11 +8,6 @@ use App\Http\Controllers\Controller; class ConfigController extends Controller { - public function init() - { - - } - public function fetch() { return response([ @@ -34,7 +29,8 @@ class ConfigController extends Controller 'plan_transfer_hour' => config('v2board.plan_transfer_hour', 12), 'try_out_plan_id' => (int)config('v2board.try_out_plan_id', 0), 'try_out_hour' => (int)config('v2board.try_out_hour', 1), - 'email_suffix_blacklist' => config('v2board.email_suffix_blacklist') + 'email_whitelist_enable' => (int)config('v2board.email_whitelist_enable', 0), + 'email_whitelist_suffix' => config('v2board.email_whitelist_suffix') ], 'pay' => [ // alipay diff --git a/app/Http/Requests/Admin/ConfigSave.php b/app/Http/Requests/Admin/ConfigSave.php index f1aa2331..845b8e94 100755 --- a/app/Http/Requests/Admin/ConfigSave.php +++ b/app/Http/Requests/Admin/ConfigSave.php @@ -22,7 +22,8 @@ class ConfigSave extends FormRequest 'try_out_enable' => 'in:0,1', 'try_out_plan_id' => 'integer', 'try_out_hour' => 'numeric', - 'email_suffix_blacklist' => '', + 'email_whitelist_enable' => 'in:0,1', + 'email_suffix_whitelist' => '', // server 'server_token' => 'nullable|min:16', 'server_license' => 'nullable',