Browse Source

opt config && add renew reset traffic

Tokumeikoi 5 years ago
parent
commit
ca2a744b10

+ 6 - 8
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;

+ 1 - 1
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;

+ 0 - 5
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.
      *