diff --git a/app/Console/Commands/CheckOrder.php b/app/Console/Commands/CheckOrder.php index e7aa96a1..b6069f49 100755 --- a/app/Console/Commands/CheckOrder.php +++ b/app/Console/Commands/CheckOrder.php @@ -42,6 +42,7 @@ class CheckOrder extends Command */ public function handle() { + ini_set('memory_limit', -1); $orders = Order::whereIn('status', [0, 1]) ->get(); foreach ($orders as $item) { diff --git a/app/Console/Commands/ResetTraffic.php b/app/Console/Commands/ResetTraffic.php index 44b799a8..1d9c0a50 100644 --- a/app/Console/Commands/ResetTraffic.php +++ b/app/Console/Commands/ResetTraffic.php @@ -4,6 +4,7 @@ namespace App\Console\Commands; use Illuminate\Console\Command; use App\Models\User; +use Illuminate\Support\Facades\DB; class ResetTraffic extends Command { @@ -41,6 +42,7 @@ class ResetTraffic extends Command */ public function handle() { + DB::beginTransaction(); $resetTrafficMethod = config('v2board.reset_traffic_method', 0); switch ((int)$resetTrafficMethod) { // 1 a month @@ -52,6 +54,7 @@ class ResetTraffic extends Command $this->resetByExpireDay(); break; } + DB::commit(); } private function resetByMonthFirstDay():void diff --git a/database/update.sql b/database/update.sql index 8c7f32b6..4930ab7f 100644 --- a/database/update.sql +++ b/database/update.sql @@ -411,7 +411,7 @@ ALTER TABLE `v2_order` ALTER TABLE `v2_payment` ADD `uuid` char(32) NOT NULL AFTER `id`; - +-- 1.5.2 ALTER TABLE `v2_user` ADD `deleted_at` int(11) NULL AFTER `updated_at`;