Merge pull request #712 from v2board/dev

1.7.3

.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

@@ -80,15 +80,14 @@ class CheckCommission extends Command
 
     public function payHandle($inviteUserId, Order $order)
     {
-        if ((int)config('v2board.commission_distribution_enable', 0)) {
         $level = 3;
+        if ((int)config('v2board.commission_distribution_enable', 0)) {
             $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,50 @@
+<?php
+
+namespace App\Console\Commands;
+
+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();
+    }
+}

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/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 = '';
+            $password = Helper::guid(false);
-            while (!$password) {
-                $password = $this->ask('请输入管理员密码?');
-            }
             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

@@ -53,11 +53,10 @@ class V2boardStatistics extends Command
             ->whereNotIn('status', [0, 2]);
         $orderCount = $orderBuilder->count();
         $orderAmount = $orderBuilder->sum('total_amount');
-        $commissionBuilder = CommissionLog::where('created_at', '>=', $startAt)
+        $commissionLogBuilder = CommissionLog::where('created_at', '>=', $startAt)
-            ->where('created_at', '<', $endAt)
+            ->where('created_at', '<', $endAt);
-            ->where('get_amount', '>', 0);
+        $commissionCount = $commissionLogBuilder->count();
-        $commissionCount = $commissionBuilder->count();
+        $commissionAmount = $commissionLogBuilder->sum('get_amount');
-        $commissionAmount = $commissionBuilder->sum('get_amount');
         $data = [
             'order_count' => $orderCount,
             'order_amount' => $orderAmount,

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/Http/Controllers/Admin/ConfigController.php

@@ -39,7 +39,7 @@ class ConfigController extends Controller
     public function testSendMail(Request $request)
     {
         $obj = new SendEmailJob([
-            'email' => $request->session()->get('email'),
+            'email' => $request->user['email'],
             'subject' => 'This is v2board test email',
             'template_name' => 'notify',
             'template_value' => [
@@ -87,27 +87,16 @@ class ConfigController extends Controller
             'site' => [
                 'logo' => config('v2board.logo'),
                 'force_https' => (int)config('v2board.force_https', 0),
-                'safe_mode_enable' => (int)config('v2board.safe_mode_enable', 0),
                 'stop_register' => (int)config('v2board.stop_register', 0),
-                'email_verify' => (int)config('v2board.email_verify', 0),
                 'app_name' => config('v2board.app_name', 'V2Board'),
                 'app_description' => config('v2board.app_description', 'V2Board is best!'),
                 'app_url' => config('v2board.app_url'),
                 'subscribe_url' => config('v2board.subscribe_url'),
                 'try_out_plan_id' => (int)config('v2board.try_out_plan_id', 0),
                 'try_out_hour' => (int)config('v2board.try_out_hour', 1),
-                'email_whitelist_enable' => (int)config('v2board.email_whitelist_enable', 0),
-                'email_whitelist_suffix' => config('v2board.email_whitelist_suffix', Dict::EMAIL_WHITELIST_SUFFIX_DEFAULT),
-                'email_gmail_limit_enable' => config('v2board.email_gmail_limit_enable', 0),
-                'recaptcha_enable' => (int)config('v2board.recaptcha_enable', 0),
-                'recaptcha_key' => config('v2board.recaptcha_key'),
-                'recaptcha_site_key' => config('v2board.recaptcha_site_key'),
                 'tos_url' => config('v2board.tos_url'),
                 'currency' => config('v2board.currency', 'CNY'),
                 'currency_symbol' => config('v2board.currency_symbol', '¥'),
-                'register_limit_by_ip_enable' => (int)config('v2board.register_limit_by_ip_enable', 0),
-                'register_limit_count' => config('v2board.register_limit_count', 3),
-                'register_limit_expire' => config('v2board.register_limit_expire', 60)
             ],
             'subscribe' => [
                 'plan_change_enable' => (int)config('v2board.plan_change_enable', 1),
@@ -124,14 +113,11 @@ class ConfigController extends Controller
                 'frontend_theme_header' => config('v2board.frontend_theme_header', 'dark'),
                 'frontend_theme_color' => config('v2board.frontend_theme_color', 'default'),
                 'frontend_background_url' => config('v2board.frontend_background_url'),
-                'frontend_admin_path' => config('v2board.frontend_admin_path', 'admin')
             ],
             'server' => [
                 'server_token' => config('v2board.server_token'),
-                'server_license' => config('v2board.server_license'),
+                'server_pull_interval' => config('v2board.server_pull_interval', 60),
-                'server_log_enable' => config('v2board.server_log_enable', 0),
+                'server_push_interval' => config('v2board.server_push_interval', 60),
-                'server_v2ray_domain' => config('v2board.server_v2ray_domain'),
-                'server_v2ray_protocol' => config('v2board.server_v2ray_protocol'),
             ],
             'email' => [
                 'email_template' => config('v2board.email_template', 'default'),
@@ -154,6 +140,23 @@ class ConfigController extends Controller
                 'macos_download_url' => config('v2board.macos_download_url'),
                 'android_version' => config('v2board.android_version'),
                 'android_download_url' => config('v2board.android_download_url')
+            ],
+            'safe' => [
+                'email_verify' => (int)config('v2board.email_verify', 0),
+                'safe_mode_enable' => (int)config('v2board.safe_mode_enable', 0),
+                'secure_path' => config('v2board.secure_path', config('v2board.frontend_admin_path', hash('crc32b', config('app.key')))),
+                'email_whitelist_enable' => (int)config('v2board.email_whitelist_enable', 0),
+                'email_whitelist_suffix' => config('v2board.email_whitelist_suffix', Dict::EMAIL_WHITELIST_SUFFIX_DEFAULT),
+                'email_gmail_limit_enable' => config('v2board.email_gmail_limit_enable', 0),
+                'recaptcha_enable' => (int)config('v2board.recaptcha_enable', 0),
+                'recaptcha_key' => config('v2board.recaptcha_key'),
+                'recaptcha_site_key' => config('v2board.recaptcha_site_key'),
+                'register_limit_by_ip_enable' => (int)config('v2board.register_limit_by_ip_enable', 0),
+                'register_limit_count' => config('v2board.register_limit_count', 3),
+                'register_limit_expire' => config('v2board.register_limit_expire', 60),
+                'password_limit_enable' => (int)config('v2board.password_limit_enable', 1),
+                'password_limit_count' => config('v2board.password_limit_count', 5),
+                'password_limit_expire' => config('v2board.password_limit_expire', 60)
             ]
         ];
         if ($key && isset($data[$key])) {

app/Http/Controllers/Admin/PaymentController.php

@@ -8,6 +8,7 @@ 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/Admin/PlanController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin;
 use App\Http\Requests\Admin\PlanSave;
 use App\Http\Requests\Admin\PlanSort;
 use App\Http\Requests\Admin\PlanUpdate;
+use App\Services\PlanService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Plan;
@@ -16,17 +17,7 @@ class PlanController extends Controller
 {
     public function fetch(Request $request)
     {
-        $counts = User::select(
+        $counts = PlanService::countActiveUsers();
-            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();
         $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 {
+                if ($request->input('force_update')) {
                     User::where('plan_id', $plan->id)->update([
                         'group_id' => $params['group_id'],
-                    'transfer_enable' => $params['transfer_enable'] * 1073741824
+                        'transfer_enable' => $params['transfer_enable'] * 1073741824,
+                        'speed_limit' => $params['speed_limit']
                     ]);
+                }
                 $plan->update($params);
             } catch (\Exception $e) {
                 DB::rollBack();

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

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin\Server;
 use App\Models\Plan;
 use App\Models\ServerShadowsocks;
 use App\Models\ServerTrojan;
-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;
 use App\Models\ServerGroup;
 use App\Models\User;
 use App\Services\ServerService;
@@ -65,7 +65,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/Admin/Server/ManageController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Server;
 
-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;
 use App\Models\ServerShadowsocks;
 use App\Models\ServerTrojan;
 use App\Services\ServerService;
@@ -24,22 +24,22 @@ class ManageController extends Controller
     {
         ini_set('post_max_size', '1m');
         DB::beginTransaction();
-        foreach ($request->input('sorts') as $k => $v) {
+        foreach ($request->input('sorts') ?? [] as $k => $v) {
             switch ($v['key']) {
                 case 'shadowsocks':
-                    if (!ServerShadowsocks::find($v['value'])->update(['sort' => $k + 1])) {
+                    if (!ServerShadowsocks::find($v['value'])->update(['sort' => $v['sort']])) {
                         DB::rollBack();
                         abort(500, '保存失败');
                     }
                     break;
-                case 'v2ray':
+                case 'vmess':
-                    if (!ServerV2ray::find($v['value'])->update(['sort' => $k + 1])) {
+                    if (!ServerVmess::find($v['value'])->update(['sort' => $v['sort']])) {
                         DB::rollBack();
                         abort(500, '保存失败');
                     }
                     break;
                 case 'trojan':
-                    if (!ServerTrojan::find($v['value'])->update(['sort' => $k + 1])) {
+                    if (!ServerTrojan::find($v['value'])->update(['sort' => $v['sort']])) {
                         DB::rollBack();
                         abort(500, '保存失败');
                     }

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

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Http\Controllers\Admin\Server;
+
+use App\Http\Requests\Admin\ServerShadowsocksSave;
+use App\Http\Requests\Admin\ServerShadowsocksUpdate;
+use App\Models\ServerRoute;
+use App\Models\ServerShadowsocks;
+use App\Services\ServerService;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+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/Admin/Server/VmessController.php

@@ -2,21 +2,21 @@
 
 namespace App\Http\Controllers\Admin\Server;
 
-use App\Http\Requests\Admin\ServerV2raySave;
+use App\Http\Requests\Admin\ServerVmessSave;
-use App\Http\Requests\Admin\ServerV2rayUpdate;
+use App\Http\Requests\Admin\ServerVmessUpdate;
 use App\Services\ServerService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;
 
-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 +30,7 @@ class V2rayController extends Controller
             ]);
         }
 
-        if (!ServerV2ray::create($params)) {
+        if (!ServerVmess::create($params)) {
             abort(500, '创建失败');
         }
 
@@ -42,7 +42,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 +52,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 +76,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 +89,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/Admin/StatController.php

@@ -2,13 +2,15 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Models\CommissionLog;
 use App\Models\ServerShadowsocks;
 use App\Models\ServerTrojan;
+use App\Models\StatUser;
 use App\Services\ServerService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\ServerGroup;
-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;
 use App\Models\Plan;
 use App\Models\User;
 use App\Models\Ticket;
@@ -45,7 +47,13 @@ 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'),
             ]
         ]);
     }
@@ -91,8 +99,9 @@ class StatController extends Controller
     {
         $servers = [
             'shadowsocks' => ServerShadowsocks::where('parent_id', null)->get()->toArray(),
-            'vmess' => ServerV2ray::where('parent_id', null)->get()->toArray(),
+            'v2ray' => ServerVmess::where('parent_id', null)->get()->toArray(),
-            'trojan' => ServerTrojan::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'));
@@ -123,5 +132,23 @@ class StatController extends Controller
             '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/Admin/SystemController.php

@@ -9,7 +9,7 @@ use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\ServerGroup;
-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;
 use App\Models\Plan;
 use App\Models\User;
 use App\Models\Ticket;
@@ -19,11 +19,16 @@ use App\Models\StatServer;
 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 getStatus()
+    public function getSystemStatus()
     {
         return response([
             'data' => [
@@ -33,6 +38,13 @@ class SystemController extends Controller
         ]);
     }
 
+    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));
@@ -48,5 +60,56 @@ class SystemController extends Controller
             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();
+    }
 }
 

app/Http/Controllers/Admin/ThemeController.php

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

@@ -68,7 +68,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/Admin/UserController.php

@@ -7,6 +7,7 @@ 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\AuthService;
 use App\Services\UserService;
 use App\Utils\Helper;
 use Illuminate\Http\Request;
@@ -128,6 +129,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) {

app/Http/Controllers/Client/AppController.php

@@ -5,9 +5,7 @@ namespace App\Http\Controllers\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,11 +31,18 @@ class AppController extends Controller
         $proxies = [];
 
         foreach ($servers as $item) {
-            if ($item['type'] === 'shadowsocks') {
+            if ($item['type'] === 'shadowsocks'
+                && in_array($item['cipher'], [
+                    'aes-128-gcm',
+                    'aes-192-gcm',
+                    'aes-256-gcm',
+                    'chacha20-ietf-poly1305'
+                ])
+            ) {
                 array_push($proxy, Protocols\Clash::buildShadowsocks($user['uuid'], $item));
                 array_push($proxies, $item['name']);
             }
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                 array_push($proxy, Protocols\Clash::buildVmess($user['uuid'], $item));
                 array_push($proxies, $item['name']);
             }

app/Http/Controllers/Client/ClientController.php

@@ -13,9 +13,7 @@ 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.
@@ -42,6 +40,7 @@ class ClientController extends Controller
 
     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);

app/Http/Controllers/Client/Protocols/Clash.php

@@ -2,6 +2,8 @@
 
 namespace App\Http\Controllers\Client\Protocols;
 
+use App\Utils\Dict;
+use phpDocumentor\Reflection\Types\Self_;
 use Symfony\Component\Yaml\Yaml;
 
 class Clash
@@ -24,6 +26,7 @@ class Clash
         header("subscription-userinfo: upload={$user['u']}; download={$user['d']}; total={$user['transfer_enable']}; expire={$user['expired_at']}");
         header('profile-update-interval: 24');
         header("content-disposition:attachment;filename*=UTF-8''".rawurlencode($appName));
+        header("profile-web-page-url:" . config('v2board.app_url'));
         $defaultConfig = base_path() . '/resources/rules/default.clash.yaml';
         $customConfig = base_path() . '/resources/rules/custom.clash.yaml';
         if (\File::exists($customConfig)) {
@@ -31,15 +34,23 @@ class Clash
         } else {
             $config = Yaml::parseFile($defaultConfig);
         }
+        $this->patch($config);
         $proxy = [];
         $proxies = [];
 
         foreach ($servers as $item) {
-            if ($item['type'] === 'shadowsocks') {
+            if ($item['type'] === 'shadowsocks'
+                && in_array($item['cipher'], [
+                    'aes-128-gcm',
+                    'aes-192-gcm',
+                    'aes-256-gcm',
+                    'chacha20-ietf-poly1305'
+                ])
+            ) {
                 array_push($proxy, self::buildShadowsocks($user['uuid'], $item));
                 array_push($proxies, $item['name']);
             }
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                 array_push($proxy, self::buildVmess($user['uuid'], $item));
                 array_push($proxies, $item['name']);
             }
@@ -68,11 +79,12 @@ class Clash
             $config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
         }
         // Force the current subscription domain to be a direct rule
-        $subsDomain = $_SERVER['SERVER_NAME'];
+        $subsDomain = $_SERVER['HTTP_HOST'];
-        $subsDomainRule = "DOMAIN,{$subsDomain},DIRECT";
+        if ($subsDomain) {
-        array_unshift($config['rules'], $subsDomainRule);
+            array_unshift($config['rules'], "DOMAIN,{$subsDomain},DIRECT");
+        }
 
-        $yaml = Yaml::dump($config);
+        $yaml = Yaml::dump($config, 2, 4, Yaml::DUMP_EMPTY_ARRAY_AS_SEQUENCE);
         $yaml = str_replace('$app_name', config('v2board.app_name', 'V2Board'), $yaml);
         return $yaml;
     }
@@ -121,7 +133,6 @@ class Clash
                     $array['ws-opts']['path'] = $wsSettings['path'];
                 if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
                     $array['ws-opts']['headers'] = ['Host' => $wsSettings['headers']['Host']];
-                // TODO: 2022.06.01 remove it
                 if (isset($wsSettings['path']) && !empty($wsSettings['path']))
                     $array['ws-path'] = $wsSettings['path'];
                 if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
@@ -163,4 +174,11 @@ class Clash
     {
         return @preg_match($exp, null) !== false;
     }
+
+    private function patch(&$config)
+    {
+        // fix clash x dns mode
+        preg_match('#(ClashX)[/ ]([0-9.]*)#', $_SERVER['HTTP_USER_AGENT'], $matches);
+        if (isset($matches[2]) && $matches[2] < '1.96.2') $config['dns']['enhanced-mode'] = 'redir-host';
+    }
 }

app/Http/Controllers/Client/Protocols/ClashMeta.php

@@ -0,0 +1,177 @@
+<?php
+
+namespace App\Http\Controllers\Client\Protocols;
+
+use App\Utils\Helper;
+use Symfony\Component\Yaml\Yaml;
+
+class ClashMeta
+{
+    public $flag = 'clashmeta';
+    private $servers;
+    private $user;
+
+    public function __construct($user, $servers)
+    {
+        $this->user = $user;
+        $this->servers = $servers;
+    }
+
+    public function handle()
+    {
+        $servers = $this->servers;
+        $user = $this->user;
+        $appName = config('v2board.app_name', 'V2Board');
+        header("subscription-userinfo: upload={$user['u']}; download={$user['d']}; total={$user['transfer_enable']}; expire={$user['expired_at']}");
+        header('profile-update-interval: 24');
+        header("content-disposition:attachment;filename*=UTF-8''".rawurlencode($appName));
+        $defaultConfig = base_path() . '/resources/rules/default.clash.yaml';
+        $customConfig = base_path() . '/resources/rules/custom.clash.yaml';
+        if (\File::exists($customConfig)) {
+            $config = Yaml::parseFile($customConfig);
+        } else {
+            $config = Yaml::parseFile($defaultConfig);
+        }
+        $proxy = [];
+        $proxies = [];
+
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                array_push($proxy, self::buildShadowsocks($user['uuid'], $item));
+                array_push($proxies, $item['name']);
+            }
+            if ($item['type'] === 'vmess') {
+                array_push($proxy, self::buildVmess($user['uuid'], $item));
+                array_push($proxies, $item['name']);
+            }
+            if ($item['type'] === 'trojan') {
+                array_push($proxy, self::buildTrojan($user['uuid'], $item));
+                array_push($proxies, $item['name']);
+            }
+        }
+
+        $config['proxies'] = array_merge($config['proxies'] ? $config['proxies'] : [], $proxy);
+        foreach ($config['proxy-groups'] as $k => $v) {
+            if (!is_array($config['proxy-groups'][$k]['proxies'])) $config['proxy-groups'][$k]['proxies'] = [];
+            $isFilter = false;
+            foreach ($config['proxy-groups'][$k]['proxies'] as $src) {
+                foreach ($proxies as $dst) {
+                    if (!$this->isRegex($src)) continue;
+                    $isFilter = true;
+                    $config['proxy-groups'][$k]['proxies'] = array_values(array_diff($config['proxy-groups'][$k]['proxies'], [$src]));
+                    if ($this->isMatch($src, $dst)) {
+                        array_push($config['proxy-groups'][$k]['proxies'], $dst);
+                    }
+                }
+                if ($isFilter) continue;
+            }
+            if ($isFilter) continue;
+            $config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
+        }
+        // Force the current subscription domain to be a direct rule
+        $subsDomain = $_SERVER['HTTP_HOST'];
+        if ($subsDomain) {
+            array_unshift($config['rules'], "DOMAIN,{$subsDomain},DIRECT");
+        }
+
+        $yaml = Yaml::dump($config, 2, 4, Yaml::DUMP_EMPTY_ARRAY_AS_SEQUENCE);
+        $yaml = str_replace('$app_name', config('v2board.app_name', 'V2Board'), $yaml);
+        return $yaml;
+    }
+
+    public static function buildShadowsocks($password, $server)
+    {
+        if ($server['cipher'] === '2022-blake3-aes-128-gcm') {
+            $serverKey = Helper::getShadowsocksServerKey($server['created_at'], 16);
+            $userKey = Helper::uuidToBase64($password, 16);
+            $password = "{$serverKey}:{$userKey}";
+        }
+        if ($server['cipher'] === '2022-blake3-aes-256-gcm') {
+            $serverKey = Helper::getShadowsocksServerKey($server['created_at'], 32);
+            $userKey = Helper::uuidToBase64($password, 32);
+            $password = "{$serverKey}:{$userKey}";
+        }
+        $array = [];
+        $array['name'] = $server['name'];
+        $array['type'] = 'ss';
+        $array['server'] = $server['host'];
+        $array['port'] = $server['port'];
+        $array['cipher'] = $server['cipher'];
+        $array['password'] = $password;
+        $array['udp'] = true;
+        return $array;
+    }
+
+    public static function buildVmess($uuid, $server)
+    {
+        $array = [];
+        $array['name'] = $server['name'];
+        $array['type'] = 'vmess';
+        $array['server'] = $server['host'];
+        $array['port'] = $server['port'];
+        $array['uuid'] = $uuid;
+        $array['alterId'] = 0;
+        $array['cipher'] = 'auto';
+        $array['udp'] = true;
+
+        if ($server['tls']) {
+            $array['tls'] = true;
+            if ($server['tlsSettings']) {
+                $tlsSettings = $server['tlsSettings'];
+                if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure']))
+                    $array['skip-cert-verify'] = ($tlsSettings['allowInsecure'] ? true : false);
+                if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
+                    $array['servername'] = $tlsSettings['serverName'];
+            }
+        }
+        if ($server['network'] === 'ws') {
+            $array['network'] = 'ws';
+            if ($server['networkSettings']) {
+                $wsSettings = $server['networkSettings'];
+                $array['ws-opts'] = [];
+                if (isset($wsSettings['path']) && !empty($wsSettings['path']))
+                    $array['ws-opts']['path'] = $wsSettings['path'];
+                if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
+                    $array['ws-opts']['headers'] = ['Host' => $wsSettings['headers']['Host']];
+                if (isset($wsSettings['path']) && !empty($wsSettings['path']))
+                    $array['ws-path'] = $wsSettings['path'];
+                if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
+                    $array['ws-headers'] = ['Host' => $wsSettings['headers']['Host']];
+            }
+        }
+        if ($server['network'] === 'grpc') {
+            $array['network'] = 'grpc';
+            if ($server['networkSettings']) {
+                $grpcSettings = $server['networkSettings'];
+                $array['grpc-opts'] = [];
+                if (isset($grpcSettings['serviceName'])) $array['grpc-opts']['grpc-service-name'] = $grpcSettings['serviceName'];
+            }
+        }
+
+        return $array;
+    }
+
+    public static function buildTrojan($password, $server)
+    {
+        $array = [];
+        $array['name'] = $server['name'];
+        $array['type'] = 'trojan';
+        $array['server'] = $server['host'];
+        $array['port'] = $server['port'];
+        $array['password'] = $password;
+        $array['udp'] = true;
+        if (!empty($server['server_name'])) $array['sni'] = $server['server_name'];
+        if (!empty($server['allow_insecure'])) $array['skip-cert-verify'] = ($server['allow_insecure'] ? true : false);
+        return $array;
+    }
+
+    private function isMatch($exp, $str)
+    {
+        return @preg_match($exp, $str);
+    }
+
+    private function isRegex($exp)
+    {
+        return @preg_match($exp, null) !== false;
+    }
+}

app/Http/Controllers/Client/Protocols/Passwall.php

@@ -22,7 +22,7 @@ class Passwall
         $uri = '';
 
         foreach ($servers as $item) {
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                 $uri .= self::buildVmess($user['uuid'], $item);
             }
             if ($item['type'] === 'shadowsocks') {

app/Http/Controllers/Client/Protocols/QuantumultX.php

@@ -25,7 +25,7 @@ class QuantumultX
             if ($item['type'] === 'shadowsocks') {
                 $uri .= self::buildShadowsocks($user['uuid'], $item);
             }
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                 $uri .= self::buildVmess($user['uuid'], $item);
             }
             if ($item['type'] === 'trojan') {

app/Http/Controllers/Client/Protocols/SSRPlus.php

@@ -22,7 +22,7 @@ class SSRPlus
         $uri = '';
 
         foreach ($servers as $item) {
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                 $uri .= self::buildVmess($user['uuid'], $item);
             }
             if ($item['type'] === 'shadowsocks') {

app/Http/Controllers/Client/Protocols/SagerNet.php

@@ -21,7 +21,7 @@ class SagerNet
         $uri = '';
 
         foreach ($servers as $item) {
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                 $uri .= self::buildVmess($user['uuid'], $item);
             }
             if ($item['type'] === 'shadowsocks') {

app/Http/Controllers/Client/Protocols/Shadowrocket.php

@@ -2,6 +2,8 @@
 
 namespace App\Http\Controllers\Client\Protocols;
 
+use App\Utils\Helper;
+
 class Shadowrocket
 {
     public $flag = 'shadowrocket';
@@ -30,7 +32,7 @@ class Shadowrocket
             if ($item['type'] === 'shadowsocks') {
                 $uri .= self::buildShadowsocks($user['uuid'], $item);
             }
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                 $uri .= self::buildVmess($user['uuid'], $item);
             }
             if ($item['type'] === 'trojan') {
@@ -43,6 +45,16 @@ class Shadowrocket
 
     public static function buildShadowsocks($password, $server)
     {
+        if ($server['cipher'] === '2022-blake3-aes-128-gcm') {
+            $serverKey = Helper::getShadowsocksServerKey($server['created_at'], 16);
+            $userKey = Helper::uuidToBase64($password, 16);
+            $password = "{$serverKey}:{$userKey}";
+        }
+        if ($server['cipher'] === '2022-blake3-aes-256-gcm') {
+            $serverKey = Helper::getShadowsocksServerKey($server['created_at'], 32);
+            $userKey = Helper::uuidToBase64($password, 32);
+            $password = "{$serverKey}:{$userKey}";
+        }
         $name = rawurlencode($server['name']);
         $str = str_replace(
             ['+', '/', '='],

app/Http/Controllers/Client/Protocols/Shadowsocks.php

@@ -29,7 +29,9 @@ class Shadowsocks
         $bytesRemaining = $user['transfer_enable'] - $bytesUsed;
 
         foreach ($servers as $item) {
-            if ($item['type'] === 'shadowsocks') {
+            if ($item['type'] === 'shadowsocks'
+                && in_array($item['cipher'], ['aes-128-gcm', 'aes-256-gcm', 'aes-192-gcm', 'chacha20-ietf-poly1305'])
+            ) {
                 array_push($configs, self::SIP008($item, $user));
             }
         }

app/Http/Controllers/Client/Protocols/Stash.php

@@ -36,11 +36,18 @@ class Stash
         $proxies = [];
 
         foreach ($servers as $item) {
-            if ($item['type'] === 'shadowsocks') {
+            if ($item['type'] === 'shadowsocks'
+                && in_array($item['cipher'], [
+                    'aes-128-gcm',
+                    'aes-192-gcm',
+                    'aes-256-gcm',
+                    'chacha20-ietf-poly1305'
+                ])
+            ) {
                 array_push($proxy, self::buildShadowsocks($user['uuid'], $item));
                 array_push($proxies, $item['name']);
             }
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                 array_push($proxy, self::buildVmess($user['uuid'], $item));
                 array_push($proxies, $item['name']);
             }
@@ -69,11 +76,12 @@ class Stash
             $config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
         }
         // Force the current subscription domain to be a direct rule
-        $subsDomain = $_SERVER['SERVER_NAME'];
+        $subsDomain = $_SERVER['HTTP_HOST'];
-        $subsDomainRule = "DOMAIN,{$subsDomain},DIRECT";
+        if ($subsDomain) {
-        array_unshift($config['rules'], $subsDomainRule);
+            array_unshift($config['rules'], "DOMAIN,{$subsDomain},DIRECT");
+        }
 
-        $yaml = Yaml::dump($config);
+        $yaml = Yaml::dump($config, 2, 4, Yaml::DUMP_EMPTY_ARRAY_AS_SEQUENCE);
         $yaml = str_replace('$app_name', config('v2board.app_name', 'V2Board'), $yaml);
         return $yaml;
     }
@@ -122,7 +130,6 @@ class Stash
                     $array['ws-opts']['path'] = $wsSettings['path'];
                 if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
                     $array['ws-opts']['headers'] = ['Host' => $wsSettings['headers']['Host']];
-                // TODO: 2022.06.01 remove it
                 if (isset($wsSettings['path']) && !empty($wsSettings['path']))
                     $array['ws-path'] = $wsSettings['path'];
                 if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
@@ -155,6 +162,11 @@ class Stash
         return $array;
     }
 
+    private function isRegex($exp)
+    {
+        return @preg_match($exp, null) !== false;
+    }
+
     private function isMatch($exp, $str)
     {
         try {

app/Http/Controllers/Client/Protocols/Surfboard.php

@@ -21,17 +21,27 @@ class Surfboard
         $servers = $this->servers;
         $user = $this->user;
 
+        $appName = config('v2board.app_name', 'V2Board');
+        header("content-disposition:attachment;filename*=UTF-8''".rawurlencode($appName).".conf");
+
         $proxies = '';
         $proxyGroup = '';
 
         foreach ($servers as $item) {
-            if ($item['type'] === 'shadowsocks') {
+            if ($item['type'] === 'shadowsocks'
+                && in_array($item['cipher'], [
+                    'aes-128-gcm',
+                    'aes-192-gcm',
+                    'aes-256-gcm',
+                    'chacha20-ietf-poly1305'
+                ])
+            ) {
                 // [Proxy]
                 $proxies .= self::buildShadowsocks($user['uuid'], $item);
                 // [Proxy Group]
                 $proxyGroup .= $item['name'] . ', ';
             }
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                 // [Proxy]
                 $proxies .= self::buildVmess($user['uuid'], $item);
                 // [Proxy Group]
@@ -55,12 +65,21 @@ class Surfboard
 
         // Subscription link
         $subsURL = Helper::getSubscribeUrl("/api/v1/client/subscribe?token={$user['token']}");
-        $subsDomain = $_SERVER['SERVER_NAME'];
+        $subsDomain = $_SERVER['HTTP_HOST'];
 
         $config = str_replace('$subs_link', $subsURL, $config);
         $config = str_replace('$subs_domain', $subsDomain, $config);
         $config = str_replace('$proxies', $proxies, $config);
         $config = str_replace('$proxy_group', rtrim($proxyGroup, ', '), $config);
+
+        $upload = round($user['u'] / (1024*1024*1024), 2);
+        $download = round($user['d'] / (1024*1024*1024), 2);
+        $useTraffic = $upload + $download;
+        $totalTraffic = round($user['transfer_enable'] / (1024*1024*1024), 2);
+        $expireDate = $user['expired_at'] === NULL ? '长期有效' : date('Y-m-d H:i:s', $user['expired_at']);
+        $subscribeInfo = "title={$appName}订阅信息, content=上传流量：{$upload}GB\\n下载流量：{$download}GB\\n剩余流量：{$useTraffic}GB\\n套餐流量：{$totalTraffic}GB\\n到期时间：{$expireDate}";
+        $config = str_replace('$subscribe_info', $subscribeInfo, $config);
+
         return $config;
     }
 

app/Http/Controllers/Client/Protocols/Surge.php

@@ -21,17 +21,27 @@ class Surge
         $servers = $this->servers;
         $user = $this->user;
 
+        $appName = config('v2board.app_name', 'V2Board');
+        header("content-disposition:attachment;filename*=UTF-8''".rawurlencode($appName).".conf");
+
         $proxies = '';
         $proxyGroup = '';
 
         foreach ($servers as $item) {
-            if ($item['type'] === 'shadowsocks') {
+            if ($item['type'] === 'shadowsocks'
+                && in_array($item['cipher'], [
+                    'aes-128-gcm',
+                    'aes-192-gcm',
+                    'aes-256-gcm',
+                    'chacha20-ietf-poly1305'
+                ])
+            ) {
                 // [Proxy]
                 $proxies .= self::buildShadowsocks($user['uuid'], $item);
                 // [Proxy Group]
                 $proxyGroup .= $item['name'] . ', ';
             }
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                 // [Proxy]
                 $proxies .= self::buildVmess($user['uuid'], $item);
                 // [Proxy Group]
@@ -55,13 +65,22 @@ class Surge
 
         // Subscription link
         $subsURL = Helper::getSubscribeUrl("/api/v1/client/subscribe?token={$user['token']}");
-        $subsDomain = $_SERVER['SERVER_NAME'];
+        $subsDomain = $_SERVER['HTTP_HOST'];
         $subsURL = 'https://' . $subsDomain . '/api/v1/client/subscribe?token=' . $user['token'];
 
         $config = str_replace('$subs_link', $subsURL, $config);
         $config = str_replace('$subs_domain', $subsDomain, $config);
         $config = str_replace('$proxies', $proxies, $config);
         $config = str_replace('$proxy_group', rtrim($proxyGroup, ', '), $config);
+
+        $upload = round($user['u'] / (1024*1024*1024), 2);
+        $download = round($user['d'] / (1024*1024*1024), 2);
+        $useTraffic = $upload + $download;
+        $totalTraffic = round($user['transfer_enable'] / (1024*1024*1024), 2);
+        $expireDate = $user['expired_at'] === NULL ? '长期有效' : date('Y-m-d H:i:s', $user['expired_at']);
+        $subscribeInfo = "title={$appName}订阅信息, content=上传流量：{$upload}GB\\n下载流量：{$download}GB\\n剩余流量：{$useTraffic}GB\\n套餐流量：{$totalTraffic}GB\\n到期时间：{$expireDate}";
+        $config = str_replace('$subscribe_info', $subscribeInfo, $config);
+
         return $config;
     }
 

app/Http/Controllers/Client/Protocols/V2rayN.php

@@ -3,6 +3,8 @@
 namespace App\Http\Controllers\Client\Protocols;
 
 
+use App\Utils\Helper;
+
 class V2rayN
 {
     public $flag = 'v2rayn';
@@ -22,7 +24,7 @@ class V2rayN
         $uri = '';
 
         foreach ($servers as $item) {
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                 $uri .= self::buildVmess($user['uuid'], $item);
             }
             if ($item['type'] === 'shadowsocks') {
@@ -37,6 +39,16 @@ class V2rayN
 
     public static function buildShadowsocks($password, $server)
     {
+        if ($server['cipher'] === '2022-blake3-aes-128-gcm') {
+            $serverKey = Helper::getShadowsocksServerKey($server['created_at'], 16);
+            $userKey = Helper::uuidToBase64($password, 16);
+            $password = "{$serverKey}:{$userKey}";
+        }
+        if ($server['cipher'] === '2022-blake3-aes-256-gcm') {
+            $serverKey = Helper::getShadowsocksServerKey($server['created_at'], 32);
+            $userKey = Helper::uuidToBase64($password, 32);
+            $password = "{$serverKey}:{$userKey}";
+        }
         $name = rawurlencode($server['name']);
         $str = str_replace(
             ['+', '/', '='],

app/Http/Controllers/Client/Protocols/V2rayNG.php

@@ -22,7 +22,7 @@ class V2rayNG
         $uri = '';
 
         foreach ($servers as $item) {
-            if ($item['type'] === 'v2ray') {
+            if ($item['type'] === 'vmess') {
                 $uri .= self::buildVmess($user['uuid'], $item);
             }
             if ($item['type'] === 'shadowsocks') {

app/Http/Controllers/Guest/TelegramController.php

@@ -10,25 +10,28 @@ 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());
+        $this->formatMessage($request->input());
-        if (!$this->msg) return;
+        $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();
+            $this->telegramService->sendMessage($msg->chat_id, $e->getMessage());
-            $telegramService->sendMessage($msg->chat_id, $e->getMessage());
         }
     }
 
     public function getBotName()
     {
-        $telegramService = new TelegramService();
+        $response = $this->telegramService->getMe();
-        $response = $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/Passport/AuthController.php

@@ -6,6 +6,8 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\Passport\AuthRegister;
 use App\Http\Requests\Passport\AuthForget;
 use App\Http\Requests\Passport\AuthLogin;
+use App\Jobs\SendEmailJob;
+use App\Services\AuthService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use App\Models\Plan;
@@ -18,12 +20,67 @@ 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)) {
@@ -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 = [
+        $authService = new AuthService($user);
-            '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;
-        }
         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')));
+        $authorization = $request->input('auth_data') ?? $request->header('authorization');
-        if (!isset($authData[0])) abort(403, __('Token error'));
+        if (!$authorization) abort(403, '未登录或登陆已过期');
-        $user = User::where('email', $authData[0])
+
-            ->where('password', $authData[1])
+        $user = AuthService::decryptAuthData($authorization);
-            ->first();
+        if (!$user) abort(403, '未登录或登陆已过期');
-        if (!$user) {
-            abort(500, __('Token error'));
-        }
 
         $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,19 +284,6 @@ 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')) {
@@ -281,5 +304,4 @@ class AuthController extends Controller
             'data' => true
         ]);
     }
-
 }

app/Http/Controllers/Passport/CommController.php

@@ -17,24 +17,6 @@ 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/Server/DeepbworkController.php

@@ -8,7 +8,7 @@ use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\User;
-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;
 use App\Models\ServerLog;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -37,11 +37,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 +69,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,13 +78,13 @@ 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_VMESS_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_LAST_PUSH_AT', $server->id), time(), 3600);
         $userService = new UserService();
         foreach ($data as $item) {
-            $u = $item['u'] * $server->rate;
+            $u = $item['u'];
-            $d = $item['d'] * $server->rate;
+            $d = $item['d'];
-            $userService->trafficFetch($u, $d, $item['user_id'], $server, 'vmess');
+            $userService->trafficFetch($u, $d, $item['user_id'], $server->toArray(), 'vmess');
         }
 
         return response([
@@ -112,7 +112,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 +129,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 +142,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 +171,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 +211,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/Server/ShadowsocksTidalabController.php

@@ -74,9 +74,9 @@ class ShadowsocksTidalabController extends Controller
         Cache::put(CacheKey::get('SERVER_SHADOWSOCKS_LAST_PUSH_AT', $server->id), time(), 3600);
         $userService = new UserService();
         foreach ($data as $item) {
-            $u = $item['u'] * $server->rate;
+            $u = $item['u'];
-            $d = $item['d'] * $server->rate;
+            $d = $item['d'];
-            $userService->trafficFetch($u, $d, $item['user_id'], $server, 'shadowsocks');
+            $userService->trafficFetch($u, $d, $item['user_id'], $server->toArray(), 'shadowsocks');
         }
 
         return response([

app/Http/Controllers/Server/TrojanTidalabController.php

@@ -79,9 +79,9 @@ class TrojanTidalabController extends Controller
         Cache::put(CacheKey::get('SERVER_TROJAN_LAST_PUSH_AT', $server->id), time(), 3600);
         $userService = new UserService();
         foreach ($data as $item) {
-            $u = $item['u'] * $server->rate;
+            $u = $item['u'];
-            $d = $item['d'] * $server->rate;
+            $d = $item['d'];
-            $userService->trafficFetch($u, $d, $item['user_id'], $server, 'trojan');
+            $userService->trafficFetch($u, $d, $item['user_id'], $server->toArray(), 'trojan');
         }
 
         return response([

app/Http/Controllers/Server/UniProxyController.php

@@ -5,19 +5,20 @@ namespace App\Http\Controllers\Server;
 use App\Services\ServerService;
 use App\Services\UserService;
 use App\Utils\CacheKey;
+use App\Utils\Helper;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\ServerShadowsocks;
-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;
 use App\Models\ServerTrojan;
 use Illuminate\Support\Facades\Cache;
 
-class VProxyController extends Controller
+class UniProxyController extends Controller
 {
     private $nodeType;
     private $nodeInfo;
     private $nodeId;
-    private $token;
+    private $serverService;
 
     public function __construct(Request $request)
     {
@@ -28,25 +29,12 @@ class VProxyController extends Controller
         if ($token !== config('v2board.server_token')) {
             abort(500, 'token is error');
         }
-        $this->token = $token;
         $this->nodeType = $request->input('node_type');
+        if ($this->nodeType === 'v2ray') $this->nodeType = 'vmess';
         $this->nodeId = $request->input('node_id');
-        switch ($this->nodeType) {
+        $this->serverService = new ServerService();
-            case 'v2ray':
+        $this->nodeInfo = $this->serverService->getServer($this->nodeId, $this->nodeType);
-                $this->nodeInfo = ServerV2ray::find($this->nodeId);
+        if (!$this->nodeInfo) abort(500, 'server is not exist');
-                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');
-        }
     }
 
     // 后端获取用户
@@ -54,21 +42,11 @@ class VProxyController extends Controller
     {
         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 = $this->serverService->getAvailableUsers($this->nodeInfo->group_id);
-        $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);
@@ -78,17 +56,17 @@ class VProxyController extends Controller
     }
 
     // 后端提交数据
-    public function submit(Request $request)
+    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();
-        foreach ($data as $item) {
+        foreach (array_keys($data) as $k) {
-            $u = $item['u'] * $this->nodeInfo->rate;
+            $u = $data[$k][0];
-            $d = $item['d'] * $this->nodeInfo->rate;
+            $d = $data[$k][1];
-            $userService->trafficFetch($u, $d, $item['user_id'], $this->nodeInfo, $this->nodeType);
+            $userService->trafficFetch($u, $d, $k, $this->nodeInfo->toArray(), $this->nodeType);
         }
 
         return response([
@@ -101,28 +79,48 @@ class VProxyController extends Controller
     {
         switch ($this->nodeType) {
             case 'shadowsocks':
-                die(json_encode([
+                $response = [
                     'server_port' => $this->nodeInfo->server_port,
                     'cipher' => $this->nodeInfo->cipher,
                     'obfs' => $this->nodeInfo->obfs,
                     'obfs_settings' => $this->nodeInfo->obfs_settings
-                ], JSON_UNESCAPED_UNICODE));
+                ];
+
+                if ($this->nodeInfo->cipher === '2022-blake3-aes-128-gcm') {
+                    $response['server_key'] = Helper::getShadowsocksServerKey($this->nodeInfo->created_at, 16);
+                }
+                if ($this->nodeInfo->cipher === '2022-blake3-aes-256-gcm') {
+                    $response['server_key'] = Helper::getShadowsocksServerKey($this->nodeInfo->created_at, 32);
+                }
                 break;
-            case 'v2ray':
+            case 'vmess':
-                die(json_encode([
+                $response = [
                     '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([
+                $response = [
                     'host' => $this->nodeInfo->host,
-                    'server_port' => $this->nodeInfo->server_port
+                    'server_port' => $this->nodeInfo->server_port,
-                ], JSON_UNESCAPED_UNICODE));
+                    'server_name' => $this->nodeInfo->server_name
+                ];
                 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/Staff/TicketController.php

@@ -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/User/CommController.php

@@ -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/User/CouponController.php

@@ -16,7 +16,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/User/InviteController.php

@@ -14,11 +14,11 @@ 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)) {
+        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->session()->get('id');
+        $inviteCode->user_id = $request->user['id'];
         $inviteCode->code = Helper::randomChar(8);
         return response([
             'data' => $inviteCode->save()
@@ -27,8 +27,9 @@ class InviteController extends Controller
 
     public function details(Request $request)
     {
-        return response([
+        $current = $request->input('current') ? $request->input('current') : 1;
-            'data' => CommissionLog::where('invite_user_id', $request->session()->get('id'))
+        $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',
@@ -37,33 +38,41 @@ class InviteController extends Controller
                 'get_amount',
                 'created_at'
             ])
-                ->get()
+            ->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->session()->get('id'))
+        $codes = InviteCode::where('user_id', $request->user['id'])
             ->where('status', 0)
             ->get();
         $commission_rate = config('v2board.invite_commission', 10);
-        $user = User::find($request->session()->get('id'));
+        $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->session()->get('id'))->count(),
+            (int)User::where('invite_user_id', $request->user['id'])->count(),
             //有效的佣金
-            (int)Order::where('status', 3)
+            (int)CommissionLog::where('invite_user_id', $request->user['id'])
-                ->where('commission_status', 2)
+                ->sum('get_amount'),
-                ->where('invite_user_id', $request->session()->get('id'))
-                ->sum('commission_balance'),
             //确认中的佣金
-            (int)Order::where('status', 3)
+            $uncheck_commission_balance,
-                ->where('commission_status', 0)
-                ->where('invite_user_id', $request->session()->get('id'))
-                ->sum('commission_balance'),
             //佣金比例
             (int)$commission_rate,
             //可用佣金

app/Http/Controllers/User/KnowledgeController.php

@@ -19,14 +19,9 @@ 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)) {
+            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');
                 $this->formatAccessData($knowledge['body']);
             }
             $subscribeUrl = Helper::getSubscribeUrl("/api/v1/client/subscribe?token={$user['token']}");
@@ -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')
+            ->orderBy('sort', 'ASC');
-            ->get()
+        $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/User/OrderController.php

@@ -9,6 +9,7 @@ use App\Models\Payment;
 use App\Services\CouponService;
 use App\Services\OrderService;
 use App\Services\PaymentService;
+use App\Services\PlanService;
 use App\Services\UserService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
@@ -28,7 +29,7 @@ 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 +50,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 +72,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'));
+        $planService = new PlanService($request->input('plan_id'));
-        $user = User::find($request->session()->get('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 +117,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 +173,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) {
@@ -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/User/PlanController.php

@@ -4,14 +4,16 @@ namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
 use App\Models\User;
+use App\Services\PlanService;
 use Illuminate\Http\Request;
 use App\Models\Plan;
+use Illuminate\Support\Facades\DB;
 
 class PlanController extends Controller
 {
     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/User/ServerController.php

@@ -8,7 +8,7 @@ use App\Services\UserService;
 use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;
 use App\Models\ServerLog;
 use App\Models\User;
 
@@ -19,15 +19,20 @@ 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/User/StatController.php

@@ -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/User/TelegramController.php

@@ -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/User/TicketController.php

@@ -21,7 +21,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 +38,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 +49,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 +87,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 +95,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 +119,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 +154,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 +164,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 +175,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/User/UserController.php

@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\User\UserTransfer;
 use App\Http\Requests\User\UserUpdate;
 use App\Http\Requests\User\UserChangePassword;
+use App\Services\AuthService;
 use App\Services\UserService;
 use App\Utils\CacheKey;
 use Illuminate\Http\Request;
@@ -18,17 +19,46 @@ 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) {
@@ -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'));
         }
@@ -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/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,
+//            \App\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+//            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
+//            \Illuminate\Session\Middleware\StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+//            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
+//            \App\Http\Middleware\VerifyCsrfToken::class,
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
+//            \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \App\Http\Middleware\CORS::class,
         ],
 
         'api' => [
-            \App\Http\Middleware\EncryptCookies::class,
+//            \App\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+//            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
+//            \Illuminate\Session\Middleware\StartSession::class,
             \App\Http\Middleware\ForceJson::class,
-            \App\Http\Middleware\CORS::class,
             \App\Http\Middleware\Language::class,
             'bindings',
         ],

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')) {
+        $authorization = $request->input('auth_data') ?? $request->header('authorization');
-            abort(403, '权限不足');
+        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-Methods', 'GET,POST,OPTIONS,HEAD');
-        $response->header('Access-Control-Allow-Headers', 'Content-Type,X-Requested-With');
+        $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/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')) {
+        $authorization = $request->input('auth_data') ?? $request->header('authorization');
-            abort(403, '权限不足');
+        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) {
+        if (!$authorization) abort(403, '未登录或登陆已过期');
-            $authData = explode(':', base64_decode($authorization));
+
-            if (!isset($authData[1]) || !isset($authData[0])) abort(403, '鉴权失败，请重新登入');
+        $user = AuthService::decryptAuthData($authorization);
-            $user = \App\Models\User::where('password', $authData[1])
+        if (!$user) abort(403, '未登录或登陆已过期');
-                ->where('email', $authData[0])
+        $request->merge([
-                ->first();
+            'user' => $user
-            if (!$user) abort(403, '鉴权失败，请重新登入');
+        ]);
-            $request->session()->put('email', $user->email);
-            $request->session()->put('id', $user->id);
-        }
-        if (!$request->session()->get('id')) {
-            abort(403, '未登录或登陆已过期');
-        }
         return $next($request);
     }
 }

app/Http/Requests/Admin/ConfigSave.php

@@ -24,9 +24,7 @@ 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',
@@ -34,18 +32,9 @@ class ConfigSave extends FormRequest
         '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',
@@ -56,17 +45,14 @@ class ConfigSave extends FormRequest
         'show_info_to_server_enable' => 'in:0,1',
         // server
         'server_token' => 'nullable|min:16',
-        'server_license' => 'nullable',
+        'server_pull_interval' => 'integer',
-        'server_log_enable' => 'in:0,1',
+        'server_push_interval' => 'integer',
-        'server_v2ray_domain' => '',
-        'server_v2ray_protocol' => '',
         // frontend
         'frontend_theme' => '',
-        'frontend_theme_sidebar' => 'in:dark,light',
+        'frontend_theme_sidebar' => 'nullable|in:dark,light',
-        'frontend_theme_header' => 'in:dark,light',
+        'frontend_theme_header' => 'nullable|in:dark,light',
-        'frontend_theme_color' => 'in:default,darkblue,black,green',
+        '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

@@ -8,7 +8,7 @@ class AdminRoute
     public function map(Registrar $router)
     {
         $router->group([
-            'prefix' => 'admin',
+            'prefix' => config('v2board.secure_path', config('v2board.frontend_admin_path', hash('crc32b', config('app.key')))),
             'middleware' => 'admin'
         ], function ($router) {
             // Config
@@ -28,6 +28,9 @@ class AdminRoute
             $router->get ('/server/group/fetch', 'Admin\\Server\\GroupController@fetch');
             $router->post('/server/group/save', 'Admin\\Server\\GroupController@save');
             $router->post('/server/group/drop', 'Admin\\Server\\GroupController@drop');
+            $router->get ('/server/route/fetch', 'Admin\\Server\\RouteController@fetch');
+            $router->post('/server/route/save', 'Admin\\Server\\RouteController@save');
+            $router->post('/server/route/drop', 'Admin\\Server\\RouteController@drop');
             $router->get ('/server/manage/getNodes', 'Admin\\Server\\ManageController@getNodes');
             $router->post('/server/manage/sort', 'Admin\\Server\\ManageController@sort');
             $router->group([
@@ -42,15 +45,14 @@ class AdminRoute
                 $router->post('viewConfig', 'Admin\\Server\\TrojanController@viewConfig');
             });
             $router->group([
-                'prefix' => 'server/v2ray'
+                'prefix' => 'server/vmess'
             ], function ($router) {
-                $router->get ('fetch', 'Admin\\Server\\V2rayController@fetch');
+                $router->get ('fetch', 'Admin\\Server\\VmessController@fetch');
-                $router->post('save', 'Admin\\Server\\V2rayController@save');
+                $router->post('save', 'Admin\\Server\\VmessController@save');
-                $router->post('drop', 'Admin\\Server\\V2rayController@drop');
+                $router->post('drop', 'Admin\\Server\\VmessController@drop');
-                $router->post('update', 'Admin\\Server\\V2rayController@update');
+                $router->post('update', 'Admin\\Server\\VmessController@update');
-                $router->post('copy', 'Admin\\Server\\V2rayController@copy');
+                $router->post('copy', 'Admin\\Server\\VmessController@copy');
-                $router->post('sort', 'Admin\\Server\\V2rayController@sort');
+                $router->post('sort', 'Admin\\Server\\VmessController@sort');
-                $router->post('viewConfig', 'Admin\\Server\\V2rayController@viewConfig');
             });
             $router->group([
                 'prefix' => 'server/shadowsocks'
@@ -83,6 +85,7 @@ class AdminRoute
             $router->get ('/stat/getOverride', 'Admin\\StatController@getOverride');
             $router->get ('/stat/getServerLastRank', 'Admin\\StatController@getServerLastRank');
             $router->get ('/stat/getOrder', 'Admin\\StatController@getOrder');
+            $router->get ('/stat/getStatUser', 'Admin\\StatController@getStatUser');
             // Notice
             $router->get ('/notice/fetch', 'Admin\\NoticeController@fetch');
             $router->post('/notice/save', 'Admin\\NoticeController@save');
@@ -112,8 +115,12 @@ class AdminRoute
             $router->post('/payment/save', 'Admin\\PaymentController@save');
             $router->post('/payment/drop', 'Admin\\PaymentController@drop');
             $router->post('/payment/show', 'Admin\\PaymentController@show');
+            $router->post('/payment/sort', 'Admin\\PaymentController@sort');
             // System
-            $router->get ('/system/getStatus', 'Admin\\SystemController@getStatus');
+            $router->get ('/system/getSystemStatus', 'Admin\\SystemController@getSystemStatus');
+            $router->get ('/system/getQueueStats', 'Admin\\SystemController@getQueueStats');
+            $router->get ('/system/getQueueWorkload', 'Admin\\SystemController@getQueueWorkload');
+            $router->get ('/system/getQueueMasters', '\\Laravel\\Horizon\\Http\\Controllers\\MasterSupervisorController@index');
             // Theme
             $router->get ('/theme/getThemes', 'Admin\\ThemeController@getThemes');
             $router->post('/theme/saveThemeConfig', 'Admin\\ThemeController@saveThemeConfig');

app/Http/Routes/ClientRoute.php

@@ -14,7 +14,6 @@ class ClientRoute
             // 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

@@ -14,12 +14,10 @@ class PassportRoute
             $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');
+            $router->post('/auth/loginWithMailLink', 'Passport\\AuthController@loginWithMailLink');
             // 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/UserRoute.php

@@ -13,21 +13,20 @@ class UserRoute
         ], 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->get ('/checkLogin', 'User\\UserController@checkLogin');
             $router->post('/transfer', 'User\\UserController@transfer');
             $router->post('/getQuickLoginUrl', 'User\\UserController@getQuickLoginUrl');
+            $router->get ('/getActiveSession', 'User\\UserController@getActiveSession');
+            $router->post('/removeActiveSession', 'User\\UserController@removeActiveSession');
             // Order
             $router->post('/order/save', 'User\\OrderController@save');
             $router->post('/order/checkout', 'User\\OrderController@checkout');
             $router->get ('/order/check', 'User\\OrderController@check');
-            // 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');

app/Jobs/StatServerJob.php

@@ -48,10 +48,10 @@ class StatServerJob implements ShouldQueue
             //
         }
 
-        $data = StatServer::where('record_at', $recordAt)
+        $data = StatServer::lockForUpdate()
-            ->where('server_id', $this->server->id)
+            ->where('record_at', $recordAt)
+            ->where('server_id', $this->server['id'])
             ->where('server_type', $this->protocol)
-            ->lockForUpdate()
             ->first();
         if ($data) {
             try {
@@ -64,7 +64,7 @@ class StatServerJob implements ShouldQueue
             }
         } else {
             if (!StatServer::create([
-                'server_id' => $this->server->id,
+                'server_id' => $this->server['id'],
                 'server_type' => $this->protocol,
                 'u' => $this->u,
                 'd' => $this->d,

app/Jobs/StatUserJob.php

@@ -28,7 +28,7 @@ class StatUserJob implements ShouldQueue
      *
      * @return void
      */
-    public function __construct($u, $d, $userId, $server, $protocol, $recordType = 'd')
+    public function __construct($u, $d, $userId, array $server, $protocol, $recordType = 'd')
     {
         $this->onQueue('stat');
         $this->u = $u;
@@ -52,14 +52,14 @@ class StatUserJob implements ShouldQueue
         }
 
         $data = StatUser::where('record_at', $recordAt)
-            ->where('server_rate', $this->server->rate)
+            ->where('server_rate', $this->server['rate'])
             ->where('user_id', $this->userId)
             ->first();
         if ($data) {
             try {
                 $data->update([
-                    'u' => $data['u'] + $this->u,
+                    'u' => $data['u'] + ($this->u * $this->server['rate']),
-                    'd' => $data['d'] + $this->d
+                    'd' => $data['d'] + ($this->d * $this->server['rate'])
                 ]);
             } catch (\Exception $e) {
                 abort(500, '用户统计数据更新失败');
@@ -67,7 +67,7 @@ class StatUserJob implements ShouldQueue
         } else {
             if (!StatUser::create([
                 'user_id' => $this->userId,
-                'server_rate' => $this->server->rate,
+                'server_rate' => $this->server['rate'],
                 'u' => $this->u,
                 'd' => $this->d,
                 'record_type' => $this->recordType,

app/Jobs/TrafficFetchJob.php

@@ -27,7 +27,7 @@ class TrafficFetchJob implements ShouldQueue
      *
      * @return void
      */
-    public function __construct($u, $d, $userId, $server, $protocol)
+    public function __construct($u, $d, $userId, array $server, $protocol)
     {
         $this->onQueue('traffic_fetch');
         $this->u = $u;
@@ -48,8 +48,8 @@ class TrafficFetchJob implements ShouldQueue
         if (!$user) return;
 
         $user->t = time();
-        $user->u = $user->u + $this->u;
+        $user->u = $user->u + ($this->u * $this->server['rate']);
-        $user->d = $user->d + $this->d;
+        $user->d = $user->d + ($this->d * $this->server['rate']);
         if (!$user->save()) throw new \Exception('流量更新失败');
         $mailService = new MailService();
         $mailService->remindTraffic($user);

app/Models/ServerRoute.php

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

app/Models/ServerShadowsocks.php

@@ -13,6 +13,7 @@ class ServerShadowsocks extends Model
         'created_at' => 'timestamp',
         'updated_at' => 'timestamp',
         'group_id' => 'array',
+        'route_id' => 'array',
         'tags' => 'array',
         'obfs_settings' => 'array'
     ];

app/Models/ServerTrojan.php

@@ -13,6 +13,7 @@ class ServerTrojan extends Model
         'created_at' => 'timestamp',
         'updated_at' => 'timestamp',
         'group_id' => 'array',
+        'route_id' => 'array',
         'tags' => 'array'
     ];
 }

app/Models/ServerVmess.php

@@ -4,15 +4,16 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
-class ServerV2ray extends Model
+class ServerVmess extends Model
 {
-    protected $table = 'v2_server_v2ray';
+    protected $table = 'v2_server_vmess';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
     protected $casts = [
         'created_at' => 'timestamp',
         'updated_at' => 'timestamp',
         'group_id' => 'array',
+        'route_id' => 'array',
         'tlsSettings' => 'array',
         'networkSettings' => 'array',
         'dnsSettings' => 'array',

app/Payments/AlipayF2F.php

@@ -28,6 +28,11 @@ class AlipayF2F {
                 'label' => '支付宝公钥',
                 'description' => '',
                 'type' => 'input',
+            ],
+            'product_name' => [
+                'label' => '自定义商品名称',
+                'description' => '将会体现在支付宝账单中',
+                'type' => 'input'
             ]
         ];
     }
@@ -42,7 +47,7 @@ class AlipayF2F {
             $gateway->setAlipayPublicKey($this->config['public_key']); // 可以是路径，也可以是密钥内容
             $gateway->setNotifyUrl($order['notify_url']);
             $gateway->setBizContent([
-                'subject' => config('v2board.app_name', 'V2Board') . ' - 订阅',
+                'subject' => $this->config['product_name'] ?? (config('v2board.app_name', 'V2Board') . ' - 订阅'),
                 'out_trade_no' => $order['trade_no'],
                 'total_amount' => $order['total_amount'] / 100
             ]);

app/Payments/MGate.php

@@ -32,6 +32,11 @@ class MGate {
                 'label' => 'AppSecret',
                 'description' => '',
                 'type' => 'input',
+            ],
+            'mgate_source_currency' => [
+                'label' => '源货币',
+                'description' => '默认CNY',
+                'type' => 'input'
             ]
         ];
     }
@@ -44,6 +49,9 @@ class MGate {
             'notify_url' => $order['notify_url'],
             'return_url' => $order['return_url']
         ];
+        if (isset($this->config['mgate_source_currency'])) {
+            $params['source_currency'] = $this->config['mgate_source_currency'];
+        }
         $params['app_id'] = $this->config['mgate_app_id'];
         ksort($params);
         $str = http_build_query($params) . $this->config['mgate_app_secret'];

app/Payments/StripeAlipay.php

@@ -91,11 +91,14 @@ class StripeAlipay {
             case 'charge.succeeded':
                 $object = $event->data->object;
                 if ($object->status === 'succeeded') {
+                    if (!isset($object->metadata->out_trade_no) && !isset($object->source->metadata)) {
+                        die('order error');
+                    }
                     $metaData = isset($object->metadata->out_trade_no) ? $object->metadata : $object->source->metadata;
                     $tradeNo = $metaData->out_trade_no;
                     return [
                         'trade_no' => $tradeNo,
-                        'callback_no' => $object->balance_transaction
+                        'callback_no' => $object->id
                     ];
                 }
                 break;

app/Payments/StripeCheckout.php

@@ -0,0 +1,124 @@
+<?php
+
+namespace App\Payments;
+
+use Stripe\Stripe;
+use Stripe\Checkout\Session;
+
+class StripeCheckout {
+    public function __construct($config)
+    {
+        $this->config = $config;
+    }
+
+    public function form()
+    {
+        return [
+            'currency' => [
+                'label' => '货币单位',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'stripe_sk_live' => [
+                'label' => 'SK_LIVE',
+                'description' => 'API 密钥',
+                'type' => 'input',
+            ],
+            'stripe_pk_live' => [
+                'label' => 'PK_LIVE',
+                'description' => 'API 公钥',
+                'type' => 'input',
+            ],
+            'stripe_webhook_key' => [
+                'label' => 'WebHook 密钥签名',
+                'description' => '',
+                'type' => 'input',
+            ]
+        ];
+    }
+
+    public function pay($order)
+    {
+        $currency = $this->config['currency'];
+        $exchange = $this->exchange('CNY', strtoupper($currency));
+        if (!$exchange) {
+            abort(500, __('Currency conversion has timed out, please try again later'));
+        }
+
+        $params = [
+            'success_url' => $order['return_url'],
+            'cancel_url' => $order['return_url'],
+            'client_reference_id' => $order['trade_no'],
+            'line_items' => [
+                [
+                    'price_data' => [
+                        'currency' => $currency,
+                        'product_data' => [
+                            'name' => $order['trade_no']
+                        ],
+                        'unit_amount' => floor($order['total_amount'] * $exchange)
+                    ],
+                    'quantity' => 1
+                ]
+            ],
+            'mode' => 'payment'
+            // 'customer_email' => $user['email'] not support
+
+        ];
+
+        Stripe::setApiKey($this->config['stripe_sk_live']);
+        try {
+            $session = Session::create($params);
+        } catch (\Exception $e) {
+            info($e);
+            abort(500, "Failed to create order. Error: {$e->getMessage}");
+        }
+        return [
+            'type' => 1, // 0:qrcode 1:url
+            'data' => $session->url
+        ];
+    }
+
+    public function notify($params)
+    {
+        \Stripe\Stripe::setApiKey($this->config['stripe_sk_live']);
+        try {
+            $event = \Stripe\Webhook::constructEvent(
+                file_get_contents('php://input'),
+                $_SERVER['HTTP_STRIPE_SIGNATURE'],
+                $this->config['stripe_webhook_key']
+            );
+        } catch (\Stripe\Error\SignatureVerification $e) {
+            abort(400);
+        }
+
+        switch ($event->type) {
+            case 'checkout.session.completed':
+                $object = $event->data->object;
+                if ($object->payment_status === 'paid') {
+                    return [
+                        'trade_no' => $object->client_reference_id,
+                        'callback_no' => $object->payment_intent
+                    ];
+                }
+                break;
+            case 'checkout.session.async_payment_succeeded':
+                $object = $event->data->object;
+                return [
+                    'trade_no' => $object->client_reference_id,
+                    'callback_no' => $object->payment_intent
+                ];
+                break;
+            default:
+                abort(500, 'event is not support');
+        }
+        die('success');
+    }
+
+    private function exchange($from, $to)
+    {
+        $result = file_get_contents('https://api.exchangerate.host/latest?symbols=' . $to . '&base=' . $from);
+        $result = json_decode($result, true);
+        return $result['rates'][$to];
+    }
+}

app/Payments/StripeCredit.php

@@ -98,11 +98,14 @@ class StripeCredit {
             case 'charge.succeeded':
                 $object = $event->data->object;
                 if ($object->status === 'succeeded') {
+                    if (!isset($object->metadata->out_trade_no) && !isset($object->source->metadata)) {
+                        die('order error');
+                    }
                     $metaData = isset($object->metadata->out_trade_no) ? $object->metadata : $object->source->metadata;
                     $tradeNo = $metaData->out_trade_no;
                     return [
                         'trade_no' => $tradeNo,
-                        'callback_no' => $object->balance_transaction
+                        'callback_no' => $object->id
                     ];
                 }
                 break;

app/Payments/StripeWepay.php

@@ -91,11 +91,14 @@ class StripeWepay {
             case 'charge.succeeded':
                 $object = $event->data->object;
                 if ($object->status === 'succeeded') {
+                    if (!isset($object->metadata->out_trade_no) && !isset($object->source->metadata)) {
+                        die('order error');
+                    }
                     $metaData = isset($object->metadata->out_trade_no) ? $object->metadata : $object->source->metadata;
                     $tradeNo = $metaData->out_trade_no;
                     return [
                         'trade_no' => $tradeNo,
-                        'callback_no' => $object->balance_transaction
+                        'callback_no' => $object->id
                     ];
                 }
                 break;

app/Services/AuthService.php

@@ -0,0 +1,104 @@
+<?php
+
+namespace App\Services;
+
+use App\Utils\CacheKey;
+use App\Utils\Helper;
+use Firebase\JWT\JWT;
+use Firebase\JWT\Key;
+use App\Models\User;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Http\Request;
+
+class AuthService
+{
+    private $user;
+
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+
+    public function generateAuthData(Request $request)
+    {
+        $guid = Helper::guid();
+        $authData = JWT::encode([
+            'id' => $this->user->id,
+            'session' => $guid,
+        ], config('app.key'), 'HS256');
+        self::addSession($this->user->id, $guid, [
+            'ip' => $request->ip(),
+            'login_at' => time(),
+            'ua' => $request->userAgent()
+        ]);
+        return [
+            'token' => $this->user->token,
+            'is_admin' => $this->user->is_admin,
+            'auth_data' => $authData
+        ];
+    }
+
+    public static function decryptAuthData($jwt)
+    {
+        try {
+            if (!Cache::has($jwt)) {
+                $data = (array)JWT::decode($jwt, new Key(config('app.key'), 'HS256'));
+                if (!self::checkSession($data['id'], $data['session'])) return false;
+                $user = User::select([
+                    'id',
+                    'email',
+                    'is_admin',
+                    'is_staff'
+                ])
+                    ->find($data['id']);
+                if (!$user) return false;
+                Cache::put($jwt, $user->toArray(), 3600);
+            }
+            return Cache::get($jwt);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    private static function checkSession($userId, $session)
+    {
+        $sessions = (array)Cache::get(CacheKey::get("USER_SESSIONS", $userId)) ?? [];
+        if (!in_array($session, array_keys($sessions))) return false;
+        return true;
+    }
+
+    private static function addSession($userId, $guid, $meta)
+    {
+        $cacheKey = CacheKey::get("USER_SESSIONS", $userId);
+        $sessions = (array)Cache::get($cacheKey, []);
+        $sessions[$guid] = $meta;
+        if (!Cache::put(
+            $cacheKey,
+            $sessions
+        )) return false;
+        return true;
+    }
+
+    public function getSessions()
+    {
+        return (array)Cache::get(CacheKey::get("USER_SESSIONS", $this->user->id), []);
+    }
+
+    public function removeSession($sessionId)
+    {
+        $cacheKey = CacheKey::get("USER_SESSIONS", $this->user->id);
+        $sessions = (array)Cache::get($cacheKey, []);
+        unset($sessions[$sessionId]);
+        if (!Cache::put(
+            $cacheKey,
+            $sessions
+        )) return false;
+        return true;
+    }
+
+    public function removeAllSession()
+    {
+        $cacheKey = CacheKey::get("USER_SESSIONS", $this->user->id);
+        return Cache::forget($cacheKey);
+    }
+}

app/Services/CouponService.php

@@ -15,7 +15,9 @@ class CouponService
 
     public function __construct($code)
     {
-        $this->coupon = Coupon::where('code', $code)->first();
+        $this->coupon = Coupon::where('code', $code)
+            ->lockForUpdate()
+            ->first();
     }
 
     public function use(Order $order):bool
@@ -36,6 +38,7 @@ class CouponService
             $order->discount_amount = $order->total_amount;
         }
         if ($this->coupon->limit_use !== NULL) {
+            if ($this->coupon->limit_use <= 0) return false;
             $this->coupon->limit_use = $this->coupon->limit_use - 1;
             if (!$this->coupon->save()) {
                 return false;

app/Services/OrderService.php

@@ -71,6 +71,8 @@ class OrderService
                 break;
         }
 
+        $this->setSpeedLimit($plan->speed_limit);
+
         if (!$this->user->save()) {
             DB::rollBack();
             abort(500, '开通失败');
@@ -182,43 +184,35 @@ class OrderService
         $order->surplus_order_ids = array_column($orderModel->get()->toArray(), 'id');
     }
 
-    private function orderIsUsed(Order $order):bool
-    {
-        $month = self::STR_TO_TIME[$order->period];
-        $orderExpireDay = strtotime('+' . $month . ' month', $order->created_at);
-        if ($orderExpireDay < time()) return true;
-        return false;
-    }
-
     private function getSurplusValueByPeriod(User $user, Order $order)
     {
-        $orderModel = Order::where('user_id', $user->id)
+        $orders = Order::where('user_id', $user->id)
             ->where('period', '!=', 'reset_price')
-            ->where('status', 3);
+            ->where('period', '!=', 'onetime_price')
-        $orders = $orderModel->get();
+            ->where('status', 3)
-        $orderSurplusMonth = 0;
+            ->get()
-        $orderSurplusAmount = 0;
+            ->toArray();
-        $userSurplusMonth = ($user->expired_at - time()) / 2678400;
+        if (!$orders) return;
-        foreach ($orders as $k => $item) {
+        $orderAmountSum = 0;
-            // 兼容历史余留问题
+        $orderMonthSum = 0;
-            if ($item->period === 'onetime_price') continue;
+        $lastValidateAt = 0;
-            if ($this->orderIsUsed($item)) continue;
+        foreach ($orders as $item) {
-            $orderSurplusMonth = $orderSurplusMonth + self::STR_TO_TIME[$item->period];
+            $period = self::STR_TO_TIME[$item['period']];
-            $orderSurplusAmount = $orderSurplusAmount + ($item['total_amount'] + $item['balance_amount'] + $item['surplus_amount'] - $item['refund_amount']);
+            if (strtotime("+{$period} month", $item['created_at']) < time()) continue;
-        }
+            $lastValidateAt = $item['created_at'];
-        if (!$orderSurplusMonth || !$orderSurplusAmount) return;
+            $orderMonthSum = $period + $orderMonthSum;
-        $monthUnitPrice = $orderSurplusAmount / $orderSurplusMonth;
+            $orderAmountSum = $orderAmountSum + ($item['total_amount'] + $item['balance_amount'] + $item['surplus_amount'] - $item['refund_amount']);
-        // 如果用户过期月大于订单过期月
-        if ($userSurplusMonth > $orderSurplusMonth) {
-            $orderSurplusAmount = $orderSurplusMonth * $monthUnitPrice;
-        } else {
-            $orderSurplusAmount = $userSurplusMonth * $monthUnitPrice;
-        }
-        if (!$orderSurplusAmount) {
-            return;
         }
+        if (!$lastValidateAt) return;
+        $expiredAtByOrder = strtotime("+{$orderMonthSum} month", $lastValidateAt);
+        if ($expiredAtByOrder < time()) return;
+        $orderSurplusSecond = $expiredAtByOrder - time();
+        $orderRangeSecond = $expiredAtByOrder - $lastValidateAt;
+        $avgPrice = $orderAmountSum / $orderRangeSecond;
+        $orderSurplusAmount = $avgPrice * $orderSurplusSecond;
+        if (!$orderSurplusSecond || !$orderSurplusAmount) return;
         $order->surplus_amount = $orderSurplusAmount > 0 ? $orderSurplusAmount : 0;
-        $order->surplus_order_ids = array_column($orders->toArray(), 'id');
+        $order->surplus_order_ids = array_column($orders, 'id');
     }
 
     public function paid(string $callbackNo)
@@ -253,6 +247,11 @@ class OrderService
         return true;
     }
 
+    private function setSpeedLimit($speedLimit)
+    {
+        $this->user->speed_limit = $speedLimit;
+    }
+
     private function buyByResetTraffic()
     {
         $this->user->u = 0;

app/Services/PlanService.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\Plan;
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+
+class PlanService
+{
+    public $plan;
+
+    public function __construct(int $planId)
+    {
+        $this->plan = Plan::lockForUpdate()->find($planId);
+    }
+
+    public function haveCapacity(): bool
+    {
+        if ($this->plan->capacity_limit === NULL) return true;
+        $count = self::countActiveUsers();
+        $count = $count[$this->plan->id]['count'] ?? 0;
+        return ($this->plan->capacity_limit - $count) > 0;
+    }
+
+    public static function countActiveUsers()
+    {
+        return 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()
+            ->keyBy('plan_id');
+    }
+}

app/Services/ServerService.php

@@ -3,9 +3,10 @@
 namespace App\Services;
 
 use App\Models\ServerLog;
+use App\Models\ServerRoute;
 use App\Models\ServerShadowsocks;
 use App\Models\User;
-use App\Models\ServerV2ray;
+use App\Models\ServerVmess;
 use App\Models\ServerTrojan;
 use App\Utils\CacheKey;
 use App\Utils\Helper;
@@ -14,96 +15,91 @@ use Illuminate\Support\Facades\Cache;
 class ServerService
 {
 
-    public function getV2ray(User $user, $all = false):array
+    public function getAvailableVmess(User $user):array
     {
         $servers = [];
-        $model = ServerV2ray::orderBy('sort', 'ASC');
+        $model = ServerVmess::orderBy('sort', 'ASC');
-        if (!$all) {
+        $vmess = $model->get();
-            $model->where('show', 1);
+        foreach ($vmess as $key => $v) {
+            if (!$v['show']) continue;
+            $vmess[$key]['type'] = 'vmess';
+            if (!in_array($user->group_id, $vmess[$key]['group_id'])) continue;
+            if (strpos($vmess[$key]['port'], '-') !== false) {
+                $vmess[$key]['port'] = Helper::randomPort($vmess[$key]['port']);
             }
-        $v2ray = $model->get();
+            if ($vmess[$key]['parent_id']) {
-        for ($i = 0; $i < count($v2ray); $i++) {
+                $vmess[$key]['last_check_at'] = Cache::get(CacheKey::get('SERVER_VMESS_LAST_CHECK_AT', $vmess[$key]['parent_id']));
-            $v2ray[$i]['type'] = 'v2ray';
-            $groupId = $v2ray[$i]['group_id'];
-            if (!in_array($user->group_id, $groupId)) continue;
-            if (strpos($v2ray[$i]['port'], '-') !== false) {
-                $v2ray[$i]['port'] = Helper::randomPort($v2ray[$i]['port']);
-            }
-            if ($v2ray[$i]['parent_id']) {
-                $v2ray[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $v2ray[$i]['parent_id']));
             } else {
-                $v2ray[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $v2ray[$i]['id']));
+                $vmess[$key]['last_check_at'] = Cache::get(CacheKey::get('SERVER_VMESS_LAST_CHECK_AT', $vmess[$key]['id']));
             }
-            array_push($servers, $v2ray[$i]->toArray());
+            $servers[] = $vmess[$key]->toArray();
         }
 
 
         return $servers;
     }
 
-    public function getTrojan(User $user, $all = false):array
+    public function getAvailableTrojan(User $user):array
     {
         $servers = [];
         $model = ServerTrojan::orderBy('sort', 'ASC');
-        if (!$all) {
-            $model->where('show', 1);
-        }
         $trojan = $model->get();
-        for ($i = 0; $i < count($trojan); $i++) {
+        foreach ($trojan as $key => $v) {
-            $trojan[$i]['type'] = 'trojan';
+            if (!$v['show']) continue;
-            $groupId = $trojan[$i]['group_id'];
+            $trojan[$key]['type'] = 'trojan';
-            if (!in_array($user->group_id, $groupId)) continue;
+            if (!in_array($user->group_id, $trojan[$key]['group_id'])) continue;
-            if (strpos($trojan[$i]['port'], '-') !== false) {
+            if (strpos($trojan[$key]['port'], '-') !== false) {
-                $trojan[$i]['port'] = Helper::randomPort($trojan[$i]['port']);
+                $trojan[$key]['port'] = Helper::randomPort($trojan[$key]['port']);
             }
-            if ($trojan[$i]['parent_id']) {
+            if ($trojan[$key]['parent_id']) {
-                $trojan[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $trojan[$i]['parent_id']));
+                $trojan[$key]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $trojan[$key]['parent_id']));
             } else {
-                $trojan[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $trojan[$i]['id']));
+                $trojan[$key]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $trojan[$key]['id']));
             }
-            array_push($servers, $trojan[$i]->toArray());
+            $servers[] = $trojan[$key]->toArray();
         }
         return $servers;
     }
 
-    public function getShadowsocks(User $user, $all = false)
+    public function getAvailableShadowsocks(User $user)
     {
         $servers = [];
         $model = ServerShadowsocks::orderBy('sort', 'ASC');
-        if (!$all) {
+        $shadowsocks = $model->get()->keyBy('id');
-            $model->where('show', 1);
+        foreach ($shadowsocks as $key => $v) {
+            if (!$v['show']) continue;
+            $shadowsocks[$key]['type'] = 'shadowsocks';
+            $shadowsocks[$key]['last_check_at'] = Cache::get(CacheKey::get('SERVER_SHADOWSOCKS_LAST_CHECK_AT', $v['id']));
+            if (!in_array($user->group_id, $v['group_id'])) continue;
+            if (strpos($v['port'], '-') !== false) {
+                $shadowsocks[$key]['port'] = Helper::randomPort($v['port']);
             }
-        $shadowsocks = $model->get();
+            if (isset($shadowsocks[$v['parent_id']])) {
-        for ($i = 0; $i < count($shadowsocks); $i++) {
+                $shadowsocks[$key]['last_check_at'] = Cache::get(CacheKey::get('SERVER_SHADOWSOCKS_LAST_CHECK_AT', $v['parent_id']));
-            $shadowsocks[$i]['type'] = 'shadowsocks';
+                $shadowsocks[$key]['created_at'] = $shadowsocks[$v['parent_id']]['created_at'];
-            $groupId = $shadowsocks[$i]['group_id'];
-            if (!in_array($user->group_id, $groupId)) continue;
-            if (strpos($shadowsocks[$i]['port'], '-') !== false) {
-                $shadowsocks[$i]['port'] = Helper::randomPort($shadowsocks[$i]['port']);
             }
-            if ($shadowsocks[$i]['parent_id']) {
+            $servers[] = $shadowsocks[$key]->toArray();
-                $shadowsocks[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_SHADOWSOCKS_LAST_CHECK_AT', $shadowsocks[$i]['parent_id']));
-            } else {
-                $shadowsocks[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_SHADOWSOCKS_LAST_CHECK_AT', $shadowsocks[$i]['id']));
-            }
-            array_push($servers, $shadowsocks[$i]->toArray());
         }
         return $servers;
     }
 
-    public function getAvailableServers(User $user, $all = false)
+    public function getAvailableServers(User $user)
     {
         $servers = array_merge(
-            $this->getShadowsocks($user, $all),
+            $this->getAvailableShadowsocks($user),
-            $this->getV2ray($user, $all),
+            $this->getAvailableVmess($user),
-            $this->getTrojan($user, $all)
+            $this->getAvailableTrojan($user)
         );
         $tmp = array_column($servers, 'sort');
         array_multisort($tmp, SORT_ASC, $servers);
-        return $servers;
+        return array_map(function ($server) {
+            $server['port'] = (int)$server['port'];
+            $server['is_online'] = (time() - 300 > $server['last_check_at']) ? 0 : 1;
+            $server['cache_key'] = "{$server['type']}-{$server['id']}-{$server['updated_at']}-{$server['is_online']}";
+            return $server;
+        }, $servers);
     }
 
-
     public function getAvailableUsers($groupId)
     {
         return User::whereIn('group_id', $groupId)
@@ -115,7 +111,8 @@ class ServerService
             ->where('banned', 0)
             ->select([
                 'id',
-                'uuid'
+                'uuid',
+                'speed_limit'
             ])
             ->get();
     }
@@ -152,45 +149,46 @@ class ServerService
         }
     }
 
-    public function getShadowsocksServers()
+    public function getAllShadowsocks()
     {
-        $server = ServerShadowsocks::orderBy('sort', 'ASC')->get();
+        $servers = ServerShadowsocks::orderBy('sort', 'ASC')
-        for ($i = 0; $i < count($server); $i++) {
+            ->get()
-            $server[$i]['type'] = 'shadowsocks';
+            ->toArray();
+        foreach ($servers as $k => $v) {
+            $servers[$k]['type'] = 'shadowsocks';
         }
-        return $server->toArray();
+        return $servers;
     }
 
-    public function getV2rayServers()
+    public function getAllVMess()
     {
-        $server = ServerV2ray::orderBy('sort', 'ASC')->get();
+        $servers = ServerVmess::orderBy('sort', 'ASC')
-        for ($i = 0; $i < count($server); $i++) {
+            ->get()
-            $server[$i]['type'] = 'v2ray';
+            ->toArray();
+        foreach ($servers as $k => $v) {
+            $servers[$k]['type'] = 'vmess';
         }
-        return $server->toArray();
+        return $servers;
     }
 
-    public function getTrojanServers()
+    public function getAllTrojan()
     {
-        $server = ServerTrojan::orderBy('sort', 'ASC')->get();
+        $servers = ServerTrojan::orderBy('sort', 'ASC')
-        for ($i = 0; $i < count($server); $i++) {
+            ->get()
-            $server[$i]['type'] = 'trojan';
+            ->toArray();
+        foreach ($servers as $k => $v) {
+            $servers[$k]['type'] = 'trojan';
         }
-        return $server->toArray();
+        return $servers;
     }
 
-    public function mergeData(&$servers)
+    private function mergeData(&$servers)
     {
         foreach ($servers as $k => $v) {
-            $serverType = strtoupper($servers[$k]['type']);
+            $serverType = strtoupper($v['type']);
-            $servers[$k]['online'] = Cache::get(CacheKey::get("SERVER_{$serverType}_ONLINE_USER", $servers[$k]['parent_id'] ? $servers[$k]['parent_id'] : $servers[$k]['id']));
+            $servers[$k]['online'] = Cache::get(CacheKey::get("SERVER_{$serverType}_ONLINE_USER", $v['parent_id'] ?? $v['id']));
-            if ($servers[$k]['parent_id']) {
+            $servers[$k]['last_check_at'] = Cache::get(CacheKey::get("SERVER_{$serverType}_LAST_CHECK_AT", $v['parent_id'] ?? $v['id']));
-                $servers[$k]['last_check_at'] = Cache::get(CacheKey::get("SERVER_{$serverType}_LAST_CHECK_AT", $servers[$k]['parent_id']));
+            $servers[$k]['last_push_at'] = Cache::get(CacheKey::get("SERVER_{$serverType}_LAST_PUSH_AT", $v['parent_id'] ?? $v['id']));
-                $servers[$k]['last_push_at'] = Cache::get(CacheKey::get("SERVER_{$serverType}_LAST_PUSH_AT", $servers[$k]['parent_id']));
-            } else {
-                $servers[$k]['last_check_at'] = Cache::get(CacheKey::get("SERVER_{$serverType}_LAST_CHECK_AT", $servers[$k]['id']));
-                $servers[$k]['last_push_at'] = Cache::get(CacheKey::get("SERVER_{$serverType}_LAST_PUSH_AT", $servers[$k]['id']));
-            }
             if ((time() - 300) >= $servers[$k]['last_check_at']) {
                 $servers[$k]['available_status'] = 0;
             } else if ((time() - 300) >= $servers[$k]['last_push_at']) {
@@ -204,13 +202,39 @@ class ServerService
     public function getAllServers()
     {
         $servers = array_merge(
-            $this->getShadowsocksServers(),
+            $this->getAllShadowsocks(),
-            $this->getV2rayServers(),
+            $this->getAllVMess(),
-            $this->getTrojanServers()
+            $this->getAllTrojan()
         );
         $this->mergeData($servers);
         $tmp = array_column($servers, 'sort');
         array_multisort($tmp, SORT_ASC, $servers);
         return $servers;
     }
+
+    public function getRoutes(array $routeIds)
+    {
+        $routes = ServerRoute::select(['id', 'match', 'action', 'action_value'])->whereIn('id', $routeIds)->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 $routes;
+    }
+
+    public function getServer($serverId, $serverType)
+    {
+        switch ($serverType) {
+            case 'vmess':
+                return ServerVmess::find($serverId);
+            case 'shadowsocks':
+                return ServerShadowsocks::find($serverId);
+            case 'trojan':
+                return ServerTrojan::find($serverId);
+            default:
+                return false;
+        }
+    }
 }

app/Services/TelegramService.php

@@ -26,6 +26,22 @@ class TelegramService {
         ]);
     }
 
+    public function approveChatJoinRequest(int $chatId, int $userId)
+    {
+        $this->request('approveChatJoinRequest', [
+            'chat_id' => $chatId,
+            'user_id' => $userId
+        ]);
+    }
+
+    public function declineChatJoinRequest(int $chatId, int $userId)
+    {
+        $this->request('declineChatJoinRequest', [
+            'chat_id' => $chatId,
+            'user_id' => $userId
+        ]);
+    }
+
     public function getMe()
     {
         return $this->request('getMe');