From ca2a744b10a4d7147193939d4115ef86672b8d3e Mon Sep 17 00:00:00 2001 From: Tokumeikoi Date: Mon, 2 Mar 2020 00:27:06 +0800 Subject: [PATCH] opt config && add renew reset traffic --- app/Console/Commands/CheckOrder.php | 14 ++++++-------- app/Http/Controllers/Admin/ConfigController.php | 2 +- app/Http/Requests/Admin/ConfigSave.php | 5 ----- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/app/Console/Commands/CheckOrder.php b/app/Console/Commands/CheckOrder.php index b4862ea0..b1b237e7 100755 --- a/app/Console/Commands/CheckOrder.php +++ b/app/Console/Commands/CheckOrder.php @@ -80,9 +80,10 @@ class CheckOrder extends Command $user->balance = $user->balance + $order->refund_amount; } $user->transfer_enable = $plan->transfer_enable * 1073741824; - $user->enable = 1; - $user->u = 0; - $user->d = 0; + if ((int)config('v2board.renew_reset_traffic_enable', 1)) { + $user->u = 0; + $user->d = 0; + } $user->plan_id = $plan->id; $user->group_id = $plan->group_id; $user->expired_at = $this->getTime($order->cycle, $user->expired_at); @@ -98,11 +99,8 @@ class CheckOrder extends Command $user->balance = $user->balance + $order->refund_amount; } $user->transfer_enable = $plan->transfer_enable * 1073741824; - $user->enable = 1; - if ((int)config('v2board.renew_reset_traffic_enable', 1)) { - $user->u = 0; - $user->d = 0; - } + $user->u = 0; + $user->d = 0; $user->plan_id = $plan->id; $user->group_id = $plan->group_id; $user->expired_at = NULL; diff --git a/app/Http/Controllers/Admin/ConfigController.php b/app/Http/Controllers/Admin/ConfigController.php index a327f3df..83d96e4d 100755 --- a/app/Http/Controllers/Admin/ConfigController.php +++ b/app/Http/Controllers/Admin/ConfigController.php @@ -80,7 +80,7 @@ class ConfigController extends Controller $data = $request->input(); $array = \Config::get('v2board'); foreach ($data as $k => $v) { - if (!in_array($k, ConfigSave::filter())) { + if (!in_array($k, array_keys(ConfigSave::RULES))) { abort(500, '参数' . $k . '不在规则内，禁止修改'); } $array[$k] = $v; diff --git a/app/Http/Requests/Admin/ConfigSave.php b/app/Http/Requests/Admin/ConfigSave.php index 1c28f898..cace371e 100755 --- a/app/Http/Requests/Admin/ConfigSave.php +++ b/app/Http/Requests/Admin/ConfigSave.php @@ -58,11 +58,6 @@ class ConfigSave extends FormRequest 'apple_id_password' => '' ]; - public static function filter() - { - return array_keys(self::RULES); - } - /** * Get the validation rules that apply to the request. *