Merge pull request #255 from v2board/dev

1.3

.env.example

@@ -7,7 +7,7 @@ APP_URL=http://localhost
 LOG_CHANNEL=stack
 
 DB_CONNECTION=mysql
-DB_HOST=db
+DB_HOST=localhost
 DB_PORT=3306
 DB_DATABASE=laravel
 DB_USERNAME=root
@@ -45,4 +45,4 @@ PUSHER_APP_SECRET=
 PUSHER_APP_CLUSTER=mt1
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

.gitignore

@@ -1,5 +1,5 @@
 /node_modules
-/config/v2panel.php
+/config/v2board.php
 /public/hot
 /public/storage
 /public/env.example.js
@@ -9,6 +9,7 @@
 .env.backup
 .phpunit.result.cache
 .idea
+.lock
 Homestead.json
 Homestead.yaml
 npm-debug.log
@@ -16,4 +17,4 @@ yarn-error.log
 composer.phar
 composer.lock
 yarn.lock
-docker-compose.yml
+docker-compose.yml

app/Console/Commands/CheckCommission.php

@@ -38,6 +38,24 @@ class CheckCommission extends Command
      * @return mixed
      */
     public function handle()
+    {
+        $this->autoCheck();
+        $this->autoPayCommission();
+    }
+
+    public function autoCheck()
+    {
+        if ((int)config('v2board.commission_auto_check_enable', 1)) {
+            Order::where('commission_status', 0)
+                ->where('status', 3)
+                ->where('updated_at', '<=', strtotime('-3 day', time()))
+                ->update([
+                    'commission_status' => 1
+                ]);
+        }
+    }
+
+    public function autoPayCommission()
     {
         $order = Order::where('commission_status', 1)
             ->where('status', 3)

app/Console/Commands/CheckOrder.php

@@ -2,12 +2,14 @@
 
 namespace App\Console\Commands;
 
+use App\Services\OrderService;
 use Illuminate\Console\Command;
 use App\Models\Order;
 use App\Models\User;
 use App\Models\Plan;
 use App\Utils\Helper;
 use App\Models\Coupon;
+use Illuminate\Support\Facades\DB;
 
 class CheckOrder extends Command
 {
@@ -42,14 +44,14 @@ class CheckOrder extends Command
      */
     public function handle()
     {
-        $order = Order::get();
-        foreach ($order as $item) {
+        $orders = Order::get();
+        foreach ($orders as $item) {
             switch ($item->status) {
                 // cancel
                 case 0:
                     if (strtotime($item->created_at) <= (time() - 1800)) {
-                        $item->status = 2;
-                        $item->save();
+                        $orderService = new OrderService($item);
+                        $orderService->cancel();
                     }
                     break;
                 case 1:
@@ -60,29 +62,78 @@ class CheckOrder extends Command
         }
     }
 
-    private function orderHandle($order)
+    private function orderHandle(Order $order)
     {
         $user = User::find($order->user_id);
-        return $this->buy($order, $user);
+        $plan = Plan::find($order->plan_id);
+
+        if ($order->refund_amount) {
+            $user->balance = $user->balance + $order->refund_amount;
+        }
+        DB::beginTransaction();
+        if ($order->surplus_order_ids) {
+            try {
+                Order::whereIn('id', json_decode($order->surplus_order_ids))->update([
+                    'status' => 4
+                ]);
+            } catch (\Exception $e) {
+                DB::rollback();
+                abort(500, '开通失败');
+            }
+        }
+        switch ((string)$order->cycle) {
+            case 'onetime_price':
+                $this->buyByOneTime($order, $user, $plan);
+                break;
+            case 'reset_price':
+                $this->buyReset($user);
+                break;
+            default:
+                $this->buyByCycle($order, $user, $plan);
+        }
+        if (!$user->save()) {
+            DB::rollBack();
+            abort(500, '开通失败');
+        }
+        $order->status = 3;
+        if (!$order->save()) {
+            DB::rollBack();
+            abort(500, '开通失败');
+        }
+
+        DB::commit();
     }
 
-    private function buy($order, $user)
+    private function buyReset(User $user)
     {
-        $plan = Plan::find($order->plan_id);
-        // change plan process, try out is enable and plan
-        if ((int)$order->type === 3 && (int)config('v2board.try_out_plan_id') !== (int)$user->plan_id) {
-            $transferEnableDifference = $plan->transfer_enable - ($user->transfer_enable / 1073741824);
-            $user->expired_at = $user->expired_at - ($transferEnableDifference * config('v2board.plan_transfer_hour', 12) * 3600);
+        $user->u = 0;
+        $user->d = 0;
+    }
+
+    private function buyByCycle(Order $order, User $user, Plan $plan)
+    {
+        // change plan process
+        if ((int)$order->type === 3) {
+            $user->expired_at = time();
         }
         $user->transfer_enable = $plan->transfer_enable * 1073741824;
-        $user->enable = 1;
+        if ((int)config('v2board.renew_reset_traffic_enable', 1)) {
+            $user->u = 0;
+            $user->d = 0;
+        }
         $user->plan_id = $plan->id;
         $user->group_id = $plan->group_id;
         $user->expired_at = $this->getTime($order->cycle, $user->expired_at);
-        if ($user->save()) {
-            $order->status = 3;
-            $order->save();
-        }
+    }
+
+    private function buyByOneTime(Order $order, User $user, Plan $plan)
+    {
+        $user->transfer_enable = $plan->transfer_enable * 1073741824;
+        $user->u = 0;
+        $user->d = 0;
+        $user->plan_id = $plan->id;
+        $user->group_id = $plan->group_id;
+        $user->expired_at = NULL;
     }
 
     private function getTime($str, $timestamp)

app/Console/Commands/ResetTraffic.php

@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
+use App\Models\User;
 
 class ResetTraffic extends Command
 {
@@ -38,7 +38,47 @@ class ResetTraffic extends Command
      */
     public function handle()
     {
-        DB::table('v2_user')->update([
+        $user = User::where('expired_at', '!=', NULL)
+            ->where('expired_at', '>', time());
+        $resetTrafficMethod = config('v2board.reset_traffic_method', 0);
+        switch ((int)$resetTrafficMethod) {
+            // 1 a month
+            case 0:
+                $this->resetByMonthFirstDay($user);
+                break;
+            // expire day
+            case 1:
+                $this->resetByExpireDay($user);
+                break;
+        }
+    }
+
+    private function resetByMonthFirstDay($user):void
+    {
+        if ((string)date('d') === '01') {
+            $user->update([
+                'u' => 0,
+                'd' => 0
+            ]);
+        }
+    }
+
+    private function resetByExpireDay($user):void
+    {
+        $lastDay = date('d', strtotime('last day of +0 months'));
+        $users = [];
+        foreach ($user->get() as $item) {
+            $expireDay = date('d', $item->expired_at);
+            $today = date('d');
+            if ($expireDay === $today) {
+                array_push($users, $item->id);
+            }
+
+            if (($today === $lastDay) && $expireDay >= $lastDay) {
+                array_push($users, $item->id);
+            }
+        }
+        User::whereIn('id', $users)->update([
             'u' => 0,
             'd' => 0
         ]);

app/Console/Commands/SendRemindMail.php

@@ -5,7 +5,7 @@ namespace App\Console\Commands;
 use Illuminate\Console\Command;
 use App\Models\User;
 use App\Models\MailLog;
-use App\Jobs\SendEmail;
+use App\Jobs\SendEmailJob;
 
 class SendRemindMail extends Command
 {
@@ -49,11 +49,11 @@ class SendRemindMail extends Command
 
     private function remindExpire($user)
     {
-        if (($user->expired_at - 86400) < time() && $user->expired_at > time()) {
-            SendEmail::dispatch([
+        if ($user->expired_at !== NULL && ($user->expired_at - 86400) < time() && $user->expired_at > time()) {
+            SendEmailJob::dispatch([
                 'email' => $user->email,
                 'subject' => '在' . config('v2board.app_name', 'V2board') . '的服务即将到期',
-                'template_name' => 'mail.sendRemindExpire',
+                'template_name' => 'remindExpire',
                 'template_value' => [
                     'name' => config('v2board.app_name', 'V2Board'),
                     'url' => config('v2board.app_url')
@@ -66,13 +66,13 @@ class SendRemindMail extends Command
     {
         if ($this->remindTrafficIsWarnValue(($user->u + $user->d), $user->transfer_enable)) {
             $sendCount = MailLog::where('created_at', '>=', strtotime(date('Y-m-1')))
-                ->where('template_name', 'mail.sendRemindTraffic')
+                ->where('template_name', 'like', '%remindTraffic%')
                 ->count();
             if ($sendCount > 0) return;
-            SendEmail::dispatch([
+            SendEmailJob::dispatch([
                 'email' => $user->email,
                 'subject' => '在' . config('v2board.app_name', 'V2board') . '的流量使用已达到80%',
-                'template_name' => 'mail.sendRemindTraffic',
+                'template_name' => 'remindTraffic',
                 'template_value' => [
                     'name' => config('v2board.app_name', 'V2Board'),
                     'url' => config('v2board.app_url')

app/Console/Commands/Test.php

@@ -3,24 +3,22 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use App\Models\Order;
-use App\Models\User;
 
-class CheckExpire extends Command
+class Test extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'check:expire';
+    protected $signature = 'test';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = '过期检查';
+    protected $description = '';
 
     /**
      * Create a new command instance.
@@ -39,15 +37,5 @@ class CheckExpire extends Command
      */
     public function handle()
     {
-        $users = User::all();
-        foreach ($users as $user) {
-            if ($user->expired_at < time() || $user->u + $user->d >= $user->transfer_enable) {
-                $user->enable = 0;
-            } else {
-                $user->enable = 1;
-            }
-            $user->save();
-        }
     }
-
 }

app/Console/Commands/V2boardInstall.php

@@ -3,6 +3,7 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
+use Illuminate\Encryption\Encrypter;
 use App\Models\User;
 use App\Utils\Helper;
 use Illuminate\Support\Facades\DB;
@@ -40,43 +41,69 @@ class V2boardInstall extends Command
      */
     public function handle()
     {
-        if (\File::exists(base_path() . '/.lock')) {
-            abort(500, 'V2board 已安装，如需重新安装请删除目录下.lock文件');
-        }
-        \Artisan::call('key:generate');
-        sleep(2);
-        \Artisan::call('config:cache');
-        DB::connection()->getPdo();
-        $file = \File::get(base_path() . '/install.sql');
-        if (!$file) {
-            abort(500, '数据库文件不存在');
-        }
-        $sql = str_replace("\n", "", $file);
-        $sql = preg_split("/;/", $sql);
-        if (!is_array($sql)) {
-            abort(500, '数据库文件格式有误');
-        }
-        $this->info('正在导入数据库请稍等...');
-        foreach ($sql as $item) {
-            try {
-                DB::select(DB::raw($item));
-            } catch (\Exception $e) {
+        try {
+            $this->info("__     ______  ____                      _  ");
+            $this->info("\ \   / /___ \| __ )  ___   __ _ _ __ __| | ");
+            $this->info(" \ \ / /  __) |  _ \ / _ \ / _` | '__/ _` | ");
+            $this->info("  \ V /  / __/| |_) | (_) | (_| | | | (_| | ");
+            $this->info("   \_/  |_____|____/ \___/ \__,_|_|  \__,_| ");
+            if (\File::exists(base_path() . '/.lock')) {
+                abort(500, 'V2board 已安装，如需重新安装请删除目录下.lock文件');
+            }
+            if (!\File::exists(base_path() . '/.env')) {
+                if (!copy(base_path() . '/.env.example', base_path() . '/.env')) {
+                    abort(500, '复制环境文件失败，请检查目录权限');
+                }
+            }
+            $this->saveToEnv([
+                'APP_KEY' => 'base64:' . base64_encode(Encrypter::generateKey('AES-256-CBC')),
+                'DB_HOST' => $this->ask('请输入数据库地址（默认:localhost）', 'localhost'),
+                'DB_DATABASE' => $this->ask('请输入数据库名'),
+                'DB_USERNAME' => $this->ask('请输入数据库用户名'),
+                'DB_PASSWORD' => $this->ask('请输入数据库密码')
+            ]);
+            \Artisan::call('config:clear');
+            \Artisan::call('config:cache');
+            try {
+                DB::connection()->getPdo();
+            } catch (\Exception $e) {
+                abort(500, '数据库连接失败');
+            }
+            $file = \File::get(base_path() . '/database/install.sql');
+            if (!$file) {
+                abort(500, '数据库文件不存在');
+            }
+            $sql = str_replace("\n", "", $file);
+            $sql = preg_split("/;/", $sql);
+            if (!is_array($sql)) {
+                abort(500, '数据库文件格式有误');
+            }
+            $this->info('正在导入数据库请稍等...');
+            foreach ($sql as $item) {
+                try {
+                    DB::select(DB::raw($item));
+                } catch (\Exception $e) {
+                }
+            }
+            $this->info('数据库导入完成');
+            $email = '';
+            while (!$email) {
+                $email = $this->ask('请输入管理员邮箱?');
+            }
+            $password = '';
+            while (!$password) {
+                $password = $this->ask('请输入管理员密码?');
+            }
+            if (!$this->registerAdmin($email, $password)) {
+                abort(500, '管理员账号注册失败，请重试');
             }
-        }
-        $email = '';
-        while (!$email) {
-            $email = $this->ask('请输入管理员邮箱?');
-        }
-        $password = '';
-        while (!$password) {
-            $password = $this->ask('请输入管理员密码?');
-        }
-        if (!$this->registerAdmin($email, $password)) {
-            abort(500, '管理员账号注册失败，请重试');
-        }
 
-        $this->info('一切就绪');
-        \File::put(base_path() . '/.lock', time());
+            $this->info('一切就绪');
+            $this->info('访问 http(s)://你的站点/admin 进入管理面板');
+            \File::put(base_path() . '/.lock', time());
+        } catch (\Exception $e) {
+            $this->error($e->getMessage());
+        }
     }
 
     private function registerAdmin($email, $password)
@@ -92,4 +119,36 @@ class V2boardInstall extends Command
         $user->is_admin = 1;
         return $user->save();
     }
+
+    private function saveToEnv($data = [])
+    {
+        function set_env_var($key, $value)
+        {
+            if (! is_bool(strpos($value, ' '))) {
+                $value = '"' . $value . '"';
+            }
+            $key = strtoupper($key);
+
+            $envPath = app()->environmentFilePath();
+            $contents = file_get_contents($envPath);
+
+            preg_match("/^{$key}=[^\r\n]*/m", $contents, $matches);
+
+            $oldValue = count($matches) ? $matches[0] : '';
+
+            if ($oldValue) {
+                $contents = str_replace("{$oldValue}", "{$key}={$value}", $contents);
+            } else {
+                $contents = $contents . "\n{$key}={$value}\n";
+            }
+
+            $file = fopen($envPath, 'w');
+            fwrite($file, $contents);
+            return fclose($file);
+        }
+        foreach($data as $key => $value) {
+            set_env_var($key, $value);
+        }
+        return true;
+    }
 }

app/Console/Commands/V2boardUpdate.php

@@ -40,7 +40,7 @@ class V2boardUpdate extends Command
     {
         \Artisan::call('config:cache');
         DB::connection()->getPdo();
-        $file = \File::get(base_path() . '/update.sql');
+        $file = \File::get(base_path() . '/database/update.sql');
         if (!$file) {
             abort(500, '数据库文件不存在');
         }

app/Console/Kernel.php

@@ -28,10 +28,9 @@ class Kernel extends ConsoleKernel
         $schedule->command('v2board:cache')->hourly();
         // check
         $schedule->command('check:order')->everyMinute();
-        $schedule->command('check:expire')->everyMinute();
         $schedule->command('check:commission')->everyMinute();
         // reset
-        $schedule->command('reset:traffic')->monthly();
+        $schedule->command('reset:traffic')->daily();
         $schedule->command('reset:serverLog')->monthly();
         // send
         $schedule->command('send:remindMail')->dailyAt('11:30');

app/Exceptions/Handler.php

@@ -46,6 +46,9 @@ class Handler extends ExceptionHandler
      */
     public function render($request, Exception $exception)
     {
+        if($exception instanceof \Illuminate\Http\Exceptions\ThrottleRequestsException) {
+            abort(429, '请求频繁，请稍后再试');
+        }
         return parent::render($request, $exception);
     }
 

app/Http/Controllers/Admin/ConfigController.php

@@ -3,37 +3,69 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\Admin\ConfigSave;
+use App\Services\TelegramService;
 use Illuminate\Http\Request;
+use App\Utils\Dict;
 use App\Http\Controllers\Controller;
 
 class ConfigController extends Controller
 {
-    public function init()
+    public function getEmailTemplate()
     {
+        $path = resource_path('views/mail/');
+        $files = array_map(function ($item) use ($path) {
+            return str_replace($path, '', $item);
+        }, glob($path . '*'));
+        return response([
+            'data' => $files
+        ]);
+    }
 
+    public function setTelegramWebhook(Request $request)
+    {
+        $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')))
+            )
+        );
+        return response([
+            'data' => true
+        ]);
     }
 
     public function fetch()
     {
+        // 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)
+                    '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)
                 ],
                 '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)
+                ],
+                'subscribe' => [
                     'plan_change_enable' => (int)config('v2board.plan_change_enable', 1),
-                    'plan_transfer_hour' => config('v2board.plan_transfer_hour', 12),
-                    'try_out_enable' => (int)config('v2board.try_out_enable', 0),
-                    'try_out_plan_id' => (int)config('v2board.try_out_plan_id'),
-                    'try_out_hour' => (int)config('v2board.try_out_hour', 1)
+                    'reset_traffic_method' => (int)config('v2board.reset_traffic_method', 0),
+                    'renew_reset_traffic_enable' => (int)config('v2board.renew_reset_traffic_enable', 1)
                 ],
                 'pay' => [
                     // alipay
@@ -42,29 +74,42 @@ class ConfigController extends Controller
                     '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_sk_live' => config('v2board.stripe_sk_live'),
                     'stripe_pk_live' => config('v2board.stripe_pk_live'),
-                    'stripe_alipay_enable' => (int)config('v2board.stripe_alipay_enable'),
-                    'stripe_wepay_enable' => (int)config('v2board.stripe_wepay_enable'),
                     'stripe_webhook_key' => config('v2board.stripe_webhook_key'),
+                    'stripe_currency' => config('v2board.stripe_currency', 'hkd'),
                     // bitpayx
-                    'bitpayx_enable' => config('v2board.bitpayx_enable'),
+                    'bitpayx_name' => config('v2board.bitpayx_name', '聚合支付'),
+                    'bitpayx_enable' => (int)config('v2board.bitpayx_enable', 0),
                     'bitpayx_appsecret' => config('v2board.bitpayx_appsecret'),
                     // paytaro
-                    'paytaro_enable' => config('v2board.paytaro_enable'),
+                    'paytaro_name' => config('v2board.paytaro_name', '聚合支付'),
+                    'paytaro_enable' => (int)config('v2board.paytaro_enable', 0),
                     'paytaro_app_id' => config('v2board.paytaro_app_id'),
                     'paytaro_app_secret' => config('v2board.paytaro_app_secret')
                 ],
                 'frontend' => [
-                    'frontend_theme' => config('v2board.frontend_theme', 1),
+                    '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_license' => config('v2board.server_license')
+                    'server_license' => config('v2board.server_license'),
+                    'server_log_level' => config('v2board.server_log_level', 'none')
                 ],
                 'tutorial' => [
                     'apple_id' => config('v2board.apple_id')
+                ],
+                'email' => [
+                    'email_template' => config('v2board.email_template', 'default')
+                ],
+                'telegram' => [
+                    'telegram_bot_enable' => config('v2board.telegram_bot_enable', 0),
+                    'telegram_bot_token' => config('v2board.telegram_bot_token')
                 ]
             ]
         ]);
@@ -75,7 +120,7 @@ class ConfigController extends Controller
         $data = $request->input();
         $array = \Config::get('v2board');
         foreach ($data as $k => $v) {
-            if (!in_array($k, ConfigSave::filter())) {
+            if (!in_array($k, array_keys(ConfigSave::RULES))) {
                 abort(500, '参数' . $k . '不在规则内，禁止修改');
             }
             $array[$k] = $v;
@@ -85,6 +130,9 @@ class ConfigController extends Controller
             abort(500, '修改失败');
         }
         \Artisan::call('config:cache');
+        if (function_exists('opcache')) {
+            opcache_reset();
+        }
         return response([
             'data' => true
         ]);

app/Http/Controllers/Admin/CouponController.php

@@ -34,7 +34,9 @@ class CouponController extends Controller
                 abort(500, '创建失败');
             }
         } else {
-            if (!Coupon::find($request->input('id'))->update($params)) {
+            try {
+                Coupon::find($request->input('id'))->update($params);
+            } catch (\Exception $e) {
                 abort(500, '保存失败');
             }
         }

app/Http/Controllers/Admin/MailController.php

@@ -3,36 +3,41 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\Admin\MailSend;
+use App\Services\UserService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use App\Models\User;
-use App\Jobs\SendEmail;
+use App\Jobs\SendEmailJob;
 
 class MailController extends Controller
 {
     public function send(MailSend $request)
     {
-        if ($request->input('type') == 2 && empty($request->input('receiver'))) {
-            abort(500, '收件人不能为空');
-        }
-
-        if ($request->input('receiver')) {
-            $users = User::whereIn('id', $request->input('receiver'))->get();
-        } else {
-            $users = User::all();
+        $userService = new UserService();
+        $users = [];
+        switch ($request->input('type')) {
+            case 1: $users = $userService->getAllUsers();
+            break;
+            case 2: $users = $userService->getUsersByIds($request->input('receiver'));
+            break;
+            // available users
+            case 3: $users = $userService->getAvailableUsers();
+            break;
+            // un available users
+            case 4: $users = $userService->getUnAvailbaleUsers();
+            break;
         }
 
         foreach ($users as $user) {
-            SendEmail::dispatch([
+            SendEmailJob::dispatch([
                 'email' => $user->email,
                 'subject' => $request->input('subject'),
-                'template_name' => 'mail.sendEmailCustom',
+                'template_name' => 'notify',
                 'template_value' => [
                     'name' => config('v2board.app_name', 'V2Board'),
                     'url' => config('v2board.app_url'),
                     'content' => $request->input('content')
                 ]
-            ])->onQueue('other_mail');
+            ]);
         }
 
         return response([

app/Http/Controllers/Admin/NoticeController.php

@@ -29,7 +29,9 @@ class NoticeController extends Controller
                 abort(500, '保存失败');
             }
         } else {
-            if (!Notice::find($request->input('id'))->update($data)) {
+            try {
+                Notice::find($request->input('id'))->update($data);
+            } catch (\Exception $e) {
                 abort(500, '保存失败');
             }
         }

app/Http/Controllers/Admin/OrderController.php

@@ -2,12 +2,16 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Http\Requests\Admin\OrderAssign;
 use App\Http\Requests\Admin\OrderUpdate;
+use App\Services\OrderService;
+use App\Utils\Helper;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Order;
 use App\Models\User;
 use App\Models\Plan;
+use Illuminate\Support\Facades\DB;
 
 class OrderController extends Controller
 {
@@ -22,10 +26,14 @@ class OrderController extends Controller
         if ($request->input('is_commission')) {
             $orderModel->where('invite_user_id', '!=', NULL);
             $orderModel->where('status', 3);
+            $orderModel->where('commission_balance', '>', 0);
         }
         if ($request->input('id')) {
             $orderModel->where('id', $request->input('id'));
         }
+        if ($request->input('user_id')) {
+            $orderModel->where('user_id', $request->input('user_id'));
+        }
         $total = $orderModel->count();
         $res = $orderModel->forPage($current, $pageSize)
             ->get();
@@ -45,7 +53,7 @@ class OrderController extends Controller
 
     public function update(OrderUpdate $request)
     {
-        $updateData = $request->only([
+        $params = $request->only([
             'status',
             'commission_status'
         ]);
@@ -56,7 +64,19 @@ class OrderController extends Controller
             abort(500, '订单不存在');
         }
 
-        if (!$order->update($updateData)) {
+        if (isset($params['status']) && (int)$params['status'] === 2) {
+            $orderService = new OrderService($order);
+            if (!$orderService->cancel()) {
+                abort(500, '更新失败');
+            }
+            return response([
+                'data' => true
+            ]);
+        }
+
+        try {
+            $order->update($params);
+        } catch (\Exception $e) {
             abort(500, '更新失败');
         }
 
@@ -84,4 +104,50 @@ class OrderController extends Controller
             'data' => true
         ]);
     }
+
+    public function assign(OrderAssign $request)
+    {
+        $plan = Plan::find($request->input('plan_id'));
+        $user = User::where('email', $request->input('email'))->first();
+
+        if (!$user) {
+            abort(500, '该用户不存在');
+        }
+
+        if (!$plan) {
+            abort(500, '该订阅不存在');
+        }
+
+        DB::beginTransaction();
+        $order = new Order();
+        $orderService = new OrderService($order);
+        $order->user_id = $user->id;
+        $order->plan_id = $plan->id;
+        $order->cycle = $request->input('cycle');
+        $order->trade_no = Helper::guid();
+        $order->total_amount = $request->input('total_amount');
+
+        if ($order->cycle === 'reset_price') {
+            $order->type = 4;
+        } else if ($user->plan_id !== NULL && $order->plan_id !== $user->plan_id) {
+            $order->type = 3;
+        } else if ($user->expired_at > time() && $order->plan_id == $user->plan_id) {
+            $order->type = 2;
+        } else {
+            $order->type = 1;
+        }
+
+        $orderService->setInvite($user);
+
+        if (!$order->save()) {
+            DB::rollback();
+            abort(500, '订单创建失败');
+        }
+
+        DB::commit();
+
+        return response([
+            'data' => $order->trade_no
+        ]);
+    }
 }

app/Http/Controllers/Admin/PlanController.php

@@ -3,43 +3,54 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\Admin\PlanSave;
+use App\Http\Requests\Admin\PlanSort;
 use App\Http\Requests\Admin\PlanUpdate;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Plan;
 use App\Models\Order;
 use App\Models\User;
+use Illuminate\Support\Facades\DB;
 
 class PlanController extends Controller
 {
     public function fetch(Request $request)
     {
         return response([
-            'data' => Plan::get()
+            'data' => Plan::orderBy('sort', 'ASC')->get()
         ]);
     }
 
     public function save(PlanSave $request)
     {
+        $params = $request->only(array_keys(PlanSave::RULES));
         if ($request->input('id')) {
             $plan = Plan::find($request->input('id'));
             if (!$plan) {
                 abort(500, '该订阅不存在');
             }
-        } else {
-            $plan = new Plan();
+            DB::beginTransaction();
+            // update user group id and transfer
+            try {
+                User::where('plan_id', $plan->id)->update([
+                    'group_id' => $plan->group_id,
+                    'transfer_enable' => $plan->transfer_enable * 1073741824
+                ]);
+                $plan->update($params);
+            } catch (\Exception $e) {
+                DB::rollBack();
+                abort(500, '保存失败');
+            }
+            DB::commit();
+            return response([
+                'data' => true
+            ]);
+        }
+        if (!Plan::create($params)) {
+            abort(500, '创建失败');
         }
-        $plan->name = $request->input('name');
-        $plan->content = $request->input('content');
-        $plan->transfer_enable = $request->input('transfer_enable');
-        $plan->group_id = $request->input('group_id');
-        $plan->month_price = $request->input('month_price');
-        $plan->quarter_price = $request->input('quarter_price');
-        $plan->half_year_price = $request->input('half_year_price');
-        $plan->year_price = $request->input('year_price');
-
         return response([
-            'data' => $plan->save()
+            'data' => true
         ]);
     }
 
@@ -73,7 +84,10 @@ class PlanController extends Controller
         if (!$plan) {
             abort(500, '该订阅不存在');
         }
-        if (!$plan->update($updateData)) {
+
+        try {
+            $plan->update($updateData);
+        } catch (\Exception $e) {
             abort(500, '保存失败');
         }
 
@@ -81,4 +95,19 @@ class PlanController extends Controller
             'data' => true
         ]);
     }
+
+    public function sort(PlanSort $request)
+    {
+        DB::beginTransaction();
+        foreach ($request->input('plan_ids') as $k => $v) {
+            if (!Plan::find($v)->update(['sort' => $k + 1])) {
+                DB::rollBack();
+                abort(500, '保存失败');
+            }
+        }
+        DB::commit();
+        return response([
+            'data' => true
+        ]);
+    }
 }

app/Http/Controllers/Admin/ServerController.php

@@ -3,7 +3,9 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\Admin\ServerSave;
+use App\Http\Requests\Admin\ServerSort;
 use App\Http\Requests\Admin\ServerUpdate;
+use App\Services\ServerService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\ServerGroup;
@@ -11,12 +13,13 @@ use App\Models\Server;
 use App\Models\Plan;
 use App\Models\User;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 
 class ServerController extends Controller
 {
     public function fetch(Request $request)
     {
-        $server = Server::get();
+        $server = Server::orderBy('sort', 'ASC')->get();
         for ($i = 0; $i < count($server); $i++) {
             if (!empty($server[$i]['tags'])) {
                 $server[$i]['tags'] = json_decode($server[$i]['tags']);
@@ -35,37 +38,44 @@ class ServerController extends Controller
 
     public function save(ServerSave $request)
     {
-        $params = $request->only([
-            'show',
-            'group_id',
-            'parent_id',
-            'name',
-            'host',
-            'port',
-            'server_port',
-            'tls',
-            'tags',
-            'rate',
-            'network',
-            'settings'
-        ]);
+        $params = $request->only(array_keys(ServerSave::RULES));
         $params['group_id'] = json_encode($params['group_id']);
         if (isset($params['tags'])) {
             $params['tags'] = json_encode($params['tags']);
         }
 
-        if (isset($params['settings'])) {
-            if (!is_object(json_decode($params['settings']))) {
+        if (isset($params['dnsSettings'])) {
+            if (!is_object(json_decode($params['dnsSettings']))) {
+                abort(500, 'DNS规则配置格式不正确');
+            }
+        }
+
+        if (isset($params['ruleSettings'])) {
+            if (!is_object(json_decode($params['ruleSettings']))) {
+                abort(500, '审计规则配置格式不正确');
+            }
+        }
+
+        if (isset($params['networkSettings'])) {
+            if (!is_object(json_decode($params['networkSettings']))) {
                 abort(500, '传输协议配置格式不正确');
             }
         }
 
+        if (isset($params['tlsSettings'])) {
+            if (!is_object(json_decode($params['tlsSettings']))) {
+                abort(500, 'TLS配置格式不正确');
+            }
+        }
+
         if ($request->input('id')) {
             $server = Server::find($request->input('id'));
             if (!$server) {
                 abort(500, '服务器不存在');
             }
-            if (!$server->update($params)) {
+            try {
+                $server->update($params);
+            } catch (\Exception $e) {
                 abort(500, '保存失败');
             }
             return response([
@@ -164,7 +174,9 @@ class ServerController extends Controller
         if (!$server) {
             abort(500, '该服务器不存在');
         }
-        if (!$server->update($params)) {
+        try {
+            $server->update($params);
+        } catch (\Exception $e) {
             abort(500, '保存失败');
         }
 
@@ -172,4 +184,43 @@ class ServerController extends Controller
             'data' => true
         ]);
     }
+
+    public function copy(Request $request)
+    {
+        $server = Server::find($request->input('id'));
+        if (!$server) {
+            abort(500, '服务器不存在');
+        }
+        if (!Server::create($server->toArray())) {
+            abort(500, '复制失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function viewConfig(Request $request)
+    {
+        $serverService = new ServerService();
+        $config = $serverService->getConfig($request->input('node_id'), 23333);
+        return response([
+            'data' => $config
+        ]);
+    }
+
+    public function sort(ServerSort $request)
+    {
+        DB::beginTransaction();
+        foreach ($request->input('server_ids') as $k => $v) {
+            if (!Server::find($v)->update(['sort' => $k + 1])) {
+                DB::rollBack();
+                abort(500, '保存失败');
+            }
+        }
+        DB::commit();
+        return response([
+            'data' => true
+        ]);
+    }
 }

app/Http/Controllers/Admin/StatController.php

@@ -20,7 +20,7 @@ class StatController extends Controller
             'data' => [
                 'month_income' => Order::where('created_at', '>=', strtotime(date('Y-m-1')))
                     ->where('created_at', '<', time())
-                    ->where('status', '3')
+                    ->whereIn('status', [3, 4])
                     ->sum('total_amount'),
                 'month_register_total' => User::where('created_at', '>=', strtotime(date('Y-m-1')))
                     ->where('created_at', '<', time())
@@ -30,7 +30,16 @@ class StatController extends Controller
                 'commission_pendding_total' => Order::where('commission_status', 0)
                     ->where('invite_user_id', '!=', NULL)
                     ->where('status', 3)
+                    ->where('commission_balance', '>', 0)
                     ->count(),
+                'day_income' => Order::where('created_at', '>=', strtotime(date('Y-m-d')))
+                    ->where('created_at', '<', time())
+                    ->where('status', 3)
+                    ->sum('total_amount'),
+                'last_month_income' => Order::where('created_at', '>=', strtotime('-1 month', strtotime(date('Y-m-1'))))
+                    ->where('created_at', '<', strtotime(date('Y-m-1')))
+                    ->where('status', 3)
+                    ->sum('total_amount')
             ]
         ]);
     }

app/Http/Controllers/Admin/TicketController.php

@@ -2,10 +2,13 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Jobs\SendEmailJob;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Ticket;
+use App\Models\User;
 use App\Models\TicketMessage;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 
 class TicketController extends Controller
@@ -30,17 +33,25 @@ class TicketController extends Controller
                 'data' => $ticket
             ]);
         }
-        $ticket = Ticket::orderBy('created_at', 'DESC')
+        $current = $request->input('current') ? $request->input('current') : 1;
+        $pageSize = $request->input('pageSize') >= 10 ? $request->input('pageSize') : 10;
+        $model = Ticket::orderBy('created_at', 'DESC');
+        if ($request->input('status') !== NULL) {
+            $model->where('status', $request->input('status'));
+        }
+        $total = $model->count();
+        $res = $model->forPage($current, $pageSize)
             ->get();
-        for ($i = 0; $i < count($ticket); $i++) {
-            if ($ticket[$i]['last_reply_user_id'] == $request->session()->get('id')) {
-                $ticket[$i]['reply_status'] = 0;
+        for ($i = 0; $i < count($res); $i++) {
+            if ($res[$i]['last_reply_user_id'] == $request->session()->get('id')) {
+                $res[$i]['reply_status'] = 0;
             } else {
-                $ticket[$i]['reply_status'] = 1;
+                $res[$i]['reply_status'] = 1;
             }
         }
         return response([
-            'data' => $ticket
+            'data' => $res,
+            'total' => $total
         ]);
     }
 
@@ -72,6 +83,7 @@ class TicketController extends Controller
             abort(500, '工单回复失败');
         }
         DB::commit();
+        $this->sendEmailNotify($ticket, $ticketMessage);
         return response([
             'data' => true
         ]);
@@ -95,4 +107,24 @@ class TicketController extends Controller
             'data' => true
         ]);
     }
+
+    // 半小时内不再重复通知
+    private function sendEmailNotify(Ticket $ticket, TicketMessage $ticketMessage)
+    {
+        $user = User::find($ticket->user_id);
+        $cacheKey = 'ticket_sendEmailNotify_' . $ticket->user_id;
+        if (!Cache::get($cacheKey)) {
+            Cache::put($cacheKey, 1, 1800);
+            SendEmailJob::dispatch([
+                'email' => $user->email,
+                'subject' => '您在' . config('v2board.app_name', 'V2Board') . '的工单得到了回复',
+                'template_name' => 'notify',
+                'template_value' => [
+                    'name' => config('v2board.app_name', 'V2Board'),
+                    'url' => config('v2board.app_url'),
+                    'content' => "主题：{$ticket->subject}\r\n回复内容：{$ticketMessage->message}"
+                ]
+            ]);
+        }
+    }
 }

app/Http/Controllers/Admin/TutorialController.php

@@ -3,34 +3,33 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\Admin\TutorialSave;
+use App\Http\Requests\Admin\TutorialSort;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Tutorial;
+use Illuminate\Support\Facades\DB;
 
 class TutorialController extends Controller
 {
     public function fetch(Request $request)
     {
         return response([
-            'data' => Tutorial::all()
+            'data' => Tutorial::orderBy('sort', 'ASC')->get()
         ]);
     }
 
     public function save(TutorialSave $request)
     {
-        $params = $request->only([
-            'title',
-            'description',
-            'steps',
-            'icon'
-        ]);
+        $params = $request->only(array_keys(TutorialSave::RULES));
 
         if (!$request->input('id')) {
             if (!Tutorial::create($params)) {
                 abort(500, '创建失败');
             }
         } else {
-            if (!Tutorial::find($request->input('id'))->update($params)) {
+            try {
+                Tutorial::find($request->input('id'))->update($params);
+            } catch (\Exception $e) {
                 abort(500, '保存失败');
             }
         }
@@ -59,6 +58,21 @@ class TutorialController extends Controller
         ]);
     }
 
+    public function sort(TutorialSort $request)
+    {
+        DB::beginTransaction();
+        foreach ($request->input('tutorial_ids') as $k => $v) {
+            if (!Tutorial::find($v)->update(['sort' => $k + 1])) {
+                DB::rollBack();
+                abort(500, '保存失败');
+            }
+        }
+        DB::commit();
+        return response([
+            'data' => true
+        ]);
+    }
+
     public function drop(Request $request)
     {
         if (empty($request->input('id'))) {

app/Http/Controllers/Admin/UserController.php

@@ -15,10 +15,15 @@ class UserController extends Controller
     {
         $current = $request->input('current') ? $request->input('current') : 1;
         $pageSize = $request->input('pageSize') >= 10 ? $request->input('pageSize') : 10;
-        $userModel = User::orderBy('created_at', 'DESC');
+        $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);
         if ($request->input('email')) {
             $userModel->where('email', $request->input('email'));
         }
+        if ($request->input('invite_user_id')) {
+            $userModel->where('invite_user_id', $request->input('invite_user_id'));
+        }
         $total = $userModel->count();
         $res = $userModel->forPage($current, $pageSize)
             ->get();
@@ -36,55 +41,43 @@ class UserController extends Controller
         ]);
     }
 
-    public function id2UserInfo($id)
+    public function getUserInfoById(Request $request)
     {
-        if (empty($id)) {
+        if (empty($request->input('id'))) {
             abort(500, '参数错误');
         }
         return response([
-            'data' => User::select([
-                'email',
-                'u',
-                'd',
-                'transfer_enable',
-                'expired_at'
-            ])->find($id)
+            'data' => User::find($request->input('id'))
         ]);
     }
 
     public function update(UserUpdate $request)
     {
-        $updateData = $request->only([
-            'email',
-            'password',
-            'transfer_enable',
-            'expired_at',
-            'banned',
-            'plan_id',
-            'commission_rate',
-            'is_admin'
-        ]);
+        $params = $request->only(array_keys(UserUpdate::RULES));
         $user = User::find($request->input('id'));
         if (!$user) {
             abort(500, '用户不存在');
         }
-        if (User::where('email', $updateData['email'])->first() && $user->email !== $updateData['email']) {
+        if (User::where('email', $params['email'])->first() && $user->email !== $params['email']) {
             abort(500, '邮箱已被使用');
         }
-        if (isset($updateData['password'])) {
-            $updateData['password'] = password_hash($updateData['password'], PASSWORD_DEFAULT);
+        if (isset($params['password'])) {
+            $params['password'] = password_hash($params['password'], PASSWORD_DEFAULT);
+            $params['password_algo'] = NULL;
         } else {
-            unset($updateData['password']);
+            unset($params['password']);
         }
-        $updateData['transfer_enable'] = $updateData['transfer_enable'] * 1073741824;
-        if (isset($updateData['plan_id'])) {
-            $plan = Plan::find($updateData['plan_id']);
+        if (isset($params['plan_id'])) {
+            $plan = Plan::find($params['plan_id']);
             if (!$plan) {
                 abort(500, '订阅计划不存在');
             }
-            $updateData['group_id'] = $plan->group_id;
+            $params['group_id'] = $plan->group_id;
         }
-        if (!$user->update($updateData)) {
+
+        try {
+            $user->update($params);
+        } catch (\Exception $e) {
             abort(500, '保存失败');
         }
         return response([

app/Http/Controllers/Client/AppController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Client;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
 use App\Models\User;
 use App\Models\Plan;
 use App\Models\Server;
@@ -16,6 +16,7 @@ class AppController extends Controller
     CONST SOCKS_PORT = 10010;
     CONST HTTP_PORT = 10011;
 
+    // TODO: 1.1.1 abolish
     public function data(Request $request)
     {
         $user = $request->user;
@@ -56,7 +57,7 @@ class AppController extends Controller
             abort(500, '参数错误');
         }
         $user = $request->user;
-        if ($user->expired_at < time()) {
+        if ($user->expired_at < time() && $user->expired_at !== NULL) {
             abort(500, '订阅计划已过期');
         }
         $server = Server::where('show', 1)
@@ -77,25 +78,25 @@ class AppController extends Controller
         $json->outbound->settings->vnext[0]->users[0]->alterId = (int)$user->v2ray_alter_id;
         $json->outbound->settings->vnext[0]->remark = (string)$server->name;
         $json->outbound->streamSettings->network = $server->network;
-        if ($server->settings) {
+        if ($server->networkSettings) {
             switch ($server->network) {
                 case 'tcp':
-                    $json->outbound->streamSettings->tcpSettings = json_decode($server->settings);
+                    $json->outbound->streamSettings->tcpSettings = json_decode($server->networkSettings);
                     break;
                 case 'kcp':
-                    $json->outbound->streamSettings->kcpSettings = json_decode($server->settings);
+                    $json->outbound->streamSettings->kcpSettings = json_decode($server->networkSettings);
                     break;
                 case 'ws':
-                    $json->outbound->streamSettings->wsSettings = json_decode($server->settings);
+                    $json->outbound->streamSettings->wsSettings = json_decode($server->networkSettings);
                     break;
                 case 'http':
-                    $json->outbound->streamSettings->httpSettings = json_decode($server->settings);
+                    $json->outbound->streamSettings->httpSettings = json_decode($server->networkSettings);
                     break;
                 case 'domainsocket':
-                    $json->outbound->streamSettings->dsSettings = json_decode($server->settings);
+                    $json->outbound->streamSettings->dsSettings = json_decode($server->networkSettings);
                     break;
                 case 'quic':
-                    $json->outbound->streamSettings->quicSettings = json_decode($server->settings);
+                    $json->outbound->streamSettings->quicSettings = json_decode($server->networkSettings);
                     break;
             }
         }

app/Http/Controllers/Client/ClientController.php

@@ -0,0 +1,262 @@
+<?php
+
+namespace App\Http\Controllers\Client;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Models\Server;
+use App\Utils\Helper;
+use Symfony\Component\Yaml\Yaml;
+use App\Services\UserService;
+
+class ClientController extends Controller
+{
+    public function subscribe(Request $request)
+    {
+        $user = $request->user;
+        $server = [];
+        // account not expired and is not banned.
+        $userService = new UserService();
+        if ($userService->isAvailable($user)) {
+            $servers = Server::where('show', 1)
+                ->orderBy('sort', 'ASC')
+                ->get();
+            foreach ($servers as $item) {
+                $groupId = json_decode($item['group_id']);
+                if (in_array($user->group_id, $groupId)) {
+                    array_push($server, $item);
+                }
+            }
+        }
+        if (isset($_SERVER['HTTP_USER_AGENT'])) {
+            if (strpos($_SERVER['HTTP_USER_AGENT'], 'Quantumult%20X') !== false) {
+                die($this->quantumultX($user, $server));
+            }
+            if (strpos($_SERVER['HTTP_USER_AGENT'], 'Quantumult') !== false) {
+                die($this->quantumult($user, $server));
+            }
+            if (strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'clash') !== false) {
+                die($this->clash($user, $server));
+            }
+            if (strpos($_SERVER['HTTP_USER_AGENT'], 'Surfboard') !== false) {
+                die($this->surfboard($user, $server));
+            }
+            if (strpos($_SERVER['HTTP_USER_AGENT'], 'Surge') !== false) {
+                die($this->surge($user, $server));
+            }
+        }
+        die($this->origin($user, $server));
+    }
+
+    private function quantumultX($user, $server)
+    {
+        $uri = '';
+        foreach ($server as $item) {
+            $uri .= "vmess=" . $item->host . ":" . $item->port . ", method=none, password=" . $user->v2ray_uuid . ", fast-open=false, udp-relay=false, tag=" . $item->name;
+            if ($item->tls) {
+                $tlsSettings = json_decode($item->tlsSettings);
+                if ($item->network === 'tcp') $uri .= ', obfs=over-tls';
+                if (isset($tlsSettings->allowInsecure)) {
+                    // Default: tls-verification=true
+                    $uri .= ', tls-verification=' . ($tlsSettings->allowInsecure ? "false" : "true");
+                }
+                if (isset($tlsSettings->serverName)) {
+                    $uri .= ', obfs-host=' . $tlsSettings->serverName;
+                }
+            }
+            if ($item->network === 'ws') {
+                $uri .= ', obfs=' . ($item->tls ? 'wss' : 'ws');
+                if ($item->networkSettings) {
+                    $wsSettings = json_decode($item->networkSettings);
+                    if (isset($wsSettings->path)) $uri .= ', obfs-uri=' . $wsSettings->path;
+                    if (isset($wsSettings->headers->Host)) $uri .= ', obfs-host=' . $wsSettings->headers->Host;
+                }
+            }
+            $uri .= "\r\n";
+        }
+        return base64_encode($uri);
+    }
+
+    private function quantumult($user, $server)
+    {
+        $uri = '';
+        header('subscription-userinfo: upload=' . $user->u . '; download=' . $user->d . ';total=' . $user->transfer_enable);
+        foreach ($server as $item) {
+            $str = '';
+            $str .= $item->name . '= vmess, ' . $item->host . ', ' . $item->port . ', chacha20-ietf-poly1305, "' . $user->v2ray_uuid . '", over-tls=' . ($item->tls ? "true" : "false") . ', certificate=0, group=' . config('v2board.app_name', 'V2Board');
+            if ($item->network === 'ws') {
+                $str .= ', obfs=ws';
+                if ($item->networkSettings) {
+                    $wsSettings = json_decode($item->networkSettings);
+                    if (isset($wsSettings->path)) $str .= ', obfs-path="' . $wsSettings->path . '"';
+                    if (isset($wsSettings->headers->Host)) $str .= ', obfs-header="Host:' . $wsSettings->headers->Host . '"';
+                }
+            }
+            $uri .= "vmess://" . base64_encode($str) . "\r\n";
+        }
+        return base64_encode($uri);
+    }
+
+    private function origin($user, $server)
+    {
+        $uri = '';
+        foreach ($server as $item) {
+            $uri .= Helper::buildVmessLink($item, $user);
+        }
+        return base64_encode($uri);
+    }
+
+    private function surge($user, $server)
+    {
+        $proxies = '';
+        $proxyGroup = '';
+        foreach ($server as $item) {
+            // [Proxy]
+            $proxies .= $item->name . ' = vmess, ' . $item->host . ', ' . $item->port . ', username=' . $user->v2ray_uuid . ', tfo=true';
+            if ($item->tls) {
+                $tlsSettings = json_decode($item->tlsSettings);
+                $proxies .= ', tls=' . ($item->tls ? "true" : "false");
+                if (isset($tlsSettings->allowInsecure)) {
+                  $proxies .= ', skip-cert-verify=' . ($tlsSettings->allowInsecure ? "true" : "false");
+                }
+            }
+            if ($item->network == 'ws') {
+                $proxies .= ', ws=true';
+                if ($item->networkSettings) {
+                    $wsSettings = json_decode($item->networkSettings);
+                    if (isset($wsSettings->path)) $proxies .= ', ws-path=' . $wsSettings->path;
+                    if (isset($wsSettings->headers->Host)) $proxies .= ', ws-headers=host:' . $wsSettings->headers->Host;
+                }
+            }
+            $proxies .= "\r\n";
+            // [Proxy Group]
+            $proxyGroup .= $item->name . ', ';
+        }
+
+        $defaultConfig = base_path() . '/resources/rules/default.surge.conf';
+        $customConfig = base_path() . '/resources/rules/custom.surge.conf';
+        if (\File::exists($customConfig)) {
+            $config = file_get_contents("$customConfig");
+        } else {
+            $config = file_get_contents("$defaultConfig");
+        }
+
+        // Subscription link
+        $subsURL = 'http';
+        if (isset( $_SERVER['HTTPS'] ) && strtolower( $_SERVER['HTTPS'] ) == 'on') {
+            $subsURL .= 's';
+        }
+        $subsURL .= '://';
+        if ($_SERVER['SERVER_PORT'] != ('80' || '443')) {
+            $subsURL .= $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'] . $_SERVER['REQUEST_URI'];
+        } else {
+            $subsURL .= $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
+        }
+
+        $config = str_replace('$subs_link',$subsURL,$config);
+        $config = str_replace('$proxies',$proxies,$config);
+        $config = str_replace('$proxy_group',rtrim($proxyGroup, ', '),$config);
+        return $config;
+    }
+
+    private function surfboard($user, $server)
+    {
+        $proxies = '';
+        $proxyGroup = '';
+        foreach ($server as $item) {
+            // [Proxy]
+            $proxies .= $item->name . ' = vmess, ' . $item->host . ', ' . $item->port . ', username=' . $user->v2ray_uuid;
+            if ($item->tls) {
+                $tlsSettings = json_decode($item->tlsSettings);
+                $proxies .= ', tls=' . ($item->tls ? "true" : "false");
+                if (isset($tlsSettings->allowInsecure)) {
+                  $proxies .= ', skip-cert-verify=' . ($tlsSettings->allowInsecure ? "true" : "false");
+                }
+            }
+            if ($item->network == 'ws') {
+                $proxies .= ', ws=true';
+                if ($item->networkSettings) {
+                    $wsSettings = json_decode($item->networkSettings);
+                    if (isset($wsSettings->path)) $proxies .= ', ws-path=' . $wsSettings->path;
+                    if (isset($wsSettings->headers->Host)) $proxies .= ', ws-headers=host:' . $wsSettings->headers->Host;
+                }
+            }
+            $proxies .= "\r\n";
+            // [Proxy Group]
+            $proxyGroup .= $item->name . ', ';
+        }
+
+        $defaultConfig = base_path() . '/resources/rules/default.surfboard.conf';
+        $customConfig = base_path() . '/resources/rules/custom.surfboard.conf';
+        if (\File::exists($customConfig)) {
+            $config = file_get_contents("$customConfig");
+        } else {
+            $config = file_get_contents("$defaultConfig");
+        }
+
+        // Subscription link
+        $subsURL = 'http';
+        if (isset( $_SERVER['HTTPS'] ) && strtolower( $_SERVER['HTTPS'] ) == 'on') {
+            $subsURL .= 's';
+        }
+        $subsURL .= '://';
+        if ($_SERVER['SERVER_PORT'] != ('80' || '443')) {
+            $subsURL .= $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT'] . $_SERVER['REQUEST_URI'];
+        } else {
+            $subsURL .= $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
+        }
+
+        $config = str_replace('$subs_link',$subsURL,$config);
+        $config = str_replace('$proxies',$proxies,$config);
+        $config = str_replace('$proxy_group',rtrim($proxyGroup, ', '),$config);
+        return $config;
+    }
+
+    private function clash($user, $server)
+    {
+        $defaultConfig = base_path() . '/resources/rules/default.clash.yaml';
+        $customConfig = base_path() . '/resources/rules/custom.clash.yaml';
+        if (\File::exists($customConfig)) {
+            $config = Yaml::parseFile($customConfig);
+        } else {
+            $config = Yaml::parseFile($defaultConfig);
+        }
+        $proxy = [];
+        $proxies = [];
+        foreach ($server as $item) {
+            $array = [];
+            $array['name'] = $item->name;
+            $array['type'] = 'vmess';
+            $array['server'] = $item->host;
+            $array['port'] = $item->port;
+            $array['uuid'] = $user->v2ray_uuid;
+            $array['alterId'] = $user->v2ray_alter_id;
+            $array['cipher'] = 'auto';
+            if ($item->tls) {
+                $tlsSettings = json_decode($item->tlsSettings);
+                $array['tls'] = true;
+                if (isset($tlsSettings->allowInsecure)) $array['skip-cert-verify'] = ($tlsSettings->allowInsecure ? true : false );
+            }
+            if ($item->network == 'ws') {
+                $array['network'] = $item->network;
+                if ($item->networkSettings) {
+                    $wsSettings = json_decode($item->networkSettings);
+                    if (isset($wsSettings->path)) $array['ws-path'] = $wsSettings->path;
+                    if (isset($wsSettings->headers->Host)) $array['ws-headers'] = [
+                        'Host' => $wsSettings->headers->Host
+                    ];
+                }
+            }
+            array_push($proxy, $array);
+            array_push($proxies, $item->name);
+        }
+
+        $config['Proxy'] = array_merge($config['Proxy'] ? $config['Proxy'] : [], $proxy);
+        foreach ($config['Proxy Group'] as $k => $v) {
+            $config['Proxy Group'][$k]['proxies'] = array_merge($config['Proxy Group'][$k]['proxies'], $proxies);
+        }
+        $yaml = Yaml::dump($config);
+        $yaml = str_replace('$app_name', config('v2board.app_name', 'V2Board'), $yaml);
+        return $yaml;
+    }
+}

app/Http/Controllers/ClientController.php

@@ -1,149 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\User;
-use App\Models\Plan;
-use App\Models\Server;
-use App\Utils\Helper;
-use Symfony\Component\Yaml\Yaml;
-
-class ClientController extends Controller
-{
-    public function subscribe(Request $request)
-    {
-        $user = $request->user;
-        $server = [];
-        if ($user->expired_at > time()) {
-            $servers = Server::where('show', 1)
-                ->orderBy('name')
-                ->get();
-            foreach ($servers as $item) {
-                $groupId = json_decode($item['group_id']);
-                if (in_array($user->group_id, $groupId)) {
-                    array_push($server, $item);
-                }
-            }
-        }
-        if (isset($_SERVER['HTTP_USER_AGENT'])) {
-            if (strpos($_SERVER['HTTP_USER_AGENT'], 'Quantumult%20X') !== false) {
-                die($this->quantumultX($user, $server));
-            }
-            if (strpos($_SERVER['HTTP_USER_AGENT'], 'Quantumult') !== false) {
-                die($this->quantumult($user, $server));
-            }
-            if (strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'clash') !== false) {
-                die($this->clash($user, $server));
-            }
-        }
-        die($this->origin($user, $server));
-    }
-
-    private function quantumultX($user, $server)
-    {
-        $uri = '';
-        foreach ($server as $item) {
-            $uri .= "vmess=" . $item->host . ":" . $item->port . ", method=none, password=" . $user->v2ray_uuid . ", fast-open=false, udp-relay=false, tag=" . $item->name;
-            if ($item->network == 'ws') {
-                $uri .= ', obfs=ws';
-                if ($item->settings) {
-                    $wsSettings = json_decode($item->settings);
-                    if (isset($wsSettings->path)) $uri .= ', obfs-uri=' . $wsSettings->path;
-                    if (isset($wsSettings->headers->Host)) $uri .= ', obfs-host=' . $wsSettings->headers->Host;
-                }
-            }
-            $uri .= "\r\n";
-        }
-        return base64_encode($uri);
-    }
-
-    private function quantumult($user, $server)
-    {
-        $uri = '';
-        header('subscription-userinfo: upload=' . $user->u . '; download=' . $user->d . ';total=' . $user->transfer_enable);
-        foreach ($server as $item) {
-            $str = '';
-            $str .= $item->name . '= vmess, ' . $item->host . ', ' . $item->port . ', chacha20-ietf-poly1305, "' . $user->v2ray_uuid . '", over-tls=' . ($item->tls ? "true" : "false") . ', certificate=0, group=' . config('v2board.app_name', 'V2Board');
-            if ($item->network === 'ws') {
-                $str .= ', obfs=ws';
-                if ($item->settings) {
-                    $wsSettings = json_decode($item->settings);
-                    if (isset($wsSettings->path)) $str .= ', obfs-path="' . $wsSettings->path . '"';
-                    if (isset($wsSettings->headers->Host)) $str .= ', obfs-header="Host:' . $wsSettings->headers->Host . '"';
-                }
-            }
-            $uri .= "vmess://" . base64_encode($str) . "\r\n";
-        }
-        return base64_encode($uri);
-    }
-
-    private function origin($user, $server)
-    {
-        $uri = '';
-        foreach ($server as $item) {
-            $uri .= Helper::buildVmessLink($item, $user);
-        }
-        return base64_encode($uri);
-    }
-
-    private function clash($user, $server)
-    {
-        $proxy = [];
-        $proxyGroup = [];
-        $proxies = [];
-        foreach ($server as $item) {
-            $array = [];
-            $array['name'] = $item->name;
-            $array['type'] = 'vmess';
-            $array['server'] = $item->host;
-            $array['port'] = $item->port;
-            $array['uuid'] = $user->v2ray_uuid;
-            $array['alterId'] = $user->v2ray_alter_id;
-            $array['cipher'] = 'auto';
-            if ($item->tls) {
-                $array['tls'] = true;
-            }
-            if ($item->network == 'ws') {
-                $array['network'] = $item->network;
-                if ($item->settings) {
-                    $wsSettings = json_decode($item->settings);
-                    if (isset($wsSettings->path)) $array['ws-path'] = $wsSettings->path;
-                    if (isset($wsSettings->headers->Host)) $array['ws-headers'] = [
-                        'Host' => $wsSettings->headers->Host
-                    ];
-                }
-            }
-            array_push($proxy, $array);
-            array_push($proxies, $item->name);
-        }
-        array_push($proxyGroup, [
-            'name' => config('v2board.app_name', 'V2Board'),
-            'type' => 'select',
-            'proxies' => $proxies
-        ]);
-
-        $config = [
-            'port' => 7890,
-            'socks-port' => 0,
-            'allow-lan' => false,
-            'mode' => 'Rule',
-            'log-level' => 'info',
-            'external-controller' => '0.0.0.0:9090',
-            'secret' => '',
-            'Proxy' => $proxy,
-            'Proxy Group' => $proxyGroup,
-            'Rule' => [
-                'DOMAIN-SUFFIX,google.com,' . config('v2board.app_name', 'V2Board'),
-                'DOMAIN-KEYWORD,google,' . config('v2board.app_name', 'V2Board'),
-                'DOMAIN,google.com,' . config('v2board.app_name', 'V2Board'),
-                'DOMAIN-SUFFIX,ad.com,REJECT',
-                'IP-CIDR,127.0.0.0/8,DIRECT',
-                'GEOIP,CN,DIRECT',
-                'MATCH,' . config('v2board.app_name', 'V2Board')
-            ]
-        ];
-        return Yaml::dump($config);
-    }
-}

app/Http/Controllers/Guest/OrderController.php

@@ -15,7 +15,7 @@ class OrderController extends Controller
 {
     public function alipayNotify(Request $request)
     {
-        Log::info('alipayNotifyData: ' . json_encode($_POST));
+        // Log::info('alipayNotifyData: ' . json_encode($_POST));
         $gateway = Omnipay::create('Alipay_AopF2F');
         $gateway->setSignType('RSA2'); //RSA/RSA2
         $gateway->setAppId(config('v2board.alipay_appid'));
@@ -52,7 +52,7 @@ class OrderController extends Controller
 
     public function stripeNotify(Request $request)
     {
-        Log::info('stripeNotifyData: ' . json_encode($request->input()));
+        // Log::info('stripeNotifyData: ' . json_encode($request->input()));
 
         \Stripe\Stripe::setApiKey(config('v2board.stripe_sk_live'));
         try {
@@ -71,6 +71,7 @@ class OrderController extends Controller
                     'amount' => $source['amount'],
                     'currency' => $source['currency'],
                     'source' => $source['id'],
+                    'description' => config('v2board.app_name', 'V2Board') . $source['metadata']['invoice_id'],
                 ]);
                 if ($charge['status'] == 'succeeded') {
                     $trade_no = Cache::get($source['id']);
@@ -92,7 +93,7 @@ class OrderController extends Controller
     public function bitpayXNotify(Request $request)
     {
         $inputString = file_get_contents('php://input', 'r');
-        Log::info('bitpayXNotifyData: ' . $inputString);
+        // Log::info('bitpayXNotifyData: ' . $inputString);
         $inputStripped = str_replace(array("\r", "\n", "\t", "\v"), '', $inputString);
         $inputJSON = json_decode($inputStripped, true); //convert JSON into array
 
@@ -117,12 +118,14 @@ class OrderController extends Controller
         if (!$this->handle($params['merchant_order_id'], $params['order_id'])) {
             abort(500, 'order process fail');
         }
-        die('success');
+        die(json_encode([
+            'status' => 200
+        ]));
     }
 
     public function payTaroNotify(Request $request)
     {
-        Log::info('payTaroNotify: ' . json_encode($request->input()));
+        // Log::info('payTaroNotify: ' . json_encode($request->input()));
 
         $payTaro = new PayTaro(config('v2board.paytaro_app_id'), config('v2board.paytaro_app_secret'));
         if (!$payTaro->verify($request->input())) {

app/Http/Controllers/Guest/TelegramController.php

@@ -0,0 +1,111 @@
+<?php
+
+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;
+
+class TelegramController extends Controller
+{
+    protected $msg;
+
+    public function __construct(Request $request)
+    {
+        if ($request->input('access_token') !== md5(config('v2board.telegram_bot_token'))) {
+            abort(500, 'authentication failed');
+        }
+    }
+
+    public function webhook(Request $request)
+    {
+        $this->msg = $this->getMessage($request->input());
+        if (!$this->msg) return;
+        try {
+            switch($this->msg->command) {
+                case '/bind': $this->bind();
+                    break;
+                case '/traffic': $this->traffic();
+                    break;
+                default: $this->help();
+            }
+        } catch (\Exception $e) {
+            $telegramService = new TelegramService();
+            $telegramService->sendMessage($this->msg->chat_id, $e->getMessage());
+        }
+    }
+
+    private function getMessage(array $data)
+    {
+        if (!isset($data['message'])) return false;
+        $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'];
+        return $obj;
+    }
+
+    private function bind()
+    {
+        $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 (!$user) {
+            abort(500, '用户不存在');
+        }
+        $user->telegram_id = $msg->chat_id;
+        if (!$user->save()) {
+            abort(500, '设置失败');
+        }
+        $telegramService = new TelegramService();
+        $telegramService->sendMessage($msg->chat_id, '绑定成功');
+    }
+
+    private function help()
+    {
+        $msg = $this->msg;
+        if (!$msg->is_private) return;
+        $telegramService = new TelegramService();
+        $commands = [
+            '/bind 订阅地址 - 绑定你的' . config('v2board.app_name', 'V2Board') . '账号',
+            '/traffic - 查询流量信息'
+        ];
+        $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');
+    }
+}

app/Http/Controllers/NoticeController.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\Notice;
-use App\Utils\Helper;
-
-class NoticeController extends Controller
-{
-    public function fetch(Request $request)
-    {
-        return response([
-            'data' => Notice::orderBy('created_at', 'DESC')->first()
-        ]);
-    }
-}

app/Http/Controllers/Passport/AuthController.php

@@ -0,0 +1,216 @@
+<?php
+
+namespace App\Http\Controllers\Passport;
+
+use App\Http\Controllers\Controller;
+use App\Http\Requests\Passport\AuthRegister;
+use App\Http\Requests\Passport\AuthForget;
+use App\Http\Requests\Passport\AuthLogin;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use App\Models\Plan;
+use App\Models\User;
+use App\Models\InviteCode;
+use App\Utils\Helper;
+use App\Utils\Dict;
+use App\Utils\CacheKey;
+
+class AuthController extends Controller
+{
+    public function register(AuthRegister $request)
+    {
+        if ((int)config('v2board.email_whitelist_enable', 0)) {
+            if (!Helper::emailSuffixVerify(
+                $request->input('email'),
+                config('v2board.email_whitelist_suffix', Dict::EMAIL_WHITELIST_SUFFIX_DEFAULT))
+            ) {
+                abort(500, '邮箱后缀不处于白名单中');
+            }
+        }
+        if ((int)config('v2board.email_gmail_limit_enable', 0)) {
+            $prefix = explode('@', $request->input('email'))[0];
+            if (strpos($prefix, '.') !== false || strpos($prefix, '+') !== false) {
+                abort(500, '不支持Gmail别名邮箱');
+            }
+        }
+        if ((int)config('v2board.stop_register', 0)) {
+            abort(500, '本站已关闭注册');
+        }
+        if ((int)config('v2board.invite_force', 0)) {
+            if (empty($request->input('invite_code'))) {
+                abort(500, '必须使用邀请码才可以注册');
+            }
+        }
+        if ((int)config('v2board.email_verify', 0)) {
+            if (empty($request->input('email_code'))) {
+                abort(500, '邮箱验证码不能为空');
+            }
+            if (Cache::get(CacheKey::get('EMAIL_VERIFY_CODE', $request->input('email'))) !== $request->input('email_code')) {
+                abort(500, '邮箱验证码有误');
+            }
+        }
+        $email = $request->input('email');
+        $password = $request->input('password');
+        $exist = User::where('email', $email)->first();
+        if ($exist) {
+            abort(500, '邮箱已存在系统中');
+        }
+        $user = new User();
+        $user->email = $email;
+        $user->password = password_hash($password, PASSWORD_DEFAULT);
+        $user->v2ray_uuid = Helper::guid(true);
+        $user->token = Helper::guid();
+        if ($request->input('invite_code')) {
+            $inviteCode = InviteCode::where('code', $request->input('invite_code'))
+                ->where('status', 0)
+                ->first();
+            if (!$inviteCode) {
+                if ((int)config('v2board.invite_force', 0)) {
+                    abort(500, '邀请码无效');
+                }
+            } else {
+                $user->invite_user_id = $inviteCode->user_id ? $inviteCode->user_id : null;
+                if (!(int)config('v2board.invite_never_expire', 0)) {
+                    $inviteCode->status = 1;
+                    $inviteCode->save();
+                }
+            }
+        }
+
+        // try out
+        if ((int)config('v2board.try_out_plan_id', 0)) {
+            $plan = Plan::find(config('v2board.try_out_plan_id'));
+            if ($plan) {
+                $user->transfer_enable = $plan->transfer_enable * 1073741824;
+                $user->plan_id = $plan->id;
+                $user->group_id = $plan->group_id;
+                $user->expired_at = time() + (config('v2board.try_out_hour', 1) * 3600);
+            }
+        }
+
+        if (!$user->save()) {
+            abort(500, '注册失败');
+        }
+        if ((int)config('v2board.email_verify', 0)) {
+            Cache::forget(CacheKey::get('EMAIL_VERIFY_CODE', $request->input('email')));
+        }
+        $request->session()->put('email', $user->email);
+        $request->session()->put('id', $user->id);
+        return response()->json([
+            'data' => true
+        ]);
+    }
+
+    public function login(AuthLogin $request)
+    {
+        $email = $request->input('email');
+        $password = $request->input('password');
+
+        $user = User::where('email', $email)->first();
+        if (!$user) {
+            abort(500, '用户名或密码错误');
+        }
+        if (!Helper::multiPasswordVerify(
+            $user->password_algo,
+            $password,
+            $user->password)
+        ) {
+            abort(500, '用户名或密码错误');
+        }
+
+        if ($user->banned) {
+            abort(500, '该账户已被停止使用');
+        }
+
+        $data = [
+            'token' => $user->token
+        ];
+        $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;
+        }
+        return response([
+            'data' => $data
+        ]);
+    }
+
+    public function token2Login(Request $request)
+    {
+        if ($request->input('token')) {
+            $user = User::where('token', $request->input('token'))->first();
+            if (!$user) {
+                return header('Location:' . config('v2board.app_url'));
+            }
+            $code = Helper::guid();
+            $key = 'token2Login_' . $code;
+            Cache::put($key, $user->id, 600);
+            $redirect = '/#/login?verify=' . $code . '&redirect=' . ($request->input('redirect') ? $request->input('redirect') : 'dashboard');
+            if (config('v2board.app_url')) {
+                $location = config('v2board.app_url') . $redirect;
+            } else {
+                $location = url($redirect);
+            }
+            return header('Location:' . $location);
+        }
+
+        if ($request->input('verify')) {
+            $key = 'token2Login_' . $request->input('verify');
+            $userId = Cache::get($key);
+            if (!$userId) {
+                abort(500, '令牌有误');
+            }
+            $user = User::find($userId);
+            if (!$user) {
+                abort(500, '用户不存在');
+            }
+            if ($user->banned) {
+                abort(500, '该账户已被停止使用');
+            }
+            $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);
+            return response([
+                'data' => true
+            ]);
+        }
+    }
+
+    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')) {
+            abort(500, '邮箱验证码有误');
+        }
+        $user = User::where('email', $request->input('email'))->first();
+        if (!$user) {
+            abort(500, '该邮箱不存在系统中');
+        }
+        $user->password = password_hash($request->input('password'), PASSWORD_DEFAULT);
+        $user->password_algo = NULL;
+        if (!$user->save()) {
+            abort(500, '重置失败');
+        }
+        Cache::forget(CacheKey::get('EMAIL_VERIFY_CODE', $request->input('email')));
+        return response([
+            'data' => true
+        ]);
+    }
+
+}

app/Http/Controllers/Passport/CommController.php

@@ -9,7 +9,10 @@ use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Support\Facades\Mail;
 use App\Utils\Helper;
 use Illuminate\Support\Facades\Cache;
-use App\Jobs\SendEmail;
+use App\Jobs\SendEmailJob;
+use App\Models\InviteCode;
+use App\Utils\Dict;
+use App\Utils\CacheKey;
 
 class CommController extends Controller
 {
@@ -18,7 +21,10 @@ class CommController extends Controller
         return response([
             'data' => [
                 'isEmailVerify' => (int)config('v2board.email_verify', 0) ? 1 : 0,
-                'isInviteForce' => (int)config('v2board.invite_force', 0) ? 1 : 0
+                'isInviteForce' => (int)config('v2board.invite_force', 0) ? 1 : 0,
+                'emailWhitelistSuffix' => (int)config('v2board.email_whitelist_enable', 0)
+                    ? $this->getEmailSuffix()
+                    : 0
             ]
         ]);
     }
@@ -33,27 +39,49 @@ class CommController extends Controller
     public function sendEmailVerify(CommSendEmailVerify $request)
     {
         $email = $request->input('email');
-        $cacheKey = 'sendEmailVerify:' . $email;
-        if (Cache::get($cacheKey)) {
-            abort(500, '验证码已发送，请过一会在请求');
+        if (Cache::get(CacheKey::get('LAST_SEND_EMAIL_VERIFY_TIMESTAMP', $email))) {
+            abort(500, '验证码已发送，请过一会再请求');
         }
-        $code = Helper::randomChar(6);
+        $code = rand(100000, 999999);
         $subject = config('v2board.app_name', 'V2Board') . '邮箱验证码';
 
-        SendEmail::dispatch([
+        SendEmailJob::dispatch([
             'email' => $email,
             'subject' => $subject,
-            'template_name' => 'mail.sendEmailVerify',
+            'template_name' => 'verify',
             'template_value' => [
                 'name' => config('v2board.app_name', 'V2Board'),
                 'code' => $code,
                 'url' => config('v2board.app_url')
             ]
-        ])->onQueue('verify_mail');
+        ]);
 
-        Cache::put($cacheKey, $code, 60);
+        Cache::put(CacheKey::get('EMAIL_VERIFY_CODE', $email), $code, 300);
+        Cache::put(CacheKey::get('LAST_SEND_EMAIL_VERIFY_TIMESTAMP', $email), time(), 60);
         return response([
             'data' => true
         ]);
     }
+
+    public function pv(Request $request)
+    {
+        $inviteCode = InviteCode::where('code', $request->input('invite_code'))->first();
+        if ($inviteCode) {
+            $inviteCode->pv = $inviteCode->pv + 1;
+            $inviteCode->save();
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    private function getEmailSuffix()
+    {
+        $suffix = config('v2board.email_whitelist_suffix', Dict::EMAIL_WHITELIST_SUFFIX_DEFAULT);
+        if (!is_array($suffix)) {
+            return preg_split('/,/', $suffix);
+        }
+        return $suffix;
+    }
 }

app/Http/Controllers/Passport/ForgetController.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Passport;
-
-use App\Http\Requests\Passport\ForgetIndex;
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\User;
-use Illuminate\Support\Facades\Mail;
-use Illuminate\Support\Facades\Cache;
-
-class ForgetController extends Controller
-{
-    public function index(ForgetIndex $request)
-    {
-        $redisKey = 'sendEmailVerify:' . $request->input('email');
-        if (Cache::get($redisKey) !== $request->input('email_code')) {
-            abort(500, '邮箱验证码有误');
-        }
-        $user = User::where('email', $request->input('email'))->first();
-        $user->password = password_hash($request->input('password'), PASSWORD_DEFAULT);
-        if (!$user->save()) {
-            abort(500, '重置失败');
-        }
-        Cache::forget($redisKey);
-        return response([
-            'data' => true
-        ]);
-    }
-}

app/Http/Controllers/Passport/LoginController.php

@@ -1,94 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Passport;
-
-use Illuminate\Http\Request;
-use App\Http\Requests\Passport\LoginIndex;
-use App\Http\Controllers\Controller;
-use App\Models\User;
-use Illuminate\Support\Facades\Cache;
-use App\Utils\Helper;
-
-class LoginController extends Controller
-{
-    public function index(LoginIndex $request)
-    {
-        $email = $request->input('email');
-        $password = $request->input('password');
-
-        $user = User::where('email', $email)->first();
-        if (!$user) {
-            abort(500, '用户名或密码错误');
-        }
-        if (!password_verify($password, $user->password)) {
-            abort(500, '用户名或密码错误');
-        }
-
-        if ($user->banned) {
-            abort(500, '该账户已被停止使用');
-        }
-
-        $request->session()->put('email', $user->email);
-        $request->session()->put('id', $user->id);
-        if ($user->is_admin) {
-            $request->session()->put('is_admin', true);
-        }
-        return response([
-            'data' => [
-                'is_admin' => $user->is_admin ? 2 : 1,
-                'token' => $user->token
-            ]
-        ]);
-    }
-
-    public function token2Login(Request $request)
-    {
-        if ($request->input('token')) {
-            $user = User::where('token', $request->input('token'))->first();
-            if (!$user) {
-                return header('Location:' . config('v2board.app_url'));
-            }
-            $code = Helper::guid();
-            $key = 'token2Login_' . $code;
-            Cache::put($key, $user->id, 600);
-            $redirect = '/#/login?verify=' . $code . '&redirect=' . ($request->input('redirect') ? $request->input('redirect') : 'dashboard');
-            if (config('v2board.app_url')) {
-                $location = config('v2board.app_url') . $redirect;
-            } else {
-                $location = url($redirect);
-            }
-            return header('Location:' . $location);
-        }
-
-        if ($request->input('verify')) {
-            $key = 'token2Login_' . $request->input('verify');
-            $userId = Cache::get($key);
-            if (!$userId) {
-                abort(500, '令牌有误');
-            }
-            $user = User::find($userId);
-            if (!$user) {
-                abort(500, '用户不存在');
-            }
-            if ($user->banned) {
-                abort(500, '该账户已被停止使用');
-            }
-            $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);
-            return response([
-                'data' => true
-            ]);
-        }
-    }
-
-    public function check(Request $request)
-    {
-        return response([
-            'data' => $request->session()->get('id') ? true : false
-        ]);
-    }
-}

app/Http/Controllers/Passport/RegisterController.php

@@ -1,88 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Passport;
-
-use App\Http\Requests\Passport\RegisterIndex;
-use App\Http\Controllers\Controller;
-use App\Models\User;
-use App\Models\Plan;
-use Illuminate\Support\Facades\Cache;
-use App\Utils\Helper;
-use App\Models\InviteCode;
-
-class RegisterController extends Controller
-{
-    private function setTryOut()
-    {
-
-    }
-
-    public function index(RegisterIndex $request)
-    {
-        if ((int)config('v2board.stop_register', 0)) {
-            abort(500, '本站已关闭注册');
-        }
-        if ((int)config('v2board.invite_force', 0)) {
-            if (empty($request->input('invite_code'))) {
-                abort(500, '必须使用邀请码才可以注册');
-            }
-        }
-        if ((int)config('v2board.email_verify', 0)) {
-            $redisKey = 'sendEmailVerify:' . $request->input('email');
-            if (empty($request->input('email_code'))) {
-                abort(500, '邮箱验证码不能为空');
-            }
-            if (Cache::get($redisKey) !== $request->input('email_code')) {
-                abort(500, '邮箱验证码有误');
-            }
-        }
-        $email = $request->input('email');
-        $password = $request->input('password');
-        $exist = User::where('email', $email)->first();
-        if ($exist) {
-            abort(500, '邮箱已存在系统中');
-        }
-        $user = new User();
-        $user->email = $email;
-        $user->password = password_hash($password, PASSWORD_DEFAULT);
-        $user->v2ray_uuid = Helper::guid(true);
-        $user->token = Helper::guid();
-        if ($request->input('invite_code')) {
-            $inviteCode = InviteCode::where('code', $request->input('invite_code'))
-                ->where('status', 0)
-                ->first();
-            if (!$inviteCode) {
-                if ((int)config('v2board.invite_force', 0)) {
-                    abort(500, '邀请码无效');
-                }
-            } else {
-                $user->invite_user_id = $inviteCode->user_id ? $inviteCode->user_id : null;
-                if (!(int)config('v2board.invite_never_expire', env('V2BOARD_INVITE_NEVER_EXPIRE'))) {
-                    $inviteCode->status = 1;
-                    $inviteCode->save();
-                }
-            }
-        }
-
-        // try out
-        if ((int)config('v2board.try_out_enable', 0)) {
-            $plan = Plan::find(config('v2board.try_out_plan_id'));
-            if ($plan) {
-                $user->transfer_enable = $plan->transfer_enable * 1073741824;
-                $user->plan_id = $plan->id;
-                $user->group_id = $plan->group_id;
-                $user->expired_at = time() + (config('v2board.try_out_hour', 1) * 3600);
-            }
-        }
-
-        if (!$user->save()) {
-            abort(500, '注册失败');
-        }
-        if ((int)config('v2board.email_verify', 0)) {
-            Cache::forget($redisKey);
-        }
-        return response()->json([
-            'data' => true
-        ]);
-    }
-}

app/Http/Controllers/Server/Controller.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Server;
-
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller as BaseController;
-
-class Controller extends BaseController
-{
-    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');
-        }
-    }
-}

app/Http/Controllers/Server/DeepbworkController.php

@@ -2,18 +2,31 @@
 
 namespace App\Http\Controllers\Server;
 
+use App\Services\ServerService;
+use App\Services\UserService;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Server\Controller;
+use App\Http\Controllers\Controller;
 use App\Models\User;
-use App\Models\Plan;
 use App\Models\Server;
 use App\Models\ServerLog;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Cache;
 
 class DeepbworkController extends Controller
 {
-    CONST SERVER_CONFIG = '{"api":{"services":["HandlerService","StatsService"],"tag":"api"},"stats":{},"inbound":{"port":443,"protocol":"vmess","settings":{"clients":[]},"streamSettings":{"network":"tcp"},"tag":"proxy"},"inboundDetour":[{"listen":"0.0.0.0","port":23333,"protocol":"dokodemo-door","settings":{"address":"0.0.0.0"},"tag":"api"}],"log":{"loglevel":"debug","access":"access.log","error":"error.log"},"outbound":{"protocol":"freedom","settings":{}},"routing":{"settings":{"rules":[{"inboundTag":["api"],"outboundTag":"api","type":"field"}]},"strategy":"rules"},"policy":{"levels":{"0":{"handshake":4,"connIdle":300,"uplinkOnly":5,"downlinkOnly":30,"statsUserUplink":true,"statsUserDownlink":true}}}}';
+    CONST SERVER_CONFIG = '{"api":{"services":["HandlerService","StatsService"],"tag":"api"},"stats":{},"inbound":{"port":443,"protocol":"vmess","settings":{"clients":[]},"sniffing":{"enabled": true,"destOverride": ["http","tls"]},"streamSettings":{"network":"tcp"},"tag":"proxy"},"inboundDetour":[{"listen":"0.0.0.0","port":23333,"protocol":"dokodemo-door","settings":{"address":"0.0.0.0"},"tag":"api"}],"log":{"loglevel":"debug","access":"access.log","error":"error.log"},"outbound":{"protocol":"freedom","settings":{}},"outboundDetour":[{"protocol":"blackhole","settings":{},"tag":"block"}],"routing":{"rules":[{"inboundTag":"api","outboundTag":"api","type":"field"}]},"policy":{"levels":{"0":{"handshake":4,"connIdle":300,"uplinkOnly":5,"downlinkOnly":30,"statsUserUplink":true,"statsUserDownlink":true}}}}';
+
+    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');
+        }
+    }
 
     // 后端获取用户
     public function user(Request $request)
@@ -24,25 +37,13 @@ class DeepbworkController extends Controller
             abort(500, 'fail');
         }
         Cache::put('server_last_check_at_' . $server->id, time());
-        $users = User::whereIn('group_id', json_decode($server->group_id))
-            ->select([
-                'id',
-                'email',
-                't',
-                'u',
-                'd',
-                'transfer_enable',
-                'enable',
-                'v2ray_uuid',
-                'v2ray_alter_id',
-                'v2ray_level'
-            ])
-            ->get();
+        $serverService = new ServerService();
+        $users = $serverService->getAvailableUsers(json_decode($server->group_id));
         $result = [];
         foreach ($users as $user) {
             $user->v2ray_user = [
                 "uuid" => $user->v2ray_uuid,
-                "email" => sprintf("%s@v2panel.user", $user->v2ray_uuid),
+                "email" => sprintf("%s@v2board.user", $user->v2ray_uuid),
                 "alter_id" => $user->v2ray_alter_id,
                 "level" => $user->v2ray_level,
             ];
@@ -60,32 +61,35 @@ class DeepbworkController extends Controller
     // 后端提交数据
     public function submit(Request $request)
     {
-        Log::info('serverSubmitData:' . $request->input('node_id') . ':' . file_get_contents('php://input'));
+        // Log::info('serverSubmitData:' . $request->input('node_id') . ':' . file_get_contents('php://input'));
         $server = Server::find($request->input('node_id'));
         if (!$server) {
             return response([
-                'ret' => 1,
-                'msg' => 'ok'
+                'ret' => 0,
+                'msg' => 'server is not found'
             ]);
         }
         $data = file_get_contents('php://input');
         $data = json_decode($data, true);
+        $serverService = new ServerService();
+        $userService = new UserService();
         foreach ($data as $item) {
             $u = $item['u'] * $server->rate;
             $d = $item['d'] * $server->rate;
-            $user = User::find($item['user_id']);
-            $user->t = time();
-            $user->u = $user->u + $u;
-            $user->d = $user->d + $d;
-            $user->save();
+            if (!$userService->trafficFetch($u, $d, $item['user_id'])) {
+                return response([
+                    'ret' => 0,
+                    'msg' => 'user fetch fail'
+                ]);
+            }
 
-            $serverLog = new ServerLog();
-            $serverLog->user_id = $item['user_id'];
-            $serverLog->server_id = $request->input('node_id');
-            $serverLog->u = $item['u'];
-            $serverLog->d = $item['d'];
-            $serverLog->rate = $server->rate;
-            $serverLog->save();
+            $serverService->log(
+                $item['user_id'],
+                $request->input('node_id'),
+                $item['u'],
+                $item['d'],
+                $server->rate
+            );
         }
 
         return response([
@@ -100,42 +104,13 @@ class DeepbworkController extends Controller
         $nodeId = $request->input('node_id');
         $localPort = $request->input('local_port');
         if (empty($nodeId) || empty($localPort)) {
-            abort(1000, '参数错误');
+            abort(500, '参数错误');
         }
-        $server = Server::find($nodeId);
-        if (!$server) {
-            abort(1001, '节点不存在');
-        }
-        $json = json_decode(self::SERVER_CONFIG);
-        $json->inboundDetour[0]->port = (int)$localPort;
-        $json->inbound->port = (int)$server->server_port;
-        $json->inbound->streamSettings->network = $server->network;
-        if ($server->settings) {
-            switch ($server->network) {
-                case 'tcp':
-                    $json->inbound->streamSettings->tcpSettings = json_decode($server->settings);
-                    break;
-                case 'kcp':
-                    $json->inbound->streamSettings->kcpSettings = json_decode($server->settings);
-                    break;
-                case 'ws':
-                    $json->inbound->streamSettings->wsSettings = json_decode($server->settings);
-                    break;
-                case 'http':
-                    $json->inbound->streamSettings->httpSettings = json_decode($server->settings);
-                    break;
-                case 'domainsocket':
-                    $json->inbound->streamSettings->dsSettings = json_decode($server->settings);
-                    break;
-                case 'quic':
-                    $json->inbound->streamSettings->quicSettings = json_decode($server->settings);
-                    break;
-            }
-        }
-        if ((int)$server->tls) {
-            $json->inbound->streamSettings->security = "tls";
-            $tls = (object)array("certificateFile" => "/home/v2ray.crt", "keyFile" => "/home/v2ray.key");
-            $json->inbound->streamSettings->tlsSettings->certificates[0] = $tls;
+        $serverService = new ServerService();
+        try {
+            $json = $serverService->getConfig($nodeId, $localPort);
+        } catch (\Exception $e) {
+            abort(500, $e->getMessage());
         }
 
         die(json_encode($json, JSON_UNESCAPED_UNICODE));

app/Http/Controllers/Server/PoseidonController.php

@@ -0,0 +1,151 @@
+<?php
+
+namespace App\Http\Controllers\Server;
+
+use App\Services\ServerService;
+use App\Services\UserService;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\User;
+use App\Models\Plan;
+use App\Models\Server;
+use App\Models\ServerLog;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Cache;
+
+class PoseidonController extends Controller
+{
+    CONST SERVER_CONFIG = '{"api":{"services":["HandlerService","StatsService"],"tag":"api"},"stats":{},"inbound":{"port":443,"protocol":"vmess","settings":{"clients":[]},"sniffing":{"enabled": true,"destOverride": ["http","tls"]},"streamSettings":{"network":"tcp"},"tag":"proxy"},"inboundDetour":[{"listen":"0.0.0.0","port":23333,"protocol":"dokodemo-door","settings":{"address":"0.0.0.0"},"tag":"api"}],"log":{"loglevel":"debug","access":"access.log","error":"error.log"},"outbound":{"protocol":"freedom","settings":{}},"outboundDetour":[{"protocol":"blackhole","settings":{},"tag":"block"}],"routing":{"rules":[{"inboundTag":"api","outboundTag":"api","type":"field"}]},"policy":{"levels":{"0":{"handshake":4,"connIdle":300,"uplinkOnly":5,"downlinkOnly":30,"statsUserUplink":true,"statsUserDownlink":true}}}}';
+
+    public $poseidonVersion;
+
+    public function __construct(Request $request)
+    {
+        $this->poseidonVersion = $request->input('poseidon_version');
+    }
+
+    // 后端获取用户
+    public function user(Request $request)
+    {
+        if ($r = $this->verifyToken($request)) { return $r; }
+
+        $nodeId = $request->input('node_id');
+        $server = Server::find($nodeId);
+        if (!$server) {
+            return $this->error("server could not be found", 404);
+        }
+        Cache::put('server_last_check_at_' . $server->id, time());
+        $serverService = new ServerService();
+        $users = $serverService->getAvailableUsers(json_decode($server->group_id));
+        $result = [];
+        foreach ($users as $user) {
+            $user->v2ray_user = [
+                "uuid" => $user->v2ray_uuid,
+                "email" => sprintf("%s@v2board.user", $user->v2ray_uuid),
+                "alter_id" => $user->v2ray_alter_id,
+                "level" => $user->v2ray_level,
+            ];
+            unset($user['v2ray_uuid']);
+            unset($user['v2ray_alter_id']);
+            unset($user['v2ray_level']);
+            array_push($result, $user);
+        }
+
+        return $this->success($result);
+    }
+
+    // 后端提交数据
+    public function submit(Request $request)
+    {
+        if ($r = $this->verifyToken($request)) { return $r; }
+
+        // Log::info('serverSubmitData:' . $request->input('node_id') . ':' . file_get_contents('php://input'));
+        $server = Server::find($request->input('node_id'));
+        if (!$server) {
+            return $this->error("server could not be found", 404);
+        }
+        $data = file_get_contents('php://input');
+        $data = json_decode($data, true);
+        $serverService = new ServerService();
+        $userService = new UserService();
+        foreach ($data as $item) {
+            $u = $item['u'] * $server->rate;
+            $d = $item['d'] * $server->rate;
+            if (!$userService->trafficFetch($u, $d, $item['user_id'])) {
+                return $this->error("user fetch fail", 500);
+            }
+
+            $serverService->log(
+                $item['user_id'],
+                $request->input('node_id'),
+                $item['u'],
+                $item['d'],
+                $server->rate
+            );
+        }
+
+        return $this->success('');
+    }
+
+    // 后端获取配置
+    public function config(Request $request)
+    {
+        if ($r = $this->verifyToken($request)) { return $r; }
+
+        $nodeId = $request->input('node_id');
+        $localPort = $request->input('local_port');
+        if (empty($nodeId) || empty($localPort)) {
+            return $this->error('invalid parameters', 400);
+        }
+
+        $serverService = new ServerService();
+        try {
+            $json = $serverService->getConfig($nodeId, $localPort);
+            $json->poseidon = [
+              'license_key' => (string)config('v2board.server_license'),
+            ];
+            if ($this->poseidonVersion >= 'v1.5.0') {
+                // don't need it after v1.5.0
+                unset($json->inboundDetour);
+                unset($json->stats);
+                unset($json->api);
+                array_shift($json->routing->rules);
+            }
+
+            foreach($json->policy->levels as &$level) {
+                $level->handshake = 2;
+                $level->uplinkOnly = 2;
+                $level->downlinkOnly = 2;
+                $level->connIdle = 60;
+            }
+
+            return $this->success($json);
+        } catch (\Exception $e) {
+            return $this->error($e->getMessage(), 500);
+        }
+    }
+
+    protected function verifyToken(Request $request)
+    {
+        $token = $request->input('token');
+        if (empty($token)) {
+            return $this->error("token must be set");
+        }
+        if ($token !== config('v2board.server_token')) {
+            return $this->error("invalid token");
+        }
+    }
+
+    protected function error($msg, int $status = 400) {
+        return response([
+            'msg' => $msg,
+        ], $status);
+    }
+
+    protected function success($data) {
+        return response([
+            'msg' => 'ok',
+            'data' => $data,
+        ]);
+    }
+}

app/Http/Controllers/User/CommController.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Controllers\User;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+class CommController extends Controller
+{
+    public function config()
+    {
+        return response([
+            'data' => [
+                'isTelegram' => (int)config('v2board.telegram_bot_enable', 0)
+            ]
+        ]);
+    }
+}

app/Http/Controllers/User/CouponController.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use App\Models\Coupon;
 

app/Http/Controllers/User/InviteController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
 use App\Models\User;
 use App\Models\Order;
 use App\Models\InviteCode;
@@ -28,6 +28,7 @@ class InviteController extends Controller
     {
         return response([
             'data' => Order::where('invite_user_id', $request->session()->get('id'))
+                ->where('commission_balance', '>', 0)
                 ->where('status', 3)
                 ->select([
                     'id',
@@ -45,7 +46,7 @@ class InviteController extends Controller
         $codes = InviteCode::where('user_id', $request->session()->get('id'))
             ->where('status', 0)
             ->get();
-        $commission_rate = config('v2board.invite_commission');
+        $commission_rate = config('v2board.invite_commission', 10);
         $user = User::find($request->session()->get('id'));
         if ($user->commission_rate) {
             $commission_rate = $user->commission_rate;
@@ -55,7 +56,7 @@ class InviteController extends Controller
             (int)User::where('invite_user_id', $request->session()->get('id'))->count(),
             //有效的佣金
             (int)Order::where('status', 3)
-                ->where('commission_status', 1)
+                ->where('commission_status', 2)
                 ->where('invite_user_id', $request->session()->get('id'))
                 ->sum('commission_balance'),
             //确认中的佣金
@@ -64,7 +65,9 @@ class InviteController extends Controller
                 ->where('invite_user_id', $request->session()->get('id'))
                 ->sum('commission_balance'),
             //佣金比例
-            (int)$commission_rate
+            (int)$commission_rate,
+            //可用佣金
+            (int)$user->commission_balance
         ];
         return response([
             'data' => [

app/Http/Controllers/User/NoticeController.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Controllers\User;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use App\Models\Notice;
+use App\Utils\Helper;
+
+class NoticeController extends Controller
+{
+    public function fetch(Request $request)
+    {
+        $current = $request->input('current') ? $request->input('current') : 1;
+        $pageSize = 5;
+        $model = Notice::orderBy('created_at', 'DESC');
+        $total = $model->count();
+        $res = $model->forPage($current, $pageSize)
+            ->get();
+        return response([
+            'data' => $res,
+            'total' => $total
+        ]);
+    }
+}

app/Http/Controllers/User/OrderController.php

@@ -1,9 +1,12 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
-use App\Http\Requests\OrderSave;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\User\OrderSave;
+use App\Services\CouponService;
+use App\Services\OrderService;
+use App\Services\UserService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
@@ -23,9 +26,12 @@ class OrderController extends Controller
 {
     public function fetch(Request $request)
     {
-        $order = Order::where('user_id', $request->session()->get('id'))
-            ->orderBy('created_at', 'DESC')
-            ->get();
+        $model = Order::where('user_id', $request->session()->get('id'))
+            ->orderBy('created_at', 'DESC');
+        if ($request->input('status') !== null) {
+            $model->where('status', $request->input('status'));
+        }
+        $order = $model->get();
         $plan = Plan::get();
         for ($i = 0; $i < count($order); $i++) {
             for ($x = 0; $x < count($plan); $x++) {
@@ -48,7 +54,6 @@ class OrderController extends Controller
             abort(500, '订单不存在');
         }
         $order['plan'] = Plan::find($order->plan_id);
-        $order['plan_transfer_hour'] = config('v2board.plan_transfer_hour', 12);
         $order['try_out_plan_id'] = (int)config('v2board.try_out_plan_id');
         if (!$order['plan']) {
             abort(500, '订阅不存在');
@@ -58,21 +63,11 @@ class OrderController extends Controller
         ]);
     }
 
-    private function isExistNotPayOrderByUserId($userId)
-    {
-        $order = Order::where('status', 0)
-            ->where('user_id', $userId)
-            ->first();
-        if (!$order) {
-            return false;
-        }
-        return true;
-    }
-
     public function save(OrderSave $request)
     {
-        if ($this->isExistNotPayOrderByUserId($request->session()->get('id'))) {
-            abort(500, '存在未付款订单，请取消后再试');
+        $userService = new UserService();
+        if ($userService->isNotCompleteOrderByUserId($request->session()->get('id'))) {
+            abort(500, '您有未付款或开通中的订单，请稍后或取消再试');
         }
 
         $plan = Plan::find($request->input('plan_id'));
@@ -82,84 +77,68 @@ class OrderController extends Controller
             abort(500, '该订阅不存在');
         }
 
-        if (!($plan->show || $user->plan_id == $plan->id)) {
-            abort(500, '该订阅已售罄');
+        if ((!$plan->show && !$plan->renew) || (!$plan->show && $user->plan_id !== $plan->id)) {
+            if ($request->input('cycle') !== 'reset_price') {
+                abort(500, '该订阅已售罄');
+            }
         }
 
-        if (!$plan->show && !$plan->renew) {
+        if (!$plan->renew && $user->plan_id == $plan->id) {
             abort(500, '该订阅无法续费，请更换其他订阅');
         }
 
         if ($plan[$request->input('cycle')] === NULL) {
+            if ($request->input('cycle') === 'reset_price') {
+                abort(500, '该订阅当前不支持重置流量');
+            }
             abort(500, '该订阅周期无法进行购买，请选择其他周期');
         }
 
-        if ($request->input('coupon_code')) {
-            $coupon = Coupon::where('code', $request->input('coupon_code'))->first();
-            if (!$coupon) {
-                abort(500, '优惠券无效');
-            }
-            if ($coupon->limit_use <= 0 && $coupon->limit_use !== NULL) {
-                abort(500, '优惠券已无可用次数');
-            }
-            if (time() < $coupon->started_at) {
-                abort(500, '优惠券还未到可用时间');
-            }
-            if (time() > $coupon->ended_at) {
-                abort(500, '优惠券已过期');
-            }
+        if ($request->input('cycle') === 'reset_price' && !$user->plan_id) {
+            abort(500, '必须存在订阅才可以购买流量重置包');
         }
 
         DB::beginTransaction();
         $order = new Order();
+        $orderService = new OrderService($order);
         $order->user_id = $request->session()->get('id');
         $order->plan_id = $plan->id;
         $order->cycle = $request->input('cycle');
         $order->trade_no = Helper::guid();
         $order->total_amount = $plan[$request->input('cycle')];
-        // renew and change subscribe process
-        if ($user->expired_at > time() && $order->plan_id !== $user->plan_id) {
-            $order->type = 3;
-            if (!(int)config('v2board.plan_change_enable', 1)) abort(500, '目前不允许更改订阅，请联系管理员');
-        } else if ($user->expired_at > time() && $order->plan_id == $user->plan_id) {
-            $order->type = 2;
-        } else {
-            $order->type = 1;
-        }
-        // coupon process
-        if (isset($coupon)) {
-            switch ($coupon->type) {
-                case 1:
-                    $order->discount_amount = $coupon->value;
-                    break;
-                case 2:
-                    $order->discount_amount = $order->total_amount * ($coupon->value / 100);
-                    break;
+
+        if ($request->input('coupon_code')) {
+            $couponService = new CouponService($request->input('coupon_code'));
+            if (!$couponService->use($order)) {
+                DB::rollBack();
+                abort(500, '优惠券使用失败');
             }
-            $order->total_amount = $order->total_amount - $order->discount_amount;
-            if ($coupon->limit_use !== NULL) {
-                $coupon->limit_use = $coupon->limit_use - 1;
-                if (!$coupon->save()) {
-                    DB::rollback();
-                    abort(500, '优惠券使用失败');
+        }
+
+        $orderService->setVipDiscount($user);
+        $orderService->setOrderType($user);
+        $orderService->setInvite($user);
+
+        if ($user->balance && $order->total_amount > 0) {
+            $remainingBalance = $user->balance - $order->total_amount;
+            $userService = new UserService();
+            if ($remainingBalance > 0) {
+                if (!$userService->addBalance($order->user_id, - $order->total_amount)) {
+                    DB::rollBack();
+                    abort(500, '余额不足');
                 }
-            }
-        }
-        // free process
-        if ($order->total_amount <= 0) {
-            $order->total_amount = 0;
-            $order->status = 1;
-        }
-        // invite process
-        if ($user->invite_user_id && $order->total_amount > 0) {
-            $order->invite_user_id = $user->invite_user_id;
-            $inviter = User::find($user->invite_user_id);
-            if ($inviter && $inviter->commission_rate) {
-                $order->commission_balance = $order->total_amount * ($inviter->commission_rate / 100);
+                $order->balance_amount = $order->total_amount;
+                $order->total_amount = 0;
             } else {
-                $order->commission_balance = $order->total_amount * (config('v2board.invite_commission', 10) / 100);
+                if (!$userService->addBalance($order->user_id, - $user->balance)) {
+                    DB::rollBack();
+                    abort(500, '余额不足');
+                }
+                $order->balance_amount = $user->balance;
+                $order->total_amount = $order->total_amount - $user->balance;
             }
         }
+
         if (!$order->save()) {
             DB::rollback();
             abort(500, '订单创建失败');
@@ -183,6 +162,16 @@ class OrderController extends Controller
         if (!$order) {
             abort(500, '订单不存在或已支付');
         }
+        // free process
+        if ($order->total_amount <= 0) {
+            $order->total_amount = 0;
+            $order->status = 1;
+            $order->save();
+            return response([
+                'type' => -1,
+                'data' => true
+            ]);
+        }
         switch ($method) {
             // return type => 0: QRCode / 1: URL
             case 0:
@@ -277,7 +266,7 @@ class OrderController extends Controller
 
         if ((int)config('v2board.bitpayx_enable')) {
             $bitpayX = new \StdClass();
-            $bitpayX->name = '聚合支付';
+            $bitpayX->name = config('v2board.bitpayx_name', '聚合支付');
             $bitpayX->method = 4;
             $bitpayX->icon = 'wallet';
             array_push($data, $bitpayX);
@@ -285,7 +274,7 @@ class OrderController extends Controller
 
         if ((int)config('v2board.paytaro_enable')) {
             $obj = new \StdClass();
-            $obj->name = '聚合支付';
+            $obj->name = config('v2board.paytaro_name', '聚合支付');
             $obj->method = 5;
             $obj->icon = 'wallet';
             array_push($data, $obj);
@@ -310,8 +299,8 @@ class OrderController extends Controller
         if ($order->status !== 0) {
             abort(500, '只可以取消待支付订单');
         }
-        $order->status = 2;
-        if (!$order->save()) {
+        $orderService = new OrderService($order);
+        if (!$orderService->cancel()) {
             abort(500, '取消失败');
         }
         return response([
@@ -345,15 +334,22 @@ class OrderController extends Controller
 
     private function stripeAlipay($order)
     {
-        $exchange = Helper::exchange('CNY', 'HKD');
+        $currency = config('v2board.stripe_currency', 'hkd');
+        $exchange = Helper::exchange('CNY', strtoupper($currency));
         if (!$exchange) {
             abort(500, '货币转换超时，请稍后再试');
         }
         Stripe::setApiKey(config('v2board.stripe_sk_live'));
         $source = Source::create([
             'amount' => floor($order->total_amount * $exchange),
-            'currency' => 'hkd',
+            'currency' => $currency,
             'type' => 'alipay',
+            'statement_descriptor' => $order->trade_no,
+            'metadata' => [
+                'user_id' => $order->user_id,
+                'invoice_id' => $order->trade_no,
+                'identifier' => ''
+            ],
             'redirect' => [
                 'return_url' => config('v2board.app_url', env('APP_URL')) . '/#/order'
             ]
@@ -370,15 +366,21 @@ class OrderController extends Controller
 
     private function stripeWepay($order)
     {
-        $exchange = Helper::exchange('CNY', 'HKD');
+        $currency = config('v2board.stripe_currency', 'hkd');
+        $exchange = Helper::exchange('CNY', strtoupper($currency));
         if (!$exchange) {
             abort(500, '货币转换超时，请稍后再试');
         }
         Stripe::setApiKey(config('v2board.stripe_sk_live'));
         $source = Source::create([
             'amount' => floor($order->total_amount * $exchange),
-            'currency' => 'hkd',
+            'currency' => $currency,
             'type' => 'wechat',
+            'metadata' => [
+                'user_id' => $order->user_id,
+                'invoice_id' => $order->trade_no,
+                'identifier' => ''
+            ],
             'redirect' => [
                 'return_url' => config('v2board.app_url', env('APP_URL')) . '/#/order'
             ]
@@ -408,7 +410,7 @@ class OrderController extends Controller
         $strToSign = $bitpayX->prepareSignId($params['merchant_order_id']);
         $params['token'] = $bitpayX->sign($strToSign);
         $result = $bitpayX->mprequest($params);
-        Log::info('bitpayXSubmit: ' . json_encode($result));
+        // Log::info('bitpayXSubmit: ' . json_encode($result));
         return isset($result['payment_url']) ? $result['payment_url'] : false;
     }
 

app/Http/Controllers/User/PlanController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
 use App\Models\Plan;
 
 class PlanController extends Controller
@@ -21,6 +21,7 @@ class PlanController extends Controller
             ]);
         }
         $plan = Plan::where('show', 1)
+            ->orderBy('sort', 'ASC')
             ->get();
         return response([
             'data' => $plan

app/Http/Controllers/User/ServerController.php

@@ -1,10 +1,11 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
+use App\Http\Controllers\Controller;
+use App\Services\UserService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
-use App\Http\Controllers\Controller;
 use App\Models\Server;
 use App\Models\ServerLog;
 use App\Models\User;
@@ -17,9 +18,10 @@ class ServerController extends Controller
     {
         $user = User::find($request->session()->get('id'));
         $server = [];
-        if ($user->expired_at > time()) {
+        $userService = new UserService();
+        if ($userService->isAvailable($user)) {
             $servers = Server::where('show', 1)
-                ->orderBy('name')
+                ->orderBy('sort', 'ASC')
                 ->get();
             foreach ($servers as $item) {
                 $groupId = json_decode($item['group_id']);
@@ -58,17 +60,12 @@ class ServerController extends Controller
             case 2:
                 $serverLogModel->where('created_at', '>=', strtotime(date('Y-m-1')));
         }
-        $sum = [
-            'u' => $serverLogModel->sum('u'),
-            'd' => $serverLogModel->sum('d')
-        ];
         $total = $serverLogModel->count();
         $res = $serverLogModel->forPage($current, $pageSize)
             ->get();
         return response([
             'data' => $res,
-            'total' => $total,
-            'sum' => $sum
+            'total' => $total
         ]);
     }
 }

app/Http/Controllers/User/TelegramController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\User;
+
+use App\Http\Controllers\Controller;
+use App\Services\TelegramService;
+
+class TelegramController extends Controller
+{
+    public function getBotInfo()
+    {
+        $telegramService = new TelegramService();
+        $response = $telegramService->getMe();
+        return response([
+            'data' => [
+                'username' => $response->result->username
+            ]
+        ]);
+    }
+}

app/Http/Controllers/User/TicketController.php

@@ -1,13 +1,15 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
-use App\Http\Requests\TicketSave;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\User\TicketSave;
+use App\Http\Requests\User\TicketWithdraw;
+use App\Jobs\SendTelegramJob;
+use App\Models\User;
+use Illuminate\Http\Request;
 use App\Models\Ticket;
 use App\Models\TicketMessage;
-use App\Utils\Helper;
 use Illuminate\Support\Facades\DB;
 
 class TicketController extends Controller
@@ -51,6 +53,9 @@ 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()) {
+            abort(500, '存在其他工单尚未处理');
+        }
         $ticket = Ticket::create(array_merge($request->only([
             'subject',
             'level'
@@ -72,6 +77,7 @@ class TicketController extends Controller
             abort(500, '工单创建失败');
         }
         DB::commit();
+        $this->sendNotify($ticket, $ticketMessage);
         return response([
             'data' => true
         ]);
@@ -109,6 +115,7 @@ class TicketController extends Controller
             abort(500, '工单回复失败');
         }
         DB::commit();
+        $this->sendNotify($ticket, $ticketMessage);
         return response([
             'data' => true
         ]);
@@ -141,4 +148,53 @@ class TicketController extends Controller
             ->orderBy('id', 'DESC')
             ->first();
     }
+
+    public function withdraw(TicketWithdraw $request)
+    {
+        DB::beginTransaction();
+        $subject = '[提现申请]本工单由系统发出';
+        $ticket = Ticket::create([
+            'subject' => $subject,
+            'level' => 2,
+            'user_id' => $request->session()->get('id'),
+            'last_reply_user_id' => $request->session()->get('id')
+        ]);
+        if (!$ticket) {
+            DB::rollback();
+            abort(500, '工单创建失败');
+        }
+        $methodText = [
+            'alipay' => '支付宝',
+            'paypal' => '贝宝(Paypal)',
+            'usdt' => 'USDT',
+            'btc' => '比特币'
+        ];
+        $message = "提现方式：{$methodText[$request->input('withdraw_method')]}\r\n提现账号：{$request->input('withdraw_account')}\r\n";
+        $ticketMessage = TicketMessage::create([
+            'user_id' => $request->session()->get('id'),
+            'ticket_id' => $ticket->id,
+            'message' => $message
+        ]);
+        if (!$ticketMessage) {
+            DB::rollback();
+            abort(500, '工单创建失败');
+        }
+        DB::commit();
+        $this->sendNotify($ticket, $ticketMessage);
+        return response([
+            'data' => true
+        ]);
+    }
+
+    private function sendNotify(Ticket $ticket, TicketMessage $ticketMessage)
+    {
+        if (!config('v2board.telegram_bot_enable', 0)) return;
+        $users = User::where('is_admin', 1)
+            ->where('telegram_id', '!=', NULL)
+            ->get();
+        foreach ($users as $user) {
+            $text = "📮工单提醒 #{$ticket->id}\n———————————————\n主题：\n`{$ticket->subject}`\n内容：\n`{$ticketMessage->message}`";
+            SendTelegramJob::dispatch($user->telegram_id, $text);
+        }
+    }
 }

app/Http/Controllers/User/TutorialController.php

@@ -1,11 +1,12 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
 use App\Models\User;
 use App\Models\Tutorial;
+use Illuminate\Support\Facades\DB;
 
 class TutorialController extends Controller
 {
@@ -49,9 +50,11 @@ class TutorialController extends Controller
                 'data' => $tutorial
             ]);
         }
-        $tutorial = Tutorial::select(['id', 'title', 'description', 'icon'])
+        $tutorial = Tutorial::select(['id', 'category_id', 'title'])
             ->where('show', 1)
-            ->get();
+            ->orderBy('sort', 'ASC')
+            ->get()
+            ->groupBy('category_id');
         $user = User::find($request->session()->get('id'));
         $response = [
             'data' => [
@@ -59,8 +62,8 @@ class TutorialController extends Controller
                 'safe_area_var' => [
                     'subscribe_url' => config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user['token'],
                     'app_name' => config('v2board.app_name', 'V2board'),
-                    'apple_id' => $user->expired_at > time() ? config('v2board.apple_id', '管理员暂无提供AppleID信息') : '账号过期或未订阅',
-                    'apple_id_password' => $user->expired_at > time() ? config('v2board.apple_id_password', '管理员暂无提供AppleID信息') : '账号过期或未订阅'
+                    'apple_id' => $user->expired_at > time() || $user->expired_at === NULL ? config('v2board.apple_id', '本站暂无提供AppleID信息') : '账号过期或未订阅',
+                    'apple_id_password' => $user->expired_at > time() || $user->expired_at === NULL ? config('v2board.apple_id_password', '本站暂无提供AppleID信息') : '账号过期或未订阅'
                 ]
             ]
         ];
@@ -71,6 +74,9 @@ class TutorialController extends Controller
             base64_encode($response['data']['safe_area_var']['subscribe_url'])
         );
         // end
+        // fuck support surge urlencode subscribe
+        $response['data']['safe_area_var']['ue_subscribe_url'] = urlencode($response['data']['safe_area_var']['subscribe_url']);
+        // end
         return response($response);
     }
 }

app/Http/Controllers/User/UserController.php

@@ -1,10 +1,11 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\User;
 
-use App\Http\Requests\UserUpdate;
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\User\UserUpdate;
+use App\Http\Requests\User\UserChangePassword;
+use Illuminate\Http\Request;
 use App\Models\User;
 use App\Models\Plan;
 use App\Models\Server;
@@ -17,24 +18,24 @@ class UserController extends Controller
 {
     public function logout(Request $request)
     {
+        $request->session()->flush();
         return response([
-            'data' => $request->session()->flush()
+            'data' => true
         ]);
     }
 
-    public function changePassword(Request $request)
+    public function changePassword(UserChangePassword $request)
     {
-        if (empty($request->input('old_password'))) {
-            abort(500, '旧密码不能为空');
-        }
-        if (empty($request->input('new_password'))) {
-            abort(500, '新密码不能为空');
-        }
         $user = User::find($request->session()->get('id'));
-        if (!password_verify($request->input('old_password'), $user->password)) {
+        if (!Helper::multiPasswordVerify(
+            $user->password_algo,
+            $request->input('old_password'),
+            $user->password)
+        ) {
             abort(500, '旧密码有误');
         }
         $user->password = password_hash($request->input('new_password'), PASSWORD_DEFAULT);
+        $user->password_algo = NULL;
         if (!$user->save()) {
             abort(500, '保存失败');
         }
@@ -52,14 +53,17 @@ class UserController extends Controller
                 'transfer_enable',
                 'last_login_at',
                 'created_at',
-                'enable',
+                'banned',
                 'is_admin',
                 'remind_expire',
                 'remind_traffic',
                 'expired_at',
                 'balance',
                 'commission_balance',
-                'plan_id'
+                'plan_id',
+                'discount',
+                'commission_rate',
+                'telegram_id'
             ])
             ->first();
         $user['avatar_url'] = 'https://cdn.v2ex.com/gravatar/' . md5($user->email) . '?s=64&d=identicon';
@@ -109,7 +113,7 @@ class UserController extends Controller
             abort(500, '重置失败');
         }
         return response([
-            'data' => true
+            'data' => config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user->token
         ]);
     }
 
@@ -124,7 +128,9 @@ class UserController extends Controller
         if (!$user) {
             abort(500, '该用户不存在');
         }
-        if (!$user->update($updateData)) {
+        try {
+            $user->update($updateData);
+        } catch (\Exception $e) {
             abort(500, '保存失败');
         }
 
@@ -132,4 +138,26 @@ class UserController extends Controller
             'data' => true
         ]);
     }
+
+    public function transfer(Request $request)
+    {
+        $user = User::find($request->session()->get('id'));
+        if (!$user) {
+            abort(500, '该用户不存在');
+        }
+        if ($request->input('transfer_amount') <= 0) {
+            abort(500, '参数错误');
+        }
+        if ($request->input('transfer_amount') > $user->commission_balance) {
+            abort(500, '推广佣金余额不足');
+        }
+        $user->commission_balance = $user->commission_balance - $request->input('transfer_amount');
+        $user->balance = $user->balance + $request->input('transfer_amount');
+        if (!$user->save()) {
+            abort(500, '划转失败');
+        }
+        return response([
+            'data' => true
+        ]);
+    }
 }

app/Http/Kernel.php

@@ -43,7 +43,7 @@ class Kernel extends HttpKernel
             \Illuminate\Session\Middleware\StartSession::class,
             \App\Http\Middleware\ForceJson::class,
             \App\Http\Middleware\CORS::class,
-            'throttle:60,1',
+            'throttle:120,1',
             'bindings',
         ],
     ];

app/Http/Middleware/Server.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use App\Models\User;
-
-class Server
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
-     * @return mixed
-     */
-    public function handle($request, Closure $next)
-    {
-        $token = $request->input('token');
-        if (empty($token)) {
-            abort(500, 'token is null');
-        }
-        if ($token !== config('v2board.server_token')) {
-            abort(500, 'token is error');
-        }
-        return $next($request);
-    }
-}

app/Http/Middleware/User.php

@@ -15,6 +15,13 @@ class User
      */
     public function handle($request, Closure $next)
     {
+        if ($request->input('access_token')) {
+            $user = \App\Models\User::where('token', $request->input('access_token'))->first();
+            if ($user) {
+                $request->session()->put('email', $user->email);
+                $request->session()->put('id', $user->id);
+            }
+        }
         if (!$request->session()->get('id')) {
             abort(403, '未登录或登陆已过期');
         }

app/Http/Requests/Admin/ConfigSave.php

@@ -7,23 +7,35 @@ use Illuminate\Foundation\Http\FormRequest;
 class ConfigSave extends FormRequest
 {
     CONST RULES = [
+        // 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',
+        // site
         'stop_register' => 'in:0,1',
         'email_verify' => 'in:0,1',
         'app_name' => '',
-        'app_url' => 'url',
-        'subscribe_url' => 'url',
-        'plan_transfer_hour' => 'numeric',
-        'plan_change_enable' => 'in:0,1',
+        'app_description' => '',
+        'app_url' => 'nullable|url',
+        'subscribe_url' => 'nullable|url',
         'try_out_enable' => 'in:0,1',
         'try_out_plan_id' => 'integer',
         'try_out_hour' => 'numeric',
+        'email_whitelist_enable' => 'in:0,1',
+        'email_whitelist_suffix' => '',
+        'email_gmail_limit_enable' => 'in:0,1',
+        // subscribe
+        'plan_change_enable' => 'in:0,1',
+        'reset_traffic_method' => 'in:0,1',
+        'renew_reset_traffic_enable' => 'in:0,1',
         // server
         'server_token' => 'nullable|min:16',
         'server_license' => 'nullable',
+        'server_log_level' => 'nullable|in:debug,info,warning,error,none',
         // alipay
         'alipay_enable' => 'in:0,1',
         'alipay_appid' => 'nullable|integer|min:16',
@@ -35,26 +47,33 @@ class ConfigSave extends FormRequest
         'stripe_sk_live' => '',
         'stripe_pk_live' => '',
         'stripe_webhook_key' => '',
+        'stripe_currency' => 'in:hkd,usd,sgd,eur,gbp',
         // bitpayx
+        'bitpayx_name' => '',
         'bitpayx_enable' => 'in:0,1',
         'bitpayx_appsecret' => '',
         // paytaro
+        'paytaro_name' => '',
         'paytaro_enable' => 'in:0,1',
         'paytaro_app_id' => '',
         'paytaro_app_secret' => '',
         // frontend
-        'frontend_theme' => 'in:1,2',
+        'frontend_theme_sidebar' => 'in:dark,light',
+        'frontend_theme_header' => 'in:dark,light',
+        'frontend_theme_color' => 'in:default,darkblue,black',
         'frontend_background_url' => 'nullable|url',
         // tutorial
         'apple_id' => 'email',
-        'apple_id_password' => ''
+        'apple_id_password' => '',
+        // email
+        'email_template' => '',
+        // telegram
+        'telegram_bot_enable' => 'in:0,1',
+        'telegram_bot_token' => '',
+        'telegram_discuss_id' => '',
+        'telegram_channel_id' => ''
     ];
 
-    public static function filter()
-    {
-        return array_keys(self::RULES);
-    }
-
     /**
      * Get the validation rules that apply to the request.
      *
@@ -67,7 +86,10 @@ class ConfigSave extends FormRequest
 
     public function messages()
     {
+        // illiteracy prompt
         return [
+            'app_url.url' => '站点URL格式不正确，必须携带http(s)://',
+            'subscribe_url.url' => '订阅URL格式不正确，必须携带http(s)://'
         ];
     }
 }

app/Http/Requests/Admin/MailSend.php

@@ -14,7 +14,7 @@ class MailSend extends FormRequest
     public function rules()
     {
         return [
-            'type' => 'required|in:1,2',
+            'type' => 'required|in:1,2,3,4',
             'subject' => 'required',
             'content' => 'required',
             'receiver' => 'array'

app/Http/Requests/Admin/NoticeSave.php

@@ -16,7 +16,7 @@ class NoticeSave extends FormRequest
         return [
             'title' => 'required',
             'content' => 'required',
-            'img_url' => 'url'
+            'img_url' => 'nullable|url'
         ];
     }
 

app/Http/Requests/Admin/OrderAssign.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class OrderAssign extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'plan_id' => 'required',
+            'email' => 'required',
+            'total_amount' => 'required',
+            'cycle' => 'required|in:month_price,quarter_price,half_year_price,year_price,onetime_price,reset_price'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'plan_id.required' => '订阅不能为空',
+            'email.required' => '邮箱不能为空',
+            'total_amount.required' => '支付金额不能为空',
+            'cycle.required' => '订阅周期不能为空',
+            'cycle.in' => '订阅周期格式有误'
+        ];
+    }
+}

app/Http/Requests/Admin/OrderUpdate.php

@@ -15,7 +15,7 @@ class OrderUpdate extends FormRequest
     {
         return [
             'status' => 'in:0,1,2,3',
-            'commission_status' => 'in:0,1'
+            'commission_status' => 'in:0,1,2'
         ];
     }
 
@@ -23,7 +23,7 @@ class OrderUpdate extends FormRequest
     {
         return [
             'status.in' => '销售状态格式不正确',
-            'commission_status.in' => '续费状态格式不正确'
+            'commission_status.in' => '佣金状态格式不正确'
         ];
     }
 }

app/Http/Requests/Admin/PlanSave.php

@@ -6,6 +6,18 @@ use Illuminate\Foundation\Http\FormRequest;
 
 class PlanSave extends FormRequest
 {
+    CONST RULES = [
+        'name' => 'required',
+        'content' => '',
+        'group_id' => 'required',
+        'transfer_enable' => 'required',
+        'month_price' => 'nullable|integer',
+        'quarter_price' => 'nullable|integer',
+        'half_year_price' => 'nullable|integer',
+        'year_price' => 'nullable|integer',
+        'onetime_price' => 'nullable|integer',
+        'reset_price' => 'nullable|integer'
+    ];
     /**
      * Get the validation rules that apply to the request.
      *
@@ -13,27 +25,23 @@ class PlanSave extends FormRequest
      */
     public function rules()
     {
-        return [
-            'name' => 'required',
-            'group_id' => 'required',
-            'transfer_enable' => 'required',
-            'month_price' => 'nullable|integer',
-            'quarter_price' => 'nullable|integer',
-            'half_year_price' => 'nullable|integer',
-            'year_price' => 'nullable|integer'
-        ];
+        return self::RULES;
     }
 
     public function messages()
     {
         return [
             'name.required' => '套餐名称不能为空',
+            'type.required' => '套餐类型不能为空',
+            'type.in' => '套餐类型格式有误',
             'group_id.required' => '权限组不能为空',
             'transfer_enable.required' => '流量不能为空',
             'month_price.integer' => '月付金额格式有误',
             'quarter_price.integer' => '季付金额格式有误',
             'half_year_price.integer' => '半年付金额格式有误',
-            'year_price.integer' => '年付金额格式有误'
+            'year_price.integer' => '年付金额格式有误',
+            'onetime_price.integer' => '一次性金额有误',
+            'reset_price.integer' => '流量重置包金额有误'
         ];
     }
 }

app/Http/Requests/Admin/PlanSort.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class PlanSort extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'plan_ids' => 'required|array'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'plan_ids.required' => '订阅计划ID不能为空',
+            'plan_ids.array' => '订阅计划ID格式有误'
+        ];
+    }
+}

app/Http/Requests/Admin/ServerSave.php

@@ -6,6 +6,23 @@ use Illuminate\Foundation\Http\FormRequest;
 
 class ServerSave extends FormRequest
 {
+    CONST RULES = [
+        'show' => '',
+        'name' => 'required',
+        'group_id' => 'required|array',
+        'parent_id' => 'nullable|integer',
+        'host' => 'required',
+        'port' => 'required',
+        'server_port' => 'required',
+        'tls' => 'required',
+        'tags' => 'nullable|array',
+        'rate' => 'required|numeric',
+        'network' => 'required|in:tcp,kcp,ws,http,domainsocket,quic',
+        'networkSettings' => '',
+        'ruleSettings' => '',
+        'tlsSettings' => '',
+        'dnsSettings' => ''
+    ];
     /**
      * Get the validation rules that apply to the request.
      *
@@ -13,18 +30,7 @@ class ServerSave extends FormRequest
      */
     public function rules()
     {
-        return [
-            'name' => 'required',
-            'group_id' => 'required|array',
-            'parent_id' => 'nullable|integer',
-            'host' => 'required',
-            'port' => 'required',
-            'server_port' => 'required',
-            'tls' => 'required',
-            'tags' => 'array',
-            'rate' => 'required|numeric',
-            'network' => 'required|in:tcp,kcp,ws,http,domainsocket,quic'
-        ];
+        return self::RULES;
     }
 
     public function messages()

app/Http/Requests/Admin/ServerSort.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ServerSort extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'server_ids' => 'required|array'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'server_ids.required' => '服务器ID不能为空',
+            'server_ids.array' => '服务器ID格式有误'
+        ];
+    }
+}

app/Http/Requests/Admin/TutorialSave.php

@@ -6,6 +6,12 @@ use Illuminate\Foundation\Http\FormRequest;
 
 class TutorialSave extends FormRequest
 {
+    CONST RULES = [
+        'title' => 'required',
+        // 1:windows 2:macos 3:ios 4:android 5:linux 6:router
+        'category_id' => 'required|in:1,2,3,4,5,6',
+        'steps' => 'required'
+    ];
     /**
      * Get the validation rules that apply to the request.
      *
@@ -13,19 +19,16 @@ class TutorialSave extends FormRequest
      */
     public function rules()
     {
-        return [
-            'title' => 'required',
-            'description' => 'required',
-            'icon' => 'required'
-        ];
+        return self::RULES;
     }
 
     public function messages()
     {
         return [
             'title.required' => '标题不能为空',
-            'description.required' => '描述不能为空',
-            'icon.required' => '图标不能为空'
+            'category_id.required' => '分类不能为空',
+            'category_id.in' => '分类格式不正确',
+            'steps.required' => '教程步骤不能为空'
         ];
     }
 }

app/Http/Requests/Admin/TutorialSort.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class TutorialSort extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'tutorial_ids' => 'required|array'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'tutorial_ids.required' => '教程ID不能为空',
+            'tutorial_ids.array' => '教程ID格式有误'
+        ];
+    }
+}

app/Http/Requests/Admin/UserUpdate.php

@@ -6,6 +6,21 @@ use Illuminate\Foundation\Http\FormRequest;
 
 class UserUpdate extends FormRequest
 {
+    CONST RULES = [
+        'email' => 'required|email',
+        'password' => 'nullable',
+        'transfer_enable' => 'numeric',
+        'expired_at' => 'nullable|integer',
+        'banned' => 'required|in:0,1',
+        'plan_id' => 'nullable|integer',
+        'commission_rate' => 'nullable|integer|min:0|max:100',
+        'discount' => 'nullable|integer|min:0|max:100',
+        'is_admin' => 'required|in:0,1',
+        'u' => 'integer',
+        'd' => 'integer',
+        'balance' => 'integer',
+        'commission_balance' => 'integer'
+    ];
     /**
      * Get the validation rules that apply to the request.
      *
@@ -13,15 +28,7 @@ class UserUpdate extends FormRequest
      */
     public function rules()
     {
-        return [
-            'email' => 'required|email',
-            'transfer_enable' => 'numeric',
-            'expired_at' => 'integer',
-            'banned' => 'required|in:0,1',
-            'is_admin' => 'required|in:0,1',
-            'plan_id' => 'integer',
-            'commission_rate' => 'nullable|integer|min:0|max:100'
-        ];
+        return self::RULES;
     }
 
     public function messages()
@@ -39,7 +46,15 @@ class UserUpdate extends FormRequest
             'commission_rate.integer' => '推荐返利比例格式不正确',
             'commission_rate.nullable' => '推荐返利比例格式不正确',
             'commission_rate.min' => '推荐返利比例最小为0',
-            'commission_rate.max' => '推荐返利比例最大为100'
+            'commission_rate.max' => '推荐返利比例最大为100',
+            'discount.integer' => '专属折扣比例格式不正确',
+            'discount.nullable' => '专属折扣比例格式不正确',
+            'discount.min' => '专属折扣比例最小为0',
+            'discount.max' => '专属折扣比例最大为100',
+            'u.integer' => '上行流量格式不正确',
+            'd.integer' => '下行流量格式不正确',
+            'balance.integer' => '余额格式不正确',
+            'commission_balance.integer' => '佣金格式不正确'
         ];
     }
 }

app/Http/Requests/Passport/AuthForget.php

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

app/Http/Requests/Passport/AuthLogin.php

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

app/Http/Requests/Passport/AuthRegister.php

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

app/Http/Requests/User/OrderSave.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\User;
 
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -15,7 +15,7 @@ class OrderSave extends FormRequest
     {
         return [
             'plan_id' => 'required',
-            'cycle' => 'required|in:month_price,quarter_price,half_year_price,year_price'
+            'cycle' => 'required|in:month_price,quarter_price,half_year_price,year_price,onetime_price,reset_price'
         ];
     }
 

app/Http/Requests/User/TicketSave.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\User;
 
 use Illuminate\Foundation\Http\FormRequest;
 

app/Http/Requests/User/TicketWithdraw.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests\User;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class TicketWithdraw  extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'withdraw_method' => 'required|in:alipay,paypal,usdt,btc',
+            'withdraw_account' => 'required'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'withdraw_method.required' => '提现方式不能为空',
+            'withdraw_method.in' => '提现方式不支持',
+            'withdraw_account.required' => '提现账号不能为空'
+        ];
+    }
+}

app/Http/Requests/User/UserChangePassword.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests\User;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UserChangePassword extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'old_password' => 'required',
+            'new_password' => 'required|min:8'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'old_password.required' => '旧密码不能为空',
+            'new_password.required' => '新密码不能为空',
+            'new_password.min' => '密码必须大于8位数'
+        ];
+    }
+}

app/Http/Requests/User/UserUpdate.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\User;
 
 use Illuminate\Foundation\Http\FormRequest;
 

app/Http/Routes/AdminRoute.php

@@ -0,0 +1,70 @@
+<?php
+namespace App\Http\Routes;
+
+use Illuminate\Contracts\Routing\Registrar;
+
+class AdminRoute
+{
+    public function map(Registrar $router)
+    {
+        $router->group([
+            'prefix' => 'admin',
+            'middleware' => 'admin'
+        ], function ($router) {
+            // Config
+            $router->get ('/config/fetch', 'Admin\\ConfigController@fetch');
+            $router->post('/config/save', 'Admin\\ConfigController@save');
+            $router->get ('/config/getEmailTemplate', 'Admin\\ConfigController@getEmailTemplate');
+            $router->post('/config/setTelegramWebhook', 'Admin\\ConfigController@setTelegramWebhook');
+            // Plan
+            $router->get ('/plan/fetch', 'Admin\\PlanController@fetch');
+            $router->post('/plan/save', 'Admin\\PlanController@save');
+            $router->post('/plan/drop', 'Admin\\PlanController@drop');
+            $router->post('/plan/update', 'Admin\\PlanController@update');
+            $router->post('/plan/sort', 'Admin\\PlanController@sort');
+            // Server
+            $router->get ('/server/fetch', 'Admin\\ServerController@fetch');
+            $router->post('/server/save', 'Admin\\ServerController@save');
+            $router->get ('/server/group/fetch', 'Admin\\ServerController@groupFetch');
+            $router->post('/server/group/save', 'Admin\\ServerController@groupSave');
+            $router->post('/server/group/drop', 'Admin\\ServerController@groupDrop');
+            $router->post('/server/drop', 'Admin\\ServerController@drop');
+            $router->post('/server/update', 'Admin\\ServerController@update');
+            $router->post('/server/copy', 'Admin\\ServerController@copy');
+            $router->post('/server/viewConfig', 'Admin\\ServerController@viewConfig');
+            $router->post('/server/sort', 'Admin\\ServerController@sort');
+            // Order
+            $router->get ('/order/fetch', 'Admin\\OrderController@fetch');
+            $router->post('/order/repair', 'Admin\\OrderController@repair');
+            $router->post('/order/update', 'Admin\\OrderController@update');
+            $router->post('/order/assign', 'Admin\\OrderController@assign');
+            // User
+            $router->get ('/user/fetch', 'Admin\\UserController@fetch');
+            $router->post('/user/update', 'Admin\\UserController@update');
+            $router->get ('/user/getUserInfoById', 'Admin\\UserController@getUserInfoById');
+            // Stat
+            $router->get ('/stat/getOverride', 'Admin\\StatController@getOverride');
+            // 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');
+            // Ticket
+            $router->get ('/ticket/fetch', 'Admin\\TicketController@fetch');
+            $router->post('/ticket/reply', 'Admin\\TicketController@reply');
+            $router->post('/ticket/close', 'Admin\\TicketController@close');
+            // Mail
+            $router->post('/mail/send', 'Admin\\MailController@send');
+            // Coupon
+            $router->get ('/coupon/fetch', 'Admin\\CouponController@fetch');
+            $router->post('/coupon/save', 'Admin\\CouponController@save');
+            $router->post('/coupon/drop', 'Admin\\CouponController@drop');
+            // Tutorial
+            $router->get ('/tutorial/fetch', 'Admin\\TutorialController@fetch');
+            $router->post('/tutorial/save', 'Admin\\TutorialController@save');
+            $router->post('/tutorial/show', 'Admin\\TutorialController@show');
+            $router->post('/tutorial/drop', 'Admin\\TutorialController@drop');
+            $router->post('/tutorial/sort', 'Admin\\TutorialController@sort');
+        });
+    }
+}

app/Http/Routes/ClientRoute.php

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

app/Http/Routes/GuestRoute.php

@@ -0,0 +1,24 @@
+<?php
+namespace App\Http\Routes;
+
+use Illuminate\Contracts\Routing\Registrar;
+
+class GuestRoute
+{
+    public function map(Registrar $router)
+    {
+        $router->group([
+            'prefix' => 'guest'
+        ], function ($router) {
+            // Plan
+            $router->get ('/plan/fetch', 'Guest\\PlanController@fetch');
+            // Order
+            $router->post('/order/alipayNotify', 'Guest\\OrderController@alipayNotify');
+            $router->post('/order/stripeNotify', 'Guest\\OrderController@stripeNotify');
+            $router->post('/order/bitpayXNotify', 'Guest\\OrderController@bitpayXNotify');
+            $router->post('/order/payTaroNotify', 'Guest\\OrderController@payTaroNotify');
+            // Telegram
+            $router->post('/telegram/webhook', 'Guest\\TelegramController@webhook');
+        });
+    }
+}

app/Http/Routes/PassportRoute.php

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

app/Http/Routes/ServerRoute.php

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

app/Http/Routes/UserRoute.php

@@ -0,0 +1,60 @@
+<?php
+namespace App\Http\Routes;
+
+use Illuminate\Contracts\Routing\Registrar;
+
+class UserRoute
+{
+    public function map(Registrar $router)
+    {
+        $router->group([
+            'prefix' => 'user',
+            'middleware' => 'user'
+        ], function ($router) {
+            // User
+            $router->get ('/resetSecurity', 'User\\UserController@resetSecurity');
+            $router->get ('/logout', 'User\\UserController@logout');
+            $router->get ('/info', 'User\\UserController@info');
+            $router->post('/changePassword', 'User\\UserController@changePassword');
+            $router->post('/update', 'User\\UserController@update');
+            $router->get ('/getSubscribe', 'User\\UserController@getSubscribe');
+            $router->get ('/getStat', 'User\\UserController@getStat');
+            $router->post('/transfer', 'User\\UserController@transfer');
+            // 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/fetch', 'User\\OrderController@fetch');
+            $router->get ('/order/getPaymentMethod', 'User\\OrderController@getPaymentMethod');
+            $router->post('/order/cancel', 'User\\OrderController@cancel');
+            // Plan
+            $router->get ('/plan/fetch', 'User\\PlanController@fetch');
+            // Invite
+            $router->get ('/invite/save', 'User\\InviteController@save');
+            $router->get ('/invite/fetch', 'User\\InviteController@fetch');
+            $router->get ('/invite/details', 'User\\InviteController@details');
+            // Tutorial
+            $router->get ('/tutorial/getSubscribeUrl', 'User\\TutorialController@getSubscribeUrl');
+            $router->get ('/tutorial/getAppleID', 'User\\TutorialController@getAppleID');
+            $router->get ('/tutorial/fetch', 'User\\TutorialController@fetch');
+            // Notice
+            $router->get ('/notice/fetch', 'User\\NoticeController@fetch');
+            // Ticket
+            $router->post('/ticket/reply', 'User\\TicketController@reply');
+            $router->post('/ticket/close', 'User\\TicketController@close');
+            $router->post('/ticket/save', 'User\\TicketController@save');
+            $router->get ('/ticket/fetch', 'User\\TicketController@fetch');
+            $router->post('/ticket/withdraw', 'User\\TicketController@withdraw');
+            // Server
+            $router->get ('/server/fetch', 'User\\ServerController@fetch');
+            $router->get ('/server/log/fetch', 'User\\ServerController@logFetch');
+            // Coupon
+            $router->post('/coupon/check', 'User\\CouponController@check');
+            // Telegram
+            $router->get ('/telegram/getBotInfo', 'User\\TelegramController@getBotInfo');
+            // Comm
+            $router->get ('/comm/config', 'User\\CommController@config');
+        });
+    }
+}

app/Jobs/SendEmailJob.php

@@ -10,7 +10,7 @@ use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Mail;
 use App\Models\MailLog;
 
-class SendEmail implements ShouldQueue
+class SendEmailJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
     protected $params;
@@ -22,6 +22,8 @@ class SendEmail implements ShouldQueue
      */
     public function __construct($params)
     {
+        $this->delay(now()->addSecond(2));
+        $this->onQueue('send_email');
         $this->params = $params;
     }
 
@@ -35,6 +37,7 @@ class SendEmail implements ShouldQueue
         $params = $this->params;
         $email = $params['email'];
         $subject = $params['subject'];
+        $params['template_name'] = 'mail.' . config('v2board.email_template', 'default') . '.' . $params['template_name'];
         try {
             Mail::send(
                 $params['template_name'],

app/Jobs/SendTelegramJob.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Services\TelegramService;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class SendTelegramJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    protected $telegramId;
+    protected $text;
+
+    public $tries = 3;
+    public $timeout = 5;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct(int $telegramId, string $text)
+    {
+        $this->onQueue('send_telegram');
+        $this->telegramId = $telegramId;
+        $this->text = $text;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $telegramService = new TelegramService();
+        $telegramService->sendMessage($this->telegramId, $this->text, 'markdown');
+    }
+}

app/Models/ServerLog.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
 
 class ServerLog extends Model
 {

app/Providers/RouteServiceProvider.php

@@ -36,7 +36,6 @@ class RouteServiceProvider extends ServiceProvider
     public function map()
     {
         $this->mapApiRoutes();
-
         $this->mapWebRoutes();
 
         //
@@ -65,9 +64,14 @@ class RouteServiceProvider extends ServiceProvider
      */
     protected function mapApiRoutes()
     {
-        Route::prefix('api')
-            ->middleware('api')
-            ->namespace($this->namespace)
-            ->group(base_path('routes/api.php'));
+        Route::group([
+            'prefix' => '/api/v1',
+            'middleware' => 'api',
+            'namespace' => $this->namespace
+        ], function ($router) {
+            foreach (glob(app_path('Http//Routes') . '/*.php') as $file) {
+                $this->app->make('App\\Http\\Routes\\' . basename($file, '.php'))->map($router);
+            }
+        });
     }
 }

app/Services/CouponService.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\Coupon;
+use App\Models\Order;
+use Illuminate\Support\Facades\DB;
+
+class CouponService
+{
+    public $order;
+
+    public function __construct($code)
+    {
+        $this->coupon = Coupon::where('code', $code)->first();
+        if (!$this->coupon) {
+            abort(500, '优惠券无效');
+        }
+        if ($this->coupon->limit_use <= 0 && $this->coupon->limit_use !== NULL) {
+            abort(500, '优惠券已无可用次数');
+        }
+        if (time() < $this->coupon->started_at) {
+            abort(500, '优惠券还未到可用时间');
+        }
+        if (time() > $this->coupon->ended_at) {
+            abort(500, '优惠券已过期');
+        }
+    }
+
+    public function use(Order $order)
+    {
+        switch ($this->coupon->type) {
+            case 1:
+                $order->discount_amount = $this->coupon->value;
+                break;
+            case 2:
+                $order->discount_amount = $order->total_amount * ($this->coupon->value / 100);
+                break;
+        }
+        if ($this->coupon->limit_use !== NULL) {
+            $this->coupon->limit_use = $this->coupon->limit_use - 1;
+            if (!$this->coupon->save()) {
+                return false;
+            }
+        }
+        return true;
+    }
+}

app/Services/MailService.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace App\Services;
+
+class MailService
+{
+}

app/Services/OrderService.php

@@ -0,0 +1,143 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\Order;
+use App\Models\Plan;
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+
+class OrderService
+{
+    public $order;
+
+    public function __construct(Order $order)
+    {
+        $this->order = $order;
+    }
+
+    public function cancel():bool
+    {
+        $order = $this->order;
+        DB::beginTransaction();
+        $order->status = 2;
+        if (!$order->save()) {
+            DB::rollBack();
+            return false;
+        }
+        if ($order->balance_amount) {
+            $userService = new UserService();
+            if (!$userService->addBalance($order->user_id, $order->balance_amount)) {
+                DB::rollBack();
+                return false;
+            }
+        }
+        DB::commit();
+        return true;
+    }
+
+    public function create()
+    {
+
+    }
+
+    public function setOrderType(User $user)
+    {
+        $order = $this->order;
+        if ($order->cycle === 'reset_price') {
+            $order->type = 4;
+        } else if ($user->plan_id !== NULL && $order->plan_id !== $user->plan_id) {
+            if (!(int)config('v2board.plan_change_enable', 1)) abort(500, '目前不允许更改订阅，请联系客服或提交工单操作');
+            $order->type = 3;
+            $this->getSurplusValue($user, $order);
+            if ($order->surplus_amount >= $order->total_amount) {
+                $order->refund_amount = $order->surplus_amount - $order->total_amount;
+                $order->total_amount = 0;
+            } else {
+                $order->total_amount = $order->total_amount - $order->surplus_amount;
+            }
+        } else if ($user->expired_at > time() && $order->plan_id == $user->plan_id) {
+            $order->type = 2;
+        } else {
+            $order->type = 1;
+        }
+    }
+
+    public function setVipDiscount(User $user)
+    {
+        $order = $this->order;
+        if ($user->discount) {
+            $order->discount_amount = $order->discount_amount + ($order->total_amount * ($user->discount / 100));
+        }
+        $order->total_amount = $order->total_amount - $order->discount_amount;
+    }
+
+    public function setInvite(User $user)
+    {
+        $order = $this->order;
+        if ($user->invite_user_id && $order->total_amount > 0) {
+            $order->invite_user_id = $user->invite_user_id;
+            $commissionFirstTime = (int)config('v2board.commission_first_time_enable', 1);
+            if (!$commissionFirstTime || ($commissionFirstTime && !Order::where('user_id', $user->id)->where('status', 3)->first())) {
+                $inviter = User::find($user->invite_user_id);
+                if ($inviter && $inviter->commission_rate) {
+                    $order->commission_balance = $order->total_amount * ($inviter->commission_rate / 100);
+                } else {
+                    $order->commission_balance = $order->total_amount * (config('v2board.invite_commission', 10) / 100);
+                }
+            }
+        }
+    }
+
+    private function getSurplusValue(User $user, Order $order)
+    {
+        if ($user->expired_at === NULL) {
+            $this->getSurplusValueByOneTime($user, $order);
+        } else {
+            $this->getSurplusValueByCycle($user, $order);
+        }
+    }
+
+
+    private function getSurplusValueByOneTime(User $user, Order $order)
+    {
+        $plan = Plan::find($user->plan_id);
+        $trafficUnitPrice = $plan->onetime_price / $plan->transfer_enable;
+        if ($user->discount && $trafficUnitPrice) {
+            $trafficUnitPrice = $trafficUnitPrice - ($trafficUnitPrice * $user->discount / 100);
+        }
+        $notUsedTrafficPrice = $plan->transfer_enable - (($user->u + $user->d) / 1073741824);
+        $result = $trafficUnitPrice * $notUsedTrafficPrice;
+        $orderModel = Order::where('user_id', $user->id)->where('cycle', '!=', 'reset_price')->where('status', 3);
+        $order->surplus_amount = $result > 0 ? $result : 0;
+        $order->surplus_order_ids = json_encode(array_map(function ($v) { return $v['id'];}, $orderModel->get()->toArray()));
+    }
+
+    private function getSurplusValueByCycle(User $user, Order $order)
+    {
+        $strToMonth = [
+            'month_price' => 1,
+            'quarter_price' => 3,
+            'half_year_price' => 6,
+            'year_price' => 12,
+            'onetime_price' => 0
+        ];
+        $orderModel = Order::where('user_id', $user->id)
+            ->where('cycle', '!=', 'reset_price')
+            ->where('status', 3);
+        $surplusAmount = 0;
+        foreach ($orderModel->get() as $item) {
+            $surplusMonth = strtotime("+ {$strToMonth[$item->cycle]}month", $item->created_at->format('U'));
+            if (!$surplusMonth) continue;
+            $surplusMonth = ($surplusMonth - time()) / 2678400 / $strToMonth[$item->cycle];
+            if ($surplusMonth > 0) {
+                $surplusAmount = $surplusAmount + ($item['total_amount'] + $item['balance_amount']) * $surplusMonth;
+            }
+        }
+        if (!$surplusAmount) {
+            return;
+        }
+        $order->surplus_amount = $surplusAmount > 0 ? $surplusAmount : 0;
+        $order->surplus_order_ids = json_encode(array_map(function ($v) { return $v['id'];}, $orderModel->get()->toArray()));
+    }
+}

app/Services/ServerService.php

@@ -0,0 +1,165 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\ServerLog;
+use App\Models\User;
+use App\Models\Server;
+
+class ServerService
+{
+
+    CONST SERVER_CONFIG = '{"api":{"services":["HandlerService","StatsService"],"tag":"api"},"dns":{},"stats":{},"inbound":{"port":443,"protocol":"vmess","settings":{"clients":[]},"sniffing":{"enabled":true,"destOverride":["http","tls"]},"streamSettings":{"network":"tcp"},"tag":"proxy"},"inboundDetour":[{"listen":"0.0.0.0","port":23333,"protocol":"dokodemo-door","settings":{"address":"0.0.0.0"},"tag":"api"}],"log":{"loglevel":"debug","access":"access.log","error":"error.log"},"outbound":{"protocol":"freedom","settings":{}},"outboundDetour":[{"protocol":"blackhole","settings":{},"tag":"block"}],"routing":{"rules":[{"inboundTag":"api","outboundTag":"api","type":"field"}]},"policy":{"levels":{"0":{"handshake":4,"connIdle":300,"uplinkOnly":5,"downlinkOnly":30,"statsUserUplink":true,"statsUserDownlink":true}}}}';
+
+    public function getAvailableUsers($groupId)
+    {
+        return User::whereIn('group_id', $groupId)
+            ->whereRaw('u + d < transfer_enable')
+            ->where(function ($query) {
+                $query->where('expired_at', '>=', time())
+                    ->orWhere('expired_at', NULL);
+            })
+            ->where('banned', 0)
+            ->select([
+                'id',
+                'email',
+                't',
+                'u',
+                'd',
+                'transfer_enable',
+                'v2ray_uuid',
+                'v2ray_alter_id',
+                'v2ray_level'
+            ])
+            ->get();
+    }
+
+    public function getConfig(int $nodeId, int $localPort)
+    {
+        $server = Server::find($nodeId);
+        if (!$server) {
+            abort(500, '节点不存在');
+        }
+        $json = json_decode(self::SERVER_CONFIG);
+        $json->log->loglevel = config('v2board.server_log_level', 'none');
+        $json->inboundDetour[0]->port = (int)$localPort;
+        $json->inbound->port = (int)$server->server_port;
+        $json->inbound->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(Server $server, object $json)
+    {
+        if ($server->dnsSettings) {
+            $dns = json_decode($server->dnsSettings);
+            if (isset($dns->servers)) {
+                array_push($dns->servers, '1.1.1.1');
+                array_push($dns->servers, 'localhost');
+            }
+            $json->dns = $dns;
+            $json->outbound->settings->domainStrategy = 'UseIP';
+        }
+    }
+
+    private function setNetwork(Server $server, object $json)
+    {
+        if ($server->networkSettings) {
+            switch ($server->network) {
+                case 'tcp':
+                    $json->inbound->streamSettings->tcpSettings = json_decode($server->networkSettings);
+                    break;
+                case 'kcp':
+                    $json->inbound->streamSettings->kcpSettings = json_decode($server->networkSettings);
+                    break;
+                case 'ws':
+                    $json->inbound->streamSettings->wsSettings = json_decode($server->networkSettings);
+                    break;
+                case 'http':
+                    $json->inbound->streamSettings->httpSettings = json_decode($server->networkSettings);
+                    break;
+                case 'domainsocket':
+                    $json->inbound->streamSettings->dsSettings = json_decode($server->networkSettings);
+                    break;
+                case 'quic':
+                    $json->inbound->streamSettings->quicSettings = json_decode($server->networkSettings);
+                    break;
+            }
+        }
+    }
+
+    private function setRule(Server $server, object $json)
+    {
+        if ($server->ruleSettings) {
+            $rules = json_decode($server->ruleSettings);
+            // domain
+            if (isset($rules->domain) && !empty($rules->domain)) {
+                $rules->domain = array_filter($rules->domain);
+                $domainObj = new \StdClass();
+                $domainObj->type = 'field';
+                $domainObj->domain = $rules->domain;
+                $domainObj->outboundTag = 'block';
+                array_push($json->routing->rules, $domainObj);
+            }
+            // protocol
+            if (isset($rules->protocol) && !empty($rules->protocol)) {
+                $rules->protocol = array_filter($rules->protocol);
+                $protocolObj = new \StdClass();
+                $protocolObj->type = 'field';
+                $protocolObj->protocol = $rules->protocol;
+                $protocolObj->outboundTag = 'block';
+                array_push($json->routing->rules, $protocolObj);
+            }
+        }
+    }
+
+    private function setTls(Server $server, object $json)
+    {
+        if ((int)$server->tls) {
+            $tlsSettings = json_decode($server->tlsSettings);
+            $json->inbound->streamSettings->security = 'tls';
+            $tls = (object)[
+                'certificateFile' => '/home/v2ray.crt',
+                'keyFile' => '/home/v2ray.key'
+            ];
+            $json->inbound->streamSettings->tlsSettings = new \StdClass();
+            if (isset($tlsSettings->serverName)) {
+                $json->inbound->streamSettings->tlsSettings->serverName = (string)$tlsSettings->serverName;
+            }
+            if (isset($tlsSettings->allowInsecure)) {
+                $json->inbound->streamSettings->tlsSettings->allowInsecure = (int)$tlsSettings->allowInsecure ? true : false;
+            }
+            $json->inbound->streamSettings->tlsSettings->certificates[0] = $tls;
+        }
+    }
+
+    public function log(int $userId, int $serverId, int $u, int $d, float $rate)
+    {
+        if (($u + $d) <= 10240) return;
+        $timestamp = strtotime(date('Y-m-d H:0'));
+        $serverLog = ServerLog::where('log_at', '>=', $timestamp)
+            ->where('log_at', '<', $timestamp + 3600)
+            ->where('server_id', $serverId)
+            ->where('user_id', $userId)
+            ->where('rate', $rate)
+            ->first();
+        if ($serverLog) {
+            $serverLog->u = $serverLog->u + $u;
+            $serverLog->d = $serverLog->d + $d;
+            $serverLog->save();
+        } else {
+            $serverLog = new ServerLog();
+            $serverLog->user_id = $userId;
+            $serverLog->server_id = $serverId;
+            $serverLog->u = $u;
+            $serverLog->d = $d;
+            $serverLog->rate = $rate;
+            $serverLog->log_at = $timestamp;
+            $serverLog->save();
+        }
+    }
+}

app/Services/TelegramService.php

@@ -0,0 +1,46 @@
+<?php
+namespace App\Services;
+
+use \Curl\Curl;
+
+class TelegramService {
+    protected $api;
+
+    public function __construct($token = '')
+    {
+        $this->api = 'http://dev.v2board.com/bot' . config('v2board.telegram_bot_token', $token) . '/';
+    }
+
+    public function sendMessage(int $chatId, string $text, string $parseMode = '')
+    {
+        $this->request('sendMessage', [
+            'chat_id' => $chatId,
+            'text' => $text,
+            'parse_mode' => $parseMode
+        ]);
+    }
+
+    public function getMe()
+    {
+        return $this->request('getMe');
+    }
+
+    public function setWebhook(string $url)
+    {
+        return $this->request('setWebhook', [
+            'url' => $url
+        ]);
+    }
+
+    private function request(string $method, array $params = [])
+    {
+        $curl = new Curl();
+        $curl->get($this->api . $method . '?' . http_build_query($params));
+        $response = $curl->response;
+        $curl->close();
+        if (!$response->ok) {
+            abort(500, '来自TG的错误：' . $response->description);
+        }
+        return $response;
+    }
+}

app/Services/UserService.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace App\Services;
+
+use App\Models\Order;
+use App\Models\User;
+
+class UserService
+{
+    public function isAvailable(User $user)
+    {
+        if (!$user->banned && $user->transfer_enable && ($user->expired_at > time() || $user->expired_at === NULL)) {
+            return true;
+        }
+        return false;
+    }
+
+    public function getAvailableUsers()
+    {
+        return User::whereRaw('u + d < transfer_enable')
+            ->where(function ($query) {
+                $query->where('expired_at', '>=', time())
+                    ->orWhere('expired_at', NULL);
+            })
+            ->where('banned', 0)
+            ->get();
+    }
+
+    public function getUnAvailbaleUsers()
+    {
+        return User::where(function ($query) {
+            $query->where('expired_at', '<', time())
+                ->orWhere('expired_at', 0);
+        })
+            ->where(function ($query) {
+            $query->where('plan_id', NULL)
+                ->orWhere('transfer_enable', 0);
+        })
+            ->get();
+    }
+
+    public function getUsersByIds($ids)
+    {
+        return User::whereIn('id', $ids)->get();
+    }
+
+    public function getAllUsers()
+    {
+        return User::all();
+    }
+
+    public function addBalance(int $userId, int $balance):bool
+    {
+        $user = User::find($userId);
+        if (!$user) {
+            return false;
+        }
+        $user->balance = $user->balance + $balance;
+        if ($user->balance < 0) {
+            return false;
+        }
+        if (!$user->save()) {
+            return false;
+        }
+        return true;
+    }
+
+    public function isNotCompleteOrderByUserId(int $userId):bool
+    {
+        $order = Order::whereIn('status', [0, 1])
+            ->where('user_id', $userId)
+            ->first();
+        if (!$order) {
+            return false;
+        }
+        return true;
+    }
+
+    public function trafficFetch(int $u, int $d, int $userId):bool
+    {
+        $user = User::find($userId);
+        if (!$user) {
+            return false;
+        }
+        $user->t = time();
+        $user->u = $user->u + $u;
+        $user->d = $user->d + $d;
+        if (!$user->save()) {
+            return false;
+        }
+        return true;
+    }
+}

app/Utils/CacheKey.php

@@ -4,5 +4,16 @@ namespace App\Utils;
 
 class CacheKey
 {
+    CONST KEYS = [
+        'EMAIL_VERIFY_CODE' => '邮箱验证吗',
+        'LAST_SEND_EMAIL_VERIFY_TIMESTAMP' => '最后一次发送邮箱验证码时间'
+    ];
 
+    public static function get(string $key, $uniqueValue)
+    {
+        if (!in_array($key, array_keys(self::KEYS))) {
+            abort(500, 'key is not in cache key list');
+        }
+        return $key . '_' . $uniqueValue;
+    }
 }

app/Utils/Dict.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Utils;
+
+class Dict
+{
+    CONST EMAIL_WHITELIST_SUFFIX_DEFAULT = [
+        'gmail.com',
+        'qq.com',
+        '163.com',
+        'yahoo.com',
+        'sina.com',
+        '126.com',
+        'outlook.com',
+        'yeah.net',
+        'foxmail.com'
+    ];
+}

app/Utils/Helper.php

@@ -2,6 +2,9 @@
 
 namespace App\Utils;
 
+use App\Models\Server;
+use App\Models\User;
+
 class Helper
 {
     public static function guid($format = false)
@@ -53,26 +56,64 @@ class Helper
         return $str;
     }
 
-    public static function buildVmessLink($item, $user)
+    public static function buildVmessLink(Server $server, User $user)
     {
         $config = [
             "v" => "2",
-            "ps" => $item->name,
-            "add" => $item->host,
-            "port" => $item->port,
+            "ps" => $server->name,
+            "add" => $server->host,
+            "port" => $server->port,
             "id" => $user->v2ray_uuid,
             "aid" => "2",
-            "net" => $item->network,
+            "net" => $server->network,
             "type" => "none",
             "host" => "",
             "path" => "",
-            "tls" => $item->tls ? "tls" : ""
+            "tls" => $server->tls ? "tls" : ""
         ];
-        if ($item->network == 'ws') {
-            $wsSettings = json_decode($item->settings);
+        if ((string)$server->network === 'ws') {
+            $wsSettings = json_decode($server->networkSettings);
             if (isset($wsSettings->path)) $config['path'] = $wsSettings->path;
             if (isset($wsSettings->headers->Host)) $config['host'] = $wsSettings->headers->Host;
         }
         return "vmess://" . base64_encode(json_encode($config)) . "\r\n";
     }
+
+    public static function multiPasswordVerify($algo, $password, $hash)
+    {
+        switch($algo) {
+            case 'md5': return md5($password) === $hash;
+            case 'sha256': return hash('sha256', $password) === $hash;
+            default: return password_verify($password, $hash);
+        }
+    }
+
+    public static function emailSuffixVerify($email, $suffixs)
+    {
+        $suffix = preg_split('/@/', $email)[1];
+        if (!$suffix) return false;
+        if (!is_array($suffixs)) {
+            $suffixs = preg_split('/,/', $suffixs);
+        }
+        if (!in_array($suffix, $suffixs)) return false;
+        return true;
+    }
+
+    public static function trafficConvert(int $byte)
+    {
+        $kb = 1024;
+        $mb = 1048576;
+        $gb = 1073741824;
+        if ($byte > $gb) {
+            return round($byte / $gb, 2) . ' GB';
+        } else if ($byte > $mb) {
+            return round($byte / $mb, 2) . ' MB';
+        } else if ($byte > $kb) {
+            return round($byte / $kb, 2) . ' KB';
+        } else if ($byte < 0) {
+            return 0;
+        } else {
+            return round($byte, 2) . ' B';
+        }
+    }
 }

composer.json

@@ -13,7 +13,7 @@
         "fideloper/proxy": "^4.0",
         "laravel/framework": "^6.0",
         "laravel/tinker": "^1.0",
-        "lokielse/omnipay-alipay": "^3.0",
+        "lokielse/omnipay-alipay": "3.0.6",
         "php-curl-class/php-curl-class": "^8.6",
         "stripe/stripe-php": "^7.5",
         "symfony/yaml": "^4.3"
@@ -63,5 +63,11 @@
         "post-create-project-cmd": [
             "@php artisan key:generate --ansi"
         ]
+    },
+    "repositories": {
+        "packagist": {
+            "type": "composer",
+            "url": "https://mirrors.aliyun.com/composer/"
+        }
     }
 }

config/app.php

@@ -67,7 +67,7 @@ return [
     |
     */
 
-    'timezone' => 'UTC',
+    'timezone' => 'Asia/Shanghai',
 
     /*
     |--------------------------------------------------------------------------
@@ -228,4 +228,13 @@ return [
 
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | V2board version
+    |--------------------------------------------------------------------------
+    |
+    | The only modification by laravel config
+    |
+    */
+    'version' => '1.3'
 ];

database/install.sql

@@ -1,4 +1,4 @@
--- Adminer 4.7.3 MySQL dump
+-- Adminer 4.7.6 MySQL dump
 
 SET NAMES utf8;
 SET time_zone = '+00:00';
@@ -7,6 +7,18 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 
 SET NAMES utf8mb4;
 
+DROP TABLE IF EXISTS `failed_jobs`;
+CREATE TABLE `failed_jobs` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `connection` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `queue` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `payload` longtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `exception` longtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `failed_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+
 DROP TABLE IF EXISTS `v2_coupon`;
 CREATE TABLE `v2_coupon` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -29,6 +41,7 @@ CREATE TABLE `v2_invite_code` (
   `user_id` int(11) NOT NULL,
   `code` char(32) NOT NULL,
   `status` tinyint(1) NOT NULL DEFAULT '0',
+  `pv` int(11) NOT NULL DEFAULT '0',
   `created_at` int(11) NOT NULL,
   `updated_at` int(11) NOT NULL,
   PRIMARY KEY (`id`)
@@ -41,7 +54,7 @@ CREATE TABLE `v2_mail_log` (
   `email` varchar(64) NOT NULL,
   `subject` varchar(255) NOT NULL,
   `template_name` varchar(255) NOT NULL,
-  `error` varchar(255) DEFAULT NULL,
+  `error` text,
   `created_at` int(11) NOT NULL,
   `updated_at` int(11) NOT NULL,
   PRIMARY KEY (`id`)
@@ -72,7 +85,11 @@ CREATE TABLE `v2_order` (
   `callback_no` varchar(255) DEFAULT NULL,
   `total_amount` int(11) NOT NULL,
   `discount_amount` int(11) DEFAULT NULL,
-  `status` tinyint(1) NOT NULL DEFAULT '0',
+  `surplus_amount` int(11) DEFAULT NULL COMMENT '剩余价值',
+  `refund_amount` int(11) DEFAULT NULL COMMENT '退款金额',
+  `balance_amount` int(11) DEFAULT NULL COMMENT '使用余额',
+  `surplus_order_ids` text COMMENT '折抵订单',
+  `status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '0待支付1开通中2已取消3已完成4已折抵',
   `commission_status` tinyint(1) NOT NULL DEFAULT '0',
   `commission_balance` int(11) NOT NULL DEFAULT '0',
   `created_at` int(11) NOT NULL,
@@ -88,12 +105,15 @@ CREATE TABLE `v2_plan` (
   `transfer_enable` int(11) NOT NULL,
   `name` varchar(255) NOT NULL,
   `show` tinyint(1) NOT NULL DEFAULT '0',
+  `sort` int(11) DEFAULT NULL,
   `renew` tinyint(1) NOT NULL DEFAULT '1',
   `content` text,
-  `month_price` int(11) DEFAULT '0',
-  `quarter_price` int(11) DEFAULT '0',
-  `half_year_price` int(11) DEFAULT '0',
-  `year_price` int(11) DEFAULT '0',
+  `month_price` int(11) DEFAULT NULL,
+  `quarter_price` int(11) DEFAULT NULL,
+  `half_year_price` int(11) DEFAULT NULL,
+  `year_price` int(11) DEFAULT NULL,
+  `onetime_price` int(11) DEFAULT NULL,
+  `reset_price` int(11) DEFAULT NULL,
   `created_at` int(11) NOT NULL,
   `updated_at` int(11) NOT NULL,
   PRIMARY KEY (`id`)
@@ -109,12 +129,18 @@ CREATE TABLE `v2_server` (
   `host` varchar(255) NOT NULL,
   `port` int(11) NOT NULL,
   `server_port` int(11) NOT NULL,
-  `tls` tinyint(4) NOT NULL,
+  `tls` tinyint(4) NOT NULL DEFAULT '0',
   `tags` varchar(255) DEFAULT NULL,
   `rate` varchar(11) NOT NULL,
-  `network` varchar(11) NOT NULL,
+  `network` text NOT NULL,
   `settings` text,
+  `rules` text,
+  `networkSettings` text,
+  `tlsSettings` text,
+  `ruleSettings` text,
+  `dnsSettings` text,
   `show` tinyint(1) NOT NULL DEFAULT '0',
+  `sort` int(11) DEFAULT NULL,
   `created_at` int(11) NOT NULL,
   `updated_at` int(11) NOT NULL,
   PRIMARY KEY (`id`)
@@ -133,16 +159,32 @@ CREATE TABLE `v2_server_group` (
 
 DROP TABLE IF EXISTS `v2_server_log`;
 CREATE TABLE `v2_server_log` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT,
   `user_id` int(11) NOT NULL,
   `server_id` int(11) NOT NULL,
   `u` varchar(255) NOT NULL,
   `d` varchar(255) NOT NULL,
   `rate` decimal(10,2) NOT NULL,
+  `log_at` int(11) NOT NULL,
   `created_at` int(11) NOT NULL,
-  `updated_at` int(11) NOT NULL
+  `updated_at` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `log_at` (`log_at`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
+DROP TABLE IF EXISTS `v2_server_stat`;
+CREATE TABLE `v2_server_stat` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `server_id` int(11) NOT NULL,
+  `u` varchar(255) NOT NULL,
+  `d` varchar(25) NOT NULL,
+  `created_at` int(11) NOT NULL,
+  `updated_at` int(11) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+
 DROP TABLE IF EXISTS `v2_ticket`;
 CREATE TABLE `v2_ticket` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -172,36 +214,33 @@ CREATE TABLE `v2_ticket_message` (
 DROP TABLE IF EXISTS `v2_tutorial`;
 CREATE TABLE `v2_tutorial` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
+  `category_id` int(11) NOT NULL,
   `title` varchar(255) CHARACTER SET utf8mb4 NOT NULL,
-  `description` varchar(255) CHARACTER SET utf8mb4 NOT NULL,
-  `icon` varchar(255) CHARACTER SET utf8mb4 NOT NULL,
   `steps` text,
   `show` tinyint(1) NOT NULL DEFAULT '0',
+  `sort` int(11) DEFAULT NULL,
   `created_at` int(11) NOT NULL,
   `updated_at` int(11) NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-INSERT INTO `v2_tutorial` (`id`, `title`, `description`, `icon`, `steps`, `show`, `created_at`, `updated_at`) VALUES
-(1,	'Windows',	'兼容 Windows 7 以上的版本',	'fab fa-2x fa-windows',	'[{\"default_area\":\"<div><div>下载 V2rayN 客户端。</div><div>下载完成后解压，解压完成后运行V2rayN</div><div>运行时请右键，以管理员身份运行</div></div>\",\"download_url\":\"/downloads/V2rayN.zip\"},{\"default_area\":\"<div>点击订阅按钮，选择订阅设置点击添加，输入如下内容后点击确定保存</div>\",\"safe_area\":\"<div>备注：<code onclick=\\\"safeAreaCopy(\'{{$app_name}}\')\\\">{{$app_name}}</code></div>\\n<div>地址(url)：<code onclick=\\\"safeAreaCopy(\'{{$subscribe_url}}\')\\\">{{$subscribe_url}}</code></div>\",\"img_url\":\"https://i.loli.net/2019/11/21/UkcHNtERTnjLVS8.jpg\"},{\"default_area\":\"<div>点击订阅后，从服务器列表选择服务器</div>\",\"img_url\":\"https://i.loli.net/2019/11/21/BgPGFQ3kCSuIRjJ.jpg\"},{\"default_area\":\"<div>点击参数设置，找到Http代理，选择PAC模式后按确定保存即启动代理。</div>\",\"img_url\":\"https://i.loli.net/2019/11/21/vnVykKEFT8Lzo3f.jpg\"}]',	1,	1577972408,	1577984396),
-(2,	'Android',	'兼容 Android 6 以上的版本',	'fab fa-2x fa-android',	'[{\"default_area\":\"<div>下载 V2rayNG 客户端。</div>\",\"safe_area\":\"\",\"download_url\":\"/downloads/V2rayNG.apk\"},{\"default_area\":\"<div>打开 V2rayNG 点击左上角的菜单图标打开侧边栏，随后点击 订阅设置，点击右上角的➕按钮新增订阅。</div><div>按照下方内容进行填写，填写完毕后点击右上角的☑️按钮。</div>\",\"safe_area\":\"<div>备注：<code onclick=\\\"safeAreaCopy(\'{{$app_name}}\')\\\">{{$app_name}}</code></div>\\n<div>地址(url)：<code onclick=\\\"safeAreaCopy(\'{{$subscribe_url}}\')\\\">{{$subscribe_url}}</code></div>\",\"download_url\":\"\",\"img_url\":\"https://i.loli.net/2019/11/21/ghuVkTe6LBqRxSO.jpg\"},{\"default_area\":\"<div>再次从侧边栏进入 设置 页面，点击 路由模式 将其更改为 \\b绕过局域网及大陆地址。</div>\",\"img_url\":\"https://i.loli.net/2019/11/21/Tf1AGoXZuhJrwOq.jpg\"},{\"default_area\":\"<div>随后从侧边栏回到 配置文件 页面，点击右上角的省略号图标选择更新订阅。</div>\",\"img_url\":\"https://i.loli.net/2019/11/21/UtfPShQXupRmB4L.jpg\"},{\"img_url\":\"https://i.loli.net/2019/11/21/ZkbNsSrAg3m5Dny.jpg\",\"default_area\":\"<div>点击选择您需要的节点，点击右下角的V字按钮即可连接。</div>\"}]',	1,	1577972534,	1577984397),
-(3,	'macOS',	'兼容 Yosemite 以上的版本',	'fab fa-2x fa-apple',	'[{\"default_area\":\"<div>下载 ClashX 客户端，安装后运行。</div>\",\"download_url\":\"/downloads/ClashX.dmg\",\"img_url\":\"https://i.loli.net/2019/11/20/uNGrjl2noCL1f5B.jpg\"},{\"default_area\":\"<div>点击通知栏 ClashX 图标保持选中状态，按快捷键 ⌘+M(订阅快捷键)，在弹出的窗口点击添加输入下方信息</div>\",\"safe_area\":\"<div>Url：<code onclick=\\\"safeAreaCopy(\'{{$app_name}}\')\\\">{{$app_name}}</code></div>\\n<div>Config Name：<code onclick=\\\"safeAreaCopy(\'{{$subscribe_url}}\')\\\">{{$subscribe_url}}</code></div>\",\"img_url\":\"https://i.loli.net/2019/11/20/8eB13mRbFuszwxg.jpg\"},{\"default_area\":\"<div>点击通知栏 ClashX 图标保持选中状态，按快捷键 ⌘+S(设置为系统代理快捷键)，即连接完成</div>\"}]',	1,	1577979855,	1577984397),
-(4,	'iOS',	'兼容 iOS 9 以上的版本',	'fab fa-2x fa-apple',	'[{\"default_area\":\"<div>iOS上使用请在iOS浏览器中打开本页</div>\"},{\"default_area\":\"<div>在 App Store 登录本站提供的美区 Apple ID 下载客户端。</div><div>为了保护您的隐私，请勿在手机设置里直接登录，仅在 App Store 登录即可。</div><div>登陆完成后点击下方下载会自动唤起下载。</div>\",\"safe_area\":\"<div>Apple ID：<code onclick=\\\"safeAreaCopy(\'{{$apple_id}}\')\\\">{{$apple_id}}</code></div><div>密码：<code onclick=\\\"safeAreaCopy(\'{{$apple_id_password}}\')\\\">点击复制密码</code></div>\",\"download_url\":\"https://apps.apple.com/us/app/shadowrocket/id932747118\",\"img_url\":\"https://i.loli.net/2019/11/21/5idkjJ61stWgREV.jpg\"},{\"default_area\":\"<div>待客户端安装完成后，点击下方一键订阅按钮会自动唤起并进行订阅</div>\",\"safe_area\":\"\",\"img_url\":\"https://i.loli.net/2019/11/21/ZcqlNMb3eg5Uhxd.jpg\",\"download_url\":\"shadowrocket://add/sub://{{$b64_subscribe_url}}?remark={{$app_name}}\"},{\"default_area\":\"<div>选择节点进行链接，首次链接过程授权窗口请一路允许。</div>\",\"img_url\":\"https://i.loli.net/2019/11/21/9Zdxksr7Ey6hjlm.jpg\"}]',	1,	1577982016,	1577983283);
 
 DROP TABLE IF EXISTS `v2_user`;
 CREATE TABLE `v2_user` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `invite_user_id` int(11) DEFAULT NULL,
+  `telegram_id` bigint(20) DEFAULT NULL,
   `email` varchar(64) NOT NULL,
   `password` varchar(64) NOT NULL,
+  `password_algo` char(10) DEFAULT NULL,
   `balance` int(11) NOT NULL DEFAULT '0',
+  `discount` int(11) DEFAULT NULL,
   `commission_rate` int(11) DEFAULT NULL,
   `commission_balance` int(11) NOT NULL DEFAULT '0',
   `t` int(11) NOT NULL DEFAULT '0',
   `u` bigint(20) NOT NULL DEFAULT '0',
   `d` bigint(20) NOT NULL DEFAULT '0',
   `transfer_enable` bigint(20) NOT NULL DEFAULT '0',
-  `enable` tinyint(1) NOT NULL DEFAULT '1',
   `banned` tinyint(1) NOT NULL DEFAULT '0',
   `is_admin` tinyint(1) NOT NULL DEFAULT '0',
   `last_login_at` int(11) DEFAULT NULL,
@@ -214,7 +253,7 @@ CREATE TABLE `v2_user` (
   `remind_expire` tinyint(4) DEFAULT '1',
   `remind_traffic` tinyint(4) DEFAULT '1',
   `token` char(32) NOT NULL,
-  `expired_at` bigint(20) NOT NULL DEFAULT '0',
+  `expired_at` bigint(20) DEFAULT '0',
   `created_at` int(11) NOT NULL,
   `updated_at` int(11) NOT NULL,
   PRIMARY KEY (`id`),
@@ -222,4 +261,4 @@ CREATE TABLE `v2_user` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 
--- 2020-01-20 15:33:23
+-- 2020-05-12 12:31:04

database/update.sql

@@ -123,11 +123,136 @@ SET NAMES utf8mb4;
 INSERT INTO `v2_tutorial` (`id`, `title`, `description`, `icon`, `steps`, `show`, `created_at`, `updated_at`) VALUES
 (1,	'Windows',	'兼容 Windows 7 以上的版本',	'fab fa-2x fa-windows',	'[{\"default_area\":\"<div><div>下载 V2rayN 客户端。</div><div>下载完成后解压，解压完成后运行V2rayN</div><div>运行时请右键，以管理员身份运行</div></div>\",\"download_url\":\"/downloads/V2rayN.zip\"},{\"default_area\":\"<div>点击订阅按钮，选择订阅设置点击添加，输入如下内容后点击确定保存</div>\",\"safe_area\":\"<div>备注：<code onclick=\\\"safeAreaCopy(\'{{$app_name}}\')\\\">{{$app_name}}</code></div>\\n<div>地址(url)：<code onclick=\\\"safeAreaCopy(\'{{$subscribe_url}}\')\\\">{{$subscribe_url}}</code></div>\",\"img_url\":\"https://i.loli.net/2019/11/21/UkcHNtERTnjLVS8.jpg\"},{\"default_area\":\"<div>点击订阅后，从服务器列表选择服务器</div>\",\"img_url\":\"https://i.loli.net/2019/11/21/BgPGFQ3kCSuIRjJ.jpg\"},{\"default_area\":\"<div>点击参数设置，找到Http代理，选择PAC模式后按确定保存即启动代理。</div>\",\"img_url\":\"https://i.loli.net/2019/11/21/vnVykKEFT8Lzo3f.jpg\"}]',	1,	1577972408,	1577980882),
 (2,	'Android',	'兼容 Android 6 以上的版本',	'fab fa-2x fa-android',	'[{\"default_area\":\"<div>下载 V2rayNG 客户端。</div>\",\"safe_area\":\"\",\"download_url\":\"/downloads/V2rayNG.apk\"},{\"default_area\":\"<div>打开 V2rayNG 点击左上角的菜单图标打开侧边栏，随后点击 订阅设置，点击右上角的➕按钮新增订阅。</div><div>按照下方内容进行填写，填写完毕后点击右上角的☑️按钮。</div>\",\"safe_area\":\"<div>备注：<code onclick=\\\"safeAreaCopy(\'{{$app_name}}\')\\\">{{$app_name}}</code></div>\\n<div>地址(url)：<code onclick=\\\"safeAreaCopy(\'{{$subscribe_url}}\')\\\">{{$subscribe_url}}</code></div>\",\"download_url\":\"\",\"img_url\":\"https://i.loli.net/2019/11/21/ghuVkTe6LBqRxSO.jpg\"},{\"default_area\":\"<div>再次从侧边栏进入 设置 页面，点击 路由模式 将其更改为 \\b绕过局域网及大陆地址。</div>\",\"img_url\":\"https://i.loli.net/2019/11/21/Tf1AGoXZuhJrwOq.jpg\"},{\"default_area\":\"<div>随后从侧边栏回到 配置文件 页面，点击右上角的省略号图标选择更新订阅。</div>\",\"img_url\":\"https://i.loli.net/2019/11/21/UtfPShQXupRmB4L.jpg\"},{\"img_url\":\"https://i.loli.net/2019/11/21/ZkbNsSrAg3m5Dny.jpg\",\"default_area\":\"<div>点击选择您需要的节点，点击右下角的V字按钮即可连接。</div>\"}]',	1,	1577972534,	1577981610),
-(3,	'macOS',	'兼容 Yosemite 以上的版本',	'fab fa-2x fa-apple',	'[{\"default_area\":\"<div>下载 ClashX 客户端，安装后运行。</div>\",\"download_url\":\"/downloads/ClashX.dmg\",\"img_url\":\"https://i.loli.net/2019/11/20/uNGrjl2noCL1f5B.jpg\"},{\"default_area\":\"<div>点击通知栏 ClashX 图标保持选中状态，按快捷键 ⌘+M(订阅快捷键)，在弹出的窗口点击添加输入下方信息</div>\",\"safe_area\":\"<div>Url：<code onclick=\\\"safeAreaCopy(\'{{$app_name}}\')\\\">{{$app_name}}</code></div>\\n<div>Config Name：<code onclick=\\\"safeAreaCopy(\'{{$subscribe_url}}\')\\\">{{$subscribe_url}}</code></div>\",\"img_url\":\"https://i.loli.net/2019/11/20/8eB13mRbFuszwxg.jpg\"},{\"default_area\":\"<div>点击通知栏 ClashX 图标保持选中状态，按快捷键 ⌘+S(设置为系统代理快捷键)，即连接完成</div>\"}]',	1,	1577979855,	1577981646),
+(3,	'macOS',	'兼容 Yosemite 以上的版本',	'fab fa-2x fa-apple',	'[{\"default_area\":\"<div>下载 ClashX 客户端，安装后运行。</div>\",\"download_url\":\"/downloads/ClashX.dmg\",\"img_url\":\"https://i.loli.net/2019/11/20/uNGrjl2noCL1f5B.jpg\"},{\"default_area\":\"<div>点击通知栏 ClashX 图标保持选中状态，按快捷键 ⌘+M(订阅快捷键)，在弹出的窗口点击添加输入下方信息</div>\",\"safe_area\":\"<div>Url：<code onclick=\\\"safeAreaCopy(\'{{$subscribe_url}}\')\\\">{{$subscribe_url}}</code></div>\\n<div>Config Name：<code onclick=\\\"safeAreaCopy(\'{{$app_name}}\')\\\">{{$app_name}}</code></div>\",\"img_url\":\"https://i.loli.net/2019/11/20/8eB13mRbFuszwxg.jpg\"},{\"default_area\":\"<div>点击通知栏 ClashX 图标保持选中状态，按快捷键 ⌘+S(设置为系统代理快捷键)，即连接完成</div>\"}]',	1,	1577979855,	1577981646),
 (4,	'iOS',	'兼容 iOS 9 以上的版本',	'fab fa-2x fa-apple',	'[{\"default_area\":\"<div>iOS上使用请在iOS浏览器中打开本页</div>\"},{\"default_area\":\"<div>在 App Store 登录本站提供的美区 Apple ID 下载客户端。</div><div>为了保护您的隐私，请勿在手机设置里直接登录，仅在 App Store 登录即可。</div><div>登陆完成后点击下方下载会自动唤起下载。</div>\",\"safe_area\":\"<div>Apple ID：<code onclick=\\\"safeAreaCopy(\'{{$apple_id}}\')\\\">{{$apple_id}}</code></div><div>密码：<code onclick=\\\"safeAreaCopy(\'{{$apple_id_password}}\')\\\">点击复制密码</code></div>\",\"download_url\":\"https://apps.apple.com/us/app/shadowrocket/id932747118\",\"img_url\":\"https://i.loli.net/2019/11/21/5idkjJ61stWgREV.jpg\"},{\"default_area\":\"<div>待客户端安装完成后，点击下方一键订阅按钮会自动唤起并进行订阅</div>\",\"safe_area\":\"\",\"img_url\":\"https://i.loli.net/2019/11/21/ZcqlNMb3eg5Uhxd.jpg\",\"download_url\":\"shadowrocket://add/sub://{{$b64_subscribe_url}}?remark={{$app_name}}\"},{\"default_area\":\"<div>选择节点进行链接，首次链接过程授权窗口请一路允许。</div>\",\"img_url\":\"https://i.loli.net/2019/11/21/9Zdxksr7Ey6hjlm.jpg\"}]',	1,	1577982016,	1577983283);
 
 ALTER TABLE `v2_server_log`
 CHANGE `rate` `rate` decimal(10,2) NOT NULL AFTER `d`;
 
 ALTER TABLE `v2_order`
-DROP `method`;
+DROP `method`;
+
+ALTER TABLE `v2_invite_code`
+ADD `pv` int(11) NOT NULL DEFAULT '0' AFTER `status`;
+
+ALTER TABLE `v2_user`
+ADD `password_algo` char(10) COLLATE 'utf8_general_ci' NULL AFTER `password`;
+
+ALTER TABLE `v2_server`
+CHANGE `tls` `tls` tinyint(4) NOT NULL DEFAULT '0' AFTER `server_port`;
+
+ALTER TABLE `v2_server`
+ADD `rules` text COLLATE 'utf8_general_ci' NULL AFTER `settings`;
+
+CREATE TABLE `failed_jobs` (
+  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `connection` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `queue` text COLLATE utf8mb4_unicode_ci NOT NULL,
+  `payload` longtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `exception` longtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  `failed_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+ALTER TABLE `v2_user`
+ADD `discount` int(11) NULL AFTER `balance`;
+
+ALTER TABLE `v2_order`
+ADD `surplus_amount` int(11) NULL COMMENT '剩余价值' AFTER `discount_amount`;
+
+ALTER TABLE `v2_order`
+ADD `refund_amount` int(11) NULL COMMENT '退款金额' AFTER `surplus_amount`;
+
+ALTER TABLE `v2_tutorial`
+ADD `category_id` int(11) NOT NULL AFTER `id`;
+
+ALTER TABLE `v2_tutorial`
+DROP `description`;
+
+ALTER TABLE `v2_plan`
+CHANGE `month_price` `month_price` int(11) NULL AFTER `content`,
+CHANGE `quarter_price` `quarter_price` int(11) NULL AFTER `month_price`,
+CHANGE `half_year_price` `half_year_price` int(11) NULL AFTER `quarter_price`,
+CHANGE `year_price` `year_price` int(11) NULL AFTER `half_year_price`,
+ADD `onetime_price` int(11) NULL AFTER `year_price`;
+
+ALTER TABLE `v2_user`
+DROP `enable`,
+ADD `banned` tinyint(1) NOT NULL DEFAULT '0' AFTER `transfer_enable`;
+
+ALTER TABLE `v2_user`
+CHANGE `expired_at` `expired_at` bigint(20) NULL DEFAULT '0' AFTER `token`;
+
+ALTER TABLE `v2_tutorial`
+DROP `icon`;
+
+ALTER TABLE `v2_server`
+CHANGE `settings` `networkSettings` text COLLATE 'utf8_general_ci' NULL AFTER `network`,
+CHANGE `rules` `ruleSettings` text COLLATE 'utf8_general_ci' NULL AFTER `networkSettings`;
+
+ALTER TABLE `v2_server`
+CHANGE `tags` `tags` varchar(255) COLLATE 'utf8_general_ci' NULL AFTER `server_port`,
+CHANGE `rate` `rate` varchar(11) COLLATE 'utf8_general_ci' NOT NULL AFTER `tags`,
+CHANGE `network` `network` varchar(11) COLLATE 'utf8_general_ci' NOT NULL AFTER `rate`,
+CHANGE `networkSettings` `networkSettings` text COLLATE 'utf8_general_ci' NULL AFTER `network`,
+CHANGE `tls` `tls` tinyint(4) NOT NULL DEFAULT '0' AFTER `networkSettings`,
+ADD `tlsSettings` text COLLATE 'utf8_general_ci' NULL AFTER `tls`;
+
+ALTER TABLE `v2_order`
+ADD `balance_amount` int(11) NULL COMMENT '使用余额' AFTER `refund_amount`;
+
+ALTER TABLE `v2_server`
+CHANGE `network` `network` text COLLATE 'utf8_general_ci' NOT NULL AFTER `rate`,
+ADD `dnsSettings` text COLLATE 'utf8_general_ci' NULL AFTER `ruleSettings`;
+
+ALTER TABLE `v2_order`
+ADD `surplus_order_ids` text NULL COMMENT '折抵订单' AFTER `balance_amount`;
+
+ALTER TABLE `v2_order`
+CHANGE `status` `status` tinyint(1) NOT NULL DEFAULT '0' COMMENT '0待支付1开通中2已取消3已完成4已折抵' AFTER `surplus_order_ids`;
+
+CREATE TABLE `v2_server_stat` (
+  `id` int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  `server_id` int(11) NOT NULL,
+  `u` varchar(255) NOT NULL,
+  `d` varchar(25) NOT NULL,
+  `created_at` int(11) NOT NULL,
+  `updated_at` int(11) NOT NULL
+);
+
+ALTER TABLE `v2_tutorial`
+ADD `sort` int(11) NULL AFTER `show`;
+
+ALTER TABLE `v2_server`
+ADD `sort` int(11) NULL AFTER `show`;
+
+ALTER TABLE `v2_plan`
+ADD `sort` int(11) NULL AFTER `show`;
+
+ALTER TABLE `v2_plan`
+CHANGE `month_price` `month_price` int(11) NULL AFTER `content`,
+CHANGE `quarter_price` `quarter_price` int(11) NULL AFTER `month_price`,
+CHANGE `half_year_price` `half_year_price` int(11) NULL AFTER `quarter_price`,
+CHANGE `year_price` `year_price` int(11) NULL AFTER `half_year_price`,
+ADD `reset_price` int(11) NULL AFTER `onetime_price`;
+
+ALTER TABLE `v2_server_log`
+ADD `id` bigint NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;
+
+ALTER TABLE `v2_server_log`
+ADD `log_at` int(11) NOT NULL AFTER `rate`;
+
+ALTER TABLE `v2_mail_log`
+CHANGE `error` `error` text COLLATE 'utf8_general_ci' NULL AFTER `template_name`;
+
+ALTER TABLE `v2_plan`
+CHANGE `month_price` `month_price` int(11) NULL AFTER `content`,
+CHANGE `quarter_price` `quarter_price` int(11) NULL AFTER `month_price`,
+CHANGE `half_year_price` `half_year_price` int(11) NULL AFTER `quarter_price`,
+CHANGE `year_price` `year_price` int(11) NULL AFTER `half_year_price`;
+
+ALTER TABLE `v2_server_log`
+ADD INDEX log_at (`log_at`);
+
+ALTER TABLE `v2_user`
+ADD `telegram_id` bigint NULL AFTER `invite_user_id`;

docker-compose.yml.example

@@ -1,25 +0,0 @@
-version: '3'
-
-services:
-  db:
-    image: mysql
-    command: --default-authentication-plugin=mysql_native_password
-    environment:
-      - MYSQL_ROOT_PASSWORD=123456
-    volumes:
-      - ./docker/mysql:/var/lib/mysql
-      - ./install.sql:/install.sql
-  phpfpm:
-    image: bitnami/php-fpm
-    volumes:
-      - .:/app
-  nginx:
-    image: nginx
-    depends_on:
-      - phpfpm
-    volumes:
-      - .:/app
-      - ./docker/nginx:/etc/nginx/conf.d
-    ports:
-      - 8964:80
-

docker/mysql/.gitignore

@@ -1,2 +0,0 @@
-*
-!.gitignore

docker/nginx/.gitignore

@@ -1,3 +0,0 @@
-*
-!.gitignore
-!nginx.conf

docker/nginx/nginx.conf

@@ -1,52 +0,0 @@
-server {
-    # 监听 HTTP 协议默认的 [80] 端口。
-    listen 80;
-    # 绑定主机名 [example.com]。
-    server_name localhost;
-    # 服务器站点根目录 [/example.com/public]。
-    root /app/public;
-
-    # 添加几条有关安全的响应头；与 Google+ 的配置类似，详情参见文末。
-    add_header X-Frame-Options "SAMEORIGIN";
-    add_header X-XSS-Protection "1; mode=block";
-    add_header X-Content-Type-Options "nosniff";
-
-    # 站点默认页面；可指定多个，将顺序查找。
-    # 例如，访问 http://example.com/ Nginx 将首先尝试「站点根目录/index.html」是否存在，不存在则继续尝试「站点根目录/index.htm」，以此类推...
-    index index.html index.htm index.php;
-
-    # 指定字符集为 UTF-8
-    charset utf-8;
-
-    # Laravel 默认重写规则；删除将导致 Laravel 路由失效且 Nginx 响应 404。
-    location / {
-        try_files $uri $uri/ /index.php?$query_string;
-    }
-
-    # 关闭 [/favicon.ico] 和 [/robots.txt] 的访问日志。
-    # 并且即使它们不存在，也不写入错误日志。
-    location = /favicon.ico { access_log off; log_not_found off; }
-    location = /robots.txt  { access_log off; log_not_found off; }
-
-    # 将 [404] 错误交给 [/index.php] 处理，表示由 Laravel 渲染美观的错误页面。
-    error_page 404 /index.php;
-
-    # URI 符合正则表达式 [\.php$] 的请求将进入此段配置
-    location ~ \.php$ {
-        # 配置 FastCGI 服务地址，可以为 IP:端口，也可以为 Unix socket。
-        fastcgi_pass phpfpm:9000;
-        # 配置 FastCGI 的主页为 index.php。
-        fastcgi_index index.php;
-        # 配置 FastCGI 参数 SCRIPT_FILENAME 为 $realpath_root$fastcgi_script_name。
-        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
-        # 引用更多默认的 FastCGI 参数。
-        include fastcgi_params;
-    }
-    # 通俗地说，以上配置将所有 URI 以 .php 结尾的请求，全部交给 PHP-FPM 处理。
-
-    # 除符合正则表达式 [/\.(?!well-known).*] 之外的 URI，全部拒绝访问
-    # 也就是说，拒绝公开以 [.] 开头的目录，[.well-known] 除外
-    location ~ /\.(?!well-known).* {
-        deny all;
-    }
-}

init.sh

@@ -1,2 +1,3 @@
-php artisan key:generate
-php artisan config:cache
+wget https://getcomposer.org/download/1.9.0/composer.phar
+php composer.phar install -vvv
+php artisan v2board:install

library/PayTaro.php

@@ -21,11 +21,12 @@ class PayTaro
         $str = http_build_query($params) . $this->appSecret;
         $params['sign'] = md5($str);
         $curl = new Curl();
-        $curl->post('http://api.paytaro.com/v1/gateway/fetch', http_build_query($params));
-        if ($curl->error) {
-            abort(500, '接口请求失败');
-        }
+        $curl->post('https://api.paytaro.com/v1/gateway/fetch', http_build_query($params));
         $result = $curl->response;
+        if ($curl->error) {
+            $errors = (array)$result->errors;
+            abort(500, $errors[array_keys($errors)[0]][0]);
+        }
         $curl->close();
         if (!isset($result->data->trade_no)) {
             abort(500, '接口请求失败');

pm2.yaml

@@ -1,5 +1,5 @@
 apps:
-  - name     : 'V2Board Queue'
-    script   : 'php artisan queue:work --queue=verify_mail,other_mail'
+  - name     : 'V2Board'
+    script   : 'php artisan queue:work --queue=send_email,send_telegram'
     instances: 4
-    out_file : './storage/logs/queue/queue.log'
+    out_file : './storage/logs/queue/queue.log'