Merge branch 'dev'

1.7.0

app/Console/Commands/CheckCommission.php

@@ -80,15 +80,14 @@ class CheckCommission extends Command
 
     public function payHandle($inviteUserId, Order $order)
     {
+        $level = 3;
         if ((int)config('v2board.commission_distribution_enable', 0)) {
-            $level = 3;
             $commissionShareLevels = [
                 0 => (int)config('v2board.commission_distribution_l1'),
                 1 => (int)config('v2board.commission_distribution_l2'),
                 2 => (int)config('v2board.commission_distribution_l3')
             ];
         } else {
-            $level = 3;
             $commissionShareLevels = [
                 0 => 100
             ];
@@ -98,6 +97,7 @@ class CheckCommission extends Command
             if (!$inviter) continue;
             if (!isset($commissionShareLevels[$l])) continue;
             $commissionBalance = $order->commission_balance * ($commissionShareLevels[$l] / 100);
+            if (!$commissionBalance) continue;
             if ((int)config('v2board.withdraw_close_enable', 0)) {
                 $inviter->balance = $inviter->balance + $commissionBalance;
             } else {
@@ -118,6 +118,8 @@ class CheckCommission extends Command
                 return false;
             }
             $inviteUserId = $inviter->invite_user_id;
+            // update order actual commission balance
+            $order->actual_commission_balance = $order->actual_commission_balance + $commissionBalance;
         }
         return true;
     }

app/Console/Commands/CheckTicket.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Ticket;
+use Illuminate\Console\Command;
+
+class CheckTicket extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'check:ticket';
+
+    /**
+     * 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()
+    {
+        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;
+            $ticket->status = 1;
+            $ticket->save();
+        }
+    }
+}

app/Console/Commands/ClearUser.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Ticket;
+use App\Models\User;
+use Illuminate\Console\Command;
+
+class ClearUser extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'clear: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()
+    {
+        $builder = User::where('plan_id', NULL)
+            ->where('transfer_enable', 0)
+            ->where('expired_at', 0)
+            ->where('last_login_at', NULL);
+        $count = $builder->count();
+        if ($builder->delete()) {
+            $this->info("已删除${count}位没有任何数据的用户");
+        }
+    }
+}

app/Console/Commands/ResetLog.php

@@ -2,25 +2,30 @@
 
 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;
-use App\Models\ServerLog;
 
-class ResetServerLog extends Command
+class ResetLog extends Command
 {
+    protected $builder;
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'reset:serverLog';
+    protected $signature = 'reset:log';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = '节点服务器日志重置';
+    protected $description = '清空日志';
 
     /**
      * Create a new command instance.
@@ -39,6 +44,7 @@ class ResetServerLog extends Command
      */
     public function handle()
     {
-        ServerLog::truncate();
+        StatUser::where('record_at', '<', strtotime('-2 month', time()))->delete();
+        StatServer::where('record_at', '<', strtotime('-2 month', time()))->delete();
     }
 }

app/Console/Commands/ResetPassword.php

@@ -0,0 +1,54 @@
+<?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 ResetPassword extends Command
+{
+    protected $builder;
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'reset:password {email}';
+
+    /**
+     * 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()
+    {
+        $user = User::where('email', $this->argument('email'))->first();
+        if (!$user) abort(500, '邮箱不存在');
+        $password = Helper::guid(false);
+        $user->password = password_hash($password, PASSWORD_DEFAULT);
+        $user->password_algo = null;
+        if (!$user->save()) abort(500, '重置失败');
+        $this->info("!!!重置成功!!!");
+        $this->info("新密码为：{$password}，请尽快修改密码。");
+    }
+}

app/Console/Commands/ResetTraffic.php

@@ -44,42 +44,93 @@ class ResetTraffic extends Command
     public function handle()
     {
         ini_set('memory_limit', -1);
-        foreach (Plan::get() as $plan) {
-            switch ($plan->reset_traffic_method) {
-                case null: {
+        $resetMethods = Plan::select(
+            DB::raw("GROUP_CONCAT(`id`) as plan_ids"),
+            DB::raw("reset_traffic_method as method")
+        )
+            ->groupBy('reset_traffic_method')
+            ->get()
+            ->toArray();
+        foreach ($resetMethods as $resetMethod) {
+            $planIds = explode(',', $resetMethod['plan_ids']);
+            switch (true) {
+                case ($resetMethod['method'] === NULL): {
                     $resetTrafficMethod = config('v2board.reset_traffic_method', 0);
+                    $builder = with(clone($this->builder))->whereIn('plan_id', $planIds);
                     switch ((int)$resetTrafficMethod) {
                         // month first day
                         case 0:
-                            $this->resetByMonthFirstDay($this->builder);
+                            $this->resetByMonthFirstDay($builder);
                             break;
                         // expire day
                         case 1:
-                            $this->resetByExpireDay($this->builder);
+                            $this->resetByExpireDay($builder);
                             break;
                         // no action
                         case 2:
                             break;
+                        // year first day
+                        case 3:
+                            $this->resetByYearFirstDay($builder);
+                        // year expire day
+                        case 4:
+                            $this->resetByExpireYear($builder);
                     }
                     break;
                 }
-                case 0: {
-                    $builder = with(clone($this->builder))->where('plan_id', $plan->id);
+                case ($resetMethod['method'] === 0): {
+                    $builder = with(clone($this->builder))->whereIn('plan_id', $planIds);
                     $this->resetByMonthFirstDay($builder);
                     break;
                 }
-                case 1: {
-                    $builder = with(clone($this->builder))->where('plan_id', $plan->id);
+                case ($resetMethod['method'] === 1): {
+                    $builder = with(clone($this->builder))->whereIn('plan_id', $planIds);
                     $this->resetByExpireDay($builder);
                     break;
                 }
-                case 2: {
+                case ($resetMethod['method'] === 2): {
+                    break;
+                }
+                case ($resetMethod['method'] === 3): {
+                    $builder = with(clone($this->builder))->whereIn('plan_id', $planIds);
+                    $this->resetByYearFirstDay($builder);
+                    break;
+                }
+                case ($resetMethod['method'] === 4): {
+                    $builder = with(clone($this->builder))->whereIn('plan_id', $planIds);
+                    $this->resetByExpireYear($builder);
                     break;
                 }
             }
         }
     }
 
+    private function resetByExpireYear($builder):void
+    {
+        $users = [];
+        foreach ($builder->get() as $item) {
+            $expireDay = date('m-d', $item->expired_at);
+            $today = date('m-d');
+            if ($expireDay === $today) {
+                array_push($users, $item->id);
+            }
+        }
+        User::whereIn('id', $users)->update([
+            'u' => 0,
+            'd' => 0
+        ]);
+    }
+
+    private function resetByYearFirstDay($builder):void
+    {
+        if ((string)date('md') === '0101') {
+            $builder->update([
+                'u' => 0,
+                'd' => 0
+            ]);
+        }
+    }
+
     private function resetByMonthFirstDay($builder):void
     {
         if ((string)date('d') === '01') {

app/Console/Commands/ResetUser.php

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

app/Console/Commands/V2boardStatistics.php

@@ -2,12 +2,10 @@
 
 namespace App\Console\Commands;
 
-use App\Jobs\StatServerJob;
 use Illuminate\Console\Command;
 use App\Models\Order;
 use App\Models\StatOrder;
-use App\Models\ServerLog;
-use Illuminate\Support\Facades\DB;
+use App\Models\CommissionLog;
 
 class V2boardStatistics extends Command
 {
@@ -42,22 +40,23 @@ class V2boardStatistics extends Command
      */
     public function handle()
     {
+        ini_set('memory_limit', -1);
         $this->statOrder();
-        $this->statServer();
     }
 
     private function statOrder()
     {
         $endAt = strtotime(date('Y-m-d'));
         $startAt = strtotime('-1 day', $endAt);
-        $builder = Order::where('paid_at', '>=', $startAt)
+        $orderBuilder = Order::where('paid_at', '>=', $startAt)
             ->where('paid_at', '<', $endAt)
             ->whereNotIn('status', [0, 2]);
-        $orderCount = $builder->count();
-        $orderAmount = $builder->sum('total_amount');
-        $builder = $builder->where('commission_balance', '!=', 0);
-        $commissionCount = $builder->count();
-        $commissionAmount = $builder->sum('commission_balance');
+        $orderCount = $orderBuilder->count();
+        $orderAmount = $orderBuilder->sum('total_amount');
+        $commissionLogBuilder = CommissionLog::where('created_at', '>=', $startAt)
+            ->where('created_at', '<', $endAt);
+        $commissionCount = $commissionLogBuilder->count();
+        $commissionAmount = $commissionLogBuilder->sum('get_amount');
         $data = [
             'order_count' => $orderCount,
             'order_amount' => $orderAmount,
@@ -75,26 +74,4 @@ class V2boardStatistics extends Command
         }
         StatOrder::create($data);
     }
-
-    private function statServer()
-    {
-        $endAt = strtotime(date('Y-m-d'));
-        $startAt = strtotime('-1 day', $endAt);
-        $statistics = ServerLog::select([
-            'server_id',
-            'method as server_type',
-            DB::raw("sum(u) as u"),
-            DB::raw("sum(d) as d"),
-        ])
-            ->where('log_at', '>=', $startAt)
-            ->where('log_at', '<', $endAt)
-            ->groupBy('server_id', 'method')
-            ->get()
-            ->toArray();
-        foreach ($statistics as $statistic) {
-            $statistic['record_type'] = 'd';
-            $statistic['record_at'] = $startAt;
-            StatServerJob::dispatch($statistic);
-        }
-    }
 }

app/Console/Commands/V2boardUpdate.php

@@ -58,5 +58,7 @@ class V2boardUpdate extends Command
             }
         }
         $this->info('更新完毕，请重新启动队列服务。');
+        \Artisan::call('cache:clear');
+        \Artisan::call('config:cache');
     }
 }

app/Console/Kernel.php

@@ -2,8 +2,10 @@
 
 namespace App\Console;
 
+use App\Utils\CacheKey;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
+use Illuminate\Support\Facades\Cache;
 
 class Kernel extends ConsoleKernel
 {
@@ -24,14 +26,16 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
+        Cache::put(CacheKey::get('SCHEDULE_LAST_CHECK_AT', null), time());
         // v2board
         $schedule->command('v2board:statistics')->dailyAt('0:10');
         // check
         $schedule->command('check:order')->everyMinute();
         $schedule->command('check:commission')->everyMinute();
+        $schedule->command('check:ticket')->everyMinute();
         // reset
         $schedule->command('reset:traffic')->daily();
-        $schedule->command('reset:serverLog')->quarterly()->at('0:15');
+        $schedule->command('reset:log')->daily();
         // send
         $schedule->command('send:remindMail')->dailyAt('11:30');
         // horizon metrics

app/Exceptions/Handler.php

@@ -3,7 +3,10 @@
 namespace App\Exceptions;
 
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Support\Arr;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Throwable;
+use Facade\Ignition\Exceptions\ViewException;
 
 class Handler extends ExceptionHandler
 {
@@ -50,6 +53,27 @@ class Handler extends ExceptionHandler
      */
     public function render($request, Throwable $exception)
     {
+        if ($exception instanceof ViewException) {
+            return response([
+                'message' => "主题初始化发生错误，请在后台对主题检查或配置后重试。"
+            ]);
+        }
         return parent::render($request, $exception);
     }
+
+
+    protected function convertExceptionToArray(Throwable $e)
+    {
+        return config('app.debug') ? [
+            'message' => $e->getMessage(),
+            'exception' => get_class($e),
+            'file' => $e->getFile(),
+            'line' => $e->getLine(),
+            'trace' => collect($e->getTrace())->map(function ($trace) {
+                return Arr::except($trace, ['args']);
+            })->all(),
+        ] : [
+            'message' => $this->isHttpException($e) ? $e->getMessage() : __("Uh-oh, we've had some problems, we're working on it."),
+        ];
+    }
 }

app/Http/Controllers/Admin/ConfigController.php

@@ -8,6 +8,8 @@ use App\Services\TelegramService;
 use Illuminate\Http\Request;
 use App\Utils\Dict;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Mail;
 
 class ConfigController extends Controller
@@ -37,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' => [
@@ -54,152 +56,132 @@ class ConfigController extends Controller
 
     public function setTelegramWebhook(Request $request)
     {
+        $hookUrl = url('/api/v1/guest/telegram/webhook?access_token=' . md5(config('v2board.telegram_bot_token', $request->input('telegram_bot_token'))));
         $telegramService = new TelegramService($request->input('telegram_bot_token'));
         $telegramService->getMe();
-        $telegramService->setWebhook(
-            url(
-                '/api/v1/guest/telegram/webhook?access_token=' . md5(config('v2board.telegram_bot_token', $request->input('telegram_bot_token')))
-            )
-        );
+        $telegramService->setWebhook($hookUrl);
         return response([
             'data' => true
         ]);
     }
 
-    public function fetch()
+    public function fetch(Request $request)
     {
+        $key = $request->input('key');
+        $data = [
+            'invite' => [
+                'invite_force' => (int)config('v2board.invite_force', 0),
+                'invite_commission' => config('v2board.invite_commission', 10),
+                'invite_gen_limit' => config('v2board.invite_gen_limit', 5),
+                'invite_never_expire' => config('v2board.invite_never_expire', 0),
+                'commission_first_time_enable' => config('v2board.commission_first_time_enable', 1),
+                'commission_auto_check_enable' => config('v2board.commission_auto_check_enable', 1),
+                'commission_withdraw_limit' => config('v2board.commission_withdraw_limit', 100),
+                'commission_withdraw_method' => config('v2board.commission_withdraw_method', Dict::WITHDRAW_METHOD_WHITELIST_DEFAULT),
+                'withdraw_close_enable' => config('v2board.withdraw_close_enable', 0),
+                'commission_distribution_enable' => config('v2board.commission_distribution_enable', 0),
+                'commission_distribution_l1' => config('v2board.commission_distribution_l1'),
+                'commission_distribution_l2' => config('v2board.commission_distribution_l2'),
+                'commission_distribution_l3' => config('v2board.commission_distribution_l3')
+            ],
+            'site' => [
+                '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),
+                'secure_path' => config('v2board.secure_path', config('v2board.frontend_admin_path', hash('crc32b', config('app.key'))))
+            ],
+            'subscribe' => [
+                'plan_change_enable' => (int)config('v2board.plan_change_enable', 1),
+                'reset_traffic_method' => (int)config('v2board.reset_traffic_method', 0),
+                'surplus_enable' => (int)config('v2board.surplus_enable', 1),
+                'new_order_event_id' => (int)config('v2board.new_order_event_id', 0),
+                'renew_order_event_id' => (int)config('v2board.renew_order_event_id', 0),
+                'change_order_event_id' => (int)config('v2board.change_order_event_id', 0),
+                'show_info_to_server_enable' => (int)config('v2board.show_info_to_server_enable', 0)
+            ],
+            'frontend' => [
+                'frontend_theme' => config('v2board.frontend_theme', 'v2board'),
+                'frontend_theme_sidebar' => config('v2board.frontend_theme_sidebar', 'light'),
+                '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'),
+            ],
+            'server' => [
+                'server_token' => config('v2board.server_token'),
+                'server_pull_interval' => config('v2board.server_pull_interval', 60),
+                'server_push_interval' => config('v2board.server_push_interval', 60),
+            ],
+            'email' => [
+                'email_template' => config('v2board.email_template', 'default'),
+                'email_host' => config('v2board.email_host'),
+                'email_port' => config('v2board.email_port'),
+                'email_username' => config('v2board.email_username'),
+                'email_password' => config('v2board.email_password'),
+                'email_encryption' => config('v2board.email_encryption'),
+                'email_from_address' => config('v2board.email_from_address')
+            ],
+            'telegram' => [
+                'telegram_bot_enable' => config('v2board.telegram_bot_enable', 0),
+                'telegram_bot_token' => config('v2board.telegram_bot_token'),
+                'telegram_discuss_link' => config('v2board.telegram_discuss_link')
+            ],
+            'app' => [
+                'windows_version' => config('v2board.windows_version'),
+                'windows_download_url' => config('v2board.windows_download_url'),
+                'macos_version' => config('v2board.macos_version'),
+                'macos_download_url' => config('v2board.macos_download_url'),
+                'android_version' => config('v2board.android_version'),
+                'android_download_url' => config('v2board.android_download_url')
+            ]
+        ];
+        if ($key && isset($data[$key])) {
+            return response([
+                'data' => [
+                    $key => $data[$key]
+                ]
+            ]);
+        };
         // TODO: default should be in Dict
         return response([
-            'data' => [
-                'invite' => [
-                    'invite_force' => (int)config('v2board.invite_force', 0),
-                    'invite_commission' => config('v2board.invite_commission', 10),
-                    'invite_gen_limit' => config('v2board.invite_gen_limit', 5),
-                    'invite_never_expire' => config('v2board.invite_never_expire', 0),
-                    'commission_first_time_enable' => config('v2board.commission_first_time_enable', 1),
-                    'commission_auto_check_enable' => config('v2board.commission_auto_check_enable', 1),
-                    'commission_withdraw_limit' => config('v2board.commission_withdraw_limit', 100),
-                    'commission_withdraw_method' => config('v2board.commission_withdraw_method', Dict::WITHDRAW_METHOD_WHITELIST_DEFAULT),
-                    'withdraw_close_enable' => config('v2board.withdraw_close_enable', 0),
-                    'commission_distribution_enable' => config('v2board.commission_distribution_enable', 0),
-                    'commission_distribution_l1' => config('v2board.commission_distribution_l1'),
-                    'commission_distribution_l2' => config('v2board.commission_distribution_l2'),
-                    'commission_distribution_l3' => config('v2board.commission_distribution_l3')
-                ],
-                'site' => [
-                    'safe_mode_enable' => (int)config('v2board.safe_mode_enable', 0),
-                    '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', '¥')
-                ],
-                'subscribe' => [
-                    'plan_change_enable' => (int)config('v2board.plan_change_enable', 1),
-                    'reset_traffic_method' => (int)config('v2board.reset_traffic_method', 0),
-                    'surplus_enable' => (int)config('v2board.surplus_enable', 1),
-                    'new_order_event_id' => (int)config('v2board.new_order_event_id', 0),
-                    'renew_order_event_id' => (int)config('v2board.renew_order_event_id', 0),
-                    'change_order_event_id' => (int)config('v2board.change_order_event_id', 0),
-                ],
-                'pay' => [
-                    // alipay
-                    'alipay_enable' => (int)config('v2board.alipay_enable'),
-                    'alipay_appid' => config('v2board.alipay_appid'),
-                    'alipay_pubkey' => config('v2board.alipay_pubkey'),
-                    'alipay_privkey' => config('v2board.alipay_privkey'),
-                    // stripe
-                    'stripe_alipay_enable' => (int)config('v2board.stripe_alipay_enable', 0),
-                    'stripe_wepay_enable' => (int)config('v2board.stripe_wepay_enable', 0),
-                    'stripe_card_enable' => (int)config('v2board.stripe_card_enable', 0),
-                    'stripe_sk_live' => config('v2board.stripe_sk_live'),
-                    'stripe_pk_live' => config('v2board.stripe_pk_live'),
-                    'stripe_webhook_key' => config('v2board.stripe_webhook_key'),
-                    'stripe_currency' => config('v2board.stripe_currency', 'hkd'),
-                    // bitpayx
-                    'bitpayx_name' => config('v2board.bitpayx_name', '在线支付'),
-                    'bitpayx_enable' => (int)config('v2board.bitpayx_enable', 0),
-                    'bitpayx_appsecret' => config('v2board.bitpayx_appsecret'),
-                    // mGate
-                    'mgate_name' => config('v2board.mgate_name', '在线支付'),
-                    'mgate_enable' => (int)config('v2board.mgate_enable', 0),
-                    'mgate_url' => config('v2board.mgate_url'),
-                    'mgate_app_id' => config('v2board.mgate_app_id'),
-                    'mgate_app_secret' => config('v2board.mgate_app_secret'),
-                    // Epay
-                    'epay_name' => config('v2board.epay_name', '在线支付'),
-                    'epay_enable' => (int)config('v2board.epay_enable', 0),
-                    'epay_url' => config('v2board.epay_url'),
-                    'epay_pid' => config('v2board.epay_pid'),
-                    'epay_key' => config('v2board.epay_key'),
-                ],
-                'frontend' => [
-                    'frontend_theme' => config('v2board.frontend_theme', 'v2board'),
-                    'frontend_theme_sidebar' => config('v2board.frontend_theme_sidebar', 'light'),
-                    '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'),
-                    'frontend_customer_service_method' => config('v2board.frontend_customer_service_method', 0),
-                    'frontend_customer_service_id' => config('v2board.frontend_customer_service_id'),
-                ],
-                'server' => [
-                    'server_token' => config('v2board.server_token'),
-                    'server_license' => config('v2board.server_license'),
-                    'server_log_enable' => config('v2board.server_log_enable', 0),
-                    'server_v2ray_domain' => config('v2board.server_v2ray_domain'),
-                    'server_v2ray_protocol' => config('v2board.server_v2ray_protocol'),
-                ],
-                'email' => [
-                    'email_template' => config('v2board.email_template', 'default'),
-                    'email_host' => config('v2board.email_host'),
-                    'email_port' => config('v2board.email_port'),
-                    'email_username' => config('v2board.email_username'),
-                    'email_password' => config('v2board.email_password'),
-                    'email_encryption' => config('v2board.email_encryption'),
-                    'email_from_address' => config('v2board.email_from_address')
-                ],
-                'telegram' => [
-                    'telegram_bot_enable' => config('v2board.telegram_bot_enable', 0),
-                    'telegram_bot_token' => config('v2board.telegram_bot_token'),
-                    'telegram_discuss_link' => config('v2board.telegram_discuss_link')
-                ],
-                'app' => [
-                    'windows_version' => config('v2board.windows_version'),
-                    'windows_download_url' => config('v2board.windows_download_url'),
-                    'macos_version' => config('v2board.macos_version'),
-                    'macos_download_url' => config('v2board.macos_download_url'),
-                    'android_version' => config('v2board.android_version'),
-                    'android_download_url' => config('v2board.android_download_url')
-                ]
-            ]
+            'data' => $data
         ]);
     }
 
     public function save(ConfigSave $request)
     {
         $data = $request->validated();
-        $array = \Config::get('v2board');
-        foreach ($data as $k => $v) {
-            if (!in_array($k, array_keys($request->validated()))) {
-                abort(500, '参数' . $k . '不在规则内，禁止修改');
+        $config = config('v2board');
+        foreach (ConfigSave::RULES as $k => $v) {
+            if (!in_array($k, array_keys(ConfigSave::RULES))) {
+                unset($config[$k]);
+                continue;
+            }
+            if (array_key_exists($k, $data)) {
+                $config[$k] = $data[$k];
             }
-            $array[$k] = $v;
         }
-        $data = var_export($array, 1);
-        if (!\File::put(base_path() . '/config/v2board.php', "<?php\n return $data ;")) {
+        $data = var_export($config, 1);
+        if (!File::put(base_path() . '/config/v2board.php', "<?php\n return $data ;")) {
             abort(500, '修改失败');
         }
         if (function_exists('opcache_reset')) {
@@ -207,7 +189,7 @@ class ConfigController extends Controller
                 abort(500, '缓存清除失败，请卸载或检查opcache配置状态');
             }
         }
-        \Artisan::call('config:cache');
+        Artisan::call('config:cache');
         return response([
             'data' => true
         ]);

app/Http/Controllers/Admin/CouponController.php

@@ -30,6 +30,25 @@ class CouponController extends Controller
         ]);
     }
 
+    public function show(Request $request)
+    {
+        if (empty($request->input('id'))) {
+            abort(500, '参数有误');
+        }
+        $coupon = Coupon::find($request->input('id'));
+        if (!$coupon) {
+            abort(500, '优惠券不存在');
+        }
+        $coupon->show = $coupon->show ? 0 : 1;
+        if (!$coupon->save()) {
+            abort(500, '保存失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
     public function generate(CouponGenerate $request)
     {
         if ($request->input('generate_count')) {
@@ -63,15 +82,22 @@ class CouponController extends Controller
         $coupons = [];
         $coupon = $request->validated();
         $coupon['created_at'] = $coupon['updated_at'] = time();
-        $coupon['limit_plan_ids'] = json_encode($coupon['limit_plan_ids']);
-        $coupon['limit_period'] = json_encode($coupon['limit_period']);
         unset($coupon['generate_count']);
         for ($i = 0;$i < $request->input('generate_count');$i++) {
             $coupon['code'] = Helper::randomChar(8);
             array_push($coupons, $coupon);
         }
         DB::beginTransaction();
-        if (!Coupon::insert($coupons)) {
+        if (!Coupon::insert(array_map(function ($item) use ($coupon) {
+            // format data
+            if (isset($item['limit_plan_ids']) && is_array($item['limit_plan_ids'])) {
+                $item['limit_plan_ids'] = json_encode($coupon['limit_plan_ids']);
+            }
+            if (isset($item['limit_period']) && is_array($item['limit_period'])) {
+                $item['limit_period'] = json_encode($coupon['limit_period']);
+            }
+            return $item;
+        }, $coupons))) {
             DB::rollBack();
             abort(500, '生成失败');
         }
@@ -84,7 +110,7 @@ class CouponController extends Controller
             $endTime = date('Y-m-d H:i:s', $coupon['ended_at']);
             $limitUse = $coupon['limit_use'] ?? '不限制';
             $createTime = date('Y-m-d H:i:s', $coupon['created_at']);
-            $limitPlanIds = implode("/", json_decode($coupon['limit_plan_ids'], true)) ?? '不限制';
+            $limitPlanIds = isset($coupon['limit_plan_ids']) ? implode("/", $coupon['limit_plan_ids']) : '不限制';
             $data .= "{$coupon['name']},{$type},{$value},{$startTime},{$endTime},{$limitUse},{$limitPlanIds},{$coupon['code']},{$createTime}\r\n";
         }
         echo $data;

app/Http/Controllers/Admin/NoticeController.php

@@ -22,7 +22,8 @@ class NoticeController extends Controller
         $data = $request->only([
             'title',
             'content',
-            'img_url'
+            'img_url',
+            'tags'
         ]);
         if (!$request->input('id')) {
             if (!Notice::create($data)) {
@@ -40,6 +41,27 @@ class NoticeController extends Controller
         ]);
     }
 
+
+
+    public function show(Request $request)
+    {
+        if (empty($request->input('id'))) {
+            abort(500, '参数有误');
+        }
+        $notice = Notice::find($request->input('id'));
+        if (!$notice) {
+            abort(500, '公告不存在');
+        }
+        $notice->show = $notice->show ? 0 : 1;
+        if (!$notice->save()) {
+            abort(500, '保存失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
     public function drop(Request $request)
     {
         if (empty($request->input('id'))) {

app/Http/Controllers/Admin/OrderController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin;
 use App\Http\Requests\Admin\OrderAssign;
 use App\Http\Requests\Admin\OrderUpdate;
 use App\Http\Requests\Admin\OrderFetch;
+use App\Models\CommissionLog;
 use App\Services\OrderService;
 use App\Services\UserService;
 use App\Utils\Helper;
@@ -36,6 +37,19 @@ class OrderController extends Controller
         }
     }
 
+    public function detail(Request $request)
+    {
+        $order = Order::find($request->input('id'));
+        if (!$order) abort(500, '订单不存在');
+        $order['commission_log'] = CommissionLog::where('trade_no', $order->trade_no)->get();
+        if ($order->surplus_order_ids) {
+            $order['surplus_orders'] = Order::whereIn('id', $order->surplus_order_ids)->get();
+        }
+        return response([
+            'data' => $order
+        ]);
+    }
+
     public function fetch(OrderFetch $request)
     {
         $current = $request->input('current') ? $request->input('current') : 1;

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,9 +25,14 @@ class PaymentController extends Controller
 
     public function fetch()
     {
-        $payments = Payment::all();
+        $payments = Payment::orderBy('sort', 'ASC')->get();
         foreach ($payments as $k => $v) {
-            $payments[$k]['notify_url'] = url("/api/v1/guest/payment/notify/{$v->payment}/{$v->uuid}");
+            $notifyUrl = url("/api/v1/guest/payment/notify/{$v->payment}/{$v->uuid}");
+            if ($v->notify_domain) {
+                $parseUrl = parse_url($notifyUrl);
+                $notifyUrl = $v->notify_domain . $parseUrl['path'];
+            }
+            $payments[$k]['notify_url'] = $notifyUrl;
         }
         return response([
             'data' => $payments
@@ -41,39 +47,52 @@ class PaymentController extends Controller
         ]);
     }
 
+    public function show(Request $request)
+    {
+        $payment = Payment::find($request->input('id'));
+        if (!$payment) abort(500, '支付方式不存在');
+        $payment->enable = !$payment->enable;
+        if (!$payment->save()) abort(500, '保存失败');
+        return response([
+            'data' => true
+        ]);
+    }
+
     public function save(Request $request)
     {
         if (!config('v2board.app_url')) {
             abort(500, '请在站点配置中配置站点地址');
         }
+        $params = $request->validate([
+            'name' => 'required',
+            'icon' => 'nullable',
+            'payment' => 'required',
+            'config' => 'required',
+            'notify_domain' => 'nullable|url',
+            'handling_fee_fixed' => 'nullable|integer',
+            'handling_fee_percent' => 'nullable|numeric|between:0.1,100'
+        ], [
+            'name.required' => '显示名称不能为空',
+            'payment.required' => '网关参数不能为空',
+            'config.required' => '配置参数不能为空',
+            'notify_domain.url' => '自定义通知域名格式有误',
+            'handling_fee_fixed.integer' => '固定手续费格式有误',
+            'handling_fee_percent.between' => '百分比手续费范围须在0.1-100之间'
+        ]);
         if ($request->input('id')) {
             $payment = Payment::find($request->input('id'));
             if (!$payment) abort(500, '支付方式不存在');
             try {
-                $payment->update($request->input());
+                $payment->update($params);
             } catch (\Exception $e) {
-                abort(500, '更新失败');
+                abort(500, $e->getMessage());
             }
             return response([
                 'data' => true
             ]);
         }
-        $request->validate([
-            'name' => 'required',
-            'payment' => 'required',
-            'config' => 'required'
-        ], [
-            'name.required' => '显示名称不能为空',
-            'payment.required' => '网关参数不能为空',
-            'config.required' => '配置参数不能为空'
-        ]);
-        if (!Payment::create([
-            'name' => $request->input('name'),
-            'icon' => $request->input('icon'),
-            'payment' => $request->input('payment'),
-            'config' => $request->input('config'),
-            'uuid' => Helper::randomChar(8)
-        ])) {
+        $params['uuid'] = Helper::randomChar(8);
+        if (!Payment::create($params)) {
             abort(500, '保存失败');
         }
         return response([
@@ -89,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,18 +17,7 @@ class PlanController extends Controller
 {
     public function fetch(Request $request)
     {
-
-        $counts = User::select(
-            DB::raw("plan_id"),
-            DB::raw("count(*) as count")
-        )
-            ->where('plan_id', '!=', NULL)
-            ->where(function ($query) {
-                $query->where('expired_at', '>=', time())
-                    ->orWhere('expired_at', NULL);
-            })
-            ->groupBy("plan_id")
-            ->get();
+        $counts = PlanService::countActiveUsers();
         $plans = Plan::orderBy('sort', 'ASC')->get();
         foreach ($plans as $k => $v) {
             $plans[$k]->count = 0;
@@ -51,10 +41,13 @@ class PlanController extends Controller
             DB::beginTransaction();
             // update user group id and transfer
             try {
-                User::where('plan_id', $plan->id)->update([
-                    'group_id' => $params['group_id'],
-                    'transfer_enable' => $params['transfer_enable'] * 1073741824
-                ]);
+                if ($request->input('force_update')) {
+                    User::where('plan_id', $plan->id)->update([
+                        'group_id' => $params['group_id'],
+                        'transfer_enable' => $params['transfer_enable'] * 1073741824,
+                        'speed_limit' => $params['speed_limit']
+                    ]);
+                }
                 $plan->update($params);
             } catch (\Exception $e) {
                 DB::rollBack();

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

@@ -0,0 +1,57 @@
+<?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();
+        return [
+            'data' => $routes
+        ];
+    }
+
+    public function save(Request $request)
+    {
+        $params = $request->validate([
+            'remarks' => 'required',
+            'match' => 'required',
+            'action' => 'required',
+            'action_value' => 'nullable'
+        ]);
+        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/V2rayController.php

@@ -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,8 +2,10 @@
 
 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;
@@ -31,9 +33,9 @@ class StatController extends Controller
                 'month_register_total' => User::where('created_at', '>=', strtotime(date('Y-m-1')))
                     ->where('created_at', '<', time())
                     ->count(),
-                'ticket_pendding_total' => Ticket::where('status', 0)
+                'ticket_pending_total' => Ticket::where('status', 0)
                     ->count(),
-                'commission_pendding_total' => Order::where('commission_status', 0)
+                'commission_pending_total' => Order::where('commission_status', 0)
                     ->where('invite_user_id', '!=', NULL)
                     ->whereNotIn('status', [0, 2])
                     ->where('commission_balance', '>', 0)
@@ -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'),
             ]
         ]);
     }
@@ -71,12 +79,12 @@ class StatController extends Controller
                 'value' => $statistic['order_count']
             ]);
             array_push($result, [
-                'type' => '佣金金额',
+                'type' => '佣金金额(已发放)',
                 'date' => $date,
                 'value' => $statistic['commission_amount'] / 100
             ]);
             array_push($result, [
-                'type' => '佣金笔数',
+                'type' => '佣金笔数(已发放)',
                 'date' => $date,
                 'value' => $statistic['commission_count']
             ]);
@@ -91,10 +99,11 @@ class StatController extends Controller
     {
         $servers = [
             'shadowsocks' => ServerShadowsocks::where('parent_id', null)->get()->toArray(),
-            'vmess' => ServerV2ray::where('parent_id', null)->get()->toArray(),
+            'v2ray' => ServerV2ray::where('parent_id', null)->get()->toArray(),
             'trojan' => ServerTrojan::where('parent_id', null)->get()->toArray()
         ];
-        $timestamp = strtotime('-1 day', strtotime(date('Y-m-d')));
+        $startAt = strtotime('-1 day', strtotime(date('Y-m-d')));
+        $endAt = strtotime(date('Y-m-d'));
         $statistics = StatServer::select([
                 'server_id',
                 'server_type',
@@ -102,7 +111,8 @@ class StatController extends Controller
                 'd',
                 DB::raw('(u+d) as total')
             ])
-            ->where('record_at', '>=', $timestamp)
+            ->where('record_at', '>=', $startAt)
+            ->where('record_at', '<', $endAt)
             ->where('record_type', 'd')
             ->limit(10)
             ->orderBy('total', 'DESC')
@@ -121,5 +131,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

@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Models\ServerShadowsocks;
+use App\Models\ServerTrojan;
+use App\Services\ServerService;
+use App\Utils\CacheKey;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\ServerGroup;
+use App\Models\ServerV2ray;
+use App\Models\Plan;
+use App\Models\User;
+use App\Models\Ticket;
+use App\Models\Order;
+use App\Models\StatOrder;
+use App\Models\StatServer;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Http;
+use Laravel\Horizon\Contracts\JobRepository;
+use Laravel\Horizon\Contracts\MasterSupervisorRepository;
+use Laravel\Horizon\Contracts\MetricsRepository;
+use Laravel\Horizon\Contracts\SupervisorRepository;
+use Laravel\Horizon\Contracts\WorkloadRepository;
+use Laravel\Horizon\WaitTimeCalculator;
+
+class SystemController extends Controller
+{
+    public function getSystemStatus()
+    {
+        return response([
+            'data' => [
+                'schedule' => $this->getScheduleStatus(),
+                'horizon' => $this->getHorizonStatus()
+            ]
+        ]);
+    }
+
+    public function getQueueWorkload(WorkloadRepository $workload)
+    {
+        return response([
+            'data' => collect($workload->get())->sortBy('name')->values()->toArray()
+        ]);
+    }
+
+    protected function getScheduleStatus():bool
+    {
+        return (time() - 120) < Cache::get(CacheKey::get('SCHEDULE_LAST_CHECK_AT', null));
+    }
+
+    protected function getHorizonStatus():bool
+    {
+        if (! $masters = app(MasterSupervisorRepository::class)->all()) {
+            return false;
+        }
+
+        return collect($masters)->contains(function ($master) {
+            return $master->status === 'paused';
+        }) ? false : true;
+    }
+
+    public function getQueueStats()
+    {
+        return response([
+            'data' => [
+                'failedJobs' => app(JobRepository::class)->countRecentlyFailed(),
+                'jobsPerMinute' => app(MetricsRepository::class)->jobsProcessedPerMinute(),
+                'pausedMasters' => $this->totalPausedMasters(),
+                'periods' => [
+                    'failedJobs' => config('horizon.trim.recent_failed', config('horizon.trim.failed')),
+                    'recentJobs' => config('horizon.trim.recent'),
+                ],
+                'processes' => $this->totalProcessCount(),
+                'queueWithMaxRuntime' => app(MetricsRepository::class)->queueWithMaximumRuntime(),
+                'queueWithMaxThroughput' => app(MetricsRepository::class)->queueWithMaximumThroughput(),
+                'recentJobs' => app(JobRepository::class)->countRecent(),
+                'status' => $this->getHorizonStatus(),
+                'wait' => collect(app(WaitTimeCalculator::class)->calculate())->take(1),
+            ]
+        ]);
+    }
+
+    /**
+     * Get the total process count across all supervisors.
+     *
+     * @return int
+     */
+    protected function totalProcessCount()
+    {
+        $supervisors = app(SupervisorRepository::class)->all();
+
+        return collect($supervisors)->reduce(function ($carry, $supervisor) {
+            return $carry + collect($supervisor->processes)->sum();
+        }, 0);
+    }
+
+    /**
+     * Get the number of master supervisors that are currently paused.
+     *
+     * @return int
+     */
+    protected function totalPausedMasters()
+    {
+        if (! $masters = app(MasterSupervisorRepository::class)->all()) {
+            return 0;
+        }
+
+        return collect($masters)->filter(function ($master) {
+            return $master->status === 'paused';
+        })->count();
+    }
+}
+

app/Http/Controllers/Admin/ThemeController.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Services\ThemeService;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Http\Request;
+
+class ThemeController extends Controller
+{
+    private $themes;
+    private $path;
+
+    public function __construct()
+    {
+        $this->path = $path = public_path('theme/');
+        $this->themes = array_map(function ($item) use ($path) {
+            return str_replace($path, '', $item);
+        }, glob($path . '*'));
+    }
+
+    public function getThemes()
+    {
+        $themeConfigs = [];
+        foreach ($this->themes as $theme) {
+            $themeConfigFile = $this->path . "{$theme}/config.php";
+            if (!File::exists($themeConfigFile)) continue;
+            $themeConfig = include($themeConfigFile);
+            if (!isset($themeConfig['configs']) || !is_array($themeConfig)) continue;
+            $themeConfigs[$theme] = $themeConfig;
+            if (config("theme.{$theme}")) continue;
+            $themeService = new ThemeService($theme);
+            $themeService->init();
+        }
+        return response([
+            'data' => [
+                'themes' => $themeConfigs,
+                'active' => config('v2board.frontend_theme', 'v2board')
+            ]
+        ]);
+    }
+
+    public function getThemeConfig(Request $request)
+    {
+        $payload = $request->validate([
+            'name' => 'required|in:' . join(',', $this->themes)
+        ]);
+        return response([
+            'data' => config("theme.{$payload['name']}")
+        ]);
+    }
+
+    public function saveThemeConfig(Request $request)
+    {
+        $payload = $request->validate([
+            'name' => 'required|in:' . join(',', $this->themes),
+            'config' => 'required'
+        ]);
+        $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");
+        if (!File::exists($themeConfigFile)) abort(500, '主题不存在');
+        $themeConfig = include($themeConfigFile);
+        $validateFields = array_column($themeConfig['configs'], 'field_name');
+        $config = [];
+        foreach ($validateFields as $validateField) {
+            $config[$validateField] = isset($payload['config'][$validateField]) ? $payload['config'][$validateField] : '';
+        }
+
+        File::ensureDirectoryExists(base_path() . '/config/theme/');
+
+        $data = var_export($config, 1);
+        if (!File::put(base_path() . "/config/theme/{$payload['name']}.php", "<?php\n return $data ;")) {
+            abort(500, '修改失败');
+        }
+
+        try {
+            Artisan::call('config:cache');
+//            sleep(2);
+        } catch (\Exception $e) {
+            abort(500, '保存失败');
+        }
+
+        return response([
+            'data' => $config
+        ]);
+    }
+}

app/Http/Controllers/Admin/TicketController.php

@@ -36,20 +36,20 @@ class TicketController extends Controller
         }
         $current = $request->input('current') ? $request->input('current') : 1;
         $pageSize = $request->input('pageSize') >= 10 ? $request->input('pageSize') : 10;
-        $model = Ticket::orderBy('created_at', 'DESC');
+        $model = Ticket::orderBy('updated_at', 'DESC');
         if ($request->input('status') !== NULL) {
             $model->where('status', $request->input('status'));
         }
+        if ($request->input('reply_status') !== NULL) {
+            $model->whereIn('reply_status', $request->input('reply_status'));
+        }
+        if ($request->input('email') !== NULL) {
+            $user = User::where('email', $request->input('email'))->first();
+            if ($user) $model->where('user_id', $user->id);
+        }
         $total = $model->count();
         $res = $model->forPage($current, $pageSize)
             ->get();
-        for ($i = 0; $i < count($res); $i++) {
-            if ($res[$i]['last_reply_user_id'] == $request->session()->get('id')) {
-                $res[$i]['reply_status'] = 0;
-            } else {
-                $res[$i]['reply_status'] = 1;
-            }
-        }
         return response([
             'data' => $res,
             'total' => $total
@@ -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

@@ -58,7 +58,11 @@ class UserController extends Controller
         $pageSize = $request->input('pageSize') >= 10 ? $request->input('pageSize') : 10;
         $sortType = in_array($request->input('sort_type'), ['ASC', 'DESC']) ? $request->input('sort_type') : 'DESC';
         $sort = $request->input('sort') ? $request->input('sort') : 'created_at';
-        $userModel = User::orderBy($sort, $sortType);
+        $userModel = User::select(
+            DB::raw('*'),
+            DB::raw('(u+d) as total_used')
+        )
+            ->orderBy($sort, $sortType);
         $this->filter($request, $userModel);
         $total = $userModel->count();
         $res = $userModel->forPage($current, $pageSize)
@@ -70,7 +74,7 @@ class UserController extends Controller
                     $res[$i]['plan_name'] = $plan[$k]['name'];
                 }
             }
-            $res[$i]['subscribe_url'] = Helper::getSubscribeHost() . '/api/v1/client/subscribe?token=' . $res[$i]['token'];
+            $res[$i]['subscribe_url'] = Helper::getSubscribeUrl('/api/v1/client/subscribe?token=' . $res[$i]['token']);
         }
         return response([
             'data' => $res,
@@ -149,7 +153,6 @@ class UserController extends Controller
         }
 
         $data = "邮箱,余额,推广佣金,总流量,剩余流量,套餐到期时间,订阅计划,订阅地址\r\n";
-        $baseUrl = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL')));
         foreach($res as $user) {
             $expireDate = $user['expired_at'] === NULL ? '长期有效' : date('Y-m-d H:i:s', $user['expired_at']);
             $balance = $user['balance'] / 100;
@@ -157,7 +160,7 @@ class UserController extends Controller
             $transferEnable = $user['transfer_enable'] ? $user['transfer_enable'] / 1073741824 : 0;
             $notUseFlow = (($user['transfer_enable'] - ($user['u'] + $user['d'])) / 1073741824) ?? 0;
             $planName = $user['plan_name'] ?? '无订阅';
-            $subscribeUrl = $baseUrl . '/api/v1/client/subscribe?token=' . $user['token'];
+            $subscribeUrl = Helper::getSubscribeUrl('/api/v1/client/subscribe?token=' . $user['token']);
             $data .= "{$user['email']},{$balance},{$commissionBalance},{$transferEnable},{$notUseFlow},{$expireDate},{$planName},{$subscribeUrl}\r\n";
         }
         echo "\xEF\xBB\xBF" . $data;
@@ -228,12 +231,11 @@ class UserController extends Controller
         }
         DB::commit();
         $data = "账号,密码,过期时间,UUID,创建时间,订阅地址\r\n";
-        $baseUrl = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL')));
         foreach($users as $user) {
             $expireDate = $user['expired_at'] === NULL ? '长期有效' : date('Y-m-d H:i:s', $user['expired_at']);
             $createDate = date('Y-m-d H:i:s', $user['created_at']);
             $password = $request->input('password') ?? $user['email'];
-            $subscribeUrl = $baseUrl . '/api/v1/client/subscribe?token=' . $user['token'];
+            $subscribeUrl = Helper::getSubscribeUrl('/api/v1/client/subscribe?token=' . $user['token']);
             $data .= "{$user['email']},{$password},{$expireDate},{$user['uuid']},{$createDate},{$subscribeUrl}\r\n";
         }
         echo $data;

app/Http/Controllers/Client/AppController.php

@@ -13,10 +13,6 @@ use Symfony\Component\Yaml\Yaml;
 
 class AppController extends Controller
 {
-    CONST CLIENT_CONFIG = '{"policy":{"levels":{"0":{"uplinkOnly":0}}},"dns":{"servers":["114.114.114.114","8.8.8.8"]},"outboundDetour":[{"protocol":"freedom","tag":"direct","settings":{}}],"inbound":{"listen":"0.0.0.0","port":31211,"protocol":"socks","settings":{"auth":"noauth","udp":true,"ip":"127.0.0.1"}},"inboundDetour":[{"listen":"0.0.0.0","allocate":{"strategy":"always","refresh":5,"concurrency":3},"port":31210,"protocol":"http","tag":"httpDetour","domainOverride":["http","tls"],"streamSettings":{},"settings":{"timeout":0}}],"routing":{"strategy":"rules","settings":{"domainStrategy":"IPIfNonMatch","rules":[{"type":"field","ip":["geoip:cn"],"outboundTag":"direct"},{"type":"field","ip":["0.0.0.0/8","10.0.0.0/8","100.64.0.0/10","127.0.0.0/8","169.254.0.0/16","172.16.0.0/12","192.0.0.0/24","192.0.2.0/24","192.168.0.0/16","198.18.0.0/15","198.51.100.0/24","203.0.113.0/24","::1/128","fc00::/7","fe80::/10"],"outboundTag":"direct"}]}},"outbound":{"tag":"proxy","sendThrough":"0.0.0.0","mux":{"enabled":false,"concurrency":8},"protocol":"vmess","settings":{"vnext":[{"address":"server","port":443,"users":[{"id":"uuid","alterId":2,"security":"auto","level":0}],"remark":"remark"}]},"streamSettings":{"network":"tcp","tcpSettings":{"header":{"type":"none"}},"security":"none","tlsSettings":{"allowInsecure":true,"allowInsecureCiphers":true},"kcpSettings":{"header":{"type":"none"},"mtu":1350,"congestion":false,"tti":20,"uplinkCapacity":5,"writeBufferSize":1,"readBufferSize":1,"downlinkCapacity":20},"wsSettings":{"path":"","headers":{"Host":"server.cc"}}}}}';
-    CONST SOCKS_PORT = 10010;
-    CONST HTTP_PORT = 10011;
-
     public function getConfig(Request $request)
     {
         $servers = [];
@@ -37,7 +33,14 @@ 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']);
             }

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.
@@ -23,6 +21,7 @@ class ClientController extends Controller
         if ($userService->isAvailable($user)) {
             $serverService = new ServerService();
             $servers = $serverService->getAvailableServers($user);
+            $this->setSubscribeInfoToServers($servers, $user);
             if ($flag) {
                 foreach (glob(app_path('Http//Controllers//Client//Protocols') . '/*.php') as $file) {
                     $file = 'App\\Http\\Controllers\\Client\\Protocols\\' . basename($file, '.php');
@@ -38,4 +37,26 @@ class ClientController extends Controller
             die('该客户端暂不支持进行订阅');
         }
     }
+
+    private function setSubscribeInfoToServers(&$servers, $user)
+    {
+        if (!(int)config('v2board.show_info_to_server_enable', 0)) return;
+        $useTraffic = round($user['u'] / (1024*1024*1024), 2) + round($user['d'] / (1024*1024*1024), 2);
+        $totalTraffic = round($user['transfer_enable'] / (1024*1024*1024), 2);
+        $remainingTraffic = $totalTraffic - $useTraffic;
+        $expiredDate = $user['expired_at'] ? date('Y-m-d', $user['expired_at']) : '长期有效';
+        $userService = new UserService();
+        $resetDay = $userService->getResetDay($user);
+        array_unshift($servers, array_merge($servers[0], [
+            'name' => "套餐到期：{$expiredDate}",
+        ]));
+        if ($resetDay) {
+            array_unshift($servers, array_merge($servers[0], [
+                'name' => "距离下次重置剩余：{$resetDay} 天",
+            ]));
+        }
+        array_unshift($servers, array_merge($servers[0], [
+            'name' => "剩余流量：{$remainingTraffic} GB",
+        ]));
+    }
 }

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
@@ -23,7 +25,8 @@ class Clash
         $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: filename={$appName}");
+        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)) {
@@ -35,7 +38,14 @@ class Clash
         $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']);
             }
@@ -51,20 +61,21 @@ class Clash
 
         $config['proxies'] = array_merge($config['proxies'] ? $config['proxies'] : [], $proxy);
         foreach ($config['proxy-groups'] as $k => $v) {
-            if (!is_array($config['proxy-groups'][$k]['proxies'])) continue;
+            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)) {
-                        $isFilter = true;
-                        $config['proxy-groups'][$k]['proxies'] = array_diff($config['proxy-groups'][$k]['proxies'], [$src]);
                         array_push($config['proxy-groups'][$k]['proxies'], $dst);
                     }
                 }
+                if ($isFilter) continue;
             }
-            if (!$isFilter) {
-                $config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
-            }
+            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['SERVER_NAME'];
@@ -97,7 +108,7 @@ class Clash
         $array['server'] = $server['host'];
         $array['port'] = $server['port'];
         $array['uuid'] = $uuid;
-        $array['alterId'] = $server['alter_id'];
+        $array['alterId'] = 0;
         $array['cipher'] = 'auto';
         $array['udp'] = true;
 
@@ -115,6 +126,11 @@ class Clash
             $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']))
@@ -124,9 +140,9 @@ class Clash
         if ($server['network'] === 'grpc') {
             $array['network'] = 'grpc';
             if ($server['networkSettings']) {
-                $grpcObject = $server['networkSettings'];
+                $grpcSettings = $server['networkSettings'];
                 $array['grpc-opts'] = [];
-                $array['grpc-opts']['grpc-service-name'] = $grpcObject['serviceName'];
+                if (isset($grpcSettings['serviceName'])) $array['grpc-opts']['grpc-service-name'] = $grpcSettings['serviceName'];
             }
         }
 
@@ -149,10 +165,11 @@ class Clash
 
     private function isMatch($exp, $str)
     {
-        try {
-            return preg_match($exp, $str);
-        } catch (\Exception $e) {
-            return false;
-        }
+        return @preg_match($exp, $str);
+    }
+
+    private function isRegex($exp)
+    {
+        return @preg_match($exp, null) !== false;
     }
 }

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

@@ -54,7 +54,7 @@ class Passwall
             "add" => $server['host'],
             "port" => (string)$server['port'],
             "id" => $uuid,
-            "aid" => (string)$server['alter_id'],
+            "aid" => '0',
             "net" => $server['network'],
             "type" => "none",
             "host" => "",

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

@@ -54,7 +54,7 @@ class SSRPlus
             "add" => $server['host'],
             "port" => (string)$server['port'],
             "id" => $uuid,
-            "aid" => (string)$server['alter_id'],
+            "aid" => '0',
             "net" => $server['network'],
             "type" => "none",
             "host" => "",

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

@@ -2,9 +2,9 @@
 
 namespace App\Http\Controllers\Client\Protocols;
 
-class AnXray
+class SagerNet
 {
-    public $flag = 'axxray';
+    public $flag = 'sagernet';
     private $servers;
     private $user;
 
@@ -74,7 +74,7 @@ class AnXray
         }
         if ((string)$server['network'] === 'ws') {
             $wsSettings = $server['networkSettings'];
-            if (isset($wsSettings['path'])) $config['path'] = urlencode($wsSettings['path']);
+            if (isset($wsSettings['path'])) $config['path'] = $wsSettings['path'];
             if (isset($wsSettings['headers']['Host'])) $config['host'] = urlencode($wsSettings['headers']['Host']);
         }
         if ((string)$server['network'] === 'grpc') {

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';
@@ -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(
             ['+', '/', '='],
@@ -58,7 +70,7 @@ class Shadowrocket
         $config = [
             'tfo' => 1,
             'remark' => $server['name'],
-            'alterId' => $server['alter_id']
+            'alterId' => 0
         ];
         if ($server['tls']) {
             $config['tls'] = 1;

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'])
+            ) {
                 array_push($configs, self::SIP008($item, $user));
             }
         }

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

@@ -23,7 +23,7 @@ class Stash
         $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: filename={$appName}");
+        header("content-disposition: filename*=UTF-8''".rawurlencode($appName));
         // 暂时使用clash配置文件，后续根据Stash更新情况更新
         $defaultConfig = base_path() . '/resources/rules/default.clash.yaml';
         $customConfig = base_path() . '/resources/rules/custom.clash.yaml';
@@ -36,7 +36,14 @@ 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']);
             }
@@ -56,16 +63,17 @@ class Stash
             $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)) {
-                        $isFilter = true;
-                        $config['proxy-groups'][$k]['proxies'] = array_diff($config['proxy-groups'][$k]['proxies'], [$src]);
                         array_push($config['proxy-groups'][$k]['proxies'], $dst);
                     }
                 }
+                if ($isFilter) continue;
             }
-            if (!$isFilter) {
-                $config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
-            }
+            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['SERVER_NAME'];
@@ -98,7 +106,7 @@ class Stash
         $array['server'] = $server['host'];
         $array['port'] = $server['port'];
         $array['uuid'] = $uuid;
-        $array['alterId'] = $server['alter_id'];
+        $array['alterId'] = 0;
         $array['cipher'] = 'auto';
         $array['udp'] = true;
 
@@ -116,6 +124,11 @@ class Stash
             $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']))
@@ -125,9 +138,9 @@ class Stash
         if ($server['network'] === 'grpc') {
             $array['network'] = 'grpc';
             if ($server['networkSettings']) {
-                $grpcObject = $server['networkSettings'];
+                $grpcSettings = $server['networkSettings'];
                 $array['grpc-opts'] = [];
-                $array['grpc-opts']['grpc-service-name'] = $grpcObject['serviceName'];
+                if (isset($grpcSettings['serviceName']))  $array['grpc-opts']['grpc-service-name'] = $grpcSettings['serviceName'];
             }
         }
 
@@ -148,6 +161,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

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Client\Protocols;
 
+use App\Utils\Helper;
 
 class Surfboard
 {
@@ -20,11 +21,21 @@ 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]
@@ -53,7 +64,7 @@ class Surfboard
         }
 
         // Subscription link
-        $subsURL = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user['token'];
+        $subsURL = Helper::getSubscribeUrl("/api/v1/client/subscribe?token={$user['token']}");
         $subsDomain = $_SERVER['SERVER_NAME'];
 
         $config = str_replace('$subs_link', $subsURL, $config);
@@ -88,6 +99,7 @@ class Surfboard
             "{$server['host']}",
             "{$server['port']}",
             "username={$uuid}",
+            "vmess-aead=true",
             'tfo=true',
             'udp-relay=true'
         ];

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

@@ -2,6 +2,8 @@
 
 namespace App\Http\Controllers\Client\Protocols;
 
+use App\Utils\Helper;
+
 class Surge
 {
     public $flag = 'surge';
@@ -19,11 +21,21 @@ 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]
@@ -52,6 +64,7 @@ class Surge
         }
 
         // Subscription link
+        $subsURL = Helper::getSubscribeUrl("/api/v1/client/subscribe?token={$user['token']}");
         $subsDomain = $_SERVER['SERVER_NAME'];
         $subsURL = 'https://' . $subsDomain . '/api/v1/client/subscribe?token=' . $user['token'];
 
@@ -87,6 +100,7 @@ class Surge
             "{$server['host']}",
             "{$server['port']}",
             "username={$uuid}",
+            "vmess-aead=true",
             'tfo=true',
             'udp-relay=true'
         ];

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

@@ -54,7 +54,7 @@ class V2rayN
             "add" => $server['host'],
             "port" => (string)$server['port'],
             "id" => $uuid,
-            "aid" => (string)$server['alter_id'],
+            "aid" => '0',
             "net" => $server['network'],
             "type" => "none",
             "host" => "",

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

@@ -54,7 +54,7 @@ class V2rayNG
             "add" => $server['host'],
             "port" => (string)$server['port'],
             "id" => $uuid,
-            "aid" => (string)$server['alter_id'],
+            "aid" => '0',
             "net" => $server['network'],
             "type" => "none",
             "host" => "",

app/Http/Controllers/Guest/CommController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Guest;
 
 use App\Utils\Dict;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Http;
 
 class CommController extends Controller
 {
@@ -20,7 +21,21 @@ class CommController extends Controller
                 'is_recaptcha' => (int)config('v2board.recaptcha_enable', 0) ? 1 : 0,
                 'recaptcha_site_key' => config('v2board.recaptcha_site_key'),
                 'app_description' => config('v2board.app_description'),
-                'app_url' => config('v2board.app_url')
+                'app_url' => config('v2board.app_url'),
+                'logo' => config('v2board.logo'),
+
+                // TODO:REMOVE:1.7.0
+
+                'tosUrl' => config('v2board.tos_url'),
+                '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'),
             ]
         ]);
     }

app/Http/Controllers/Guest/PaymentController.php

@@ -20,7 +20,7 @@ class PaymentController extends Controller
             if (!$this->handle($verify['trade_no'], $verify['callback_no'])) {
                 abort(500, 'handle error');
             }
-            die(isset($paymentService->customResult) ? $paymentService->customResult : 'success');
+            die(isset($verify['custom_result']) ? $verify['custom_result'] : 'success');
         } catch (\Exception $e) {
             abort(500, 'fail');
         }
@@ -32,7 +32,7 @@ class PaymentController extends Controller
         if (!$order) {
             abort(500, 'order is not found');
         }
-        if ($order->status === 1) return true;
+        if ($order->status !== 0) return true;
         $orderService = new OrderService($order);
         if (!$orderService->paid($callbackNo)) {
             return false;

app/Http/Controllers/Guest/TelegramController.php

@@ -5,196 +5,119 @@ namespace App\Http\Controllers\Guest;
 use App\Services\TelegramService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use App\Models\User;
-use App\Utils\Helper;
-use App\Services\TicketService;
 
 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(500, 'authentication failed');
+            abort(401);
         }
+
+        $this->telegramService = new TelegramService();
     }
 
     public function webhook(Request $request)
     {
-        $this->msg = $this->getMessage($request->input());
+        $this->formatMessage($request->input());
+        $this->formatChatJoinRequest($request->input());
+        $this->handle();
+    }
+
+    public function handle()
+    {
         if (!$this->msg) return;
+        $msg = $this->msg;
+        $commandName = explode('@', $msg->command);
+
+        // To reduce request, only commands contains @ will get the bot name
+        if (count($commandName) == 2) {
+            $botName = $this->getBotName();
+            if ($commandName[1] === $botName){
+                $msg->command = $commandName[0];
+            }
+        }
+
         try {
-            switch($this->msg->message_type) {
-                case 'send':
-                    $this->fromSend();
-                    break;
-                case 'reply':
-                    $this->fromReply();
-                    break;
+            foreach (glob(base_path('app//Plugins//Telegram//Commands') . '/*.php') as $file) {
+                $command = basename($file, '.php');
+                $class = '\\App\\Plugins\\Telegram\\Commands\\' . $command;
+                if (!class_exists($class)) continue;
+                $instance = new $class();
+                if ($msg->message_type === 'message') {
+                    if (!isset($instance->command)) continue;
+                    if ($msg->command !== $instance->command) continue;
+                    $instance->handle($msg);
+                    return;
+                }
+                if ($msg->message_type === 'reply_message') {
+                    if (!isset($instance->regex)) continue;
+                    if (!preg_match($instance->regex, $msg->reply_text, $match)) continue;
+                    $instance->handle($msg, $match);
+                    return;
+                }
             }
         } catch (\Exception $e) {
-            $telegramService = new TelegramService();
-            $telegramService->sendMessage($this->msg->chat_id, $e->getMessage());
+            $this->telegramService->sendMessage($msg->chat_id, $e->getMessage());
         }
     }
 
-    private function fromSend()
+    public function getBotName()
     {
-        switch($this->msg->command) {
-            case '/bind': $this->bind();
-                break;
-            case '/traffic': $this->traffic();
-                break;
-            case '/getlatesturl': $this->getLatestUrl();
-                break;
-            case '/unbind': $this->unbind();
-                break;
-            default: $this->help();
-        }
+        $response = $this->telegramService->getMe();
+        return $response->result->username;
     }
 
-    private function fromReply()
+    private function formatMessage(array $data)
     {
-        // ticket
-        if (preg_match("/[#](.*)/", $this->msg->reply_text, $match)) {
-            $this->replayTicket($match[1]);
-        }
-    }
-
-    private function getMessage(array $data)
-    {
-        if (!isset($data['message'])) return false;
+        if (!isset($data['message'])) return;
+        if (!isset($data['message']['text'])) return;
         $obj = new \StdClass();
-        $obj->is_private = $data['message']['chat']['type'] === 'private' ? true : false;
-        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']) ? 'send' : 'reply';
+        $obj->message_type = 'message';
         $obj->text = $data['message']['text'];
-        if ($obj->message_type === 'reply') {
+        $obj->is_private = $data['message']['chat']['type'] === 'private';
+        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 bind()
+    private function formatChatJoinRequest(array $data)
     {
-        $msg = $this->msg;
-        if (!$msg->is_private) return;
-        if (!isset($msg->args[0])) {
-            abort(500, '参数有误，请携带订阅地址发送');
-        }
-        $subscribeUrl = $msg->args[0];
-        $subscribeUrl = parse_url($subscribeUrl);
-        parse_str($subscribeUrl['query'], $query);
-        $token = $query['token'];
-        if (!$token) {
-            abort(500, '订阅地址无效');
-        }
-        $user = User::where('token', $token)->first();
+        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) {
-            abort(500, '用户不存在');
-        }
-        if ($user->telegram_id) {
-            abort(500, '该账号已经绑定了Telegram账号');
-        }
-        $user->telegram_id = $msg->chat_id;
-        if (!$user->save()) {
-            abort(500, '设置失败');
-        }
-        $telegramService = new TelegramService();
-        $telegramService->sendMessage($msg->chat_id, '绑定成功');
-    }
-
-    private function unbind()
-    {
-        $msg = $this->msg;
-        if (!$msg->is_private) return;
-        $user = User::where('telegram_id', $msg->chat_id)->first();
-        $telegramService = new TelegramService();
-        if (!$user) {
-            $this->help();
-            $telegramService->sendMessage($msg->chat_id, '没有查询到您的用户信息，请先绑定账号', 'markdown');
-            return;
-        }
-        $user->telegram_id = NULL;
-        if (!$user->save()) {
-            abort(500, '解绑失败');
-        }
-        $telegramService->sendMessage($msg->chat_id, '解绑成功', 'markdown');
-    }
-
-    private function help()
-    {
-        $msg = $this->msg;
-        if (!$msg->is_private) return;
-        $telegramService = new TelegramService();
-        $commands = [
-            '/bind 订阅地址 - 绑定你的' . config('v2board.app_name', 'V2Board') . '账号',
-            '/traffic - 查询流量信息',
-            '/getlatesturl - 获取最新的' . config('v2board.app_name', 'V2Board') . '网址',
-            '/unbind - 解除绑定'
-        ];
-        $text = implode(PHP_EOL, $commands);
-        $telegramService->sendMessage($msg->chat_id, "你可以使用以下命令进行操作：\n\n$text", 'markdown');
-    }
-
-    private function traffic()
-    {
-        $msg = $this->msg;
-        if (!$msg->is_private) return;
-        $user = User::where('telegram_id', $msg->chat_id)->first();
-        $telegramService = new TelegramService();
-        if (!$user) {
-            $this->help();
-            $telegramService->sendMessage($msg->chat_id, '没有查询到您的用户信息，请先绑定账号', 'markdown');
-            return;
-        }
-        $transferEnable = Helper::trafficConvert($user->transfer_enable);
-        $up = Helper::trafficConvert($user->u);
-        $down = Helper::trafficConvert($user->d);
-        $remaining = Helper::trafficConvert($user->transfer_enable - ($user->u + $user->d));
-        $text = "🚥流量查询\n———————————————\n计划流量：`{$transferEnable}`\n已用上行：`{$up}`\n已用下行：`{$down}`\n剩余流量：`{$remaining}`";
-        $telegramService->sendMessage($msg->chat_id, $text, 'markdown');
-    }
-
-    private function getLatestUrl()
-    {
-        $msg = $this->msg;
-        $user = User::where('telegram_id', $msg->chat_id)->first();
-        $telegramService = new TelegramService();
-        $text = sprintf(
-            "%s的最新网址是：%s",
-            config('v2board.app_name', 'V2Board'),
-            config('v2board.app_url')
-        );
-        $telegramService->sendMessage($msg->chat_id, $text, 'markdown');
-    }
-
-    private function replayTicket($ticketId)
-    {
-        $msg = $this->msg;
-        if (!$msg->is_private) return;
-        $user = User::where('telegram_id', $msg->chat_id)->first();
-        if (!$user) {
-            abort(500, '用户不存在');
-        }
-        $ticketService = new TicketService();
-        if ($user->is_admin || $user->is_staff) {
-            $ticketService->replyByAdmin(
-                $ticketId,
-                $msg->text,
-                $user->id
+            $this->telegramService->declineChatJoinRequest(
+                $data['chat_join_request']['chat']['id'],
+                $data['chat_join_request']['from']['id']
             );
+            return;
         }
-        $telegramService = new TelegramService();
-        $telegramService->sendMessage($msg->chat_id, "#`{$ticketId}` 的工单已回复成功", 'markdown');
-        $telegramService->sendMessageWithAdmin("#`{$ticketId}` 的工单已由 {$user->email} 进行回复", true);
+        $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,8 +20,69 @@ 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',
+            '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 :minute minute', [
+                    'minute' => config('v2board.register_limit_expire', 60)
+                ]));
+            }
+        }
         if ((int)config('v2board.recaptcha_enable', 0)) {
             $recaptcha = new ReCaptcha(config('v2board.recaptcha_key'));
             $recaptchaResp = $recaptcha->verify($request->input('recaptcha_data'));
@@ -103,14 +166,21 @@ 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();
+
+        if ((int)config('v2board.register_limit_by_ip_enable', 0)) {
+            Cache::put(
+                CacheKey::get('REGISTER_IP_RATE_LIMIT', $request->ip()),
+                (int)$registerCountByIP + 1,
+                (int)config('v2board.register_limit_expire', 60) * 60
+            );
+        }
+
+        $authService = new AuthService($user);
+
         return response()->json([
-            'data' => $data
+            'data' => $authService->generateAuthData($request)
         ]);
     }
 
@@ -119,6 +189,12 @@ class AuthController extends Controller
         $email = $request->input('email');
         $password = $request->input('password');
 
+        $passwordErrorCount = (int)Cache::get(CacheKey::get('PASSWORD_ERROR_LIMIT', $email), 0);
+
+        if ($passwordErrorCount >= 5) {
+            abort(500, __('There are too many password errors, please try again after 30 minutes.'));
+        }
+
         $user = User::where('email', $email)->first();
         if (!$user) {
             abort(500, __('Incorrect email or password'));
@@ -129,6 +205,11 @@ class AuthController extends Controller
             $password,
             $user->password)
         ) {
+            Cache::put(
+                CacheKey::get('PASSWORD_ERROR_LIMIT', $email),
+                (int)$passwordErrorCount + 1,
+                30 * 60
+            );
             abort(500, __('Incorrect email or password'));
         }
 
@@ -136,22 +217,9 @@ class AuthController extends Controller
             abort(500, __('Your account has been suspended'));
         }
 
-        $data = [
-            'token' => $user->token,
-            'auth_data' => base64_encode("{$user->email}:{$user->password}")
-        ];
-        $request->session()->put('email', $user->email);
-        $request->session()->put('id', $user->id);
-        if ($user->is_admin) {
-            $request->session()->put('is_admin', true);
-            $data['is_admin'] = true;
-        }
-        if ($user->is_staff) {
-            $request->session()->put('is_staff', true);
-            $data['is_staff'] = true;
-        }
+        $authService = new AuthService($user);
         return response([
-            'data' => $data
+            'data' => $authService->generateAuthData($request)
         ]);
     }
 
@@ -180,47 +248,25 @@ class AuthController extends Controller
             if ($user->banned) {
                 abort(500, __('Your account has been suspended'));
             }
-            $request->session()->put('email', $user->email);
-            $request->session()->put('id', $user->id);
-            if ($user->is_admin) {
-                $request->session()->put('is_admin', true);
-            }
             Cache::forget($key);
+            $authService = new AuthService($user);
             return response([
-                'data' => true
+                'data' => $authService->generateAuthData($request)
             ]);
         }
     }
 
-    public function getTempToken(Request $request)
-    {
-        $user = User::where('token', $request->input('token'))->first();
-        if (!$user) {
-            abort(500, __('Token error'));
-        }
-
-        $code = Helper::guid();
-        $key = CacheKey::get('TEMP_TOKEN', $code);
-        Cache::put($key, $user->id, 60);
-        return response([
-            'data' => $code
-        ]);
-    }
-
     public function getQuickLoginUrl(Request $request)
     {
-        $authData = explode(':', base64_decode($request->input('auth_data')));
-        if (!isset($authData[0])) abort(403, __('Token error'));
-        $user = User::where('email', $authData[0])
-            ->where('password', $authData[1])
-            ->first();
-        if (!$user) {
-            abort(500, __('Token error'));
-        }
+        $authorization = $request->input('auth_data') ?? $request->header('authorization');
+        if (!$authorization) abort(403, '未登录或登陆已过期');
+
+        $user = AuthService::decryptAuthData($authorization);
+        if (!$user) abort(403, '未登录或登陆已过期');
 
         $code = Helper::guid();
         $key = CacheKey::get('TEMP_TOKEN', $code);
-        Cache::put($key, $user->id, 60);
+        Cache::put($key, $user['id'], 60);
         $redirect = '/#/login?verify=' . $code . '&redirect=' . ($request->input('redirect') ? $request->input('redirect') : 'dashboard');
         if (config('v2board.app_url')) {
             $url = config('v2board.app_url') . $redirect;
@@ -232,19 +278,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')) {
@@ -265,5 +298,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

@@ -20,6 +20,7 @@ use Illuminate\Support\Facades\Cache;
  */
 class DeepbworkController extends Controller
 {
+    CONST V2RAY_CONFIG = '{"log":{"loglevel":"debug","access":"access.log","error":"error.log"},"api":{"services":["HandlerService","StatsService"],"tag":"api"},"dns":{},"stats":{},"inbounds":[{"port":443,"protocol":"vmess","settings":{"clients":[]},"sniffing":{"enabled":true,"destOverride":["http","tls"]},"streamSettings":{"network":"tcp"},"tag":"proxy"},{"listen":"127.0.0.1","port":23333,"protocol":"dokodemo-door","settings":{"address":"0.0.0.0"},"tag":"api"}],"outbounds":[{"protocol":"freedom","settings":{}},{"protocol":"blackhole","settings":{},"tag":"block"}],"routing":{"rules":[{"type":"field","inboundTag":"api","outboundTag":"api"}]},"policy":{"levels":{"0":{"handshake":4,"connIdle":300,"uplinkOnly":5,"downlinkOnly":30,"statsUserUplink":true,"statsUserDownlink":true}}}}';
     public function __construct(Request $request)
     {
         $token = $request->input('token');
@@ -34,6 +35,7 @@ class DeepbworkController extends Controller
     // 后端获取用户
     public function user(Request $request)
     {
+        ini_set('memory_limit', -1);
         $nodeId = $request->input('node_id');
         $server = ServerV2ray::find($nodeId);
         if (!$server) {
@@ -47,17 +49,20 @@ class DeepbworkController extends Controller
             $user->v2ray_user = [
                 "uuid" => $user->uuid,
                 "email" => sprintf("%s@v2board.user", $user->uuid),
-                "alter_id" => $server->alter_id,
+                "alter_id" => 0,
                 "level" => 0,
             ];
             unset($user['uuid']);
-            unset($user['email']);
             array_push($result, $user);
         }
+        $eTag = sha1(json_encode($result));
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
+            abort(304);
+        }
         return response([
             'msg' => 'ok',
             'data' => $result,
-        ]);
+        ])->header('ETag', "\"{$eTag}\"");
     }
 
     // 后端提交数据
@@ -77,9 +82,9 @@ class DeepbworkController extends Controller
         Cache::put(CacheKey::get('SERVER_V2RAY_LAST_PUSH_AT', $server->id), time(), 3600);
         $userService = new UserService();
         foreach ($data as $item) {
-            $u = $item['u'] * $server->rate;
-            $d = $item['d'] * $server->rate;
-            $userService->trafficFetch($u, $d, $item['user_id'], $server, 'vmess');
+            $u = $item['u'];
+            $d = $item['d'];
+            $userService->trafficFetch($u, $d, $item['user_id'], $server->toArray(), 'v2ray');
         }
 
         return response([
@@ -96,13 +101,133 @@ class DeepbworkController extends Controller
         if (empty($nodeId) || empty($localPort)) {
             abort(500, '参数错误');
         }
-        $serverService = new ServerService();
         try {
-            $json = $serverService->getV2RayConfig($nodeId, $localPort);
+            $json = $this->getV2RayConfig($nodeId, $localPort);
         } catch (\Exception $e) {
             abort(500, $e->getMessage());
         }
 
         die(json_encode($json, JSON_UNESCAPED_UNICODE));
     }
+
+    private function getV2RayConfig(int $nodeId, int $localPort)
+    {
+        $server = ServerV2ray::find($nodeId);
+        if (!$server) {
+            abort(500, '节点不存在');
+        }
+        $json = json_decode(self::V2RAY_CONFIG);
+        $json->log->loglevel = (int)config('v2board.server_log_enable') ? 'debug' : 'none';
+        $json->inbounds[1]->port = (int)$localPort;
+        $json->inbounds[0]->port = (int)$server->server_port;
+        $json->inbounds[0]->streamSettings->network = $server->network;
+        $this->setDns($server, $json);
+        $this->setNetwork($server, $json);
+        $this->setRule($server, $json);
+        $this->setTls($server, $json);
+
+        return $json;
+    }
+
+    private function setDns(ServerV2ray $server, object $json)
+    {
+        if ($server->dnsSettings) {
+            $dns = $server->dnsSettings;
+            if (isset($dns->servers)) {
+                array_push($dns->servers, '1.1.1.1');
+                array_push($dns->servers, 'localhost');
+            }
+            $json->dns = $dns;
+            $json->outbounds[0]->settings->domainStrategy = 'UseIP';
+        }
+    }
+
+    private function setNetwork(ServerV2ray $server, object $json)
+    {
+        if ($server->networkSettings) {
+            switch ($server->network) {
+                case 'tcp':
+                    $json->inbounds[0]->streamSettings->tcpSettings = $server->networkSettings;
+                    break;
+                case 'kcp':
+                    $json->inbounds[0]->streamSettings->kcpSettings = $server->networkSettings;
+                    break;
+                case 'ws':
+                    $json->inbounds[0]->streamSettings->wsSettings = $server->networkSettings;
+                    break;
+                case 'http':
+                    $json->inbounds[0]->streamSettings->httpSettings = $server->networkSettings;
+                    break;
+                case 'domainsocket':
+                    $json->inbounds[0]->streamSettings->dsSettings = $server->networkSettings;
+                    break;
+                case 'quic':
+                    $json->inbounds[0]->streamSettings->quicSettings = $server->networkSettings;
+                    break;
+                case 'grpc':
+                    $json->inbounds[0]->streamSettings->grpcSettings = $server->networkSettings;
+                    break;
+            }
+        }
+    }
+
+    private function setRule(ServerV2ray $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')));
+        if ($server->ruleSettings) {
+            $ruleSettings = $server->ruleSettings;
+            // domain
+            if (isset($ruleSettings->domain)) {
+                $ruleSettings->domain = array_filter($ruleSettings->domain);
+                if (!empty($ruleSettings->domain)) {
+                    $domainRules = array_merge($domainRules, $ruleSettings->domain);
+                }
+            }
+            // protocol
+            if (isset($ruleSettings->protocol)) {
+                $ruleSettings->protocol = array_filter($ruleSettings->protocol);
+                if (!empty($ruleSettings->protocol)) {
+                    $protocolRules = array_merge($protocolRules, $ruleSettings->protocol);
+                }
+            }
+        }
+        if (!empty($domainRules)) {
+            $domainObj = new \StdClass();
+            $domainObj->type = 'field';
+            $domainObj->domain = $domainRules;
+            $domainObj->outboundTag = 'block';
+            array_push($json->routing->rules, $domainObj);
+        }
+        if (!empty($protocolRules)) {
+            $protocolObj = new \StdClass();
+            $protocolObj->type = 'field';
+            $protocolObj->protocol = $protocolRules;
+            $protocolObj->outboundTag = 'block';
+            array_push($json->routing->rules, $protocolObj);
+        }
+        if (empty($domainRules) && empty($protocolRules)) {
+            $json->inbounds[0]->sniffing->enabled = false;
+        }
+    }
+
+    private function setTls(ServerV2ray $server, object $json)
+    {
+        if ((int)$server->tls) {
+            $tlsSettings = $server->tlsSettings;
+            $json->inbounds[0]->streamSettings->security = 'tls';
+            $tls = (object)[
+                'certificateFile' => '/root/.cert/server.crt',
+                'keyFile' => '/root/.cert/server.key'
+            ];
+            $json->inbounds[0]->streamSettings->tlsSettings = new \StdClass();
+            if (isset($tlsSettings->serverName)) {
+                $json->inbounds[0]->streamSettings->tlsSettings->serverName = (string)$tlsSettings->serverName;
+            }
+            if (isset($tlsSettings->allowInsecure)) {
+                $json->inbounds[0]->streamSettings->tlsSettings->allowInsecure = (int)$tlsSettings->allowInsecure ? true : false;
+            }
+            $json->inbounds[0]->streamSettings->tlsSettings->certificates[0] = $tls;
+        }
+    }
 }

app/Http/Controllers/Server/ShadowsocksTidalabController.php

@@ -30,6 +30,7 @@ class ShadowsocksTidalabController extends Controller
     // 后端获取用户
     public function user(Request $request)
     {
+        ini_set('memory_limit', -1);
         $nodeId = $request->input('node_id');
         $server = ServerShadowsocks::find($nodeId);
         if (!$server) {
@@ -47,9 +48,13 @@ class ShadowsocksTidalabController extends Controller
                 'secret' => $user->uuid
             ]);
         }
+        $eTag = sha1(json_encode($result));
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
+            abort(304);
+        }
         return response([
             'data' => $result
-        ]);
+        ])->header('ETag', "\"{$eTag}\"");
     }
 
     // 后端提交数据
@@ -69,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;
-            $d = $item['d'] * $server->rate;
-            $userService->trafficFetch($u, $d, $item['user_id'], $server, 'shadowsocks');
+            $u = $item['u'];
+            $d = $item['d'];
+            $userService->trafficFetch($u, $d, $item['user_id'], $server->toArray(), 'shadowsocks');
         }
 
         return response([

app/Http/Controllers/Server/TrojanTidalabController.php

@@ -20,6 +20,7 @@ use Illuminate\Support\Facades\Cache;
  */
 class TrojanTidalabController extends Controller
 {
+    CONST TROJAN_CONFIG = '{"run_type":"server","local_addr":"0.0.0.0","local_port":443,"remote_addr":"www.taobao.com","remote_port":80,"password":[],"ssl":{"cert":"server.crt","key":"server.key","sni":"domain.com"},"api":{"enabled":true,"api_addr":"127.0.0.1","api_port":10000}}';
     public function __construct(Request $request)
     {
         $token = $request->input('token');
@@ -34,6 +35,7 @@ class TrojanTidalabController extends Controller
     // 后端获取用户
     public function user(Request $request)
     {
+        ini_set('memory_limit', -1);
         $nodeId = $request->input('node_id');
         $server = ServerTrojan::find($nodeId);
         if (!$server) {
@@ -48,13 +50,16 @@ class TrojanTidalabController extends Controller
                 "password" => $user->uuid,
             ];
             unset($user['uuid']);
-            unset($user['email']);
             array_push($result, $user);
         }
+        $eTag = sha1(json_encode($result));
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
+            abort(304);
+        }
         return response([
             'msg' => 'ok',
             'data' => $result,
-        ]);
+        ])->header('ETag', "\"{$eTag}\"");
     }
 
     // 后端提交数据
@@ -74,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;
-            $d = $item['d'] * $server->rate;
-            $userService->trafficFetch($u, $d, $item['user_id'], $server, 'trojan');
+            $u = $item['u'];
+            $d = $item['d'];
+            $userService->trafficFetch($u, $d, $item['user_id'], $server->toArray(), 'trojan');
         }
 
         return response([
@@ -93,13 +98,28 @@ class TrojanTidalabController extends Controller
         if (empty($nodeId) || empty($localPort)) {
             abort(500, '参数错误');
         }
-        $serverService = new ServerService();
         try {
-            $json = $serverService->getTrojanConfig($nodeId, $localPort);
+            $json = $this->getTrojanConfig($nodeId, $localPort);
         } catch (\Exception $e) {
             abort(500, $e->getMessage());
         }
 
         die(json_encode($json, JSON_UNESCAPED_UNICODE));
     }
+
+    private function getTrojanConfig(int $nodeId, int $localPort)
+    {
+        $server = ServerTrojan::find($nodeId);
+        if (!$server) {
+            abort(500, '节点不存在');
+        }
+
+        $json = json_decode(self::TROJAN_CONFIG);
+        $json->local_port = $server->server_port;
+        $json->ssl->sni = $server->server_name ? $server->server_name : $server->host;
+        $json->ssl->cert = "/root/.cert/server.crt";
+        $json->ssl->key = "/root/.cert/server.key";
+        $json->api->api_port = $localPort;
+        return $json;
+    }
 }

app/Http/Controllers/Server/UniProxyController.php

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

@@ -39,13 +39,6 @@ class TicketController extends Controller
         $total = $model->count();
         $res = $model->forPage($current, $pageSize)
             ->get();
-        for ($i = 0; $i < count($res); $i++) {
-            if ($res[$i]['last_reply_user_id'] == $request->session()->get('id')) {
-                $res[$i]['reply_status'] = 0;
-            } else {
-                $res[$i]['reply_status'] = 1;
-            }
-        }
         return response([
             'data' => $res,
             'total' => $total
@@ -64,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

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
+use App\Models\CommissionLog;
 use Illuminate\Http\Request;
 use App\Models\User;
 use App\Models\Order;
@@ -13,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()
@@ -26,44 +27,52 @@ class InviteController extends Controller
 
     public function details(Request $request)
     {
+        $current = $request->input('current') ? $request->input('current') : 1;
+        $pageSize = $request->input('page_size') >= 10 ? $request->input('page_size') : 10;
+        $builder = CommissionLog::where('invite_user_id', $request->user['id'])
+            ->where('get_amount', '>', 0)
+            ->select([
+                'id',
+                'trade_no',
+                'order_amount',
+                'get_amount',
+                'created_at'
+            ])
+            ->orderBy('created_at', 'DESC');
+        $total = $builder->count();
+        $details = $builder->forPage($current, $pageSize)
+            ->get();
         return response([
-            'data' => Order::where('invite_user_id', $request->session()->get('id'))
-                ->where('commission_balance', '>', 0)
-                ->whereIn('status', [3, 4])
-                ->select([
-                    'id',
-                    'commission_status',
-                    'commission_balance',
-                    'created_at',
-                    'updated_at'
-                ])
-                ->get()
+            '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)
-                ->where('commission_status', 2)
-                ->where('invite_user_id', $request->session()->get('id'))
-                ->sum('commission_balance'),
+            (int)CommissionLog::where('invite_user_id', $request->user['id'])
+                ->sum('get_amount'),
             //确认中的佣金
-            (int)Order::where('status', 3)
-                ->where('commission_status', 0)
-                ->where('invite_user_id', $request->session()->get('id'))
-                ->sum('commission_balance'),
+            $uncheck_commission_balance,
             //佣金比例
             (int)$commission_rate,
             //可用佣金

app/Http/Controllers/User/KnowledgeController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\User;
 use App\Http\Controllers\Controller;
 use App\Models\User;
 use App\Services\UserService;
+use App\Utils\Helper;
 use Illuminate\Http\Request;
 use App\Models\Knowledge;
 
@@ -18,22 +19,12 @@ class KnowledgeController extends Controller
                 ->first()
                 ->toArray();
             if (!$knowledge) abort(500, __('Article does not exist'));
-            $user = User::find($request->session()->get('id'));
+            $user = User::find($request->user['id']);
             $userService = new UserService();
-            if ($userService->isAvailable($user)) {
-                $appleId = config('v2board.apple_id');
-                $appleIdPassword = config('v2board.apple_id_password');
-            } else {
-                $appleId = __('No active subscription. Unable to use our provided Apple ID');
-                $appleIdPassword = __('No active subscription. Unable to use our provided Apple ID');
+            if (!$userService->isAvailable($user)) {
                 $this->formatAccessData($knowledge['body']);
             }
-            $subscribeUrl = config('v2board.app_url', env('APP_URL'));
-            $subscribeUrls = explode(',', config('v2board.subscribe_url'));
-            if ($subscribeUrls) {
-                $subscribeUrl = $subscribeUrls[rand(0, count($subscribeUrls) - 1)];
-            }
-            $subscribeUrl = "{$subscribeUrl}/api/v1/client/subscribe?token={$user['token']}";
+            $subscribeUrl = Helper::getSubscribeUrl("/api/v1/client/subscribe?token={$user['token']}");
             $knowledge['body'] = str_replace('{{siteName}}', config('v2board.app_name', 'V2Board'), $knowledge['body']);
             $knowledge['body'] = str_replace('{{subscribeUrl}}', $subscribeUrl, $knowledge['body']);
             $knowledge['body'] = str_replace('{{urlEncodeSubscribeUrl}}', urlencode($subscribeUrl), $knowledge['body']);
@@ -50,11 +41,19 @@ class KnowledgeController extends Controller
                 'data' => $knowledge
             ]);
         }
-        $knowledges = Knowledge::select(['id', 'category', 'title', 'updated_at'])
+        $builder = Knowledge::select(['id', 'category', 'title', 'updated_at'])
             ->where('language', $request->input('language'))
             ->where('show', 1)
-            ->orderBy('sort', 'ASC')
-            ->get()
+            ->orderBy('sort', 'ASC');
+        $keyword = $request->input('keyword');
+        if ($keyword) {
+            $builder = $builder->where(function ($query) use ($keyword) {
+                $query->where('title', 'LIKE', "%{$keyword}%")
+                    ->orWhere('body', 'LIKE', "%{$keyword}%");
+            });
+        }
+
+        $knowledges = $builder->get()
             ->groupBy('category');
         return response([
             'data' => $knowledges
@@ -63,10 +62,12 @@ class KnowledgeController extends Controller
 
     private function formatAccessData(&$body)
     {
-        function getBetween($input, $start, $end){$substr = substr($input, strlen($start)+strpos($input, $start),(strlen($input) - strpos($input, $end))*(-1));return $substr;}
-        $accessData = getBetween($body, '<!--access start-->', '<!--access end-->');
-        if ($accessData) {
-            $body = str_replace($accessData, '<div class="v2board-no-access">'. __('You must have a valid subscription to view content in this area') .'</div>', $body);
+        function getBetween($input, $start, $end){$substr = substr($input, strlen($start)+strpos($input, $start),(strlen($input) - strpos($input, $end))*(-1));return $start . $substr . $end;}
+        while (strpos($body, '<!--access start-->') !== false) {
+            $accessData = getBetween($body, '<!--access start-->', '<!--access end-->');
+            if ($accessData) {
+                $body = str_replace($accessData, '<div class="v2board-no-access">'. __('You must have a valid subscription to view content in this area') .'</div>', $body);
+            }
         }
     }
 }

app/Http/Controllers/User/NoticeController.php

@@ -13,7 +13,8 @@ class NoticeController extends Controller
     {
         $current = $request->input('current') ? $request->input('current') : 1;
         $pageSize = 5;
-        $model = Notice::orderBy('created_at', 'DESC');
+        $model = Notice::orderBy('created_at', 'DESC')
+            ->where('show', 1);
         $total = $model->count();
         $res = $model->forPage($current, $pageSize)
             ->get();

app/Http/Controllers/User/OrderController.php

@@ -4,10 +4,12 @@ namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\User\OrderSave;
+use App\Models\CommissionLog;
 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;
@@ -27,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'));
@@ -46,9 +48,9 @@ class OrderController extends Controller
         ]);
     }
 
-    public function details(Request $request)
+    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) {
@@ -59,6 +61,9 @@ class OrderController extends Controller
         if (!$order['plan']) {
             abort(500, __('Subscription plan does not exist'));
         }
+        if ($order->surplus_order_ids) {
+            $order['surplus_orders'] = Order::whereIn('id', $order->surplus_order_ids)->get();
+        }
         return response([
             'data' => $order
         ]);
@@ -67,23 +72,29 @@ class OrderController extends Controller
     public function save(OrderSave $request)
     {
         $userService = new UserService();
-        if ($userService->isNotCompleteOrderByUserId($request->session()->get('id'))) {
+        if ($userService->isNotCompleteOrderByUserId($request->user['id'])) {
             abort(500, __('You have an unpaid or pending order, please try again later or cancel it'));
         }
 
-        $plan = Plan::find($request->input('plan_id'));
-        $user = User::find($request->session()->get('id'));
+        $planService = new PlanService($request->input('plan_id'));
+
+        $plan = $planService->plan;
+        $user = User::find($request->user['id']);
 
         if (!$plan) {
             abort(500, __('Subscription plan does not exist'));
         }
 
+        if ($user->plan_id !== $plan->id && !$planService->haveCapacity() && $request->input('period') !== 'reset_price') {
+            abort(500, __('Current product is sold out'));
+        }
+
         if ($plan[$request->input('period')] === NULL) {
             abort(500, __('This payment period cannot be purchased, please choose another period'));
         }
 
         if ($request->input('period') === 'reset_price') {
-            if ($user->expired_at <= time() || !$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'));
             }
         }
@@ -106,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();
@@ -162,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) {
@@ -180,13 +191,17 @@ class OrderController extends Controller
         $payment = Payment::find($method);
         if (!$payment || $payment->enable !== 1) abort(500, __('Payment method is not available'));
         $paymentService = new PaymentService($payment->payment, $payment->id);
+        if ($payment->handling_fee_fixed || $payment->handling_fee_percent) {
+            $order->handling_amount = round(($order->total_amount * ($payment->handling_fee_percent / 100)) + $payment->handling_fee_fixed);
+        }
+        $order->payment_id = $method;
+        if (!$order->save()) abort(500, __('Request failed, please try again later'));
         $result = $paymentService->pay([
             'trade_no' => $tradeNo,
-            'total_amount' => $order->total_amount,
+            'total_amount' => isset($order->handling_amount) ? ($order->total_amount + $order->handling_amount) : $order->total_amount,
             'user_id' => $order->user_id,
             'stripe_token' => $request->input('token')
         ]);
-        $order->update(['payment_id' => $method]);
         return response([
             'type' => $result['type'],
             'data' => $result['data']
@@ -197,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'));
@@ -213,9 +228,13 @@ class OrderController extends Controller
             'id',
             'name',
             'payment',
-            'icon'
+            'icon',
+            'handling_fee_fixed',
+            'handling_fee_percent'
         ])
-            ->where('enable', 1)->get();
+            ->where('enable', 1)
+            ->orderBy('sort', 'ASC')
+            ->get();
 
         return response([
             'data' => $methods
@@ -228,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

@@ -3,28 +3,41 @@
 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->user['id']);
         if ($request->input('id')) {
-            $plan = Plan::where('id', $request->input('id'))
-                ->first();
+            $plan = Plan::where('id', $request->input('id'))->first();
             if (!$plan) {
                 abort(500, __('Subscription plan does not exist'));
             }
+            if ((!$plan->show && !$plan->renew) || (!$plan->show && $user->plan_id !== $plan->id)) {
+                abort(500, __('Subscription plan does not exist'));
+            }
             return response([
                 '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

@@ -13,46 +13,27 @@ use App\Models\ServerLog;
 use App\Models\User;
 
 use App\Utils\Helper;
+use Illuminate\Support\Facades\DB;
 
 class ServerController extends Controller
 {
     public function fetch(Request $request)
     {
-        $user = User::find($request->session()->get('id'));
+        $user = User::find($request->user['id']);
         $servers = [];
         $userService = new UserService();
         if ($userService->isAvailable($user)) {
             $serverService = new ServerService();
             $servers = $serverService->getAvailableServers($user);
         }
+
+        $eTag = sha1(json_encode(array_column($servers, 'updated_at')));
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
+            abort(304);
+        }
+
         return response([
             'data' => $servers
-        ]);
-    }
-
-    public function logFetch(Request $request)
-    {
-        $type = $request->input('type') ? $request->input('type') : 0;
-        $current = $request->input('current') ? $request->input('current') : 1;
-        $pageSize = $request->input('pageSize') >= 10 ? $request->input('pageSize') : 10;
-        $serverLogModel = ServerLog::where('user_id', $request->session()->get('id'))
-            ->orderBy('log_at', 'DESC');
-        switch ($type) {
-            case 0:
-                $serverLogModel->where('log_at', '>=', strtotime(date('Y-m-d')));
-                break;
-            case 1:
-                $serverLogModel->where('log_at', '>=', strtotime(date('Y-m-d')) - 604800);
-                break;
-            case 2:
-                $serverLogModel->where('log_at', '>=', strtotime(date('Y-m-1')));
-        }
-        $total = $serverLogModel->count();
-        $res = $serverLogModel->forPage($current, $pageSize)
-            ->get();
-        return response([
-            'data' => $res,
-            'total' => $total
-        ]);
+        ])->header('ETag', "\"{$eTag}\"");
     }
 }

app/Http/Controllers/User/StatController.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers\User;
+
+use App\Http\Controllers\Controller;
+use App\Models\StatUser;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class StatController extends Controller
+{
+    public function getTrafficLog(Request $request)
+    {
+        $builder = StatUser::select([
+            'u',
+            'd',
+            'record_at',
+            'user_id',
+            'server_rate'
+        ])
+            ->where('user_id', $request->user['id'])
+            ->where('record_at', '>=', strtotime(date('Y-m-1')))
+            ->orderBy('record_at', 'DESC');
+        return response([
+            'data' => $builder->get()
+        ]);
+    }
+}

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

@@ -8,6 +8,7 @@ use App\Http\Requests\User\TicketWithdraw;
 use App\Jobs\SendTelegramJob;
 use App\Models\User;
 use App\Services\TelegramService;
+use App\Services\TicketService;
 use App\Utils\Dict;
 use Illuminate\Http\Request;
 use App\Models\Ticket;
@@ -20,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'));
@@ -37,16 +38,9 @@ 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();
-        for ($i = 0; $i < count($ticket); $i++) {
-            if ($ticket[$i]['last_reply_user_id'] == $request->session()->get('id')) {
-                $ticket[$i]['reply_status'] = 0;
-            } else {
-                $ticket[$i]['reply_status'] = 1;
-            }
-        }
         return response([
             'data' => $ticket
         ]);
@@ -55,22 +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'))->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'),
-            'last_reply_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')
         ]);
@@ -79,7 +72,7 @@ class TicketController extends Controller
             abort(500, __('Failed to open ticket'));
         }
         DB::commit();
-        $this->sendNotify($ticket, $ticketMessage);
+        $this->sendNotify($ticket, $request->input('message'));
         return response([
             'data' => true
         ]);
@@ -94,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'));
@@ -102,22 +95,18 @@ 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'));
         }
-        DB::beginTransaction();
-        $ticketMessage = TicketMessage::create([
-            'user_id' => $request->session()->get('id'),
-            'ticket_id' => $ticket->id,
-            'message' => $request->input('message')
-        ]);
-        $ticket->last_reply_user_id = $request->session()->get('id');
-        if (!$ticketMessage || !$ticket->save()) {
-            DB::rollback();
+        $ticketService = new TicketService();
+        if (!$ticketService->reply(
+            $ticket,
+            $request->input('message'),
+            $request->user['id']
+        )) {
             abort(500, __('Ticket reply failed'));
         }
-        DB::commit();
-        $this->sendNotify($ticket, $ticketMessage);
+        $this->sendNotify($ticket, $request->input('message'));
         return response([
             'data' => true
         ]);
@@ -130,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'));
@@ -165,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]));
@@ -175,8 +164,7 @@ class TicketController extends Controller
         $ticket = Ticket::create([
             'subject' => $subject,
             'level' => 2,
-            'user_id' => $request->session()->get('id'),
-            'last_reply_user_id' => $request->session()->get('id')
+            'user_id' => $request->user['id']
         ]);
         if (!$ticket) {
             DB::rollback();
@@ -187,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
         ]);
@@ -196,15 +184,15 @@ class TicketController extends Controller
             abort(500, __('Failed to open ticket'));
         }
         DB::commit();
-        $this->sendNotify($ticket, $ticketMessage);
+        $this->sendNotify($ticket, $message);
         return response([
             'data' => true
         ]);
     }
 
-    private function sendNotify(Ticket $ticket, TicketMessage $ticketMessage)
+    private function sendNotify(Ticket $ticket, string $message)
     {
         $telegramService = new TelegramService();
-        $telegramService->sendMessageWithAdmin("📮工单提醒 #{$ticket->id}\n———————————————\n主题：\n`{$ticket->subject}`\n内容：\n`{$ticketMessage->message}`", true);
+        $telegramService->sendMessageWithAdmin("📮工单提醒 #{$ticket->id}\n———————————————\n主题：\n`{$ticket->subject}`\n内容：\n`{$message}`", true);
     }
 }

app/Http/Controllers/User/UserController.php

@@ -6,30 +6,34 @@ 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\UserService;
 use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use App\Models\User;
 use App\Models\Plan;
-use App\Models\ServerV2ray;
 use App\Models\Ticket;
 use App\Utils\Helper;
 use App\Models\Order;
-use App\Models\ServerLog;
 use Illuminate\Support\Facades\Cache;
 
 class UserController extends Controller
 {
-    public function logout(Request $request)
+    public function checkLogin(Request $request)
     {
-        $request->session()->flush();
+        $data = [
+            'is_login' => $request->user['id'] ? true : false
+        ];
+        if ($request->user['is_admin']) {
+            $data['is_admin'] = true;
+        }
         return response([
-            'data' => true
+            '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'));
         }
@@ -47,7 +51,6 @@ class UserController extends Controller
         if (!$user->save()) {
             abort(500, __('Save failed'));
         }
-        $request->session()->flush();
         return response([
             'data' => true
         ]);
@@ -55,7 +58,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',
@@ -87,12 +90,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([
@@ -102,7 +105,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',
@@ -110,7 +113,8 @@ class UserController extends Controller
                 'u',
                 'd',
                 'transfer_enable',
-                'email'
+                'email',
+                'uuid'
             ])
             ->first();
         if (!$user) {
@@ -122,8 +126,9 @@ class UserController extends Controller
                 abort(500, __('Subscription plan does not exist'));
             }
         }
-        $user['subscribe_url'] = Helper::getSubscribeHost() . "/api/v1/client/subscribe?token={$user['token']}";
-        $user['reset_day'] = $this->getResetDay($user);
+        $user['subscribe_url'] = Helper::getSubscribeUrl("/api/v1/client/subscribe?token={$user['token']}");
+        $userService = new UserService();
+        $user['reset_day'] = $userService->getResetDay($user);
         return response([
             'data' => $user
         ]);
@@ -131,7 +136,7 @@ class UserController extends Controller
 
     public function resetSecurity(Request $request)
     {
-        $user = User::find($request->session()->get('id'));
+        $user = User::find($request->user['id']);
         if (!$user) {
             abort(500, __('The user does not exist'));
         }
@@ -141,7 +146,7 @@ class UserController extends Controller
             abort(500, __('Reset failed'));
         }
         return response([
-            'data' => config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user->token
+            'data' => Helper::getSubscribeUrl('/api/v1/client/subscribe?token=' . $user->token)
         ]);
     }
 
@@ -152,7 +157,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 +174,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'));
         }
@@ -186,35 +191,9 @@ class UserController extends Controller
         ]);
     }
 
-    private function getResetDay(User $user)
-    {
-        if ($user->expired_at <= time() || $user->expired_at === NULL) return null;
-        // if reset method is not reset
-        if (isset($user->plan->reset_traffic_method) && $user->plan->reset_traffic_method === 2) return null;
-        $day = date('d', $user->expired_at);
-        $today = date('d');
-        $lastDay = date('d', strtotime('last day of +0 months'));
-
-        if ((int)config('v2board.reset_traffic_method') === 0) {
-            return $lastDay - $today;
-        }
-        if ((int)config('v2board.reset_traffic_method') === 1) {
-            if ((int)$day >= (int)$today && (int)$day >= (int)$lastDay) {
-                return $lastDay - $today;
-            }
-            if ((int)$day >= (int)$today) {
-                return $day - $today;
-            } else {
-                return $lastDay - $today + $day;
-            }
-        }
-        return null;
-    }
-
-
     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,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
+//            \App\Http\Middleware\EncryptCookies::class,
+//            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+//            \Illuminate\Session\Middleware\StartSession::class,
             // \Illuminate\Session\Middleware\AuthenticateSession::class,
-            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
-            \App\Http\Middleware\VerifyCsrfToken::class,
-            \Illuminate\Routing\Middleware\SubstituteBindings::class,
-            \App\Http\Middleware\CORS::class,
+//            \Illuminate\View\Middleware\ShareErrorsFromSession::class,
+//            \App\Http\Middleware\VerifyCsrfToken::class,
+//            \Illuminate\Routing\Middleware\SubstituteBindings::class,
         ],
 
         'api' => [
-            \App\Http\Middleware\EncryptCookies::class,
-            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
-            \Illuminate\Session\Middleware\StartSession::class,
+//            \App\Http\Middleware\EncryptCookies::class,
+//            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
+//            \Illuminate\Session\Middleware\StartSession::class,
             \App\Http\Middleware\ForceJson::class,
-            \App\Http\Middleware\CORS::class,
             \App\Http\Middleware\Language::class,
             'bindings',
         ],

app/Http/Middleware/Admin.php

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

app/Http/Middleware/CORS.php

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

app/Http/Middleware/Client.php

@@ -2,8 +2,10 @@
 
 namespace App\Http\Middleware;
 
+use App\Utils\CacheKey;
 use Closure;
 use App\Models\User;
+use Illuminate\Support\Facades\Cache;
 
 class Client
 {
@@ -24,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')) {
-            abort(403, '权限不足');
-        }
+        $authorization = $request->input('auth_data') ?? $request->header('authorization');
+        if (!$authorization) abort(403, '未登录或登陆已过期');
+
+        $user = AuthService::decryptAuthData($authorization);
+        if (!$user || !$user['is_staff']) abort(403, '未登录或登陆已过期');
+        $request->merge([
+            'user' => $user
+        ]);
         return $next($request);
     }
 }

app/Http/Middleware/User.php

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

app/Http/Requests/Admin/ConfigSave.php

@@ -6,6 +6,87 @@ use Illuminate\Foundation\Http\FormRequest;
 
 class ConfigSave extends FormRequest
 {
+    const RULES = [
+        // invite & commission
+        'invite_force' => 'in:0,1',
+        'invite_commission' => 'integer',
+        'invite_gen_limit' => 'integer',
+        'invite_never_expire' => 'in:0,1',
+        'commission_first_time_enable' => 'in:0,1',
+        'commission_auto_check_enable' => 'in:0,1',
+        'commission_withdraw_limit' => 'nullable|numeric',
+        'commission_withdraw_method' => 'nullable|array',
+        'withdraw_close_enable' => 'in:0,1',
+        'commission_distribution_enable' => 'in:0,1',
+        'commission_distribution_l1' => 'nullable|numeric',
+        'commission_distribution_l2' => 'nullable|numeric',
+        'commission_distribution_l3' => 'nullable|numeric',
+        // site
+        'logo' => 'nullable|url',
+        'force_https' => 'in:0,1',
+        'safe_mode_enable' => 'in:0,1',
+        'stop_register' => 'in:0,1',
+        'email_verify' => 'in:0,1',
+        'app_name' => '',
+        'app_description' => '',
+        'app_url' => 'nullable|url',
+        'subscribe_url' => 'nullable',
+        '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',
+        'secure_path' => '',
+        // subscribe
+        'plan_change_enable' => 'in:0,1',
+        'reset_traffic_method' => 'in:0,1,2,3,4',
+        'surplus_enable' => 'in:0,1',
+        'new_order_event_id' => 'in:0,1',
+        'renew_order_event_id' => 'in:0,1',
+        'change_order_event_id' => 'in:0,1',
+        'show_info_to_server_enable' => 'in:0,1',
+        // server
+        'server_token' => 'nullable|min:16',
+        'server_pull_interval' => 'integer',
+        'server_push_interval' => 'integer',
+        // frontend
+        'frontend_theme' => '',
+        'frontend_theme_sidebar' => 'nullable|in:dark,light',
+        'frontend_theme_header' => 'nullable|in:dark,light',
+        'frontend_theme_color' => 'nullable|in:default,darkblue,black,green',
+        'frontend_background_url' => 'nullable|url',
+        // email
+        'email_template' => '',
+        'email_host' => '',
+        'email_port' => '',
+        'email_username' => '',
+        'email_password' => '',
+        'email_encryption' => '',
+        'email_from_address' => '',
+        // telegram
+        'telegram_bot_enable' => 'in:0,1',
+        'telegram_bot_token' => '',
+        'telegram_discuss_id' => '',
+        'telegram_channel_id' => '',
+        'telegram_discuss_link' => 'nullable|url',
+        // app
+        'windows_version' => '',
+        'windows_download_url' => '',
+        'macos_version' => '',
+        'macos_download_url' => '',
+        'android_version' => '',
+        'android_download_url' => ''
+    ];
     /**
      * Get the validation rules that apply to the request.
      *
@@ -13,114 +94,7 @@ class ConfigSave extends FormRequest
      */
     public function rules()
     {
-        return [
-            // invite & commission
-            'safe_mode_enable' => 'in:0,1',
-            'invite_force' => 'in:0,1',
-            'invite_commission' => 'integer',
-            'invite_gen_limit' => 'integer',
-            'invite_never_expire' => 'in:0,1',
-            'commission_first_time_enable' => 'in:0,1',
-            'commission_auto_check_enable' => 'in:0,1',
-            'commission_withdraw_limit' => 'nullable|numeric',
-            'commission_withdraw_method' => 'nullable|array',
-            'withdraw_close_enable' => 'in:0,1',
-            'commission_distribution_enable' => 'in:0,1',
-            'commission_distribution_l1' => 'nullable|numeric',
-            'commission_distribution_l2' => 'nullable|numeric',
-            'commission_distribution_l3' => 'nullable|numeric',
-            // site
-            'stop_register' => 'in:0,1',
-            'email_verify' => 'in:0,1',
-            'app_name' => '',
-            'app_description' => '',
-            'app_url' => 'nullable|url',
-            'subscribe_url' => 'nullable',
-            'try_out_enable' => 'in:0,1',
-            'try_out_plan_id' => 'integer',
-            'try_out_hour' => 'numeric',
-            'email_whitelist_enable' => 'in:0,1',
-            'email_whitelist_suffix' => 'nullable|array',
-            'email_gmail_limit_enable' => 'in:0,1',
-            'recaptcha_enable' => 'in:0,1',
-            'recaptcha_key' => '',
-            'recaptcha_site_key' => '',
-            'tos_url' => 'nullable|url',
-            'currency' => '',
-            'currency_symbol' => '',
-            // subscribe
-            'plan_change_enable' => 'in:0,1',
-            'reset_traffic_method' => 'in:0,1,2',
-            'surplus_enable' => 'in:0,1',
-            'new_order_event_id' => 'in:0,1',
-            'renew_order_event_id' => 'in:0,1',
-            'change_order_event_id' => 'in:0,1',
-            // server
-            'server_token' => 'nullable|min:16',
-            'server_license' => 'nullable',
-            'server_log_enable' => 'in:0,1',
-            'server_v2ray_domain' => '',
-            'server_v2ray_protocol' => '',
-            // alipay
-            'alipay_enable' => 'in:0,1',
-            'alipay_appid' => 'nullable|integer|min:16',
-            'alipay_pubkey' => 'max:2048',
-            'alipay_privkey' => 'max:2048',
-            // stripe
-            'stripe_alipay_enable' => 'in:0,1',
-            'stripe_wepay_enable' => 'in:0,1',
-            'stripe_card_enable' => 'in:0,1',
-            'stripe_sk_live' => '',
-            'stripe_pk_live' => '',
-            'stripe_webhook_key' => '',
-            'stripe_currency' => 'in:hkd,usd,sgd,eur,gbp,jpy,cad',
-            // bitpayx
-            'bitpayx_name' => '',
-            'bitpayx_enable' => 'in:0,1',
-            'bitpayx_appsecret' => '',
-            // mGate
-            'mgate_name' => '',
-            'mgate_enable' => 'in:0,1',
-            'mgate_url' => 'nullable|url',
-            'mgate_app_id' => '',
-            'mgate_app_secret' => '',
-            // Epay
-            'epay_name' => '',
-            'epay_enable' => 'in:0,1',
-            'epay_url' => 'nullable|url',
-            'epay_pid' => '',
-            'epay_key' => '',
-            // frontend
-            'frontend_theme' => '',
-            'frontend_theme_sidebar' => 'in:dark,light',
-            'frontend_theme_header' => 'in:dark,light',
-            'frontend_theme_color' => 'in:default,darkblue,black,green',
-            'frontend_background_url' => 'nullable|url',
-            'frontend_admin_path' => '',
-            'frontend_customer_service_method' => '',
-            'frontend_customer_service_id' => '',
-            // email
-            'email_template' => '',
-            'email_host' => '',
-            'email_port' => '',
-            'email_username' => '',
-            'email_password' => '',
-            'email_encryption' => '',
-            'email_from_address' => '',
-            // telegram
-            'telegram_bot_enable' => 'in:0,1',
-            'telegram_bot_token' => '',
-            'telegram_discuss_id' => '',
-            'telegram_channel_id' => '',
-            'telegram_discuss_link' => 'nullable|url',
-            // app
-            'windows_version' => '',
-            'windows_download_url' => '',
-            'macos_version' => '',
-            'macos_download_url' => '',
-            'android_version' => '',
-            'android_download_url' => ''
-        ];
+        return self::RULES;
     }
 
     public function messages()
@@ -131,7 +105,8 @@ class ConfigSave extends FormRequest
             'subscribe_url.url' => '订阅URL格式不正确，必须携带http(s)://',
             'server_token.min' => '通讯密钥长度必须大于16位',
             'tos_url.url' => '服务条款URL格式不正确，必须携带http(s)://',
-            'telegram_discuss_link.url' => 'Telegram群组地址必须为URL格式，必须携带http(s)://'
+            'telegram_discuss_link.url' => 'Telegram群组地址必须为URL格式，必须携带http(s)://',
+            'logo.url' => 'LOGO URL格式不正确，必须携带https(s)://'
         ];
     }
 }

app/Http/Requests/Admin/NoticeSave.php

@@ -16,7 +16,8 @@ class NoticeSave extends FormRequest
         return [
             'title' => 'required',
             'content' => 'required',
-            'img_url' => 'nullable|url'
+            'img_url' => 'nullable|url',
+            'tags' => 'nullable|array'
         ];
     }
 
@@ -25,7 +26,8 @@ class NoticeSave extends FormRequest
         return [
             'title.required' => '标题不能为空',
             'content.required' => '内容不能为空',
-            'img_url.url' => '图片URL格式不正确'
+            'img_url.url' => '图片URL格式不正确',
+            'tags.array' => '标签格式不正确'
         ];
     }
 }

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'
+            '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,13 @@ 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',
             'rate' => 'required|numeric'
         ];
@@ -33,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' => '连接端口不能为空',
@@ -40,7 +44,9 @@ class ServerShadowsocksSave extends FormRequest
             'cipher.required' => '加密方式不能为空',
             'tags.array' => '标签格式不正确',
             'rate.required' => '倍率不能为空',
-            'rate.numeric' => '倍率格式不正确'
+            'rate.numeric' => '倍率格式不正确',
+            'obfs.in' => '混淆格式不正确',
+            'obfs_settings.array' => '混淆设置格式不正确'
         ];
     }
 }

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

@@ -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',
@@ -24,7 +25,6 @@ class ServerV2raySave extends FormRequest
             'tls' => 'required',
             'tags' => 'nullable|array',
             'rate' => 'required|numeric',
-            'alter_id' => 'required|integer',
             'network' => 'required|in:tcp,kcp,ws,http,domainsocket,quic,grpc',
             'networkSettings' => 'nullable|array',
             'ruleSettings' => 'nullable|array',
@@ -39,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/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

@@ -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/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([
@@ -50,7 +53,6 @@ class AdminRoute
                 $router->post('update', 'Admin\\Server\\V2rayController@update');
                 $router->post('copy', 'Admin\\Server\\V2rayController@copy');
                 $router->post('sort', 'Admin\\Server\\V2rayController@sort');
-                $router->post('viewConfig', 'Admin\\Server\\V2rayController@viewConfig');
             });
             $router->group([
                 'prefix' => 'server/shadowsocks'
@@ -68,6 +70,7 @@ class AdminRoute
             $router->post('/order/assign', 'Admin\\OrderController@assign');
             $router->post('/order/paid', 'Admin\\OrderController@paid');
             $router->post('/order/cancel', 'Admin\\OrderController@cancel');
+            $router->post('/order/detail', 'Admin\\OrderController@detail');
             // User
             $router->get ('/user/fetch', 'Admin\\UserController@fetch');
             $router->post('/user/update', 'Admin\\UserController@update');
@@ -82,11 +85,13 @@ 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');
             $router->post('/notice/update', 'Admin\\NoticeController@update');
             $router->post('/notice/drop', 'Admin\\NoticeController@drop');
+            $router->post('/notice/show', 'Admin\\NoticeController@show');
             // Ticket
             $router->get ('/ticket/fetch', 'Admin\\TicketController@fetch');
             $router->post('/ticket/reply', 'Admin\\TicketController@reply');
@@ -95,6 +100,7 @@ class AdminRoute
             $router->get ('/coupon/fetch', 'Admin\\CouponController@fetch');
             $router->post('/coupon/generate', 'Admin\\CouponController@generate');
             $router->post('/coupon/drop', 'Admin\\CouponController@drop');
+            $router->post('/coupon/show', 'Admin\\CouponController@show');
             // Knowledge
             $router->get ('/knowledge/fetch', 'Admin\\KnowledgeController@fetch');
             $router->get ('/knowledge/getCategory', 'Admin\\KnowledgeController@getCategory');
@@ -108,6 +114,17 @@ class AdminRoute
             $router->post('/payment/getPaymentForm', 'Admin\\PaymentController@getPaymentForm');
             $router->post('/payment/save', 'Admin\\PaymentController@save');
             $router->post('/payment/drop', 'Admin\\PaymentController@drop');
+            $router->post('/payment/show', 'Admin\\PaymentController@show');
+            $router->post('/payment/sort', 'Admin\\PaymentController@sort');
+            // System
+            $router->get ('/system/getSystemStatus', 'Admin\\SystemController@getSystemStatus');
+            $router->get ('/system/getQueueStats', 'Admin\\SystemController@getQueueStats');
+            $router->get ('/system/getQueueWorkload', 'Admin\\SystemController@getQueueWorkload');
+            $router->get ('/system/getQueueMasters', '\\Laravel\\Horizon\\Http\\Controllers\\MasterSupervisorController@index');
+            // Theme
+            $router->get ('/theme/getThemes', 'Admin\\ThemeController@getThemes');
+            $router->post('/theme/saveThemeConfig', 'Admin\\ThemeController@saveThemeConfig');
+            $router->post('/theme/getThemeConfig', 'Admin\\ThemeController@getThemeConfig');
         });
     }
 }

app/Http/Routes/ClientRoute.php

@@ -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,14 +14,13 @@ 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');
+            $router->get ('/comm/config', 'Guest\\CommController@config');                                              // TODO:REMOVE:1.7.0
         });
     }
 }

app/Http/Routes/UserRoute.php

@@ -13,19 +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');
             // Order
             $router->post('/order/save', 'User\\OrderController@save');
             $router->post('/order/checkout', 'User\\OrderController@checkout');
             $router->get ('/order/check', 'User\\OrderController@check');
-            $router->get ('/order/details', 'User\\OrderController@details');
+            $router->get ('/order/details', 'User\\OrderController@detail');                                            // TODO: 1.7.0 remove
+            $router->get ('/order/detail', 'User\\OrderController@detail');
             $router->get ('/order/fetch', 'User\\OrderController@fetch');
             $router->get ('/order/getPaymentMethod', 'User\\OrderController@getPaymentMethod');
             $router->post('/order/cancel', 'User\\OrderController@cancel');
@@ -45,7 +46,6 @@ class UserRoute
             $router->post('/ticket/withdraw', 'User\\TicketController@withdraw');
             // Server
             $router->get ('/server/fetch', 'User\\ServerController@fetch');
-            $router->get ('/server/log/fetch', 'User\\ServerController@logFetch');
             // Coupon
             $router->post('/coupon/check', 'User\\CouponController@check');
             // Telegram
@@ -56,6 +56,8 @@ class UserRoute
             // Knowledge
             $router->get ('/knowledge/fetch', 'User\\KnowledgeController@fetch');
             $router->get ('/knowledge/getCategory', 'User\\KnowledgeController@getCategory');
+            // Stat
+            $router->get ('/stat/getTrafficLog', 'User\\StatController@getTrafficLog');
         });
     }
 }

app/Jobs/ServerLogJob.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Services\ServerService;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class ServerLogJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-    protected $u;
-    protected $d;
-    protected $userId;
-    protected $server;
-    protected $protocol;
-
-    public $tries = 3;
-    public $timeout = 3;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct($u, $d, $userId, $server, $protocol)
-    {
-        $this->onQueue('server_log');
-        $this->u = $u;
-        $this->d = $d;
-        $this->userId = $userId;
-        $this->server = $server;
-        $this->protocol = $protocol;
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $serverService = new ServerService();
-        if (!$serverService->log(
-            $this->userId,
-            $this->server->id,
-            $this->u,
-            $this->d,
-            $this->server->rate,
-            $this->protocol
-        )) {
-            throw new \Exception('日志记录失败');
-        }
-    }
-}

app/Jobs/StatServerJob.php

@@ -12,20 +12,28 @@ use Illuminate\Queue\SerializesModels;
 class StatServerJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-    protected $statistic;
+    protected $u;
+    protected $d;
+    protected $server;
+    protected $protocol;
+    protected $recordType;
 
     public $tries = 3;
-    public $timeout = 5;
+    public $timeout = 60;
 
     /**
      * Create a new job instance.
      *
      * @return void
      */
-    public function __construct(array $statistic)
+    public function __construct($u, $d, $server, $protocol, $recordType = 'd')
     {
-        $this->onQueue('stat_server');
-        $this->statistic = $statistic;
+        $this->onQueue('stat');
+        $this->u = $u;
+        $this->d = $d;
+        $this->server = $server;
+        $this->protocol = $protocol;
+        $this->recordType = $recordType;
     }
 
     /**
@@ -35,18 +43,34 @@ class StatServerJob implements ShouldQueue
      */
     public function handle()
     {
-        $statistic = $this->statistic;
-        $data = StatServer::where('record_at', $statistic['record_at'])
-            ->where('server_id', $statistic['server_id'])
+        $recordAt = strtotime(date('Y-m-d'));
+        if ($this->recordType === 'm') {
+            //
+        }
+
+        $data = StatServer::lockForUpdate()
+            ->where('record_at', $recordAt)
+            ->where('server_id', $this->server['id'])
+            ->where('server_type', $this->protocol)
             ->first();
         if ($data) {
             try {
-                $data->update($statistic);
+                $data->update([
+                    'u' => $data['u'] + $this->u,
+                    'd' => $data['d'] + $this->d
+                ]);
             } catch (\Exception $e) {
                 abort(500, '节点统计数据更新失败');
             }
         } else {
-            if (!StatServer::create($statistic)) {
+            if (!StatServer::create([
+                'server_id' => $this->server['id'],
+                'server_type' => $this->protocol,
+                'u' => $this->u,
+                'd' => $this->d,
+                'record_type' => $this->recordType,
+                'record_at' => $recordAt
+            ])) {
                 abort(500, '节点统计数据创建失败');
             }
         }

app/Jobs/StatUserJob.php

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

app/Jobs/TrafficFetchJob.php

@@ -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;
@@ -46,10 +46,10 @@ class TrafficFetchJob implements ShouldQueue
     {
         $user = User::lockForUpdate()->find($this->userId);
         if (!$user) return;
-        
+
         $user->t = time();
-        $user->u = $user->u + $this->u;
-        $user->d = $user->d + $this->d;
+        $user->u = $user->u + ($this->u * $this->server['rate']);
+        $user->d = $user->d + ($this->d * $this->server['rate']);
         if (!$user->save()) throw new \Exception('流量更新失败');
         $mailService = new MailService();
         $mailService->remindTraffic($user);

app/Models/Notice.php

@@ -11,6 +11,7 @@ class Notice extends Model
     protected $guarded = ['id'];
     protected $casts = [
         'created_at' => 'timestamp',
-        'updated_at' => 'timestamp'
+        'updated_at' => 'timestamp',
+        'tags' => 'array'
     ];
 }

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,8 @@ class ServerShadowsocks extends Model
         'created_at' => 'timestamp',
         'updated_at' => 'timestamp',
         'group_id' => 'array',
-        'tags' => '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/ServerV2ray.php

@@ -13,6 +13,7 @@ class ServerV2ray extends Model
         'created_at' => 'timestamp',
         'updated_at' => 'timestamp',
         'group_id' => 'array',
+        'route_id' => 'array',
         'tlsSettings' => 'array',
         'networkSettings' => 'array',
         'dnsSettings' => 'array',

app/Models/StatUser.php

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

app/Payments/AlipayF2F.php

@@ -5,8 +5,6 @@
  */
 namespace App\Payments;
 
-use Omnipay\Omnipay;
-
 class AlipayF2F {
     public function __construct($config)
     {
@@ -36,43 +34,37 @@ class AlipayF2F {
 
     public function pay($order)
     {
-        $gateway = Omnipay::create('Alipay_AopF2F');
-        $gateway->setSignType('RSA2'); //RSA/RSA2
-        $gateway->setAppId($this->config['app_id']);
-        $gateway->setPrivateKey($this->config['private_key']); // 可以是路径，也可以是密钥内容
-        $gateway->setAlipayPublicKey($this->config['public_key']); // 可以是路径，也可以是密钥内容
-        $gateway->setNotifyUrl($order['notify_url']);
-        $request = $gateway->purchase();
-        $request->setBizContent([
-            'subject' => config('v2board.app_name', 'V2Board') . ' - 订阅',
-            'out_trade_no' => $order['trade_no'],
-            'total_amount' => $order['total_amount'] / 100
-        ]);
-        /** @var \Omnipay\Alipay\Responses\AopTradePreCreateResponse $response */
-        $response = $request->send();
-        $result = $response->getAlipayResponse();
-        if ($result['code'] !== '10000') {
-            abort(500, $result['sub_msg']);
+        try {
+            $gateway = new \Library\AlipayF2F();
+            $gateway->setMethod('alipay.trade.precreate');
+            $gateway->setAppId($this->config['app_id']);
+            $gateway->setPrivateKey($this->config['private_key']); // 可以是路径，也可以是密钥内容
+            $gateway->setAlipayPublicKey($this->config['public_key']); // 可以是路径，也可以是密钥内容
+            $gateway->setNotifyUrl($order['notify_url']);
+            $gateway->setBizContent([
+                'subject' => config('v2board.app_name', 'V2Board') . ' - 订阅',
+                'out_trade_no' => $order['trade_no'],
+                'total_amount' => $order['total_amount'] / 100
+            ]);
+            $gateway->send();
+            return [
+                'type' => 0, // 0:qrcode 1:url
+                'data' => $gateway->getQrCodeUrl()
+            ];
+        } catch (\Exception $e) {
+            abort(500, $e->getMessage());
         }
-        return [
-            'type' => 0, // 0:qrcode 1:url
-            'data' => $response->getQrCode()
-        ];
     }
 
     public function notify($params)
     {
-        $gateway = Omnipay::create('Alipay_AopF2F');
-        $gateway->setSignType('RSA2'); //RSA/RSA2
+        if ($params['trade_status'] !== 'TRADE_SUCCESS') return false;
+        $gateway = new \Library\AlipayF2F();
         $gateway->setAppId($this->config['app_id']);
         $gateway->setPrivateKey($this->config['private_key']); // 可以是路径，也可以是密钥内容
         $gateway->setAlipayPublicKey($this->config['public_key']); // 可以是路径，也可以是密钥内容
-        $request = $gateway->completePurchase();
-        $request->setParams($_POST); //Optional
         try {
-            /** @var \Omnipay\Alipay\Responses\AopCompletePurchaseResponse $response */
-            $response = $request->send();
-            if ($response->isPaid()) {
+            if ($gateway->verify($params)) {
                 /**
                  * Payment is successful
                  */

app/Payments/BTCPay.php

@@ -0,0 +1,148 @@
+<?php
+
+namespace App\Payments;
+
+
+class BTCPay {
+    public function __construct($config) {
+        $this->config = $config;
+    }
+
+    public function form()
+    {
+        return [
+            'btcpay_url' => [
+                'label' => 'API接口所在网址(包含最后的斜杠)',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'btcpay_storeId' => [
+                'label' => 'storeId',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'btcpay_api_key' => [
+                'label' => 'API KEY',
+                'description' => '个人设置中的API KEY(非商店设置中的)',
+                'type' => 'input',
+            ],
+            'btcpay_webhook_key' => [
+                'label' => 'WEBHOOK KEY',
+                'description' => '',
+                'type' => 'input',
+            ],
+        ];
+    }
+
+    public function pay($order) {
+
+        $params = [
+            'jsonResponse' => true,
+            'amount' => sprintf('%.2f', $order['total_amount'] / 100),
+            'currency' => 'CNY',
+            'metadata' => [
+                'orderId' => $order['trade_no']
+            ]
+        ];
+
+        $params_string = @json_encode($params);
+
+        $ret_raw = self::_curlPost($this->config['btcpay_url'] . 'api/v1/stores/' . $this->config['btcpay_storeId'] . '/invoices', $params_string);
+
+        $ret = @json_decode($ret_raw, true);
+        
+        if(empty($ret['checkoutLink'])) {
+            abort(500, "error!");
+        }
+        return [
+            'type' => 1, // Redirect to url
+            'data' => $ret['checkoutLink'],
+        ];
+    }
+
+    public function notify($params) {
+        $payload = trim(file_get_contents('php://input'));
+
+        $headers = getallheaders();
+
+        //IS Btcpay-Sig
+        //NOT BTCPay-Sig
+        //API doc is WRONG!
+        $headerName = 'Btcpay-Sig';
+        $signraturHeader = isset($headers[$headerName]) ? $headers[$headerName] : '';
+        $json_param = json_decode($payload, true);
+
+        $computedSignature = "sha256=" . \hash_hmac('sha256', $payload, $this->config['btcpay_webhook_key']);
+
+        if (!self::hashEqual($signraturHeader, $computedSignature)) {
+            abort(400, 'HMAC signature does not match');
+            return false;
+        }
+
+        //get order id store in metadata
+        $context = stream_context_create(array(
+            'http' => array(
+                'method' => 'GET',
+                'header' => "Authorization:" . "token " . $this->config['btcpay_api_key'] . "\r\n"
+            )
+        ));
+
+        $invoiceDetail = file_get_contents($this->config['btcpay_url'] . 'api/v1/stores/' . $this->config['btcpay_storeId'] . '/invoices/' . $json_param['invoiceId'], false, $context);
+        $invoiceDetail = json_decode($invoiceDetail, true);
+
+    
+        $out_trade_no = $invoiceDetail['metadata']["orderId"];
+        $pay_trade_no=$json_param['invoiceId'];
+        return [
+            'trade_no' => $out_trade_no,
+            'callback_no' => $pay_trade_no
+        ];
+        http_response_code(200);
+        die('success');
+    }
+
+
+    private function _curlPost($url,$params=false){
+        
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_HEADER, 0);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 300);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
+        curl_setopt(
+            $ch, CURLOPT_HTTPHEADER, array('Authorization:' .'token '.$this->config['btcpay_api_key'], 'Content-Type: application/json')
+        );
+        $result = curl_exec($ch);
+        curl_close($ch);
+        return $result;
+    }
+
+
+    /**
+     * @param string $str1
+     * @param string $str2
+     * @return bool
+     */
+    private function hashEqual($str1, $str2)
+    {   
+
+        if (function_exists('hash_equals')) {
+            return \hash_equals($str1, $str2);
+        }
+
+        if (strlen($str1) != strlen($str2)) {
+            return false;
+        } else {
+            $res = $str1 ^ $str2;
+            $ret = 0;
+
+            for ($i = strlen($res) - 1; $i >= 0; $i--) {
+                $ret |= ord($res[$i]);
+            }
+            return !$ret;
+        }
+    }
+    
+}
+

app/Payments/CoinPayments.php

@@ -0,0 +1,104 @@
+<?php
+
+namespace App\Payments;
+
+class CoinPayments {
+    public function __construct($config) {
+        $this->config = $config;
+    }
+
+    public function form()
+    {
+        return [
+            'coinpayments_merchant_id' => [
+                'label' => 'Merchant ID',
+                'description' => '商户 ID，填写您在 Account Settings 中得到的 ID',
+                'type' => 'input',
+            ],
+            'coinpayments_ipn_secret' => [
+                'label' => 'IPN Secret',
+                'description' => '通知密钥，填写您在 Merchant Settings 中自行设置的值',
+                'type' => 'input',
+            ],
+            'coinpayments_currency' => [
+                'label' => '货币代码',
+                'description' => '填写您的货币代码（大写），建议与 Merchant Settings 中的值相同',
+                'type' => 'input',
+            ]
+        ];
+    }
+
+    public function pay($order)
+    {
+
+        // IPN notifications are slow, when the transaction is successful, we should return to the user center to avoid user confusion
+        $parseUrl = parse_url($order['return_url']);
+        $port = isset($parseUrl['port']) ? ":{$parseUrl['port']}" : '';
+        $successUrl = "{$parseUrl['scheme']}://{$parseUrl['host']}{$port}";
+
+        $params = [
+            'cmd' => '_pay_simple',
+            'reset' => 1,
+            'merchant' => $this->config['coinpayments_merchant_id'],
+            'item_name' => $order['trade_no'],
+            'item_number' => $order['trade_no'],
+            'want_shipping' => 0,
+            'currency' => $this->config['coinpayments_currency'],
+            'amountf' => sprintf('%.2f', $order['total_amount'] / 100),
+            'success_url' => $successUrl,
+            'cancel_url' => $order['return_url'],
+            'ipn_url' => $order['notify_url']
+        ];
+
+        $params_string = http_build_query($params);
+
+        return [
+            'type' => 1, // Redirect to url
+            'data' =>  'https://www.coinpayments.net/index.php?' . $params_string
+        ];
+    }
+
+    public function notify($params)
+    {
+
+        if (!isset($params['merchant']) || $params['merchant'] != trim($this->config['coinpayments_merchant_id'])) {
+            abort(500, 'No or incorrect Merchant ID passed');
+        }
+
+        $headers = getallheaders();
+
+        ksort($params);
+        reset($params);
+        $request = stripslashes(http_build_query($params));
+
+        $headerName = 'Hmac';
+        $signHeader = isset($headers[$headerName]) ? $headers[$headerName] : '';
+
+        $hmac = hash_hmac("sha512", $request, trim($this->config['coinpayments_ipn_secret']));
+
+        // if ($hmac != $signHeader) { <-- Use this if you are running a version of PHP below 5.6.0 without the hash_equals function
+        //     abort(400, 'HMAC signature does not match');
+        // }
+
+        if (!hash_equals($hmac, $signHeader)) {
+            abort(400, 'HMAC signature does not match');
+        }
+
+        // HMAC Signature verified at this point, load some variables.
+        $status = $params['status'];
+        if ($status >= 100 || $status == 2) {
+            // payment is complete or queued for nightly payout, success
+            return [
+                'trade_no' => $params['item_number'],
+                'callback_no' => $params['txn_id'],
+                'custom_result' => 'IPN OK'
+            ];
+        } else if ($status < 0) {
+            //payment error, this is usually final but payments will sometimes be reopened if there was no exchange rate conversion or with seller consent
+            abort(500, 'Payment Timed Out or Error');
+        } else {
+            //payment is pending, you can optionally add a note to the order page
+            die('IPN OK: pending');
+        }
+    }
+}

app/Payments/Coinbase.php

@@ -0,0 +1,129 @@
+<?php
+
+namespace App\Payments;
+
+class Coinbase {
+    public function __construct($config) {
+        $this->config = $config;
+    }
+
+    public function form()
+    {
+        return [
+            'coinbase_url' => [
+                'label' => '接口地址',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'coinbase_api_key' => [
+                'label' => 'API KEY',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'coinbase_webhook_key' => [
+                'label' => 'WEBHOOK KEY',
+                'description' => '',
+                'type' => 'input',
+            ],
+        ];
+    }
+
+    public function pay($order) {
+
+        $params = [
+            'name' => '订阅套餐',
+            'description' => '订单号 ' . $order['trade_no'],
+            'pricing_type' => 'fixed_price',
+            'local_price' => [
+                'amount' => sprintf('%.2f', $order['total_amount'] / 100),
+                'currency' => 'CNY'
+            ],
+            'metadata' => [
+                "outTradeNo" => $order['trade_no'],
+            ],
+        ];
+
+        $params_string = http_build_query($params);
+        
+        $ret_raw = self::_curlPost($this->config['coinbase_url'], $params_string);
+
+        $ret = @json_decode($ret_raw, true);
+        
+        if(empty($ret['data']['hosted_url'])) {
+            abort(500, "error!");
+        }
+        return [
+            'type' => 1,
+            'data' => $ret['data']['hosted_url'],
+        ];
+    }
+
+    public function notify($params) {
+        
+        $payload = trim(file_get_contents('php://input'));
+        $json_param = json_decode($payload, true); 
+
+
+        $headerName = 'X-Cc-Webhook-Signature';
+        $headers = getallheaders();
+        $signatureHeader = isset($headers[$headerName]) ? $headers[$headerName] : '';
+        $computedSignature = \hash_hmac('sha256', $payload, $this->config['coinbase_webhook_key']);
+
+        if (!self::hashEqual($signatureHeader, $computedSignature)) {
+            abort(400, 'HMAC signature does not match');
+        }
+        
+        $out_trade_no = $json_param['event']['data']['metadata']['outTradeNo'];
+        $pay_trade_no=$json_param['event']['id'];
+        return [
+            'trade_no' => $out_trade_no,
+            'callback_no' => $pay_trade_no
+        ];
+        http_response_code(200);
+        die('success');
+    }
+
+
+    private function _curlPost($url,$params=false){
+        
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_HEADER, 0);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 300);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
+        curl_setopt(
+            $ch, CURLOPT_HTTPHEADER, array('X-CC-Api-Key:' .$this->config['coinbase_api_key'], 'X-CC-Version: 2018-03-22')
+        );
+        $result = curl_exec($ch);
+        curl_close($ch);
+        return $result;
+    }
+
+
+    /**
+     * @param string $str1
+     * @param string $str2
+     * @return bool
+     */
+    public function hashEqual($str1, $str2)
+    {
+        if (function_exists('hash_equals')) {
+            return \hash_equals($str1, $str2);
+        }
+
+        if (strlen($str1) != strlen($str2)) {
+            return false;
+        } else {
+            $res = $str1 ^ $str2;
+            $ret = 0;
+
+            for ($i = strlen($res) - 1; $i >= 0; $i--) {
+                $ret |= ord($res[$i]);
+            }
+            return !$ret;
+        }
+    }
+    
+}
+

app/Payments/MGate.php

@@ -32,6 +32,11 @@ class MGate {
                 'label' => 'AppSecret',
                 'description' => '',
                 'type' => 'input',
+            ],
+            'mgate_source_currency' => [
+                'label' => '源货币',
+                'description' => '默认CNY',
+                'type' => 'input'
             ]
         ];
     }
@@ -44,12 +49,16 @@ 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'];
         $params['sign'] = md5($str);
         $curl = new Curl();
         $curl->setUserAgent('MGate');
+        $curl->setOpt(CURLOPT_SSL_VERIFYPEER, 0);
         $curl->post($this->config['mgate_url'] . '/v1/gateway/fetch', http_build_query($params));
         $result = $curl->response;
         if (!$result) {

app/Payments/StripeAlipay.php

@@ -40,7 +40,7 @@ class StripeAlipay {
         $currency = $this->config['currency'];
         $exchange = $this->exchange('CNY', strtoupper($currency));
         if (!$exchange) {
-            abort(500, __('user.order.stripeAlipay.currency_convert_timeout'));
+            abort(500, __('Currency conversion has timed out, please try again later'));
         }
         Stripe::setApiKey($this->config['stripe_sk_live']);
         $source = Source::create([
@@ -58,7 +58,7 @@ class StripeAlipay {
             ]
         ]);
         if (!$source['redirect']['url']) {
-            abort(500, __('user.order.stripeAlipay.gateway_request_failed'));
+            abort(500, __('Payment gateway request failed'));
         }
         return [
             'type' => 1,
@@ -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

@@ -46,7 +46,7 @@ class StripeCredit {
         $currency = $this->config['currency'];
         $exchange = $this->exchange('CNY', strtoupper($currency));
         if (!$exchange) {
-            abort(500, __('user.order.stripeCard.currency_convert_timeout'));
+            abort(500, __('Currency conversion has timed out, please try again later'));
         }
         Stripe::setApiKey($this->config['stripe_sk_live']);
         try {
@@ -62,10 +62,10 @@ class StripeCredit {
             ]);
         } catch (\Exception $e) {
             info($e);
-            abort(500, __('user.order.stripeCard.was_problem'));
+            abort(500, __('Payment failed. Please check your credit card information'));
         }
         if (!$charge->paid) {
-            abort(500, __('user.order.stripeCard.deduction_failed'));
+            abort(500, __('Payment failed. Please check your credit card information'));
         }
         return [
             'type' => 2,
@@ -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

@@ -40,7 +40,7 @@ class StripeWepay {
         $currency = $this->config['currency'];
         $exchange = $this->exchange('CNY', strtoupper($currency));
         if (!$exchange) {
-            abort(500, __('user.order.stripeAlipay.currency_convert_timeout'));
+            abort(500, __('Currency conversion has timed out, please try again later'));
         }
         Stripe::setApiKey($this->config['stripe_sk_live']);
         $source = Source::create([
@@ -58,7 +58,7 @@ class StripeWepay {
             ]
         ]);
         if (!$source['wechat']['qr_code_url']) {
-            abort(500, __('user.order.stripeWepay.gateway_request_failed'));
+            abort(500, __('Payment gateway request failed'));
         }
         return [
             'type' => 0,
@@ -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/Payments/WechatPayNative.php

@@ -9,7 +9,6 @@ class WechatPayNative {
     public function __construct($config)
     {
         $this->config = $config;
-        $this->customResult = '<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>';
     }
 
     public function form()
@@ -57,7 +56,8 @@ class WechatPayNative {
         }
         return [
             'type' => 0,
-            'data' => $response['code_url']
+            'data' => $response['code_url'],
+            'custom_result' => '<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>'
         ];
     }
 

app/Plugins/Telegram/Commands/Bind.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Plugins\Telegram\Commands;
+
+use App\Models\User;
+use App\Plugins\Telegram\Telegram;
+
+class Bind extends Telegram {
+    public $command = '/bind';
+    public $description = '将Telegram账号绑定到网站';
+
+    public function handle($message, $match = []) {
+        if (!$message->is_private) return;
+        if (!isset($message->args[0])) {
+            abort(500, '参数有误，请携带订阅地址发送');
+        }
+        $subscribeUrl = $message->args[0];
+        $subscribeUrl = parse_url($subscribeUrl);
+        parse_str($subscribeUrl['query'], $query);
+        $token = $query['token'];
+        if (!$token) {
+            abort(500, '订阅地址无效');
+        }
+        $user = User::where('token', $token)->first();
+        if (!$user) {
+            abort(500, '用户不存在');
+        }
+        if ($user->telegram_id) {
+            abort(500, '该账号已经绑定了Telegram账号');
+        }
+        $user->telegram_id = $message->chat_id;
+        if (!$user->save()) {
+            abort(500, '设置失败');
+        }
+        $telegramService = $this->telegramService;
+        $telegramService->sendMessage($message->chat_id, '绑定成功');
+    }
+}