Merge pull request #484 from v2board/dev

1.5.3
v2board · Oct 3, 2021 · 32c539d · 32c539d
2 parents 1a9b8b0 + 52fa1ce
commit 32c539d
Show file tree

Hide file tree

Showing 127 changed files with 2,196 additions and 1,276 deletions.
diff --git a/app/Console/Commands/CheckCommission.php b/app/Console/Commands/CheckCommission.php
@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Models\CommissionLog;
 use Illuminate\Console\Command;
 use App\Models\Order;
 use App\Models\User;
@@ -59,27 +60,66 @@ public function autoCheck()
 
     public function autoPayCommission()
     {
-        $order = Order::where('commission_status', 1)
+        $orders = Order::where('commission_status', 1)
             ->where('invite_user_id', '!=', NULL)
             ->get();
-        foreach ($order as $item) {
-            $inviter = User::find($item->invite_user_id);
+        foreach ($orders as $order) {
+            DB::beginTransaction();
+            if (!$this->payHandle($order->invite_user_id, $order)) {
+                DB::rollBack();
+                continue;
+            }
+            $order->commission_status = 2;
+            if (!$order->save()) {
+                DB::rollBack();
+                continue;
+            }
+            DB::commit();
+        }
+    }
+
+    public function payHandle($inviteUserId, Order $order)
+    {
+        if ((int)config('v2board.commission_distribution_enable', 0)) {
+            $level = 3;
+            $commissionShareLevels = [
+                0 => (int)config('v2board.commission_distribution_l1'),
+                1 => (int)config('v2board.commission_distribution_l2'),
+                2 => (int)config('v2board.commission_distribution_l3')
+            ];
+        } else {
+            $level = 3;
+            $commissionShareLevels = [
+                0 => 100
+            ];
+        }
+        for ($l = 0; $l < $level; $l++) {
+            $inviter = User::find($inviteUserId);
             if (!$inviter) continue;
+            if (!isset($commissionShareLevels[$l])) continue;
+            $commissionBalance = $order->commission_balance * ($commissionShareLevels[$l] / 100);
             if ((int)config('v2board.withdraw_close_enable', 0)) {
-                $inviter->balance = $inviter->balance + $item->commission_balance;
+                $inviter->balance = $inviter->balance + $commissionBalance;
             } else {
-                $inviter->commission_balance = $inviter->commission_balance + $item->commission_balance;
+                $inviter->commission_balance = $inviter->commission_balance + $commissionBalance;
             }
-            DB::beginTransaction();
-            if ($inviter->save()) {
-                $item->commission_status = 2;
-                if (!$item->save()) {
-                    DB::rollBack();
-                    continue;
-                }
-                DB::commit();
+            if (!$inviter->save()) {
+                DB::rollBack();
+                return false;
+            }
+            if (!CommissionLog::create([
+                'invite_user_id' => $inviteUserId,
+                'user_id' => $order->user_id,
+                'trade_no' => $order->trade_no,
+                'order_amount' => $order->total_amount,
+                'get_amount' => $commissionBalance
+            ])) {
+                DB::rollBack();
+                return false;
             }
+            $inviteUserId = $inviter->invite_user_id;
         }
+        return true;
     }
 
 }
diff --git a/app/Console/Commands/CheckOrder.php b/app/Console/Commands/CheckOrder.php
@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Jobs\OrderHandleJob;
 use App\Services\OrderService;
 use Illuminate\Console\Command;
 use App\Models\Order;
@@ -45,20 +46,8 @@ public function handle()
         ini_set('memory_limit', -1);
         $orders = Order::whereIn('status', [0, 1])
             ->get();
-        foreach ($orders as $item) {
-            $orderService = new OrderService($item);
-            switch ($item->status) {
-                // cancel
-                case 0:
-                    if (strtotime($item->created_at) <= (time() - 1800)) {
-                        $orderService->cancel();
-                    }
-                    break;
-                case 1:
-                    $orderService->open();
-                    break;
-            }
-
+        foreach ($orders as $order) {
+            OrderHandleJob::dispatch($order->trade_no);
         }
     }
 }
diff --git a/app/Console/Commands/ResetTraffic.php b/app/Console/Commands/ResetTraffic.php
@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Models\Plan;
 use Illuminate\Console\Command;
 use App\Models\User;
 use Illuminate\Support\Facades\DB;
@@ -42,24 +43,45 @@ public function __construct()
      */
     public function handle()
     {
-        DB::beginTransaction();
-        $resetTrafficMethod = config('v2board.reset_traffic_method', 0);
-        switch ((int)$resetTrafficMethod) {
-            // 1 a month
-            case 0:
-                $this->resetByMonthFirstDay();
-                break;
-            // expire day
-            case 1:
-                $this->resetByExpireDay();
-                break;
+        ini_set('memory_limit', -1);
+        foreach (Plan::get() as $plan) {
+            switch ($plan->reset_traffic_method) {
+                case null: {
+                    $resetTrafficMethod = config('v2board.reset_traffic_method', 0);
+                    switch ((int)$resetTrafficMethod) {
+                        // month first day
+                        case 0:
+                            $this->resetByMonthFirstDay($this->builder);
+                            break;
+                        // expire day
+                        case 1:
+                            $this->resetByExpireDay($this->builder);
+                            break;
+                        // no action
+                        case 2:
+                            break;
+                    }
+                    break;
+                }
+                case 0: {
+                    $builder = $this->builder->where('plan_id', $plan->id);
+                    $this->resetByMonthFirstDay($builder);
+                    break;
+                }
+                case 1: {
+                    $builder = $this->builder->where('plan_id', $plan->id);
+                    $this->resetByExpireDay($builder);
+                    break;
+                }
+                case 2: {
+                    break;
+                }
+            }
         }
-        DB::commit();
     }
 
-    private function resetByMonthFirstDay():void
+    private function resetByMonthFirstDay($builder):void
     {
-        $builder = $this->builder;
         if ((string)date('d') === '01') {
             $builder->update([
                 'u' => 0,
@@ -68,9 +90,8 @@ private function resetByMonthFirstDay():void
         }
     }
 
-    private function resetByExpireDay():void
+    private function resetByExpireDay($builder):void
     {
-        $builder = $this->builder;
         $lastDay = date('d', strtotime('last day of +0 months'));
         $users = [];
         foreach ($builder->get() as $item) {

diff --git a/app/Console/Commands/SendRemindMail.php b/app/Console/Commands/SendRemindMail.php
@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Services\MailService;
 use Illuminate\Console\Command;
 use App\Models\User;
 use App\Models\MailLog;
@@ -41,23 +42,9 @@ public function __construct()
     public function handle()
     {
         $users = User::all();
+        $mailService = new MailService();
         foreach ($users as $user) {
-            if ($user->remind_expire) $this->remindExpire($user);
-        }
-    }
-
-    private function remindExpire($user)
-    {
-        if ($user->expired_at !== NULL && ($user->expired_at - 86400) < time() && $user->expired_at > time()) {
-            SendEmailJob::dispatch([
-                'email' => $user->email,
-                'subject' => '在' . config('v2board.app_name', 'V2board') . '的服务即将到期',
-                'template_name' => 'remindExpire',
-                'template_value' => [
-                    'name' => config('v2board.app_name', 'V2Board'),
-                    'url' => config('v2board.app_url')
-                ]
-            ]);
+            if ($user->remind_expire) $mailService->remindExpire($user);
         }
     }
 }
diff --git a/app/Console/Commands/Test.php b/app/Console/Commands/Test.php
@@ -3,7 +3,10 @@
 namespace App\Console\Commands;
 
 use App\Models\Order;
+use App\Models\User;
+use App\Utils\Helper;
 use Illuminate\Console\Command;
+use Matriphe\Larinfo;
 
 class Test extends Command
 {

diff --git a/app/Console/Commands/V2boardInstall.php b/app/Console/Commands/V2boardInstall.php
@@ -47,13 +47,12 @@ public function handle()
             $this->info(" \ \ / /  __) |  _ \ / _ \ / _` | '__/ _` | ");
             $this->info("  \ V /  / __/| |_) | (_) | (_| | | | (_| | ");
             $this->info("   \_/  |_____|____/ \___/ \__,_|_|  \__,_| ");
-            if (\File::exists(base_path() . '/.lock')) {
+            if (\File::exists(base_path() . '/.env')) {
                 abort(500, 'V2board 已安装，如需重新安装请删除目录下.lock文件');
             }
-            if (!\File::exists(base_path() . '/.env')) {
-                if (!copy(base_path() . '/.env.example', base_path() . '/.env')) {
-                    abort(500, '复制环境文件失败，请检查目录权限');
-                }
+
+            if (!copy(base_path() . '/.env.example', base_path() . '/.env')) {
+                abort(500, '复制环境文件失败，请检查目录权限');
             }
             $this->saveToEnv([
                 'APP_KEY' => 'base64:' . base64_encode(Encrypter::generateKey('AES-256-CBC')),

diff --git a/app/Console/Commands/V2boardStatistics.php b/app/Console/Commands/V2boardStatistics.php
@@ -42,16 +42,16 @@ public function __construct()
      */
     public function handle()
     {
-         $this->statOrder();
-         $this->statServer();
+        $this->statOrder();
+        $this->statServer();
     }
 
     private function statOrder()
     {
         $endAt = strtotime(date('Y-m-d'));
         $startAt = strtotime('-1 day', $endAt);
-        $builder = Order::where('created_at', '>=', $startAt)
-            ->where('created_at', '<', $endAt)
+        $builder = Order::where('paid_at', '>=', $startAt)
+            ->where('paid_at', '<', $endAt)
             ->whereNotIn('status', [0, 2]);
         $orderCount = $builder->count();
         $orderAmount = $builder->sum('total_amount');

diff --git a/app/Console/Commands/V2boardUpdate.php b/app/Console/Commands/V2boardUpdate.php
@@ -51,11 +51,12 @@ public function handle()
         }
         $this->info('正在导入数据库请稍等...');
         foreach ($sql as $item) {
+            if (!$item) continue;
             try {
                 DB::select(DB::raw($item));
             } catch (\Exception $e) {
             }
         }
-        $this->info('更新完毕');
+        $this->info('更新完毕，请重新启动队列服务。');
     }
 }
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -31,9 +31,11 @@ protected function schedule(Schedule $schedule)
         $schedule->command('check:commission')->everyMinute();
         // reset
         $schedule->command('reset:traffic')->daily();
-        $schedule->command('reset:serverLog')->quarterly();
+        $schedule->command('reset:serverLog')->quarterly()->at('0:15');
         // send
         $schedule->command('send:remindMail')->dailyAt('11:30');
+        // horizon metrics
+        $schedule->command('horizon:snapshot')->everyFiveMinutes();
     }
 
     /**

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -2,8 +2,8 @@
 
 namespace App\Exceptions;
 
-use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {
@@ -29,27 +29,27 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param \Exception $exception
+     * @param  \Throwable  $exception
      * @return void
+     *
+     * @throws \Throwable
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
 
     /**
      * Render an exception into an HTTP response.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Exception $exception
-     * @return \Illuminate\Http\Response
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Throwable  $exception
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws \Throwable
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
-        if($exception instanceof \Illuminate\Http\Exceptions\ThrottleRequestsException) {
-            abort(429, '请求频繁，请稍后再试');
-        }
         return parent::render($request, $exception);
     }
-
 }
diff --git a/app/Http/Controllers/Admin/ConfigController.php b/app/Http/Controllers/Admin/ConfigController.php
@@ -60,7 +60,11 @@ public function fetch()
                     'commission_auto_check_enable' => config('v2board.commission_auto_check_enable', 1),
                     'commission_withdraw_limit' => config('v2board.commission_withdraw_limit', 100),
                     'commission_withdraw_method' => config('v2board.commission_withdraw_method', Dict::WITHDRAW_METHOD_WHITELIST_DEFAULT),
-                    'withdraw_close_enable' => config('v2board.withdraw_close_enable', 0)
+                    'withdraw_close_enable' => config('v2board.withdraw_close_enable', 0),
+                    'commission_distribution_enable' => config('v2board.commission_distribution_enable', 0),
+                    'commission_distribution_l1' => config('v2board.commission_distribution_l1'),
+                    'commission_distribution_l2' => config('v2board.commission_distribution_l2'),
+                    'commission_distribution_l3' => config('v2board.commission_distribution_l3')
                 ],
                 'site' => [
                     'safe_mode_enable' => (int)config('v2board.safe_mode_enable', 0),
@@ -136,9 +140,6 @@ public function fetch()
                     'server_v2ray_domain' => config('v2board.server_v2ray_domain'),
                     'server_v2ray_protocol' => config('v2board.server_v2ray_protocol'),
                 ],
-                'tutorial' => [
-                    'apple_id' => config('v2board.apple_id')
-                ],
                 'email' => [
                     'email_template' => config('v2board.email_template', 'default'),
                     'email_host' => config('v2board.email_host'),
@@ -166,7 +167,7 @@ public function fetch()
 
     public function save(ConfigSave $request)
     {
-        $data = $request->input();
+        $data = $request->validated();
         $array = \Config::get('v2board');
         foreach ($data as $k => $v) {
             if (!in_array($k, array_keys($request->validated()))) {