Refactor admin

update: fix flag name matching confusion

app/Console/Commands/CheckCommission.php

@@ -50,7 +50,7 @@ class CheckCommission extends Command
         if ((int)config('v2board.commission_auto_check_enable', 1)) {
             Order::where('commission_status', 0)
                 ->where('invite_user_id', '!=', NULL)
-                ->whereNotIn('status', [0, 2])
+                ->where('status', 3)
                 ->where('updated_at', '<=', strtotime('-3 day', time()))
                 ->update([
                     'commission_status' => 1

app/Console/Commands/ResetLog.php

@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Models\Log;
 use App\Models\Plan;
 use App\Models\StatServer;
 use App\Models\StatUser;
@@ -46,5 +47,6 @@ class ResetLog extends Command
     {
         StatUser::where('record_at', '<', strtotime('-2 month', time()))->delete();
         StatServer::where('record_at', '<', strtotime('-2 month', time()))->delete();
+        Log::where('created_at', '<', strtotime('-1 month', time()))->delete();
     }
 }

app/Console/Commands/SendRemindMail.php

@@ -45,6 +45,7 @@ class SendRemindMail extends Command
         $mailService = new MailService();
         foreach ($users as $user) {
             if ($user->remind_expire) $mailService->remindExpire($user);
+            if ($user->remind_traffic) $mailService->remindTraffic($user);
         }
     }
 }

app/Console/Commands/V2boardStatistics.php

@@ -2,10 +2,12 @@
 
 namespace App\Console\Commands;
 
+use App\Models\StatServer;
+use App\Models\StatUser;
+use App\Services\StatisticalService;
 use Illuminate\Console\Command;
-use App\Models\Order;
-use App\Models\StatOrder;
-use App\Models\CommissionLog;
+use App\Models\Stat;
+use Illuminate\Support\Facades\DB;
 
 class V2boardStatistics extends Command
 {
@@ -40,38 +42,99 @@ class V2boardStatistics extends Command
      */
     public function handle()
     {
+        $startAt = microtime(true);
         ini_set('memory_limit', -1);
-        $this->statOrder();
+        $this->statUser();
+        $this->statServer();
+        $this->stat();
+        info('统计任务执行完毕。耗时:' . (microtime(true) - $startAt) / 1000);
     }
 
-    private function statOrder()
+    private function statServer()
     {
-        $endAt = strtotime(date('Y-m-d'));
-        $startAt = strtotime('-1 day', $endAt);
-        $orderBuilder = Order::where('paid_at', '>=', $startAt)
-            ->where('paid_at', '<', $endAt)
-            ->whereNotIn('status', [0, 2]);
-        $orderCount = $orderBuilder->count();
-        $orderAmount = $orderBuilder->sum('total_amount');
-        $commissionLogBuilder = CommissionLog::where('created_at', '>=', $startAt)
-            ->where('created_at', '<', $endAt);
-        $commissionCount = $commissionLogBuilder->count();
-        $commissionAmount = $commissionLogBuilder->sum('get_amount');
-        $data = [
-            'order_count' => $orderCount,
-            'order_amount' => $orderAmount,
-            'commission_count' => $commissionCount,
-            'commission_amount' => $commissionAmount,
-            'record_type' => 'd',
-            'record_at' => $startAt
-        ];
-        $statistic = StatOrder::where('record_at', $startAt)
-            ->where('record_type', 'd')
-            ->first();
-        if ($statistic) {
-            $statistic->update($data);
-            return;
+        try {
+            DB::beginTransaction();
+            $createdAt = time();
+            $recordAt = strtotime('-1 day', strtotime(date('Y-m-d')));
+            $statService = new StatisticalService();
+            $statService->setStartAt($recordAt);
+            $statService->setServerStats();
+            $stats = $statService->getStatServer();
+            foreach ($stats as $stat) {
+                if (!StatServer::insert([
+                    'server_id' => $stat['server_id'],
+                    'server_type' => $stat['server_type'],
+                    'u' => $stat['u'],
+                    'd' => $stat['d'],
+                    'created_at' => $createdAt,
+                    'updated_at' => $createdAt,
+                    'record_type' => 'd',
+                    'record_at' => $recordAt
+                ])) {
+                    throw new \Exception('stat server fail');
+                }
+            }
+            DB::commit();
+            $statService->clearStatServer();
+        } catch (\Exception $e) {
+            DB::rollback();
+            \Log::error($e->getMessage(), ['exception' => $e]);
+        }
+    }
+
+    private function statUser()
+    {
+        try {
+            DB::beginTransaction();
+            $createdAt = time();
+            $recordAt = strtotime('-1 day', strtotime(date('Y-m-d')));
+            $statService = new StatisticalService();
+            $statService->setStartAt($recordAt);
+            $statService->setUserStats();
+            $stats = $statService->getStatUser();
+            foreach ($stats as $stat) {
+                if (!StatUser::insert([
+                    'user_id' => $stat['user_id'],
+                    'u' => $stat['u'],
+                    'd' => $stat['d'],
+                    'server_rate' => $stat['server_rate'],
+                    'created_at' => $createdAt,
+                    'updated_at' => $createdAt,
+                    'record_type' => 'd',
+                    'record_at' => $recordAt
+                ])) {
+                    throw new \Exception('stat user fail');
+                }
+            }
+            DB::commit();
+            $statService->clearStatUser();
+        } catch (\Exception $e) {
+            DB::rollback();
+            \Log::error($e->getMessage(), ['exception' => $e]);
+        }
+    }
+
+    private function stat()
+    {
+        try {
+            $endAt = strtotime(date('Y-m-d'));
+            $startAt = strtotime('-1 day', $endAt);
+            $statisticalService = new StatisticalService();
+            $statisticalService->setStartAt($startAt);
+            $statisticalService->setEndAt($endAt);
+            $data = $statisticalService->generateStatData();
+            $data['record_at'] = $startAt;
+            $data['record_type'] = 'd';
+            $statistic = Stat::where('record_at', $startAt)
+                ->where('record_type', 'd')
+                ->first();
+            if ($statistic) {
+                $statistic->update($data);
+                return;
+            }
+            Stat::create($data);
+        } catch (\Exception $e) {
+            \Log::error($e->getMessage(), ['exception' => $e]);
         }
-        StatOrder::create($data);
     }
 }

app/Exceptions/Handler.php

@@ -54,9 +54,7 @@ class Handler extends ExceptionHandler
     public function render($request, Throwable $exception)
     {
         if ($exception instanceof ViewException) {
-            return response([
-                'message' => "主题初始化发生错误，请在后台对主题检查或配置后重试。"
-            ]);
+            abort(500, "主题渲染失败。如更新主题，参数可能发生变化请重新配置主题后再试。");
         }
         return parent::render($request, $exception);
     }

app/Http/Controllers/Admin/Server/ManageController.php

@@ -1,54 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin\Server;
-
-use App\Models\ServerV2ray;
-use App\Models\ServerShadowsocks;
-use App\Models\ServerTrojan;
-use App\Services\ServerService;
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\DB;
-
-class ManageController extends Controller
-{
-    public function getNodes(Request $request)
-    {
-        $serverService = new ServerService();
-        return response([
-            'data' => $serverService->getAllServers()
-        ]);
-    }
-
-    public function sort(Request $request)
-    {
-        ini_set('post_max_size', '1m');
-        DB::beginTransaction();
-        foreach ($request->input('sorts') as $k => $v) {
-            switch ($v['key']) {
-                case 'shadowsocks':
-                    if (!ServerShadowsocks::find($v['value'])->update(['sort' => $k + 1])) {
-                        DB::rollBack();
-                        abort(500, '保存失败');
-                    }
-                    break;
-                case 'v2ray':
-                    if (!ServerV2ray::find($v['value'])->update(['sort' => $k + 1])) {
-                        DB::rollBack();
-                        abort(500, '保存失败');
-                    }
-                    break;
-                case 'trojan':
-                    if (!ServerTrojan::find($v['value'])->update(['sort' => $k + 1])) {
-                        DB::rollBack();
-                        abort(500, '保存失败');
-                    }
-                    break;
-            }
-        }
-        DB::commit();
-        return response([
-            'data' => true
-        ]);
-    }
-}

app/Http/Controllers/Guest/PlanController.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Guest;
-
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\Plan;
-
-class PlanController extends Controller
-{
-    public function fetch(Request $request)
-    {
-        $plan = Plan::where('show', 1)->get();
-        return response([
-            'data' => $plan
-        ]);
-    }
-}

app/Http/Controllers/V1/Admin/ConfigController.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace App\Http\Controllers\V1\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\Admin\ConfigSave;
+use App\Jobs\SendEmailJob;
+use App\Services\ConfigService;
+use App\Services\TelegramService;
+use App\Utils\Dict;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Mail;
+
+class ConfigController extends Controller
+{
+    public function getEmailTemplate()
+    {
+        $path = resource_path('views/mail/');
+        $files = array_map(function ($item) use ($path) {
+            return str_replace($path, '', $item);
+        }, glob($path . '*'));
+        return response([
+            'data' => $files
+        ]);
+    }
+
+    public function getThemeTemplate()
+    {
+        $path = public_path('theme/');
+        $files = array_map(function ($item) use ($path) {
+            return str_replace($path, '', $item);
+        }, glob($path . '*'));
+        return response([
+            'data' => $files
+        ]);
+    }
+
+    public function testSendMail(Request $request)
+    {
+        $obj = new SendEmailJob([
+            'email' => $request->user['email'],
+            'subject' => 'This is v2board test email',
+            'template_name' => 'notify',
+            'template_value' => [
+                'name' => config('v2board.app_name', 'V2Board'),
+                'content' => 'This is v2board test email',
+                'url' => config('v2board.app_url')
+            ]
+        ]);
+        return response([
+            'data' => true,
+            'log' => $obj->handle()
+        ]);
+    }
+
+    public function setTelegramWebhook(Request $request)
+    {
+        $hookUrl = url('/api/v1/guest/telegram/webhook?access_token=' . md5(config('v2board.telegram_bot_token', $request->input('telegram_bot_token'))));
+        $telegramService = new TelegramService($request->input('telegram_bot_token'));
+        $telegramService->getMe();
+        $telegramService->setWebhook($hookUrl);
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function fetch(Request $request)
+    {
+        $key = $request->input('key');
+        $data = (new ConfigService)->getDefaultConfig();
+        if ($key && isset($data[$key])) {
+            return response([
+                'data' => [
+                    $key => $data[$key]
+                ]
+            ]);
+        };
+        // TODO: default should be in Dict
+        return response([
+            'data' => $data
+        ]);
+    }
+
+    public function save(ConfigSave $request)
+    {
+        $data = $request->validated();
+        $config = config('v2board');
+        foreach (ConfigSave::RULES as $k => $v) {
+            if (!in_array($k, array_keys(ConfigSave::RULES))) {
+                unset($config[$k]);
+                continue;
+            }
+            if (array_key_exists($k, $data)) {
+                $config[$k] = $data[$k];
+            }
+        }
+        $data = var_export($config, 1);
+        if (!File::put(base_path() . '/config/v2board.php', "<?php\n return $data ;")) {
+            abort(500, '修改失败');
+        }
+        if (function_exists('opcache_reset')) {
+            if (opcache_reset() === false) {
+                abort(500, '缓存清除失败，请卸载或检查opcache配置状态');
+            }
+        }
+        Artisan::call('config:cache');
+        return response([
+            'data' => true
+        ]);
+    }
+}

app/Http/Controllers/V1/Admin/CouponController.php

@@ -1,15 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\V1\Admin;
 
-use App\Http\Requests\Admin\CouponSave;
-use App\Http\Requests\Admin\CouponGenerate;
-use App\Models\Plan;
-use App\Models\User;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\Admin\CouponGenerate;
+use App\Http\Requests\Admin\CouponSave;
 use App\Models\Coupon;
 use App\Utils\Helper;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
 class CouponController extends Controller
@@ -82,6 +80,7 @@ class CouponController extends Controller
         $coupons = [];
         $coupon = $request->validated();
         $coupon['created_at'] = $coupon['updated_at'] = time();
+        $coupon['show'] = 1;
         unset($coupon['generate_count']);
         for ($i = 0;$i < $request->input('generate_count');$i++) {
             $coupon['code'] = Helper::randomChar(8);

app/Http/Controllers/V1/Admin/KnowledgeController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\V1\Admin;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\KnowledgeSave;
 use App\Http\Requests\Admin\KnowledgeSort;
 use App\Models\Knowledge;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\DB;
 
 class KnowledgeController extends Controller

app/Http/Controllers/V1/Admin/NoticeController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\V1\Admin;
 
-use App\Http\Requests\Admin\NoticeSave;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\Admin\NoticeSave;
 use App\Models\Notice;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 
 class NoticeController extends Controller

app/Http/Controllers/V1/Admin/OrderController.php

@@ -1,19 +1,19 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\V1\Admin;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\OrderAssign;
-use App\Http\Requests\Admin\OrderUpdate;
 use App\Http\Requests\Admin\OrderFetch;
+use App\Http\Requests\Admin\OrderUpdate;
 use App\Models\CommissionLog;
+use App\Models\Order;
+use App\Models\Plan;
+use App\Models\User;
 use App\Services\OrderService;
 use App\Services\UserService;
 use App\Utils\Helper;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\Order;
-use App\Models\User;
-use App\Models\Plan;
 use Illuminate\Support\Facades\DB;
 
 class OrderController extends Controller

app/Http/Controllers/V1/Admin/PaymentController.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\V1\Admin;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\PaymentSave;
+use App\Models\Payment;
 use App\Services\PaymentService;
 use App\Utils\Helper;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\Payment;
 use Illuminate\Support\Facades\DB;
 
 class PaymentController extends Controller

app/Http/Controllers/V1/Admin/PlanController.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\V1\Admin;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\PlanSave;
 use App\Http\Requests\Admin\PlanSort;
 use App\Http\Requests\Admin\PlanUpdate;
+use App\Models\Order;
+use App\Models\Plan;
+use App\Models\User;
 use App\Services\PlanService;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\Plan;
-use App\Models\Order;
-use App\Models\User;
 use Illuminate\Support\Facades\DB;
 
 class PlanController extends Controller

app/Http/Controllers/V1/Admin/Server/GroupController.php

@@ -1,16 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Server;
+namespace App\Http\Controllers\V1\Admin\Server;
 
+use App\Http\Controllers\Controller;
 use App\Models\Plan;
-use App\Models\ServerShadowsocks;
-use App\Models\ServerTrojan;
-use App\Models\ServerV2ray;
 use App\Models\ServerGroup;
+use App\Models\ServerVmess;
 use App\Models\User;
 use App\Services\ServerService;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 
 class GroupController extends Controller
 {
@@ -65,7 +63,7 @@ class GroupController extends Controller
             }
         }
 
-        $servers = ServerV2ray::all();
+        $servers = ServerVmess::all();
         foreach ($servers as $server) {
             if (in_array($request->input('id'), $server->group_id)) {
                 abort(500, '该组已被节点所使用，无法删除');

app/Http/Controllers/V1/Admin/Server/HysteriaController.php

@@ -0,0 +1,111 @@
+<?php
+
+namespace App\Http\Controllers\V1\Admin\Server;
+
+use App\Http\Controllers\Controller;
+use App\Models\ServerHysteria;
+use Illuminate\Http\Request;
+
+class HysteriaController extends Controller
+{
+    public function save(Request $request)
+    {
+        $params = $request->validate([
+            'show' => '',
+            'name' => 'required',
+            'group_id' => 'required|array',
+            'route_id' => 'nullable|array',
+            'parent_id' => 'nullable|integer',
+            'host' => 'required',
+            'port' => 'required',
+            'server_port' => 'required',
+            'tags' => 'nullable|array',
+            'rate' => 'required|numeric',
+            'up_mbps' => 'required|numeric|min:1',
+            'down_mbps' => 'required|numeric|min:1',
+            'server_name' => 'nullable',
+            'insecure' => 'required|in:0,1',
+            'obfs_type' => 'nullable|in:salamander',
+            'ignore_client_bandwidth' => 'required|in:0,1'
+        ]);
+
+        if ($request->input('id')) {
+            $server = ServerHysteria::find($request->input('id'));
+            if (!$server) {
+                abort(500, '服务器不存在');
+            }
+            try {
+                $server->update($params);
+            } catch (\Exception $e) {
+                abort(500, '保存失败');
+            }
+            return response([
+                'data' => true
+            ]);
+        }
+
+        if (!ServerHysteria::create($params)) {
+            abort(500, '创建失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function drop(Request $request)
+    {
+        if ($request->input('id')) {
+            $server = ServerHysteria::find($request->input('id'));
+            if (!$server) {
+                abort(500, '节点ID不存在');
+            }
+        }
+        return response([
+            'data' => $server->delete()
+        ]);
+    }
+
+    public function update(Request $request)
+    {
+        $request->validate([
+            'show' => 'in:0,1'
+        ], [
+            'show.in' => '显示状态格式不正确'
+        ]);
+        $params = $request->only([
+            'show',
+        ]);
+
+        $server = ServerHysteria::find($request->input('id'));
+
+        if (!$server) {
+            abort(500, '该服务器不存在');
+        }
+        try {
+            $server->update($params);
+        } catch (\Exception $e) {
+            abort(500, '保存失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function copy(Request $request)
+    {
+        $server = ServerHysteria::find($request->input('id'));
+        $server->show = 0;
+        if (!$server) {
+            abort(500, '服务器不存在');
+        }
+        if (!ServerHysteria::create($server->toArray())) {
+            abort(500, '复制失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+}

app/Http/Controllers/V1/Admin/Server/ManageController.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Http\Controllers\V1\Admin\Server;
+
+use App\Http\Controllers\Controller;
+use App\Services\ServerService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class ManageController extends Controller
+{
+    public function getNodes(Request $request)
+    {
+        $serverService = new ServerService();
+        return response([
+            'data' => $serverService->getAllServers()
+        ]);
+    }
+
+    public function sort(Request $request)
+    {
+        ini_set('post_max_size', '1m');
+        $params = $request->only(
+                'shadowsocks',
+                'vmess',
+                'trojan',
+                'hysteria'
+            ) ?? [];
+        DB::beginTransaction();
+        foreach ($params as $k => $v) {
+            $model = 'App\\Models\\Server' . ucfirst($k);
+            foreach($v as $id => $sort) {
+                if (!$model::find($id)->update(['sort' => $sort])) {
+                    DB::rollBack();
+                    abort(500, '保存失败');
+                }
+            }
+        }
+        DB::commit();
+        return response([
+            'data' => true
+        ]);
+    }
+}

app/Http/Controllers/V1/Admin/Server/RouteController.php

@@ -1,14 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Server;
+namespace App\Http\Controllers\V1\Admin\Server;
 
-use App\Http\Requests\Admin\ServerShadowsocksSave;
-use App\Http\Requests\Admin\ServerShadowsocksUpdate;
-use App\Models\ServerRoute;
-use App\Models\ServerShadowsocks;
-use App\Services\ServerService;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Models\ServerRoute;
+use Illuminate\Http\Request;
 
 class RouteController extends Controller
 {

app/Http/Controllers/V1/Admin/Server/ShadowsocksController.php

@@ -1,13 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Server;
+namespace App\Http\Controllers\V1\Admin\Server;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\ServerShadowsocksSave;
 use App\Http\Requests\Admin\ServerShadowsocksUpdate;
 use App\Models\ServerShadowsocks;
-use App\Services\ServerService;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 
 class ShadowsocksController extends Controller
 {

app/Http/Controllers/V1/Admin/Server/TrojanController.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Server;
+namespace App\Http\Controllers\V1\Admin\Server;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\ServerTrojanSave;
 use App\Http\Requests\Admin\ServerTrojanUpdate;
+use App\Models\ServerTrojan;
 use App\Services\ServerService;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\ServerTrojan;
 
 class TrojanController extends Controller
 {

app/Http/Controllers/V1/Admin/Server/VlessController.php

@@ -0,0 +1,119 @@
+<?php
+
+namespace App\Http\Controllers\V1\Admin\Server;
+
+use App\Http\Controllers\Controller;
+use App\Models\ServerVless;
+use Illuminate\Http\Request;
+use ParagonIE_Sodium_Compat as SodiumCompat;
+use App\Utils\Helper;
+
+class VlessController extends Controller
+{
+    public function save(Request $request)
+    {
+        $params = $request->validate([
+            'group_id' => 'required',
+            'route_id' => 'nullable|array',
+            'name' => 'required',
+            'parent_id' => 'nullable|integer',
+            'host' => 'required',
+            'port' => 'required',
+            'server_port' => 'required',
+            'tls' => 'required|in:0,1,2',
+            'tls_settings' => 'nullable|array',
+            'flow' => 'nullable|in:xtls-rprx-vision',
+            'network' => 'required',
+            'network_settings' => 'nullable|array',
+            'tags' => 'nullable|array',
+            'rate' => 'required',
+            'show' => 'nullable|in:0,1',
+            'sort' => 'nullable'
+        ]);
+
+        if (isset($params['tls']) && (int)$params['tls'] === 2) {
+            $keyPair = SodiumCompat::crypto_box_keypair();
+            $params['tls_settings'] = $params['tls_settings'] ?? [];
+            if (!isset($params['tls_settings']['public_key'])) {
+                $params['tls_settings']['public_key'] = Helper::base64EncodeUrlSafe(SodiumCompat::crypto_box_publickey($keyPair));
+            }
+            if (!isset($params['tls_settings']['private_key'])) {
+                $params['tls_settings']['private_key'] = Helper::base64EncodeUrlSafe(SodiumCompat::crypto_box_secretkey($keyPair));
+            }
+        }
+
+        if ($request->input('id')) {
+            $server = ServerVless::find($request->input('id'));
+            if (!$server) {
+                abort(500, '服务器不存在');
+            }
+            try {
+                $server->update($params);
+            } catch (\Exception $e) {
+                abort(500, '保存失败');
+            }
+            return response([
+                'data' => true
+            ]);
+        }
+
+        if (!ServerVless::create($params)) {
+            abort(500, '创建失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function drop(Request $request)
+    {
+        if ($request->input('id')) {
+            $server = ServerVless::find($request->input('id'));
+            if (!$server) {
+                abort(500, '节点ID不存在');
+            }
+        }
+        return response([
+            'data' => $server->delete()
+        ]);
+    }
+
+    public function update(Request $request)
+    {
+        $params = $request->validate([
+            'show' => 'nullable|in:0,1',
+        ]);
+
+        $server = ServerVless::find($request->input('id'));
+
+        if (!$server) {
+            abort(500, '该服务器不存在');
+        }
+        try {
+            $server->update($params);
+        } catch (\Exception $e) {
+            abort(500, '保存失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function copy(Request $request)
+    {
+        $server = ServerVless::find($request->input('id'));
+        $server->show = 0;
+        if (!$server) {
+            abort(500, '服务器不存在');
+        }
+        if (!ServerVless::create($server->toArray())) {
+            abort(500, '复制失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+}

app/Http/Controllers/V1/Admin/Server/VmessController.php

@@ -1,22 +1,21 @@
 <?php
 
-namespace App\Http\Controllers\Admin\Server;
+namespace App\Http\Controllers\V1\Admin\Server;
 
-use App\Http\Requests\Admin\ServerV2raySave;
-use App\Http\Requests\Admin\ServerV2rayUpdate;
-use App\Services\ServerService;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use App\Models\ServerV2ray;
+use App\Http\Requests\Admin\ServerVmessSave;
+use App\Http\Requests\Admin\ServerVmessUpdate;
+use App\Models\ServerVmess;
+use Illuminate\Http\Request;
 
-class V2rayController extends Controller
+class VmessController extends Controller
 {
-    public function save(ServerV2raySave $request)
+    public function save(ServerVmessSave $request)
     {
         $params = $request->validated();
 
         if ($request->input('id')) {
-            $server = ServerV2ray::find($request->input('id'));
+            $server = ServerVmess::find($request->input('id'));
             if (!$server) {
                 abort(500, '服务器不存在');
             }
@@ -30,7 +29,7 @@ class V2rayController extends Controller
             ]);
         }
 
-        if (!ServerV2ray::create($params)) {
+        if (!ServerVmess::create($params)) {
             abort(500, '创建失败');
         }
 
@@ -42,7 +41,7 @@ class V2rayController extends Controller
     public function drop(Request $request)
     {
         if ($request->input('id')) {
-            $server = ServerV2ray::find($request->input('id'));
+            $server = ServerVmess::find($request->input('id'));
             if (!$server) {
                 abort(500, '节点ID不存在');
             }
@@ -52,13 +51,13 @@ class V2rayController extends Controller
         ]);
     }
 
-    public function update(ServerV2rayUpdate $request)
+    public function update(ServerVmessUpdate $request)
     {
         $params = $request->only([
             'show',
         ]);
 
-        $server = ServerV2ray::find($request->input('id'));
+        $server = ServerVmess::find($request->input('id'));
 
         if (!$server) {
             abort(500, '该服务器不存在');
@@ -76,12 +75,12 @@ class V2rayController extends Controller
 
     public function copy(Request $request)
     {
-        $server = ServerV2ray::find($request->input('id'));
+        $server = ServerVmess::find($request->input('id'));
         $server->show = 0;
         if (!$server) {
             abort(500, '服务器不存在');
         }
-        if (!ServerV2ray::create($server->toArray())) {
+        if (!ServerVmess::create($server->toArray())) {
             abort(500, '复制失败');
         }
 

app/Http/Controllers/V1/Admin/StatController.php

@@ -1,22 +1,20 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\V1\Admin;
 
+use App\Http\Controllers\Controller;
 use App\Models\CommissionLog;
+use App\Models\Order;
 use App\Models\ServerShadowsocks;
 use App\Models\ServerTrojan;
-use App\Models\StatUser;
-use App\Services\ServerService;
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\ServerGroup;
-use App\Models\ServerV2ray;
-use App\Models\Plan;
-use App\Models\User;
-use App\Models\Ticket;
-use App\Models\Order;
-use App\Models\StatOrder;
+use App\Models\ServerVmess;
+use App\Models\Stat;
 use App\Models\StatServer;
+use App\Models\StatUser;
+use App\Models\Ticket;
+use App\Models\User;
+use App\Services\StatisticalService;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 
@@ -24,7 +22,7 @@ class StatController extends Controller
 {
     public function getOverride(Request $request)
     {
-        return response([
+        return [
             'data' => [
                 'month_income' => Order::where('created_at', '>=', strtotime(date('Y-m-1')))
                     ->where('created_at', '<', time())
@@ -55,12 +53,12 @@ class StatController extends Controller
                     ->where('created_at', '<', strtotime(date('Y-m-1')))
                     ->sum('get_amount'),
             ]
-        ]);
+        ];
     }
 
     public function getOrder(Request $request)
     {
-        $statistics = StatOrder::where('record_type', 'd')
+        $statistics = Stat::where('record_type', 'd')
             ->limit(31)
             ->orderBy('record_at', 'DESC')
             ->get()
@@ -68,49 +66,50 @@ class StatController extends Controller
         $result = [];
         foreach ($statistics as $statistic) {
             $date = date('m-d', $statistic['record_at']);
-            array_push($result, [
+            $result[] = [
                 'type' => '收款金额',
                 'date' => $date,
-                'value' => $statistic['order_amount'] / 100
-            ]);
-            array_push($result, [
+                'value' => $statistic['paid_total'] / 100
+            ];
+            $result[] = [
                 'type' => '收款笔数',
                 'date' => $date,
-                'value' => $statistic['order_count']
-            ]);
-            array_push($result, [
+                'value' => $statistic['paid_count']
+            ];
+            $result[] = [
                 'type' => '佣金金额(已发放)',
                 'date' => $date,
-                'value' => $statistic['commission_amount'] / 100
-            ]);
-            array_push($result, [
+                'value' => $statistic['commission_total'] / 100
+            ];
+            $result[] = [
                 'type' => '佣金笔数(已发放)',
                 'date' => $date,
                 'value' => $statistic['commission_count']
-            ]);
+            ];
         }
         $result = array_reverse($result);
-        return response([
+        return [
             'data' => $result
-        ]);
+        ];
     }
 
     public function getServerLastRank()
     {
         $servers = [
             'shadowsocks' => ServerShadowsocks::where('parent_id', null)->get()->toArray(),
-            'v2ray' => ServerV2ray::where('parent_id', null)->get()->toArray(),
-            'trojan' => ServerTrojan::where('parent_id', null)->get()->toArray()
+            'v2ray' => ServerVmess::where('parent_id', null)->get()->toArray(),
+            'trojan' => ServerTrojan::where('parent_id', null)->get()->toArray(),
+            'vmess' => ServerVmess::where('parent_id', null)->get()->toArray()
         ];
         $startAt = strtotime('-1 day', strtotime(date('Y-m-d')));
         $endAt = strtotime(date('Y-m-d'));
         $statistics = StatServer::select([
-                'server_id',
-                'server_type',
-                'u',
-                'd',
-                DB::raw('(u+d) as total')
-            ])
+            'server_id',
+            'server_type',
+            'u',
+            'd',
+            DB::raw('(u+d) as total')
+        ])
             ->where('record_at', '>=', $startAt)
             ->where('record_at', '<', $endAt)
             ->where('record_type', 'd')
@@ -127,9 +126,9 @@ class StatController extends Controller
             $statistics[$k]['total'] = $statistics[$k]['total'] / 1073741824;
         }
         array_multisort(array_column($statistics, 'total'), SORT_DESC, $statistics);
-        return response([
+        return [
             'data' => $statistics
-        ]);
+        ];
     }
 
     public function getStatUser(Request $request)
@@ -149,5 +148,6 @@ class StatController extends Controller
             'total' => $total
         ];
     }
+
 }
 

app/Http/Controllers/V1/Admin/SystemController.php

@@ -1,21 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\V1\Admin;
 
-use App\Models\ServerShadowsocks;
-use App\Models\ServerTrojan;
-use App\Services\ServerService;
+use App\Http\Controllers\Controller;
+use App\Models\Log as LogModel;
 use App\Utils\CacheKey;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\ServerGroup;
-use App\Models\ServerV2ray;
-use App\Models\Plan;
-use App\Models\User;
-use App\Models\Ticket;
-use App\Models\Order;
-use App\Models\StatOrder;
-use App\Models\StatServer;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Http;
@@ -33,7 +23,8 @@ class SystemController extends Controller
         return response([
             'data' => [
                 'schedule' => $this->getScheduleStatus(),
-                'horizon' => $this->getHorizonStatus()
+                'horizon' => $this->getHorizonStatus(),
+                'schedule_last_runtime' => Cache::get(CacheKey::get('SCHEDULE_LAST_CHECK_AT', null))
             ]
         ]);
     }
@@ -111,5 +102,18 @@ class SystemController extends Controller
             return $master->status === 'paused';
         })->count();
     }
-}
 
+    public function getSystemLog(Request $request) {
+        $current = $request->input('current') ? $request->input('current') : 1;
+        $pageSize = $request->input('page_size') >= 10 ? $request->input('page_size') : 10;
+        $builder = LogModel::orderBy('created_at', 'DESC')
+            ->setFilterAllowKeys('level');
+        $total = $builder->count();
+        $res = $builder->forPage($current, $pageSize)
+            ->get();
+        return response([
+            'data' => $res,
+            'total' => $total
+        ]);
+    }
+}

app/Http/Controllers/V1/Admin/ThemeController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\V1\Admin;
 
 use App\Http\Controllers\Controller;
 use App\Services\ThemeService;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Artisan;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\File;
 
 class ThemeController extends Controller
 {

app/Http/Controllers/V1/Admin/TicketController.php

@@ -1,14 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\V1\Admin;
 
-use App\Jobs\SendEmailJob;
-use App\Services\TicketService;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Ticket;
-use App\Models\User;
 use App\Models\TicketMessage;
+use App\Models\User;
+use App\Services\TicketService;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 

app/Http/Controllers/V1/Admin/UserController.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\V1\Admin;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\UserFetch;
 use App\Http\Requests\Admin\UserGenerate;
 use App\Http\Requests\Admin\UserSendMail;
 use App\Http\Requests\Admin\UserUpdate;
 use App\Jobs\SendEmailJob;
-use App\Services\UserService;
+use App\Models\Plan;
+use App\Models\User;
+use App\Services\AuthService;
 use App\Utils\Helper;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\User;
-use App\Models\Plan;
 use Illuminate\Support\Facades\DB;
 
 class UserController extends Controller
@@ -74,7 +74,7 @@ class UserController extends Controller
                     $res[$i]['plan_name'] = $plan[$k]['name'];
                 }
             }
-            $res[$i]['subscribe_url'] = Helper::getSubscribeUrl('/api/v1/client/subscribe?token=' . $res[$i]['token']);
+            $res[$i]['subscribe_url'] = Helper::getSubscribeUrl($res[$i]['token']);
         }
         return response([
             'data' => $res,
@@ -128,6 +128,11 @@ class UserController extends Controller
             $params['invite_user_id'] = null;
         }
 
+        if (isset($params['banned']) && (int)$params['banned'] === 1) {
+            $authService = new AuthService($user);
+            $authService->removeAllSession();
+        }
+
         try {
             $user->update($params);
         } catch (\Exception $e) {
@@ -160,7 +165,7 @@ class UserController extends Controller
             $transferEnable = $user['transfer_enable'] ? $user['transfer_enable'] / 1073741824 : 0;
             $notUseFlow = (($user['transfer_enable'] - ($user['u'] + $user['d'])) / 1073741824) ?? 0;
             $planName = $user['plan_name'] ?? '无订阅';
-            $subscribeUrl = Helper::getSubscribeUrl('/api/v1/client/subscribe?token=' . $user['token']);
+            $subscribeUrl = Helper::getSubscribeUrl($user['token']);
             $data .= "{$user['email']},{$balance},{$commissionBalance},{$transferEnable},{$notUseFlow},{$expireDate},{$planName},{$subscribeUrl}\r\n";
         }
         echo "\xEF\xBB\xBF" . $data;
@@ -235,7 +240,7 @@ class UserController extends Controller
             $expireDate = $user['expired_at'] === NULL ? '长期有效' : date('Y-m-d H:i:s', $user['expired_at']);
             $createDate = date('Y-m-d H:i:s', $user['created_at']);
             $password = $request->input('password') ?? $user['email'];
-            $subscribeUrl = Helper::getSubscribeUrl('/api/v1/client/subscribe?token=' . $user['token']);
+            $subscribeUrl = Helper::getSubscribeUrl($user['token']);
             $data .= "{$user['email']},{$password},{$expireDate},{$user['uuid']},{$createDate},{$subscribeUrl}\r\n";
         }
         echo $data;

app/Http/Controllers/V1/Client/AppController.php

@@ -1,13 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Client;
+namespace App\Http\Controllers\V1\Client;
 
 use App\Http\Controllers\Controller;
 use App\Services\ServerService;
 use App\Services\UserService;
-use App\Utils\Clash;
 use Illuminate\Http\Request;
-use App\Models\ServerV2ray;
 use Illuminate\Support\Facades\File;
 use Symfony\Component\Yaml\Yaml;
 
@@ -41,15 +39,15 @@ class AppController extends Controller
                     'chacha20-ietf-poly1305'
                 ])
             ) {
-                array_push($proxy, Protocols\Clash::buildShadowsocks($user['uuid'], $item));
+                array_push($proxy, \App\Protocols\Clash::buildShadowsocks($user['uuid'], $item));
                 array_push($proxies, $item['name']);
             }
-            if ($item['type'] === 'v2ray') {
-                array_push($proxy, Protocols\Clash::buildVmess($user['uuid'], $item));
+            if ($item['type'] === 'vmess') {
+                array_push($proxy, \App\Protocols\Clash::buildVmess($user['uuid'], $item));
                 array_push($proxies, $item['name']);
             }
             if ($item['type'] === 'trojan') {
-                array_push($proxy, Protocols\Clash::buildTrojan($user['uuid'], $item));
+                array_push($proxy, \App\Protocols\Clash::buildTrojan($user['uuid'], $item));
                 array_push($proxies, $item['name']);
             }
         }

app/Http/Controllers/V1/Client/ClientController.php

@@ -1,12 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Client;
+namespace App\Http\Controllers\V1\Client;
 
-use App\Http\Controllers\Client\Protocols\V2rayN;
 use App\Http\Controllers\Controller;
+use App\Protocols\General;
 use App\Services\ServerService;
-use Illuminate\Http\Request;
 use App\Services\UserService;
+use App\Utils\Helper;
+use Illuminate\Http\Request;
 
 class ClientController extends Controller
 {
@@ -23,27 +24,26 @@ class ClientController extends Controller
             $servers = $serverService->getAvailableServers($user);
             $this->setSubscribeInfoToServers($servers, $user);
             if ($flag) {
-                foreach (glob(app_path('Http//Controllers//Client//Protocols') . '/*.php') as $file) {
-                    $file = 'App\\Http\\Controllers\\Client\\Protocols\\' . basename($file, '.php');
+                foreach (array_reverse(glob(app_path('Protocols') . '/*.php')) as $file) {
+                    $file = 'App\\Protocols\\' . basename($file, '.php');
                     $class = new $file($user, $servers);
                     if (strpos($flag, $class->flag) !== false) {
                         die($class->handle());
                     }
                 }
             }
-            // todo 1.5.3 remove
-            $class = new V2rayN($user, $servers);
+            $class = new General($user, $servers);
             die($class->handle());
-            die('该客户端暂不支持进行订阅');
         }
     }
 
     private function setSubscribeInfoToServers(&$servers, $user)
     {
+        if (!isset($servers[0])) return;
         if (!(int)config('v2board.show_info_to_server_enable', 0)) return;
-        $useTraffic = round($user['u'] / (1024*1024*1024), 2) + round($user['d'] / (1024*1024*1024), 2);
-        $totalTraffic = round($user['transfer_enable'] / (1024*1024*1024), 2);
-        $remainingTraffic = $totalTraffic - $useTraffic;
+        $useTraffic = $user['u'] + $user['d'];
+        $totalTraffic = $user['transfer_enable'];
+        $remainingTraffic = Helper::trafficConvert($totalTraffic - $useTraffic);
         $expiredDate = $user['expired_at'] ? date('Y-m-d', $user['expired_at']) : '长期有效';
         $userService = new UserService();
         $resetDay = $userService->getResetDay($user);
@@ -56,7 +56,7 @@ class ClientController extends Controller
             ]));
         }
         array_unshift($servers, array_merge($servers[0], [
-            'name' => "剩余流量：{$remainingTraffic} GB",
+            'name' => "剩余流量：{$remainingTraffic}",
         ]));
     }
 }

app/Http/Controllers/V1/Guest/CommController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\Guest;
+namespace App\Http\Controllers\V1\Guest;
 
-use App\Utils\Dict;
 use App\Http\Controllers\Controller;
+use App\Utils\Dict;
 use Illuminate\Support\Facades\Http;
 
 class CommController extends Controller

app/Http/Controllers/V1/Guest/PaymentController.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Guest;
+namespace App\Http\Controllers\V1\Guest;
 
+use App\Http\Controllers\Controller;
 use App\Models\Order;
 use App\Services\OrderService;
 use App\Services\PaymentService;
 use App\Services\TelegramService;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 
 class PaymentController extends Controller
 {

app/Http/Controllers/V1/Guest/TelegramController.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\Guest;
+namespace App\Http\Controllers\V1\Guest;
 
+use App\Http\Controllers\Controller;
 use App\Services\TelegramService;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 
 class TelegramController extends Controller
 {

app/Http/Controllers/V1/Passport/AuthController.php

@@ -1,21 +1,21 @@
 <?php
 
-namespace App\Http\Controllers\Passport;
+namespace App\Http\Controllers\V1\Passport;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\Passport\AuthRegister;
 use App\Http\Requests\Passport\AuthForget;
 use App\Http\Requests\Passport\AuthLogin;
+use App\Http\Requests\Passport\AuthRegister;
 use App\Jobs\SendEmailJob;
-use App\Services\AuthService;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Cache;
+use App\Models\InviteCode;
 use App\Models\Plan;
 use App\Models\User;
-use App\Models\InviteCode;
-use App\Utils\Helper;
-use App\Utils\Dict;
+use App\Services\AuthService;
 use App\Utils\CacheKey;
+use App\Utils\Dict;
+use App\Utils\Helper;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 use ReCaptcha\ReCaptcha;
 
 class AuthController extends Controller
@@ -26,7 +26,7 @@ class AuthController extends Controller
             abort(404);
         }
         $params = $request->validate([
-            'email' => 'required|email',
+            'email' => 'required|email:strict',
             'redirect' => 'nullable'
         ]);
 
@@ -116,7 +116,7 @@ class AuthController extends Controller
             if (empty($request->input('email_code'))) {
                 abort(500, __('Email verification code cannot be empty'));
             }
-            if (Cache::get(CacheKey::get('EMAIL_VERIFY_CODE', $request->input('email'))) !== $request->input('email_code')) {
+            if ((string)Cache::get(CacheKey::get('EMAIL_VERIFY_CODE', $request->input('email'))) !== (string)$request->input('email_code')) {
                 abort(500, __('Incorrect email verification code'));
             }
         }
@@ -286,7 +286,11 @@ class AuthController extends Controller
 
     public function forget(AuthForget $request)
     {
-        if (Cache::get(CacheKey::get('EMAIL_VERIFY_CODE', $request->input('email'))) !== $request->input('email_code')) {
+        $forgetRequestLimitKey = CacheKey::get('FORGET_REQUEST_LIMIT', $request->input('email'));
+        $forgetRequestLimit = (int)Cache::get($forgetRequestLimitKey);
+        if ($forgetRequestLimit >= 3) abort(500, __('Reset failed, Please try again later'));
+        if ((string)Cache::get(CacheKey::get('EMAIL_VERIFY_CODE', $request->input('email'))) !== (string)$request->input('email_code')) {
+            Cache::put($forgetRequestLimitKey, $forgetRequestLimit ? $forgetRequestLimit + 1 : 1, 300);
             abort(500, __('Incorrect email verification code'));
         }
         $user = User::where('email', $request->input('email'))->first();

app/Http/Controllers/V1/Passport/CommController.php

@@ -1,18 +1,18 @@
 <?php
 
-namespace App\Http\Controllers\Passport;
+namespace App\Http\Controllers\V1\Passport;
 
-use App\Http\Requests\Passport\CommSendEmailVerify;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use Illuminate\Http\Exceptions\HttpResponseException;
-use Illuminate\Support\Facades\Mail;
-use App\Utils\Helper;
-use Illuminate\Support\Facades\Cache;
+use App\Http\Requests\Passport\CommSendEmailVerify;
 use App\Jobs\SendEmailJob;
 use App\Models\InviteCode;
-use App\Utils\Dict;
+use App\Models\User;
 use App\Utils\CacheKey;
+use App\Utils\Dict;
+use Illuminate\Http\Exceptions\HttpResponseException;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Mail;
 use ReCaptcha\ReCaptcha;
 
 class CommController extends Controller

app/Http/Controllers/V1/Server/DeepbworkController.php

@@ -1,18 +1,16 @@
 <?php
 
-namespace App\Http\Controllers\Server;
+namespace App\Http\Controllers\V1\Server;
 
+use App\Http\Controllers\Controller;
+use App\Models\ServerVmess;
 use App\Services\ServerService;
 use App\Services\UserService;
 use App\Utils\CacheKey;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\User;
-use App\Models\ServerV2ray;
-use App\Models\ServerLog;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Cache;
 
 /*
  * V2ray Aurora
@@ -37,11 +35,11 @@ class DeepbworkController extends Controller
     {
         ini_set('memory_limit', -1);
         $nodeId = $request->input('node_id');
-        $server = ServerV2ray::find($nodeId);
+        $server = ServerVmess::find($nodeId);
         if (!$server) {
             abort(500, 'fail');
         }
-        Cache::put(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $server->id), time(), 3600);
+        Cache::put(CacheKey::get('SERVER_VMESS_LAST_CHECK_AT', $server->id), time(), 3600);
         $serverService = new ServerService();
         $users = $serverService->getAvailableUsers($server->group_id);
         $result = [];
@@ -69,7 +67,7 @@ class DeepbworkController extends Controller
     public function submit(Request $request)
     {
 //         Log::info('serverSubmitData:' . $request->input('node_id') . ':' . file_get_contents('php://input'));
-        $server = ServerV2ray::find($request->input('node_id'));
+        $server = ServerVmess::find($request->input('node_id'));
         if (!$server) {
             return response([
                 'ret' => 0,
@@ -78,14 +76,15 @@ class DeepbworkController extends Controller
         }
         $data = file_get_contents('php://input');
         $data = json_decode($data, true);
-        Cache::put(CacheKey::get('SERVER_V2RAY_ONLINE_USER', $server->id), count($data), 3600);
-        Cache::put(CacheKey::get('SERVER_V2RAY_LAST_PUSH_AT', $server->id), time(), 3600);
+        Cache::put(CacheKey::get('SERVER_VMESS_ONLINE_USER', $server->id), count($data), 3600);
+        Cache::put(CacheKey::get('SERVER_VMESS_LAST_PUSH_AT', $server->id), time(), 3600);
         $userService = new UserService();
+        $formatData = [];
+
         foreach ($data as $item) {
-            $u = $item['u'];
-            $d = $item['d'];
-            $userService->trafficFetch($u, $d, $item['user_id'], $server->toArray(), 'v2ray');
+            $formatData[$item['user_id']] = [$item['u'], $item['d']];
         }
+        $userService->trafficFetch($server->toArray(), 'vmess', $formatData);
 
         return response([
             'ret' => 1,
@@ -112,7 +111,7 @@ class DeepbworkController extends Controller
 
     private function getV2RayConfig(int $nodeId, int $localPort)
     {
-        $server = ServerV2ray::find($nodeId);
+        $server = ServerVmess::find($nodeId);
         if (!$server) {
             abort(500, '节点不存在');
         }
@@ -129,7 +128,7 @@ class DeepbworkController extends Controller
         return $json;
     }
 
-    private function setDns(ServerV2ray $server, object $json)
+    private function setDns(ServerVmess $server, object $json)
     {
         if ($server->dnsSettings) {
             $dns = $server->dnsSettings;
@@ -142,7 +141,7 @@ class DeepbworkController extends Controller
         }
     }
 
-    private function setNetwork(ServerV2ray $server, object $json)
+    private function setNetwork(ServerVmess $server, object $json)
     {
         if ($server->networkSettings) {
             switch ($server->network) {
@@ -171,7 +170,7 @@ class DeepbworkController extends Controller
         }
     }
 
-    private function setRule(ServerV2ray $server, object $json)
+    private function setRule(ServerVmess $server, object $json)
     {
         $domainRules = array_filter(explode(PHP_EOL, config('v2board.server_v2ray_domain')));
         $protocolRules = array_filter(explode(PHP_EOL, config('v2board.server_v2ray_protocol')));
@@ -211,7 +210,7 @@ class DeepbworkController extends Controller
         }
     }
 
-    private function setTls(ServerV2ray $server, object $json)
+    private function setTls(ServerVMess $server, object $json)
     {
         if ((int)$server->tls) {
             $tlsSettings = $server->tlsSettings;

app/Http/Controllers/V1/Server/ShadowsocksTidalabController.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Server;
+namespace App\Http\Controllers\V1\Server;
 
+use App\Http\Controllers\Controller;
 use App\Models\ServerShadowsocks;
 use App\Services\ServerService;
 use App\Services\UserService;
 use App\Utils\CacheKey;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Cache;
 
 /*
@@ -73,11 +73,12 @@ class ShadowsocksTidalabController extends Controller
         Cache::put(CacheKey::get('SERVER_SHADOWSOCKS_ONLINE_USER', $server->id), count($data), 3600);
         Cache::put(CacheKey::get('SERVER_SHADOWSOCKS_LAST_PUSH_AT', $server->id), time(), 3600);
         $userService = new UserService();
+        $formatData = [];
+
         foreach ($data as $item) {
-            $u = $item['u'];
-            $d = $item['d'];
-            $userService->trafficFetch($u, $d, $item['user_id'], $server->toArray(), 'shadowsocks');
+            $formatData[$item['user_id']] = [$item['u'], $item['d']];
         }
+        $userService->trafficFetch($server->toArray(), 'shadowsocks', $formatData);
 
         return response([
             'ret' => 1,

app/Http/Controllers/V1/Server/TrojanTidalabController.php

@@ -1,18 +1,16 @@
 <?php
 
-namespace App\Http\Controllers\Server;
+namespace App\Http\Controllers\V1\Server;
 
+use App\Http\Controllers\Controller;
+use App\Models\ServerTrojan;
 use App\Services\ServerService;
 use App\Services\UserService;
 use App\Utils\CacheKey;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\User;
-use App\Models\ServerTrojan;
-use App\Models\ServerLog;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Cache;
 
 /*
  * Tidal Lab Trojan
@@ -78,11 +76,11 @@ class TrojanTidalabController extends Controller
         Cache::put(CacheKey::get('SERVER_TROJAN_ONLINE_USER', $server->id), count($data), 3600);
         Cache::put(CacheKey::get('SERVER_TROJAN_LAST_PUSH_AT', $server->id), time(), 3600);
         $userService = new UserService();
+        $formatData = [];
         foreach ($data as $item) {
-            $u = $item['u'];
-            $d = $item['d'];
-            $userService->trafficFetch($u, $d, $item['user_id'], $server->toArray(), 'trojan');
+            $formatData[$item['user_id']] = [$item['u'], $item['d']];
         }
+        $userService->trafficFetch($server->toArray(), 'trojan', $formatData);
 
         return response([
             'ret' => 1,

app/Http/Controllers/V1/Server/UniProxyController.php

@@ -1,16 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\Server;
+namespace App\Http\Controllers\V1\Server;
 
+use App\Http\Controllers\Controller;
 use App\Services\ServerService;
 use App\Services\UserService;
 use App\Utils\CacheKey;
 use App\Utils\Helper;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\ServerShadowsocks;
-use App\Models\ServerV2ray;
-use App\Models\ServerTrojan;
 use Illuminate\Support\Facades\Cache;
 
 class UniProxyController extends Controller
@@ -30,6 +27,7 @@ class UniProxyController extends Controller
             abort(500, 'token is error');
         }
         $this->nodeType = $request->input('node_type');
+        if ($this->nodeType === 'v2ray') $this->nodeType = 'vmess';
         $this->nodeId = $request->input('node_id');
         $this->serverService = new ServerService();
         $this->nodeInfo = $this->serverService->getServer($this->nodeId, $this->nodeType);
@@ -62,11 +60,7 @@ class UniProxyController extends Controller
         Cache::put(CacheKey::get('SERVER_' . strtoupper($this->nodeType) . '_ONLINE_USER', $this->nodeInfo->id), count($data), 3600);
         Cache::put(CacheKey::get('SERVER_' . strtoupper($this->nodeType) . '_LAST_PUSH_AT', $this->nodeInfo->id), time(), 3600);
         $userService = new UserService();
-        foreach (array_keys($data) as $k) {
-            $u = $data[$k][0];
-            $d = $data[$k][1];
-            $userService->trafficFetch($u, $d, $k, $this->nodeInfo->toArray(), $this->nodeType);
-        }
+        $userService->trafficFetch($this->nodeInfo->toArray(), $this->nodeType, $data);
 
         return response([
             'data' => true
@@ -86,13 +80,13 @@ class UniProxyController extends Controller
                 ];
 
                 if ($this->nodeInfo->cipher === '2022-blake3-aes-128-gcm') {
-                    $response['server_key'] = Helper::getShadowsocksServerKey($this->nodeInfo->created_at, 16);
+                    $response['server_key'] = Helper::getServerKey($this->nodeInfo->created_at, 16);
                 }
                 if ($this->nodeInfo->cipher === '2022-blake3-aes-256-gcm') {
-                    $response['server_key'] = Helper::getShadowsocksServerKey($this->nodeInfo->created_at, 32);
+                    $response['server_key'] = Helper::getServerKey($this->nodeInfo->created_at, 32);
                 }
                 break;
-            case 'v2ray':
+            case 'vmess':
                 $response = [
                     'server_port' => $this->nodeInfo->server_port,
                     'network' => $this->nodeInfo->network,
@@ -104,7 +98,29 @@ class UniProxyController extends Controller
                 $response = [
                     'host' => $this->nodeInfo->host,
                     'server_port' => $this->nodeInfo->server_port,
-                    'server_name' => $this->nodeInfo->server_name
+                    'server_name' => $this->nodeInfo->server_name,
+                ];
+                break;
+            case 'hysteria':
+                $response = [
+                    'host' => $this->nodeInfo->host,
+                    'server_port' => $this->nodeInfo->server_port,
+                    'server_name' => $this->nodeInfo->server_name,
+                    'up_mbps' => $this->nodeInfo->up_mbps,
+                    'down_mbps' => $this->nodeInfo->down_mbps,
+                    'obfs' => Helper::getServerKey($this->nodeInfo->created_at, 16),
+                    'obfs_type' => $this->nodeInfo->obfs_type,
+                    'ignore_client_bandwidth' => !!$this->nodeInfo->ignore_client_bandwidth
+                ];
+                break;
+            case "vless":
+                $response = [
+                    'server_port' => $this->nodeInfo->server_port,
+                    'network' => $this->nodeInfo->network,
+                    'network_settings' => $this->nodeInfo->network_settings,
+                    'tls' => $this->nodeInfo->tls,
+                    'flow' => $this->nodeInfo->flow,
+                    'tls_settings' => $this->nodeInfo->tls_settings
                 ];
                 break;
         }

app/Http/Controllers/V1/Staff/NoticeController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Staff;
+namespace App\Http\Controllers\V1\Staff;
 
-use App\Http\Requests\Admin\NoticeSave;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\Admin\NoticeSave;
 use App\Models\Notice;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 
 class NoticeController extends Controller

app/Http/Controllers/V1/Staff/PlanController.php

@@ -1,15 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\Staff;
+namespace App\Http\Controllers\V1\Staff;
 
-use App\Http\Requests\Admin\PlanSave;
-use App\Http\Requests\Admin\PlanSort;
-use App\Http\Requests\Admin\PlanUpdate;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Plan;
-use App\Models\Order;
 use App\Models\User;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
 class PlanController extends Controller

app/Http/Controllers/V1/Staff/TicketController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\Staff;
+namespace App\Http\Controllers\V1\Staff;
 
-use App\Services\TicketService;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Ticket;
 use App\Models\TicketMessage;
+use App\Services\TicketService;
+use Illuminate\Http\Request;
 
 class TicketController extends Controller
 {

app/Http/Controllers/V1/Staff/UserController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\Staff;
+namespace App\Http\Controllers\V1\Staff;
 
+use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\UserSendMail;
 use App\Http\Requests\Staff\UserUpdate;
 use App\Jobs\SendEmailJob;
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\User;
 use App\Models\Plan;
+use App\Models\User;
+use Illuminate\Http\Request;
 
 class UserController extends Controller
 {

app/Http/Controllers/V1/User/CommController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers\User;
+namespace App\Http\Controllers\V1\User;
 
+use App\Http\Controllers\Controller;
 use App\Models\Payment;
 use App\Utils\Dict;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 
 class CommController extends Controller
 {

app/Http/Controllers/V1/User/CouponController.php

@@ -1,11 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\User;
+namespace App\Http\Controllers\V1\User;
 
 use App\Http\Controllers\Controller;
 use App\Services\CouponService;
 use Illuminate\Http\Request;
-use App\Models\Coupon;
 
 class CouponController extends Controller
 {

app/Http/Controllers/V1/User/InviteController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace App\Http\Controllers\User;
+namespace App\Http\Controllers\V1\User;
 
 use App\Http\Controllers\Controller;
 use App\Models\CommissionLog;
-use Illuminate\Http\Request;
-use App\Models\User;
-use App\Models\Order;
 use App\Models\InviteCode;
+use App\Models\Order;
+use App\Models\User;
 use App\Utils\Helper;
+use Illuminate\Http\Request;
 
 class InviteController extends Controller
 {

app/Http/Controllers/V1/User/KnowledgeController.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\User;
+namespace App\Http\Controllers\V1\User;
 
 use App\Http\Controllers\Controller;
+use App\Models\Knowledge;
 use App\Models\User;
 use App\Services\UserService;
 use App\Utils\Helper;
 use Illuminate\Http\Request;
-use App\Models\Knowledge;
 
 class KnowledgeController extends Controller
 {
@@ -24,7 +24,7 @@ class KnowledgeController extends Controller
             if (!$userService->isAvailable($user)) {
                 $this->formatAccessData($knowledge['body']);
             }
-            $subscribeUrl = Helper::getSubscribeUrl("/api/v1/client/subscribe?token={$user['token']}");
+            $subscribeUrl = Helper::getSubscribeUrl($user['token']);
             $knowledge['body'] = str_replace('{{siteName}}', config('v2board.app_name', 'V2Board'), $knowledge['body']);
             $knowledge['body'] = str_replace('{{subscribeUrl}}', $subscribeUrl, $knowledge['body']);
             $knowledge['body'] = str_replace('{{urlEncodeSubscribeUrl}}', urlencode($subscribeUrl), $knowledge['body']);

app/Http/Controllers/V1/User/NoticeController.php

@@ -1,11 +1,10 @@
 <?php
 
-namespace App\Http\Controllers\User;
+namespace App\Http\Controllers\V1\User;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
 use App\Models\Notice;
-use App\Utils\Helper;
+use Illuminate\Http\Request;
 
 class NoticeController extends Controller
 {

app/Http/Controllers/V1/User/OrderController.php

@@ -1,29 +1,28 @@
 <?php
 
-namespace App\Http\Controllers\User;
+namespace App\Http\Controllers\V1\User;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\User\OrderSave;
-use App\Models\CommissionLog;
+use App\Models\Order;
 use App\Models\Payment;
+use App\Models\Plan;
+use App\Models\User;
 use App\Services\CouponService;
 use App\Services\OrderService;
 use App\Services\PaymentService;
 use App\Services\PlanService;
 use App\Services\UserService;
+use App\Utils\Helper;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
-use App\Models\Order;
-use App\Models\Plan;
-use App\Models\User;
-use App\Utils\Helper;
-use Omnipay\Omnipay;
-use Stripe\Stripe;
-use Stripe\Source;
 use Library\BitpayX;
-use Library\MGate;
 use Library\Epay;
+use Library\MGate;
+use Omnipay\Omnipay;
+use Stripe\Source;
+use Stripe\Stripe;
 
 class OrderController extends Controller
 {
@@ -191,6 +190,7 @@ class OrderController extends Controller
         $payment = Payment::find($method);
         if (!$payment || $payment->enable !== 1) abort(500, __('Payment method is not available'));
         $paymentService = new PaymentService($payment->payment, $payment->id);
+        $order->handling_amount = NULL;
         if ($payment->handling_fee_fixed || $payment->handling_fee_percent) {
             $order->handling_amount = round(($order->total_amount * ($payment->handling_fee_percent / 100)) + $payment->handling_fee_fixed);
         }

app/Http/Controllers/V1/User/PlanController.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Controllers\User;
+namespace App\Http\Controllers\V1\User;
 
 use App\Http\Controllers\Controller;
+use App\Models\Plan;
 use App\Models\User;
 use App\Services\PlanService;
 use Illuminate\Http\Request;
-use App\Models\Plan;
 use Illuminate\Support\Facades\DB;
 
 class PlanController extends Controller

app/Http/Controllers/V1/User/ServerController.php

@@ -1,18 +1,13 @@
 <?php
 
-namespace App\Http\Controllers\User;
+namespace App\Http\Controllers\V1\User;
 
 use App\Http\Controllers\Controller;
+use App\Models\User;
 use App\Services\ServerService;
 use App\Services\UserService;
-use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
-use App\Models\ServerV2ray;
-use App\Models\ServerLog;
-use App\Models\User;
-
-use App\Utils\Helper;
 use Illuminate\Support\Facades\DB;
 
 class ServerController extends Controller
@@ -26,8 +21,7 @@ class ServerController extends Controller
             $serverService = new ServerService();
             $servers = $serverService->getAvailableServers($user);
         }
-
-        $eTag = sha1(json_encode(array_column($servers, 'updated_at')));
+        $eTag = sha1(json_encode(array_column($servers, 'cache_key')));
         if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
             abort(304);
         }

app/Http/Controllers/V1/User/StatController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\User;
+namespace App\Http\Controllers\V1\User;
 
 use App\Http\Controllers\Controller;
 use App\Models\StatUser;

app/Http/Controllers/V1/User/TelegramController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\User;
+namespace App\Http\Controllers\V1\User;
 
 use App\Http\Controllers\Controller;
 use App\Models\User;

app/Http/Controllers/V1/User/TicketController.php

@@ -1,18 +1,17 @@
 <?php
 
-namespace App\Http\Controllers\User;
+namespace App\Http\Controllers\V1\User;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\User\TicketSave;
 use App\Http\Requests\User\TicketWithdraw;
-use App\Jobs\SendTelegramJob;
+use App\Models\Ticket;
+use App\Models\TicketMessage;
 use App\Models\User;
 use App\Services\TelegramService;
 use App\Services\TicketService;
 use App\Utils\Dict;
 use Illuminate\Http\Request;
-use App\Models\Ticket;
-use App\Models\TicketMessage;
 use Illuminate\Support\Facades\DB;
 
 class TicketController extends Controller

app/Http/Controllers/V1/User/UserController.php

@@ -1,20 +1,20 @@
 <?php
 
-namespace App\Http\Controllers\User;
+namespace App\Http\Controllers\V1\User;
 
 use App\Http\Controllers\Controller;
+use App\Http\Requests\User\UserChangePassword;
 use App\Http\Requests\User\UserTransfer;
 use App\Http\Requests\User\UserUpdate;
-use App\Http\Requests\User\UserChangePassword;
+use App\Models\Order;
+use App\Models\Plan;
+use App\Models\Ticket;
+use App\Models\User;
 use App\Services\AuthService;
 use App\Services\UserService;
 use App\Utils\CacheKey;
-use Illuminate\Http\Request;
-use App\Models\User;
-use App\Models\Plan;
-use App\Models\Ticket;
 use App\Utils\Helper;
-use App\Models\Order;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 
 class UserController extends Controller
@@ -39,7 +39,7 @@ class UserController extends Controller
         }
         $authService = new AuthService($user);
         return response([
-            'data' => $authService->delSession($request->input('session_id'))
+            'data' => $authService->removeSession($request->input('session_id'))
         ]);
     }
 
@@ -151,7 +151,7 @@ class UserController extends Controller
                 abort(500, __('Subscription plan does not exist'));
             }
         }
-        $user['subscribe_url'] = Helper::getSubscribeUrl("/api/v1/client/subscribe?token={$user['token']}");
+        $user['subscribe_url'] = Helper::getSubscribeUrl($user['token']);
         $userService = new UserService();
         $user['reset_day'] = $userService->getResetDay($user);
         return response([
@@ -171,7 +171,7 @@ class UserController extends Controller
             abort(500, __('Reset failed'));
         }
         return response([
-            'data' => Helper::getSubscribeUrl('/api/v1/client/subscribe?token=' . $user->token)
+            'data' => Helper::getSubscribeUrl($user['token'])
         ]);
     }
 

app/Http/Controllers/V2/Admin/StatController.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace App\Http\Controllers\V2\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Models\CommissionLog;
+use App\Models\Order;
+use App\Models\ServerShadowsocks;
+use App\Models\ServerTrojan;
+use App\Models\ServerVmess;
+use App\Models\Stat;
+use App\Models\StatServer;
+use App\Models\StatUser;
+use App\Models\Ticket;
+use App\Models\User;
+use App\Services\StatisticalService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+
+class StatController extends Controller
+{
+    public function override(Request $request)
+    {
+        $params = $request->validate([
+            'start_at' => '',
+            'end_at' => ''
+        ]);
+
+        if (isset($params['start_at']) && isset($params['end_at'])) {
+            $stats = Stat::where('record_at', '>=', $params['start_at'])
+                ->where('record_at', '<', $params['end_at'])
+                ->get()
+                ->makeHidden(['record_at', 'created_at', 'updated_at', 'id', 'record_type'])
+                ->toArray();
+        } else {
+            $statisticalService = new StatisticalService();
+            return [
+                'data' => $statisticalService->generateStatData()
+            ];
+        }
+
+        $stats = array_reduce($stats, function($carry, $item) {
+            foreach($item as $key => $value) {
+                if(isset($carry[$key]) && $carry[$key]) {
+                    $carry[$key] += $value;
+                } else {
+                    $carry[$key] = $value;
+                }
+            }
+            return $carry;
+        }, []);
+
+        return [
+            'data' => $stats
+        ];
+    }
+
+    public function record(Request $request)
+    {
+        $request->validate([
+            'type' => 'required|in:paid_total,commission_total,register_count',
+            'start_at' => '',
+            'end_at' => ''
+        ]);
+
+        $statisticalService = new StatisticalService();
+        $statisticalService->setStartAt($request->input('start_at'));
+        $statisticalService->setEndAt($request->input('end_at'));
+        return [
+            'data' => $statisticalService->getStatRecord($request->input('type'))
+        ];
+    }
+
+    public function ranking(Request $request)
+    {
+        $request->validate([
+            'type' => 'required|in:server_traffic_rank,user_consumption_rank,invite_rank',
+            'start_at' => '',
+            'end_at' => '',
+            'limit' => 'nullable|integer'
+        ]);
+
+        $statisticalService = new StatisticalService();
+        $statisticalService->setStartAt($request->input('start_at'));
+        $statisticalService->setEndAt($request->input('end_at'));
+        return [
+            'data' => $statisticalService->getRanking($request->input('type'), $request->input('limit') ?? 20)
+        ];
+    }
+}
+

app/Http/Kernel.php

@@ -70,6 +70,7 @@ class Kernel extends HttpKernel
         'admin' => \App\Http\Middleware\Admin::class,
         'client' => \App\Http\Middleware\Client::class,
         'staff' => \App\Http\Middleware\Staff::class,
+        'log' => \App\Http\Middleware\RequestLog::class
     ];
 
     /**

app/Http/Middleware/RequestLog.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class RequestLog
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if ($request->method() === 'POST') {
+            $path = $request->path();
+            info("POST {$path}");
+        };
+        return $next($request);
+    }
+}

app/Http/Requests/Admin/ConfigSave.php

@@ -29,6 +29,7 @@ class ConfigSave extends FormRequest
         'app_description' => '',
         'app_url' => 'nullable|url',
         'subscribe_url' => 'nullable',
+        'subscribe_path' => 'nullable',
         'try_out_enable' => 'in:0,1',
         'try_out_plan_id' => 'integer',
         'try_out_hour' => 'numeric',
@@ -38,7 +39,6 @@ class ConfigSave extends FormRequest
         // subscribe
         'plan_change_enable' => 'in:0,1',
         'reset_traffic_method' => 'in:0,1,2,3,4',
-        'surplus_enable' => 'in:0,1',
         'new_order_event_id' => 'in:0,1',
         'renew_order_event_id' => 'in:0,1',
         'change_order_event_id' => 'in:0,1',

app/Http/Requests/Admin/OrderFetch.php

@@ -14,7 +14,7 @@ class OrderFetch extends FormRequest
     public function rules()
     {
         return [
-            'filter.*.key' => 'required|in:email,trade_no,status,commission_status,user_id,invite_user_id,callback_no',
+            'filter.*.key' => 'required|in:email,trade_no,status,commission_status,user_id,invite_user_id,callback_no,commission_balance',
             'filter.*.condition' => 'required|in:>,<,=,>=,<=,模糊,!=',
             'filter.*.value' => ''
         ];

app/Http/Requests/Admin/ServerVmessSave.php

@@ -4,7 +4,7 @@ namespace App\Http\Requests\Admin;
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class ServerV2raySave extends FormRequest
+class ServerVmessSave extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/Admin/ServerVmessUpdate.php

@@ -4,7 +4,7 @@ namespace App\Http\Requests\Admin;
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class ServerV2rayUpdate extends FormRequest
+class ServerVmessUpdate extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.

app/Http/Requests/Admin/UserUpdate.php

@@ -14,7 +14,7 @@ class UserUpdate extends FormRequest
     public function rules()
     {
         return [
-            'email' => 'required|email',
+            'email' => 'required|email:strict',
             'password' => 'nullable|min:8',
             'transfer_enable' => 'numeric',
             'expired_at' => 'nullable|integer',

app/Http/Requests/Passport/AuthForget.php

@@ -14,7 +14,7 @@ class AuthForget extends FormRequest
     public function rules()
     {
         return [
-            'email' => 'required|email',
+            'email' => 'required|email:strict',
             'password' => 'required|min:8',
             'email_code' => 'required'
         ];

app/Http/Requests/Passport/AuthLogin.php

@@ -14,7 +14,7 @@ class AuthLogin extends FormRequest
     public function rules()
     {
         return [
-            'email' => 'required|email',
+            'email' => 'required|email:strict',
             'password' => 'required|min:8'
         ];
     }

app/Http/Requests/Passport/AuthRegister.php

@@ -14,7 +14,7 @@ class AuthRegister extends FormRequest
     public function rules()
     {
         return [
-            'email' => 'required|email',
+            'email' => 'required|email:strict',
             'password' => 'required|min:8'
         ];
     }

app/Http/Requests/Passport/CommSendEmailVerify.php

@@ -14,7 +14,7 @@ class CommSendEmailVerify extends FormRequest
     public function rules()
     {
         return [
-            'email' => 'required|email'
+            'email' => 'required|email:strict'
         ];
     }
 

app/Http/Requests/Staff/UserUpdate.php

@@ -14,7 +14,7 @@ class UserUpdate extends FormRequest
     public function rules()
     {
         return [
-            'email' => 'required|email',
+            'email' => 'required|email:strict',
             'password' => 'nullable',
             'transfer_enable' => 'numeric',
             'expired_at' => 'nullable|integer',

app/Http/Routes/AdminRoute.php

@@ -1,130 +0,0 @@
-<?php
-namespace App\Http\Routes;
-
-use Illuminate\Contracts\Routing\Registrar;
-
-class AdminRoute
-{
-    public function map(Registrar $router)
-    {
-        $router->group([
-            'prefix' => config('v2board.secure_path', config('v2board.frontend_admin_path', hash('crc32b', config('app.key')))),
-            'middleware' => 'admin'
-        ], function ($router) {
-            // Config
-            $router->get ('/config/fetch', 'Admin\\ConfigController@fetch');
-            $router->post('/config/save', 'Admin\\ConfigController@save');
-            $router->get ('/config/getEmailTemplate', 'Admin\\ConfigController@getEmailTemplate');
-            $router->get ('/config/getThemeTemplate', 'Admin\\ConfigController@getThemeTemplate');
-            $router->post('/config/setTelegramWebhook', 'Admin\\ConfigController@setTelegramWebhook');
-            $router->post('/config/testSendMail', 'Admin\\ConfigController@testSendMail');
-            // Plan
-            $router->get ('/plan/fetch', 'Admin\\PlanController@fetch');
-            $router->post('/plan/save', 'Admin\\PlanController@save');
-            $router->post('/plan/drop', 'Admin\\PlanController@drop');
-            $router->post('/plan/update', 'Admin\\PlanController@update');
-            $router->post('/plan/sort', 'Admin\\PlanController@sort');
-            // Server
-            $router->get ('/server/group/fetch', 'Admin\\Server\\GroupController@fetch');
-            $router->post('/server/group/save', 'Admin\\Server\\GroupController@save');
-            $router->post('/server/group/drop', 'Admin\\Server\\GroupController@drop');
-            $router->get ('/server/route/fetch', 'Admin\\Server\\RouteController@fetch');
-            $router->post('/server/route/save', 'Admin\\Server\\RouteController@save');
-            $router->post('/server/route/drop', 'Admin\\Server\\RouteController@drop');
-            $router->get ('/server/manage/getNodes', 'Admin\\Server\\ManageController@getNodes');
-            $router->post('/server/manage/sort', 'Admin\\Server\\ManageController@sort');
-            $router->group([
-                'prefix' => 'server/trojan'
-            ], function ($router) {
-                $router->get ('fetch', 'Admin\\Server\\TrojanController@fetch');
-                $router->post('save', 'Admin\\Server\\TrojanController@save');
-                $router->post('drop', 'Admin\\Server\\TrojanController@drop');
-                $router->post('update', 'Admin\\Server\\TrojanController@update');
-                $router->post('copy', 'Admin\\Server\\TrojanController@copy');
-                $router->post('sort', 'Admin\\Server\\TrojanController@sort');
-                $router->post('viewConfig', 'Admin\\Server\\TrojanController@viewConfig');
-            });
-            $router->group([
-                'prefix' => 'server/v2ray'
-            ], function ($router) {
-                $router->get ('fetch', 'Admin\\Server\\V2rayController@fetch');
-                $router->post('save', 'Admin\\Server\\V2rayController@save');
-                $router->post('drop', 'Admin\\Server\\V2rayController@drop');
-                $router->post('update', 'Admin\\Server\\V2rayController@update');
-                $router->post('copy', 'Admin\\Server\\V2rayController@copy');
-                $router->post('sort', 'Admin\\Server\\V2rayController@sort');
-            });
-            $router->group([
-                'prefix' => 'server/shadowsocks'
-            ], function ($router) {
-                $router->get ('fetch', 'Admin\\Server\\ShadowsocksController@fetch');
-                $router->post('save', 'Admin\\Server\\ShadowsocksController@save');
-                $router->post('drop', 'Admin\\Server\\ShadowsocksController@drop');
-                $router->post('update', 'Admin\\Server\\ShadowsocksController@update');
-                $router->post('copy', 'Admin\\Server\\ShadowsocksController@copy');
-                $router->post('sort', 'Admin\\Server\\ShadowsocksController@sort');
-            });
-            // Order
-            $router->get ('/order/fetch', 'Admin\\OrderController@fetch');
-            $router->post('/order/update', 'Admin\\OrderController@update');
-            $router->post('/order/assign', 'Admin\\OrderController@assign');
-            $router->post('/order/paid', 'Admin\\OrderController@paid');
-            $router->post('/order/cancel', 'Admin\\OrderController@cancel');
-            $router->post('/order/detail', 'Admin\\OrderController@detail');
-            // User
-            $router->get ('/user/fetch', 'Admin\\UserController@fetch');
-            $router->post('/user/update', 'Admin\\UserController@update');
-            $router->get ('/user/getUserInfoById', 'Admin\\UserController@getUserInfoById');
-            $router->post('/user/generate', 'Admin\\UserController@generate');
-            $router->post('/user/dumpCSV', 'Admin\\UserController@dumpCSV');
-            $router->post('/user/sendMail', 'Admin\\UserController@sendMail');
-            $router->post('/user/ban', 'Admin\\UserController@ban');
-            $router->post('/user/resetSecret', 'Admin\\UserController@resetSecret');
-            $router->post('/user/setInviteUser', 'Admin\\UserController@setInviteUser');
-            // StatOrder
-            $router->get ('/stat/getOverride', 'Admin\\StatController@getOverride');
-            $router->get ('/stat/getServerLastRank', 'Admin\\StatController@getServerLastRank');
-            $router->get ('/stat/getOrder', 'Admin\\StatController@getOrder');
-            $router->get ('/stat/getStatUser', 'Admin\\StatController@getStatUser');
-            // Notice
-            $router->get ('/notice/fetch', 'Admin\\NoticeController@fetch');
-            $router->post('/notice/save', 'Admin\\NoticeController@save');
-            $router->post('/notice/update', 'Admin\\NoticeController@update');
-            $router->post('/notice/drop', 'Admin\\NoticeController@drop');
-            $router->post('/notice/show', 'Admin\\NoticeController@show');
-            // Ticket
-            $router->get ('/ticket/fetch', 'Admin\\TicketController@fetch');
-            $router->post('/ticket/reply', 'Admin\\TicketController@reply');
-            $router->post('/ticket/close', 'Admin\\TicketController@close');
-            // Coupon
-            $router->get ('/coupon/fetch', 'Admin\\CouponController@fetch');
-            $router->post('/coupon/generate', 'Admin\\CouponController@generate');
-            $router->post('/coupon/drop', 'Admin\\CouponController@drop');
-            $router->post('/coupon/show', 'Admin\\CouponController@show');
-            // Knowledge
-            $router->get ('/knowledge/fetch', 'Admin\\KnowledgeController@fetch');
-            $router->get ('/knowledge/getCategory', 'Admin\\KnowledgeController@getCategory');
-            $router->post('/knowledge/save', 'Admin\\KnowledgeController@save');
-            $router->post('/knowledge/show', 'Admin\\KnowledgeController@show');
-            $router->post('/knowledge/drop', 'Admin\\KnowledgeController@drop');
-            $router->post('/knowledge/sort', 'Admin\\KnowledgeController@sort');
-            // Payment
-            $router->get ('/payment/fetch', 'Admin\\PaymentController@fetch');
-            $router->get ('/payment/getPaymentMethods', 'Admin\\PaymentController@getPaymentMethods');
-            $router->post('/payment/getPaymentForm', 'Admin\\PaymentController@getPaymentForm');
-            $router->post('/payment/save', 'Admin\\PaymentController@save');
-            $router->post('/payment/drop', 'Admin\\PaymentController@drop');
-            $router->post('/payment/show', 'Admin\\PaymentController@show');
-            $router->post('/payment/sort', 'Admin\\PaymentController@sort');
-            // System
-            $router->get ('/system/getSystemStatus', 'Admin\\SystemController@getSystemStatus');
-            $router->get ('/system/getQueueStats', 'Admin\\SystemController@getQueueStats');
-            $router->get ('/system/getQueueWorkload', 'Admin\\SystemController@getQueueWorkload');
-            $router->get ('/system/getQueueMasters', '\\Laravel\\Horizon\\Http\\Controllers\\MasterSupervisorController@index');
-            // Theme
-            $router->get ('/theme/getThemes', 'Admin\\ThemeController@getThemes');
-            $router->post('/theme/saveThemeConfig', 'Admin\\ThemeController@saveThemeConfig');
-            $router->post('/theme/getThemeConfig', 'Admin\\ThemeController@getThemeConfig');
-        });
-    }
-}

app/Http/Routes/ClientRoute.php

@@ -1,21 +0,0 @@
-<?php
-namespace App\Http\Routes;
-
-use Illuminate\Contracts\Routing\Registrar;
-
-class ClientRoute
-{
-    public function map(Registrar $router)
-    {
-        $router->group([
-            'prefix' => 'client',
-            'middleware' => 'client'
-        ], function ($router) {
-            // Client
-            $router->get('/subscribe', 'Client\\ClientController@subscribe');
-            // App
-            $router->get('/app/getConfig', 'Client\\AppController@getConfig');
-            $router->get('/app/getVersion', 'Client\\AppController@getVersion');
-        });
-    }
-}

app/Http/Routes/PassportRoute.php

@@ -1,26 +0,0 @@
-<?php
-namespace App\Http\Routes;
-
-use Illuminate\Contracts\Routing\Registrar;
-
-class PassportRoute
-{
-    public function map(Registrar $router)
-    {
-        $router->group([
-            'prefix' => 'passport'
-        ], function ($router) {
-            // Auth
-            $router->post('/auth/register', 'Passport\\AuthController@register');
-            $router->post('/auth/login', 'Passport\\AuthController@login');
-            $router->get ('/auth/token2Login', 'Passport\\AuthController@token2Login');
-            $router->post('/auth/forget', 'Passport\\AuthController@forget');
-            $router->post('/auth/getQuickLoginUrl', 'Passport\\AuthController@getQuickLoginUrl');
-            $router->post('/auth/loginWithMailLink', 'Passport\\AuthController@loginWithMailLink');
-            // Comm
-            $router->post('/comm/sendEmailVerify', 'Passport\\CommController@sendEmailVerify');
-            $router->post('/comm/pv', 'Passport\\CommController@pv');
-            $router->get ('/comm/config', 'Guest\\CommController@config');                                              // TODO:REMOVE:1.7.0
-        });
-    }
-}

app/Http/Routes/StaffRoute.php

@@ -1,32 +0,0 @@
-<?php
-namespace App\Http\Routes;
-
-use Illuminate\Contracts\Routing\Registrar;
-
-class StaffRoute
-{
-    public function map(Registrar $router)
-    {
-        $router->group([
-            'prefix' => 'staff',
-            'middleware' => 'staff'
-        ], function ($router) {
-            // Ticket
-            $router->get ('/ticket/fetch', 'Staff\\TicketController@fetch');
-            $router->post('/ticket/reply', 'Staff\\TicketController@reply');
-            $router->post('/ticket/close', 'Staff\\TicketController@close');
-            // User
-            $router->post('/user/update', 'Staff\\UserController@update');
-            $router->get ('/user/getUserInfoById', 'Staff\\UserController@getUserInfoById');
-            $router->post('/user/sendMail', 'Staff\\UserController@sendMail');
-            $router->post('/user/ban', 'Staff\\UserController@ban');
-            // Plan
-            $router->get ('/plan/fetch', 'Staff\\PlanController@fetch');
-            // Notice
-            $router->get ('/notice/fetch', 'Admin\\NoticeController@fetch');
-            $router->post('/notice/save', 'Admin\\NoticeController@save');
-            $router->post('/notice/update', 'Admin\\NoticeController@update');
-            $router->post('/notice/drop', 'Admin\\NoticeController@drop');
-        });
-    }
-}

app/Http/Routes/UserRoute.php

@@ -1,64 +0,0 @@
-<?php
-namespace App\Http\Routes;
-
-use Illuminate\Contracts\Routing\Registrar;
-
-class UserRoute
-{
-    public function map(Registrar $router)
-    {
-        $router->group([
-            'prefix' => 'user',
-            'middleware' => 'user'
-        ], function ($router) {
-            // User
-            $router->get ('/resetSecurity', 'User\\UserController@resetSecurity');
-            $router->get ('/info', 'User\\UserController@info');
-            $router->post('/changePassword', 'User\\UserController@changePassword');
-            $router->post('/update', 'User\\UserController@update');
-            $router->get ('/getSubscribe', 'User\\UserController@getSubscribe');
-            $router->get ('/getStat', 'User\\UserController@getStat');
-            $router->get ('/checkLogin', 'User\\UserController@checkLogin');
-            $router->post('/transfer', 'User\\UserController@transfer');
-            $router->post('/getQuickLoginUrl', 'User\\UserController@getQuickLoginUrl');
-            $router->get ('/getActiveSession', 'User\\UserController@getActiveSession');
-            $router->post('/removeActiveSession', 'User\\UserController@removeActiveSession');
-            // Order
-            $router->post('/order/save', 'User\\OrderController@save');
-            $router->post('/order/checkout', 'User\\OrderController@checkout');
-            $router->get ('/order/check', 'User\\OrderController@check');
-            $router->get ('/order/detail', 'User\\OrderController@detail');
-            $router->get ('/order/fetch', 'User\\OrderController@fetch');
-            $router->get ('/order/getPaymentMethod', 'User\\OrderController@getPaymentMethod');
-            $router->post('/order/cancel', 'User\\OrderController@cancel');
-            // Plan
-            $router->get ('/plan/fetch', 'User\\PlanController@fetch');
-            // Invite
-            $router->get ('/invite/save', 'User\\InviteController@save');
-            $router->get ('/invite/fetch', 'User\\InviteController@fetch');
-            $router->get ('/invite/details', 'User\\InviteController@details');
-            // Notice
-            $router->get ('/notice/fetch', 'User\\NoticeController@fetch');
-            // Ticket
-            $router->post('/ticket/reply', 'User\\TicketController@reply');
-            $router->post('/ticket/close', 'User\\TicketController@close');
-            $router->post('/ticket/save', 'User\\TicketController@save');
-            $router->get ('/ticket/fetch', 'User\\TicketController@fetch');
-            $router->post('/ticket/withdraw', 'User\\TicketController@withdraw');
-            // Server
-            $router->get ('/server/fetch', 'User\\ServerController@fetch');
-            // Coupon
-            $router->post('/coupon/check', 'User\\CouponController@check');
-            // Telegram
-            $router->get ('/telegram/getBotInfo', 'User\\TelegramController@getBotInfo');
-            // Comm
-            $router->get ('/comm/config', 'User\\CommController@config');
-            $router->Post('/comm/getStripePublicKey', 'User\\CommController@getStripePublicKey');
-            // Knowledge
-            $router->get ('/knowledge/fetch', 'User\\KnowledgeController@fetch');
-            $router->get ('/knowledge/getCategory', 'User\\KnowledgeController@getCategory');
-            // Stat
-            $router->get ('/stat/getTrafficLog', 'User\\StatController@getTrafficLog');
-        });
-    }
-}

app/Http/Routes/V1/AdminRoute.php

@@ -0,0 +1,143 @@
+<?php
+namespace App\Http\Routes\V1;
+
+use Illuminate\Contracts\Routing\Registrar;
+
+class AdminRoute
+{
+    public function map(Registrar $router)
+    {
+        $router->group([
+            'prefix' => config('v2board.secure_path', config('v2board.frontend_admin_path', hash('crc32b', config('app.key')))),
+            'middleware' => ['admin', 'log'],
+        ], function ($router) {
+            // Config
+            $router->get ('/config/fetch', 'V1\\Admin\\ConfigController@fetch');
+            $router->post('/config/save', 'V1\\Admin\\ConfigController@save');
+            $router->get ('/config/getEmailTemplate', 'V1\\Admin\\ConfigController@getEmailTemplate');
+            $router->get ('/config/getThemeTemplate', 'V1\\Admin\\ConfigController@getThemeTemplate');
+            $router->post('/config/setTelegramWebhook', 'V1\\Admin\\ConfigController@setTelegramWebhook');
+            $router->post('/config/testSendMail', 'V1\\Admin\\ConfigController@testSendMail');
+            // Plan
+            $router->get ('/plan/fetch', 'V1\\Admin\\PlanController@fetch');
+            $router->post('/plan/save', 'V1\\Admin\\PlanController@save');
+            $router->post('/plan/drop', 'V1\\Admin\\PlanController@drop');
+            $router->post('/plan/update', 'V1\\Admin\\PlanController@update');
+            $router->post('/plan/sort', 'V1\\Admin\\PlanController@sort');
+            // Server
+            $router->get ('/server/group/fetch', 'V1\\Admin\\Server\\GroupController@fetch');
+            $router->post('/server/group/save', 'V1\\Admin\\Server\\GroupController@save');
+            $router->post('/server/group/drop', 'V1\\Admin\\Server\\GroupController@drop');
+            $router->get ('/server/route/fetch', 'V1\\Admin\\Server\\RouteController@fetch');
+            $router->post('/server/route/save', 'V1\\Admin\\Server\\RouteController@save');
+            $router->post('/server/route/drop', 'V1\\Admin\\Server\\RouteController@drop');
+            $router->get ('/server/manage/getNodes', 'V1\\Admin\\Server\\ManageController@getNodes');
+            $router->post('/server/manage/sort', 'V1\\Admin\\Server\\ManageController@sort');
+            $router->group([
+                'prefix' => 'server/trojan'
+            ], function ($router) {
+                $router->post('save', 'V1\\Admin\\Server\\TrojanController@save');
+                $router->post('drop', 'V1\\Admin\\Server\\TrojanController@drop');
+                $router->post('update', 'V1\\Admin\\Server\\TrojanController@update');
+                $router->post('copy', 'V1\\Admin\\Server\\TrojanController@copy');
+            });
+            $router->group([
+                'prefix' => 'server/vmess'
+            ], function ($router) {
+                $router->post('save', 'V1\\Admin\\Server\\VmessController@save');
+                $router->post('drop', 'V1\\Admin\\Server\\VmessController@drop');
+                $router->post('update', 'V1\\Admin\\Server\\VmessController@update');
+                $router->post('copy', 'V1\\Admin\\Server\\VmessController@copy');
+            });
+            $router->group([
+                'prefix' => 'server/shadowsocks'
+            ], function ($router) {
+                $router->post('save', 'V1\\Admin\\Server\\ShadowsocksController@save');
+                $router->post('drop', 'V1\\Admin\\Server\\ShadowsocksController@drop');
+                $router->post('update', 'V1\\Admin\\Server\\ShadowsocksController@update');
+                $router->post('copy', 'V1\\Admin\\Server\\ShadowsocksController@copy');
+            });
+            $router->group([
+                'prefix' => 'server/hysteria'
+            ], function ($router) {
+                $router->post('save', 'V1\\Admin\\Server\\HysteriaController@save');
+                $router->post('drop', 'V1\\Admin\\Server\\HysteriaController@drop');
+                $router->post('update', 'V1\\Admin\\Server\\HysteriaController@update');
+                $router->post('copy', 'V1\\Admin\\Server\\HysteriaController@copy');
+            });
+            $router->group([
+                'prefix' => 'server/vless'
+            ], function ($router) {
+                $router->post('save', 'V1\\Admin\\Server\\VlessController@save');
+                $router->post('drop', 'V1\\Admin\\Server\\VlessController@drop');
+                $router->post('update', 'V1\\Admin\\Server\\VlessController@update');
+                $router->post('copy', 'V1\\Admin\\Server\\VlessController@copy');
+            });
+            // Order
+            $router->get ('/order/fetch', 'V1\\Admin\\OrderController@fetch');
+            $router->post('/order/update', 'V1\\Admin\\OrderController@update');
+            $router->post('/order/assign', 'V1\\Admin\\OrderController@assign');
+            $router->post('/order/paid', 'V1\\Admin\\OrderController@paid');
+            $router->post('/order/cancel', 'V1\\Admin\\OrderController@cancel');
+            $router->post('/order/detail', 'V1\\Admin\\OrderController@detail');
+            // User
+            $router->get ('/user/fetch', 'V1\\Admin\\UserController@fetch');
+            $router->post('/user/update', 'V1\\Admin\\UserController@update');
+            $router->get ('/user/getUserInfoById', 'V1\\Admin\\UserController@getUserInfoById');
+            $router->post('/user/generate', 'V1\\Admin\\UserController@generate');
+            $router->post('/user/dumpCSV', 'V1\\Admin\\UserController@dumpCSV');
+            $router->post('/user/sendMail', 'V1\\Admin\\UserController@sendMail');
+            $router->post('/user/ban', 'V1\\Admin\\UserController@ban');
+            $router->post('/user/resetSecret', 'V1\\Admin\\UserController@resetSecret');
+            $router->post('/user/setInviteUser', 'V1\\Admin\\UserController@setInviteUser');
+            // Stat
+            $router->get ('/stat/getStat', 'V1\\Admin\\StatController@getStat');
+            $router->get ('/stat/getOverride', 'V1\\Admin\\StatController@getOverride');
+            $router->get ('/stat/getServerLastRank', 'V1\\Admin\\StatController@getServerLastRank');
+            $router->get ('/stat/getOrder', 'V1\\Admin\\StatController@getOrder');
+            $router->get ('/stat/getStatUser', 'V1\\Admin\\StatController@getStatUser');
+            $router->get ('/stat/getRanking', 'V1\\Admin\\StatController@getRanking');
+            $router->get ('/stat/getStatRecord', 'V1\\Admin\\StatController@getStatRecord');
+            // Notice
+            $router->get ('/notice/fetch', 'V1\\Admin\\NoticeController@fetch');
+            $router->post('/notice/save', 'V1\\Admin\\NoticeController@save');
+            $router->post('/notice/update', 'V1\\Admin\\NoticeController@update');
+            $router->post('/notice/drop', 'V1\\Admin\\NoticeController@drop');
+            $router->post('/notice/show', 'V1\\Admin\\NoticeController@show');
+            // Ticket
+            $router->get ('/ticket/fetch', 'V1\\Admin\\TicketController@fetch');
+            $router->post('/ticket/reply', 'V1\\Admin\\TicketController@reply');
+            $router->post('/ticket/close', 'V1\\Admin\\TicketController@close');
+            // Coupon
+            $router->get ('/coupon/fetch', 'V1\\Admin\\CouponController@fetch');
+            $router->post('/coupon/generate', 'V1\\Admin\\CouponController@generate');
+            $router->post('/coupon/drop', 'V1\\Admin\\CouponController@drop');
+            $router->post('/coupon/show', 'V1\\Admin\\CouponController@show');
+            // Knowledge
+            $router->get ('/knowledge/fetch', 'V1\\Admin\\KnowledgeController@fetch');
+            $router->get ('/knowledge/getCategory', 'V1\\Admin\\KnowledgeController@getCategory');
+            $router->post('/knowledge/save', 'V1\\Admin\\KnowledgeController@save');
+            $router->post('/knowledge/show', 'V1\\Admin\\KnowledgeController@show');
+            $router->post('/knowledge/drop', 'V1\\Admin\\KnowledgeController@drop');
+            $router->post('/knowledge/sort', 'V1\\Admin\\KnowledgeController@sort');
+            // Payment
+            $router->get ('/payment/fetch', 'V1\\Admin\\PaymentController@fetch');
+            $router->get ('/payment/getPaymentMethods', 'V1\\Admin\\PaymentController@getPaymentMethods');
+            $router->post('/payment/getPaymentForm', 'V1\\Admin\\PaymentController@getPaymentForm');
+            $router->post('/payment/save', 'V1\\Admin\\PaymentController@save');
+            $router->post('/payment/drop', 'V1\\Admin\\PaymentController@drop');
+            $router->post('/payment/show', 'V1\\Admin\\PaymentController@show');
+            $router->post('/payment/sort', 'V1\\Admin\\PaymentController@sort');
+            // System
+            $router->get ('/system/getSystemStatus', 'V1\\Admin\\SystemController@getSystemStatus');
+            $router->get ('/system/getQueueStats', 'V1\\Admin\\SystemController@getQueueStats');
+            $router->get ('/system/getQueueWorkload', 'V1\\Admin\\SystemController@getQueueWorkload');
+            $router->get ('/system/getQueueMasters', '\\Laravel\\Horizon\\Http\\Controllers\\MasterSupervisorController@index');
+            $router->get ('/system/getSystemLog', 'V1\\Admin\\SystemController@getSystemLog');
+            // Theme
+            $router->get ('/theme/getThemes', 'V1\\Admin\\ThemeController@getThemes');
+            $router->post('/theme/saveThemeConfig', 'V1\\Admin\\ThemeController@saveThemeConfig');
+            $router->post('/theme/getThemeConfig', 'V1\\Admin\\ThemeController@getThemeConfig');
+        });
+    }
+}

app/Http/Routes/V1/ClientRoute.php

@@ -0,0 +1,26 @@
+<?php
+namespace App\Http\Routes\V1;
+
+use Illuminate\Contracts\Routing\Registrar;
+
+class ClientRoute
+{
+    public function map(Registrar $router)
+    {
+        $router->group([
+            'prefix' => 'client',
+            'middleware' => 'client'
+        ], function ($router) {
+            // Client
+            if (!config('v2board.subscribe_path')) {
+                $router->get('/subscribe', 'V1\\Client\\ClientController@subscribe');
+            }
+            // App
+            $router->get('/app/getConfig', 'V1\\Client\\AppController@getConfig');
+            $router->get('/app/getVersion', 'V1\\Client\\AppController@getVersion');
+        });
+        if (config('v2board.subscribe_path')) {
+            \Route::get(config('v2board.subscribe_path'), 'V1\\Client\\ClientController@subscribe');
+        }
+    }
+}

app/Http/Routes/V1/GuestRoute.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Routes;
+namespace App\Http\Routes\V1;
 
 use Illuminate\Contracts\Routing\Registrar;
 
@@ -10,14 +10,12 @@ class GuestRoute
         $router->group([
             'prefix' => 'guest'
         ], function ($router) {
-            // Plan
-            $router->get ('/plan/fetch', 'Guest\\PlanController@fetch');
             // Telegram
-            $router->post('/telegram/webhook', 'Guest\\TelegramController@webhook');
+            $router->post('/telegram/webhook', 'V1\\Guest\\TelegramController@webhook');
             // Payment
-            $router->match(['get', 'post'], '/payment/notify/{method}/{uuid}', 'Guest\\PaymentController@notify');
+            $router->match(['get', 'post'], '/payment/notify/{method}/{uuid}', 'V1\\Guest\\PaymentController@notify');
             // Comm
-            $router->get ('/comm/config', 'Guest\\CommController@config');
+            $router->get ('/comm/config', 'V1\\Guest\\CommController@config');
         });
     }
 }

app/Http/Routes/V1/PassportRoute.php

@@ -0,0 +1,25 @@
+<?php
+namespace App\Http\Routes\V1;
+
+use Illuminate\Contracts\Routing\Registrar;
+
+class PassportRoute
+{
+    public function map(Registrar $router)
+    {
+        $router->group([
+            'prefix' => 'passport'
+        ], function ($router) {
+            // Auth
+            $router->post('/auth/register', 'V1\\Passport\\AuthController@register');
+            $router->post('/auth/login', 'V1\\Passport\\AuthController@login');
+            $router->get ('/auth/token2Login', 'V1\\Passport\\AuthController@token2Login');
+            $router->post('/auth/forget', 'V1\\Passport\\AuthController@forget');
+            $router->post('/auth/getQuickLoginUrl', 'V1\\Passport\\AuthController@getQuickLoginUrl');
+            $router->post('/auth/loginWithMailLink', 'V1\\Passport\\AuthController@loginWithMailLink');
+            // Comm
+            $router->post('/comm/sendEmailVerify', 'V1\\Passport\\CommController@sendEmailVerify');
+            $router->post('/comm/pv', 'V1\\Passport\\CommController@pv');
+        });
+    }
+}

app/Http/Routes/V1/ServerRoute.php

@@ -1,5 +1,5 @@
 <?php
-namespace App\Http\Routes;
+namespace App\Http\Routes\V1;
 
 use Illuminate\Contracts\Routing\Registrar;
 
@@ -11,7 +11,7 @@ class ServerRoute
             'prefix' => 'server'
         ], function ($router) {
             $router->any('/{class}/{action}', function($class, $action) {
-                $ctrl = \App::make("\\App\\Http\\Controllers\\Server\\" . ucfirst($class) . "Controller");
+                $ctrl = \App::make("\\App\\Http\\Controllers\\V1\\Server\\" . ucfirst($class) . "Controller");
                 return \App::call([$ctrl, $action]);
             });
         });

app/Http/Routes/V1/StaffRoute.php

@@ -0,0 +1,32 @@
+<?php
+namespace App\Http\Routes\V1;
+
+use Illuminate\Contracts\Routing\Registrar;
+
+class StaffRoute
+{
+    public function map(Registrar $router)
+    {
+        $router->group([
+            'prefix' => 'staff',
+            'middleware' => 'staff'
+        ], function ($router) {
+            // Ticket
+            $router->get ('/ticket/fetch', 'V1\\Staff\\TicketController@fetch');
+            $router->post('/ticket/reply', 'V1\\Staff\\TicketController@reply');
+            $router->post('/ticket/close', 'V1\\Staff\\TicketController@close');
+            // User
+            $router->post('/user/update', 'V1\\Staff\\UserController@update');
+            $router->get ('/user/getUserInfoById', 'V1\\Staff\\UserController@getUserInfoById');
+            $router->post('/user/sendMail', 'V1\\Staff\\UserController@sendMail');
+            $router->post('/user/ban', 'V1\\Staff\\UserController@ban');
+            // Plan
+            $router->get ('/plan/fetch', 'V1\\Staff\\PlanController@fetch');
+            // Notice
+            $router->get ('/notice/fetch', 'V1\\Admin\\NoticeController@fetch');
+            $router->post('/notice/save', 'V1\\Admin\\NoticeController@save');
+            $router->post('/notice/update', 'V1\\Admin\\NoticeController@update');
+            $router->post('/notice/drop', 'V1\\Admin\\NoticeController@drop');
+        });
+    }
+}

app/Http/Routes/V1/UserRoute.php

@@ -0,0 +1,64 @@
+<?php
+namespace App\Http\Routes\V1;
+
+use Illuminate\Contracts\Routing\Registrar;
+
+class UserRoute
+{
+    public function map(Registrar $router)
+    {
+        $router->group([
+            'prefix' => 'user',
+            'middleware' => 'user'
+        ], function ($router) {
+            // User
+            $router->get ('/resetSecurity', 'V1\\User\\UserController@resetSecurity');
+            $router->get ('/info', 'V1\\User\\UserController@info');
+            $router->post('/changePassword', 'V1\\User\\UserController@changePassword');
+            $router->post('/update', 'V1\\User\\UserController@update');
+            $router->get ('/getSubscribe', 'V1\\User\\UserController@getSubscribe');
+            $router->get ('/getStat', 'V1\\User\\UserController@getStat');
+            $router->get ('/checkLogin', 'V1\\User\\UserController@checkLogin');
+            $router->post('/transfer', 'V1\\User\\UserController@transfer');
+            $router->post('/getQuickLoginUrl', 'V1\\User\\UserController@getQuickLoginUrl');
+            $router->get ('/getActiveSession', 'V1\\User\\UserController@getActiveSession');
+            $router->post('/removeActiveSession', 'V1\\User\\UserController@removeActiveSession');
+            // Order
+            $router->post('/order/save', 'V1\\User\\OrderController@save');
+            $router->post('/order/checkout', 'V1\\User\\OrderController@checkout');
+            $router->get ('/order/check', 'V1\\User\\OrderController@check');
+            $router->get ('/order/detail', 'V1\\User\\OrderController@detail');
+            $router->get ('/order/fetch', 'V1\\User\\OrderController@fetch');
+            $router->get ('/order/getPaymentMethod', 'V1\\User\\OrderController@getPaymentMethod');
+            $router->post('/order/cancel', 'V1\\User\\OrderController@cancel');
+            // Plan
+            $router->get ('/plan/fetch', 'V1\\User\\PlanController@fetch');
+            // Invite
+            $router->get ('/invite/save', 'V1\\User\\InviteController@save');
+            $router->get ('/invite/fetch', 'V1\\User\\InviteController@fetch');
+            $router->get ('/invite/details', 'V1\\User\\InviteController@details');
+            // Notice
+            $router->get ('/notice/fetch', 'V1\\User\\NoticeController@fetch');
+            // Ticket
+            $router->post('/ticket/reply', 'V1\\User\\TicketController@reply');
+            $router->post('/ticket/close', 'V1\\User\\TicketController@close');
+            $router->post('/ticket/save', 'V1\\User\\TicketController@save');
+            $router->get ('/ticket/fetch', 'V1\\User\\TicketController@fetch');
+            $router->post('/ticket/withdraw', 'V1\\User\\TicketController@withdraw');
+            // Server
+            $router->get ('/server/fetch', 'V1\\User\\ServerController@fetch');
+            // Coupon
+            $router->post('/coupon/check', 'V1\\User\\CouponController@check');
+            // Telegram
+            $router->get ('/telegram/getBotInfo', 'V1\\User\\TelegramController@getBotInfo');
+            // Comm
+            $router->get ('/comm/config', 'V1\\User\\CommController@config');
+            $router->Post('/comm/getStripePublicKey', 'V1\\User\\CommController@getStripePublicKey');
+            // Knowledge
+            $router->get ('/knowledge/fetch', 'V1\\User\\KnowledgeController@fetch');
+            $router->get ('/knowledge/getCategory', 'V1\\User\\KnowledgeController@getCategory');
+            // Stat
+            $router->get ('/stat/getTrafficLog', 'V1\\User\\StatController@getTrafficLog');
+        });
+    }
+}

app/Http/Routes/V2/AdminRoute.php

@@ -0,0 +1,20 @@
+<?php
+namespace App\Http\Routes\V2;
+
+use Illuminate\Contracts\Routing\Registrar;
+
+class AdminRoute
+{
+    public function map(Registrar $router)
+    {
+        $router->group([
+            'prefix' => config('v2board.secure_path', config('v2board.frontend_admin_path', hash('crc32b', config('app.key')))),
+            'middleware' => ['admin', 'log'],
+        ], function ($router) {
+            // Stat
+            $router->get ('/stat/override', 'V2\\Admin\\StatController@override');
+            $router->get ('/stat/record', 'V2\\Admin\\StatController@record');
+            $router->get ('/stat/ranking', 'V2\\Admin\\StatController@ranking');
+        });
+    }
+}

app/Jobs/OrderHandleJob.php

@@ -15,6 +15,8 @@ class OrderHandleJob implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
     protected $order;
 
+    public $tries = 3;
+    public $timeout = 5;
     /**
      * Create a new job instance.
      *
@@ -40,7 +42,7 @@ class OrderHandleJob implements ShouldQueue
         switch ($this->order->status) {
             // cancel
             case 0:
-                if ($this->order->created_at <= (time() - 1800)) {
+                if ($this->order->created_at <= (time() - 3600 * 2)) {
                     $orderService->cancel();
                 }
                 break;

app/Jobs/SendEmailJob.php

@@ -16,6 +16,8 @@ class SendEmailJob implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
     protected $params;
 
+    public $tries = 3;
+    public $timeout = 10;
     /**
      * Create a new job instance.
      *

app/Jobs/SendTelegramJob.php

@@ -16,7 +16,7 @@ class SendTelegramJob implements ShouldQueue
     protected $text;
 
     public $tries = 3;
-    public $timeout = 5;
+    public $timeout = 10;
 
     /**
      * Create a new job instance.

app/Jobs/StatServerJob.php

@@ -1,78 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Models\StatServer;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class StatServerJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-    protected $u;
-    protected $d;
-    protected $server;
-    protected $protocol;
-    protected $recordType;
-
-    public $tries = 3;
-    public $timeout = 60;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct($u, $d, $server, $protocol, $recordType = 'd')
-    {
-        $this->onQueue('stat');
-        $this->u = $u;
-        $this->d = $d;
-        $this->server = $server;
-        $this->protocol = $protocol;
-        $this->recordType = $recordType;
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $recordAt = strtotime(date('Y-m-d'));
-        if ($this->recordType === 'm') {
-            //
-        }
-
-        $data = StatServer::lockForUpdate()
-            ->where('record_at', $recordAt)
-            ->where('server_id', $this->server['id'])
-            ->where('server_type', $this->protocol)
-            ->first();
-        if ($data) {
-            try {
-                $data->update([
-                    'u' => $data['u'] + $this->u,
-                    'd' => $data['d'] + $this->d
-                ]);
-            } catch (\Exception $e) {
-                abort(500, '节点统计数据更新失败');
-            }
-        } else {
-            if (!StatServer::create([
-                'server_id' => $this->server['id'],
-                'server_type' => $this->protocol,
-                'u' => $this->u,
-                'd' => $this->d,
-                'record_type' => $this->recordType,
-                'record_at' => $recordAt
-            ])) {
-                abort(500, '节点统计数据创建失败');
-            }
-        }
-    }
-}

app/Jobs/StatUserJob.php

@@ -1,80 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Models\StatServer;
-use App\Models\StatUser;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class StatUserJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-    protected $u;
-    protected $d;
-    protected $userId;
-    protected $server;
-    protected $protocol;
-    protected $recordType;
-
-    public $tries = 3;
-    public $timeout = 60;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct($u, $d, $userId, array $server, $protocol, $recordType = 'd')
-    {
-        $this->onQueue('stat');
-        $this->u = $u;
-        $this->d = $d;
-        $this->userId = $userId;
-        $this->server = $server;
-        $this->protocol = $protocol;
-        $this->recordType = $recordType;
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $recordAt = strtotime(date('Y-m-d'));
-        if ($this->recordType === 'm') {
-            //
-        }
-
-        $data = StatUser::where('record_at', $recordAt)
-            ->where('server_rate', $this->server['rate'])
-            ->where('user_id', $this->userId)
-            ->first();
-        if ($data) {
-            try {
-                $data->update([
-                    'u' => $data['u'] + ($this->u * $this->server['rate']),
-                    'd' => $data['d'] + ($this->d * $this->server['rate'])
-                ]);
-            } catch (\Exception $e) {
-                abort(500, '用户统计数据更新失败');
-            }
-        } else {
-            if (!StatUser::create([
-                'user_id' => $this->userId,
-                'server_rate' => $this->server['rate'],
-                'u' => $this->u,
-                'd' => $this->d,
-                'record_type' => $this->recordType,
-                'record_at' => $recordAt
-            ])) {
-                abort(500, '用户统计数据创建失败');
-            }
-        }
-    }
-}

app/Jobs/TrafficFetchJob.php

@@ -20,7 +20,7 @@ class TrafficFetchJob implements ShouldQueue
     protected $protocol;
 
     public $tries = 3;
-    public $timeout = 3;
+    public $timeout = 10;
 
     /**
      * Create a new job instance.
@@ -50,8 +50,8 @@ class TrafficFetchJob implements ShouldQueue
         $user->t = time();
         $user->u = $user->u + ($this->u * $this->server['rate']);
         $user->d = $user->d + ($this->d * $this->server['rate']);
-        if (!$user->save()) throw new \Exception('流量更新失败');
-        $mailService = new MailService();
-        $mailService->remindTraffic($user);
+        if (!$user->save()) {
+            info("流量更新失败\n未记录用户ID:{$this->userId}\n未记录上行:{$user->u}\n未记录下行:{$user->d}");
+        }
     }
 }

app/Logging/MysqlLogger.php

@@ -0,0 +1,11 @@
+<?php
+namespace App\Logging;
+
+class MysqlLogger
+{
+    public function __invoke(array $config){
+        return tap(new \Monolog\Logger('mysql'), function ($logger) {
+            $logger->pushHandler(new MysqlLoggerHandler());
+        });
+    }
+}

app/Logging/MysqlLoggerHandler.php

@@ -0,0 +1,44 @@
+<?php
+namespace App\Logging;
+
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Monolog\Handler\AbstractProcessingHandler;
+use Monolog\Logger;
+use App\Models\Log as LogModel;
+
+class MysqlLoggerHandler extends AbstractProcessingHandler
+{
+    public function __construct($level = Logger::DEBUG, bool $bubble = true)
+    {
+        parent::__construct($level, $bubble);
+    }
+
+    protected function write(array $record): void
+    {
+        try{
+            if(isset($record['context']['exception']) && is_object($record['context']['exception'])){
+                $record['context']['exception'] = (array)$record['context']['exception'];
+            }
+            $record['request_data'] = request()->all() ??[];
+            $log = [
+                'title' => $record['message'],
+                'level' => $record['level_name'],
+                'host' => $record['request_host'] ?? request()->getSchemeAndHttpHost(),
+                'uri' => $record['request_uri'] ?? request()->getRequestUri(),
+                'method' => $record['request_method'] ?? request()->getMethod(),
+                'ip' => request()->getClientIp(),
+                'data' => json_encode($record['request_data']) ,
+                'context' => isset($record['context']) ? json_encode($record['context']) : '',
+                'created_at' => strtotime($record['datetime']),
+                'updated_at' => strtotime($record['datetime']),
+            ];
+
+            LogModel::insert(
+                $log
+            );
+        }catch (\Exception $e){
+            Log::channel('daily')->error($e->getMessage().$e->getFile().$e->getTraceAsString());
+        }
+    }
+}

app/Models/Log.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Log extends Model
+{
+    use \App\Scope\FilterScope;
+    protected $table = 'v2_log';
+    protected $dateFormat = 'U';
+    protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp'
+    ];
+}

app/Models/ServerHysteria.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ServerHysteria extends Model
+{
+    protected $table = 'v2_server_hysteria';
+    protected $dateFormat = 'U';
+    protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp',
+        'group_id' => 'array',
+        'route_id' => 'array',
+        'tags' => 'array'
+    ];
+}

app/Models/ServerVless.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ServerVless extends Model
+{
+    protected $table = 'v2_server_vless';
+    protected $dateFormat = 'U';
+    protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp',
+        'group_id' => 'array',
+        'route_id' => 'array',
+        'tls_settings' => 'array',
+        'network_settings' => 'array',
+        'tags' => 'array'
+    ];
+}

app/Models/ServerVmess.php

@@ -4,9 +4,9 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
-class ServerV2ray extends Model
+class ServerVmess extends Model
 {
-    protected $table = 'v2_server_v2ray';
+    protected $table = 'v2_server_vmess';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
     protected $casts = [

app/Models/Stat.php

@@ -4,9 +4,9 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
-class StatOrder extends Model
+class Stat extends Model
 {
-    protected $table = 'v2_stat_order';
+    protected $table = 'v2_stat';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
     protected $casts = [

app/Payments/AlipayF2F.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * 自己写别抄，抄NMB抄
- */
 namespace App\Payments;
 
 class AlipayF2F {

app/Payments/EPay.php

@@ -25,6 +25,10 @@ class EPay {
                 'label' => 'KEY',
                 'description' => '',
                 'type' => 'input',
+            ],
+            'alert1' => [
+                'type' => 'alert',
+                'content' => '开户请联系：<a href="https://t.me/smogate">@smogate</a>'
             ]
         ];
     }

app/Payments/MGate.php

@@ -1,102 +0,0 @@
-<?php
-
-/**
- * 自己写别抄，抄NMB抄
- */
-namespace App\Payments;
-
-use \Curl\Curl;
-
-class MGate {
-    private $config;
-
-    public function __construct($config)
-    {
-        $this->config = $config;
-    }
-
-    public function form()
-    {
-        return [
-            'mgate_url' => [
-                'label' => 'API地址',
-                'description' => '',
-                'type' => 'input',
-            ],
-            'mgate_app_id' => [
-                'label' => 'APPID',
-                'description' => '',
-                'type' => 'input',
-            ],
-            'mgate_app_secret' => [
-                'label' => 'AppSecret',
-                'description' => '',
-                'type' => 'input',
-            ],
-            'mgate_source_currency' => [
-                'label' => '源货币',
-                'description' => '默认CNY',
-                'type' => 'input'
-            ]
-        ];
-    }
-
-    public function pay($order)
-    {
-        $params = [
-            'out_trade_no' => $order['trade_no'],
-            'total_amount' => $order['total_amount'],
-            'notify_url' => $order['notify_url'],
-            'return_url' => $order['return_url']
-        ];
-        if (isset($this->config['mgate_source_currency'])) {
-            $params['source_currency'] = $this->config['mgate_source_currency'];
-        }
-        $params['app_id'] = $this->config['mgate_app_id'];
-        ksort($params);
-        $str = http_build_query($params) . $this->config['mgate_app_secret'];
-        $params['sign'] = md5($str);
-        $curl = new Curl();
-        $curl->setUserAgent('MGate');
-        $curl->setOpt(CURLOPT_SSL_VERIFYPEER, 0);
-        $curl->post($this->config['mgate_url'] . '/v1/gateway/fetch', http_build_query($params));
-        $result = $curl->response;
-        if (!$result) {
-            abort(500, '网络异常');
-        }
-        if ($curl->error) {
-            if (isset($result->errors)) {
-                $errors = (array)$result->errors;
-                abort(500, $errors[array_keys($errors)[0]][0]);
-            }
-            if (isset($result->message)) {
-                abort(500, $result->message);
-            }
-            abort(500, '未知错误');
-        }
-        $curl->close();
-        if (!isset($result->data->trade_no)) {
-            abort(500, '接口请求失败');
-        }
-        return [
-            'type' => 1, // 0:qrcode 1:url
-            'data' => $result->data->pay_url
-        ];
-    }
-
-    public function notify($params)
-    {
-        $sign = $params['sign'];
-        unset($params['sign']);
-        ksort($params);
-        reset($params);
-        $str = http_build_query($params) . $this->config['mgate_app_secret'];
-        if ($sign !== md5($str)) {
-            return false;
-        }
-        return [
-            'trade_no' => $params['out_trade_no'],
-            'callback_no' => $params['trade_no']
-        ];
-    }
-}

app/Payments/StripeAlipay.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * 自己写别抄，抄NMB抄
- */
 namespace App\Payments;
 
 use Stripe\Source;

app/Payments/StripeCheckout.php

@@ -33,6 +33,11 @@ class StripeCheckout {
                 'label' => 'WebHook 密钥签名',
                 'description' => '',
                 'type' => 'input',
+            ],
+            'stripe_custom_field_name' => [
+                'label' => '自定义字段名称',
+                'description' => '例如可设置为“联系方式”，以便及时与客户取得联系',
+                'type' => 'input',
             ]
         ];
     }
@@ -44,6 +49,7 @@ class StripeCheckout {
         if (!$exchange) {
             abort(500, __('Currency conversion has timed out, please try again later'));
         }
+        $customFieldName = isset($this->config['stripe_custom_field_name']) ? $this->config['stripe_custom_field_name'] : 'Contact Infomation';
 
         $params = [
             'success_url' => $order['return_url'],
@@ -61,7 +67,16 @@ class StripeCheckout {
                     'quantity' => 1
                 ]
             ],
-            'mode' => 'payment'
+            'mode' => 'payment',
+            'invoice_creation' => ['enabled' => true],
+            'phone_number_collection' => ['enabled' => true],
+            'custom_fields' => [
+                [
+                    'key' => 'contactinfo',
+                    'label' => ['type' => 'custom', 'custom' => $customFieldName],
+                    'type' => 'text',
+                ],
+            ],
             // 'customer_email' => $user['email'] not support
 
         ];

app/Payments/StripeCredit.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * 自己写别抄，抄NMB抄
- */
 namespace App\Payments;
 
 use Stripe\Source;

app/Payments/StripeWepay.php

@@ -1,8 +1,5 @@
 <?php
 
-/**
- * 自己写别抄，抄NMB抄
- */
 namespace App\Payments;
 
 use Stripe\Source;