Merge pull request #439 from v2board/dev

1.5.1

app/Console/Commands/CheckCommission.php

@@ -5,6 +5,7 @@ namespace App\Console\Commands;
 use Illuminate\Console\Command;
 use App\Models\Order;
 use App\Models\User;
+use Illuminate\Support\Facades\DB;
 
 class CheckCommission extends Command
 {
@@ -38,19 +39,45 @@ 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('invite_user_id', '!=', NULL)
+                ->whereNotIn('status', [0, 2])
+                ->where('updated_at', '<=', strtotime('-3 day', time()))
+                ->update([
+                    'commission_status' => 1
+                ]);
+        }
+    }
+
+    public function autoPayCommission()
     {
         $order = Order::where('commission_status', 1)
-            ->where('status', 3)
+            ->where('invite_user_id', '!=', NULL)
             ->get();
         foreach ($order as $item) {
-            if ($item->invite_user_id) {
-                $inviter = User::find($item->invite_user_id);
-                if (!$inviter) continue;
+            $inviter = User::find($item->invite_user_id);
+            if (!$inviter) continue;
+            if ((int)config('v2board.withdraw_close_enable', 0)) {
+                $inviter->balance = $inviter->balance + $item->commission_balance;
+            } else {
                 $inviter->commission_balance = $inviter->commission_balance + $item->commission_balance;
-                if ($inviter->save()) {
-                    $item->commission_status = 2;
-                    $item->save();
+            }
+            DB::beginTransaction();
+            if ($inviter->save()) {
+                $item->commission_status = 2;
+                if (!$item->save()) {
+                    DB::rollBack();
+                    continue;
                 }
+                DB::commit();
             }
         }
     }

app/Console/Commands/CheckOrder.php

@@ -7,8 +7,7 @@ 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
 {
@@ -45,86 +44,19 @@ class CheckOrder extends Command
     {
         $orders = Order::get();
         foreach ($orders as $item) {
+            $orderService = new OrderService($item);
             switch ($item->status) {
                 // cancel
                 case 0:
                     if (strtotime($item->created_at) <= (time() - 1800)) {
-                        $orderService = new OrderService($item);
                         $orderService->cancel();
                     }
                     break;
                 case 1:
-                    $this->orderHandle($item);
+                    $orderService->open();
                     break;
             }
 
         }
     }
-
-    private function orderHandle(Order $order)
-    {
-        $user = User::find($order->user_id);
-        $plan = Plan::find($order->plan_id);
-        if ((string)$order->cycle === 'onetime_price') {
-            return $this->buyByOneTime($order, $user, $plan);
-        }
-        return $this->buyByCycle($order, $user, $plan);
-    }
-
-    private function buyByCycle(Order $order, User $user, Plan $plan)
-    {
-        // change plan process
-        if ((int)$order->type === 3) {
-            $user->expired_at = time();
-        }
-        if ($order->refund_amount) {
-            $user->balance = $user->balance + $order->refund_amount;
-        }
-        $user->transfer_enable = $plan->transfer_enable * 1073741824;
-        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)
-    {
-        if ($order->refund_amount) {
-            $user->balance = $user->balance + $order->refund_amount;
-        }
-        $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;
-        if ($user->save()) {
-            $order->status = 3;
-            $order->save();
-        }
-    }
-
-    private function getTime($str, $timestamp)
-    {
-        if ($timestamp < time()) {
-            $timestamp = time();
-        }
-        switch ($str) {
-            case 'month_price':
-                return strtotime('+1 month', $timestamp);
-            case 'quarter_price':
-                return strtotime('+3 month', $timestamp);
-            case 'half_year_price':
-                return strtotime('+6 month', $timestamp);
-            case 'year_price':
-                return strtotime('+12 month', $timestamp);
-        }
-    }
 }

app/Console/Commands/ResetTraffic.php

@@ -7,6 +7,7 @@ use App\Models\User;
 
 class ResetTraffic extends Command
 {
+    protected $builder;
     /**
      * The name and signature of the console command.
      *
@@ -29,6 +30,8 @@ class ResetTraffic extends Command
     public function __construct()
     {
         parent::__construct();
+        $this->builder = User::where('expired_at', '!=', NULL)
+            ->where('expired_at', '>', time());
     }
 
     /**
@@ -38,36 +41,36 @@ class ResetTraffic extends Command
      */
     public function handle()
     {
-        $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);
+                $this->resetByMonthFirstDay();
                 break;
             // expire day
             case 1:
-                $this->resetByExpireDay($user);
+                $this->resetByExpireDay();
                 break;
         }
     }
 
-    private function resetByMonthFirstDay($user):void
+    private function resetByMonthFirstDay():void
     {
+        $builder = $this->builder;
         if ((string)date('d') === '01') {
-            $user->update([
+            $builder->update([
                 'u' => 0,
                 'd' => 0
             ]);
         }
     }
 
-    private function resetByExpireDay($user):void
+    private function resetByExpireDay():void
     {
+        $builder = $this->builder;
         $lastDay = date('d', strtotime('last day of +0 months'));
         $users = [];
-        foreach ($user->get() as $item) {
+        foreach ($builder->get() as $item) {
             $expireDay = date('d', $item->expired_at);
             $today = date('d');
             if ($expireDay === $today) {

app/Console/Commands/SendRemindMail.php

@@ -43,7 +43,6 @@ class SendRemindMail extends Command
         $users = User::all();
         foreach ($users as $user) {
             if ($user->remind_expire) $this->remindExpire($user);
-            if ($user->remind_traffic) $this->remindTraffic($user);
         }
     }
 
@@ -61,31 +60,4 @@ class SendRemindMail extends Command
             ]);
         }
     }
-
-    private function remindTraffic($user)
-    {
-        if ($this->remindTrafficIsWarnValue(($user->u + $user->d), $user->transfer_enable)) {
-            $sendCount = MailLog::where('created_at', '>=', strtotime(date('Y-m-1')))
-                ->where('template_name', 'like', '%remindTraffic%')
-                ->count();
-            if ($sendCount > 0) return;
-            SendEmailJob::dispatch([
-                'email' => $user->email,
-                'subject' => '在' . config('v2board.app_name', 'V2board') . '的流量使用已达到80%',
-                'template_name' => 'remindTraffic',
-                'template_value' => [
-                    'name' => config('v2board.app_name', 'V2Board'),
-                    'url' => config('v2board.app_url')
-                ]
-            ]);
-        }
-    }
-
-    private function remindTrafficIsWarnValue($ud, $transfer_enable)
-    {
-        if ($ud <= 0) return false;
-        if (($ud / $transfer_enable * 100) < 80) return false;
-        return true;
-    }
-
 }

app/Console/Commands/Test.php

@@ -2,29 +2,24 @@
 
 namespace App\Console\Commands;
 
+use App\Services\PaymentService;
 use Illuminate\Console\Command;
-use App\Models\User;
-use App\Models\Order;
-use App\Models\Server;
-use App\Models\ServerLog;
-use App\Utils\Helper;
-use Illuminate\Support\Facades\Cache;
 
-class V2boardCache extends Command
+class Test extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'v2board:cache';
+    protected $signature = 'test';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = '缓存任务';
+    protected $description = '';
 
     /**
      * Create a new command instance.
@@ -43,5 +38,7 @@ class V2boardCache extends Command
      */
     public function handle()
     {
+        $paymentService = new PaymentService('MGate');
+        var_dump($paymentService->form());
     }
 }

app/Console/Commands/V2boardInstall.php

@@ -114,7 +114,7 @@ class V2boardInstall extends Command
             abort(500, '管理员密码长度最小为8位字符');
         }
         $user->password = password_hash($password, PASSWORD_DEFAULT);
-        $user->v2ray_uuid = Helper::guid(true);
+        $user->uuid = Helper::guid(true);
         $user->token = Helper::guid();
         $user->is_admin = 1;
         return $user->save();

app/Console/Commands/V2boardStatistics.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Jobs\StatServerJob;
+use Illuminate\Console\Command;
+use App\Models\Order;
+use App\Models\StatOrder;
+use App\Models\ServerLog;
+use Illuminate\Support\Facades\DB;
+
+class V2boardStatistics extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'v2board:statistics';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '统计任务';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+         $this->statOrder();
+         $this->statServer();
+    }
+
+    private function statOrder()
+    {
+        $endAt = strtotime(date('Y-m-d'));
+        $startAt = strtotime('-1 day', $endAt);
+        $builder = Order::where('created_at', '>=', $startAt)
+            ->where('created_at', '<', $endAt)
+            ->whereNotIn('status', [0, 2]);
+        $orderCount = $builder->count();
+        $orderAmount = $builder->sum('total_amount');
+        $builder = $builder->where('commission_balance', '!=', 0)
+            ->where('commission_status', 0);
+        $commissionCount = $builder->count();
+        $commissionAmount = $builder->sum('commission_balance');
+        $data = [
+            'order_count' => $orderCount,
+            'order_amount' => $orderAmount,
+            'commission_count' => $commissionCount,
+            'commission_amount' => $commissionAmount,
+            'record_type' => 'd',
+            'record_at' => $startAt
+        ];
+        $statistic = StatOrder::where('record_at', $startAt)
+            ->where('record_type', 'd')
+            ->first();
+        if ($statistic) {
+            $statistic->update($data);
+            return;
+        }
+        StatOrder::create($data);
+    }
+
+    private function statServer()
+    {
+        $endAt = strtotime(date('Y-m-d'));
+        $startAt = strtotime('-1 day', $endAt);
+        $statistics = ServerLog::select([
+            'server_id',
+            'method as server_type',
+            DB::raw("sum(u) as u"),
+            DB::raw("sum(d) as d"),
+        ])
+            ->where('log_at', '>=', $startAt)
+            ->where('log_at', '<', $endAt)
+            ->groupBy('server_id', 'method')
+            ->get()
+            ->toArray();
+        foreach ($statistics as $statistic) {
+            $statistic['record_type'] = 'd';
+            $statistic['record_at'] = $startAt;
+            StatServerJob::dispatch($statistic);
+        }
+    }
+}

app/Console/Kernel.php

@@ -25,13 +25,13 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
         // v2board
-        $schedule->command('v2board:cache')->hourly();
+        $schedule->command('v2board:statistics')->daily();
         // check
         $schedule->command('check:order')->everyMinute();
         $schedule->command('check:commission')->everyMinute();
         // reset
         $schedule->command('reset:traffic')->daily();
-        $schedule->command('reset:serverLog')->monthly();
+        $schedule->command('reset:serverLog')->quarterly();
         // send
         $schedule->command('send:remindMail')->dailyAt('11:30');
     }

app/Http/Controllers/Admin/ConfigController.php

@@ -3,6 +3,7 @@
 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;
@@ -20,6 +21,20 @@ class ConfigController extends Controller
         ]);
     }
 
+    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
@@ -30,7 +45,11 @@ class ConfigController extends Controller
                     'invite_commission' => config('v2board.invite_commission', 10),
                     'invite_gen_limit' => config('v2board.invite_gen_limit', 5),
                     'invite_never_expire' => config('v2board.invite_never_expire', 0),
-                    'commission_first_time_enable' => config('v2board.commission_first_time_enable', 1)
+                    'commission_first_time_enable' => config('v2board.commission_first_time_enable', 1),
+                    'commission_auto_check_enable' => config('v2board.commission_auto_check_enable', 1),
+                    'commission_withdraw_limit' => config('v2board.commission_withdraw_limit', 100),
+                    'commission_withdraw_method' => config('v2board.commission_withdraw_method', Dict::WITHDRAW_METHOD_WHITELIST_DEFAULT),
+                    'withdraw_close_enable' => config('v2board.withdraw_close_enable', 0)
                 ],
                 'site' => [
                     'safe_mode_enable' => (int)config('v2board.safe_mode_enable', 0),
@@ -43,12 +62,18 @@ class ConfigController extends Controller
                     '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_whitelist_suffix' => config('v2board.email_whitelist_suffix', Dict::EMAIL_WHITELIST_SUFFIX_DEFAULT),
+                    'email_gmail_limit_enable' => config('v2board.email_gmail_limit_enable', 0),
+                    'recaptcha_enable' => (int)config('v2board.recaptcha_enable', 0),
+                    'recaptcha_key' => config('v2board.recaptcha_key'),
+                    'recaptcha_site_key' => config('v2board.recaptcha_site_key'),
+                    'tos_url' => config('v2board.tos_url')
                 ],
                 'subscribe' => [
                     'plan_change_enable' => (int)config('v2board.plan_change_enable', 1),
                     'reset_traffic_method' => (int)config('v2board.reset_traffic_method', 0),
-                    'renew_reset_traffic_enable' => (int)config('v2board.renew_reset_traffic_enable', 1)
+                    'renew_reset_traffic_enable' => (int)config('v2board.renew_reset_traffic_enable', 0),
+                    'surplus_enable' => (int)config('v2board.surplus_enable', 1)
                 ],
                 'pay' => [
                     // alipay
@@ -59,33 +84,67 @@ class ConfigController extends Controller
                     // stripe
                     'stripe_alipay_enable' => (int)config('v2board.stripe_alipay_enable', 0),
                     'stripe_wepay_enable' => (int)config('v2board.stripe_wepay_enable', 0),
+                    'stripe_card_enable' => (int)config('v2board.stripe_card_enable', 0),
                     'stripe_sk_live' => config('v2board.stripe_sk_live'),
                     'stripe_pk_live' => config('v2board.stripe_pk_live'),
                     'stripe_webhook_key' => config('v2board.stripe_webhook_key'),
                     'stripe_currency' => config('v2board.stripe_currency', 'hkd'),
                     // bitpayx
+                    'bitpayx_name' => config('v2board.bitpayx_name', '在线支付'),
                     'bitpayx_enable' => (int)config('v2board.bitpayx_enable', 0),
                     'bitpayx_appsecret' => config('v2board.bitpayx_appsecret'),
-                    // paytaro
-                    'paytaro_enable' => (int)config('v2board.paytaro_enable', 0),
-                    'paytaro_app_id' => config('v2board.paytaro_app_id'),
-                    'paytaro_app_secret' => config('v2board.paytaro_app_secret')
+                    // mGate
+                    'mgate_name' => config('v2board.mgate_name', '在线支付'),
+                    'mgate_enable' => (int)config('v2board.mgate_enable', 0),
+                    'mgate_url' => config('v2board.mgate_url'),
+                    'mgate_app_id' => config('v2board.mgate_app_id'),
+                    'mgate_app_secret' => config('v2board.mgate_app_secret'),
+                    // Epay
+                    'epay_name' => config('v2board.epay_name', '在线支付'),
+                    'epay_enable' => (int)config('v2board.epay_enable', 0),
+                    'epay_url' => config('v2board.epay_url'),
+                    'epay_pid' => config('v2board.epay_pid'),
+                    'epay_key' => config('v2board.epay_key'),
                 ],
                 'frontend' => [
                     'frontend_theme_sidebar' => config('v2board.frontend_theme_sidebar', 'light'),
                     'frontend_theme_header' => config('v2board.frontend_theme_header', 'dark'),
                     'frontend_theme_color' => config('v2board.frontend_theme_color', 'default'),
-                    'frontend_background_url' => config('v2board.frontend_background_url')
+                    'frontend_background_url' => config('v2board.frontend_background_url'),
+                    'frontend_admin_path' => config('v2board.frontend_admin_path', 'admin'),
+                    'frontend_customer_service_method' => config('v2board.frontend_customer_service_method', 0),
+                    'frontend_customer_service_id' => config('v2board.frontend_customer_service_id'),
                 ],
                 'server' => [
                     'server_token' => config('v2board.server_token'),
-                    'server_license' => config('v2board.server_license')
+                    'server_license' => config('v2board.server_license'),
+                    'server_log_enable' => config('v2board.server_log_enable', 0),
+                    'server_v2ray_domain' => config('v2board.server_v2ray_domain'),
+                    'server_v2ray_protocol' => config('v2board.server_v2ray_protocol'),
                 ],
                 'tutorial' => [
                     'apple_id' => config('v2board.apple_id')
                 ],
                 'email' => [
-                    'email_template' => config('v2board.email_template', 'default')
+                    'email_template' => config('v2board.email_template', 'default'),
+                    'email_host' => config('v2board.email_host'),
+                    'email_port' => config('v2board.email_port'),
+                    'email_username' => config('v2board.email_username'),
+                    'email_password' => config('v2board.email_password'),
+                    'email_encryption' => config('v2board.email_encryption'),
+                    'email_from_address' => config('v2board.email_from_address')
+                ],
+                'telegram' => [
+                    'telegram_bot_enable' => config('v2board.telegram_bot_enable', 0),
+                    'telegram_bot_token' => config('v2board.telegram_bot_token')
+                ],
+                'app' => [
+                    'windows_version' => config('v2board.windows_version'),
+                    'windows_download_url' => config('v2board.windows_download_url'),
+                    'macos_version' => config('v2board.macos_version'),
+                    'macos_download_url' => config('v2board.macos_download_url'),
+                    'android_version' => config('v2board.android_version'),
+                    'android_download_url' => config('v2board.android_download_url')
                 ]
             ]
         ]);
@@ -96,7 +155,7 @@ class ConfigController extends Controller
         $data = $request->input();
         $array = \Config::get('v2board');
         foreach ($data as $k => $v) {
-            if (!in_array($k, array_keys(ConfigSave::RULES))) {
+            if (!in_array($k, array_keys($request->validated()))) {
                 abort(500, '参数' . $k . '不在规则内，禁止修改');
             }
             $array[$k] = $v;
@@ -105,10 +164,12 @@ class ConfigController extends Controller
         if (!\File::put(base_path() . '/config/v2board.php', "<?php\n return $data ;")) {
             abort(500, '修改失败');
         }
-        \Artisan::call('config:cache');
-        if (function_exists('opcache')) {
-            opcache_reset();
+        if (function_exists('opcache_reset')) {
+            if (opcache_reset() === false) {
+                abort(500, '缓存清除失败，请卸载或检查opcache配置状态');
+            }
         }
+        \Artisan::call('config:cache');
         return response([
             'data' => true
         ]);

app/Http/Controllers/Admin/CouponController.php

@@ -3,33 +3,47 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\Admin\CouponSave;
+use App\Http\Requests\Admin\CouponGenerate;
+use App\Models\Plan;
+use App\Models\User;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Coupon;
 use App\Utils\Helper;
+use Illuminate\Support\Facades\DB;
 
 class CouponController extends Controller
 {
     public function fetch(Request $request)
     {
+        $current = $request->input('current') ? $request->input('current') : 1;
+        $pageSize = $request->input('pageSize') >= 10 ? $request->input('pageSize') : 10;
+        $sortType = in_array($request->input('sort_type'), ['ASC', 'DESC']) ? $request->input('sort_type') : 'DESC';
+        $sort = $request->input('sort') ? $request->input('sort') : 'created_at';
+        $builder = Coupon::orderBy($sort, $sortType);
+        $total = $builder->count();
+        $coupons = $builder->forPage($current, $pageSize)
+            ->get();
+
+        foreach ($coupons as $k => $v) {
+            if ($coupons[$k]['limit_plan_ids']) $coupons[$k]['limit_plan_ids'] = json_decode($coupons[$k]['limit_plan_ids']);
+        }
         return response([
-            'data' => Coupon::all()
+            'data' => $coupons,
+            'total' => $total
         ]);
     }
 
     public function save(CouponSave $request)
     {
-        $params = $request->only([
-            'name',
-            'type',
-            'value',
-            'started_at',
-            'ended_at',
-            'limit_use'
-        ]);
-
+        $params = $request->validated();
+        if (isset($params['limit_plan_ids'])) {
+            $params['limit_plan_ids'] = json_encode($params['limit_plan_ids']);
+        }
         if (!$request->input('id')) {
-            $params['code'] = Helper::randomChar(8);
+            if (!isset($params['code'])) {
+                $params['code'] = Helper::randomChar(8);
+            }
             if (!Coupon::create($params)) {
                 abort(500, '创建失败');
             }
@@ -46,6 +60,70 @@ class CouponController extends Controller
         ]);
     }
 
+    public function generate(CouponGenerate $request)
+    {
+        if ($request->input('generate_count')) {
+            $this->multiGenerate($request);
+            return;
+        }
+
+        $params = $request->validated();
+        if (isset($params['limit_plan_ids'])) {
+            $params['limit_plan_ids'] = json_encode($params['limit_plan_ids']);
+        }
+        if (!$request->input('id')) {
+            if (!isset($params['code'])) {
+                $params['code'] = Helper::randomChar(8);
+            }
+            if (!Coupon::create($params)) {
+                abort(500, '创建失败');
+            }
+        } else {
+            try {
+                Coupon::find($request->input('id'))->update($params);
+            } catch (\Exception $e) {
+                abort(500, '保存失败');
+            }
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    private function multiGenerate(CouponGenerate $request)
+    {
+        $coupons = [];
+        $coupon = $request->validated();
+        if (isset($coupon['limit_plan_ids'])) {
+            $coupon['limit_plan_ids'] = json_encode($coupon['limit_plan_ids']);
+        }
+        $coupon['created_at'] = $coupon['updated_at'] = time();
+        unset($coupon['generate_count']);
+        for ($i = 0;$i < $request->input('generate_count');$i++) {
+            $coupon['code'] = Helper::randomChar(8);
+            array_push($coupons, $coupon);
+        }
+        DB::beginTransaction();
+        if (!Coupon::insert($coupons)) {
+            DB::rollBack();
+            abort(500, '生成失败');
+        }
+        DB::commit();
+        $data = "名称,类型,金额或比例,开始时间,结束时间,可用次数,可用于订阅,券码,生成时间\r\n";
+        foreach($coupons as $coupon) {
+            $type = ['', '金额', '比例'][$coupon['type']];
+            $value = ['', ($coupon['value'] / 100),$coupon['value']][$coupon['type']];
+            $startTime = date('Y-m-d H:i:s', $coupon['started_at']);
+            $endTime = date('Y-m-d H:i:s', $coupon['ended_at']);
+            $limitUse = $coupon['limit_use'] ?? '不限制';
+            $createTime = date('Y-m-d H:i:s', $coupon['created_at']);
+            $limitPlanIds = $coupon['limit_plan_ids'] ?? '不限制';
+            $data .= "{$coupon['name']},{$type},{$value},{$startTime},{$endTime},{$limitUse},{$limitPlanIds},{$coupon['code']},{$createTime}\r\n";
+        }
+        echo $data;
+    }
+
     public function drop(Request $request)
     {
         if (empty($request->input('id'))) {

app/Http/Controllers/Admin/KnowledgeController.php

@@ -0,0 +1,109 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Requests\Admin\KnowledgeSave;
+use App\Http\Requests\Admin\KnowledgeSort;
+use App\Models\Knowledge;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\DB;
+
+class KnowledgeController extends Controller
+{
+    public function fetch(Request $request)
+    {
+        if ($request->input('id')) {
+            $knowledge = Knowledge::find($request->input('id'))->toArray();
+            if (!$knowledge) abort(500, '知识不存在');
+            return response([
+                'data' => $knowledge
+            ]);
+        }
+        return response([
+            'data' => Knowledge::select(['title', 'id', 'updated_at', 'category', 'show'])
+                ->orderBy('sort', 'ASC')
+                ->get()
+        ]);
+    }
+
+    public function getCategory(Request $request)
+    {
+        return response([
+            'data' => array_keys(Knowledge::get()->groupBy('category')->toArray())
+        ]);
+    }
+
+    public function save(KnowledgeSave $request)
+    {
+        $params = $request->validated();
+
+        if (!$request->input('id')) {
+            if (!Knowledge::create($params)) {
+                abort(500, '创建失败');
+            }
+        } else {
+            try {
+                Knowledge::find($request->input('id'))->update($params);
+            } catch (\Exception $e) {
+                abort(500, '保存失败');
+            }
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function show(Request $request)
+    {
+        if (empty($request->input('id'))) {
+            abort(500, '参数有误');
+        }
+        $knowledge = Knowledge::find($request->input('id'));
+        if (!$knowledge) {
+            abort(500, '知识不存在');
+        }
+        $knowledge->show = $knowledge->show ? 0 : 1;
+        if (!$knowledge->save()) {
+            abort(500, '保存失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function sort(KnowledgeSort $request)
+    {
+        DB::beginTransaction();
+        foreach ($request->input('knowledge_ids') as $k => $v) {
+            if (!Knowledge::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'))) {
+            abort(500, '参数有误');
+        }
+        $knowledge = Knowledge::find($request->input('id'));
+        if (!$knowledge) {
+            abort(500, '知识不存在');
+        }
+        if (!$knowledge->delete()) {
+            abort(500, '删除失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+}

app/Http/Controllers/Admin/MailController.php

@@ -1,47 +0,0 @@
-<?php
-
-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\Jobs\SendEmailJob;
-
-class MailController extends Controller
-{
-    public function send(MailSend $request)
-    {
-        $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) {
-            SendEmailJob::dispatch([
-                'email' => $user->email,
-                'subject' => $request->input('subject'),
-                'template_name' => 'notify',
-                'template_value' => [
-                    'name' => config('v2board.app_name', 'V2Board'),
-                    'url' => config('v2board.app_url'),
-                    'content' => $request->input('content')
-                ]
-            ]);
-        }
-
-        return response([
-            'data' => true
-        ]);
-    }
-}

app/Http/Controllers/Admin/OrderController.php

@@ -2,34 +2,50 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Http\Requests\Admin\OrderAssign;
 use App\Http\Requests\Admin\OrderUpdate;
+use App\Http\Requests\Admin\OrderFetch;
 use App\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
 {
-    public function fetch(Request $request)
+    private function filter(Request $request, &$builder)
+    {
+        if ($request->input('filter')) {
+            foreach ($request->input('filter') as $filter) {
+                if ($filter['key'] === 'email') {
+                    $user = User::where('email', "%{$filter['value']}%")->first();
+                    if (!$user) continue;
+                    $builder->where('user_id', $user->id);
+                    continue;
+                }
+                if ($filter['condition'] === '模糊') {
+                    $filter['condition'] = 'like';
+                    $filter['value'] = "%{$filter['value']}%";
+                }
+                $builder->where($filter['key'], $filter['condition'], $filter['value']);
+            }
+        }
+    }
+
+    public function fetch(OrderFetch $request)
     {
         $current = $request->input('current') ? $request->input('current') : 1;
         $pageSize = $request->input('pageSize') >= 10 ? $request->input('pageSize') : 10;
         $orderModel = Order::orderBy('created_at', 'DESC');
-        if ($request->input('trade_no')) {
-            $orderModel->where('trade_no', $request->input('trade_no'));
-        }
         if ($request->input('is_commission')) {
             $orderModel->where('invite_user_id', '!=', NULL);
-            $orderModel->where('status', 3);
-        }
-        if ($request->input('id')) {
-            $orderModel->where('id', $request->input('id'));
-        }
-        if ($request->input('user_id')) {
-            $orderModel->where('user_id', $request->input('user_id'));
+            $orderModel->whereNotIn('status', [0, 2]);
+            $orderModel->where('commission_balance', '>', 0);
         }
+        $this->filter($request, $orderModel);
         $total = $orderModel->count();
         $res = $orderModel->forPage($current, $pageSize)
             ->get();
@@ -100,4 +116,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/PaymentController.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Services\PaymentService;
+use App\Utils\Helper;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\Payment;
+
+class PaymentController extends Controller
+{
+    public function getPaymentMethods()
+    {
+        $methods = [];
+        foreach (glob(base_path('app//Payments') . '/*.php') as $file) {
+            array_push($methods, pathinfo($file)['filename']);
+        }
+        return response([
+            'data' => $methods
+        ]);
+    }
+
+    public function fetch()
+    {
+        $payments = Payment::all();
+        foreach ($payments as $k => $v) {
+            $payments[$k]['notify_url'] = url("/api/v1/guest/payment/notify/{$v->payment}/{$v->uuid}");
+        }
+        return response([
+            'data' => $payments
+        ]);
+    }
+
+    public function getPaymentForm(Request $request)
+    {
+        $paymentService = new PaymentService($request->input('payment'), $request->input('id'));
+        return response([
+            'data' => $paymentService->form()
+        ]);
+    }
+
+    public function save(Request $request)
+    {
+        if ($request->input('id')) {
+            $payment = Payment::find($request->input('id'));
+            if (!$payment) abort(500, '支付方式不存在');
+            try {
+                $payment->update($request->input());
+            } catch (\Exception $e) {
+                abort(500, '更新失败');
+            }
+            return response([
+                'data' => true
+            ]);
+        }
+        if (!Payment::create([
+            'name' => $request->input('name'),
+            'payment' => $request->input('payment'),
+            'config' => $request->input('config'),
+            'uuid' => Helper::guid()
+        ])) {
+            abort(500, '保存失败');
+        }
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function drop(Request $request)
+    {
+        $payment = Payment::find($request->input('id'));
+        if (!$payment) abort(500, '支付方式不存在');
+        return response([
+            'data' => $payment->delete()
+        ]);
+    }
+}

app/Http/Controllers/Admin/PlanController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\Admin\PlanSave;
+use App\Http\Requests\Admin\PlanSort;
 use App\Http\Requests\Admin\PlanUpdate;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
@@ -15,23 +16,45 @@ class PlanController extends Controller
 {
     public function fetch(Request $request)
     {
+
+        $counts = User::select(
+            DB::raw("plan_id"),
+            DB::raw("count(*) as count")
+        )
+            ->where('plan_id', '!=', NULL)
+            ->where(function ($query) {
+                $query->where('expired_at', '>=', time())
+                    ->orWhere('expired_at', NULL);
+            })
+            ->groupBy("plan_id")
+            ->get();
+        $plans = Plan::orderBy('sort', 'ASC')->get();
+        foreach ($plans as $k => $v) {
+            $plans[$k]->count = 0;
+            foreach ($counts as $kk => $vv) {
+                if ($plans[$k]->id === $counts[$kk]->plan_id) $plans[$k]->count = $counts[$kk]->count;
+            }
+        }
         return response([
-            'data' => Plan::get()
+            'data' => $plans
         ]);
     }
 
     public function save(PlanSave $request)
     {
-        $params = $request->only(array_keys(PlanSave::RULES));
+        $params = $request->validated();
         if ($request->input('id')) {
             $plan = Plan::find($request->input('id'));
             if (!$plan) {
                 abort(500, '该订阅不存在');
             }
             DB::beginTransaction();
-            // update user group id
+            // update user group id and transfer
             try {
-                User::where('plan_id', $plan->id)->update(['group_id' => $plan->group_id]);
+                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();
@@ -91,4 +114,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/Server/GroupController.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Http\Controllers\Admin\Server;
+
+use App\Models\Plan;
+use App\Models\Server;
+use App\Models\ServerGroup;
+use App\Models\User;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+class GroupController extends Controller
+{
+    public function fetch(Request $request)
+    {
+        if ($request->input('group_id')) {
+            return response([
+                'data' => [ServerGroup::find($request->input('group_id'))]
+            ]);
+        }
+        return response([
+            'data' => ServerGroup::get()
+        ]);
+    }
+
+    public function save(Request $request)
+    {
+        if (empty($request->input('name'))) {
+            abort(500, '组名不能为空');
+        }
+
+        if ($request->input('id')) {
+            $serverGroup = ServerGroup::find($request->input('id'));
+        } else {
+            $serverGroup = new ServerGroup();
+        }
+
+        $serverGroup->name = $request->input('name');
+        return response([
+            'data' => $serverGroup->save()
+        ]);
+    }
+
+    public function drop(Request $request)
+    {
+        if ($request->input('id')) {
+            $serverGroup = ServerGroup::find($request->input('id'));
+            if (!$serverGroup) {
+                abort(500, '组不存在');
+            }
+        }
+
+        $servers = Server::all();
+        foreach ($servers as $server) {
+            $groupId = json_decode($server->group_id);
+            if (in_array($request->input('id'), $groupId)) {
+                abort(500, '该组已被节点所使用，无法删除');
+            }
+        }
+
+        if (Plan::where('group_id', $request->input('id'))->first()) {
+            abort(500, '该组已被订阅所使用，无法删除');
+        }
+        if (User::where('group_id', $request->input('id'))->first()) {
+            abort(500, '该组已被用户所使用，无法删除');
+        }
+        return response([
+            'data' => $serverGroup->delete()
+        ]);
+    }
+}

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

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

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

@@ -0,0 +1,96 @@
+<?php
+
+namespace App\Http\Controllers\Admin\Server;
+
+use App\Http\Requests\Admin\ServerShadowsocksSave;
+use App\Http\Requests\Admin\ServerShadowsocksUpdate;
+use App\Models\ServerShadowsocks;
+use App\Services\ServerService;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+class ShadowsocksController extends Controller
+{
+    public function save(ServerShadowsocksSave $request)
+    {
+        $params = $request->validated();
+        $params['group_id'] = json_encode($params['group_id']);
+        if (isset($params['tags'])) {
+            $params['tags'] = json_encode($params['tags']);
+        }
+
+        if ($request->input('id')) {
+            $server = ServerShadowsocks::find($request->input('id'));
+            if (!$server) {
+                abort(500, '服务器不存在');
+            }
+            try {
+                $server->update($params);
+            } catch (\Exception $e) {
+                abort(500, '保存失败');
+            }
+            return response([
+                'data' => true
+            ]);
+        }
+
+        if (!ServerShadowsocks::create($params)) {
+            abort(500, '创建失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function drop(Request $request)
+    {
+        if ($request->input('id')) {
+            $server = ServerShadowsocks::find($request->input('id'));
+            if (!$server) {
+                abort(500, '节点ID不存在');
+            }
+        }
+        return response([
+            'data' => $server->delete()
+        ]);
+    }
+
+    public function update(ServerShadowsocksUpdate $request)
+    {
+        $params = $request->only([
+            'show',
+        ]);
+
+        $server = ServerShadowsocks::find($request->input('id'));
+
+        if (!$server) {
+            abort(500, '该服务器不存在');
+        }
+        try {
+            $server->update($params);
+        } catch (\Exception $e) {
+            abort(500, '保存失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function copy(Request $request)
+    {
+        $server = ServerShadowsocks::find($request->input('id'));
+        $server->show = 0;
+        if (!$server) {
+            abort(500, '服务器不存在');
+        }
+        if (!ServerShadowsocks::create($server->toArray())) {
+            abort(500, '复制失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+}

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

@@ -0,0 +1,104 @@
+<?php
+
+namespace App\Http\Controllers\Admin\Server;
+
+use App\Http\Requests\Admin\ServerTrojanSave;
+use App\Http\Requests\Admin\ServerTrojanUpdate;
+use App\Services\ServerService;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\ServerTrojan;
+
+class TrojanController extends Controller
+{
+    public function save(ServerTrojanSave $request)
+    {
+        $params = $request->validated();
+        $params['group_id'] = json_encode($params['group_id']);
+        if (isset($params['tags'])) {
+            $params['tags'] = json_encode($params['tags']);
+        }
+
+        if ($request->input('id')) {
+            $server = ServerTrojan::find($request->input('id'));
+            if (!$server) {
+                abort(500, '服务器不存在');
+            }
+            try {
+                $server->update($params);
+            } catch (\Exception $e) {
+                abort(500, '保存失败');
+            }
+            return response([
+                'data' => true
+            ]);
+        }
+
+        if (!ServerTrojan::create($params)) {
+            abort(500, '创建失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function drop(Request $request)
+    {
+        if ($request->input('id')) {
+            $server = ServerTrojan::find($request->input('id'));
+            if (!$server) {
+                abort(500, '节点ID不存在');
+            }
+        }
+        return response([
+            'data' => $server->delete()
+        ]);
+    }
+
+    public function update(ServerTrojanUpdate $request)
+    {
+        $params = $request->only([
+            'show',
+        ]);
+
+        $server = ServerTrojan::find($request->input('id'));
+
+        if (!$server) {
+            abort(500, '该服务器不存在');
+        }
+        try {
+            $server->update($params);
+        } catch (\Exception $e) {
+            abort(500, '保存失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function copy(Request $request)
+    {
+        $server = ServerTrojan::find($request->input('id'));
+        $server->show = 0;
+        if (!$server) {
+            abort(500, '服务器不存在');
+        }
+        if (!ServerTrojan::create($server->toArray())) {
+            abort(500, '复制失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+    public function viewConfig(Request $request)
+    {
+        $serverService = new ServerService();
+        $config = $serverService->getTrojanConfig($request->input('node_id'), 23333);
+        return response([
+            'data' => $config
+        ]);
+    }
+}

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

@@ -1,42 +1,19 @@
 <?php
 
-namespace App\Http\Controllers\Admin;
+namespace App\Http\Controllers\Admin\Server;
 
-use App\Http\Requests\Admin\ServerSave;
-use App\Http\Requests\Admin\ServerUpdate;
+use App\Http\Requests\Admin\ServerV2raySave;
+use App\Http\Requests\Admin\ServerV2rayUpdate;
 use App\Services\ServerService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use App\Models\ServerGroup;
 use App\Models\Server;
-use App\Models\Plan;
-use App\Models\User;
-use Illuminate\Support\Facades\Cache;
 
-class ServerController extends Controller
+class V2rayController extends Controller
 {
-    public function fetch(Request $request)
+    public function save(ServerV2raySave $request)
     {
-        $server = Server::get();
-        for ($i = 0; $i < count($server); $i++) {
-            if (!empty($server[$i]['tags'])) {
-                $server[$i]['tags'] = json_decode($server[$i]['tags']);
-            }
-            $server[$i]['group_id'] = json_decode($server[$i]['group_id']);
-            if ($server[$i]['parent_id']) {
-                $server[$i]['last_check_at'] = Cache::get('server_last_check_at_' . $server[$i]['parent_id']);
-            } else {
-                $server[$i]['last_check_at'] = Cache::get('server_last_check_at_' . $server[$i]['id']);
-            }
-        }
-        return response([
-            'data' => $server
-        ]);
-    }
-
-    public function save(ServerSave $request)
-    {
-        $params = $request->only(array_keys(ServerSave::RULES));
+        $params = $request->validated();
         $params['group_id'] = json_encode($params['group_id']);
         if (isset($params['tags'])) {
             $params['tags'] = json_encode($params['tags']);
@@ -90,64 +67,6 @@ class ServerController extends Controller
         ]);
     }
 
-    public function groupFetch(Request $request)
-    {
-        if ($request->input('group_id')) {
-            return response([
-                'data' => [ServerGroup::find($request->input('group_id'))]
-            ]);
-        }
-        return response([
-            'data' => ServerGroup::get()
-        ]);
-    }
-
-    public function groupSave(Request $request)
-    {
-        if (empty($request->input('name'))) {
-            abort(500, '组名不能为空');
-        }
-
-        if ($request->input('id')) {
-            $serverGroup = ServerGroup::find($request->input('id'));
-        } else {
-            $serverGroup = new ServerGroup();
-        }
-
-        $serverGroup->name = $request->input('name');
-        return response([
-            'data' => $serverGroup->save()
-        ]);
-    }
-
-    public function groupDrop(Request $request)
-    {
-        if ($request->input('id')) {
-            $serverGroup = ServerGroup::find($request->input('id'));
-            if (!$serverGroup) {
-                abort(500, '组不存在');
-            }
-        }
-
-        $servers = Server::all();
-        foreach ($servers as $server) {
-            $groupId = json_decode($server->group_id);
-            if (in_array($request->input('id'), $groupId)) {
-                abort(500, '该组已被节点所使用，无法删除');
-            }
-        }
-
-        if (Plan::where('group_id', $request->input('id'))->first()) {
-            abort(500, '该组已被订阅所使用，无法删除');
-        }
-        if (User::where('group_id', $request->input('id'))->first()) {
-            abort(500, '该组已被用户所使用，无法删除');
-        }
-        return response([
-            'data' => $serverGroup->delete()
-        ]);
-    }
-
     public function drop(Request $request)
     {
         if ($request->input('id')) {
@@ -161,7 +80,7 @@ class ServerController extends Controller
         ]);
     }
 
-    public function update(ServerUpdate $request)
+    public function update(ServerV2rayUpdate $request)
     {
         $params = $request->only([
             'show',
@@ -186,6 +105,7 @@ class ServerController extends Controller
     public function copy(Request $request)
     {
         $server = Server::find($request->input('id'));
+        $server->show = 0;
         if (!$server) {
             abort(500, '服务器不存在');
         }
@@ -201,7 +121,7 @@ class ServerController extends Controller
     public function viewConfig(Request $request)
     {
         $serverService = new ServerService();
-        $config = $serverService->getConfig($request->input('node_id'), 23333);
+        $config = $serverService->getV2RayConfig($request->input('node_id'), 23333);
         return response([
             'data' => $config
         ]);

app/Http/Controllers/Admin/StatController.php

@@ -2,6 +2,9 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Models\ServerShadowsocks;
+use App\Models\ServerTrojan;
+use App\Services\ServerService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\ServerGroup;
@@ -10,7 +13,10 @@ use App\Models\Plan;
 use App\Models\User;
 use App\Models\Ticket;
 use App\Models\Order;
+use App\Models\StatOrder;
+use App\Models\StatServer;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
 
 class StatController extends Controller
 {
@@ -20,7 +26,7 @@ class StatController extends Controller
             'data' => [
                 'month_income' => Order::where('created_at', '>=', strtotime(date('Y-m-1')))
                     ->where('created_at', '<', time())
-                    ->where('status', '3')
+                    ->whereNotIn('status', [0, 2])
                     ->sum('total_amount'),
                 'month_register_total' => User::where('created_at', '>=', strtotime(date('Y-m-1')))
                     ->where('created_at', '<', time())
@@ -29,9 +35,91 @@ class StatController extends Controller
                     ->count(),
                 'commission_pendding_total' => Order::where('commission_status', 0)
                     ->where('invite_user_id', '!=', NULL)
-                    ->where('status', 3)
+                    ->whereNotIn('status', [0, 2])
+                    ->where('commission_balance', '>', 0)
                     ->count(),
+                'day_income' => Order::where('created_at', '>=', strtotime(date('Y-m-d')))
+                    ->where('created_at', '<', time())
+                    ->whereNotIn('status', [0, 2])
+                    ->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')))
+                    ->whereNotIn('status', [0, 2])
+                    ->sum('total_amount')
             ]
         ]);
     }
+
+    public function getOrder(Request $request)
+    {
+        $statistics = StatOrder::where('record_type', 'd')
+            ->limit(31)
+            ->orderBy('record_at', 'DESC')
+            ->get()
+            ->toArray();
+        $result = [];
+        foreach ($statistics as $statistic) {
+            $date = date('m-d', $statistic['record_at']);
+            array_push($result, [
+                'type' => '收款金额',
+                'date' => $date,
+                'value' => $statistic['order_amount'] / 100
+            ]);
+            array_push($result, [
+                'type' => '收款笔数',
+                'date' => $date,
+                'value' => $statistic['order_count']
+            ]);
+            array_push($result, [
+                'type' => '佣金金额',
+                'date' => $date,
+                'value' => $statistic['commission_amount'] / 100
+            ]);
+            array_push($result, [
+                'type' => '佣金笔数',
+                'date' => $date,
+                'value' => $statistic['commission_count']
+            ]);
+        }
+        $result = array_reverse($result);
+        return response([
+            'data' => $result
+        ]);
+    }
+
+    public function getServerLastRank()
+    {
+        $servers = [
+            'shadowsocks' => ServerShadowsocks::where('parent_id', null)->get()->toArray(),
+            'vmess' => Server::where('parent_id', null)->get()->toArray(),
+            'trojan' => ServerTrojan::where('parent_id', null)->get()->toArray()
+        ];
+        $timestamp = strtotime('-1 day', strtotime(date('Y-m-d')));
+        $statistics = StatServer::select([
+                'server_id',
+                'server_type',
+                'u',
+                'd',
+                DB::raw('(u+d) as total')
+            ])
+            ->where('record_at', '>=', $timestamp)
+            ->where('record_type', 'd')
+            ->limit(10)
+            ->orderBy('total', 'DESC')
+            ->get()
+            ->toArray();
+        foreach ($statistics as $k => $v) {
+            foreach ($servers[$v['server_type']] as $server) {
+                if ($server['id'] === $v['server_id']) {
+                    $statistics[$k]['server_name'] = $server['name'];
+                }
+            }
+            $statistics[$k]['total'] = $statistics[$k]['total'] / 1073741824;
+        }
+        array_multisort(array_column($statistics, 'total'), SORT_DESC, $statistics);
+        return response([
+            'data' => $statistics
+        ]);
+    }
 }
+

app/Http/Controllers/Admin/TicketController.php

@@ -2,10 +2,14 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Jobs\SendEmailJob;
+use App\Services\TicketService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Ticket;
+use App\Models\User;
 use App\Models\TicketMessage;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 
 class TicketController extends Controller
@@ -30,17 +34,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
         ]);
     }
 
@@ -52,26 +64,12 @@ class TicketController extends Controller
         if (empty($request->input('message'))) {
             abort(500, '消息不能为空');
         }
-        $ticket = Ticket::where('id', $request->input('id'))
-            ->first();
-        if (!$ticket) {
-            abort(500, '工单不存在');
-        }
-        if ($ticket->status) {
-            abort(500, '工单已关闭，无法回复');
-        }
-        DB::beginTransaction();
-        $ticketMessage = TicketMessage::create([
-            'user_id' => $request->session()->get('id'),
-            'ticket_id' => $ticket->id,
-            'message' => $request->input('message')
-        ]);
-        $ticket->last_reply_user_id = $request->session()->get('id');
-        if (!$ticketMessage || !$ticket->save()) {
-            DB::rollback();
-            abort(500, '工单回复失败');
-        }
-        DB::commit();
+        $ticketService = new TicketService();
+        $ticketService->replyByAdmin(
+            $request->input('id'),
+            $request->input('message'),
+            $request->session()->get('id')
+        );
         return response([
             'data' => true
         ]);

app/Http/Controllers/Admin/TutorialController.php

@@ -1,76 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin;
-
-use App\Http\Requests\Admin\TutorialSave;
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\Tutorial;
-
-class TutorialController extends Controller
-{
-    public function fetch(Request $request)
-    {
-        return response([
-            'data' => Tutorial::get()
-        ]);
-    }
-
-    public function save(TutorialSave $request)
-    {
-        $params = $request->only(array_keys(TutorialSave::RULES));
-
-        if (!$request->input('id')) {
-            if (!Tutorial::create($params)) {
-                abort(500, '创建失败');
-            }
-        } else {
-            try {
-                Tutorial::find($request->input('id'))->update($params);
-            } catch (\Exception $e) {
-                abort(500, '保存失败');
-            }
-        }
-
-        return response([
-            'data' => true
-        ]);
-    }
-
-    public function show(Request $request)
-    {
-        if (empty($request->input('id'))) {
-            abort(500, '参数有误');
-        }
-        $tutorial = Tutorial::find($request->input('id'));
-        if (!$tutorial) {
-            abort(500, '教程不存在');
-        }
-        $tutorial->show = $tutorial->show ? 0 : 1;
-        if (!$tutorial->save()) {
-            abort(500, '保存失败');
-        }
-
-        return response([
-            'data' => true
-        ]);
-    }
-
-    public function drop(Request $request)
-    {
-        if (empty($request->input('id'))) {
-            abort(500, '参数有误');
-        }
-        $tutorial = Tutorial::find($request->input('id'));
-        if (!$tutorial) {
-            abort(500, '教程不存在');
-        }
-        if (!$tutorial->delete()) {
-            abort(500, '删除失败');
-        }
-
-        return response([
-            'data' => true
-        ]);
-    }
-}

app/Http/Controllers/Admin/UserController.php

@@ -2,28 +2,62 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Http\Requests\Admin\UserFetch;
+use App\Http\Requests\Admin\UserGenerate;
+use App\Http\Requests\Admin\UserSendMail;
 use App\Http\Requests\Admin\UserUpdate;
+use App\Jobs\SendEmailJob;
+use App\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 UserController extends Controller
 {
-    public function fetch(Request $request)
+    public function resetSecret(Request $request)
+    {
+        $user = User::find($request->input('id'));
+        if (!$user) abort(500, '用户不存在');
+        $user->token = Helper::guid();
+        $user->uuid = Helper::guid(true);
+        return response([
+            'data' => $user->save()
+        ]);
+    }
+
+    private function filter(Request $request, $builder)
+    {
+        if ($request->input('filter')) {
+            foreach ($request->input('filter') as $filter) {
+                if ($filter['key'] === 'invite_by_email') {
+                    $user = User::where('email', $filter['value'])->first();
+                    if (!$user) continue;
+                    $builder->where('invite_user_id', $user->id);
+                    continue;
+                }
+                if ($filter['key'] === 'd' || $filter['key'] === 'transfer_enable') {
+                    $filter['value'] = $filter['value'] * 1073741824;
+                }
+                if ($filter['condition'] === '模糊') {
+                    $filter['condition'] = 'like';
+                    $filter['value'] = "%{$filter['value']}%";
+                }
+                $builder->where($filter['key'], $filter['condition'], $filter['value']);
+            }
+        }
+    }
+
+    public function fetch(UserFetch $request)
     {
         $current = $request->input('current') ? $request->input('current') : 1;
         $pageSize = $request->input('pageSize') >= 10 ? $request->input('pageSize') : 10;
         $sortType = in_array($request->input('sort_type'), ['ASC', 'DESC']) ? $request->input('sort_type') : 'DESC';
         $sort = $request->input('sort') ? $request->input('sort') : 'created_at';
         $userModel = User::orderBy($sort, $sortType);
-        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'));
-        }
+        $this->filter($request, $userModel);
         $total = $userModel->count();
         $res = $userModel->forPage($current, $pageSize)
             ->get();
@@ -34,6 +68,7 @@ class UserController extends Controller
                     $res[$i]['plan_name'] = $plan[$k]['name'];
                 }
             }
+            $res[$i]['subscribe_url'] = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $res[$i]['token'];
         }
         return response([
             'data' => $res,
@@ -47,19 +82,13 @@ class UserController extends Controller
             abort(500, '参数错误');
         }
         return response([
-            'data' => User::select([
-                'email',
-                'u',
-                'd',
-                'transfer_enable',
-                'expired_at'
-            ])->find($request->input('id'))
+            'data' => User::find($request->input('id'))
         ]);
     }
 
     public function update(UserUpdate $request)
     {
-        $params = $request->only(array_keys(UserUpdate::RULES));
+        $params = $request->validated();
         $user = User::find($request->input('id'));
         if (!$user) {
             abort(500, '用户不存在');
@@ -69,6 +98,7 @@ class UserController extends Controller
         }
         if (isset($params['password'])) {
             $params['password'] = password_hash($params['password'], PASSWORD_DEFAULT);
+            $params['password_algo'] = NULL;
         } else {
             unset($params['password']);
         }
@@ -89,4 +119,176 @@ class UserController extends Controller
             'data' => true
         ]);
     }
+
+    public function dumpCSV(Request $request)
+    {
+        $userModel = User::orderBy('id', 'asc');
+        $this->filter($request, $userModel);
+        $res = $userModel->get();
+        $plan = Plan::get();
+        for ($i = 0; $i < count($res); $i++) {
+            for ($k = 0; $k < count($plan); $k++) {
+                if ($plan[$k]['id'] == $res[$i]['plan_id']) {
+                    $res[$i]['plan_name'] = $plan[$k]['name'];
+                }
+            }
+        }
+
+        $data = "邮箱,余额,推广佣金,总流量,剩余流量,套餐到期时间,订阅计划,订阅地址\r\n";
+        $baseUrl = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL')));
+        foreach($res as $user) {
+            $expireDate = $user['expired_at'] === NULL ? '长期有效' : date('Y-m-d H:i:s', $user['expired_at']);
+            $balance = $user['balance'] / 100;
+            $commissionBalance = $user['commission_balance'] / 100;
+            $transferEnable = $user['transfer_enable'] ? $user['transfer_enable'] / 1073741824 : 0;
+            $notUseFlow = (($user['transfer_enable'] - ($user['u'] + $user['d'])) / 1073741824) ?? 0;
+            $planName = $user['plan_name'] ?? '无订阅';
+            $subscribeUrl = $baseUrl . '/api/v1/client/subscribe?token=' . $user['token'];
+            $data .= "{$user['email']},{$balance},{$commissionBalance},{$transferEnable},{$notUseFlow},{$expireDate},{$planName},{$subscribeUrl}\r\n";
+        }
+        echo "\xEF\xBB\xBF" . $data;
+    }
+
+    public function generate(UserGenerate $request)
+    {
+        if ($request->input('email_prefix')) {
+            if ($request->input('plan_id')) {
+                $plan = Plan::find($request->input('plan_id'));
+                if (!$plan) {
+                    abort(500, '订阅计划不存在');
+                }
+            }
+            $user = [
+                'email' => $request->input('email_prefix') . '@' . $request->input('email_suffix'),
+                'plan_id' => isset($plan->id) ? $plan->id : NULL,
+                'group_id' => isset($plan->group_id) ? $plan->group_id : NULL,
+                'transfer_enable' => isset($plan->transfer_enable) ? $plan->transfer_enable * 1073741824 : 0,
+                'expired_at' => $request->input('expired_at') ?? NULL,
+                'uuid' => Helper::guid(true),
+                'token' => Helper::guid()
+            ];
+            $user['password'] = password_hash($request->input('password') ?? $user['email'], PASSWORD_DEFAULT);
+            if (!User::create($user)) {
+                abort(500, '生成失败');
+            }
+            return response([
+                'data' => true
+            ]);
+        }
+        if ($request->input('generate_count')) {
+            $this->multiGenerate($request);
+        }
+    }
+
+    private function multiGenerate(Request $request)
+    {
+        if ($request->input('plan_id')) {
+            $plan = Plan::find($request->input('plan_id'));
+            if (!$plan) {
+                abort(500, '订阅计划不存在');
+            }
+        }
+        $users = [];
+        for ($i = 0;$i < $request->input('generate_count');$i++) {
+            $user = [
+                'email' => Helper::randomChar(6) . '@' . $request->input('email_suffix'),
+                'plan_id' => isset($plan->id) ? $plan->id : NULL,
+                'group_id' => isset($plan->group_id) ? $plan->group_id : NULL,
+                'transfer_enable' => isset($plan->transfer_enable) ? $plan->transfer_enable * 1073741824 : 0,
+                'expired_at' => $request->input('expired_at') ?? NULL,
+                'uuid' => Helper::guid(true),
+                'token' => Helper::guid(),
+                'created_at' => time(),
+                'updated_at' => time()
+            ];
+            $user['password'] = password_hash($request->input('password') ?? $user['email'], PASSWORD_DEFAULT);
+            array_push($users, $user);
+        }
+        DB::beginTransaction();
+        if (!User::insert($users)) {
+            DB::rollBack();
+            abort(500, '生成失败');
+        }
+        DB::commit();
+        $data = "账号,密码,过期时间,UUID,创建时间,订阅地址\r\n";
+        $baseUrl = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL')));
+        foreach($users as $user) {
+            $expireDate = $user['expired_at'] === NULL ? '长期有效' : date('Y-m-d H:i:s', $user['expired_at']);
+            $createDate = date('Y-m-d H:i:s', $user['created_at']);
+            $password = $request->input('password') ?? $user['email'];
+            $subscribeUrl = $baseUrl . '/api/v1/client/subscribe?token=' . $user['token'];
+            $data .= "{$user['email']},{$password},{$expireDate},{$user['uuid']},{$createDate},{$subscribeUrl}\r\n";
+        }
+        echo $data;
+    }
+
+    public function sendMail(UserSendMail $request)
+    {
+        $sortType = in_array($request->input('sort_type'), ['ASC', 'DESC']) ? $request->input('sort_type') : 'DESC';
+        $sort = $request->input('sort') ? $request->input('sort') : 'created_at';
+        $builder = User::orderBy($sort, $sortType);
+        $this->filter($request, $builder);
+        $users = $builder->get();
+        foreach ($users as $user) {
+            SendEmailJob::dispatch([
+                'email' => $user->email,
+                'subject' => $request->input('subject'),
+                'template_name' => 'notify',
+                'template_value' => [
+                    'name' => config('v2board.app_name', 'V2Board'),
+                    'url' => config('v2board.app_url'),
+                    'content' => $request->input('content')
+                ]
+            ]);
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function ban(Request $request)
+    {
+        $sortType = in_array($request->input('sort_type'), ['ASC', 'DESC']) ? $request->input('sort_type') : 'DESC';
+        $sort = $request->input('sort') ? $request->input('sort') : 'created_at';
+        $builder = User::orderBy($sort, $sortType);
+        $this->filter($request, $builder);
+        try {
+            $builder->update([
+                'banned' => 1
+            ]);
+        } catch (\Exception $e) {
+            abort(500, '处理失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function setInviteUser(Request $request)
+    {
+        $request->validate([
+            'user_id' => 'required|integer',
+            'invite_user' => 'required',
+        ], [
+            'user_id.required' => '用户ID不能为空',
+            'user_id.integer' => '用户ID参数有误',
+            'invite_user.required' => '邀请人不能为空'
+        ]);
+
+        $user = User::find($request->input('user_id'));
+        if (!$user) abort(500, '用户不存在');
+        if (strpos($request->input('invite_user'), '@') !== -1) {
+            $inviteUser = User::where('email', $request->input('invite_user'))->first();
+        } else {
+            $inviteUser = User::find($request->input('invite_user'));
+        }
+        if (!$inviteUser) abort(500, '邀请人不存在');
+        $user->invite_user_id = $inviteUser->id;
+
+        return response([
+            'data' => $user->save()
+        ]);
+    }
 }

app/Http/Controllers/Client/AppController.php

@@ -3,12 +3,12 @@
 namespace App\Http\Controllers\Client;
 
 use App\Http\Controllers\Controller;
+use App\Services\ServerService;
+use App\Services\UserService;
+use App\Utils\Clash;
 use Illuminate\Http\Request;
-use App\Models\User;
-use App\Models\Plan;
 use App\Models\Server;
-use App\Models\Notice;
-use App\Utils\Helper;
+use Symfony\Component\Yaml\Yaml;
 
 class AppController extends Controller
 {
@@ -16,37 +16,71 @@ class AppController extends Controller
     CONST SOCKS_PORT = 10010;
     CONST HTTP_PORT = 10011;
 
-    // TODO: 1.1.1 abolish
-    public function data(Request $request)
+    public function getConfig(Request $request)
     {
+        $servers = [];
         $user = $request->user;
-        $nodes = [];
-        if ($user->plan_id) {
-            $user['plan'] = Plan::find($user->plan_id);
-            if (!$user['plan']) {
-                abort(500, '订阅计划不存在');
+        $userService = new UserService();
+        if ($userService->isAvailable($user)) {
+            $serverService = new ServerService();
+            $servers = $serverService->getAvailableServers($user);
+        }
+        $config = Yaml::parseFile(base_path() . '/resources/rules/app.clash.yaml');
+        $proxy = [];
+        $proxies = [];
+
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                array_push($proxy, Clash::buildShadowsocks($user['uuid'], $item));
+                array_push($proxies, $item['name']);
             }
-            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($nodes, $item);
-                    }
-                }
+            if ($item['type'] === 'v2ray') {
+                array_push($proxy, Clash::buildVmess($user['uuid'], $item));
+                array_push($proxies, $item['name']);
             }
+            if ($item['type'] === 'trojan') {
+                array_push($proxy, Clash::buildTrojan($user['uuid'], $item));
+                array_push($proxies, $item['name']);
+            }
+        }
+
+        $config['proxies'] = array_merge($config['proxies'] ? $config['proxies'] : [], $proxy);
+        foreach ($config['proxy-groups'] as $k => $v) {
+            $config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
+        }
+        die(Yaml::dump($config));
+    }
+
+    public function getVersion(Request $request)
+    {
+        if (strpos($request->header('user-agent'), 'tidalab/4.0.0') !== false
+            || strpos($request->header('user-agent'), 'tunnelab/4.0.0') !== false
+        ) {
+            if (strpos($request->header('user-agent'), 'Win64') !== false) {
+                return response([
+                    'data' => [
+                        'version' => config('v2board.windows_version'),
+                        'download_url' => config('v2board.windows_download_url')
+                    ]
+                ]);
+            } else {
+                return response([
+                    'data' => [
+                        'version' => config('v2board.macos_version'),
+                        'download_url' => config('v2board.macos_download_url')
+                    ]
+                ]);
+            }
+            return;
         }
         return response([
             'data' => [
-                'nodes' => $nodes,
-                'u' => $user->u,
-                'd' => $user->d,
-                'transfer_enable' => $user->transfer_enable,
-                'expired_at' => $user->expired_at,
-                'plan' => isset($user['plan']) ? $user['plan'] : false,
-                'notice' => Notice::orderBy('created_at', 'DESC')->first()
+                'windows_version' => config('v2board.windows_version'),
+                'windows_download_url' => config('v2board.windows_download_url'),
+                'macos_version' => config('v2board.macos_version'),
+                'macos_download_url' => config('v2board.macos_download_url'),
+                'android_version' => config('v2board.android_version'),
+                'android_download_url' => config('v2board.android_download_url')
             ]
         ]);
     }
@@ -74,8 +108,8 @@ class AppController extends Controller
         //other
         $json->outbound->settings->vnext[0]->address = (string)$server->host;
         $json->outbound->settings->vnext[0]->port = (int)$server->port;
-        $json->outbound->settings->vnext[0]->users[0]->id = (string)$user->v2ray_uuid;
-        $json->outbound->settings->vnext[0]->users[0]->alterId = (int)$user->v2ray_alter_id;
+        $json->outbound->settings->vnext[0]->users[0]->id = (string)$user->uuid;
+        $json->outbound->settings->vnext[0]->users[0]->alterId = (int)$server->alter_id;
         $json->outbound->settings->vnext[0]->remark = (string)$server->name;
         $json->outbound->streamSettings->network = $server->network;
         if ($server->networkSettings) {

app/Http/Controllers/Client/ClientController.php

@@ -3,6 +3,13 @@
 namespace App\Http\Controllers\Client;
 
 use App\Http\Controllers\Controller;
+use App\Services\ServerService;
+use App\Utils\Clash;
+use App\Utils\QuantumultX;
+use App\Utils\Shadowrocket;
+use App\Utils\Surge;
+use App\Utils\Surfboard;
+use App\Utils\URLSchemes;
 use Illuminate\Http\Request;
 use App\Models\Server;
 use App\Utils\Helper;
@@ -13,216 +20,263 @@ class ClientController extends Controller
 {
     public function subscribe(Request $request)
     {
+        $flag = $request->input('flag')
+            ?? (isset($_SERVER['HTTP_USER_AGENT'])
+                ? $_SERVER['HTTP_USER_AGENT']
+                : '');
+        $flag = strtolower($flag);
         $user = $request->user;
-        $server = [];
         // account not expired and is not banned.
         $userService = new UserService();
         if ($userService->isAvailable($user)) {
-            $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);
+            $serverService = new ServerService();
+            $servers = $serverService->getAvailableServers($user);
+            if ($flag) {
+                if (strpos($flag, 'quantumult%20x') !== false) {
+                    die($this->quantumultX($user, $servers));
+                }
+                if (strpos($flag, 'quantumult') !== false) {
+                    die($this->quantumult($user, $servers));
+                }
+                if (strpos($flag, 'clash') !== false) {
+                    die($this->clash($user, $servers));
+                }
+                if (strpos($flag, 'surfboard') !== false) {
+                    die($this->surfboard($user, $servers));
+                }
+                if (strpos($flag, 'surge') !== false) {
+                    die($this->surge($user, $servers));
+                }
+                if (strpos($flag, 'shadowrocket') !== false) {
+                    die($this->shadowrocket($user, $servers));
+                }
+                if (strpos($flag, 'shadowsocks') !== false) {
+                    die($this->shaodowsocksSIP008($user, $servers));
                 }
             }
+            die($this->origin($user, $servers));
         }
-        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->surge($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)
+    // TODO: Ready to stop support
+    private function quantumult($user, $servers = [])
     {
         $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=' . ($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;
+        header('subscription-userinfo: upload=' . $user['u'] . '; download=' . $user['d'] . ';total=' . $user['transfer_enable']);
+        foreach ($servers as $item) {
+            if ($item['type'] === 'v2ray') {
+                $str = '';
+                $str .= $item['name'] . '= vmess, ' . $item['host'] . ', ' . $item['port'] . ', chacha20-ietf-poly1305, "' . $user['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'], true);
+                        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";
             }
-            $uri .= "\r\n";
         }
         return base64_encode($uri);
     }
 
-    private function quantumult($user, $server)
+    private function shadowrocket($user, $servers = [])
     {
         $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 . '"';
-                }
+        //display remaining traffic and expire date
+        $upload = round($user['u'] / (1024*1024*1024), 2);
+        $download = round($user['d'] / (1024*1024*1024), 2);
+        $totalTraffic = round($user['transfer_enable'] / (1024*1024*1024), 2);
+        $expiredDate = date('Y-m-d', $user['expired_at']);
+        $uri .= "STATUS=🚀↑:{$upload}GB,↓:{$download}GB,TOT:{$totalTraffic}GB💡Expires:{$expiredDate}\r\n";
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                $uri .= Shadowrocket::buildShadowsocks($user['uuid'], $item);
+            }
+            if ($item['type'] === 'v2ray') {
+                $uri .= Shadowrocket::buildVmess($user['uuid'], $item);
+            }
+            if ($item['type'] === 'trojan') {
+                $uri .= Shadowrocket::buildTrojan($user['uuid'], $item);
             }
-            $uri .= "vmess://" . base64_encode($str) . "\r\n";
         }
         return base64_encode($uri);
     }
 
-    private function origin($user, $server)
+    private function quantumultX($user, $servers = [])
     {
         $uri = '';
-        foreach ($server as $item) {
-            $uri .= Helper::buildVmessLink($item, $user);
+        header("subscription-userinfo: upload={$user['u']}; download={$user['d']}; total={$user['transfer_enable']}; expire={$user['expired_at']}");
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                $uri .= QuantumultX::buildShadowsocks($user['uuid'], $item);
+            }
+            if ($item['type'] === 'v2ray') {
+                $uri .= QuantumultX::buildVmess($user['uuid'], $item);
+            }
+            if ($item['type'] === 'trojan') {
+                $uri .= QuantumultX::buildTrojan($user['uuid'], $item);
+            }
         }
         return base64_encode($uri);
     }
 
-    private function surge($user, $server)
+    private function origin($user, $servers = [])
+    {
+        $uri = '';
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                $uri .= URLSchemes::buildShadowsocks($item, $user);
+            }
+            if ($item['type'] === 'v2ray') {
+                $uri .= URLSchemes::buildVmess($item, $user);
+            }
+            if ($item['type'] === 'trojan') {
+                $uri .= URLSchemes::buildTrojan($item, $user);
+            }
+        }
+        return base64_encode($uri);
+    }
+
+    private function shaodowsocksSIP008($user, $servers = [])
+    {
+        $configs = [];
+        $subs = [];
+        $subs['servers'] = [];
+        $subs['bytes_used'] = '';
+        $subs['bytes_remaining'] = '';
+
+        $bytesUsed = $user['u'] + $user['d'];
+        $bytesRemaining = $user['transfer_enable'] - $bytesUsed;
+
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                array_push($configs, URLSchemes::buildShadowsocksSIP008($item, $user));
+            }
+        }
+
+        $subs['version'] = 1;
+        $subs['bytes_used'] = $bytesUsed;
+        $subs['bytes_remaining'] = $bytesRemaining;
+        $subs['servers'] = array_merge($subs['servers'] ? $subs['servers'] : [], $configs);
+
+        return json_encode($subs, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
+    }
+
+    private function surge($user, $servers = [])
     {
         $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=true';
-                }
+
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                // [Proxy]
+                $proxies .= Surge::buildShadowsocks($user['uuid'], $item);
+                // [Proxy Group]
+                $proxyGroup .= $item['name'] . ', ';
             }
-            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;
-                }
+            if ($item['type'] === 'v2ray') {
+                // [Proxy]
+                $proxies .= Surge::buildVmess($user['uuid'], $item);
+                // [Proxy Group]
+                $proxyGroup .= $item['name'] . ', ';
+            }
+            if ($item['type'] === 'trojan') {
+                // [Proxy]
+                $proxies .= Surge::buildTrojan($user['uuid'], $item);
+                // [Proxy Group]
+                $proxyGroup .= $item['name'] . ', ';
             }
-            $proxies .= "\r\n";
-            // [Proxy Group]
-            $proxyGroup .= $item->name . ', ';
         }
 
-        try {
-            $rules = '';
-            foreach (glob(base_path() . '/resources/rules/' . '*.surge.conf') as $file) {
-                $rules = file_get_contents("$file");
-            }
-        } catch (\Exception $e) {}
+        $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'];
-        }
+        $subsURL = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user['token'];
 
-        $rules = str_replace('{subs_link}',$subsURL,$rules);
-        $rules = str_replace('{proxies}',$proxies,$rules);
-        $rules = str_replace('{proxy_group}',rtrim($proxyGroup, ', '),$rules);
-        return $rules;
+        $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)
+    private function surfboard($user, $servers = [])
     {
-        $proxy = [];
-        $proxyGroup = [];
-        $proxies = [];
-        $rules = [];
-        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;
-                $array['skip-cert-verify'] = true;
+        $proxies = '';
+        $proxyGroup = '';
+
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                // [Proxy]
+                $proxies .= Surfboard::buildShadowsocks($user['uuid'], $item);
+                // [Proxy Group]
+                $proxyGroup .= $item['name'] . ', ';
             }
-            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
-                    ];
-                }
+            if ($item['type'] === 'v2ray') {
+                // [Proxy]
+                $proxies .= Surfboard::buildVmess($user['uuid'], $item);
+                // [Proxy Group]
+                $proxyGroup .= $item['name'] . ', ';
             }
-            array_push($proxy, $array);
-            array_push($proxies, $item->name);
         }
 
-        array_push($proxyGroup, [
-            'name' => 'auto',
-            'type' => 'url-test',
-            'proxies' => $proxies,
-            'url' => 'https://www.bing.com',
-            'interval' => 300
-        ]);
-        array_push($proxyGroup, [
-            'name' => 'fallback-auto',
-            'type' => 'fallback',
-            'proxies' => $proxies,
-            'url' => 'https://www.bing.com',
-            'interval' => 300
-        ]);
-        array_push($proxyGroup, [
-            'name' => 'select',
-            'type' => 'select',
-            'proxies' => array_merge($proxies, [
-                'auto',
-                'fallback-auto'
-            ])
-        ]);
+        $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");
+        }
 
-        try {
-            $rules = [];
-            foreach (glob(base_path() . '/resources/rules/' . '*.clash.yaml') as $file) {
-                $rules = array_merge($rules, Yaml::parseFile($file)['Rule']);
+        // Subscription link
+        $subsURL = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user['token'];
+
+        $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, $servers = [])
+    {
+        $defaultConfig = base_path() . '/resources/rules/default.clash.yaml';
+        $customConfig = base_path() . '/resources/rules/custom.clash.yaml';
+        if (\File::exists($customConfig)) {
+            $config = Yaml::parseFile($customConfig);
+        } else {
+            $config = Yaml::parseFile($defaultConfig);
+        }
+        $proxy = [];
+        $proxies = [];
+
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                array_push($proxy, Clash::buildShadowsocks($user['uuid'], $item));
+                array_push($proxies, $item['name']);
             }
-        } catch (\Exception $e) {}
+            if ($item['type'] === 'v2ray') {
+                array_push($proxy, Clash::buildVmess($user['uuid'], $item));
+                array_push($proxies, $item['name']);
+            }
+            if ($item['type'] === 'trojan') {
+                array_push($proxy, Clash::buildTrojan($user['uuid'], $item));
+                array_push($proxies, $item['name']);
+            }
+        }
 
-        $config = [
-            'port' => 7890,
-            'socks-port' => 7891,
-            'allow-lan' => false,
-            'mode' => 'Rule',
-            'log-level' => 'info',
-            'external-controller' => '0.0.0.0:9090',
-            'secret' => '',
-            'Proxy' => $proxy,
-            'Proxy Group' => $proxyGroup,
-            'Rule' => $rules
-        ];
-
-        return Yaml::dump($config);
+        $config['proxies'] = array_merge($config['proxies'] ? $config['proxies'] : [], $proxy);
+        foreach ($config['proxy-groups'] as $k => $v) {
+            if (!is_array($config['proxy-groups'][$k]['proxies'])) continue;
+            $config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
+        }
+        $yaml = Yaml::dump($config);
+        $yaml = str_replace('$app_name', config('v2board.app_name', 'V2Board'), $yaml);
+        return $yaml;
     }
 }

app/Http/Controllers/Guest/CommController.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Controllers\Guest;
+
+use App\Utils\Dict;
+use App\Http\Controllers\Controller;
+
+class CommController extends Controller
+{
+    public function config()
+    {
+        return response([
+            'data' => [
+                'tos_url' => config('v2board.tos_url')
+            ]
+        ]);
+    }
+}

app/Http/Controllers/Guest/OrderController.php

@@ -1,153 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Guest;
-
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\Order;
-use Omnipay\Omnipay;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Cache;
-use Library\BitpayX;
-use Library\PayTaro;
-
-class OrderController extends Controller
-{
-    public function alipayNotify(Request $request)
-    {
-        // Log::info('alipayNotifyData: ' . json_encode($_POST));
-        $gateway = Omnipay::create('Alipay_AopF2F');
-        $gateway->setSignType('RSA2'); //RSA/RSA2
-        $gateway->setAppId(config('v2board.alipay_appid'));
-        $gateway->setPrivateKey(config('v2board.alipay_privkey')); // 可以是路径，也可以是密钥内容
-        $gateway->setAlipayPublicKey(config('v2board.alipay_pubkey')); // 可以是路径，也可以是密钥内容
-        $request = $gateway->completePurchase();
-        $request->setParams($_POST); //Optional
-        try {
-            /** @var \Omnipay\Alipay\Responses\AopCompletePurchaseResponse $response */
-            $response = $request->send();
-
-            if ($response->isPaid()) {
-                /**
-                 * Payment is successful
-                 */
-                if (!$this->handle($_POST['out_trade_no'], $_POST['trade_no'])) {
-                    abort(500, 'fail');
-                }
-
-                die('success'); //The response should be 'success' only
-            } else {
-                /**
-                 * Payment is not successful
-                 */
-                die('fail');
-            }
-        } catch (Exception $e) {
-            /**
-             * Payment is not successful
-             */
-            die('fail');
-        }
-    }
-
-    public function stripeNotify(Request $request)
-    {
-        // Log::info('stripeNotifyData: ' . json_encode($request->input()));
-
-        \Stripe\Stripe::setApiKey(config('v2board.stripe_sk_live'));
-        try {
-            $event = \Stripe\Webhook::constructEvent(
-                file_get_contents('php://input'),
-                $_SERVER['HTTP_STRIPE_SIGNATURE'],
-                config('v2board.stripe_webhook_key')
-            );
-        } catch (\Stripe\Error\SignatureVerification $e) {
-            abort(400);
-        }
-        switch ($event->type) {
-            case 'source.chargeable':
-                $source = $event->data->object;
-                $charge = \Stripe\Charge::create([
-                    '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']);
-                    if (!$trade_no) {
-                        abort(500, 'redis is not found trade no by stripe source id');
-                    }
-                    if (!$this->handle($trade_no, $source['id'])) {
-                        abort(500, 'fail');
-                    }
-                    Cache::forget($source['id']);
-                    die('success');
-                }
-                break;
-            default:
-                abort(500, 'event is not support');
-        }
-    }
-
-    public function bitpayXNotify(Request $request)
-    {
-        $inputString = file_get_contents('php://input', 'r');
-        // Log::info('bitpayXNotifyData: ' . $inputString);
-        $inputStripped = str_replace(array("\r", "\n", "\t", "\v"), '', $inputString);
-        $inputJSON = json_decode($inputStripped, true); //convert JSON into array
-
-        $bitpayX = new BitpayX(config('v2board.bitpayx_appsecret'));
-        $params = [
-            'status' => $inputJSON['status'],
-            'order_id' => $inputJSON['order_id'],
-            'merchant_order_id' => $inputJSON['merchant_order_id'],
-            'price_amount' => $inputJSON['price_amount'],
-            'price_currency' => $inputJSON['price_currency'],
-            'pay_amount' => $inputJSON['pay_amount'],
-            'pay_currency' => $inputJSON['pay_currency'],
-            'created_at_t' => $inputJSON['created_at_t']
-        ];
-        $strToSign = $bitpayX->prepareSignId($inputJSON['merchant_order_id']);
-        if (!$bitpayX->verify($strToSign, $inputJSON['token'])) {
-            abort(500, 'sign error');
-        }
-        if ($params['status'] !== 'PAID') {
-            abort(500, 'order is not paid');
-        }
-        if (!$this->handle($params['merchant_order_id'], $params['order_id'])) {
-            abort(500, 'order process fail');
-        }
-        die(json_encode([
-            'status' => 200
-        ]));
-    }
-
-    public function payTaroNotify(Request $request)
-    {
-        // 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())) {
-            abort(500, 'fail');
-        }
-        if (!$this->handle($request->input('out_trade_no'), $request->input('trade_no'))) {
-            abort(500, 'fail');
-        }
-        die('success');
-    }
-
-    private function handle($tradeNo, $callbackNo)
-    {
-        $order = Order::where('trade_no', $tradeNo)->first();
-        if (!$order) {
-            abort(500, 'order is not found');
-        }
-        if ($order->status !== 0) {
-            return true;
-        }
-        $order->status = 1;
-        $order->callback_no = $callbackNo;
-        return $order->save();
-    }
-}

app/Http/Controllers/Guest/PaymentController.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Http\Controllers\Guest;
+
+use App\Models\Order;
+use App\Services\OrderService;
+use App\Services\PaymentService;
+use App\Services\TelegramService;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+class PaymentController extends Controller
+{
+    public function notify($method, $uuid, Request $request)
+    {
+        try {
+            $paymentService = new PaymentService($method, null, $uuid);
+            $verify = $paymentService->notify($request->input());
+            if (!$verify) abort(500, 'verify error');
+            if (!$this->handle($verify['trade_no'], $verify['callback_no'])) {
+                abort(500, 'handle error');
+            }
+            die('success');
+        } catch (\Exception $e) {
+            abort(500, 'fail');
+        }
+    }
+
+    private function handle($tradeNo, $callbackNo)
+    {
+        $order = Order::where('trade_no', $tradeNo)->first();
+        if (!$order) {
+            abort(500, 'order is not found');
+        }
+        if ($order->status === 1) return true;
+        $orderService = new OrderService($order);
+        if (!$orderService->success($callbackNo)) {
+            return false;
+        }
+        $telegramService = new TelegramService();
+        $message = sprintf(
+            "💰成功收款%s元\n———————————————\n订单号：%s",
+            $order->total_amount / 100,
+            $order->trade_no
+        );
+        $telegramService->sendMessageWithAdmin($message);
+        return true;
+    }
+}

app/Http/Controllers/Guest/TelegramController.php

@@ -0,0 +1,199 @@
+<?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;
+use App\Services\TicketService;
+
+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->message_type) {
+                case 'send':
+                    $this->fromSend();
+                    break;
+                case 'reply':
+                    $this->fromReply();
+                    break;
+            }
+        } catch (\Exception $e) {
+            $telegramService = new TelegramService();
+            $telegramService->sendMessage($this->msg->chat_id, $e->getMessage());
+        }
+    }
+
+    private function fromSend()
+    {
+        switch($this->msg->command) {
+            case '/bind': $this->bind();
+                break;
+            case '/traffic': $this->traffic();
+                break;
+            case '/getlatesturl': $this->getLatestUrl();
+                break;
+            case '/unbind': $this->unbind();
+                break;
+            default: $this->help();
+        }
+    }
+
+    private function fromReply()
+    {
+        // ticket
+        if (preg_match("/[#](.*)/", $this->msg->reply_text, $match)) {
+            $this->replayTicket($match[1]);
+        }
+    }
+
+    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'];
+        $obj->message_type = !isset($data['message']['reply_to_message']['text']) ? 'send' : 'reply';
+        $obj->text = $data['message']['text'];
+        if ($obj->message_type === 'reply') {
+            $obj->reply_text = $data['message']['reply_to_message']['text'];
+        }
+        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, '用户不存在');
+        }
+        if ($user->telegram_id) {
+            abort(500, '该账号已经绑定了Telegram账号');
+        }
+        $user->telegram_id = $msg->chat_id;
+        if (!$user->save()) {
+            abort(500, '设置失败');
+        }
+        $telegramService = new TelegramService();
+        $telegramService->sendMessage($msg->chat_id, '绑定成功');
+    }
+
+    private function unbind()
+    {
+        $msg = $this->msg;
+        if (!$msg->is_private) return;
+        $user = User::where('telegram_id', $msg->chat_id)->first();
+        $telegramService = new TelegramService();
+        if (!$user) {
+            $this->help();
+            $telegramService->sendMessage($msg->chat_id, '没有查询到您的用户信息，请先绑定账号', 'markdown');
+            return;
+        }
+        $user->telegram_id = NULL;
+        if (!$user->save()) {
+            abort(500, '解绑失败');
+        }
+        $telegramService->sendMessage($msg->chat_id, '解绑成功', 'markdown');
+    }
+
+    private function help()
+    {
+        $msg = $this->msg;
+        if (!$msg->is_private) return;
+        $telegramService = new TelegramService();
+        $commands = [
+            '/bind 订阅地址 - 绑定你的' . config('v2board.app_name', 'V2Board') . '账号',
+            '/traffic - 查询流量信息',
+            '/getlatesturl - 获取最新的' . config('v2board.app_name', 'V2Board') . '网址',
+            '/unbind - 解除绑定'
+        ];
+        $text = implode(PHP_EOL, $commands);
+        $telegramService->sendMessage($msg->chat_id, "你可以使用以下命令进行操作：\n\n$text", 'markdown');
+    }
+
+    private function traffic()
+    {
+        $msg = $this->msg;
+        if (!$msg->is_private) return;
+        $user = User::where('telegram_id', $msg->chat_id)->first();
+        $telegramService = new TelegramService();
+        if (!$user) {
+            $this->help();
+            $telegramService->sendMessage($msg->chat_id, '没有查询到您的用户信息，请先绑定账号', 'markdown');
+            return;
+        }
+        $transferEnable = Helper::trafficConvert($user->transfer_enable);
+        $up = Helper::trafficConvert($user->u);
+        $down = Helper::trafficConvert($user->d);
+        $remaining = Helper::trafficConvert($user->transfer_enable - ($user->u + $user->d));
+        $text = "🚥流量查询\n———————————————\n计划流量：`{$transferEnable}`\n已用上行：`{$up}`\n已用下行：`{$down}`\n剩余流量：`{$remaining}`";
+        $telegramService->sendMessage($msg->chat_id, $text, 'markdown');
+    }
+
+    private function getLatestUrl()
+    {
+        $msg = $this->msg;
+        $user = User::where('telegram_id', $msg->chat_id)->first();
+        $telegramService = new TelegramService();
+        $text = sprintf(
+            "%s的最新网址是：%s",
+            config('v2board.app_name', 'V2Board'),
+            config('v2board.app_url')
+        );
+        $telegramService->sendMessage($msg->chat_id, $text, 'markdown');
+    }
+
+    private function replayTicket($ticketId)
+    {
+        $msg = $this->msg;
+        if (!$msg->is_private) return;
+        $user = User::where('telegram_id', $msg->chat_id)->first();
+        if (!$user) {
+            abort(500, '用户不存在');
+        }
+        $ticketService = new TicketService();
+        if ($user->is_admin || $user->is_staff) {
+            $ticketService->replyByAdmin(
+                $ticketId,
+                $msg->text,
+                $user->id
+            );
+        }
+        $telegramService = new TelegramService();
+        $telegramService->sendMessage($msg->chat_id, "#`{$ticketId}` 的工单已回复成功", 'markdown');
+    }
+
+
+}

app/Http/Controllers/Passport/AuthController.php

@@ -14,11 +14,19 @@ use App\Models\InviteCode;
 use App\Utils\Helper;
 use App\Utils\Dict;
 use App\Utils\CacheKey;
+use ReCaptcha\ReCaptcha;
 
 class AuthController extends Controller
 {
     public function register(AuthRegister $request)
     {
+        if ((int)config('v2board.recaptcha_enable', 0)) {
+            $recaptcha = new ReCaptcha(config('v2board.recaptcha_key'));
+            $recaptchaResp = $recaptcha->verify($request->input('recaptcha_data'));
+            if (!$recaptchaResp->isSuccess()) {
+                abort(500, '验证码有误');
+            }
+        }
         if ((int)config('v2board.email_whitelist_enable', 0)) {
             if (!Helper::emailSuffixVerify(
                 $request->input('email'),
@@ -27,6 +35,12 @@ class AuthController extends Controller
                 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, '本站已关闭注册');
         }
@@ -52,7 +66,7 @@ class AuthController extends Controller
         $user = new User();
         $user->email = $email;
         $user->password = password_hash($password, PASSWORD_DEFAULT);
-        $user->v2ray_uuid = Helper::guid(true);
+        $user->uuid = Helper::guid(true);
         $user->token = Helper::guid();
         if ($request->input('invite_code')) {
             $inviteCode = InviteCode::where('code', $request->input('invite_code'))
@@ -117,7 +131,8 @@ class AuthController extends Controller
         }
 
         $data = [
-            'token' => $user->token
+            'token' => $user->token,
+            'auth_data' => base64_encode("{$user->email}:{$user->password}")
         ];
         $request->session()->put('email', $user->email);
         $request->session()->put('id', $user->id);
@@ -125,6 +140,10 @@ class AuthController extends Controller
             $request->session()->put('is_admin', true);
             $data['is_admin'] = true;
         }
+        if ($user->is_staff) {
+            $request->session()->put('is_staff', true);
+            $data['is_staff'] = true;
+        }
         return response([
             'data' => $data
         ]);
@@ -133,24 +152,17 @@ class AuthController extends Controller
     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');
+            $redirect = '/#/login?verify=' . $request->input('token') . '&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);
+            return redirect()->to($location)->send();
         }
 
         if ($request->input('verify')) {
-            $key = 'token2Login_' . $request->input('verify');
+            $key =  CacheKey::get('TEMP_TOKEN', $request->input('verify'));
             $userId = Cache::get($key);
             if (!$userId) {
                 abort(500, '令牌有误');
@@ -174,6 +186,45 @@ class AuthController extends Controller
         }
     }
 
+    public function getTempToken(Request $request)
+    {
+        $user = User::where('token', $request->input('token'))->first();
+        if (!$user) {
+            abort(500, '令牌有误');
+        }
+
+        $code = Helper::guid();
+        $key = CacheKey::get('TEMP_TOKEN', $code);
+        Cache::put($key, $user->id, 60);
+        return response([
+            'data' => $code
+        ]);
+    }
+
+    public function getQuickLoginUrl(Request $request)
+    {
+        $authData = explode(':', base64_decode($request->input('auth_data')));
+        $user = User::where('email', $authData[0])
+            ->where('password', $authData[1])
+            ->first();
+        if (!$user) {
+            abort(500, '令牌有误');
+        }
+
+        $code = Helper::guid();
+        $key = CacheKey::get('TEMP_TOKEN', $code);
+        Cache::put($key, $user->id, 60);
+        $redirect = '/#/login?verify=' . $code . '&redirect=' . ($request->input('redirect') ? $request->input('redirect') : 'dashboard');
+        if (config('v2board.app_url')) {
+            $url = config('v2board.app_url') . $redirect;
+        } else {
+            $url = url($redirect);
+        }
+        return response([
+            'data' => $url
+        ]);
+    }
+
     public function check(Request $request)
     {
         $data = [

app/Http/Controllers/Passport/CommController.php

@@ -13,6 +13,7 @@ use App\Jobs\SendEmailJob;
 use App\Models\InviteCode;
 use App\Utils\Dict;
 use App\Utils\CacheKey;
+use ReCaptcha\ReCaptcha;
 
 class CommController extends Controller
 {
@@ -24,7 +25,11 @@ class CommController extends Controller
                 'isInviteForce' => (int)config('v2board.invite_force', 0) ? 1 : 0,
                 'emailWhitelistSuffix' => (int)config('v2board.email_whitelist_enable', 0)
                     ? $this->getEmailSuffix()
-                    : 0
+                    : 0,
+                'isRecaptcha' => (int)config('v2board.recaptcha_enable', 0) ? 1 : 0,
+                'recaptchaSiteKey' => config('v2board.recaptcha_site_key'),
+                'appDescription' => config('v2board.app_description'),
+                'appUrl' => config('v2board.app_url')
             ]
         ]);
     }
@@ -38,6 +43,13 @@ class CommController extends Controller
 
     public function sendEmailVerify(CommSendEmailVerify $request)
     {
+        if ((int)config('v2board.recaptcha_enable', 0)) {
+            $recaptcha = new ReCaptcha(config('v2board.recaptcha_key'));
+            $recaptchaResp = $recaptcha->verify($request->input('recaptcha_data'));
+            if (!$recaptchaResp->isSuccess()) {
+                abort(500, '验证码有误');
+            }
+        }
         $email = $request->input('email');
         if (Cache::get(CacheKey::get('LAST_SEND_EMAIL_VERIFY_TIMESTAMP', $email))) {
             abort(500, '验证码已发送，请过一会再请求');

app/Http/Controllers/Server/DeepbworkController.php

@@ -3,18 +3,23 @@
 namespace App\Http\Controllers\Server;
 
 use App\Services\ServerService;
+use App\Services\UserService;
+use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\User;
 use App\Models\Server;
 use App\Models\ServerLog;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Cache;
 
+/*
+ * V2ray Aurora
+ * Github: https://github.com/tokumeikoi/aurora
+ */
 class DeepbworkController 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 function __construct(Request $request)
     {
         $token = $request->input('token');
@@ -34,20 +39,19 @@ class DeepbworkController extends Controller
         if (!$server) {
             abort(500, 'fail');
         }
-        Cache::put('server_last_check_at_' . $server->id, time());
+        Cache::put(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $server->id), time(), 3600);
         $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,
+                "uuid" => $user->uuid,
+                "email" => sprintf("%s@v2board.user", $user->uuid),
+                "alter_id" => $server->alter_id,
+                "level" => 0,
             ];
-            unset($user['v2ray_uuid']);
-            unset($user['v2ray_alter_id']);
-            unset($user['v2ray_level']);
+            unset($user['uuid']);
+            unset($user['email']);
             array_push($result, $user);
         }
         return response([
@@ -59,33 +63,36 @@ 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);
-        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();
-
-            $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();
+        Cache::put(CacheKey::get('SERVER_V2RAY_ONLINE_USER', $server->id), count($data), 3600);
+        Cache::put(CacheKey::get('SERVER_V2RAY_LAST_PUSH_AT', $server->id), time(), 3600);
+        $userService = new UserService();
+        DB::beginTransaction();
+        try {
+            foreach ($data as $item) {
+                $u = $item['u'] * $server->rate;
+                $d = $item['d'] * $server->rate;
+                if (!$userService->trafficFetch($u, $d, $item['user_id'], $server, 'vmess')) {
+                    continue;
+                }
+            }
+        } catch (\Exception $e) {
+            DB::rollBack();
+            return response([
+                'ret' => 0,
+                'msg' => 'user fetch fail'
+            ]);
         }
+        DB::commit();
 
         return response([
             'ret' => 1,
@@ -103,7 +110,7 @@ class DeepbworkController extends Controller
         }
         $serverService = new ServerService();
         try {
-            $json = $serverService->getConfig($nodeId, $localPort);
+            $json = $serverService->getV2RayConfig($nodeId, $localPort);
         } catch (\Exception $e) {
             abort(500, $e->getMessage());
         }

app/Http/Controllers/Server/PoseidonController.php

@@ -3,6 +3,8 @@
 namespace App\Http\Controllers\Server;
 
 use App\Services\ServerService;
+use App\Services\UserService;
+use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\User;
@@ -12,9 +14,18 @@ use App\Models\ServerLog;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Cache;
 
+/*
+ * V2ray Poseidon
+ * Github: https://github.com/ColetteContreras/trojan-poseidon
+ */
 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)
@@ -26,20 +37,19 @@ class PoseidonController extends Controller
         if (!$server) {
             return $this->error("server could not be found", 404);
         }
-        Cache::put('server_last_check_at_' . $server->id, time());
+        Cache::put(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $server->id), time(), 3600);
         $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,
+                "uuid" => $user->uuid,
+                "email" => sprintf("%s@v2board.user", $user->uuid),
+                "alter_id" => $server->alter_id,
+                "level" => 0,
             ];
-            unset($user['v2ray_uuid']);
-            unset($user['v2ray_alter_id']);
-            unset($user['v2ray_level']);
+            unset($user['uuid']);
+            unset($user['email']);
             array_push($result, $user);
         }
 
@@ -50,30 +60,21 @@ class PoseidonController extends Controller
     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);
+        Cache::put(CacheKey::get('SERVER_V2RAY_ONLINE_USER', $server->id), count($data), 3600);
+        Cache::put(CacheKey::get('SERVER_V2RAY_LAST_PUSH_AT', $server->id), time(), 3600);
+        $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();
-
-            $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();
+            if (!$userService->trafficFetch($u, $d, $item['user_id'], $server, 'vmess')) {
+                return $this->error("user fetch fail", 500);
+            }
         }
 
         return $this->success('');
@@ -92,10 +93,24 @@ class PoseidonController extends Controller
 
         $serverService = new ServerService();
         try {
-            $json = $serverService->getConfig($nodeId, $localPort);
+            $json = $serverService->getV2RayConfig($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) {
@@ -121,9 +136,23 @@ class PoseidonController extends Controller
     }
 
     protected function success($data) {
+         $req = request();
+        // Only for "GET" method
+        if (!$req->isMethod('GET') || !$data) {
+            return response([
+                'msg' => 'ok',
+                'data' => $data,
+            ]);
+        }
+
+        $etag = sha1(json_encode($data));
+        if ($etag == $req->header("IF-NONE-MATCH")) {
+            return response(null, 304);
+        }
+
         return response([
             'msg' => 'ok',
             'data' => $data,
-        ]);
+        ])->header('ETAG', $etag);
     }
 }

app/Http/Controllers/Server/ShadowsocksTidalabController.php

@@ -0,0 +1,98 @@
+<?php
+
+namespace App\Http\Controllers\Server;
+
+use App\Models\ServerShadowsocks;
+use App\Services\ServerService;
+use App\Services\UserService;
+use App\Utils\CacheKey;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\User;
+use App\Models\ServerLog;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Cache;
+
+/*
+ * Tidal Lab Shadowsocks
+ * Github: https://github.com/tokumeikoi/tidalab-ss
+ */
+class ShadowsocksTidalabController extends Controller
+{
+    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)
+    {
+        $nodeId = $request->input('node_id');
+        $server = ServerShadowsocks::find($nodeId);
+        if (!$server) {
+            abort(500, 'fail');
+        }
+        Cache::put(CacheKey::get('SERVER_SHADOWSOCKS_LAST_CHECK_AT', $server->id), time(), 3600);
+        $serverService = new ServerService();
+        $users = $serverService->getAvailableUsers(json_decode($server->group_id));
+        $result = [];
+        foreach ($users as $user) {
+            array_push($result, [
+                'id' => $user->id,
+                'port' => $server->server_port,
+                'cipher' => $server->cipher,
+                'secret' => $user->uuid
+            ]);
+        }
+        return response([
+            'data' => $result
+        ]);
+    }
+
+    // 后端提交数据
+    public function submit(Request $request)
+    {
+//         Log::info('serverSubmitData:' . $request->input('node_id') . ':' . file_get_contents('php://input'));
+        $server = ServerShadowsocks::find($request->input('node_id'));
+        if (!$server) {
+            return response([
+                'ret' => 0,
+                'msg' => 'server is not found'
+            ]);
+        }
+        $data = file_get_contents('php://input');
+        $data = json_decode($data, true);
+        Cache::put(CacheKey::get('SERVER_SHADOWSOCKS_ONLINE_USER', $server->id), count($data), 3600);
+        Cache::put(CacheKey::get('SERVER_SHADOWSOCKS_LAST_PUSH_AT', $server->id), time(), 3600);
+        $userService = new UserService();
+        DB::beginTransaction();
+        try {
+            foreach ($data as $item) {
+                $u = $item['u'] * $server->rate;
+                $d = $item['d'] * $server->rate;
+                if (!$userService->trafficFetch((float)$u, (float)$d, (int)$item['user_id'], $server, 'shadowsocks')) {
+                    continue;
+                }
+            }
+        } catch (\Exception $e) {
+            DB::rollBack();
+            return response([
+                'ret' => 0,
+                'msg' => 'user fetch fail'
+            ]);
+        }
+        DB::commit();
+
+        return response([
+            'ret' => 1,
+            'msg' => 'ok'
+        ]);
+    }
+}

app/Http/Controllers/Server/TrojanTidalabController.php

@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Http\Controllers\Server;
+
+use App\Services\ServerService;
+use App\Services\UserService;
+use App\Utils\CacheKey;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\User;
+use App\Models\ServerTrojan;
+use App\Models\ServerLog;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Cache;
+
+/*
+ * Tidal Lab Trojan
+ * Github: https://github.com/tokumeikoi/tidalab-trojan
+ */
+class TrojanTidalabController extends Controller
+{
+    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)
+    {
+        $nodeId = $request->input('node_id');
+        $server = ServerTrojan::find($nodeId);
+        if (!$server) {
+            abort(500, 'fail');
+        }
+        Cache::put(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $server->id), time(), 3600);
+        $serverService = new ServerService();
+        $users = $serverService->getAvailableUsers(json_decode($server->group_id));
+        $result = [];
+        foreach ($users as $user) {
+            $user->trojan_user = [
+                "password" => $user->uuid,
+            ];
+            unset($user['uuid']);
+            unset($user['email']);
+            array_push($result, $user);
+        }
+        return response([
+            'msg' => 'ok',
+            'data' => $result,
+        ]);
+    }
+
+    // 后端提交数据
+    public function submit(Request $request)
+    {
+        // Log::info('serverSubmitData:' . $request->input('node_id') . ':' . file_get_contents('php://input'));
+        $server = ServerTrojan::find($request->input('node_id'));
+        if (!$server) {
+            return response([
+                'ret' => 0,
+                'msg' => 'server is not found'
+            ]);
+        }
+        $data = file_get_contents('php://input');
+        $data = json_decode($data, true);
+        Cache::put(CacheKey::get('SERVER_TROJAN_ONLINE_USER', $server->id), count($data), 3600);
+        Cache::put(CacheKey::get('SERVER_TROJAN_LAST_PUSH_AT', $server->id), time(), 3600);
+        $userService = new UserService();
+        DB::beginTransaction();
+        try {
+            foreach ($data as $item) {
+                $u = $item['u'] * $server->rate;
+                $d = $item['d'] * $server->rate;
+                if (!$userService->trafficFetch($u, $d, $item['user_id'], $server, 'trojan')) {
+                    continue;
+                }
+            }
+        } catch (\Exception $e) {
+            DB::rollBack();
+            return response([
+                'ret' => 0,
+                'msg' => 'user fetch fail'
+            ]);
+        }
+        DB::commit();
+
+        return response([
+            'ret' => 1,
+            'msg' => 'ok'
+        ]);
+    }
+
+    // 后端获取配置
+    public function config(Request $request)
+    {
+        $nodeId = $request->input('node_id');
+        $localPort = $request->input('local_port');
+        if (empty($nodeId) || empty($localPort)) {
+            abort(500, '参数错误');
+        }
+        $serverService = new ServerService();
+        try {
+            $json = $serverService->getTrojanConfig($nodeId, $localPort);
+        } catch (\Exception $e) {
+            abort(500, $e->getMessage());
+        }
+
+        die(json_encode($json, JSON_UNESCAPED_UNICODE));
+    }
+}

app/Http/Controllers/Staff/NoticeController.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Http\Controllers\Staff;
+
+use App\Http\Requests\Admin\NoticeSave;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\Notice;
+use Illuminate\Support\Facades\Cache;
+
+class NoticeController extends Controller
+{
+    public function fetch(Request $request)
+    {
+        return response([
+            'data' => Notice::orderBy('id', 'DESC')->get()
+        ]);
+    }
+
+    public function save(NoticeSave $request)
+    {
+        $data = $request->only([
+            'title',
+            'content',
+            'img_url'
+        ]);
+        if (!$request->input('id')) {
+            if (!Notice::create($data)) {
+                abort(500, '保存失败');
+            }
+        } else {
+            try {
+                Notice::find($request->input('id'))->update($data);
+            } catch (\Exception $e) {
+                abort(500, '保存失败');
+            }
+        }
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function drop(Request $request)
+    {
+        if (empty($request->input('id'))) {
+            abort(500, '参数错误');
+        }
+        $notice = Notice::find($request->input('id'));
+        if (!$notice) {
+            abort(500, '公告不存在');
+        }
+        if (!$notice->delete()) {
+            abort(500, '删除失败');
+        }
+        return response([
+            'data' => true
+        ]);
+    }
+}

app/Http/Controllers/Staff/PlanController.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Http\Controllers\Staff;
+
+use App\Http\Requests\Admin\PlanSave;
+use App\Http\Requests\Admin\PlanSort;
+use App\Http\Requests\Admin\PlanUpdate;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\Plan;
+use App\Models\Order;
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+
+class PlanController extends Controller
+{
+    public function fetch(Request $request)
+    {
+        $counts = User::select(
+            DB::raw("plan_id"),
+            DB::raw("count(*) as count")
+        )
+            ->where('plan_id', '!=', NULL)
+            ->where(function ($query) {
+                $query->where('expired_at', '>=', time())
+                    ->orWhere('expired_at', NULL);
+            })
+            ->groupBy("plan_id")
+            ->get();
+        $plans = Plan::orderBy('sort', 'ASC')->get();
+        foreach ($plans as $k => $v) {
+            $plans[$k]->count = 0;
+            foreach ($counts as $kk => $vv) {
+                if ($plans[$k]->id === $counts[$kk]->plan_id) $plans[$k]->count = $counts[$kk]->count;
+            }
+        }
+        return response([
+            'data' => $plans
+        ]);
+    }
+}

app/Http/Controllers/Staff/TicketController.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace App\Http\Controllers\Staff;
+
+use App\Services\TicketService;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\Ticket;
+use App\Models\TicketMessage;
+
+class TicketController extends Controller
+{
+    public function fetch(Request $request)
+    {
+        if ($request->input('id')) {
+            $ticket = Ticket::where('id', $request->input('id'))
+                ->first();
+            if (!$ticket) {
+                abort(500, '工单不存在');
+            }
+            $ticket['message'] = TicketMessage::where('ticket_id', $ticket->id)->get();
+            for ($i = 0; $i < count($ticket['message']); $i++) {
+                if ($ticket['message'][$i]['user_id'] !== $ticket->user_id) {
+                    $ticket['message'][$i]['is_me'] = true;
+                } else {
+                    $ticket['message'][$i]['is_me'] = false;
+                }
+            }
+            return response([
+                'data' => $ticket
+            ]);
+        }
+        $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($res); $i++) {
+            if ($res[$i]['last_reply_user_id'] == $request->session()->get('id')) {
+                $res[$i]['reply_status'] = 0;
+            } else {
+                $res[$i]['reply_status'] = 1;
+            }
+        }
+        return response([
+            'data' => $res,
+            'total' => $total
+        ]);
+    }
+
+    public function reply(Request $request)
+    {
+        if (empty($request->input('id'))) {
+            abort(500, '参数错误');
+        }
+        if (empty($request->input('message'))) {
+            abort(500, '消息不能为空');
+        }
+        $ticketService = new TicketService();
+        $ticketService->replyByAdmin(
+            $request->input('id'),
+            $request->input('message'),
+            $request->session()->get('id')
+        );
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function close(Request $request)
+    {
+        if (empty($request->input('id'))) {
+            abort(500, '参数错误');
+        }
+        $ticket = Ticket::where('id', $request->input('id'))
+            ->first();
+        if (!$ticket) {
+            abort(500, '工单不存在');
+        }
+        $ticket->status = 1;
+        if (!$ticket->save()) {
+            abort(500, '关闭失败');
+        }
+        return response([
+            'data' => true
+        ]);
+    }
+}

app/Http/Controllers/Staff/UserController.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace App\Http\Controllers\Staff;
+
+use App\Http\Requests\Admin\UserSendMail;
+use App\Http\Requests\Staff\UserUpdate;
+use App\Jobs\SendEmailJob;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\User;
+use App\Models\Plan;
+
+class UserController extends Controller
+{
+    public function getUserInfoById(Request $request)
+    {
+        if (empty($request->input('id'))) {
+            abort(500, '参数错误');
+        }
+        $user = User::where('is_admin', 0)
+            ->where('id', $request->input('id'))
+            ->where('is_staff', 0)
+            ->first();
+        if (!$user) abort(500, '用户不存在');
+        return response([
+            'data' => $user
+        ]);
+    }
+
+    public function update(UserUpdate $request)
+    {
+        $params = $request->validated();
+        $user = User::find($request->input('id'));
+        if (!$user) {
+            abort(500, '用户不存在');
+        }
+        if (User::where('email', $params['email'])->first() && $user->email !== $params['email']) {
+            abort(500, '邮箱已被使用');
+        }
+        if (isset($params['password'])) {
+            $params['password'] = password_hash($params['password'], PASSWORD_DEFAULT);
+            $params['password_algo'] = NULL;
+        } else {
+            unset($params['password']);
+        }
+        if (isset($params['plan_id'])) {
+            $plan = Plan::find($params['plan_id']);
+            if (!$plan) {
+                abort(500, '订阅计划不存在');
+            }
+            $params['group_id'] = $plan->group_id;
+        }
+
+        try {
+            $user->update($params);
+        } catch (\Exception $e) {
+            abort(500, '保存失败');
+        }
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function sendMail(UserSendMail $request)
+    {
+        $sortType = in_array($request->input('sort_type'), ['ASC', 'DESC']) ? $request->input('sort_type') : 'DESC';
+        $sort = $request->input('sort') ? $request->input('sort') : 'created_at';
+        $builder = User::orderBy($sort, $sortType);
+        $this->filter($request, $builder);
+        $users = $builder->get();
+        foreach ($users as $user) {
+            SendEmailJob::dispatch([
+                'email' => $user->email,
+                'subject' => $request->input('subject'),
+                'template_name' => 'notify',
+                'template_value' => [
+                    'name' => config('v2board.app_name', 'V2Board'),
+                    'url' => config('v2board.app_url'),
+                    'content' => $request->input('content')
+                ]
+            ]);
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function ban(Request $request)
+    {
+        $sortType = in_array($request->input('sort_type'), ['ASC', 'DESC']) ? $request->input('sort_type') : 'DESC';
+        $sort = $request->input('sort') ? $request->input('sort') : 'created_at';
+        $builder = User::orderBy($sort, $sortType);
+        $this->filter($request, $builder);
+        try {
+            $builder->update([
+                'banned' => 1
+            ]);
+        } catch (\Exception $e) {
+            abort(500, '处理失败');
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+}

app/Http/Controllers/User/CommController.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Controllers\User;
+
+use App\Models\Payment;
+use App\Utils\Dict;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+
+class CommController extends Controller
+{
+    public function config()
+    {
+        return response([
+            'data' => [
+                'is_telegram' => (int)config('v2board.telegram_bot_enable', 0),
+                'stripe_pk' => config('v2board.stripe_pk_live'),
+                'withdraw_methods' => config('v2board.commission_withdraw_method', Dict::WITHDRAW_METHOD_WHITELIST_DEFAULT),
+                'withdraw_close' => (int)config('v2board.withdraw_close_enable', 0)
+            ]
+        ]);
+    }
+
+    public function getStripePublicKey(Request $request)
+    {
+        $payment = Payment::where('id', $request->input('id'))
+            ->where('payment', 'StripeCredit')
+            ->first();
+        if (!$payment) abort(500, 'payment is not found');
+        $config = json_decode($payment->config, true);
+        return response([
+            'data' => $config['stripe_pk_live']
+        ]);
+    }
+}

app/Http/Controllers/User/CouponController.php

@@ -11,20 +11,26 @@ class CouponController extends Controller
     public function check(Request $request)
     {
         if (empty($request->input('code'))) {
-            abort(500, '优惠券码不能为空');
+            abort(500, __('user.coupon.check.coupon_not_empty'));
         }
         $coupon = Coupon::where('code', $request->input('code'))->first();
         if (!$coupon) {
-            abort(500, '优惠券无效');
+            abort(500, __('user.coupon.check.coupon_invalid'));
         }
         if ($coupon->limit_use <= 0 && $coupon->limit_use !== NULL) {
-            abort(500, '优惠券已无可用次数');
+            abort(500, __('user.coupon.check.coupon_not_available_by_number'));
         }
         if (time() < $coupon->started_at) {
-            abort(500, '优惠券还未到可用时间');
+            abort(500, __('user.coupon.check.coupon_not_available_by_time'));
         }
         if (time() > $coupon->ended_at) {
-            abort(500, '优惠券已过期');
+            abort(500, __('user.coupon.check.coupon_expired'));
+        }
+        if ($coupon->limit_plan_ids) {
+            $limitPlanIds = json_decode($coupon->limit_plan_ids);
+            if (!in_array($request->input('plan_id'), $limitPlanIds)) {
+                abort(500, __('user.coupon.check.coupon_limit_plan'));
+            }
         }
         return response([
             'data' => $coupon

app/Http/Controllers/User/InviteController.php

@@ -14,7 +14,7 @@ class InviteController extends Controller
     public function save(Request $request)
     {
         if (InviteCode::where('user_id', $request->session()->get('id'))->where('status', 0)->count() >= config('v2board.invite_gen_limit', 5)) {
-            abort(500, '已达到创建数量上限');
+            abort(500, __('user.invite.save.invite_create_limit'));
         }
         $inviteCode = new InviteCode();
         $inviteCode->user_id = $request->session()->get('id');
@@ -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',

app/Http/Controllers/User/KnowledgeController.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Http\Controllers\User;
+
+use App\Http\Controllers\Controller;
+use App\Models\User;
+use App\Services\UserService;
+use Illuminate\Http\Request;
+use App\Models\Knowledge;
+
+class KnowledgeController extends Controller
+{
+    public function fetch(Request $request)
+    {
+        if ($request->input('id')) {
+            $knowledge = Knowledge::where('id', $request->input('id'))
+                ->where('show', 1)
+                ->first()
+                ->toArray();
+            if (!$knowledge) abort(500, __('user.knowledge.fetch.knowledge_not_exist'));
+            $user = User::find($request->session()->get('id'));
+            $userService = new UserService();
+            if ($userService->isAvailable($user)) {
+                $appleId = config('v2board.apple_id');
+                $appleIdPassword = config('v2board.apple_id_password');
+            } else {
+                $appleId = __('user.knowledge.fetch.apple_id_must_be_plan');
+                $appleIdPassword = __('user.knowledge.fetch.apple_id_must_be_plan');
+                $this->formatAccessData($knowledge['body']);
+            }
+            $subscribeUrl = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user['token'];
+            $knowledge['body'] = str_replace('{{siteName}}', config('v2board.app_name', 'V2Board'), $knowledge['body']);
+            $knowledge['body'] = str_replace('{{appleId}}', $appleId, $knowledge['body']);
+            $knowledge['body'] = str_replace('{{appleIdPassword}}', $appleIdPassword, $knowledge['body']);
+            $knowledge['body'] = str_replace('{{subscribeUrl}}', $subscribeUrl, $knowledge['body']);
+            $knowledge['body'] = str_replace('{{urlEncodeSubscribeUrl}}', urlencode($subscribeUrl), $knowledge['body']);
+            $knowledge['body'] = str_replace(
+                '{{safeBase64SubscribeUrl}}',
+                str_replace(
+                    array('+', '/', '='),
+                    array('-', '_', ''),
+                    base64_encode($subscribeUrl)
+                ),
+                $knowledge['body']
+            );
+            return response([
+                'data' => $knowledge
+            ]);
+        }
+        $knowledges = Knowledge::select(['id', 'category', 'title', 'updated_at'])
+            ->where('language', $request->input('language'))
+            ->where('show', 1)
+            ->orderBy('sort', 'ASC')
+            ->get()
+            ->groupBy('category');
+        return response([
+            'data' => $knowledges
+        ]);
+    }
+
+    private function formatAccessData(&$body)
+    {
+        function getBetween($input, $start, $end){$substr = substr($input, strlen($start)+strpos($input, $start),(strlen($input) - strpos($input, $end))*(-1));return $substr;}
+        $accessData = getBetween($body, '<!--access start-->', '<!--access end-->');
+        if ($accessData) {
+            $body = str_replace($accessData, '<div class="v2board-no-access">'. __('user.knowledge.formatAccessData.no_access') .'</div>', $body);
+        }
+    }
+}

app/Http/Controllers/User/OrderController.php

@@ -4,22 +4,24 @@ namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\User\OrderSave;
+use App\Models\Payment;
+use App\Services\CouponService;
 use App\Services\OrderService;
+use App\Services\PaymentService;
 use App\Services\UserService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\DB;
 use App\Models\Order;
 use App\Models\Plan;
 use App\Models\User;
-use App\Models\Coupon;
 use App\Utils\Helper;
 use Omnipay\Omnipay;
 use Stripe\Stripe;
 use Stripe\Source;
 use Library\BitpayX;
-use Library\PayTaro;
+use Library\MGate;
+use Library\Epay;
 
 class OrderController extends Controller
 {
@@ -40,7 +42,7 @@ class OrderController extends Controller
             }
         }
         return response([
-            'data' => $order
+            'data' => $order->makeHidden(['id', 'user_id'])
         ]);
     }
 
@@ -50,189 +52,92 @@ class OrderController extends Controller
             ->where('trade_no', $request->input('trade_no'))
             ->first();
         if (!$order) {
-            abort(500, '订单不存在');
+            abort(500, __('user.order.details.order_not_exist'));
         }
         $order['plan'] = Plan::find($order->plan_id);
         $order['try_out_plan_id'] = (int)config('v2board.try_out_plan_id');
         if (!$order['plan']) {
-            abort(500, '订阅不存在');
+            abort(500, __('user.order.details.plan_not_exist'));
         }
         return response([
             'data' => $order
         ]);
     }
 
-    private function isNotCompleteOrderByUserId($userId)
-    {
-        $order = Order::whereIn('status', [0, 1])
-            ->where('user_id', $userId)
-            ->first();
-        if (!$order) {
-            return false;
-        }
-        return true;
-    }
-
-    // surplus value
-    private function getSurplusValue(User $user)
-    {
-        $plan = Plan::find($user->plan_id);
-        if ($user->expired_at === NULL) {
-            return $this->getSurplusValueByOneTime($user, $plan);
-        } else {
-            return $this->getSurplusValueByCycle($user, $plan);
-        }
-    }
-
-    private function getSurplusValueByOneTime(User $user, Plan $plan)
-    {
-        $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;
-        return $result > 0 ? $result : 0;
-    }
-
-    private function getSurplusValueByCycle(User $user, Plan $plan)
-    {
-        $price = 0;
-        if ($plan->month_price) {
-            $price = $plan->month_price / (31536000 / 12);
-        } else if ($plan->quarter_price) {
-            $price = $plan->quarter_price / (31536000 / 4);
-        } else if ($plan->half_year_price) {
-            $price = $plan->half_year_price / (31536000 / 2);
-        } else if ($plan->year_price) {
-            $price = $plan->year_price / 31536000;
-        }
-        // exclude discount
-        if ($user->discount && $price) {
-            $price = $price - ($price * $user->discount / 100);
-        }
-        $remainingDay = $user->expired_at - time();
-        $result = $remainingDay * $price;
-        return $result > 0 ? $result : 0;
-    }
-
     public function save(OrderSave $request)
     {
-        if ($this->isNotCompleteOrderByUserId($request->session()->get('id'))) {
-            abort(500, '存在未付款订单，请取消后再试');
+        $userService = new UserService();
+        if ($userService->isNotCompleteOrderByUserId($request->session()->get('id'))) {
+            abort(500, __('user.order.save.exist_open_order'));
         }
 
         $plan = Plan::find($request->input('plan_id'));
         $user = User::find($request->session()->get('id'));
 
         if (!$plan) {
-            abort(500, '该订阅不存在');
+            abort(500, __('user.order.save.plan_not_exist'));
         }
 
         if ((!$plan->show && !$plan->renew) || (!$plan->show && $user->plan_id !== $plan->id)) {
-            abort(500, '该订阅已售罄');
+            if ($request->input('cycle') !== 'reset_price') {
+                abort(500, __('user.order.save.plan_stop_sell'));
+            }
         }
 
-        if (!$plan->renew && $user->plan_id == $plan->id) {
-            abort(500, '该订阅无法续费，请更换其他订阅');
+        if (!$plan->renew && $user->plan_id == $plan->id && $request->input('cycle') !== 'reset_price') {
+            abort(500, __('user.order.save.plan_stop_renew'));
         }
 
         if ($plan[$request->input('cycle')] === NULL) {
-            abort(500, '该订阅周期无法进行购买，请选择其他周期');
+            abort(500, __('user.order.save.plan_stop'));
         }
 
-        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') {
+            if ($user->expired_at <= time() || !$user->plan_id) {
+                abort(500, __('user.order.save.plan_exist_not_buy_package'));
             }
         }
 
+        if (!$plan->show && $plan->renew && !$userService->isAvailable($user)) {
+            abort(500, __('user.order.save.plan_expired'));
+        }
+
         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')];
-        // coupon start
-        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 ($coupon->limit_use !== NULL) {
-                $coupon->limit_use = $coupon->limit_use - 1;
-                if (!$coupon->save()) {
-                    DB::rollback();
-                    abort(500, '优惠券使用失败');
-                }
+
+        if ($request->input('coupon_code')) {
+            $couponService = new CouponService($request->input('coupon_code'));
+            if (!$couponService->use($order)) {
+                DB::rollBack();
+                abort(500, __('user.order.save.coupon_use_failed'));
             }
+            $order->coupon_id = $couponService->getId();
         }
-        // coupon complete
-        // discount start
-        if ($user->discount) {
-            $order->discount_amount = $order->discount_amount + ($order->total_amount * ($user->discount / 100));
-        }
-        // discount end
-        $order->total_amount = $order->total_amount - $order->discount_amount;
-        // renew and change subscribe process
-        if ($user->plan_id !== NULL && $order->plan_id !== $user->plan_id) {
-            if (!(int)config('v2board.plan_change_enable', 1)) abort(500, '目前不允许更改订阅，请联系客服或提交工单');
-            $order->type = 3;
-            $order->surplus_amount = $this->getSurplusValue($user);
-            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;
-        }
-        // invite process
-        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);
-                }
-            }
-        }
-        // use balance
+
+        $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, '余额不足');
+                    abort(500, __('user.order.save.insufficient_balance'));
                 }
                 $order->balance_amount = $order->total_amount;
                 $order->total_amount = 0;
             } else {
                 if (!$userService->addBalance($order->user_id, - $user->balance)) {
                     DB::rollBack();
-                    abort(500, '余额不足');
+                    abort(500, __('user.order.save.insufficient_balance'));
                 }
                 $order->balance_amount = $user->balance;
                 $order->total_amount = $order->total_amount - $user->balance;
@@ -241,7 +146,7 @@ class OrderController extends Controller
 
         if (!$order->save()) {
             DB::rollback();
-            abort(500, '订单创建失败');
+            abort(500, __('user.order.save.order_create_failed'));
         }
 
         DB::commit();
@@ -260,64 +165,32 @@ class OrderController extends Controller
             ->where('status', 0)
             ->first();
         if (!$order) {
-            abort(500, '订单不存在或已支付');
+            abort(500, __('user.order.checkout.order_not_exist_or_paid'));
         }
         // free process
         if ($order->total_amount <= 0) {
             $order->total_amount = 0;
             $order->status = 1;
             $order->save();
-            exit();
-        }
-        switch ($method) {
-            // return type => 0: QRCode / 1: URL
-            case 0:
-                // alipayF2F
-                if (!(int)config('v2board.alipay_enable')) {
-                    abort(500, '支付方式不可用');
-                }
-                return response([
-                    'type' => 0,
-                    'data' => $this->alipayF2F($tradeNo, $order->total_amount)
-                ]);
-            case 2:
-                // stripeAlipay
-                if (!(int)config('v2board.stripe_alipay_enable')) {
-                    abort(500, '支付方式不可用');
-                }
-                return response([
-                    'type' => 1,
-                    'data' => $this->stripeAlipay($order)
-                ]);
-            case 3:
-                // stripeWepay
-                if (!(int)config('v2board.stripe_wepay_enable')) {
-                    abort(500, '支付方式不可用');
-                }
-                return response([
-                    'type' => 0,
-                    'data' => $this->stripeWepay($order)
-                ]);
-            case 4:
-                // bitpayX
-                if (!(int)config('v2board.bitpayx_enable')) {
-                    abort(500, '支付方式不可用');
-                }
-                return response([
-                    'type' => 1,
-                    'data' => $this->bitpayX($order)
-                ]);
-            case 5:
-                if (!(int)config('v2board.paytaro_enable')) {
-                    abort(500, '支付方式不可用');
-                }
-                return response([
-                    'type' => 1,
-                    'data' => $this->payTaro($order)
-                ]);
-            default:
-                abort(500, '支付方式不存在');
+            return response([
+                'type' => -1,
+                'data' => true
+            ]);
         }
+        $payment = Payment::find($method);
+        if (!$payment || $payment->enable !== 1) abort(500, __('user.order.checkout.pay_method_not_use'));
+        $paymentService = new PaymentService($payment->payment, $payment->id);
+        $result = $paymentService->pay([
+            'trade_no' => $tradeNo,
+            'total_amount' => $order->total_amount,
+            'user_id' => $order->user_id,
+            'stripe_token' => $request->input('token')
+        ]);
+        $order->update(['payment_id' => $method]);
+        return response([
+            'type' => $result['type'],
+            'data' => $result['data']
+        ]);
     }
 
     public function check(Request $request)
@@ -327,7 +200,7 @@ class OrderController extends Controller
             ->where('user_id', $request->session()->get('id'))
             ->first();
         if (!$order) {
-            abort(500, '订单不存在');
+            abort(500, __('user.order.check.order_not_exist'));
         }
         return response([
             'data' => $order->status
@@ -336,191 +209,38 @@ class OrderController extends Controller
 
     public function getPaymentMethod()
     {
-        $data = [];
-        if ((int)config('v2board.alipay_enable')) {
-            $alipayF2F = new \StdClass();
-            $alipayF2F->name = '支付宝';
-            $alipayF2F->method = 0;
-            $alipayF2F->icon = 'alipay';
-            array_push($data, $alipayF2F);
-        }
-
-        if ((int)config('v2board.stripe_alipay_enable')) {
-            $stripeAlipay = new \StdClass();
-            $stripeAlipay->name = '支付宝';
-            $stripeAlipay->method = 2;
-            $stripeAlipay->icon = 'alipay';
-            array_push($data, $stripeAlipay);
-        }
-
-        if ((int)config('v2board.stripe_wepay_enable')) {
-            $stripeWepay = new \StdClass();
-            $stripeWepay->name = '微信';
-            $stripeWepay->method = 3;
-            $stripeWepay->icon = 'wechat';
-            array_push($data, $stripeWepay);
-        }
-
-        if ((int)config('v2board.bitpayx_enable')) {
-            $bitpayX = new \StdClass();
-            $bitpayX->name = '聚合支付';
-            $bitpayX->method = 4;
-            $bitpayX->icon = 'wallet';
-            array_push($data, $bitpayX);
-        }
-
-        if ((int)config('v2board.paytaro_enable')) {
-            $obj = new \StdClass();
-            $obj->name = '聚合支付';
-            $obj->method = 5;
-            $obj->icon = 'wallet';
-            array_push($data, $obj);
-        }
+        $methods = Payment::select([
+            'id',
+            'name',
+            'payment'
+        ])
+            ->where('enable', 1)->get();
 
         return response([
-            'data' => $data
+            'data' => $methods
         ]);
     }
 
     public function cancel(Request $request)
     {
         if (empty($request->input('trade_no'))) {
-            abort(500, '参数有误');
+            abort(500, __('user.order.cancel.params_wrong'));
         }
         $order = Order::where('trade_no', $request->input('trade_no'))
             ->where('user_id', $request->session()->get('id'))
             ->first();
         if (!$order) {
-            abort(500, '订单不存在');
+            abort(500, __('user.order.cancel.order_not_exist'));
         }
         if ($order->status !== 0) {
-            abort(500, '只可以取消待支付订单');
+            abort(500, __('user.order.cancel.only_cancel_pending_order'));
         }
         $orderService = new OrderService($order);
         if (!$orderService->cancel()) {
-            abort(500, '取消失败');
+            abort(500, __('user.order.cancel.cancel_failed'));
         }
         return response([
             'data' => true
         ]);
     }
-
-    private function alipayF2F($tradeNo, $totalAmount)
-    {
-        $gateway = Omnipay::create('Alipay_AopF2F');
-        $gateway->setSignType('RSA2'); //RSA/RSA2
-        $gateway->setAppId(config('v2board.alipay_appid'));
-        $gateway->setPrivateKey(config('v2board.alipay_privkey')); // 可以是路径，也可以是密钥内容
-        $gateway->setAlipayPublicKey(config('v2board.alipay_pubkey')); // 可以是路径，也可以是密钥内容
-        $gateway->setNotifyUrl(url('/api/v1/guest/order/alipayNotify'));
-        $request = $gateway->purchase();
-        $request->setBizContent([
-            'subject' => config('v2board.app_name', 'V2Board') . ' - 订阅',
-            'out_trade_no' => $tradeNo,
-            'total_amount' => $totalAmount / 100
-        ]);
-        /** @var \Omnipay\Alipay\Responses\AopTradePreCreateResponse $response */
-        $response = $request->send();
-        $result = $response->getAlipayResponse();
-        if ($result['code'] !== '10000') {
-            abort(500, $result['sub_msg']);
-        }
-        // 获取收款二维码内容
-        return $response->getQrCode();
-    }
-
-    private function stripeAlipay($order)
-    {
-        $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' => $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'
-            ]
-        ]);
-        if (!$source['redirect']['url']) {
-            abort(500, '支付网关请求失败');
-        }
-
-        if (!Cache::put($source['id'], $order->trade_no, 3600)) {
-            abort(500, '订单创建失败');
-        }
-        return $source['redirect']['url'];
-    }
-
-    private function stripeWepay($order)
-    {
-        $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' => $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'
-            ]
-        ]);
-        if (!$source['wechat']['qr_code_url']) {
-            abort(500, '支付网关请求失败');
-        }
-        if (!Cache::put($source['id'], $order->trade_no, 3600)) {
-            abort(500, '订单创建失败');
-        }
-        return $source['wechat']['qr_code_url'];
-    }
-
-    private function bitpayX($order)
-    {
-        $bitpayX = new BitpayX(config('v2board.bitpayx_appsecret'));
-        $params = [
-            'merchant_order_id' => $order->trade_no,
-            'price_amount' => $order->total_amount / 100,
-            'price_currency' => 'CNY',
-            'title' => '支付单号：' . $order->trade_no,
-            'description' => '充值：' . $order->total_amount / 100 . ' 元',
-            'callback_url' => url('/api/v1/guest/order/bitpayXNotify'),
-            'success_url' => config('v2board.app_url', env('APP_URL')) . '/#/order',
-            'cancel_url' => config('v2board.app_url', env('APP_URL')) . '/#/order'
-        ];
-        $strToSign = $bitpayX->prepareSignId($params['merchant_order_id']);
-        $params['token'] = $bitpayX->sign($strToSign);
-        $result = $bitpayX->mprequest($params);
-        // Log::info('bitpayXSubmit: ' . json_encode($result));
-        return isset($result['payment_url']) ? $result['payment_url'] : false;
-    }
-
-    private function payTaro($order)
-    {
-        $payTaro = new PayTaro(config('v2board.paytaro_app_id'), config('v2board.paytaro_app_secret'));
-        $result = $payTaro->pay([
-            'app_id' => config('v2board.paytaro_app_id'),
-            'out_trade_no' => $order->trade_no,
-            'total_amount' => $order->total_amount,
-            'notify_url' => url('/api/v1/guest/order/payTaroNotify'),
-            'return_url' => config('v2board.app_url', env('APP_URL')) . '/#/order'
-        ]);
-        return $result;
-    }
 }

app/Http/Controllers/User/PlanController.php

@@ -14,13 +14,14 @@ class PlanController extends Controller
             $plan = Plan::where('id', $request->input('id'))
                 ->first();
             if (!$plan) {
-                abort(500, '该订阅不存在');
+                abort(500, __('user.plan.fetch.plan_not_exist'));
             }
             return response([
                 'data' => $plan
             ]);
         }
         $plan = Plan::where('show', 1)
+            ->orderBy('sort', 'ASC')
             ->get();
         return response([
             'data' => $plan

app/Http/Controllers/User/ServerController.php

@@ -3,7 +3,9 @@
 namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
+use App\Services\ServerService;
 use App\Services\UserService;
+use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use App\Models\Server;
@@ -17,29 +19,14 @@ class ServerController extends Controller
     public function fetch(Request $request)
     {
         $user = User::find($request->session()->get('id'));
-        $server = [];
+        $servers = [];
         $userService = new UserService();
         if ($userService->isAvailable($user)) {
-            $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);
-                }
-            }
-        }
-        for ($i = 0; $i < count($server); $i++) {
-            $server[$i]['link'] = Helper::buildVmessLink($server[$i], $user);
-            if ($server[$i]['parent_id']) {
-                $server[$i]['last_check_at'] = Cache::get('server_last_check_at_' . $server[$i]['parent_id']);
-            } else {
-                $server[$i]['last_check_at'] = Cache::get('server_last_check_at_' . $server[$i]['id']);
-            }
+            $serverService = new ServerService();
+            $servers = $serverService->getAvailableServers($user);
         }
         return response([
-            'data' => $server
+            'data' => $servers
         ]);
     }
 
@@ -60,17 +47,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

@@ -4,10 +4,14 @@ namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\User\TicketSave;
+use App\Http\Requests\User\TicketWithdraw;
+use App\Jobs\SendTelegramJob;
+use App\Models\User;
+use App\Services\TelegramService;
+use App\Utils\Dict;
 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
@@ -19,7 +23,7 @@ class TicketController extends Controller
                 ->where('user_id', $request->session()->get('id'))
                 ->first();
             if (!$ticket) {
-                abort(500, '工单不存在');
+                abort(500, __('user.ticket.fetch.ticket_not_exist'));
             }
             $ticket['message'] = TicketMessage::where('ticket_id', $ticket->id)->get();
             for ($i = 0; $i < count($ticket['message']); $i++) {
@@ -52,7 +56,7 @@ class TicketController extends Controller
     {
         DB::beginTransaction();
         if ((int)Ticket::where('status', 0)->where('user_id', $request->session()->get('id'))->count()) {
-            abort(500, '存在其他工单尚未处理');
+            abort(500, __('user.ticket.save.exist_other_open_ticket'));
         }
         $ticket = Ticket::create(array_merge($request->only([
             'subject',
@@ -63,7 +67,7 @@ class TicketController extends Controller
         ]));
         if (!$ticket) {
             DB::rollback();
-            abort(500, '工单创建失败');
+            abort(500, __('user.ticket.save.ticket_create_failed'));
         }
         $ticketMessage = TicketMessage::create([
             'user_id' => $request->session()->get('id'),
@@ -72,9 +76,10 @@ class TicketController extends Controller
         ]);
         if (!$ticketMessage) {
             DB::rollback();
-            abort(500, '工单创建失败');
+            abort(500, __('user.ticket.save.ticket_create_failed'));
         }
         DB::commit();
+        $this->sendNotify($ticket, $ticketMessage);
         return response([
             'data' => true
         ]);
@@ -83,22 +88,22 @@ class TicketController extends Controller
     public function reply(Request $request)
     {
         if (empty($request->input('id'))) {
-            abort(500, '参数错误');
+            abort(500, __('user.ticket.reply.params_wrong'));
         }
         if (empty($request->input('message'))) {
-            abort(500, '消息不能为空');
+            abort(500, __('user.ticket.reply.message_not_empty'));
         }
         $ticket = Ticket::where('id', $request->input('id'))
             ->where('user_id', $request->session()->get('id'))
             ->first();
         if (!$ticket) {
-            abort(500, '工单不存在');
+            abort(500, __('user.ticket.reply.ticket_not_exist'));
         }
         if ($ticket->status) {
-            abort(500, '工单已关闭，无法回复');
+            abort(500, __('user.ticket.reply.ticket_close_not_reply'));
         }
         if ($request->session()->get('id') == $this->getLastMessage($ticket->id)->user_id) {
-            abort(500, '请等待技术支持回复');
+            abort(500, __('user.ticket.reply.wait_reply'));
         }
         DB::beginTransaction();
         $ticketMessage = TicketMessage::create([
@@ -109,9 +114,10 @@ class TicketController extends Controller
         $ticket->last_reply_user_id = $request->session()->get('id');
         if (!$ticketMessage || !$ticket->save()) {
             DB::rollback();
-            abort(500, '工单回复失败');
+            abort(500, __('user.ticket.reply.ticket_reply_failed'));
         }
         DB::commit();
+        $this->sendNotify($ticket, $ticketMessage);
         return response([
             'data' => true
         ]);
@@ -121,17 +127,17 @@ class TicketController extends Controller
     public function close(Request $request)
     {
         if (empty($request->input('id'))) {
-            abort(500, '参数错误');
+            abort(500, __('user.ticket.close.params_wrong'));
         }
         $ticket = Ticket::where('id', $request->input('id'))
             ->where('user_id', $request->session()->get('id'))
             ->first();
         if (!$ticket) {
-            abort(500, '工单不存在');
+            abort(500, __('user.ticket.close.ticket_not_exist'));
         }
         $ticket->status = 1;
         if (!$ticket->save()) {
-            abort(500, '关闭失败');
+            abort(500, __('user.ticket.close.close_failed'));
         }
         return response([
             'data' => true
@@ -144,4 +150,61 @@ class TicketController extends Controller
             ->orderBy('id', 'DESC')
             ->first();
     }
+
+    public function withdraw(TicketWithdraw $request)
+    {
+        if ((int)config('v2board.withdraw_close_enable', 0)) {
+            abort(500, 'user.ticket.withdraw.not_support_withdraw');
+        }
+        if (!in_array(
+            $request->input('withdraw_method'),
+            config(
+                'v2board.commission_withdraw_method',
+                Dict::WITHDRAW_METHOD_WHITELIST_DEFAULT
+            )
+        )) {
+            abort(500, __('user.ticket.withdraw.not_support_withdraw_method'));
+        }
+        $user = User::find($request->session()->get('id'));
+        $limit = config('v2board.commission_withdraw_limit', 100);
+        if ($limit > ($user->commission_balance / 100)) {
+            abort(500, __('user.ticket.withdraw.system_require_withdraw_limit', ['limit' => $limit]));
+        }
+        DB::beginTransaction();
+        $subject = __('user.ticket.withdraw.ticket_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, __('user.ticket.withdraw.ticket_create_failed'));
+        }
+        $message = __('user.ticket.withdraw.ticket_message', [
+            'method' => $request->input('withdraw_method'),
+            'account' => $request->input('withdraw_account')
+        ]);
+        $ticketMessage = TicketMessage::create([
+            'user_id' => $request->session()->get('id'),
+            'ticket_id' => $ticket->id,
+            'message' => $message
+        ]);
+        if (!$ticketMessage) {
+            DB::rollback();
+            abort(500, __('user.ticket.withdraw.ticket_create_failed'));
+        }
+        DB::commit();
+        $this->sendNotify($ticket, $ticketMessage);
+        return response([
+            'data' => true
+        ]);
+    }
+
+    private function sendNotify(Ticket $ticket, TicketMessage $ticketMessage)
+    {
+        $telegramService = new TelegramService();
+        $telegramService->sendMessageWithAdmin("📮工单提醒 #{$ticket->id}\n———————————————\n主题：\n`{$ticket->subject}`\n内容：\n`{$ticketMessage->message}`", true);
+    }
 }

app/Http/Controllers/User/TutorialController.php

@@ -1,77 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\User;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use App\Models\User;
-use App\Models\Tutorial;
-
-class TutorialController extends Controller
-{
-    public function getSubscribeUrl(Request $request)
-    {
-        $user = User::find($request->session()->get('id'));
-        return response([
-            'data' => [
-                'subscribe_url' => config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user['token']
-            ]
-        ]);
-    }
-
-    public function getAppleID(Request $request)
-    {
-        $user = User::find($request->session()->get('id'));
-        if ($user->expired_at < time()) {
-            return response([
-                'data' => [
-                ]
-            ]);
-        }
-        return response([
-            'data' => [
-                'apple_id' => config('v2board.apple_id'),
-                'apple_id_password' => config('v2board.apple_id_password')
-            ]
-        ]);
-    }
-
-    public function fetch(Request $request)
-    {
-        if ($request->input('id')) {
-            $tutorial = Tutorial::where('show', 1)
-                ->where('id', $request->input('id'))
-                ->first();
-            if (!$tutorial) {
-                abort(500, '教程不存在');
-            }
-            return response([
-                'data' => $tutorial
-            ]);
-        }
-        $tutorial = Tutorial::select(['id', 'category_id', 'title'])
-            ->where('show', 1)
-            ->get()
-            ->groupBy('category_id');
-        $user = User::find($request->session()->get('id'));
-        $response = [
-            'data' => [
-                'tutorials' => $tutorial,
-                '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() || $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信息') : '账号过期或未订阅'
-                ]
-            ]
-        ];
-        // fuck support shadowrocket urlsafeb64 subscribe
-        $response['data']['safe_area_var']['b64_subscribe_url'] = str_replace(
-            array('+', '/', '='),
-            array('-', '_', ''),
-            base64_encode($response['data']['safe_area_var']['subscribe_url'])
-        );
-        // end
-        return response($response);
-    }
-}

app/Http/Controllers/User/UserController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
+use App\Http\Requests\User\UserTransfer;
 use App\Http\Requests\User\UserUpdate;
 use App\Http\Requests\User\UserChangePassword;
 use Illuminate\Http\Request;
@@ -27,17 +28,20 @@ class UserController extends Controller
     public function changePassword(UserChangePassword $request)
     {
         $user = User::find($request->session()->get('id'));
+        if (!$user) {
+            abort(500, __('user.user.changePassword.user_not_exist'));
+        }
         if (!Helper::multiPasswordVerify(
             $user->password_algo,
             $request->input('old_password'),
             $user->password)
         ) {
-            abort(500, '旧密码有误');
+            abort(500, __('user.user.changePassword.old_password_wrong'));
         }
         $user->password = password_hash($request->input('new_password'), PASSWORD_DEFAULT);
         $user->password_algo = NULL;
         if (!$user->save()) {
-            abort(500, '保存失败');
+            abort(500, __('user.user.changePassword.save_failed'));
         }
         $request->session()->flush();
         return response([
@@ -54,7 +58,6 @@ class UserController extends Controller
                 'last_login_at',
                 'created_at',
                 'banned',
-                'is_admin',
                 'remind_expire',
                 'remind_traffic',
                 'expired_at',
@@ -62,9 +65,13 @@ class UserController extends Controller
                 'commission_balance',
                 'plan_id',
                 'discount',
-                'commission_rate'
+                'commission_rate',
+                'telegram_id'
             ])
             ->first();
+        if (!$user) {
+            abort(500, __('user.user.info.user_not_exist'));
+        }
         $user['avatar_url'] = 'https://cdn.v2ex.com/gravatar/' . md5($user->email) . '?s=64&d=identicon';
         return response([
             'data' => $user
@@ -90,14 +97,29 @@ class UserController extends Controller
 
     public function getSubscribe(Request $request)
     {
-        $user = User::find($request->session()->get('id'));
+        $user = User::where('id', $request->session()->get('id'))
+            ->select([
+                'id',
+                'plan_id',
+                'token',
+                'expired_at',
+                'u',
+                'd',
+                'transfer_enable',
+                'email'
+            ])
+            ->first();
+        if (!$user) {
+            abort(500, __('user.user.getSubscribe.user_not_exist'));
+        }
         if ($user->plan_id) {
             $user['plan'] = Plan::find($user->plan_id);
             if (!$user['plan']) {
-                abort(500, '订阅计划不存在');
+                abort(500, __('user.user.getSubscribe.plan_not_exist'));
             }
         }
         $user['subscribe_url'] = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user['token'];
+        $user['reset_day'] = $this->getResetDay($user);
         return response([
             'data' => $user
         ]);
@@ -106,10 +128,13 @@ class UserController extends Controller
     public function resetSecurity(Request $request)
     {
         $user = User::find($request->session()->get('id'));
-        $user->v2ray_uuid = Helper::guid(true);
+        if (!$user) {
+            abort(500, __('user.user.resetSecurity.user_not_exist'));
+        }
+        $user->uuid = Helper::guid(true);
         $user->token = Helper::guid();
         if (!$user->save()) {
-            abort(500, '重置失败');
+            abort(500, __('user.user.resetSecurity.reset_failed'));
         }
         return response([
             'data' => config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user->token
@@ -125,16 +150,58 @@ class UserController extends Controller
 
         $user = User::find($request->session()->get('id'));
         if (!$user) {
-            abort(500, '该用户不存在');
+            abort(500, __('user.user.update.user_not_exist'));
         }
         try {
             $user->update($updateData);
         } catch (\Exception $e) {
-            abort(500, '保存失败');
+            abort(500, __('user.user.update.save_failed'));
         }
 
         return response([
             'data' => true
         ]);
     }
+
+    public function transfer(UserTransfer $request)
+    {
+        $user = User::find($request->session()->get('id'));
+        if (!$user) {
+            abort(500, __('user.user.transfer.user_not_exist'));
+        }
+        if ($request->input('transfer_amount') > $user->commission_balance) {
+            abort(500, __('user.user.transfer.insufficient_commission_balance'));
+        }
+        $user->commission_balance = $user->commission_balance - $request->input('transfer_amount');
+        $user->balance = $user->balance + $request->input('transfer_amount');
+        if (!$user->save()) {
+            abort(500, __('user.user.transfer.transfer_failed'));
+        }
+        return response([
+            'data' => true
+        ]);
+    }
+
+    private function getResetDay(User $user)
+    {
+        if ($user->expired_at <= time() || $user->expired_at === NULL) return null;
+        $day = date('d', $user->expired_at);
+        $today = date('d');
+        $lastDay = date('d', strtotime('last day of +0 months'));
+
+        if ((int)config('v2board.reset_traffic_method') === 0) {
+            return $lastDay - $today;
+        }
+        if ((int)config('v2board.reset_traffic_method') === 1) {
+            if ((int)$day >= (int)$today && (int)$day >= (int)$lastDay) {
+                return $lastDay - $today;
+            }
+            if ((int)$day >= (int)$today) {
+                return $day - $today;
+            } else {
+                return $lastDay - $today + $day;
+            }
+        }
+        return null;
+    }
 }

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:120,1',
+            \App\Http\Middleware\Language::class,
             'bindings',
         ],
     ];
@@ -68,7 +68,7 @@ class Kernel extends HttpKernel
         'user' => \App\Http\Middleware\User::class,
         'admin' => \App\Http\Middleware\Admin::class,
         'client' => \App\Http\Middleware\Client::class,
-        'server' => \App\Http\Middleware\Server::class,
+        'staff' => \App\Http\Middleware\Staff::class,
     ];
 
     /**

app/Http/Middleware/Language.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\App;
+
+class Language
+{
+    public function handle($request, Closure $next)
+    {
+        if ($request->header('content-language')) {
+            App::setLocale($request->header('content-language'));
+        }
+        return $next($request);
+    }
+}

app/Http/Middleware/Staff.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class Staff
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if (!$request->session()->get('is_staff')) {
+            abort(403, '权限不足');
+        }
+        return $next($request);
+    }
+}

app/Http/Middleware/User.php

@@ -15,13 +15,22 @@ 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 ($request->input('auth_data')) {
+            $authData = explode(':', base64_decode($request->input('auth_data')));
+            $user = \App\Models\User::where('password', $authData[1])
+                ->where('email', $authData[0])
+                ->first();
             if ($user) {
                 $request->session()->put('email', $user->email);
                 $request->session()->put('id', $user->id);
             }
         }
+//        if ($request->input('lang')) {
+//            $request->session()->put('lang', $request->input('lang'));
+//        }
+//        if ($request->session()->get('lang')) {
+//            App::setLocale($request->session()->get('lang'));
+//        }
         if (!$request->session()->get('id')) {
             abort(403, '未登录或登陆已过期');
         }

app/Http/Requests/Admin/ConfigSave.php

@@ -6,64 +6,6 @@ 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',
-        // site
-        'stop_register' => 'in:0,1',
-        'email_verify' => 'in:0,1',
-        'app_name' => '',
-        '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' => '',
-        // 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',
-        // alipay
-        'alipay_enable' => 'in:0,1',
-        'alipay_appid' => 'nullable|integer|min:16',
-        'alipay_pubkey' => 'max:2048',
-        'alipay_privkey' => 'max:2048',
-        // stripe
-        'stripe_alipay_enable' => 'in:0,1',
-        'stripe_wepay_enable' => 'in:0,1',
-        'stripe_sk_live' => '',
-        'stripe_pk_live' => '',
-        'stripe_webhook_key' => '',
-        'stripe_currency' => 'in:hkd,usd,sgd,eur,gbp',
-        // bitpayx
-        'bitpayx_enable' => 'in:0,1',
-        'bitpayx_appsecret' => '',
-        // paytaro
-        'paytaro_enable' => 'in:0,1',
-        'paytaro_app_id' => '',
-        'paytaro_app_secret' => '',
-        // frontend
-        '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' => '',
-        // email
-        'email_template' => ''
-    ];
-
     /**
      * Get the validation rules that apply to the request.
      *
@@ -71,7 +13,107 @@ class ConfigSave extends FormRequest
      */
     public function rules()
     {
-        return self::RULES;
+        return [
+            // invite & commission
+            'safe_mode_enable' => 'in:0,1',
+            'invite_force' => 'in:0,1',
+            'invite_commission' => 'integer',
+            'invite_gen_limit' => 'integer',
+            'invite_never_expire' => 'in:0,1',
+            'commission_first_time_enable' => 'in:0,1',
+            'commission_auto_check_enable' => 'in:0,1',
+            'commission_withdraw_limit' => 'nullable|numeric',
+            'commission_withdraw_method' => 'nullable|array',
+            'withdraw_close_enable' => 'in:0,1',
+            // site
+            'stop_register' => 'in:0,1',
+            'email_verify' => 'in:0,1',
+            'app_name' => '',
+            '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' => 'nullable|array',
+            'email_gmail_limit_enable' => 'in:0,1',
+            'recaptcha_enable' => 'in:0,1',
+            'recaptcha_key' => '',
+            'recaptcha_site_key' => '',
+            'tos_url' => 'nullable|url',
+            // subscribe
+            'plan_change_enable' => 'in:0,1',
+            'reset_traffic_method' => 'in:0,1',
+            'renew_reset_traffic_enable' => 'in:0,1',
+            'surplus_enable' => 'in:0,1',
+            // server
+            'server_token' => 'nullable|min:16',
+            'server_license' => 'nullable',
+            'server_log_enable' => 'in:0,1',
+            'server_v2ray_domain' => '',
+            'server_v2ray_protocol' => '',
+            // alipay
+            'alipay_enable' => 'in:0,1',
+            'alipay_appid' => 'nullable|integer|min:16',
+            'alipay_pubkey' => 'max:2048',
+            'alipay_privkey' => 'max:2048',
+            // stripe
+            'stripe_alipay_enable' => 'in:0,1',
+            'stripe_wepay_enable' => 'in:0,1',
+            'stripe_card_enable' => 'in:0,1',
+            'stripe_sk_live' => '',
+            'stripe_pk_live' => '',
+            'stripe_webhook_key' => '',
+            'stripe_currency' => 'in:hkd,usd,sgd,eur,gbp,jpy,cad',
+            // bitpayx
+            'bitpayx_name' => '',
+            'bitpayx_enable' => 'in:0,1',
+            'bitpayx_appsecret' => '',
+            // mGate
+            'mgate_name' => '',
+            'mgate_enable' => 'in:0,1',
+            'mgate_url' => 'nullable|url',
+            'mgate_app_id' => '',
+            'mgate_app_secret' => '',
+            // Epay
+            'epay_name' => '',
+            'epay_enable' => 'in:0,1',
+            'epay_url' => 'nullable|url',
+            'epay_pid' => '',
+            'epay_key' => '',
+            // frontend
+            'frontend_theme_sidebar' => 'in:dark,light',
+            'frontend_theme_header' => 'in:dark,light',
+            'frontend_theme_color' => 'in:default,darkblue,black',
+            'frontend_background_url' => 'nullable|url',
+            'frontend_admin_path' => '',
+            'frontend_customer_service_method' => '',
+            'frontend_customer_service_id' => '',
+            // tutorial
+            'apple_id' => 'nullable|email',
+            'apple_id_password' => '',
+            // email
+            'email_template' => '',
+            'email_host' => '',
+            'email_port' => '',
+            'email_username' => '',
+            'email_password' => '',
+            'email_encryption' => '',
+            'email_from_address' => '',
+            // telegram
+            'telegram_bot_enable' => 'in:0,1',
+            'telegram_bot_token' => '',
+            'telegram_discuss_id' => '',
+            'telegram_channel_id' => '',
+            // app
+            'windows_version' => '',
+            'windows_download_url' => '',
+            'macos_version' => '',
+            'macos_download_url' => '',
+            'android_version' => '',
+            'android_download_url' => ''
+        ];
     }
 
     public function messages()
@@ -79,7 +121,9 @@ class ConfigSave extends FormRequest
         // illiteracy prompt
         return [
             'app_url.url' => '站点URL格式不正确，必须携带http(s)://',
-            'subscribe_url.url' => '订阅URL格式不正确，必须携带http(s)://'
+            'subscribe_url.url' => '订阅URL格式不正确，必须携带http(s)://',
+            'server_token.min' => '通讯密钥长度必须大于16位',
+            'tos_url.url' => '服务条款URL格式不正确'
         ];
     }
 }

app/Http/Requests/Admin/CouponGenerate.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class CouponGenerate extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'generate_count' => 'nullable|integer|max:500',
+            'name' => 'required',
+            'type' => 'required|in:1,2',
+            'value' => 'required|integer',
+            'started_at' => 'required|integer',
+            'ended_at' => 'required|integer',
+            'limit_use' => 'nullable|integer',
+            'limit_plan_ids' => 'nullable|array',
+            'code' => ''
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'generate_count.integer' => '生成数量必须为数字',
+            'generate_count.max' => '生成数量最大为500个',
+            'name.required' => '名称不能为空',
+            'type.required' => '类型不能为空',
+            'type.in' => '类型格式有误',
+            'value.required' => '金额或比例不能为空',
+            'value.integer' => '金额或比例格式有误',
+            'started_at.required' => '开始时间不能为空',
+            'started_at.integer' => '开始时间格式有误',
+            'ended_at.required' => '结束时间不能为空',
+            'ended_at.integer' => '结束时间格式有误',
+            'limit_use.integer' => '使用次数格式有误',
+            'limit_plan_ids.array' => '指定订阅格式有误'
+        ];
+    }
+}

app/Http/Requests/Admin/CouponSave.php

@@ -19,7 +19,9 @@ class CouponSave extends FormRequest
             'value' => 'required|integer',
             'started_at' => 'required|integer',
             'ended_at' => 'required|integer',
-            'limit_use' => 'nullable|integer'
+            'limit_use' => 'nullable|integer',
+            'limit_plan_ids' => 'nullable|array',
+            'code' => ''
         ];
     }
 
@@ -35,7 +37,8 @@ class CouponSave extends FormRequest
             'started_at.integer' => '开始时间格式有误',
             'ended_at.required' => '结束时间不能为空',
             'ended_at.integer' => '结束时间格式有误',
-            'limit_use.integer' => '使用次数格式有误'
+            'limit_use.integer' => '使用次数格式有误',
+            'limit_plan_ids.array' => '指定订阅格式有误'
         ];
     }
 }

app/Http/Requests/Admin/KnowledgeCategorySave.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class KnowledgeCategorySave extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name' => 'required',
+            'language' => 'required'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'name.required' => '分类名称不能为空',
+            'language.required' => '分类语言不能为空'
+        ];
+    }
+}

app/Http/Requests/Admin/KnowledgeCategorySort.php

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

app/Http/Requests/Admin/KnowledgeSave.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class KnowledgeSave extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'category' => 'required',
+            'language' => 'required',
+            'title' => 'required',
+            'body' => 'required'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'title.required' => '标题不能为空',
+            'category.required' => '分类不能为空',
+            'body.required' => '内容不能为空',
+            'language.required' => '语言不能为空'
+        ];
+    }
+}

app/Http/Requests/Admin/KnowledgeSort.php

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

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,two_year_price,three_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/OrderFetch.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class OrderFetch extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'filter.*.key' => 'required|in:email,trade_no,status,commission_status,user_id,invite_user_id',
+            'filter.*.condition' => 'required|in:>,<,=,>=,<=,模糊,!=',
+            'filter.*.value' => ''
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'filter.*.key.required' => '过滤键不能为空',
+            'filter.*.key.in' => '过滤键参数有误',
+            'filter.*.condition.required' => '过滤条件不能为空',
+            'filter.*.condition.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,2'
+            'commission_status' => 'in:0,1,3'
         ];
     }
 

app/Http/Requests/Admin/PlanSave.php

@@ -6,17 +6,6 @@ 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'
-    ];
     /**
      * Get the validation rules that apply to the request.
      *
@@ -24,7 +13,20 @@ class PlanSave extends FormRequest
      */
     public function rules()
     {
-        return self::RULES;
+        return [
+            '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',
+            'two_year_price' => 'nullable|integer',
+            'three_year_price' => 'nullable|integer',
+            'onetime_price' => 'nullable|integer',
+            'reset_price' => 'nullable|integer'
+        ];
     }
 
     public function messages()
@@ -39,7 +41,10 @@ class PlanSave extends FormRequest
             'quarter_price.integer' => '季付金额格式有误',
             'half_year_price.integer' => '半年付金额格式有误',
             'year_price.integer' => '年付金额格式有误',
-            'onetime_price.integer' => '一次性金额有误'
+            'two_year_price.integer' => '两年付金额格式有误',
+            'three_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/ServerShadowsocksSave.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ServerShadowsocksSave extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'show' => '',
+            'name' => 'required',
+            'group_id' => 'required|array',
+            'parent_id' => 'nullable|integer',
+            'host' => 'required',
+            'port' => 'required',
+            'server_port' => 'required',
+            'cipher' => 'required|in:aes-128-gcm,aes-256-gcm,chacha20-ietf-poly1305',
+            'tags' => 'nullable|array',
+            'rate' => 'required|numeric'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'name.required' => '节点名称不能为空',
+            'group_id.required' => '权限组不能为空',
+            'group_id.array' => '权限组格式不正确',
+            'parent_id.integer' => '父节点格式不正确',
+            'host.required' => '节点地址不能为空',
+            'port.required' => '连接端口不能为空',
+            'server_port.required' => '后端服务端口不能为空',
+            'cipher.required' => '加密方式不能为空',
+            'tags.array' => '标签格式不正确',
+            'rate.required' => '倍率不能为空',
+            'rate.numeric' => '倍率格式不正确'
+        ];
+    }
+}

app/Http/Requests/Admin/ServerShadowsocksUpdate.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ServerShadowsocksUpdate extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+
+    public function rules()
+    {
+        return [
+            'show' => 'in:0,1'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'show.in' => '显示状态格式不正确'
+        ];
+    }
+}

app/Http/Requests/Admin/ServerTrojanSave.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ServerTrojanSave extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'show' => '',
+            'name' => 'required',
+            'group_id' => 'required|array',
+            'parent_id' => 'nullable|integer',
+            'host' => 'required',
+            'port' => 'required',
+            'server_port' => 'required',
+            'allow_insecure' => 'nullable|in:0,1',
+            'server_name' => 'nullable',
+            'tags' => 'nullable|array',
+            'rate' => 'required|numeric'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'name.required' => '节点名称不能为空',
+            'group_id.required' => '权限组不能为空',
+            'group_id.array' => '权限组格式不正确',
+            'parent_id.integer' => '父节点格式不正确',
+            'host.required' => '节点地址不能为空',
+            'port.required' => '连接端口不能为空',
+            'server_port.required' => '后端服务端口不能为空',
+            'allow_insecure.in' => '允许不安全格式不正确',
+            'tags.array' => '标签格式不正确',
+            'rate.required' => '倍率不能为空',
+            'rate.numeric' => '倍率格式不正确'
+        ];
+    }
+}

app/Http/Requests/Admin/ServerTrojanUpdate.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ServerTrojanUpdate extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+
+    public function rules()
+    {
+        return [
+            'show' => 'in:0,1'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'show.in' => '显示状态格式不正确'
+        ];
+    }
+}

app/Http/Requests/Admin/ServerV2raySave.php

@@ -4,25 +4,8 @@ namespace App\Http\Requests\Admin;
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class ServerSave extends FormRequest
+class ServerV2raySave 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.
      *
@@ -30,7 +13,24 @@ class ServerSave extends FormRequest
      */
     public function rules()
     {
-        return self::RULES;
+        return [
+            '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',
+            'alter_id' => 'required|integer',
+            'network' => 'required|in:tcp,kcp,ws,http,domainsocket,quic',
+            'networkSettings' => '',
+            'ruleSettings' => '',
+            'tlsSettings' => '',
+            'dnsSettings' => ''
+        ];
     }
 
     public function messages()

app/Http/Requests/Admin/ServerV2rayUpdate.php

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

app/Http/Requests/Admin/TutorialSave.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Admin;
-
-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.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return self::RULES;
-    }
-
-    public function messages()
-    {
-        return [
-            'title.required' => '标题不能为空',
-            'category_id.required' => '分类不能为空',
-            'category_id.in' => '分类格式不正确',
-            'steps.required' => '教程步骤不能为空'
-        ];
-    }
-}

app/Http/Requests/Admin/UserFetch.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UserFetch extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'filter.*.key' => 'required|in:id,email,transfer_enable,d,expired_at,uuid,token,invite_by_email,invite_user_id,plan_id,banned',
+            'filter.*.condition' => 'required|in:>,<,=,>=,<=,模糊,!=',
+            'filter.*.value' => 'required'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'filter.*.key.required' => '过滤键不能为空',
+            'filter.*.key.in' => '过滤键参数有误',
+            'filter.*.condition.required' => '过滤条件不能为空',
+            'filter.*.condition.in' => '过滤条件参数有误',
+            'filter.*.value.required' => '过滤值不能为空'
+        ];
+    }
+}

app/Http/Requests/Admin/UserGenerate.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UserGenerate extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'generate_count' => 'nullable|integer|max:500',
+            'expired_at' => 'nullable|integer',
+            'plan_id' => 'nullable|integer',
+            'email_prefix' => 'nullable',
+            'email_suffix' => 'required',
+            'password' => 'nullable'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'generate_count.integer' => '生成数量必须为数字',
+            'generate_count.max' => '生成数量最大为500个'
+        ];
+    }
+}

app/Http/Requests/Admin/UserSendMail.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UserSendMail extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'subject' => 'required',
+            'content' => 'required',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'subject.required' => '主题不能为空',
+            'content.required' => '发送内容不能为空'
+        ];
+    }
+}

app/Http/Requests/Admin/UserUpdate.php

@@ -6,21 +6,6 @@ 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.
      *
@@ -28,7 +13,23 @@ class UserUpdate extends FormRequest
      */
     public function rules()
     {
-        return self::RULES;
+        return [
+            'email' => 'required|email',
+            'password' => 'nullable|min:8',
+            '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',
+            'is_staff' => 'required|in:0,1',
+            'u' => 'integer',
+            'd' => 'integer',
+            'balance' => 'integer',
+            'commission_balance' => 'integer',
+            'remarks' => 'nullable'
+        ];
     }
 
     public function messages()
@@ -42,6 +43,8 @@ class UserUpdate extends FormRequest
             'banned.in' => '是否封禁格式不正确',
             'is_admin.required' => '是否管理员不能为空',
             'is_admin.in' => '是否管理员格式不正确',
+            'is_staff.required' => '是否员工不能为空',
+            'is_staff.in' => '是否员工格式不正确',
             'plan_id.integer' => '订阅计划格式不正确',
             'commission_rate.integer' => '推荐返利比例格式不正确',
             'commission_rate.nullable' => '推荐返利比例格式不正确',
@@ -54,7 +57,8 @@ class UserUpdate extends FormRequest
             'u.integer' => '上行流量格式不正确',
             'd.integer' => '下行流量格式不正确',
             'balance.integer' => '余额格式不正确',
-            'commission_balance.integer' => '佣金格式不正确'
+            'commission_balance.integer' => '佣金格式不正确',
+            'password.min' => '密码长度最小8位'
         ];
     }
 }

app/Http/Requests/Staff/UserUpdate.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Http\Requests\Staff;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UserUpdate extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            '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',
+            'u' => 'integer',
+            'd' => 'integer',
+            'balance' => 'integer',
+            'commission_balance' => 'integer'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'email.required' => '邮箱不能为空',
+            'email.email' => '邮箱格式不正确',
+            'transfer_enable.numeric' => '流量格式不正确',
+            'expired_at.integer' => '到期时间格式不正确',
+            'banned.required' => '是否封禁不能为空',
+            'banned.in' => '是否封禁格式不正确',
+            'plan_id.integer' => '订阅计划格式不正确',
+            'commission_rate.integer' => '推荐返利比例格式不正确',
+            'commission_rate.nullable' => '推荐返利比例格式不正确',
+            'commission_rate.min' => '推荐返利比例最小为0',
+            '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/User/OrderSave.php

@@ -15,7 +15,7 @@ class OrderSave extends FormRequest
     {
         return [
             'plan_id' => 'required',
-            'cycle' => 'required|in:month_price,quarter_price,half_year_price,year_price,onetime_price'
+            'cycle' => 'required|in:month_price,quarter_price,half_year_price,year_price,two_year_price,three_year_price,onetime_price,reset_price'
         ];
     }
 

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',
+            'withdraw_account' => 'required'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'withdraw_method.required' => '提现方式不能为空',
+            'withdraw_method.in' => '提现方式不支持',
+            'withdraw_account.required' => '提现账号不能为空'
+        ];
+    }
+}

app/Http/Requests/User/UserTransfer.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests\User;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class UserTransfer extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'transfer_amount' => 'required|integer|min:1'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'transfer_amount.required' => '划转金额不能为空',
+            'transfer_amount.integer' => __('user.user.transfer.params_wrong'),
+            'transfer_amount.min' => __('user.user.transfer.params_wrong')
+        ];
+    }
+}

app/Http/Routes/AdminRoute.php

@@ -15,31 +15,70 @@ class AdminRoute
             $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->get ('/server/group/fetch', 'Admin\\Server\\GroupController@fetch');
+            $router->post('/server/group/save', 'Admin\\Server\\GroupController@save');
+            $router->post('/server/group/drop', 'Admin\\Server\\GroupController@drop');
+            $router->get ('/server/manage/getNodes', 'Admin\\Server\\ManageController@getNodes');
+            $router->post('/server/manage/sort', 'Admin\\Server\\ManageController@sort');
+            $router->group([
+                'prefix' => 'server/trojan'
+            ], function ($router) {
+                $router->get ('fetch', 'Admin\\Server\\TrojanController@fetch');
+                $router->post('save', 'Admin\\Server\\TrojanController@save');
+                $router->post('drop', 'Admin\\Server\\TrojanController@drop');
+                $router->post('update', 'Admin\\Server\\TrojanController@update');
+                $router->post('copy', 'Admin\\Server\\TrojanController@copy');
+                $router->post('sort', 'Admin\\Server\\TrojanController@sort');
+                $router->post('viewConfig', 'Admin\\Server\\TrojanController@viewConfig');
+            });
+            $router->group([
+                'prefix' => 'server/v2ray'
+            ], function ($router) {
+                $router->get ('fetch', 'Admin\\Server\\V2rayController@fetch');
+                $router->post('save', 'Admin\\Server\\V2rayController@save');
+                $router->post('drop', 'Admin\\Server\\V2rayController@drop');
+                $router->post('update', 'Admin\\Server\\V2rayController@update');
+                $router->post('copy', 'Admin\\Server\\V2rayController@copy');
+                $router->post('sort', 'Admin\\Server\\V2rayController@sort');
+                $router->post('viewConfig', 'Admin\\Server\\V2rayController@viewConfig');
+            });
+            $router->group([
+                'prefix' => 'server/shadowsocks'
+            ], function ($router) {
+                $router->get ('fetch', 'Admin\\Server\\ShadowsocksController@fetch');
+                $router->post('save', 'Admin\\Server\\ShadowsocksController@save');
+                $router->post('drop', 'Admin\\Server\\ShadowsocksController@drop');
+                $router->post('update', 'Admin\\Server\\ShadowsocksController@update');
+                $router->post('copy', 'Admin\\Server\\ShadowsocksController@copy');
+                $router->post('sort', 'Admin\\Server\\ShadowsocksController@sort');
+            });
             // Order
             $router->get ('/order/fetch', 'Admin\\OrderController@fetch');
             $router->post('/order/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->post('/user/generate', 'Admin\\UserController@generate');
+            $router->post('/user/dumpCSV', 'Admin\\UserController@dumpCSV');
+            $router->post('/user/sendMail', 'Admin\\UserController@sendMail');
+            $router->post('/user/ban', 'Admin\\UserController@ban');
+            $router->post('/user/resetSecret', 'Admin\\UserController@resetSecret');
+            $router->post('/user/setInviteUser', 'Admin\\UserController@setInviteUser');
+            // StatOrder
             $router->get ('/stat/getOverride', 'Admin\\StatController@getOverride');
+            $router->get ('/stat/getServerLastRank', 'Admin\\StatController@getServerLastRank');
+            $router->get ('/stat/getOrder', 'Admin\\StatController@getOrder');
             // Notice
             $router->get ('/notice/fetch', 'Admin\\NoticeController@fetch');
             $router->post('/notice/save', 'Admin\\NoticeController@save');
@@ -49,17 +88,23 @@ class AdminRoute
             $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/generate', 'Admin\\CouponController@generate');
             $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');
+            // Knowledge
+            $router->get ('/knowledge/fetch', 'Admin\\KnowledgeController@fetch');
+            $router->get ('/knowledge/getCategory', 'Admin\\KnowledgeController@getCategory');
+            $router->post('/knowledge/save', 'Admin\\KnowledgeController@save');
+            $router->post('/knowledge/show', 'Admin\\KnowledgeController@show');
+            $router->post('/knowledge/drop', 'Admin\\KnowledgeController@drop');
+            $router->post('/knowledge/sort', 'Admin\\KnowledgeController@sort');
+            // Payment
+            $router->get ('/payment/fetch', 'Admin\\PaymentController@fetch');
+            $router->get ('/payment/getPaymentMethods', 'Admin\\PaymentController@getPaymentMethods');
+            $router->post('/payment/getPaymentForm', 'Admin\\PaymentController@getPaymentForm');
+            $router->post('/payment/save', 'Admin\\PaymentController@save');
+            $router->post('/payment/drop', 'Admin\\PaymentController@drop');
         });
     }
 }

app/Http/Routes/ClientRoute.php

@@ -14,8 +14,9 @@ class ClientRoute
             // Client
             $router->get('/subscribe', 'Client\\ClientController@subscribe');
             // App
-            $router->get('/app/data', 'Client\\AppController@data');
             $router->get('/app/config', 'Client\\AppController@config');
+            $router->get('/app/getConfig', 'Client\\AppController@getConfig');
+            $router->get('/app/getVersion', 'Client\\AppController@getVersion');
         });
     }
 }

app/Http/Routes/GuestRoute.php

@@ -12,11 +12,12 @@ class GuestRoute
         ], 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');
+            // Payment
+            $router->match(['get', 'post'], '/payment/notify/{method}/{uuid}', 'Guest\\PaymentController@notify');
+            // Comm
+            $router->get ('/comm/config', 'Guest\\CommController@config');
         });
     }
 }

app/Http/Routes/PassportRoute.php

@@ -10,14 +10,14 @@ class PassportRoute
         $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');
+            $router->post('/auth/getTempToken', 'Passport\\AuthController@getTempToken');
+            $router->post('/auth/getQuickLoginUrl', 'Passport\\AuthController@getQuickLoginUrl');
             // Comm
             $router->get ('/comm/config', 'Passport\\CommController@config');
             $router->post('/comm/sendEmailVerify', 'Passport\\CommController@sendEmailVerify');

app/Http/Routes/StaffRoute.php

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

app/Http/Routes/UserRoute.php

@@ -19,6 +19,7 @@ class UserRoute
             $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');
@@ -33,10 +34,6 @@ class UserRoute
             $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
@@ -44,11 +41,20 @@ class UserRoute
             $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');
+            $router->Post('/comm/getStripePublicKey', 'User\\CommController@getStripePublicKey');
+            // Knowledge
+            $router->get ('/knowledge/fetch', 'User\\KnowledgeController@fetch');
+            $router->get ('/knowledge/getCategory', 'User\\KnowledgeController@getCategory');
         });
     }
 }

app/Jobs/SendEmailJob.php

@@ -7,6 +7,7 @@ use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Mail;
 use App\Models\MailLog;
 
@@ -34,6 +35,15 @@ class SendEmailJob implements ShouldQueue
      */
     public function handle()
     {
+        if (config('v2board.email_host')) {
+            Config::set('mail.host', config('v2board.email_host', env('mail.host')));
+            Config::set('mail.port', config('v2board.email_port', env('mail.port')));
+            Config::set('mail.encryption', config('v2board.email_encryption', env('mail.encryption')));
+            Config::set('mail.username', config('v2board.email_username', env('mail.username')));
+            Config::set('mail.password', config('v2board.email_password', env('mail.password')));
+            Config::set('mail.from.address', config('v2board.email_from_address', env('mail.from.address')));
+            Config::set('mail.from.name', config('v2board.app_name', 'V2Board'));
+        }
         $params = $this->params;
         $email = $params['email'];
         $subject = $params['subject'];

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/Jobs/StatServerJob.php

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

app/Models/Knowledge.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Knowledge extends Model
+{
+    protected $table = 'v2_knowledge';
+    protected $dateFormat = 'U';
+    protected $guarded = ['id'];
+}

app/Models/Payment.php

@@ -4,9 +4,9 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 
-class Tutorial extends Model
+class Payment extends Model
 {
-    protected $table = 'v2_tutorial';
+    protected $table = 'v2_payment';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
 }

app/Models/ServerLog.php

@@ -3,11 +3,10 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
 
 class ServerLog extends Model
 {
     protected $table = 'v2_server_log';
     protected $dateFormat = 'U';
-    protected $dispatchesEvents = [
-    ];
 }

app/Models/ServerShadowsocks.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ServerShadowsocks extends Model
+{
+    protected $table = 'v2_server_shadowsocks';
+    protected $dateFormat = 'U';
+    protected $guarded = ['id'];
+}

app/Models/ServerStat.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ServerStat extends Model
+{
+    protected $table = 'v2_server_stat';
+    protected $dateFormat = 'U';
+    protected $guarded = ['id'];
+}

app/Models/ServerTrojan.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ServerTrojan extends Model
+{
+    protected $table = 'v2_server_trojan';
+    protected $dateFormat = 'U';
+    protected $guarded = ['id'];
+}

app/Models/StatOrder.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class StatOrder extends Model
+{
+    protected $table = 'v2_stat_order';
+    protected $dateFormat = 'U';
+    protected $guarded = ['id'];
+}

app/Models/StatServer.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class StatServer extends Model
+{
+    protected $table = 'v2_stat_server';
+    protected $dateFormat = 'U';
+    protected $guarded = ['id'];
+}

app/Payments/AlipayF2F.php

@@ -0,0 +1,96 @@
+<?php
+
+/**
+ * 自己写别抄，抄NMB抄
+ */
+namespace App\Payments;
+
+use Omnipay\Omnipay;
+
+class AlipayF2F {
+    public function __construct($config)
+    {
+        $this->config = $config;
+    }
+
+    public function form()
+    {
+        return [
+            'app_id' => [
+                'label' => '支付宝APPID',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'private_key' => [
+                'label' => '支付宝私钥',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'public_key' => [
+                'label' => '支付宝公钥',
+                'description' => '',
+                'type' => 'input',
+            ]
+        ];
+    }
+
+    public function pay($order)
+    {
+        $gateway = Omnipay::create('Alipay_AopF2F');
+        $gateway->setSignType('RSA2'); //RSA/RSA2
+        $gateway->setAppId($this->config['app_id']);
+        $gateway->setPrivateKey($this->config['private_key']); // 可以是路径，也可以是密钥内容
+        $gateway->setAlipayPublicKey($this->config['public_key']); // 可以是路径，也可以是密钥内容
+        $gateway->setNotifyUrl($order['notify_url']);
+        $request = $gateway->purchase();
+        $request->setBizContent([
+            'subject' => config('v2board.app_name', 'V2Board') . ' - 订阅',
+            'out_trade_no' => $order['trade_no'],
+            'total_amount' => $order['total_amount'] / 100
+        ]);
+        /** @var \Omnipay\Alipay\Responses\AopTradePreCreateResponse $response */
+        $response = $request->send();
+        $result = $response->getAlipayResponse();
+        if ($result['code'] !== '10000') {
+            abort(500, $result['sub_msg']);
+        }
+        return [
+            'type' => 0, // 0:qrcode 1:url
+            'data' => $response->getQrCode()
+        ];
+    }
+
+    public function notify($params)
+    {
+        $gateway = Omnipay::create('Alipay_AopF2F');
+        $gateway->setSignType('RSA2'); //RSA/RSA2
+        $gateway->setAppId($this->config['app_id']);
+        $gateway->setPrivateKey($this->config['private_key']); // 可以是路径，也可以是密钥内容
+        $gateway->setAlipayPublicKey($this->config['public_key']); // 可以是路径，也可以是密钥内容
+        $request = $gateway->completePurchase();
+        $request->setParams($_POST); //Optional
+        try {
+            /** @var \Omnipay\Alipay\Responses\AopCompletePurchaseResponse $response */
+            $response = $request->send();
+            if ($response->isPaid()) {
+                /**
+                 * Payment is successful
+                 */
+                return [
+                    'trade_no' => $params['out_trade_no'],
+                    'callback_no' => $params['trade_no']
+                ];
+            } else {
+                /**
+                 * Payment is not successful
+                 */
+                return false;
+            }
+        } catch (\Exception $e) {
+            /**
+             * Payment is not successful
+             */
+            return false;
+        }
+    }
+}