Browse Source

add renew reset traffic switch

Tokumeikoi 5 years ago
parent
commit
0f72e9a091

+ 4 - 2
app/Console/Commands/CheckOrder.php

@@ -99,8 +99,10 @@ class CheckOrder extends Command
         }
         $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 = NULL;

+ 1 - 1
app/Console/Commands/ResetTraffic.php

@@ -39,7 +39,7 @@ class ResetTraffic extends Command
     public function handle()
     {
         $user = User::where('expired_at', '!=', NULL);
-        $resetTrafficMethod = config('v2board.reset_traffic_method', 0);
+        $resetTrafficMethod = (int)config('v2board.reset_traffic_method', 0);
         switch ($resetTrafficMethod) {
             // 1 a month
             case 0:

+ 2 - 1
app/Http/Controllers/Admin/ConfigController.php

@@ -35,7 +35,8 @@ class ConfigController extends Controller
                 ],
                 'subscribe' => [
                     'plan_change_enable' => (int)config('v2board.plan_change_enable', 1),
-                    'reset_traffic_method' => (int)config('v2board.reset_traffic_method', 0)
+                    'reset_traffic_method' => (int)config('v2board.reset_traffic_method', 0),
+                    'renew_reset_traffic_enable' => (int)config('v2board.renew_reset_traffic_enable', 1)
                 ],
                 'pay' => [
                     // alipay

+ 4 - 0
app/Http/Requests/Admin/ConfigSave.php

@@ -26,6 +26,7 @@ class ConfigSave extends FormRequest
         // subscribe
         'plan_change_enable' => 'in:0,1',
         'reset_traffic_method' => 'in:0,1',
+        'renew_reset_traffic_enable' => 'in:0,1',
         // server
         'server_token' => 'nullable|min:16',
         'server_license' => 'nullable',
@@ -74,7 +75,10 @@ class ConfigSave extends FormRequest
 
     public function messages()
     {
+        // illiteracy prompt
         return [
+            'app_url.url' => '站点URL格式不正确,必须携带http(s)://',
+            'subscribe_url.url' => '订阅URL格式不正确,必须携带http(s)://'
         ];
     }
 }