Refactor admin

update: fix flag name matching confusion

.github/ISSUE_TEMPLATE/bug-report----问题反馈.md

@@ -0,0 +1,39 @@
+---
+name: Bug report  | 问题反馈
+about: Tell us what problems you have encountered
+title: "[BUG]"
+labels: ''
+assignees: ''
+
+---
+
+🙇‍♂️🙇‍♂️🙇‍♂️注意：XrayR等非V2Board问题请前往项目方提问
+🙇‍♂️🙇‍♂️🙇‍♂️Note: XrayR and other non-V2Board issues please go to the project side to ask questions
+
+
+The V2Board version number you are using
+当前使用的V2Board版本号
+--------
+
+
+Briefly describe the problem you are experiencing
+简单描述你遇到的问题
+--------
+
+
+
+Screenshot of the reported error(Please do desensitization)
+报告错误的截图（请做脱敏处理）
+--------
+
+
+
+Screenshot of the reported error(Please do desensitization)
+报告错误的截图（请做脱敏处理）
+--------
+
+
+
+The latest log files in the storage/logs directory report from #1 (Please do desensitization)
+storage/logs 目录下最新的日志文件从 #1 开始报告（请做脱敏处理）
+--------

.github/ISSUE_TEMPLATE/feature-request---功能请求.md

@@ -0,0 +1,11 @@
+---
+name: Feature request | 功能请求
+about: Tell us what you need
+title: "[Feature request]"
+labels: ''
+assignees: ''
+
+---
+
+Please describe in detail the problems or needs you have encountered.
+请详细描述你遇到的问题或需求。

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
@@ -80,15 +80,14 @@ class CheckCommission extends Command
 
     public function payHandle($inviteUserId, Order $order)
     {
+        $level = 3;
         if ((int)config('v2board.commission_distribution_enable', 0)) {
-            $level = 3;
             $commissionShareLevels = [
                 0 => (int)config('v2board.commission_distribution_l1'),
                 1 => (int)config('v2board.commission_distribution_l2'),
                 2 => (int)config('v2board.commission_distribution_l3')
             ];
         } else {
-            $level = 3;
             $commissionShareLevels = [
                 0 => 100
             ];

app/Console/Commands/CheckTicket.php

@@ -41,6 +41,7 @@ class CheckTicket extends Command
         ini_set('memory_limit', -1);
         $tickets = Ticket::where('status', 0)
             ->where('updated_at', '<=', time() - 24 * 3600)
+            ->where('reply_status', 0)
             ->get();
         foreach ($tickets as $ticket) {
             if ($ticket->user_id === $ticket->last_reply_user_id) continue;

app/Console/Commands/ResetLog.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Log;
+use App\Models\Plan;
+use App\Models\StatServer;
+use App\Models\StatUser;
+use App\Utils\Helper;
+use Illuminate\Console\Command;
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+
+class ResetLog extends Command
+{
+    protected $builder;
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'reset:log';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '清空日志';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        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/ResetUser.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Plan;
+use App\Utils\Helper;
+use Illuminate\Console\Command;
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+
+class ResetUser extends Command
+{
+    protected $builder;
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'reset:user';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '重置所有用户信息';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        if (!$this->confirm("确定要重置所有用户安全信息吗？")) {
+            return;
+        }
+        ini_set('memory_limit', -1);
+        $users = User::all();
+        foreach ($users as $user)
+        {
+            $user->token = Helper::guid();
+            $user->uuid = Helper::guid(true);
+            $user->save();
+            $this->info("已重置用户{$user->email}的安全信息");
+        }
+    }
+}

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/Test.php

@@ -2,15 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Models\Order;
-use App\Models\User;
-use App\Utils\CacheKey;
-use App\Utils\Helper;
 use Illuminate\Console\Command;
-use Illuminate\Filesystem\Filesystem;
-use Illuminate\Foundation\Console\ConfigCacheCommand;
-use Illuminate\Support\Facades\Cache;
-use Matriphe\Larinfo;
 
 class Test extends Command
 {

app/Console/Commands/V2boardInstall.php

@@ -48,7 +48,9 @@ class V2boardInstall extends Command
             $this->info("  \ V /  / __/| |_) | (_) | (_| | | | (_| | ");
             $this->info("   \_/  |_____|____/ \___/ \__,_|_|  \__,_| ");
             if (\File::exists(base_path() . '/.env')) {
-                abort(500, 'V2board 已安装，如需重新安装请删除目录下.env文件');
+                $securePath = config('v2board.secure_path', config('v2board.frontend_admin_path', hash('crc32b', config('app.key'))));
+                $this->info("访问 http(s)://你的站点/{$securePath} 进入管理面板，你可以在用户中心修改你的密码。");
+                abort(500, '如需重新安装请删除目录下.env文件');
             }
 
             if (!copy(base_path() . '/.env.example', base_path() . '/.env')) {
@@ -89,16 +91,17 @@ class V2boardInstall extends Command
             while (!$email) {
                 $email = $this->ask('请输入管理员邮箱?');
             }
-            $password = '';
-            while (!$password) {
-                $password = $this->ask('请输入管理员密码?');
-            }
+            $password = Helper::guid(false);
             if (!$this->registerAdmin($email, $password)) {
                 abort(500, '管理员账号注册失败，请重试');
             }
 
             $this->info('一切就绪');
-            $this->info('访问 http(s)://你的站点/admin 进入管理面板');
+            $this->info("管理员邮箱：{$email}");
+            $this->info("管理员密码：{$password}");
+
+            $defaultSecurePath = hash('crc32b', config('app.key'));
+            $this->info("访问 http(s)://你的站点/{$defaultSecurePath} 进入管理面板，你可以在用户中心修改你的密码。");
         } catch (\Exception $e) {
             $this->error($e->getMessage());
         }

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,39 +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');
-        $commissionBuilder = CommissionLog::where('created_at', '>=', $startAt)
-            ->where('created_at', '<', $endAt)
-            ->where('get_amount', '>', 0);
-        $commissionCount = $commissionBuilder->count();
-        $commissionAmount = $commissionBuilder->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/Console/Commands/V2boardUpdate.php

@@ -57,6 +57,7 @@ class V2boardUpdate extends Command
             } catch (\Exception $e) {
             }
         }
-        $this->info('更新完毕，请重新启动队列服务。');
+        \Artisan::call('horizon:terminate');
+        $this->info('更新完毕，队列服务已重启，你无需进行任何操作。');
     }
 }

app/Console/Kernel.php

@@ -35,6 +35,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('check:ticket')->everyMinute();
         // reset
         $schedule->command('reset:traffic')->daily();
+        $schedule->command('reset:log')->daily();
         // send
         $schedule->command('send:remindMail')->dailyAt('11:30');
         // horizon metrics

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/Admin/SystemController.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin;
-
-use App\Models\ServerShadowsocks;
-use App\Models\ServerTrojan;
-use App\Services\ServerService;
-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;
-use Laravel\Horizon\Contracts\MasterSupervisorRepository;
-
-class SystemController extends Controller
-{
-    public function getStatus()
-    {
-        return response([
-            'data' => [
-                'schedule' => $this->getScheduleStatus(),
-                'horizon' => $this->getHorizonStatus()
-            ]
-        ]);
-    }
-
-    protected function getScheduleStatus():bool
-    {
-        return (time() - 120) < Cache::get(CacheKey::get('SCHEDULE_LAST_CHECK_AT', null));
-    }
-
-    protected function getHorizonStatus():bool
-    {
-        if (! $masters = app(MasterSupervisorRepository::class)->all()) {
-            return false;
-        }
-
-        return collect($masters)->contains(function ($master) {
-            return $master->status === 'paused';
-        }) ? false : 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/Server/VProxyController.php

@@ -1,128 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Server;
-
-use App\Services\ServerService;
-use App\Services\UserService;
-use App\Utils\CacheKey;
-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 VProxyController extends Controller
-{
-    private $nodeType;
-    private $nodeInfo;
-    private $nodeId;
-    private $token;
-
-    public function __construct(Request $request)
-    {
-        $token = $request->input('token');
-        if (empty($token)) {
-            abort(500, 'token is null');
-        }
-        if ($token !== config('v2board.server_token')) {
-            abort(500, 'token is error');
-        }
-        $this->token = $token;
-        $this->nodeType = $request->input('node_type');
-        $this->nodeId = $request->input('node_id');
-        switch ($this->nodeType) {
-            case 'v2ray':
-                $this->nodeInfo = ServerV2ray::find($this->nodeId);
-                break;
-            case 'shadowsocks':
-                $this->nodeInfo = ServerShadowsocks::find($this->nodeId);
-                break;
-            case 'trojan':
-                $this->nodeInfo = ServerTrojan::find($this->nodeId);
-                break;
-            default:
-                break;
-        }
-        if (!$this->nodeInfo) {
-            abort(500, 'server not found');
-        }
-    }
-
-    // 后端获取用户
-    public function user(Request $request)
-    {
-        ini_set('memory_limit', -1);
-        Cache::put(CacheKey::get('SERVER_' . strtoupper($this->nodeType) . '_LAST_CHECK_AT', $this->nodeInfo->id), time(), 3600);
-        $serverService = new ServerService();
-        $users = $serverService->getAvailableUsers($this->nodeInfo->group_id);
-        $users = $users->toArray();
-
-        $response['users'] = $users;
-
-        switch ($this->nodeType) {
-            case 'shadowsocks':
-                $response['server'] = [
-                    'cipher' => $this->nodeInfo->cipher,
-                    'server_port' => $this->nodeInfo->server_port
-                ];
-                break;
-        }
-
-        $eTag = sha1(json_encode($response));
-        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
-            abort(304);
-        }
-
-        return response($response)->header('ETag', "\"{$eTag}\"");
-    }
-
-    // 后端提交数据
-    public function submit(Request $request)
-    {
-        $data = file_get_contents('php://input');
-        $data = json_decode($data, true);
-        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 ($data as $item) {
-            $u = $item['u'] * $this->nodeInfo->rate;
-            $d = $item['d'] * $this->nodeInfo->rate;
-            $userService->trafficFetch($u, $d, $item['user_id'], $this->nodeInfo, $this->nodeType);
-        }
-
-        return response([
-            'data' => true
-        ]);
-    }
-
-    // 后端获取配置
-    public function config(Request $request)
-    {
-        switch ($this->nodeType) {
-            case 'shadowsocks':
-                die(json_encode([
-                    'server_port' => $this->nodeInfo->server_port,
-                    'cipher' => $this->nodeInfo->cipher,
-                    'obfs' => $this->nodeInfo->obfs,
-                    'obfs_settings' => $this->nodeInfo->obfs_settings
-                ], JSON_UNESCAPED_UNICODE));
-                break;
-            case 'v2ray':
-                die(json_encode([
-                    'server_port' => $this->nodeInfo->server_port,
-                    'network' => $this->nodeInfo->network,
-                    'cipher' => $this->nodeInfo->cipher,
-                    'networkSettings' => $this->nodeInfo->networkSettings,
-                    'tls' => $this->nodeInfo->tls
-                ], JSON_UNESCAPED_UNICODE));
-                break;
-            case 'trojan':
-                die(json_encode([
-                    'host' => $this->nodeInfo->host,
-                    'server_port' => $this->nodeInfo->server_port
-                ], JSON_UNESCAPED_UNICODE));
-                break;
-        }
-    }
-}

app/Http/Controllers/User/InviteController.php

@@ -1,79 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\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\Utils\Helper;
-
-class InviteController extends Controller
-{
-    public function save(Request $request)
-    {
-        if (InviteCode::where('user_id', $request->session()->get('id'))->where('status', 0)->count() >= config('v2board.invite_gen_limit', 5)) {
-            abort(500, __('The maximum number of creations has been reached'));
-        }
-        $inviteCode = new InviteCode();
-        $inviteCode->user_id = $request->session()->get('id');
-        $inviteCode->code = Helper::randomChar(8);
-        return response([
-            'data' => $inviteCode->save()
-        ]);
-    }
-
-    public function details(Request $request)
-    {
-        return response([
-            'data' => CommissionLog::where('invite_user_id', $request->session()->get('id'))
-                ->where('get_amount', '>', 0)
-                ->select([
-                    'id',
-                    'trade_no',
-                    'order_amount',
-                    'get_amount',
-                    'created_at'
-                ])
-                ->get()
-        ]);
-    }
-
-    public function fetch(Request $request)
-    {
-        $codes = InviteCode::where('user_id', $request->session()->get('id'))
-            ->where('status', 0)
-            ->get();
-        $commission_rate = config('v2board.invite_commission', 10);
-        $user = User::find($request->session()->get('id'));
-        if ($user->commission_rate) {
-            $commission_rate = $user->commission_rate;
-        }
-        $stat = [
-            //已注册用户数
-            (int)User::where('invite_user_id', $request->session()->get('id'))->count(),
-            //有效的佣金
-            (int)Order::where('status', 3)
-                ->where('commission_status', 2)
-                ->where('invite_user_id', $request->session()->get('id'))
-                ->sum('commission_balance'),
-            //确认中的佣金
-            (int)Order::where('status', 3)
-                ->where('commission_status', 0)
-                ->where('invite_user_id', $request->session()->get('id'))
-                ->sum('commission_balance'),
-            //佣金比例
-            (int)$commission_rate,
-            //可用佣金
-            (int)$user->commission_balance
-        ];
-        return response([
-            'data' => [
-                'codes' => $codes,
-                'stat' => $stat
-            ]
-        ]);
-    }
-}

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,14 @@
 <?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
 {
@@ -24,7 +25,7 @@ class PaymentController extends Controller
 
     public function fetch()
     {
-        $payments = Payment::all();
+        $payments = Payment::orderBy('sort', 'ASC')->get();
         foreach ($payments as $k => $v) {
             $notifyUrl = url("/api/v1/guest/payment/notify/{$v->payment}/{$v->uuid}");
             if ($v->notify_domain) {
@@ -107,4 +108,26 @@ class PaymentController extends Controller
             'data' => $payment->delete()
         ]);
     }
+
+
+    public function sort(Request $request)
+    {
+        $request->validate([
+            'ids' => 'required|array'
+        ], [
+            'ids.required' => '参数有误',
+            'ids.array' => '参数有误'
+        ]);
+        DB::beginTransaction();
+        foreach ($request->input('ids') as $k => $v) {
+            if (!Payment::find($v)->update(['sort' => $k + 1])) {
+                DB::rollBack();
+                abort(500, '保存失败');
+            }
+        }
+        DB::commit();
+        return response([
+            'data' => true
+        ]);
+    }
 }

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

@@ -1,32 +1,23 @@
 <?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 Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\Plan;
 use App\Models\Order;
+use App\Models\Plan;
 use App\Models\User;
+use App\Services\PlanService;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
 class PlanController extends Controller
 {
     public function fetch(Request $request)
     {
-        $counts = User::select(
-            DB::raw("plan_id"),
-            DB::raw("count(*) as count")
-        )
-            ->where('plan_id', '!=', NULL)
-            ->where(function ($query) {
-                $query->where('expired_at', '>=', time())
-                    ->orWhere('expired_at', NULL);
-            })
-            ->groupBy("plan_id")
-            ->get();
+        $counts = PlanService::countActiveUsers();
         $plans = Plan::orderBy('sort', 'ASC')->get();
         foreach ($plans as $k => $v) {
             $plans[$k]->count = 0;
@@ -50,10 +41,13 @@ class PlanController extends Controller
             DB::beginTransaction();
             // update user group id and transfer
             try {
-                User::where('plan_id', $plan->id)->update([
-                    'group_id' => $params['group_id'],
-                    'transfer_enable' => $params['transfer_enable'] * 1073741824
-                ]);
+                if ($request->input('force_update')) {
+                    User::where('plan_id', $plan->id)->update([
+                        'group_id' => $params['group_id'],
+                        'transfer_enable' => $params['transfer_enable'] * 1073741824,
+                        'speed_limit' => $params['speed_limit']
+                    ]);
+                }
                 $plan->update($params);
             } catch (\Exception $e) {
                 DB::rollBack();

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

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Http\Controllers\V1\Admin\Server;
+
+use App\Http\Controllers\Controller;
+use App\Models\ServerRoute;
+use Illuminate\Http\Request;
+
+class RouteController extends Controller
+{
+    public function fetch(Request $request)
+    {
+        $routes = ServerRoute::get();
+        // TODO: remove on 1.8.0
+        foreach ($routes as $k => $route) {
+            $array = json_decode($route->match, true);
+            if (is_array($array)) $routes[$k]['match'] = $array;
+        }
+        // TODO: remove on 1.8.0
+        return [
+            'data' => $routes
+        ];
+    }
+
+    public function save(Request $request)
+    {
+        $params = $request->validate([
+            'remarks' => 'required',
+            'match' => 'required|array',
+            'action' => 'required|in:block,dns',
+            'action_value' => 'nullable'
+        ], [
+            'remarks.required' => '备注不能为空',
+            'match.required' => '匹配值不能为空',
+            'action.required' => '动作类型不能为空',
+            'action.in' => '动作类型参数有误'
+        ]);
+        $params['match'] = array_filter($params['match']);
+        // TODO: remove on 1.8.0
+        $params['match'] = json_encode($params['match']);
+        // TODO: remove on 1.8.0
+        if ($request->input('id')) {
+            try {
+                $route = ServerRoute::find($request->input('id'));
+                $route->update($params);
+                return [
+                    'data' => true
+                ];
+            } catch (\Exception $e) {
+                abort(500, '保存失败');
+            }
+        }
+        if (!ServerRoute::create($params)) abort(500, '创建失败');
+        return [
+            'data' => true
+        ];
+    }
+
+    public function drop(Request $request)
+    {
+        $route = ServerRoute::find($request->input('id'));
+        if (!$route) abort(500, '路由不存在');
+        if (!$route->delete()) abort(500, '删除失败');
+        return [
+            'data' => true
+        ];
+    }
+}

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, '复制失败');
         }
 
@@ -89,13 +88,4 @@ class V2rayController extends Controller
             'data' => true
         ]);
     }
-
-    public function viewConfig(Request $request)
-    {
-        $serverService = new ServerService();
-        $config = $serverService->getV2RayConfig($request->input('node_id'), 23333);
-        return response([
-            'data' => $config
-        ]);
-    }
 }

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

@@ -1,20 +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\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;
 
@@ -22,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())
@@ -45,14 +45,20 @@ class StatController extends Controller
                 'last_month_income' => Order::where('created_at', '>=', strtotime('-1 month', strtotime(date('Y-m-1'))))
                     ->where('created_at', '<', strtotime(date('Y-m-1')))
                     ->whereNotIn('status', [0, 2])
-                    ->sum('total_amount')
+                    ->sum('total_amount'),
+                'commission_month_payout' => CommissionLog::where('created_at', '>=', strtotime(date('Y-m-1')))
+                    ->where('created_at', '<', time())
+                    ->sum('get_amount'),
+                'commission_last_month_payout' => CommissionLog::where('created_at', '>=', strtotime('-1 month', strtotime(date('Y-m-1'))))
+                    ->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()
@@ -60,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(),
-            'vmess' => 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')
@@ -119,9 +126,28 @@ 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)
+    {
+        $request->validate([
+            'user_id' => 'required|integer'
+        ]);
+        $current = $request->input('current') ? $request->input('current') : 1;
+        $pageSize = $request->input('pageSize') >= 10 ? $request->input('pageSize') : 10;
+        $builder = StatUser::orderBy('record_at', 'DESC')->where('user_id', $request->input('user_id'));
+
+        $total = $builder->count();
+        $records = $builder->forPage($current, $pageSize)
+            ->get();
+        return [
+            'data' => $records,
+            'total' => $total
+        ];
+    }
+
 }
 

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

@@ -0,0 +1,119 @@
+<?php
+
+namespace App\Http\Controllers\V1\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Models\Log as LogModel;
+use App\Utils\CacheKey;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Http;
+use Laravel\Horizon\Contracts\JobRepository;
+use Laravel\Horizon\Contracts\MasterSupervisorRepository;
+use Laravel\Horizon\Contracts\MetricsRepository;
+use Laravel\Horizon\Contracts\SupervisorRepository;
+use Laravel\Horizon\Contracts\WorkloadRepository;
+use Laravel\Horizon\WaitTimeCalculator;
+
+class SystemController extends Controller
+{
+    public function getSystemStatus()
+    {
+        return response([
+            'data' => [
+                'schedule' => $this->getScheduleStatus(),
+                'horizon' => $this->getHorizonStatus(),
+                'schedule_last_runtime' => Cache::get(CacheKey::get('SCHEDULE_LAST_CHECK_AT', null))
+            ]
+        ]);
+    }
+
+    public function getQueueWorkload(WorkloadRepository $workload)
+    {
+        return response([
+            'data' => collect($workload->get())->sortBy('name')->values()->toArray()
+        ]);
+    }
+
+    protected function getScheduleStatus():bool
+    {
+        return (time() - 120) < Cache::get(CacheKey::get('SCHEDULE_LAST_CHECK_AT', null));
+    }
+
+    protected function getHorizonStatus():bool
+    {
+        if (! $masters = app(MasterSupervisorRepository::class)->all()) {
+            return false;
+        }
+
+        return collect($masters)->contains(function ($master) {
+            return $master->status === 'paused';
+        }) ? false : true;
+    }
+
+    public function getQueueStats()
+    {
+        return response([
+            'data' => [
+                'failedJobs' => app(JobRepository::class)->countRecentlyFailed(),
+                'jobsPerMinute' => app(MetricsRepository::class)->jobsProcessedPerMinute(),
+                'pausedMasters' => $this->totalPausedMasters(),
+                'periods' => [
+                    'failedJobs' => config('horizon.trim.recent_failed', config('horizon.trim.failed')),
+                    'recentJobs' => config('horizon.trim.recent'),
+                ],
+                'processes' => $this->totalProcessCount(),
+                'queueWithMaxRuntime' => app(MetricsRepository::class)->queueWithMaximumRuntime(),
+                'queueWithMaxThroughput' => app(MetricsRepository::class)->queueWithMaximumThroughput(),
+                'recentJobs' => app(JobRepository::class)->countRecent(),
+                'status' => $this->getHorizonStatus(),
+                'wait' => collect(app(WaitTimeCalculator::class)->calculate())->take(1),
+            ]
+        ]);
+    }
+
+    /**
+     * Get the total process count across all supervisors.
+     *
+     * @return int
+     */
+    protected function totalProcessCount()
+    {
+        $supervisors = app(SupervisorRepository::class)->all();
+
+        return collect($supervisors)->reduce(function ($carry, $supervisor) {
+            return $carry + collect($supervisor->processes)->sum();
+        }, 0);
+    }
+
+    /**
+     * Get the number of master supervisors that are currently paused.
+     *
+     * @return int
+     */
+    protected function totalPausedMasters()
+    {
+        if (! $masters = app(MasterSupervisorRepository::class)->all()) {
+            return 0;
+        }
+
+        return collect($masters)->filter(function ($master) {
+            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
 {
@@ -25,9 +25,9 @@ class ThemeController extends Controller
     {
         $themeConfigs = [];
         foreach ($this->themes as $theme) {
-            $themeConfigFile = $this->path . "{$theme}/config.php";
+            $themeConfigFile = $this->path . "{$theme}/config.json";
             if (!File::exists($themeConfigFile)) continue;
-            $themeConfig = include($themeConfigFile);
+            $themeConfig = json_decode(File::get($themeConfigFile), true);
             if (!isset($themeConfig['configs']) || !is_array($themeConfig)) continue;
             $themeConfigs[$theme] = $themeConfig;
             if (config("theme.{$theme}")) continue;
@@ -60,9 +60,10 @@ class ThemeController extends Controller
         ]);
         $payload['config'] = json_decode(base64_decode($payload['config']), true);
         if (!$payload['config'] || !is_array($payload['config'])) abort(500, '参数有误');
-        $themeConfigFile = public_path("theme/{$payload['name']}/config.php");
+        $themeConfigFile = public_path("theme/{$payload['name']}/config.json");
         if (!File::exists($themeConfigFile)) abort(500, '主题不存在');
-        $themeConfig = include($themeConfigFile);
+        $themeConfig = json_decode(File::get($themeConfigFile), true);
+        if (!isset($themeConfig['configs']) || !is_array($themeConfig)) abort(500, '主题配置文件有误');
         $validateFields = array_column($themeConfig['configs'], 'field_name');
         $config = [];
         foreach ($validateFields as $validateField) {

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;
 
@@ -68,7 +67,7 @@ class TicketController extends Controller
         $ticketService->replyByAdmin(
             $request->input('id'),
             $request->input('message'),
-            $request->session()->get('id')
+            $request->user['id']
         );
         return response([
             'data' => true

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;
 
@@ -33,16 +31,23 @@ class AppController extends Controller
         $proxies = [];
 
         foreach ($servers as $item) {
-            if ($item['type'] === 'shadowsocks') {
-                array_push($proxy, Protocols\Clash::buildShadowsocks($user['uuid'], $item));
+            if ($item['type'] === 'shadowsocks'
+                && in_array($item['cipher'], [
+                    'aes-128-gcm',
+                    'aes-192-gcm',
+                    'aes-256-gcm',
+                    'chacha20-ietf-poly1305'
+                ])
+            ) {
+                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,21 +1,20 @@
 <?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
 {
     public function subscribe(Request $request)
     {
         $flag = $request->input('flag')
-            ?? (isset($_SERVER['HTTP_USER_AGENT'])
-                ? $_SERVER['HTTP_USER_AGENT']
-                : '');
+            ?? ($_SERVER['HTTP_USER_AGENT'] ?? '');
         $flag = strtolower($flag);
         $user = $request->user;
         // account not expired and is not banned.
@@ -25,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);
@@ -58,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,34 +1,37 @@
 <?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
 {
     protected $msg;
     protected $commands = [];
+    protected $telegramService;
 
     public function __construct(Request $request)
     {
         if ($request->input('access_token') !== md5(config('v2board.telegram_bot_token'))) {
             abort(401);
         }
+
+        $this->telegramService = new TelegramService();
     }
 
     public function webhook(Request $request)
     {
-        $this->msg = $this->getMessage($request->input());
-        if (!$this->msg) return;
+        $this->formatMessage($request->input());
+        $this->formatChatJoinRequest($request->input());
         $this->handle();
     }
 
     public function handle()
     {
+        if (!$this->msg) return;
         $msg = $this->msg;
-
         $commandName = explode('@', $msg->command);
 
         // To reduce request, only commands contains @ will get the bot name
@@ -59,34 +62,62 @@ class TelegramController extends Controller
                 }
             }
         } catch (\Exception $e) {
-            $telegramService = new TelegramService();
-            $telegramService->sendMessage($msg->chat_id, $e->getMessage());
+            $this->telegramService->sendMessage($msg->chat_id, $e->getMessage());
         }
     }
 
     public function getBotName()
     {
-        $telegramService = new TelegramService();
-        $response = $telegramService->getMe();
+        $response = $this->telegramService->getMe();
         return $response->result->username;
     }
 
-    private function getMessage(array $data)
+    private function formatMessage(array $data)
     {
-        if (!isset($data['message'])) return false;
+        if (!isset($data['message'])) return;
+        if (!isset($data['message']['text'])) return;
         $obj = new \StdClass();
-        if (!isset($data['message']['text'])) return false;
         $text = explode(' ', $data['message']['text']);
         $obj->command = $text[0];
         $obj->args = array_slice($text, 1);
         $obj->chat_id = $data['message']['chat']['id'];
         $obj->message_id = $data['message']['message_id'];
-        $obj->message_type = !isset($data['message']['reply_to_message']['text']) ? 'message' : 'reply_message';
+        $obj->message_type = 'message';
         $obj->text = $data['message']['text'];
         $obj->is_private = $data['message']['chat']['type'] === 'private';
-        if ($obj->message_type === 'reply_message') {
+        if (isset($data['message']['reply_to_message']['text'])) {
+            $obj->message_type = 'reply_message';
             $obj->reply_text = $data['message']['reply_to_message']['text'];
         }
-        return $obj;
+        $this->msg = $obj;
+    }
+
+    private function formatChatJoinRequest(array $data)
+    {
+        if (!isset($data['chat_join_request'])) return;
+        if (!isset($data['chat_join_request']['from']['id'])) return;
+        if (!isset($data['chat_join_request']['chat']['id'])) return;
+        $user = \App\Models\User::where('telegram_id', $data['chat_join_request']['from']['id'])
+            ->first();
+        if (!$user) {
+            $this->telegramService->declineChatJoinRequest(
+                $data['chat_join_request']['chat']['id'],
+                $data['chat_join_request']['from']['id']
+            );
+            return;
+        }
+        $userService = new \App\Services\UserService();
+        if (!$userService->isAvailable($user)) {
+            $this->telegramService->declineChatJoinRequest(
+                $data['chat_join_request']['chat']['id'],
+                $data['chat_join_request']['from']['id']
+            );
+            return;
+        }
+        $userService = new \App\Services\UserService();
+        $this->telegramService->approveChatJoinRequest(
+            $data['chat_join_request']['chat']['id'],
+            $data['chat_join_request']['from']['id']
+        );
     }
 }

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

@@ -1,29 +1,86 @@
 <?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 Illuminate\Http\Request;
-use Illuminate\Support\Facades\Cache;
+use App\Http\Requests\Passport\AuthRegister;
+use App\Jobs\SendEmailJob;
+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
 {
+    public function loginWithMailLink(Request $request)
+    {
+        if (!(int)config('v2board.login_with_mail_link_enable')) {
+            abort(404);
+        }
+        $params = $request->validate([
+            'email' => 'required|email:strict',
+            'redirect' => 'nullable'
+        ]);
+
+        if (Cache::get(CacheKey::get('LAST_SEND_LOGIN_WITH_MAIL_LINK_TIMESTAMP', $params['email']))) {
+            abort(500, __('Sending frequently, please try again later'));
+        }
+
+        $user = User::where('email', $params['email'])->first();
+        if (!$user) {
+            return response([
+                'data' => true
+            ]);
+        }
+
+        $code = Helper::guid();
+        $key = CacheKey::get('TEMP_TOKEN', $code);
+        Cache::put($key, $user->id, 300);
+        Cache::put(CacheKey::get('LAST_SEND_LOGIN_WITH_MAIL_LINK_TIMESTAMP', $params['email']), time(), 60);
+
+
+        $redirect = '/#/login?verify=' . $code . '&redirect=' . ($request->input('redirect') ? $request->input('redirect') : 'dashboard');
+        if (config('v2board.app_url')) {
+            $link = config('v2board.app_url') . $redirect;
+        } else {
+            $link = url($redirect);
+        }
+
+        SendEmailJob::dispatch([
+            'email' => $user->email,
+            'subject' => __('Login to :name', [
+                'name' => config('v2board.app_name', 'V2Board')
+            ]),
+            'template_name' => 'login',
+            'template_value' => [
+                'name' => config('v2board.app_name', 'V2Board'),
+                'link' => $link,
+                'url' => config('v2board.app_url')
+            ]
+        ]);
+
+        return response([
+            'data' => $link
+        ]);
+
+    }
+
     public function register(AuthRegister $request)
     {
         if ((int)config('v2board.register_limit_by_ip_enable', 0)) {
             $registerCountByIP = Cache::get(CacheKey::get('REGISTER_IP_RATE_LIMIT', $request->ip())) ?? 0;
             if ((int)$registerCountByIP >= (int)config('v2board.register_limit_count', 3)) {
-                abort(500, __('Register frequently, please try again after 1 hour'));
+                abort(500, __('Register frequently, please try again after :minute minute', [
+                    'minute' => config('v2board.register_limit_expire', 60)
+                ]));
             }
         }
         if ((int)config('v2board.recaptcha_enable', 0)) {
@@ -59,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'));
             }
         }
@@ -99,6 +156,7 @@ class AuthController extends Controller
                 $user->plan_id = $plan->id;
                 $user->group_id = $plan->group_id;
                 $user->expired_at = time() + (config('v2board.try_out_hour', 1) * 3600);
+                $user->speed_limit = $plan->speed_limit;
             }
         }
 
@@ -109,12 +167,6 @@ class AuthController extends Controller
             Cache::forget(CacheKey::get('EMAIL_VERIFY_CODE', $request->input('email')));
         }
 
-        $data = [
-            'token' => $user->token,
-            'auth_data' => base64_encode("{$user->email}:{$user->password}")
-        ];
-        $request->session()->put('email', $user->email);
-        $request->session()->put('id', $user->id);
         $user->last_login_at = time();
         $user->save();
 
@@ -125,8 +177,11 @@ class AuthController extends Controller
                 (int)config('v2board.register_limit_expire', 60) * 60
             );
         }
+
+        $authService = new AuthService($user);
+
         return response()->json([
-            'data' => $data
+            'data' => $authService->generateAuthData($request)
         ]);
     }
 
@@ -135,6 +190,15 @@ class AuthController extends Controller
         $email = $request->input('email');
         $password = $request->input('password');
 
+        if ((int)config('v2board.password_limit_enable', 1)) {
+            $passwordErrorCount = (int)Cache::get(CacheKey::get('PASSWORD_ERROR_LIMIT', $email), 0);
+            if ($passwordErrorCount >= (int)config('v2board.password_limit_count', 5)) {
+                abort(500, __('There are too many password errors, please try again after :minute minutes.', [
+                    'minute' => config('v2board.password_limit_expire', 60)
+                ]));
+            }
+        }
+
         $user = User::where('email', $email)->first();
         if (!$user) {
             abort(500, __('Incorrect email or password'));
@@ -145,6 +209,13 @@ class AuthController extends Controller
             $password,
             $user->password)
         ) {
+            if ((int)config('v2board.password_limit_enable')) {
+                Cache::put(
+                    CacheKey::get('PASSWORD_ERROR_LIMIT', $email),
+                    (int)$passwordErrorCount + 1,
+                    60 * (int)config('v2board.password_limit_expire', 60)
+                );
+            }
             abort(500, __('Incorrect email or password'));
         }
 
@@ -152,22 +223,9 @@ class AuthController extends Controller
             abort(500, __('Your account has been suspended'));
         }
 
-        $data = [
-            'token' => $user->token,
-            'auth_data' => base64_encode("{$user->email}:{$user->password}")
-        ];
-        $request->session()->put('email', $user->email);
-        $request->session()->put('id', $user->id);
-        if ($user->is_admin) {
-            $request->session()->put('is_admin', true);
-            $data['is_admin'] = true;
-        }
-        if ($user->is_staff) {
-            $request->session()->put('is_staff', true);
-            $data['is_staff'] = true;
-        }
+        $authService = new AuthService($user);
         return response([
-            'data' => $data
+            'data' => $authService->generateAuthData($request)
         ]);
     }
 
@@ -196,47 +254,25 @@ class AuthController extends Controller
             if ($user->banned) {
                 abort(500, __('Your account has been suspended'));
             }
-            $request->session()->put('email', $user->email);
-            $request->session()->put('id', $user->id);
-            if ($user->is_admin) {
-                $request->session()->put('is_admin', true);
-            }
             Cache::forget($key);
+            $authService = new AuthService($user);
             return response([
-                'data' => true
+                'data' => $authService->generateAuthData($request)
             ]);
         }
     }
 
-    public function getTempToken(Request $request)
-    {
-        $user = User::where('token', $request->input('token'))->first();
-        if (!$user) {
-            abort(500, __('Token error'));
-        }
-
-        $code = Helper::guid();
-        $key = CacheKey::get('TEMP_TOKEN', $code);
-        Cache::put($key, $user->id, 60);
-        return response([
-            'data' => $code
-        ]);
-    }
-
     public function getQuickLoginUrl(Request $request)
     {
-        $authData = explode(':', base64_decode($request->input('auth_data')));
-        if (!isset($authData[0])) abort(403, __('Token error'));
-        $user = User::where('email', $authData[0])
-            ->where('password', $authData[1])
-            ->first();
-        if (!$user) {
-            abort(500, __('Token error'));
-        }
+        $authorization = $request->input('auth_data') ?? $request->header('authorization');
+        if (!$authorization) abort(403, '未登录或登陆已过期');
+
+        $user = AuthService::decryptAuthData($authorization);
+        if (!$user) abort(403, '未登录或登陆已过期');
 
         $code = Helper::guid();
         $key = CacheKey::get('TEMP_TOKEN', $code);
-        Cache::put($key, $user->id, 60);
+        Cache::put($key, $user['id'], 60);
         $redirect = '/#/login?verify=' . $code . '&redirect=' . ($request->input('redirect') ? $request->input('redirect') : 'dashboard');
         if (config('v2board.app_url')) {
             $url = config('v2board.app_url') . $redirect;
@@ -248,22 +284,13 @@ class AuthController extends Controller
         ]);
     }
 
-    public function check(Request $request)
-    {
-        $data = [
-            'is_login' => $request->session()->get('id') ? true : false
-        ];
-        if ($request->session()->get('is_admin')) {
-            $data['is_admin'] = true;
-        }
-        return response([
-            'data' => $data
-        ]);
-    }
-
     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();
@@ -281,5 +308,4 @@ class AuthController extends Controller
             'data' => true
         ]);
     }
-
 }

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

@@ -1,40 +1,22 @@
 <?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
 {
-    // TODO: remove on 1.5.5
-    public function config()
-    {
-        return response([
-            'data' => [
-                'isEmailVerify' => (int)config('v2board.email_verify', 0) ? 1 : 0,
-                'isInviteForce' => (int)config('v2board.invite_force', 0) ? 1 : 0,
-                'emailWhitelistSuffix' => (int)config('v2board.email_whitelist_enable', 0)
-                    ? $this->getEmailSuffix()
-                    : 0,
-                'isRecaptcha' => (int)config('v2board.recaptcha_enable', 0) ? 1 : 0,
-                'recaptchaSiteKey' => config('v2board.recaptcha_site_key'),
-                'appDescription' => config('v2board.app_description'),
-                'appUrl' => config('v2board.app_url')
-            ]
-        ]);
-    }
-
     private function isEmailVerify()
     {
         return response([

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'] * $server->rate;
-            $d = $item['d'] * $server->rate;
-            $userService->trafficFetch($u, $d, $item['user_id'], $server, 'vmess');
+            $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'] * $server->rate;
-            $d = $item['d'] * $server->rate;
-            $userService->trafficFetch($u, $d, $item['user_id'], $server, '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'] * $server->rate;
-            $d = $item['d'] * $server->rate;
-            $userService->trafficFetch($u, $d, $item['user_id'], $server, '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

@@ -0,0 +1,141 @@
+<?php
+
+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 Illuminate\Support\Facades\Cache;
+
+class UniProxyController extends Controller
+{
+    private $nodeType;
+    private $nodeInfo;
+    private $nodeId;
+    private $serverService;
+
+    public function __construct(Request $request)
+    {
+        $token = $request->input('token');
+        if (empty($token)) {
+            abort(500, 'token is null');
+        }
+        if ($token !== config('v2board.server_token')) {
+            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);
+        if (!$this->nodeInfo) abort(500, 'server is not exist');
+    }
+
+    // 后端获取用户
+    public function user(Request $request)
+    {
+        ini_set('memory_limit', -1);
+        Cache::put(CacheKey::get('SERVER_' . strtoupper($this->nodeType) . '_LAST_CHECK_AT', $this->nodeInfo->id), time(), 3600);
+        $users = $this->serverService->getAvailableUsers($this->nodeInfo->group_id);
+        $users = $users->toArray();
+
+        $response['users'] = $users;
+
+        $eTag = sha1(json_encode($response));
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
+            abort(304);
+        }
+
+        return response($response)->header('ETag', "\"{$eTag}\"");
+    }
+
+    // 后端提交数据
+    public function push(Request $request)
+    {
+        $data = file_get_contents('php://input');
+        $data = json_decode($data, true);
+        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();
+        $userService->trafficFetch($this->nodeInfo->toArray(), $this->nodeType, $data);
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    // 后端获取配置
+    public function config(Request $request)
+    {
+        switch ($this->nodeType) {
+            case 'shadowsocks':
+                $response = [
+                    'server_port' => $this->nodeInfo->server_port,
+                    'cipher' => $this->nodeInfo->cipher,
+                    'obfs' => $this->nodeInfo->obfs,
+                    'obfs_settings' => $this->nodeInfo->obfs_settings
+                ];
+
+                if ($this->nodeInfo->cipher === '2022-blake3-aes-128-gcm') {
+                    $response['server_key'] = Helper::getServerKey($this->nodeInfo->created_at, 16);
+                }
+                if ($this->nodeInfo->cipher === '2022-blake3-aes-256-gcm') {
+                    $response['server_key'] = Helper::getServerKey($this->nodeInfo->created_at, 32);
+                }
+                break;
+            case 'vmess':
+                $response = [
+                    'server_port' => $this->nodeInfo->server_port,
+                    'network' => $this->nodeInfo->network,
+                    'networkSettings' => $this->nodeInfo->networkSettings,
+                    'tls' => $this->nodeInfo->tls
+                ];
+                break;
+            case 'trojan':
+                $response = [
+                    'host' => $this->nodeInfo->host,
+                    'server_port' => $this->nodeInfo->server_port,
+                    '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;
+        }
+        $response['base_config'] = [
+            'push_interval' => (int)config('v2board.server_push_interval', 60),
+            'pull_interval' => (int)config('v2board.server_pull_interval', 60)
+        ];
+        if ($this->nodeInfo['route_id']) {
+            $response['routes'] = $this->serverService->getRoutes($this->nodeInfo['route_id']);
+        }
+        $eTag = sha1(json_encode($response));
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
+            abort(304);
+        }
+
+        return response($response)->header('ETag', "\"{$eTag}\"");
+    }
+}

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
 {
@@ -57,7 +57,7 @@ class TicketController extends Controller
         $ticketService->replyByAdmin(
             $request->input('id'),
             $request->input('message'),
-            $request->session()->get('id')
+            $request->user['id']
         );
         return response([
             'data' => true

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
 {
@@ -19,7 +19,11 @@ class CommController extends Controller
                 'withdraw_methods' => config('v2board.commission_withdraw_method', Dict::WITHDRAW_METHOD_WHITELIST_DEFAULT),
                 'withdraw_close' => (int)config('v2board.withdraw_close_enable', 0),
                 'currency' => config('v2board.currency', 'CNY'),
-                'currency_symbol' => config('v2board.currency_symbol', '¥')
+                'currency_symbol' => config('v2board.currency_symbol', '¥'),
+                'commission_distribution_enable' => (int)config('v2board.commission_distribution_enable', 0),
+                'commission_distribution_l1' => config('v2board.commission_distribution_l1'),
+                'commission_distribution_l2' => config('v2board.commission_distribution_l2'),
+                'commission_distribution_l3' => config('v2board.commission_distribution_l3')
             ]
         ]);
     }

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
 {
@@ -16,7 +15,7 @@ class CouponController extends Controller
         }
         $couponService = new CouponService($request->input('code'));
         $couponService->setPlanId($request->input('plan_id'));
-        $couponService->setUserId($request->session()->get('id'));
+        $couponService->setUserId($request->user['id']);
         $couponService->check();
         return response([
             'data' => $couponService->getCoupon()

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

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Http\Controllers\V1\User;
+
+use App\Http\Controllers\Controller;
+use App\Models\CommissionLog;
+use App\Models\InviteCode;
+use App\Models\Order;
+use App\Models\User;
+use App\Utils\Helper;
+use Illuminate\Http\Request;
+
+class InviteController extends Controller
+{
+    public function save(Request $request)
+    {
+        if (InviteCode::where('user_id', $request->user['id'])->where('status', 0)->count() >= config('v2board.invite_gen_limit', 5)) {
+            abort(500, __('The maximum number of creations has been reached'));
+        }
+        $inviteCode = new InviteCode();
+        $inviteCode->user_id = $request->user['id'];
+        $inviteCode->code = Helper::randomChar(8);
+        return response([
+            'data' => $inviteCode->save()
+        ]);
+    }
+
+    public function details(Request $request)
+    {
+        $current = $request->input('current') ? $request->input('current') : 1;
+        $pageSize = $request->input('page_size') >= 10 ? $request->input('page_size') : 10;
+        $builder = CommissionLog::where('invite_user_id', $request->user['id'])
+            ->where('get_amount', '>', 0)
+            ->select([
+                'id',
+                'trade_no',
+                'order_amount',
+                'get_amount',
+                'created_at'
+            ])
+            ->orderBy('created_at', 'DESC');
+        $total = $builder->count();
+        $details = $builder->forPage($current, $pageSize)
+            ->get();
+        return response([
+            'data' => $details,
+            'total' => $total
+        ]);
+    }
+
+    public function fetch(Request $request)
+    {
+        $codes = InviteCode::where('user_id', $request->user['id'])
+            ->where('status', 0)
+            ->get();
+        $commission_rate = config('v2board.invite_commission', 10);
+        $user = User::find($request->user['id']);
+        if ($user->commission_rate) {
+            $commission_rate = $user->commission_rate;
+        }
+        $uncheck_commission_balance = (int)Order::where('status', 3)
+            ->where('commission_status', 0)
+            ->where('invite_user_id', $request->user['id'])
+            ->sum('commission_balance');
+        if (config('v2board.commission_distribution_enable', 0)) {
+            $uncheck_commission_balance = $uncheck_commission_balance * (config('v2board.commission_distribution_l1') / 100);
+        }
+        $stat = [
+            //已注册用户数
+            (int)User::where('invite_user_id', $request->user['id'])->count(),
+            //有效的佣金
+            (int)CommissionLog::where('invite_user_id', $request->user['id'])
+                ->sum('get_amount'),
+            //确认中的佣金
+            $uncheck_commission_balance,
+            //佣金比例
+            (int)$commission_rate,
+            //可用佣金
+            (int)$user->commission_balance
+        ];
+        return response([
+            'data' => [
+                'codes' => $codes,
+                'stat' => $stat
+            ]
+        ]);
+    }
+}

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
 {
@@ -19,17 +19,12 @@ class KnowledgeController extends Controller
                 ->first()
                 ->toArray();
             if (!$knowledge) abort(500, __('Article does not exist'));
-            $user = User::find($request->session()->get('id'));
+            $user = User::find($request->user['id']);
             $userService = new UserService();
-            if ($userService->isAvailable($user)) {
-                $appleId = config('v2board.apple_id');
-                $appleIdPassword = config('v2board.apple_id_password');
-            } else {
-                $appleId = __('No active subscription. Unable to use our provided Apple ID');
-                $appleIdPassword = __('No active subscription. Unable to use our provided Apple ID');
+            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']);
@@ -46,11 +41,19 @@ class KnowledgeController extends Controller
                 'data' => $knowledge
             ]);
         }
-        $knowledges = Knowledge::select(['id', 'category', 'title', 'updated_at'])
+        $builder = Knowledge::select(['id', 'category', 'title', 'updated_at'])
             ->where('language', $request->input('language'))
             ->where('show', 1)
-            ->orderBy('sort', 'ASC')
-            ->get()
+            ->orderBy('sort', 'ASC');
+        $keyword = $request->input('keyword');
+        if ($keyword) {
+            $builder = $builder->where(function ($query) use ($keyword) {
+                $query->where('title', 'LIKE', "%{$keyword}%")
+                    ->orWhere('body', 'LIKE', "%{$keyword}%");
+            });
+        }
+
+        $knowledges = $builder->get()
             ->groupBy('category');
         return response([
             'data' => $knowledges

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,34 +1,34 @@
 <?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
 {
     public function fetch(Request $request)
     {
-        $model = Order::where('user_id', $request->session()->get('id'))
+        $model = Order::where('user_id', $request->user['id'])
             ->orderBy('created_at', 'DESC');
         if ($request->input('status') !== null) {
             $model->where('status', $request->input('status'));
@@ -49,7 +49,7 @@ class OrderController extends Controller
 
     public function detail(Request $request)
     {
-        $order = Order::where('user_id', $request->session()->get('id'))
+        $order = Order::where('user_id', $request->user['id'])
             ->where('trade_no', $request->input('trade_no'))
             ->first();
         if (!$order) {
@@ -71,28 +71,30 @@ class OrderController extends Controller
     public function save(OrderSave $request)
     {
         $userService = new UserService();
-        if ($userService->isNotCompleteOrderByUserId($request->session()->get('id'))) {
+        if ($userService->isNotCompleteOrderByUserId($request->user['id'])) {
             abort(500, __('You have an unpaid or pending order, please try again later or cancel it'));
         }
 
-        $plan = Plan::find($request->input('plan_id'));
-        $user = User::find($request->session()->get('id'));
+        $planService = new PlanService($request->input('plan_id'));
+
+        $plan = $planService->plan;
+        $user = User::find($request->user['id']);
 
         if (!$plan) {
             abort(500, __('Subscription plan does not exist'));
         }
 
+        if ($user->plan_id !== $plan->id && !$planService->haveCapacity() && $request->input('period') !== 'reset_price') {
+            abort(500, __('Current product is sold out'));
+        }
+
         if ($plan[$request->input('period')] === NULL) {
             abort(500, __('This payment period cannot be purchased, please choose another period'));
         }
 
         if ($request->input('period') === 'reset_price') {
-            if (!$user->plan_id) {
+            if (!$userService->isAvailable($user) || $plan->id !== $user->plan_id) {
                 abort(500, __('Subscription has expired or no active subscription, unable to purchase Data Reset Package'));
-            } else {
-                if ($user->plan_id !== $plan->id) {
-                    abort(500, __('This subscription reset package does not apply to your subscription'));
-                }
             }
         }
 
@@ -114,7 +116,7 @@ class OrderController extends Controller
         DB::beginTransaction();
         $order = new Order();
         $orderService = new OrderService($order);
-        $order->user_id = $request->session()->get('id');
+        $order->user_id = $request->user['id'];
         $order->plan_id = $plan->id;
         $order->period = $request->input('period');
         $order->trade_no = Helper::generateOrderNo();
@@ -170,7 +172,7 @@ class OrderController extends Controller
         $tradeNo = $request->input('trade_no');
         $method = $request->input('method');
         $order = Order::where('trade_no', $tradeNo)
-            ->where('user_id', $request->session()->get('id'))
+            ->where('user_id', $request->user['id'])
             ->where('status', 0)
             ->first();
         if (!$order) {
@@ -188,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);
         }
@@ -209,7 +212,7 @@ class OrderController extends Controller
     {
         $tradeNo = $request->input('trade_no');
         $order = Order::where('trade_no', $tradeNo)
-            ->where('user_id', $request->session()->get('id'))
+            ->where('user_id', $request->user['id'])
             ->first();
         if (!$order) {
             abort(500, __('Order does not exist'));
@@ -229,7 +232,9 @@ class OrderController extends Controller
             'handling_fee_fixed',
             'handling_fee_percent'
         ])
-            ->where('enable', 1)->get();
+            ->where('enable', 1)
+            ->orderBy('sort', 'ASC')
+            ->get();
 
         return response([
             'data' => $methods
@@ -242,7 +247,7 @@ class OrderController extends Controller
             abort(500, __('Invalid parameter'));
         }
         $order = Order::where('trade_no', $request->input('trade_no'))
-            ->where('user_id', $request->session()->get('id'))
+            ->where('user_id', $request->user['id'])
             ->first();
         if (!$order) {
             abort(500, __('Order does not exist'));

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

@@ -1,17 +1,19 @@
 <?php
 
-namespace App\Http\Controllers\User;
+namespace App\Http\Controllers\V1\User;
 
 use App\Http\Controllers\Controller;
-use App\Models\User;
-use Illuminate\Http\Request;
 use App\Models\Plan;
+use App\Models\User;
+use App\Services\PlanService;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 
 class PlanController extends Controller
 {
     public function fetch(Request $request)
     {
-        $user = User::find($request->session()->get('id'));
+        $user = User::find($request->user['id']);
         if ($request->input('id')) {
             $plan = Plan::where('id', $request->input('id'))->first();
             if (!$plan) {
@@ -24,11 +26,18 @@ class PlanController extends Controller
                 'data' => $plan
             ]);
         }
-        $plan = Plan::where('show', 1)
+
+        $counts = PlanService::countActiveUsers();
+        $plans = Plan::where('show', 1)
             ->orderBy('sort', 'ASC')
             ->get();
+        foreach ($plans as $k => $v) {
+            if ($plans[$k]->capacity_limit === NULL) continue;
+            if (!isset($counts[$plans[$k]->id])) continue;
+            $plans[$k]->capacity_limit = $plans[$k]->capacity_limit - $counts[$plans[$k]->id]->count;
+        }
         return response([
-            'data' => $plan
+            'data' => $plans
         ]);
     }
 }

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

@@ -1,33 +1,33 @@
 <?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
 {
     public function fetch(Request $request)
     {
-        $user = User::find($request->session()->get('id'));
+        $user = User::find($request->user['id']);
         $servers = [];
         $userService = new UserService();
         if ($userService->isAvailable($user)) {
             $serverService = new ServerService();
             $servers = $serverService->getAvailableServers($user);
         }
+        $eTag = sha1(json_encode(array_column($servers, 'cache_key')));
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
+            abort(304);
+        }
+
         return response([
             'data' => $servers
-        ]);
+        ])->header('ETag', "\"{$eTag}\"");
     }
 }

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;
@@ -18,7 +18,7 @@ class StatController extends Controller
             'user_id',
             'server_rate'
         ])
-            ->where('user_id', $request->session()->get('id'))
+            ->where('user_id', $request->user['id'])
             ->where('record_at', '>=', strtotime(date('Y-m-1')))
             ->orderBy('record_at', 'DESC');
         return response([

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;
@@ -22,6 +22,6 @@ class TelegramController extends Controller
 
     public function unbind(Request $request)
     {
-        $user = User::where('user_id', $request->session()->get('id'))->first();
+        $user = User::where('user_id', $request->user['id'])->first();
     }
 }

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
@@ -21,7 +20,7 @@ class TicketController extends Controller
     {
         if ($request->input('id')) {
             $ticket = Ticket::where('id', $request->input('id'))
-                ->where('user_id', $request->session()->get('id'))
+                ->where('user_id', $request->user['id'])
                 ->first();
             if (!$ticket) {
                 abort(500, __('Ticket does not exist'));
@@ -38,7 +37,7 @@ class TicketController extends Controller
                 'data' => $ticket
             ]);
         }
-        $ticket = Ticket::where('user_id', $request->session()->get('id'))
+        $ticket = Ticket::where('user_id', $request->user['id'])
             ->orderBy('created_at', 'DESC')
             ->get();
         return response([
@@ -49,21 +48,21 @@ class TicketController extends Controller
     public function save(TicketSave $request)
     {
         DB::beginTransaction();
-        if ((int)Ticket::where('status', 0)->where('user_id', $request->session()->get('id'))->lockForUpdate()->count()) {
+        if ((int)Ticket::where('status', 0)->where('user_id', $request->user['id'])->lockForUpdate()->count()) {
             abort(500, __('There are other unresolved tickets'));
         }
         $ticket = Ticket::create(array_merge($request->only([
             'subject',
             'level'
         ]), [
-            'user_id' => $request->session()->get('id')
+            'user_id' => $request->user['id']
         ]));
         if (!$ticket) {
             DB::rollback();
             abort(500, __('Failed to open ticket'));
         }
         $ticketMessage = TicketMessage::create([
-            'user_id' => $request->session()->get('id'),
+            'user_id' => $request->user['id'],
             'ticket_id' => $ticket->id,
             'message' => $request->input('message')
         ]);
@@ -87,7 +86,7 @@ class TicketController extends Controller
             abort(500, __('Message cannot be empty'));
         }
         $ticket = Ticket::where('id', $request->input('id'))
-            ->where('user_id', $request->session()->get('id'))
+            ->where('user_id', $request->user['id'])
             ->first();
         if (!$ticket) {
             abort(500, __('Ticket does not exist'));
@@ -95,14 +94,14 @@ class TicketController extends Controller
         if ($ticket->status) {
             abort(500, __('The ticket is closed and cannot be replied'));
         }
-        if ($request->session()->get('id') == $this->getLastMessage($ticket->id)->user_id) {
+        if ($request->user['id'] == $this->getLastMessage($ticket->id)->user_id) {
             abort(500, __('Please wait for the technical enginneer to reply'));
         }
         $ticketService = new TicketService();
         if (!$ticketService->reply(
             $ticket,
             $request->input('message'),
-            $request->session()->get('id')
+            $request->user['id']
         )) {
             abort(500, __('Ticket reply failed'));
         }
@@ -119,7 +118,7 @@ class TicketController extends Controller
             abort(500, __('Invalid parameter'));
         }
         $ticket = Ticket::where('id', $request->input('id'))
-            ->where('user_id', $request->session()->get('id'))
+            ->where('user_id', $request->user['id'])
             ->first();
         if (!$ticket) {
             abort(500, __('Ticket does not exist'));
@@ -154,7 +153,7 @@ class TicketController extends Controller
         )) {
             abort(500, __('Unsupported withdrawal method'));
         }
-        $user = User::find($request->session()->get('id'));
+        $user = User::find($request->user['id']);
         $limit = config('v2board.commission_withdraw_limit', 100);
         if ($limit > ($user->commission_balance / 100)) {
             abort(500, __('The current required minimum withdrawal commission is :limit', ['limit' => $limit]));
@@ -164,7 +163,7 @@ class TicketController extends Controller
         $ticket = Ticket::create([
             'subject' => $subject,
             'level' => 2,
-            'user_id' => $request->session()->get('id')
+            'user_id' => $request->user['id']
         ]);
         if (!$ticket) {
             DB::rollback();
@@ -175,7 +174,7 @@ class TicketController extends Controller
             __('Withdrawal account') . "：" . $request->input('withdraw_account')
         );
         $ticketMessage = TicketMessage::create([
-            'user_id' => $request->session()->get('id'),
+            'user_id' => $request->user['id'],
             'ticket_id' => $ticket->id,
             'message' => $message
         ]);

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

@@ -1,34 +1,64 @@
 <?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\Services\UserService;
-use App\Utils\CacheKey;
-use Illuminate\Http\Request;
-use App\Models\User;
+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 App\Utils\Helper;
-use App\Models\Order;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 
 class UserController extends Controller
 {
-    public function logout(Request $request)
+    public function getActiveSession(Request $request)
     {
-        $request->session()->flush();
+        $user = User::find($request->user['id']);
+        if (!$user) {
+            abort(500, __('The user does not exist'));
+        }
+        $authService = new AuthService($user);
         return response([
-            'data' => true
+            'data' => $authService->getSessions()
+        ]);
+    }
+
+    public function removeActiveSession(Request $request)
+    {
+        $user = User::find($request->user['id']);
+        if (!$user) {
+            abort(500, __('The user does not exist'));
+        }
+        $authService = new AuthService($user);
+        return response([
+            'data' => $authService->removeSession($request->input('session_id'))
+        ]);
+    }
+
+    public function checkLogin(Request $request)
+    {
+        $data = [
+            'is_login' => $request->user['id'] ? true : false
+        ];
+        if ($request->user['is_admin']) {
+            $data['is_admin'] = true;
+        }
+        return response([
+            'data' => $data
         ]);
     }
 
     public function changePassword(UserChangePassword $request)
     {
-        $user = User::find($request->session()->get('id'));
+        $user = User::find($request->user['id']);
         if (!$user) {
             abort(500, __('The user does not exist'));
         }
@@ -46,7 +76,6 @@ class UserController extends Controller
         if (!$user->save()) {
             abort(500, __('Save failed'));
         }
-        $request->session()->flush();
         return response([
             'data' => true
         ]);
@@ -54,7 +83,7 @@ class UserController extends Controller
 
     public function info(Request $request)
     {
-        $user = User::where('id', $request->session()->get('id'))
+        $user = User::where('id', $request->user['id'])
             ->select([
                 'email',
                 'transfer_enable',
@@ -86,12 +115,12 @@ class UserController extends Controller
     {
         $stat = [
             Order::where('status', 0)
-                ->where('user_id', $request->session()->get('id'))
+                ->where('user_id', $request->user['id'])
                 ->count(),
             Ticket::where('status', 0)
-                ->where('user_id', $request->session()->get('id'))
+                ->where('user_id', $request->user['id'])
                 ->count(),
-            User::where('invite_user_id', $request->session()->get('id'))
+            User::where('invite_user_id', $request->user['id'])
                 ->count()
         ];
         return response([
@@ -101,7 +130,7 @@ class UserController extends Controller
 
     public function getSubscribe(Request $request)
     {
-        $user = User::where('id', $request->session()->get('id'))
+        $user = User::where('id', $request->user['id'])
             ->select([
                 'plan_id',
                 'token',
@@ -109,7 +138,8 @@ class UserController extends Controller
                 'u',
                 'd',
                 'transfer_enable',
-                'email'
+                'email',
+                'uuid'
             ])
             ->first();
         if (!$user) {
@@ -121,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([
@@ -131,7 +161,7 @@ class UserController extends Controller
 
     public function resetSecurity(Request $request)
     {
-        $user = User::find($request->session()->get('id'));
+        $user = User::find($request->user['id']);
         if (!$user) {
             abort(500, __('The user does not exist'));
         }
@@ -141,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'])
         ]);
     }
 
@@ -152,7 +182,7 @@ class UserController extends Controller
             'remind_traffic'
         ]);
 
-        $user = User::find($request->session()->get('id'));
+        $user = User::find($request->user['id']);
         if (!$user) {
             abort(500, __('The user does not exist'));
         }
@@ -169,7 +199,7 @@ class UserController extends Controller
 
     public function transfer(UserTransfer $request)
     {
-        $user = User::find($request->session()->get('id'));
+        $user = User::find($request->user['id']);
         if (!$user) {
             abort(500, __('The user does not exist'));
         }
@@ -188,7 +218,7 @@ class UserController extends Controller
 
     public function getQuickLoginUrl(Request $request)
     {
-        $user = User::find($request->session()->get('id'));
+        $user = User::find($request->user['id']);
         if (!$user) {
             abort(500, __('The user does not exist'));
         }

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

@@ -2,6 +2,7 @@
 
 namespace App\Http;
 
+use Fruitcake\Cors\HandleCors;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
 class Kernel extends HttpKernel
@@ -14,6 +15,7 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
+        \App\Http\Middleware\CORS::class,
         \App\Http\Middleware\TrustProxies::class,
         \App\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
@@ -28,22 +30,20 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
-            \App\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
+//            \App\Http\Middleware\EncryptCookies::class,
+//            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+//            \Illuminate\Session\Middleware\StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \App\Http\Middleware\CORS::class,
+//            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+//            \App\Http\Middleware\VerifyCsrfToken::class,
+//            \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
         'api' => [
-            \App\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
+//            \App\Http\Middleware\EncryptCookies::class,
+//            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+//            \Illuminate\Session\Middleware\StartSession::class,
             \App\Http\Middleware\ForceJson::class,
-            \App\Http\Middleware\CORS::class,
             \App\Http\Middleware\Language::class,
             'bindings',
         ],
@@ -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/Admin.php

@@ -2,7 +2,9 @@
 
 namespace App\Http\Middleware;
 
+use App\Services\AuthService;
 use Closure;
+use Illuminate\Support\Facades\Cache;
 
 class Admin
 {
@@ -15,9 +17,14 @@ class Admin
      */
     public function handle($request, Closure $next)
     {
-        if (!$request->session()->get('is_admin')) {
-            abort(403, '权限不足');
-        }
+        $authorization = $request->input('auth_data') ?? $request->header('authorization');
+        if (!$authorization) abort(403, '未登录或登陆已过期');
+
+        $user = AuthService::decryptAuthData($authorization);
+        if (!$user || !$user['is_admin']) abort(403, '未登录或登陆已过期');
+        $request->merge([
+            'user' => $user
+        ]);
         return $next($request);
     }
 }

app/Http/Middleware/CORS.php

@@ -17,8 +17,8 @@ class CORS
         }
         $response = $next($request);
         $response->header('Access-Control-Allow-Origin', trim($origin, '/'));
-        $response->header('Access-Control-Allow-Methods', 'GET,POST,OPTIONS');
-        $response->header('Access-Control-Allow-Headers', 'Content-Type,X-Requested-With');
+        $response->header('Access-Control-Allow-Methods', 'GET,POST,OPTIONS,HEAD');
+        $response->header('Access-Control-Allow-Headers', 'Origin,Content-Type,Accept,Authorization,X-Request-With');
         $response->header('Access-Control-Allow-Credentials', 'true');
         $response->header('Access-Control-Max-Age', 10080);
 

app/Http/Middleware/Client.php

@@ -26,7 +26,9 @@ class Client
         if (!$user) {
             abort(403, 'token is error');
         }
-        $request->user = $user;
+        $request->merge([
+            'user' => $user
+        ]);
         return $next($request);
     }
 }

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/Middleware/Staff.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Middleware;
 
+use App\Services\AuthService;
 use Closure;
 
 class Staff
@@ -15,9 +16,14 @@ class Staff
      */
     public function handle($request, Closure $next)
     {
-        if (!$request->session()->get('is_staff')) {
-            abort(403, '权限不足');
-        }
+        $authorization = $request->input('auth_data') ?? $request->header('authorization');
+        if (!$authorization) abort(403, '未登录或登陆已过期');
+
+        $user = AuthService::decryptAuthData($authorization);
+        if (!$user || !$user['is_staff']) abort(403, '未登录或登陆已过期');
+        $request->merge([
+            'user' => $user
+        ]);
         return $next($request);
     }
 }

app/Http/Middleware/User.php

@@ -2,7 +2,9 @@
 
 namespace App\Http\Middleware;
 
+use App\Services\AuthService;
 use Closure;
+use Illuminate\Support\Facades\Cache;
 
 class User
 {
@@ -16,19 +18,13 @@ class User
     public function handle($request, Closure $next)
     {
         $authorization = $request->input('auth_data') ?? $request->header('authorization');
-        if ($authorization) {
-            $authData = explode(':', base64_decode($authorization));
-            if (!isset($authData[1]) || !isset($authData[0])) abort(403, '鉴权失败，请重新登入');
-            $user = \App\Models\User::where('password', $authData[1])
-                ->where('email', $authData[0])
-                ->first();
-            if (!$user) abort(403, '鉴权失败，请重新登入');
-            $request->session()->put('email', $user->email);
-            $request->session()->put('id', $user->id);
-        }
-        if (!$request->session()->get('id')) {
-            abort(403, '未登录或登陆已过期');
-        }
+        if (!$authorization) abort(403, '未登录或登陆已过期');
+
+        $user = AuthService::decryptAuthData($authorization);
+        if (!$user) abort(403, '未登录或登陆已过期');
+        $request->merge([
+            'user' => $user
+        ]);
         return $next($request);
     }
 }

app/Http/Requests/Admin/ConfigSave.php

@@ -24,49 +24,35 @@ class ConfigSave extends FormRequest
         // site
         'logo' => 'nullable|url',
         'force_https' => 'in:0,1',
-        'safe_mode_enable' => 'in:0,1',
         'stop_register' => 'in:0,1',
-        'email_verify' => 'in:0,1',
         'app_name' => '',
         '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',
-        'email_whitelist_enable' => 'in:0,1',
-        'email_whitelist_suffix' => 'nullable|array',
-        'email_gmail_limit_enable' => 'in:0,1',
-        'recaptcha_enable' => 'in:0,1',
-        'recaptcha_key' => '',
-        'recaptcha_site_key' => '',
         'tos_url' => 'nullable|url',
         'currency' => '',
         'currency_symbol' => '',
-        'register_limit_by_ip_enable' => 'in:0,1',
-        'register_limit_count' => 'integer',
-        'register_limit_expire' => 'integer',
         // 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',
         'show_info_to_server_enable' => 'in:0,1',
         // server
         'server_token' => 'nullable|min:16',
-        'server_license' => 'nullable',
-        'server_log_enable' => 'in:0,1',
-        'server_v2ray_domain' => '',
-        'server_v2ray_protocol' => '',
+        'server_pull_interval' => 'integer',
+        'server_push_interval' => 'integer',
         // frontend
         'frontend_theme' => '',
-        'frontend_theme_sidebar' => 'in:dark,light',
-        'frontend_theme_header' => 'in:dark,light',
-        'frontend_theme_color' => 'in:default,darkblue,black,green',
+        'frontend_theme_sidebar' => 'nullable|in:dark,light',
+        'frontend_theme_header' => 'nullable|in:dark,light',
+        'frontend_theme_color' => 'nullable|in:default,darkblue,black,green',
         'frontend_background_url' => 'nullable|url',
-        'frontend_admin_path' => '',
         // email
         'email_template' => '',
         'email_host' => '',
@@ -87,7 +73,23 @@ class ConfigSave extends FormRequest
         'macos_version' => '',
         'macos_download_url' => '',
         'android_version' => '',
-        'android_download_url' => ''
+        'android_download_url' => '',
+        // safe
+        'email_whitelist_enable' => 'in:0,1',
+        'email_whitelist_suffix' => 'nullable|array',
+        'email_gmail_limit_enable' => 'in:0,1',
+        'recaptcha_enable' => 'in:0,1',
+        'recaptcha_key' => '',
+        'recaptcha_site_key' => '',
+        'email_verify' => 'in:0,1',
+        'safe_mode_enable' => 'in:0,1',
+        'register_limit_by_ip_enable' => 'in:0,1',
+        'register_limit_count' => 'integer',
+        'register_limit_expire' => 'integer',
+        'secure_path' => 'min:8|regex:/^[\w-]*$/',
+        'password_limit_enable' => 'in:0,1',
+        'password_limit_count' => 'integer',
+        'password_limit_expire' => 'integer',
     ];
     /**
      * Get the validation rules that apply to the request.
@@ -108,7 +110,9 @@ class ConfigSave extends FormRequest
             'server_token.min' => '通讯密钥长度必须大于16位',
             'tos_url.url' => '服务条款URL格式不正确，必须携带http(s)://',
             'telegram_discuss_link.url' => 'Telegram群组地址必须为URL格式，必须携带http(s)://',
-            'logo.url' => 'LOGO URL格式不正确，必须携带https(s)://'
+            'logo.url' => 'LOGO URL格式不正确，必须携带https(s)://',
+            'secure_path.min' => '后台路径长度最小为8位',
+            'secure_path.regex' => '后台路径只能为字母或数字'
         ];
     }
 }

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/PlanSave.php

@@ -26,7 +26,9 @@ class PlanSave extends FormRequest
             'three_year_price' => 'nullable|integer',
             'onetime_price' => 'nullable|integer',
             'reset_price' => 'nullable|integer',
-            'reset_traffic_method' => 'nullable|integer|in:0,1,2,3,4'
+            'reset_traffic_method' => 'nullable|integer|in:0,1,2,3,4',
+            'capacity_limit' => 'nullable|integer',
+            'speed_limit' => 'nullable|integer'
         ];
     }
 
@@ -47,7 +49,9 @@ class PlanSave extends FormRequest
             'onetime_price.integer' => '一次性金额有误',
             'reset_price.integer' => '流量重置包金额有误',
             'reset_traffic_method.integer' => '流量重置方式格式有误',
-            'reset_traffic_method.in' => '流量重置方式格式有误'
+            'reset_traffic_method.in' => '流量重置方式格式有误',
+            'capacity_limit.integer' => '容纳用户量限制格式有误',
+            'speed_limit.integer' => '限速格式有误'
         ];
     }
 }

app/Http/Requests/Admin/ServerShadowsocksSave.php

@@ -18,10 +18,11 @@ class ServerShadowsocksSave extends FormRequest
             'name' => 'required',
             'group_id' => 'required|array',
             'parent_id' => 'nullable|integer',
+            'route_id' => 'nullable|array',
             'host' => 'required',
             'port' => 'required',
             'server_port' => 'required',
-            'cipher' => 'required|in:aes-128-gcm,aes-256-gcm,chacha20-ietf-poly1305',
+            'cipher' => 'required|in:aes-128-gcm,aes-192-gcm,aes-256-gcm,chacha20-ietf-poly1305,2022-blake3-aes-128-gcm,2022-blake3-aes-256-gcm',
             'obfs' => 'nullable|in:http',
             'obfs_settings' => 'nullable|array',
             'tags' => 'nullable|array',
@@ -35,6 +36,7 @@ class ServerShadowsocksSave extends FormRequest
             'name.required' => '节点名称不能为空',
             'group_id.required' => '权限组不能为空',
             'group_id.array' => '权限组格式不正确',
+            'route_id.array' => '路由组格式不正确',
             'parent_id.integer' => '父节点格式不正确',
             'host.required' => '节点地址不能为空',
             'port.required' => '连接端口不能为空',

app/Http/Requests/Admin/ServerTrojanSave.php

@@ -17,6 +17,7 @@ class ServerTrojanSave extends FormRequest
             'show' => '',
             'name' => 'required',
             'group_id' => 'required|array',
+            'route_id' => 'nullable|array',
             'parent_id' => 'nullable|integer',
             'host' => 'required',
             'port' => 'required',
@@ -34,6 +35,7 @@ class ServerTrojanSave extends FormRequest
             'name.required' => '节点名称不能为空',
             'group_id.required' => '权限组不能为空',
             'group_id.array' => '权限组格式不正确',
+            'route_id.array' => '路由组格式不正确',
             'parent_id.integer' => '父节点格式不正确',
             'host.required' => '节点地址不能为空',
             'port.required' => '连接端口不能为空',

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.
@@ -17,6 +17,7 @@ class ServerV2raySave extends FormRequest
             'show' => '',
             'name' => 'required',
             'group_id' => 'required|array',
+            'route_id' => 'nullable|array',
             'parent_id' => 'nullable|integer',
             'host' => 'required',
             'port' => 'required',
@@ -38,6 +39,7 @@ class ServerV2raySave extends FormRequest
             'name.required' => '节点名称不能为空',
             'group_id.required' => '权限组不能为空',
             'group_id.array' => '权限组格式不正确',
+            'route_id.array' => '路由组格式不正确',
             'parent_id.integer' => '父ID格式不正确',
             'host.required' => '节点地址不能为空',
             'port.required' => '连接端口不能为空',

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/UserFetch.php

@@ -14,7 +14,7 @@ class UserFetch extends FormRequest
     public function rules()
     {
         return [
-            'filter.*.key' => 'required|in:id,email,transfer_enable,d,expired_at,uuid,token,invite_by_email,invite_user_id,plan_id,banned,remarks',
+            'filter.*.key' => 'required|in:id,email,transfer_enable,d,expired_at,uuid,token,invite_by_email,invite_user_id,plan_id,banned,remarks,is_admin',
             'filter.*.condition' => 'required|in:>,<,=,>=,<=,模糊,!=',
             'filter.*.value' => 'required'
         ];

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',
@@ -29,7 +29,8 @@ class UserUpdate extends FormRequest
             'balance' => 'integer',
             'commission_type' => 'integer',
             'commission_balance' => 'integer',
-            'remarks' => 'nullable'
+            'remarks' => 'nullable',
+            'speed_limit' => 'nullable|integer'
         ];
     }
 
@@ -59,7 +60,8 @@ class UserUpdate extends FormRequest
             'd.integer' => '下行流量格式不正确',
             'balance.integer' => '余额格式不正确',
             'commission_balance.integer' => '佣金格式不正确',
-            'password.min' => '密码长度最小8位'
+            'password.min' => '密码长度最小8位',
+            'speed_limit.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,123 +0,0 @@
-<?php
-namespace App\Http\Routes;
-
-use Illuminate\Contracts\Routing\Registrar;
-
-class AdminRoute
-{
-    public function map(Registrar $router)
-    {
-        $router->group([
-            'prefix' => 'admin',
-            '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/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->post('viewConfig', 'Admin\\Server\\V2rayController@viewConfig');
-            });
-            $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');
-            // 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');
-            // System
-            $router->get ('/system/getStatus', 'Admin\\SystemController@getStatus');
-            // 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,22 +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/config', 'Client\\AppController@config');
-            $router->get('/app/getConfig', 'Client\\AppController@getConfig');
-            $router->get('/app/getVersion', 'Client\\AppController@getVersion');
-        });
-    }
-}

app/Http/Routes/PassportRoute.php

@@ -1,27 +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->get ('/auth/check', 'Passport\\AuthController@check');
-            $router->post('/auth/forget', 'Passport\\AuthController@forget');
-            $router->post('/auth/getTempToken', 'Passport\\AuthController@getTempToken');
-            $router->post('/auth/getQuickLoginUrl', 'Passport\\AuthController@getQuickLoginUrl');
-            // Comm
-            $router->get ('/comm/config', 'Passport\\CommController@config');
-            $router->post('/comm/sendEmailVerify', 'Passport\\CommController@sendEmailVerify');
-            $router->post('/comm/pv', 'Passport\\CommController@pv');
-        });
-    }
-}

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,65 +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 ('/logout', 'User\\UserController@logout');
-            $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->post('/transfer', 'User\\UserController@transfer');
-            $router->post('/getQuickLoginUrl', 'User\\UserController@getQuickLoginUrl');
-            // Order
-            $router->post('/order/save', 'User\\OrderController@save');
-            $router->post('/order/checkout', 'User\\OrderController@checkout');
-            $router->get ('/order/check', 'User\\OrderController@check');
-            // TODO: 1.5.6 remove
-            $router->get ('/order/details', 'User\\OrderController@detail');
-            // TODO: 1.5.6 remove
-            $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');
+        });
+    }
+}