Merge pull request #510 from v2board/dev

1.5.5 patch 1

app/Console/Commands/CheckCommission.php

@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Models\CommissionLog;
 use Illuminate\Console\Command;
 use App\Models\Order;
 use App\Models\User;
@@ -59,27 +60,68 @@ class CheckCommission extends Command
 
     public function autoPayCommission()
     {
-        $order = Order::where('commission_status', 1)
+        $orders = Order::where('commission_status', 1)
             ->where('invite_user_id', '!=', NULL)
             ->get();
-        foreach ($order as $item) {
-            $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;
-            }
+        foreach ($orders as $order) {
             DB::beginTransaction();
-            if ($inviter->save()) {
-                $item->commission_status = 2;
-                if (!$item->save()) {
-                    DB::rollBack();
-                    continue;
-                }
-                DB::commit();
+            if (!$this->payHandle($order->invite_user_id, $order)) {
+                DB::rollBack();
+                continue;
             }
+            $order->commission_status = 2;
+            if (!$order->save()) {
+                DB::rollBack();
+                continue;
+            }
+            DB::commit();
         }
     }
 
+    public function payHandle($inviteUserId, Order $order)
+    {
+        if ((int)config('v2board.commission_distribution_enable', 0)) {
+            $level = 3;
+            $commissionShareLevels = [
+                0 => (int)config('v2board.commission_distribution_l1'),
+                1 => (int)config('v2board.commission_distribution_l2'),
+                2 => (int)config('v2board.commission_distribution_l3')
+            ];
+        } else {
+            $level = 3;
+            $commissionShareLevels = [
+                0 => 100
+            ];
+        }
+        for ($l = 0; $l < $level; $l++) {
+            $inviter = User::find($inviteUserId);
+            if (!$inviter) continue;
+            if (!isset($commissionShareLevels[$l])) continue;
+            $commissionBalance = $order->commission_balance * ($commissionShareLevels[$l] / 100);
+            if ((int)config('v2board.withdraw_close_enable', 0)) {
+                $inviter->balance = $inviter->balance + $commissionBalance;
+            } else {
+                $inviter->commission_balance = $inviter->commission_balance + $commissionBalance;
+            }
+            if (!$inviter->save()) {
+                DB::rollBack();
+                return false;
+            }
+            if (!CommissionLog::create([
+                'invite_user_id' => $inviteUserId,
+                'user_id' => $order->user_id,
+                'trade_no' => $order->trade_no,
+                'order_amount' => $order->total_amount,
+                'get_amount' => $commissionBalance
+            ])) {
+                DB::rollBack();
+                return false;
+            }
+            $inviteUserId = $inviter->invite_user_id;
+            // update order actual commission balance
+            $order->actual_commission_balance = $order->actual_commission_balance + $commissionBalance;
+        }
+        return true;
+    }
+
 }

app/Console/Commands/CheckOrder.php

@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Jobs\OrderHandleJob;
 use App\Services\OrderService;
 use Illuminate\Console\Command;
 use App\Models\Order;
@@ -44,21 +45,10 @@ class CheckOrder extends Command
     {
         ini_set('memory_limit', -1);
         $orders = Order::whereIn('status', [0, 1])
+            ->orderBy('created_at', 'ASC')
             ->get();
-        foreach ($orders as $item) {
-            $orderService = new OrderService($item);
-            switch ($item->status) {
-                // cancel
-                case 0:
-                    if (strtotime($item->created_at) <= (time() - 1800)) {
-                        $orderService->cancel();
-                    }
-                    break;
-                case 1:
-                    $orderService->open();
-                    break;
-            }
-
+        foreach ($orders as $order) {
+            OrderHandleJob::dispatch($order->trade_no);
         }
     }
 }

app/Console/Commands/CheckTicket.php

@@ -2,25 +2,24 @@
 
 namespace App\Console\Commands;
 
+use App\Models\Ticket;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
-use App\Models\ServerLog;
 
-class ResetServerLog extends Command
+class CheckTicket extends Command
 {
     /**
      * The name and signature of the console command.
      *
      * @var string
      */
-    protected $signature = 'reset:serverLog';
+    protected $signature = 'check:ticket';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = '节点服务器日志重置';
+    protected $description = '工单检查任务';
 
     /**
      * Create a new command instance.
@@ -39,6 +38,14 @@ class ResetServerLog extends Command
      */
     public function handle()
     {
-        ServerLog::truncate();
+        ini_set('memory_limit', -1);
+        $tickets = Ticket::where('status', 0)
+            ->where('updated_at', '<=', time() - 24 * 3600)
+            ->get();
+        foreach ($tickets as $ticket) {
+            if ($ticket->user_id === $ticket->last_reply_user_id) continue;
+            $ticket->status = 1;
+            $ticket->save();
+        }
     }
 }

app/Console/Commands/ResetTraffic.php

@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Models\Plan;
 use Illuminate\Console\Command;
 use App\Models\User;
 use Illuminate\Support\Facades\DB;
@@ -42,24 +43,54 @@ class ResetTraffic extends Command
      */
     public function handle()
     {
-        DB::beginTransaction();
-        $resetTrafficMethod = config('v2board.reset_traffic_method', 0);
-        switch ((int)$resetTrafficMethod) {
-            // 1 a month
-            case 0:
-                $this->resetByMonthFirstDay();
-                break;
-            // expire day
-            case 1:
-                $this->resetByExpireDay();
-                break;
+        ini_set('memory_limit', -1);
+        $resetMethods = Plan::select(
+            DB::raw("GROUP_CONCAT(`id`) as plan_ids"),
+            DB::raw("reset_traffic_method as method")
+        )
+            ->groupBy('reset_traffic_method')
+            ->get()
+            ->toArray();
+        foreach ($resetMethods as $resetMethod) {
+            $planIds = explode(',', $resetMethod['plan_ids']);
+            switch (true) {
+                case ($resetMethod['method'] === NULL): {
+                    $resetTrafficMethod = config('v2board.reset_traffic_method', 0);
+                    $builder = with(clone($this->builder))->whereIn('plan_id', $planIds);
+                    switch ((int)$resetTrafficMethod) {
+                        // month first day
+                        case 0:
+                            $this->resetByMonthFirstDay($builder);
+                            break;
+                        // expire day
+                        case 1:
+                            $this->resetByExpireDay($builder);
+                            break;
+                        // no action
+                        case 2:
+                            break;
+                    }
+                    break;
+                }
+                case ($resetMethod['method'] === 0): {
+                    $builder = with(clone($this->builder))->whereIn('plan_id', $planIds);
+                    $this->resetByMonthFirstDay($builder);
+                    break;
+                }
+                case ($resetMethod['method'] === 1): {
+                    $builder = with(clone($this->builder))->whereIn('plan_id', $planIds);
+                    $this->resetByExpireDay($builder);
+                    break;
+                }
+                case ($resetMethod['method'] === 2): {
+                    break;
+                }
+            }
         }
-        DB::commit();
     }
 
-    private function resetByMonthFirstDay():void
+    private function resetByMonthFirstDay($builder):void
     {
-        $builder = $this->builder;
         if ((string)date('d') === '01') {
             $builder->update([
                 'u' => 0,
@@ -68,9 +99,8 @@ class ResetTraffic extends Command
         }
     }
 
-    private function resetByExpireDay():void
+    private function resetByExpireDay($builder):void
     {
-        $builder = $this->builder;
         $lastDay = date('d', strtotime('last day of +0 months'));
         $users = [];
         foreach ($builder->get() as $item) {

app/Console/Commands/SendRemindMail.php

@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Services\MailService;
 use Illuminate\Console\Command;
 use App\Models\User;
 use App\Models\MailLog;
@@ -41,23 +42,9 @@ class SendRemindMail extends Command
     public function handle()
     {
         $users = User::all();
+        $mailService = new MailService();
         foreach ($users as $user) {
-            if ($user->remind_expire) $this->remindExpire($user);
-        }
-    }
-
-    private function remindExpire($user)
-    {
-        if ($user->expired_at !== NULL && ($user->expired_at - 86400) < time() && $user->expired_at > time()) {
-            SendEmailJob::dispatch([
-                'email' => $user->email,
-                'subject' => '在' . config('v2board.app_name', 'V2board') . '的服务即将到期',
-                'template_name' => 'remindExpire',
-                'template_value' => [
-                    'name' => config('v2board.app_name', 'V2Board'),
-                    'url' => config('v2board.app_url')
-                ]
-            ]);
+            if ($user->remind_expire) $mailService->remindExpire($user);
         }
     }
 }

app/Console/Commands/Test.php

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

app/Console/Commands/V2boardInstall.php

@@ -47,13 +47,12 @@ class V2boardInstall extends Command
             $this->info(" \ \ / /  __) |  _ \ / _ \ / _` | '__/ _` | ");
             $this->info("  \ V /  / __/| |_) | (_) | (_| | | | (_| | ");
             $this->info("   \_/  |_____|____/ \___/ \__,_|_|  \__,_| ");
-            if (\File::exists(base_path() . '/.lock')) {
-                abort(500, 'V2board 已安装，如需重新安装请删除目录下.lock文件');
+            if (\File::exists(base_path() . '/.env')) {
+                abort(500, 'V2board 已安装，如需重新安装请删除目录下.env文件');
             }
-            if (!\File::exists(base_path() . '/.env')) {
-                if (!copy(base_path() . '/.env.example', base_path() . '/.env')) {
-                    abort(500, '复制环境文件失败，请检查目录权限');
-                }
+
+            if (!copy(base_path() . '/.env.example', base_path() . '/.env')) {
+                abort(500, '复制环境文件失败，请检查目录权限');
             }
             $this->saveToEnv([
                 'APP_KEY' => 'base64:' . base64_encode(Encrypter::generateKey('AES-256-CBC')),
@@ -100,7 +99,6 @@ class V2boardInstall extends Command
 
             $this->info('一切就绪');
             $this->info('访问 http(s)://你的站点/admin 进入管理面板');
-            \File::put(base_path() . '/.lock', time());
         } catch (\Exception $e) {
             $this->error($e->getMessage());
         }

app/Console/Commands/V2boardStatistics.php

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

app/Console/Commands/V2boardUpdate.php

@@ -51,11 +51,12 @@ class V2boardUpdate extends Command
         }
         $this->info('正在导入数据库请稍等...');
         foreach ($sql as $item) {
+            if (!$item) continue;
             try {
                 DB::select(DB::raw($item));
             } catch (\Exception $e) {
             }
         }
-        $this->info('更新完毕');
+        $this->info('更新完毕，请重新启动队列服务。');
     }
 }

app/Console/Kernel.php

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

app/Exceptions/Handler.php

@@ -2,8 +2,8 @@
 
 namespace App\Exceptions;
 
-use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {
@@ -29,10 +29,12 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param \Exception $exception
+     * @param  \Throwable  $exception
      * @return void
+     *
+     * @throws \Throwable
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
@@ -40,16 +42,14 @@ class Handler extends ExceptionHandler
     /**
      * Render an exception into an HTTP response.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Exception $exception
-     * @return \Illuminate\Http\Response
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Throwable  $exception
+     * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws \Throwable
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
-        if($exception instanceof \Illuminate\Http\Exceptions\ThrottleRequestsException) {
-            abort(429, '请求频繁，请稍后再试');
-        }
         return parent::render($request, $exception);
     }
-
 }

app/Http/Controllers/Admin/ConfigController.php

@@ -3,10 +3,12 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\Admin\ConfigSave;
+use App\Jobs\SendEmailJob;
 use App\Services\TelegramService;
 use Illuminate\Http\Request;
 use App\Utils\Dict;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Mail;
 
 class ConfigController extends Controller
 {
@@ -32,6 +34,24 @@ class ConfigController extends Controller
         ]);
     }
 
+    public function testSendMail(Request $request)
+    {
+        $obj = new SendEmailJob([
+            'email' => $request->session()->get('email'),
+            'subject' => 'This is v2board test email',
+            'template_name' => 'notify',
+            'template_value' => [
+                'name' => config('v2board.app_name', 'V2Board'),
+                'content' => 'This is v2board test email',
+                'url' => config('v2board.app_url')
+            ]
+        ]);
+        return response([
+            'data' => true,
+            'log' => $obj->handle()
+        ]);
+    }
+
     public function setTelegramWebhook(Request $request)
     {
         $telegramService = new TelegramService($request->input('telegram_bot_token'));
@@ -60,7 +80,11 @@ class ConfigController extends Controller
                     '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)
+                    'withdraw_close_enable' => config('v2board.withdraw_close_enable', 0),
+                    'commission_distribution_enable' => config('v2board.commission_distribution_enable', 0),
+                    'commission_distribution_l1' => config('v2board.commission_distribution_l1'),
+                    'commission_distribution_l2' => config('v2board.commission_distribution_l2'),
+                    'commission_distribution_l3' => config('v2board.commission_distribution_l3')
                 ],
                 'site' => [
                     'safe_mode_enable' => (int)config('v2board.safe_mode_enable', 0),
@@ -78,7 +102,9 @@ class ConfigController extends Controller
                     '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')
+                    'tos_url' => config('v2board.tos_url'),
+                    'currency' => config('v2board.currency', 'CNY'),
+                    'currency_symbol' => config('v2board.currency_symbol', '¥')
                 ],
                 'subscribe' => [
                     'plan_change_enable' => (int)config('v2board.plan_change_enable', 1),
@@ -136,9 +162,6 @@ class ConfigController extends Controller
                     '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_host' => config('v2board.email_host'),
@@ -150,7 +173,8 @@ class ConfigController extends Controller
                 ],
                 'telegram' => [
                     'telegram_bot_enable' => config('v2board.telegram_bot_enable', 0),
-                    'telegram_bot_token' => config('v2board.telegram_bot_token')
+                    'telegram_bot_token' => config('v2board.telegram_bot_token'),
+                    'telegram_discuss_link' => config('v2board.telegram_discuss_link')
                 ],
                 'app' => [
                     'windows_version' => config('v2board.windows_version'),
@@ -166,7 +190,7 @@ class ConfigController extends Controller
 
     public function save(ConfigSave $request)
     {
-        $data = $request->input();
+        $data = $request->validated();
         $array = \Config::get('v2board');
         foreach ($data as $k => $v) {
             if (!in_array($k, array_keys($request->validated()))) {

app/Http/Controllers/Admin/CouponController.php

@@ -19,40 +19,29 @@ class CouponController extends Controller
         $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';
+        $sort = $request->input('sort') ? $request->input('sort') : 'id';
         $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' => $coupons,
             'total' => $total
         ]);
     }
 
-    public function save(CouponSave $request)
+    public function show(Request $request)
     {
-        $params = $request->validated();
-        if (isset($params['limit_plan_ids'])) {
-            $params['limit_plan_ids'] = json_encode($params['limit_plan_ids']);
+        if (empty($request->input('id'))) {
+            abort(500, '参数有误');
         }
-        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, '保存失败');
-            }
+        $coupon = Coupon::find($request->input('id'));
+        if (!$coupon) {
+            abort(500, '优惠券不存在');
+        }
+        $coupon->show = $coupon->show ? 0 : 1;
+        if (!$coupon->save()) {
+            abort(500, '保存失败');
         }
 
         return response([
@@ -68,9 +57,6 @@ class CouponController extends Controller
         }
 
         $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);
@@ -95,9 +81,6 @@ class CouponController extends Controller
     {
         $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++) {
@@ -118,7 +101,7 @@ class CouponController extends Controller
             $endTime = date('Y-m-d H:i:s', $coupon['ended_at']);
             $limitUse = $coupon['limit_use'] ?? '不限制';
             $createTime = date('Y-m-d H:i:s', $coupon['created_at']);
-            $limitPlanIds = $coupon['limit_plan_ids'] ?? '不限制';
+            $limitPlanIds = isset($coupon['limit_plan_ids']) ? implode("/", $coupon['limit_plan_ids']) : '不限制';
             $data .= "{$coupon['name']},{$type},{$value},{$startTime},{$endTime},{$limitUse},{$limitPlanIds},{$coupon['code']},{$createTime}\r\n";
         }
         echo $data;

app/Http/Controllers/Admin/NoticeController.php

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

app/Http/Controllers/Admin/OrderController.php

@@ -5,7 +5,9 @@ namespace App\Http\Controllers\Admin;
 use App\Http\Requests\Admin\OrderAssign;
 use App\Http\Requests\Admin\OrderUpdate;
 use App\Http\Requests\Admin\OrderFetch;
+use App\Models\CommissionLog;
 use App\Services\OrderService;
+use App\Services\UserService;
 use App\Utils\Helper;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
@@ -35,6 +37,19 @@ class OrderController extends Controller
         }
     }
 
+    public function detail(Request $request)
+    {
+        $order = Order::find($request->input('id'));
+        if (!$order) abort(500, '订单不存在');
+        $order['commission_log'] = CommissionLog::where('trade_no', $order->trade_no)->get();
+        if ($order->surplus_order_ids) {
+            $order['surplus_orders'] = Order::whereIn('id', $order->surplus_order_ids)->get();
+        }
+        return response([
+            'data' => $order
+        ]);
+    }
+
     public function fetch(OrderFetch $request)
     {
         $current = $request->input('current') ? $request->input('current') : 1;
@@ -63,10 +78,45 @@ class OrderController extends Controller
         ]);
     }
 
+    public function paid(Request $request)
+    {
+        $order = Order::where('trade_no', $request->input('trade_no'))
+            ->first();
+        if (!$order) {
+            abort(500, '订单不存在');
+        }
+        if ($order->status !== 0) abort(500, '只能对待支付的订单进行操作');
+
+        $orderService = new OrderService($order);
+        if (!$orderService->paid('manual_operation')) {
+            abort(500, '更新失败');
+        }
+        return response([
+            'data' => true
+        ]);
+    }
+
+    public function cancel(Request $request)
+    {
+        $order = Order::where('trade_no', $request->input('trade_no'))
+            ->first();
+        if (!$order) {
+            abort(500, '订单不存在');
+        }
+        if ($order->status !== 0) abort(500, '只能对待支付的订单进行操作');
+
+        $orderService = new OrderService($order);
+        if (!$orderService->cancel()) {
+            abort(500, '更新失败');
+        }
+        return response([
+            'data' => true
+        ]);
+    }
+
     public function update(OrderUpdate $request)
     {
         $params = $request->only([
-            'status',
             'commission_status'
         ]);
 
@@ -76,16 +126,6 @@ class OrderController extends Controller
             abort(500, '订单不存在');
         }
 
-        if (isset($params['status']) && (int)$params['status'] === 2) {
-            $orderService = new OrderService($order);
-            if (!$orderService->cancel()) {
-                abort(500, '更新失败');
-            }
-            return response([
-                'data' => true
-            ]);
-        }
-
         try {
             $order->update($params);
         } catch (\Exception $e) {
@@ -97,26 +137,6 @@ class OrderController extends Controller
         ]);
     }
 
-    public function repair(Request $request)
-    {
-        if (empty($request->input('trade_no'))) {
-            abort(500, '参数错误');
-        }
-        $order = Order::where('trade_no', $request->input('trade_no'))
-            ->where('status', 0)
-            ->first();
-        if (!$order) {
-            abort(500, '订单不存在或订单已支付');
-        }
-        $order->status = 1;
-        if (!$order->save()) {
-            abort(500, '保存失败');
-        }
-        return response([
-            'data' => true
-        ]);
-    }
-
     public function assign(OrderAssign $request)
     {
         $plan = Plan::find($request->input('plan_id'));
@@ -130,16 +150,21 @@ class OrderController extends Controller
             abort(500, '该订阅不存在');
         }
 
+        $userService = new UserService();
+        if ($userService->isNotCompleteOrderByUserId($user->id)) {
+            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->period = $request->input('period');
         $order->trade_no = Helper::guid();
         $order->total_amount = $request->input('total_amount');
 
-        if ($order->cycle === 'reset_price') {
+        if ($order->period === 'reset_price') {
             $order->type = 4;
         } else if ($user->plan_id !== NULL && $order->plan_id !== $user->plan_id) {
             $order->type = 3;

app/Http/Controllers/Admin/PaymentController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Http\Requests\Admin\PaymentSave;
 use App\Services\PaymentService;
 use App\Utils\Helper;
 use Illuminate\Http\Request;
@@ -25,7 +26,12 @@ class PaymentController extends Controller
     {
         $payments = Payment::all();
         foreach ($payments as $k => $v) {
-            $payments[$k]['notify_url'] = url("/api/v1/guest/payment/notify/{$v->payment}/{$v->uuid}");
+            $notifyUrl = url("/api/v1/guest/payment/notify/{$v->payment}/{$v->uuid}");
+            if ($v->notify_domain) {
+                $parseUrl = parse_url($notifyUrl);
+                $notifyUrl = $v->notify_domain . $parseUrl['path'];
+            }
+            $payments[$k]['notify_url'] = $notifyUrl;
         }
         return response([
             'data' => $payments
@@ -42,6 +48,9 @@ class PaymentController extends Controller
 
     public function save(Request $request)
     {
+        if (!config('v2board.app_url')) {
+            abort(500, '请在站点配置中配置站点地址');
+        }
         if ($request->input('id')) {
             $payment = Payment::find($request->input('id'));
             if (!$payment) abort(500, '支付方式不存在');
@@ -54,12 +63,20 @@ class PaymentController extends Controller
                 'data' => true
             ]);
         }
-        if (!Payment::create([
-            'name' => $request->input('name'),
-            'payment' => $request->input('payment'),
-            'config' => $request->input('config'),
-            'uuid' => Helper::guid()
-        ])) {
+        $params = $request->validate([
+            'name' => 'required',
+            'icon' => 'nullable',
+            'payment' => 'required',
+            'config' => 'required',
+            'notify_domain' => 'nullable|url'
+        ], [
+            'name.required' => '显示名称不能为空',
+            'payment.required' => '网关参数不能为空',
+            'config.required' => '配置参数不能为空',
+            'notify_domain.url' => '自定义通知域名格式有误'
+        ]);
+        $params['uuid'] = Helper::randomChar(8);
+        if (!Payment::create($params)) {
             abort(500, '保存失败');
         }
         return response([

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

@@ -3,9 +3,12 @@
 namespace App\Http\Controllers\Admin\Server;
 
 use App\Models\Plan;
-use App\Models\Server;
+use App\Models\ServerShadowsocks;
+use App\Models\ServerTrojan;
+use App\Models\ServerV2ray;
 use App\Models\ServerGroup;
 use App\Models\User;
+use App\Services\ServerService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
@@ -18,8 +21,20 @@ class GroupController extends Controller
                 'data' => [ServerGroup::find($request->input('group_id'))]
             ]);
         }
+        $serverGroups = ServerGroup::get();
+        $serverService = new ServerService();
+        $servers = $serverService->getAllServers();
+        foreach ($serverGroups as $k => $v) {
+            $serverGroups[$k]['user_count'] = User::where('group_id', $v['id'])->count();
+            $serverGroups[$k]['server_count'] = 0;
+            foreach ($servers as $server) {
+                if (in_array($v['id'], $server['group_id'])) {
+                    $serverGroups[$k]['server_count'] = $serverGroups[$k]['server_count']+1;
+                }
+            }
+        }
         return response([
-            'data' => ServerGroup::get()
+            'data' => $serverGroups
         ]);
     }
 
@@ -50,10 +65,9 @@ class GroupController extends Controller
             }
         }
 
-        $servers = Server::all();
+        $servers = ServerV2ray::all();
         foreach ($servers as $server) {
-            $groupId = json_decode($server->group_id);
-            if (in_array($request->input('id'), $groupId)) {
+            if (in_array($request->input('id'), $server->group_id)) {
                 abort(500, '该组已被节点所使用，无法删除');
             }
         }

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

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

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

@@ -14,11 +14,6 @@ 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) {

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

@@ -14,11 +14,6 @@ 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) {

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

@@ -7,44 +7,16 @@ use App\Http\Requests\Admin\ServerV2rayUpdate;
 use App\Services\ServerService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use App\Models\Server;
+use App\Models\ServerV2ray;
 
 class V2rayController extends Controller
 {
     public function save(ServerV2raySave $request)
     {
         $params = $request->validated();
-        $params['group_id'] = json_encode($params['group_id']);
-        if (isset($params['tags'])) {
-            $params['tags'] = json_encode($params['tags']);
-        }
-
-        if (isset($params['dnsSettings'])) {
-            if (!is_object(json_decode($params['dnsSettings']))) {
-                abort(500, 'DNS规则配置格式不正确');
-            }
-        }
-
-        if (isset($params['ruleSettings'])) {
-            if (!is_object(json_decode($params['ruleSettings']))) {
-                abort(500, '审计规则配置格式不正确');
-            }
-        }
-
-        if (isset($params['networkSettings'])) {
-            if (!is_object(json_decode($params['networkSettings']))) {
-                abort(500, '传输协议配置格式不正确');
-            }
-        }
-
-        if (isset($params['tlsSettings'])) {
-            if (!is_object(json_decode($params['tlsSettings']))) {
-                abort(500, 'TLS配置格式不正确');
-            }
-        }
 
         if ($request->input('id')) {
-            $server = Server::find($request->input('id'));
+            $server = ServerV2ray::find($request->input('id'));
             if (!$server) {
                 abort(500, '服务器不存在');
             }
@@ -58,7 +30,7 @@ class V2rayController extends Controller
             ]);
         }
 
-        if (!Server::create($params)) {
+        if (!ServerV2ray::create($params)) {
             abort(500, '创建失败');
         }
 
@@ -70,7 +42,7 @@ class V2rayController extends Controller
     public function drop(Request $request)
     {
         if ($request->input('id')) {
-            $server = Server::find($request->input('id'));
+            $server = ServerV2ray::find($request->input('id'));
             if (!$server) {
                 abort(500, '节点ID不存在');
             }
@@ -86,7 +58,7 @@ class V2rayController extends Controller
             'show',
         ]);
 
-        $server = Server::find($request->input('id'));
+        $server = ServerV2ray::find($request->input('id'));
 
         if (!$server) {
             abort(500, '该服务器不存在');
@@ -104,12 +76,12 @@ class V2rayController extends Controller
 
     public function copy(Request $request)
     {
-        $server = Server::find($request->input('id'));
+        $server = ServerV2ray::find($request->input('id'));
         $server->show = 0;
         if (!$server) {
             abort(500, '服务器不存在');
         }
-        if (!Server::create($server->toArray())) {
+        if (!ServerV2ray::create($server->toArray())) {
             abort(500, '复制失败');
         }
 

app/Http/Controllers/Admin/StatController.php

@@ -8,7 +8,7 @@ use App\Services\ServerService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\ServerGroup;
-use App\Models\Server;
+use App\Models\ServerV2ray;
 use App\Models\Plan;
 use App\Models\User;
 use App\Models\Ticket;
@@ -31,9 +31,9 @@ class StatController extends Controller
                 'month_register_total' => User::where('created_at', '>=', strtotime(date('Y-m-1')))
                     ->where('created_at', '<', time())
                     ->count(),
-                'ticket_pendding_total' => Ticket::where('status', 0)
+                'ticket_pending_total' => Ticket::where('status', 0)
                     ->count(),
-                'commission_pendding_total' => Order::where('commission_status', 0)
+                'commission_pending_total' => Order::where('commission_status', 0)
                     ->where('invite_user_id', '!=', NULL)
                     ->whereNotIn('status', [0, 2])
                     ->where('commission_balance', '>', 0)
@@ -91,7 +91,7 @@ class StatController extends Controller
     {
         $servers = [
             'shadowsocks' => ServerShadowsocks::where('parent_id', null)->get()->toArray(),
-            'vmess' => Server::where('parent_id', null)->get()->toArray(),
+            'vmess' => ServerV2ray::where('parent_id', null)->get()->toArray(),
             'trojan' => ServerTrojan::where('parent_id', null)->get()->toArray()
         ];
         $timestamp = strtotime('-1 day', strtotime(date('Y-m-d')));

app/Http/Controllers/Admin/SystemController.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Models\ServerShadowsocks;
+use App\Models\ServerTrojan;
+use App\Services\ServerService;
+use App\Utils\CacheKey;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\ServerGroup;
+use App\Models\ServerV2ray;
+use App\Models\Plan;
+use App\Models\User;
+use App\Models\Ticket;
+use App\Models\Order;
+use App\Models\StatOrder;
+use App\Models\StatServer;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Http;
+use Laravel\Horizon\Contracts\MasterSupervisorRepository;
+
+class SystemController extends Controller
+{
+    public function getStatus()
+    {
+        return response([
+            'data' => [
+                'schedule' => $this->getScheduleStatus(),
+                'horizon' => $this->getHorizonStatus()
+            ]
+        ]);
+    }
+
+    protected function getScheduleStatus():bool
+    {
+        return (time() - 120) < Cache::get(CacheKey::get('SCHEDULE_LAST_CHECK_AT', null));
+    }
+
+    protected function getHorizonStatus():bool
+    {
+        if (! $masters = app(MasterSupervisorRepository::class)->all()) {
+            return false;
+        }
+
+        return collect($masters)->contains(function ($master) {
+            return $master->status === 'paused';
+        }) ? false : true;
+    }
+}
+

app/Http/Controllers/Admin/UserController.php

@@ -30,20 +30,22 @@ class UserController extends Controller
 
     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;
+        $filters = $request->input('filter');
+        if ($filters) {
+            foreach ($filters as $k => $filter) {
+                if ($filter['condition'] === '模糊') {
+                    $filter['condition'] = 'like';
+                    $filter['value'] = "%{$filter['value']}%";
                 }
                 if ($filter['key'] === 'd' || $filter['key'] === 'transfer_enable') {
                     $filter['value'] = $filter['value'] * 1073741824;
                 }
-                if ($filter['condition'] === '模糊') {
-                    $filter['condition'] = 'like';
-                    $filter['value'] = "%{$filter['value']}%";
+                if ($filter['key'] === 'invite_by_email') {
+                    $user = User::where('email', $filter['condition'], $filter['value'])->first();
+                    $inviteUserId = isset($user->id) ? $user->id : 0;
+                    $builder->where('invite_user_id', $inviteUserId);
+                    unset($filters[$k]);
+                    continue;
                 }
                 $builder->where($filter['key'], $filter['condition'], $filter['value']);
             }
@@ -56,7 +58,11 @@ class UserController extends Controller
         $pageSize = $request->input('pageSize') >= 10 ? $request->input('pageSize') : 10;
         $sortType = in_array($request->input('sort_type'), ['ASC', 'DESC']) ? $request->input('sort_type') : 'DESC';
         $sort = $request->input('sort') ? $request->input('sort') : 'created_at';
-        $userModel = User::orderBy($sort, $sortType);
+        $userModel = User::select(
+            DB::raw('*'),
+            DB::raw('(u+d) as total_used')
+        )
+            ->orderBy($sort, $sortType);
         $this->filter($request, $userModel);
         $total = $userModel->count();
         $res = $userModel->forPage($current, $pageSize)
@@ -68,7 +74,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'];
+            $res[$i]['subscribe_url'] = Helper::getSubscribeHost() . '/api/v1/client/subscribe?token=' . $res[$i]['token'];
         }
         return response([
             'data' => $res,
@@ -179,6 +185,9 @@ class UserController extends Controller
                 'uuid' => Helper::guid(true),
                 'token' => Helper::guid()
             ];
+            if (User::where('email', $user['email'])->first()) {
+                abort(500, '邮箱已存在于系统中');
+            }
             $user['password'] = password_hash($request->input('password') ?? $user['email'], PASSWORD_DEFAULT);
             if (!User::create($user)) {
                 abort(500, '生成失败');
@@ -251,7 +260,8 @@ class UserController extends Controller
                     'url' => config('v2board.app_url'),
                     'content' => $request->input('content')
                 ]
-            ]);
+            ],
+            'send_email_mass');
         }
 
         return response([

app/Http/Controllers/Client/AppController.php

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

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

@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Client\Protocols;
 
 class AnXray
 {
-    public $flag = 'anxray';
+    public $flag = 'axxray';
     private $servers;
     private $user;
 
@@ -64,15 +64,21 @@ class AnXray
             "encryption" => "none",
             "type" => urlencode($server['network']),
             "security" => $server['tls'] ? "tls" : "",
-            "sni" => $server['tls'] ? urlencode(json_decode($server['tlsSettings'], true)['serverName']) : ""
         ];
+        if ($server['tls']) {
+            if ($server['tlsSettings']) {
+                $tlsSettings = $server['tlsSettings'];
+                if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
+                    $config['sni'] = urlencode($tlsSettings['serverName']);
+            }
+        }
         if ((string)$server['network'] === 'ws') {
-            $wsSettings = json_decode($server['networkSettings'], true);
+            $wsSettings = $server['networkSettings'];
             if (isset($wsSettings['path'])) $config['path'] = urlencode($wsSettings['path']);
             if (isset($wsSettings['headers']['Host'])) $config['host'] = urlencode($wsSettings['headers']['Host']);
         }
         if ((string)$server['network'] === 'grpc') {
-            $grpcSettings = json_decode($server['networkSettings'], true);
+            $grpcSettings = $server['networkSettings'];
             if (isset($grpcSettings['serviceName'])) $config['serviceName'] = urlencode($grpcSettings['serviceName']);
         }
         return "vmess://" . $uuid . "@" . $server['host'] . ":" . $server['port'] . "?" . http_build_query($config) . "#" . urlencode($server['name']) . "\r\n";

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

@@ -20,7 +20,10 @@ class Clash
     {
         $servers = $this->servers;
         $user = $this->user;
+        $appName = config('v2board.app_name', 'V2Board');
         header("subscription-userinfo: upload={$user['u']}; download={$user['d']}; total={$user['transfer_enable']}; expire={$user['expired_at']}");
+        header('profile-update-interval: 24');
+        header("content-disposition:attachment;filename={$appName}");
         $defaultConfig = base_path() . '/resources/rules/default.clash.yaml';
         $customConfig = base_path() . '/resources/rules/custom.clash.yaml';
         if (\File::exists($customConfig)) {
@@ -48,9 +51,27 @@ class Clash
 
         $config['proxies'] = array_merge($config['proxies'] ? $config['proxies'] : [], $proxy);
         foreach ($config['proxy-groups'] as $k => $v) {
-            if (!is_array($config['proxy-groups'][$k]['proxies'])) continue;
+            if (!is_array($config['proxy-groups'][$k]['proxies'])) $config['proxy-groups'][$k]['proxies'] = [];
+            $isFilter = false;
+            foreach ($config['proxy-groups'][$k]['proxies'] as $src) {
+                foreach ($proxies as $dst) {
+                    if (!$this->isRegex($src)) continue;
+                    $isFilter = true;
+                    $config['proxy-groups'][$k]['proxies'] = array_values(array_diff($config['proxy-groups'][$k]['proxies'], [$src]));
+                    if ($this->isMatch($src, $dst)) {
+                        array_push($config['proxy-groups'][$k]['proxies'], $dst);
+                    }
+                }
+                if ($isFilter) continue;
+            }
+            if ($isFilter) continue;
             $config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
         }
+        // Force the current subscription domain to be a direct rule
+        $subsDomain = $_SERVER['SERVER_NAME'];
+        $subsDomainRule = "DOMAIN,{$subsDomain},DIRECT";
+        array_unshift($config['rules'], $subsDomainRule);
+
         $yaml = Yaml::dump($config);
         $yaml = str_replace('$app_name', config('v2board.app_name', 'V2Board'), $yaml);
         return $yaml;
@@ -77,14 +98,14 @@ class Clash
         $array['server'] = $server['host'];
         $array['port'] = $server['port'];
         $array['uuid'] = $uuid;
-        $array['alterId'] = $server['alter_id'];
+        $array['alterId'] = 0;
         $array['cipher'] = 'auto';
         $array['udp'] = true;
 
         if ($server['tls']) {
             $array['tls'] = true;
             if ($server['tlsSettings']) {
-                $tlsSettings = json_decode($server['tlsSettings'], true);
+                $tlsSettings = $server['tlsSettings'];
                 if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure']))
                     $array['skip-cert-verify'] = ($tlsSettings['allowInsecure'] ? true : false);
                 if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
@@ -94,7 +115,13 @@ class Clash
         if ($server['network'] === 'ws') {
             $array['network'] = 'ws';
             if ($server['networkSettings']) {
-                $wsSettings = json_decode($server['networkSettings'], true);
+                $wsSettings = $server['networkSettings'];
+                $array['ws-opts'] = [];
+                if (isset($wsSettings['path']) && !empty($wsSettings['path']))
+                    $array['ws-opts']['path'] = $wsSettings['path'];
+                if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
+                    $array['ws-opts']['headers'] = ['Host' => $wsSettings['headers']['Host']];
+                // TODO: 2022.06.01 remove it
                 if (isset($wsSettings['path']) && !empty($wsSettings['path']))
                     $array['ws-path'] = $wsSettings['path'];
                 if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
@@ -104,9 +131,9 @@ class Clash
         if ($server['network'] === 'grpc') {
             $array['network'] = 'grpc';
             if ($server['networkSettings']) {
-                $grpcObject = json_decode($server['networkSettings'], true);
+                $grpcSettings = $server['networkSettings'];
                 $array['grpc-opts'] = [];
-                $array['grpc-opts']['grpc-service-name'] = $grpcObject['serviceName'];
+                $array['grpc-opts']['grpc-service-name'] = $grpcSettings['serviceName'];
             }
         }
 
@@ -126,4 +153,14 @@ class Clash
         if (!empty($server['allow_insecure'])) $array['skip-cert-verify'] = ($server['allow_insecure'] ? true : false);
         return $array;
     }
+
+    private function isMatch($exp, $str)
+    {
+        return @preg_match($exp, $str);
+    }
+
+    private function isRegex($exp)
+    {
+        return @preg_match($exp, null) !== false;
+    }
 }

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

@@ -54,7 +54,7 @@ class Passwall
             "add" => $server['host'],
             "port" => (string)$server['port'],
             "id" => $uuid,
-            "aid" => (string)$server['alter_id'],
+            "aid" => '0',
             "net" => $server['network'],
             "type" => "none",
             "host" => "",
@@ -63,19 +63,19 @@ class Passwall
         ];
         if ($server['tls']) {
             if ($server['tlsSettings']) {
-                $tlsSettings = json_decode($server['tlsSettings'], true);
+                $tlsSettings = $server['tlsSettings'];
                 if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
                     $config['sni'] = $tlsSettings['serverName'];
             }
         }
         if ((string)$server['network'] === 'ws') {
-            $wsSettings = json_decode($server['networkSettings'], true);
+            $wsSettings = $server['networkSettings'];
             if (isset($wsSettings['path'])) $config['path'] = $wsSettings['path'];
             if (isset($wsSettings['headers']['Host'])) $config['host'] = $wsSettings['headers']['Host'];
         }
         if ((string)$server['network'] === 'grpc') {
-            $grpcSettings = json_decode($server['networkSettings'], true);
-            if (isset($grpcSettings['path'])) $config['path'] = $grpcSettings['serviceName'];
+            $grpcSettings = $server['networkSettings'];
+            if (isset($grpcSettings['serviceName'])) $config['path'] = $grpcSettings['serviceName'];
         }
         return "vmess://" . base64_encode(json_encode($config)) . "\r\n";
     }

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

@@ -66,7 +66,7 @@ class QuantumultX
             if ($server['network'] === 'tcp')
                 array_push($config, 'obfs=over-tls');
             if ($server['tlsSettings']) {
-                $tlsSettings = json_decode($server['tlsSettings'], true);
+                $tlsSettings = $server['tlsSettings'];
                 if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure']))
                     array_push($config, 'tls-verification=' . ($tlsSettings['allowInsecure'] ? 'false' : 'true'));
                 if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
@@ -79,7 +79,7 @@ class QuantumultX
             else
                 array_push($config, 'obfs=ws');
             if ($server['networkSettings']) {
-                $wsSettings = json_decode($server['networkSettings'], true);
+                $wsSettings = $server['networkSettings'];
                 if (isset($wsSettings['path']) && !empty($wsSettings['path']))
                     array_push($config, "obfs-uri={$wsSettings['path']}");
                 if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']) && !isset($host))

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

@@ -54,7 +54,7 @@ class SSRPlus
             "add" => $server['host'],
             "port" => (string)$server['port'],
             "id" => $uuid,
-            "aid" => (string)$server['alter_id'],
+            "aid" => '0',
             "net" => $server['network'],
             "type" => "none",
             "host" => "",
@@ -63,19 +63,19 @@ class SSRPlus
         ];
         if ($server['tls']) {
             if ($server['tlsSettings']) {
-                $tlsSettings = json_decode($server['tlsSettings'], true);
+                $tlsSettings = $server['tlsSettings'];
                 if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
                     $config['sni'] = $tlsSettings['serverName'];
             }
         }
         if ((string)$server['network'] === 'ws') {
-            $wsSettings = json_decode($server['networkSettings'], true);
+            $wsSettings = $server['networkSettings'];
             if (isset($wsSettings['path'])) $config['path'] = $wsSettings['path'];
             if (isset($wsSettings['headers']['Host'])) $config['host'] = $wsSettings['headers']['Host'];
         }
         if ((string)$server['network'] === 'grpc') {
-            $grpcSettings = json_decode($server['networkSettings'], true);
-            if (isset($grpcSettings['path'])) $config['path'] = $grpcSettings['serviceName'];
+            $grpcSettings = $server['networkSettings'];
+            if (isset($grpcSettings['serviceName'])) $config['path'] = $grpcSettings['serviceName'];
         }
         return "vmess://" . base64_encode(json_encode($config)) . "\r\n";
     }

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

@@ -58,12 +58,12 @@ class Shadowrocket
         $config = [
             'tfo' => 1,
             'remark' => $server['name'],
-            'alterId' => $server['alter_id']
+            'alterId' => 0
         ];
         if ($server['tls']) {
             $config['tls'] = 1;
             if ($server['tlsSettings']) {
-                $tlsSettings = json_decode($server['tlsSettings'], true);
+                $tlsSettings = $server['tlsSettings'];
                 if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure']))
                     $config['allowInsecure'] = (int)$tlsSettings['allowInsecure'];
                 if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
@@ -73,7 +73,7 @@ class Shadowrocket
         if ($server['network'] === 'ws') {
             $config['obfs'] = "websocket";
             if ($server['networkSettings']) {
-                $wsSettings = json_decode($server['networkSettings'], true);
+                $wsSettings = $server['networkSettings'];
                 if (isset($wsSettings['path']) && !empty($wsSettings['path']))
                     $config['path'] = $wsSettings['path'];
                 if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
@@ -83,7 +83,7 @@ class Shadowrocket
         if ($server['network'] === 'grpc') {
             $config['obfs'] = "grpc";
             if ($server['networkSettings']) {
-                $grpcSettings = json_decode($server['networkSettings'], true);
+                $grpcSettings = $server['networkSettings'];
                 if (isset($grpcSettings['serviceName']) && !empty($grpcSettings['serviceName']))
                     $config['path'] = $grpcSettings['serviceName'];
             }

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

@@ -0,0 +1,166 @@
+<?php
+
+namespace App\Http\Controllers\Client\Protocols;
+
+use Symfony\Component\Yaml\Yaml;
+
+class Stash
+{
+    public $flag = 'stash';
+    private $servers;
+    private $user;
+
+    public function __construct($user, $servers)
+    {
+        $this->user = $user;
+        $this->servers = $servers;
+    }
+
+    public function handle()
+    {
+        $servers = $this->servers;
+        $user = $this->user;
+        $appName = config('v2board.app_name', 'V2Board');
+        header("subscription-userinfo: upload={$user['u']}; download={$user['d']}; total={$user['transfer_enable']}; expire={$user['expired_at']}");
+        header('profile-update-interval: 24');
+        header("content-disposition: filename={$appName}");
+        // 暂时使用clash配置文件，后续根据Stash更新情况更新
+        $defaultConfig = base_path() . '/resources/rules/default.clash.yaml';
+        $customConfig = base_path() . '/resources/rules/custom.clash.yaml';
+        if (\File::exists($customConfig)) {
+            $config = Yaml::parseFile($customConfig);
+        } else {
+            $config = Yaml::parseFile($defaultConfig);
+        }
+        $proxy = [];
+        $proxies = [];
+
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                array_push($proxy, self::buildShadowsocks($user['uuid'], $item));
+                array_push($proxies, $item['name']);
+            }
+            if ($item['type'] === 'v2ray') {
+                array_push($proxy, self::buildVmess($user['uuid'], $item));
+                array_push($proxies, $item['name']);
+            }
+            if ($item['type'] === 'trojan') {
+                array_push($proxy, self::buildTrojan($user['uuid'], $item));
+                array_push($proxies, $item['name']);
+            }
+        }
+
+        $config['proxies'] = array_merge($config['proxies'] ? $config['proxies'] : [], $proxy);
+        foreach ($config['proxy-groups'] as $k => $v) {
+            if (!is_array($config['proxy-groups'][$k]['proxies'])) continue;
+            $isFilter = false;
+            foreach ($config['proxy-groups'][$k]['proxies'] as $src) {
+                foreach ($proxies as $dst) {
+                    if (!$this->isRegex($src)) continue;
+                    $isFilter = true;
+                    $config['proxy-groups'][$k]['proxies'] = array_values(array_diff($config['proxy-groups'][$k]['proxies'], [$src]));
+                    if ($this->isMatch($src, $dst)) {
+                        array_push($config['proxy-groups'][$k]['proxies'], $dst);
+                    }
+                }
+                if ($isFilter) continue;
+            }
+            if ($isFilter) continue;
+            $config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
+        }
+        // Force the current subscription domain to be a direct rule
+        $subsDomain = $_SERVER['SERVER_NAME'];
+        $subsDomainRule = "DOMAIN,{$subsDomain},DIRECT";
+        array_unshift($config['rules'], $subsDomainRule);
+
+        $yaml = Yaml::dump($config);
+        $yaml = str_replace('$app_name', config('v2board.app_name', 'V2Board'), $yaml);
+        return $yaml;
+    }
+
+    public static function buildShadowsocks($uuid, $server)
+    {
+        $array = [];
+        $array['name'] = $server['name'];
+        $array['type'] = 'ss';
+        $array['server'] = $server['host'];
+        $array['port'] = $server['port'];
+        $array['cipher'] = $server['cipher'];
+        $array['password'] = $uuid;
+        $array['udp'] = true;
+        return $array;
+    }
+
+    public static function buildVmess($uuid, $server)
+    {
+        $array = [];
+        $array['name'] = $server['name'];
+        $array['type'] = 'vmess';
+        $array['server'] = $server['host'];
+        $array['port'] = $server['port'];
+        $array['uuid'] = $uuid;
+        $array['alterId'] = 0;
+        $array['cipher'] = 'auto';
+        $array['udp'] = true;
+
+        if ($server['tls']) {
+            $array['tls'] = true;
+            if ($server['tlsSettings']) {
+                $tlsSettings = $server['tlsSettings'];
+                if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure']))
+                    $array['skip-cert-verify'] = ($tlsSettings['allowInsecure'] ? true : false);
+                if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
+                    $array['servername'] = $tlsSettings['serverName'];
+            }
+        }
+        if ($server['network'] === 'ws') {
+            $array['network'] = 'ws';
+            if ($server['networkSettings']) {
+                $wsSettings = $server['networkSettings'];
+                $array['ws-opts'] = [];
+                if (isset($wsSettings['path']) && !empty($wsSettings['path']))
+                    $array['ws-opts']['path'] = $wsSettings['path'];
+                if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
+                    $array['ws-opts']['headers'] = ['Host' => $wsSettings['headers']['Host']];
+                // TODO: 2022.06.01 remove it
+                if (isset($wsSettings['path']) && !empty($wsSettings['path']))
+                    $array['ws-path'] = $wsSettings['path'];
+                if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
+                    $array['ws-headers'] = ['Host' => $wsSettings['headers']['Host']];
+            }
+        }
+        if ($server['network'] === 'grpc') {
+            $array['network'] = 'grpc';
+            if ($server['networkSettings']) {
+                $grpcSettings = $server['networkSettings'];
+                $array['grpc-opts'] = [];
+                $array['grpc-opts']['grpc-service-name'] = $grpcSettings['serviceName'];
+            }
+        }
+
+        return $array;
+    }
+
+    public static function buildTrojan($password, $server)
+    {
+        $array = [];
+        $array['name'] = $server['name'];
+        $array['type'] = 'trojan';
+        $array['server'] = $server['host'];
+        $array['port'] = $server['port'];
+        $array['password'] = $password;
+        $array['udp'] = true;
+        if (!empty($server['server_name'])) $array['sni'] = $server['server_name'];
+        if (!empty($server['allow_insecure'])) $array['skip-cert-verify'] = ($server['allow_insecure'] ? true : false);
+        return $array;
+    }
+
+    private function isMatch($exp, $str)
+    {
+        try {
+            return preg_match($exp, $str);
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+}

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

@@ -26,13 +26,19 @@ class Surfboard
         foreach ($servers as $item) {
             if ($item['type'] === 'shadowsocks') {
                 // [Proxy]
-                $proxies .= Surfboard::buildShadowsocks($user['uuid'], $item);
+                $proxies .= self::buildShadowsocks($user['uuid'], $item);
                 // [Proxy Group]
                 $proxyGroup .= $item['name'] . ', ';
             }
             if ($item['type'] === 'v2ray') {
                 // [Proxy]
-                $proxies .= Surfboard::buildVmess($user['uuid'], $item);
+                $proxies .= self::buildVmess($user['uuid'], $item);
+                // [Proxy Group]
+                $proxyGroup .= $item['name'] . ', ';
+            }
+            if ($item['type'] === 'trojan') {
+                // [Proxy]
+                $proxies .= self::buildTrojan($user['uuid'], $item);
                 // [Proxy Group]
                 $proxyGroup .= $item['name'] . ', ';
             }
@@ -48,8 +54,10 @@ class Surfboard
 
         // Subscription link
         $subsURL = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user['token'];
+        $subsDomain = $_SERVER['SERVER_NAME'];
 
         $config = str_replace('$subs_link', $subsURL, $config);
+        $config = str_replace('$subs_domain', $subsDomain, $config);
         $config = str_replace('$proxies', $proxies, $config);
         $config = str_replace('$proxy_group', rtrim($proxyGroup, ', '), $config);
         return $config;
@@ -59,12 +67,11 @@ class Surfboard
     public static function buildShadowsocks($password, $server)
     {
         $config = [
-            "{$server['name']}=custom",
+            "{$server['name']}=ss",
             "{$server['host']}",
             "{$server['port']}",
-            "{$server['cipher']}",
-            "{$password}",
-            'https://raw.githubusercontent.com/Hackl0us/proxy-tool-backup/master/SSEncrypt.module',
+            "encrypt-method={$server['cipher']}",
+            "password={$password}",
             'tfo=true',
             'udp-relay=true'
         ];
@@ -81,6 +88,7 @@ class Surfboard
             "{$server['host']}",
             "{$server['port']}",
             "username={$uuid}",
+            "vmess-aead=true",
             'tfo=true',
             'udp-relay=true'
         ];
@@ -88,7 +96,7 @@ class Surfboard
         if ($server['tls']) {
             array_push($config, 'tls=true');
             if ($server['tlsSettings']) {
-                $tlsSettings = json_decode($server['tlsSettings'], true);
+                $tlsSettings = $server['tlsSettings'];
                 if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure']))
                     array_push($config, 'skip-cert-verify=' . ($tlsSettings['allowInsecure'] ? 'true' : 'false'));
                 if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
@@ -98,7 +106,7 @@ class Surfboard
         if ($server['network'] === 'ws') {
             array_push($config, 'ws=true');
             if ($server['networkSettings']) {
-                $wsSettings = json_decode($server['networkSettings'], true);
+                $wsSettings = $server['networkSettings'];
                 if (isset($wsSettings['path']) && !empty($wsSettings['path']))
                     array_push($config, "ws-path={$wsSettings['path']}");
                 if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
@@ -110,4 +118,24 @@ class Surfboard
         $uri .= "\r\n";
         return $uri;
     }
+
+    public static function buildTrojan($password, $server)
+    {
+        $config = [
+            "{$server['name']}=trojan",
+            "{$server['host']}",
+            "{$server['port']}",
+            "password={$password}",
+            $server['server_name'] ? "sni={$server['server_name']}" : "",
+            'tfo=true',
+            'udp-relay=true'
+        ];
+        if (!empty($server['allow_insecure'])) {
+            array_push($config, $server['allow_insecure'] ? 'skip-cert-verify=true' : 'skip-cert-verify=false');
+        }
+        $config = array_filter($config);
+        $uri = implode(',', $config);
+        $uri .= "\r\n";
+        return $uri;
+    }
 }

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

@@ -52,9 +52,11 @@ class Surge
         }
 
         // Subscription link
-        $subsURL = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user['token'];
+        $subsDomain = $_SERVER['SERVER_NAME'];
+        $subsURL = 'https://' . $subsDomain . '/api/v1/client/subscribe?token=' . $user['token'];
 
         $config = str_replace('$subs_link', $subsURL, $config);
+        $config = str_replace('$subs_domain', $subsDomain, $config);
         $config = str_replace('$proxies', $proxies, $config);
         $config = str_replace('$proxy_group', rtrim($proxyGroup, ', '), $config);
         return $config;
@@ -85,6 +87,7 @@ class Surge
             "{$server['host']}",
             "{$server['port']}",
             "username={$uuid}",
+            "vmess-aead=true",
             'tfo=true',
             'udp-relay=true'
         ];
@@ -92,7 +95,7 @@ class Surge
         if ($server['tls']) {
             array_push($config, 'tls=true');
             if ($server['tlsSettings']) {
-                $tlsSettings = json_decode($server['tlsSettings'], true);
+                $tlsSettings = $server['tlsSettings'];
                 if (isset($tlsSettings['allowInsecure']) && !empty($tlsSettings['allowInsecure']))
                     array_push($config, 'skip-cert-verify=' . ($tlsSettings['allowInsecure'] ? 'true' : 'false'));
                 if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
@@ -102,7 +105,7 @@ class Surge
         if ($server['network'] === 'ws') {
             array_push($config, 'ws=true');
             if ($server['networkSettings']) {
-                $wsSettings = json_decode($server['networkSettings'], true);
+                $wsSettings = $server['networkSettings'];
                 if (isset($wsSettings['path']) && !empty($wsSettings['path']))
                     array_push($config, "ws-path={$wsSettings['path']}");
                 if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))

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

@@ -54,7 +54,7 @@ class V2rayN
             "add" => $server['host'],
             "port" => (string)$server['port'],
             "id" => $uuid,
-            "aid" => (string)$server['alter_id'],
+            "aid" => '0',
             "net" => $server['network'],
             "type" => "none",
             "host" => "",
@@ -63,19 +63,19 @@ class V2rayN
         ];
         if ($server['tls']) {
             if ($server['tlsSettings']) {
-                $tlsSettings = json_decode($server['tlsSettings'], true);
+                $tlsSettings = $server['tlsSettings'];
                 if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
                     $config['sni'] = $tlsSettings['serverName'];
             }
         }
         if ((string)$server['network'] === 'ws') {
-            $wsSettings = json_decode($server['networkSettings'], true);
+            $wsSettings = $server['networkSettings'];
             if (isset($wsSettings['path'])) $config['path'] = $wsSettings['path'];
             if (isset($wsSettings['headers']['Host'])) $config['host'] = $wsSettings['headers']['Host'];
         }
         if ((string)$server['network'] === 'grpc') {
-            $grpcSettings = json_decode($server['networkSettings'], true);
-            if (isset($grpcSettings['path'])) $config['path'] = $grpcSettings['serviceName'];
+            $grpcSettings = $server['networkSettings'];
+            if (isset($grpcSettings['serviceName'])) $config['path'] = $grpcSettings['serviceName'];
         }
         return "vmess://" . base64_encode(json_encode($config)) . "\r\n";
     }

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

@@ -54,7 +54,7 @@ class V2rayNG
             "add" => $server['host'],
             "port" => (string)$server['port'],
             "id" => $uuid,
-            "aid" => (string)$server['alter_id'],
+            "aid" => '0',
             "net" => $server['network'],
             "type" => "none",
             "host" => "",
@@ -63,19 +63,19 @@ class V2rayNG
         ];
         if ($server['tls']) {
             if ($server['tlsSettings']) {
-                $tlsSettings = json_decode($server['tlsSettings'], true);
+                $tlsSettings = $server['tlsSettings'];
                 if (isset($tlsSettings['serverName']) && !empty($tlsSettings['serverName']))
                     $config['sni'] = $tlsSettings['serverName'];
             }
         }
         if ((string)$server['network'] === 'ws') {
-            $wsSettings = json_decode($server['networkSettings'], true);
+            $wsSettings = $server['networkSettings'];
             if (isset($wsSettings['path'])) $config['path'] = $wsSettings['path'];
             if (isset($wsSettings['headers']['Host'])) $config['host'] = $wsSettings['headers']['Host'];
         }
         if ((string)$server['network'] === 'grpc') {
-            $grpcSettings = json_decode($server['networkSettings'], true);
-            if (isset($grpcSettings['path'])) $config['path'] = $grpcSettings['serviceName'];
+            $grpcSettings = $server['networkSettings'];
+            if (isset($grpcSettings['serviceName'])) $config['path'] = $grpcSettings['serviceName'];
         }
         return "vmess://" . base64_encode(json_encode($config)) . "\r\n";
     }

app/Http/Controllers/Guest/CommController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Guest;
 
 use App\Utils\Dict;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Http;
 
 class CommController extends Controller
 {
@@ -33,4 +34,11 @@ class CommController extends Controller
         }
         return $suffix;
     }
+
+    public function getHitokoto()
+    {
+        return response([
+            'data' => Http::get('https://v1.hitokoto.cn/')->json()
+        ]);
+    }
 }

app/Http/Controllers/Guest/PaymentController.php

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

app/Http/Controllers/Guest/TelegramController.php

@@ -5,18 +5,16 @@ namespace App\Http\Controllers\Guest;
 use App\Services\TelegramService;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use App\Models\User;
-use App\Utils\Helper;
-use App\Services\TicketService;
 
 class TelegramController extends Controller
 {
     protected $msg;
+    protected $commands = [];
 
     public function __construct(Request $request)
     {
         if ($request->input('access_token') !== md5(config('v2board.telegram_bot_token'))) {
-            abort(500, 'authentication failed');
+            abort(401);
         }
     }
 
@@ -24,41 +22,34 @@ class TelegramController extends Controller
     {
         $this->msg = $this->getMessage($request->input());
         if (!$this->msg) return;
+        $this->handle();
+    }
+
+    public function handle()
+    {
+        $msg = $this->msg;
         try {
-            switch($this->msg->message_type) {
-                case 'send':
-                    $this->fromSend();
-                    break;
-                case 'reply':
-                    $this->fromReply();
-                    break;
+            foreach (glob(base_path('app//Plugins//Telegram//Commands') . '/*.php') as $file) {
+                $command = basename($file, '.php');
+                $class = '\\App\\Plugins\\Telegram\\Commands\\' . $command;
+                if (!class_exists($class)) continue;
+                $instance = new $class();
+                if ($msg->message_type === 'message') {
+                    if (!isset($instance->command)) continue;
+                    if ($msg->command !== $instance->command) continue;
+                    $instance->handle($msg);
+                    return;
+                }
+                if ($msg->message_type === 'reply_message') {
+                    if (!isset($instance->regex)) continue;
+                    if (!preg_match($instance->regex, $msg->reply_text, $match)) continue;
+                    $instance->handle($msg, $match);
+                    return;
+                }
             }
         } catch (\Exception $e) {
             $telegramService = new TelegramService();
-            $telegramService->sendMessage($this->msg->chat_id, $e->getMessage());
-        }
-    }
-
-    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]);
+            $telegramService->sendMessage($msg->chat_id, $e->getMessage());
         }
     }
 
@@ -66,135 +57,18 @@ class TelegramController extends Controller
     {
         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->message_type = !isset($data['message']['reply_to_message']['text']) ? 'message' : 'reply_message';
         $obj->text = $data['message']['text'];
-        if ($obj->message_type === 'reply') {
+        $obj->is_private = $data['message']['chat']['type'] === 'private';
+        if ($obj->message_type === 'reply_message') {
             $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');
-        $telegramService->sendMessageWithAdmin("#`{$ticketId}` 的工单已由 {$user->email} 进行回复", true);
-    }
-
-
 }

app/Http/Controllers/Passport/AuthController.php

@@ -102,10 +102,15 @@ class AuthController extends Controller
         if ((int)config('v2board.email_verify', 0)) {
             Cache::forget(CacheKey::get('EMAIL_VERIFY_CODE', $request->input('email')));
         }
+
+        $data = [
+            'token' => $user->token,
+            'auth_data' => base64_encode("{$user->email}:{$user->password}")
+        ];
         $request->session()->put('email', $user->email);
         $request->session()->put('id', $user->id);
         return response()->json([
-            'data' => true
+            'data' => $data
         ]);
     }
 
@@ -120,6 +125,7 @@ class AuthController extends Controller
         }
         if (!Helper::multiPasswordVerify(
             $user->password_algo,
+            $user->password_salt,
             $password,
             $user->password)
         ) {
@@ -250,6 +256,7 @@ class AuthController extends Controller
         }
         $user->password = password_hash($request->input('password'), PASSWORD_DEFAULT);
         $user->password_algo = NULL;
+        $user->password_salt = NULL;
         if (!$user->save()) {
             abort(500, __('Reset failed'));
         }

app/Http/Controllers/Server/DeepbworkController.php

@@ -8,7 +8,7 @@ use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\User;
-use App\Models\Server;
+use App\Models\ServerV2ray;
 use App\Models\ServerLog;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -34,20 +34,21 @@ class DeepbworkController extends Controller
     // 后端获取用户
     public function user(Request $request)
     {
+        ini_set('memory_limit', -1);
         $nodeId = $request->input('node_id');
-        $server = Server::find($nodeId);
+        $server = ServerV2ray::find($nodeId);
         if (!$server) {
             abort(500, 'fail');
         }
         Cache::put(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $server->id), time(), 3600);
         $serverService = new ServerService();
-        $users = $serverService->getAvailableUsers(json_decode($server->group_id));
+        $users = $serverService->getAvailableUsers($server->group_id);
         $result = [];
         foreach ($users as $user) {
             $user->v2ray_user = [
                 "uuid" => $user->uuid,
                 "email" => sprintf("%s@v2board.user", $user->uuid),
-                "alter_id" => $server->alter_id,
+                "alter_id" => 0,
                 "level" => 0,
             ];
             unset($user['uuid']);
@@ -64,7 +65,7 @@ class DeepbworkController extends Controller
     public function submit(Request $request)
     {
 //         Log::info('serverSubmitData:' . $request->input('node_id') . ':' . file_get_contents('php://input'));
-        $server = Server::find($request->input('node_id'));
+        $server = ServerV2ray::find($request->input('node_id'));
         if (!$server) {
             return response([
                 'ret' => 0,
@@ -76,23 +77,11 @@ class DeepbworkController extends Controller
         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'
-            ]);
+        foreach ($data as $item) {
+            $u = $item['u'] * $server->rate;
+            $d = $item['d'] * $server->rate;
+            $userService->trafficFetch($u, $d, $item['user_id'], $server, 'vmess');
         }
-        DB::commit();
 
         return response([
             'ret' => 1,

app/Http/Controllers/Server/PoseidonController.php

@@ -1,158 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Server;
-
-use App\Services\ServerService;
-use App\Services\UserService;
-use App\Utils\CacheKey;
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\User;
-use App\Models\Plan;
-use App\Models\Server;
-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
-{
-    public $poseidonVersion;
-
-    public function __construct(Request $request)
-    {
-        $this->poseidonVersion = $request->input('poseidon_version');
-    }
-
-    // 后端获取用户
-    public function user(Request $request)
-    {
-        if ($r = $this->verifyToken($request)) { return $r; }
-
-        $nodeId = $request->input('node_id');
-        $server = Server::find($nodeId);
-        if (!$server) {
-            return $this->error("server could not be found", 404);
-        }
-        Cache::put(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->uuid,
-                "email" => sprintf("%s@v2board.user", $user->uuid),
-                "alter_id" => $server->alter_id,
-                "level" => 0,
-            ];
-            unset($user['uuid']);
-            unset($user['email']);
-            array_push($result, $user);
-        }
-
-        return $this->success($result);
-    }
-
-    // 后端提交数据
-    public function submit(Request $request)
-    {
-        if ($r = $this->verifyToken($request)) { return $r; }
-        $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;
-            if (!$userService->trafficFetch($u, $d, $item['user_id'], $server, 'vmess')) {
-                return $this->error("user fetch fail", 500);
-            }
-        }
-
-        return $this->success('');
-    }
-
-    // 后端获取配置
-    public function config(Request $request)
-    {
-        if ($r = $this->verifyToken($request)) { return $r; }
-
-        $nodeId = $request->input('node_id');
-        $localPort = $request->input('local_port');
-        if (empty($nodeId) || empty($localPort)) {
-            return $this->error('invalid parameters', 400);
-        }
-
-        $serverService = new ServerService();
-        try {
-            $json = $serverService->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) {
-            return $this->error($e->getMessage(), 500);
-        }
-    }
-
-    protected function verifyToken(Request $request)
-    {
-        $token = $request->input('token');
-        if (empty($token)) {
-            return $this->error("token must be set");
-        }
-        if ($token !== config('v2board.server_token')) {
-            return $this->error("invalid token");
-        }
-    }
-
-    protected function error($msg, int $status = 400) {
-        return response([
-            'msg' => $msg,
-        ], $status);
-    }
-
-    protected function success($data) {
-         $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

@@ -8,10 +8,6 @@ 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;
 
 /*
@@ -34,6 +30,7 @@ class ShadowsocksTidalabController extends Controller
     // 后端获取用户
     public function user(Request $request)
     {
+        ini_set('memory_limit', -1);
         $nodeId = $request->input('node_id');
         $server = ServerShadowsocks::find($nodeId);
         if (!$server) {
@@ -41,7 +38,7 @@ class ShadowsocksTidalabController extends Controller
         }
         Cache::put(CacheKey::get('SERVER_SHADOWSOCKS_LAST_CHECK_AT', $server->id), time(), 3600);
         $serverService = new ServerService();
-        $users = $serverService->getAvailableUsers(json_decode($server->group_id));
+        $users = $serverService->getAvailableUsers($server->group_id);
         $result = [];
         foreach ($users as $user) {
             array_push($result, [
@@ -72,23 +69,11 @@ class ShadowsocksTidalabController extends Controller
         Cache::put(CacheKey::get('SERVER_SHADOWSOCKS_ONLINE_USER', $server->id), count($data), 3600);
         Cache::put(CacheKey::get('SERVER_SHADOWSOCKS_LAST_PUSH_AT', $server->id), time(), 3600);
         $userService = new UserService();
-        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'
-            ]);
+        foreach ($data as $item) {
+            $u = $item['u'] * $server->rate;
+            $d = $item['d'] * $server->rate;
+            $userService->trafficFetch($u, $d, $item['user_id'], $server, 'shadowsocks');
         }
-        DB::commit();
 
         return response([
             'ret' => 1,

app/Http/Controllers/Server/TrojanTidalabController.php

@@ -34,6 +34,7 @@ class TrojanTidalabController extends Controller
     // 后端获取用户
     public function user(Request $request)
     {
+        ini_set('memory_limit', -1);
         $nodeId = $request->input('node_id');
         $server = ServerTrojan::find($nodeId);
         if (!$server) {
@@ -41,7 +42,7 @@ class TrojanTidalabController extends Controller
         }
         Cache::put(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $server->id), time(), 3600);
         $serverService = new ServerService();
-        $users = $serverService->getAvailableUsers(json_decode($server->group_id));
+        $users = $serverService->getAvailableUsers($server->group_id);
         $result = [];
         foreach ($users as $user) {
             $user->trojan_user = [
@@ -73,23 +74,11 @@ class TrojanTidalabController extends Controller
         Cache::put(CacheKey::get('SERVER_TROJAN_ONLINE_USER', $server->id), count($data), 3600);
         Cache::put(CacheKey::get('SERVER_TROJAN_LAST_PUSH_AT', $server->id), time(), 3600);
         $userService = new UserService();
-        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'
-            ]);
+        foreach ($data as $item) {
+            $u = $item['u'] * $server->rate;
+            $d = $item['d'] * $server->rate;
+            $userService->trafficFetch($u, $d, $item['user_id'], $server, 'trojan');
         }
-        DB::commit();
 
         return response([
             'ret' => 1,

app/Http/Controllers/User/CommController.php

@@ -14,9 +14,12 @@ class CommController extends Controller
         return response([
             'data' => [
                 'is_telegram' => (int)config('v2board.telegram_bot_enable', 0),
+                'telegram_discuss_link' => config('v2board.telegram_discuss_link'),
                 '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)
+                'withdraw_close' => (int)config('v2board.withdraw_close_enable', 0),
+                'currency' => config('v2board.currency', 'CNY'),
+                'currency_symbol' => config('v2board.currency_symbol', '¥')
             ]
         ]);
     }
@@ -27,9 +30,8 @@ class CommController extends Controller
             ->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']
+            'data' => $payment->config['stripe_pk_live']
         ]);
     }
 }

app/Http/Controllers/User/CouponController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
+use App\Services\CouponService;
 use Illuminate\Http\Request;
 use App\Models\Coupon;
 
@@ -13,27 +14,12 @@ class CouponController extends Controller
         if (empty($request->input('code'))) {
             abort(500, __('Coupon cannot be empty'));
         }
-        $coupon = Coupon::where('code', $request->input('code'))->first();
-        if (!$coupon) {
-            abort(500, __('Invalid coupon'));
-        }
-        if ($coupon->limit_use <= 0 && $coupon->limit_use !== NULL) {
-            abort(500, __('This coupon is no longer available'));
-        }
-        if (time() < $coupon->started_at) {
-            abort(500, __('This coupon has not yet started'));
-        }
-        if (time() > $coupon->ended_at) {
-            abort(500, __('This coupon has expired'));
-        }
-        if ($coupon->limit_plan_ids) {
-            $limitPlanIds = json_decode($coupon->limit_plan_ids);
-            if (!in_array($request->input('plan_id'), $limitPlanIds)) {
-                abort(500, __('The coupon code cannot be used for this subscription'));
-            }
-        }
+        $couponService = new CouponService($request->input('code'));
+        $couponService->setPlanId($request->input('plan_id'));
+        $couponService->setUserId($request->session()->get('id'));
+        $couponService->check();
         return response([
-            'data' => $coupon
+            'data' => $couponService->getCoupon()
         ]);
     }
 }

app/Http/Controllers/User/InviteController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
+use App\Models\CommissionLog;
 use Illuminate\Http\Request;
 use App\Models\User;
 use App\Models\Order;
@@ -27,15 +28,13 @@ class InviteController extends Controller
     public function details(Request $request)
     {
         return response([
-            'data' => Order::where('invite_user_id', $request->session()->get('id'))
-                ->where('commission_balance', '>', 0)
-                ->where('status', 3)
+            'data' => CommissionLog::where('invite_user_id', $request->session()->get('id'))
                 ->select([
                     'id',
-                    'commission_status',
-                    'commission_balance',
-                    'created_at',
-                    'updated_at'
+                    'trade_no',
+                    'order_amount',
+                    'get_amount',
+                    'created_at'
                 ])
                 ->get()
         ]);

app/Http/Controllers/User/KnowledgeController.php

@@ -35,8 +35,6 @@ class KnowledgeController extends Controller
             }
             $subscribeUrl = "{$subscribeUrl}/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(

app/Http/Controllers/User/NoticeController.php

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

app/Http/Controllers/User/OrderController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\User\OrderSave;
+use App\Models\CommissionLog;
 use App\Models\Payment;
 use App\Services\CouponService;
 use App\Services\OrderService;
@@ -46,7 +47,7 @@ class OrderController extends Controller
         ]);
     }
 
-    public function details(Request $request)
+    public function detail(Request $request)
     {
         $order = Order::where('user_id', $request->session()->get('id'))
             ->where('trade_no', $request->input('trade_no'))
@@ -59,6 +60,9 @@ class OrderController extends Controller
         if (!$order['plan']) {
             abort(500, __('Subscription plan does not exist'));
         }
+        if ($order->surplus_order_ids) {
+            $order['surplus_orders'] = Order::whereIn('id', $order->surplus_order_ids)->get();
+        }
         return response([
             'data' => $order
         ]);
@@ -78,26 +82,27 @@ class OrderController extends Controller
             abort(500, __('Subscription plan does not exist'));
         }
 
-        if ((!$plan->show && !$plan->renew) || (!$plan->show && $user->plan_id !== $plan->id)) {
-            if ($request->input('cycle') !== 'reset_price') {
-                abort(500, __('This subscription has been sold out, please choose another subscription'));
-            }
+        if ($plan[$request->input('period')] === NULL) {
+            abort(500, __('This payment period cannot be purchased, please choose another period'));
         }
 
-        if (!$plan->renew && $user->plan_id == $plan->id && $request->input('cycle') !== 'reset_price') {
-            abort(500, __('This subscription cannot be renewed, please change to another subscription'));
-        }
-
-        if ($plan[$request->input('cycle')] === NULL) {
-            abort(500, __('This payment cycle cannot be purchased, please choose another cycle'));
-        }
-
-        if ($request->input('cycle') === 'reset_price') {
+        if ($request->input('period') === 'reset_price') {
             if ($user->expired_at <= time() || !$user->plan_id) {
                 abort(500, __('Subscription has expired or no active subscription, unable to purchase Data Reset Package'));
             }
         }
 
+        if ((!$plan->show && !$plan->renew) || (!$plan->show && $user->plan_id !== $plan->id)) {
+            if ($request->input('period') !== 'reset_price') {
+                abort(500, __('This subscription has been sold out, please choose another subscription'));
+            }
+        }
+
+        if (!$plan->renew && $user->plan_id == $plan->id && $request->input('period') !== 'reset_price') {
+            abort(500, __('This subscription cannot be renewed, please change to another subscription'));
+        }
+
+
         if (!$plan->show && $plan->renew && !$userService->isAvailable($user)) {
             abort(500, __('This subscription has expired, please change to another subscription'));
         }
@@ -107,9 +112,9 @@ class OrderController extends Controller
         $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')];
+        $order->period = $request->input('period');
+        $order->trade_no = Helper::generateOrderNo();
+        $order->total_amount = $plan[$request->input('period')];
 
         if ($request->input('coupon_code')) {
             $couponService = new CouponService($request->input('coupon_code'));
@@ -169,9 +174,8 @@ class OrderController extends Controller
         }
         // free process
         if ($order->total_amount <= 0) {
-            $order->total_amount = 0;
-            $order->status = 1;
-            $order->save();
+            $orderService = new OrderService($order);
+            if (!$orderService->paid($order->trade_no)) abort(500, '');
             return response([
                 'type' => -1,
                 'data' => true
@@ -212,7 +216,8 @@ class OrderController extends Controller
         $methods = Payment::select([
             'id',
             'name',
-            'payment'
+            'payment',
+            'icon'
         ])
             ->where('enable', 1)->get();
 

app/Http/Controllers/User/ServerController.php

@@ -8,11 +8,12 @@ use App\Services\UserService;
 use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
-use App\Models\Server;
+use App\Models\ServerV2ray;
 use App\Models\ServerLog;
 use App\Models\User;
 
 use App\Utils\Helper;
+use Illuminate\Support\Facades\DB;
 
 class ServerController extends Controller
 {
@@ -29,30 +30,4 @@ class ServerController extends Controller
             'data' => $servers
         ]);
     }
-
-    public function logFetch(Request $request)
-    {
-        $type = $request->input('type') ? $request->input('type') : 0;
-        $current = $request->input('current') ? $request->input('current') : 1;
-        $pageSize = $request->input('pageSize') >= 10 ? $request->input('pageSize') : 10;
-        $serverLogModel = ServerLog::where('user_id', $request->session()->get('id'))
-            ->orderBy('created_at', 'DESC');
-        switch ($type) {
-            case 0:
-                $serverLogModel->where('created_at', '>=', strtotime(date('Y-m-d')));
-                break;
-            case 1:
-                $serverLogModel->where('created_at', '>=', strtotime(date('Y-m-d')) - 604800);
-                break;
-            case 2:
-                $serverLogModel->where('created_at', '>=', strtotime(date('Y-m-1')));
-        }
-        $total = $serverLogModel->count();
-        $res = $serverLogModel->forPage($current, $pageSize)
-            ->get();
-        return response([
-            'data' => $res,
-            'total' => $total
-        ]);
-    }
 }

app/Http/Controllers/User/StatController.php

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

app/Http/Controllers/User/TicketController.php

@@ -168,7 +168,7 @@ class TicketController extends Controller
         $user = User::find($request->session()->get('id'));
         $limit = config('v2board.commission_withdraw_limit', 100);
         if ($limit > ($user->commission_balance / 100)) {
-            abort(500, __('The current required minimum withdrawal commission is', ['limit' => $limit]));
+            abort(500, __('The current required minimum withdrawal commission is :limit', ['limit' => $limit]));
         }
         DB::beginTransaction();
         $subject = __('[Commission Withdrawal Request] This ticket is opened by the system');

app/Http/Controllers/User/UserController.php

@@ -6,14 +6,14 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\User\UserTransfer;
 use App\Http\Requests\User\UserUpdate;
 use App\Http\Requests\User\UserChangePassword;
+use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use App\Models\User;
 use App\Models\Plan;
-use App\Models\Server;
 use App\Models\Ticket;
 use App\Utils\Helper;
 use App\Models\Order;
-use App\Models\ServerLog;
+use Illuminate\Support\Facades\Cache;
 
 class UserController extends Controller
 {
@@ -33,6 +33,7 @@ class UserController extends Controller
         }
         if (!Helper::multiPasswordVerify(
             $user->password_algo,
+            $user->password_salt,
             $request->input('old_password'),
             $user->password)
         ) {
@@ -40,6 +41,7 @@ class UserController extends Controller
         }
         $user->password = password_hash($request->input('new_password'), PASSWORD_DEFAULT);
         $user->password_algo = NULL;
+        $user->password_salt = NULL;
         if (!$user->save()) {
             abort(500, __('Save failed'));
         }
@@ -66,7 +68,8 @@ class UserController extends Controller
                 'plan_id',
                 'discount',
                 'commission_rate',
-                'telegram_id'
+                'telegram_id',
+                'uuid'
             ])
             ->first();
         if (!$user) {
@@ -99,7 +102,6 @@ class UserController extends Controller
     {
         $user = User::where('id', $request->session()->get('id'))
             ->select([
-                'id',
                 'plan_id',
                 'token',
                 'expired_at',
@@ -118,12 +120,7 @@ class UserController extends Controller
                 abort(500, __('Subscription plan does not exist'));
             }
         }
-        $subscribeUrl = config('v2board.app_url', env('APP_URL'));
-        $subscribeUrls = explode(',', config('v2board.subscribe_url'));
-        if ($subscribeUrls) {
-            $subscribeUrl = $subscribeUrls[rand(0, count($subscribeUrls) - 1)];
-        }
-        $user['subscribe_url'] = "{$subscribeUrl}/api/v1/client/subscribe?token={$user['token']}";
+        $user['subscribe_url'] = Helper::getSubscribeHost() . "/api/v1/client/subscribe?token={$user['token']}";
         $user['reset_day'] = $this->getResetDay($user);
         return response([
             'data' => $user
@@ -190,14 +187,20 @@ class UserController extends Controller
     private function getResetDay(User $user)
     {
         if ($user->expired_at <= time() || $user->expired_at === NULL) return null;
+        // if reset method is not reset
+        if (isset($user->plan->reset_traffic_method) && $user->plan->reset_traffic_method === 2) return null;
         $day = date('d', $user->expired_at);
         $today = date('d');
         $lastDay = date('d', strtotime('last day of +0 months'));
 
-        if ((int)config('v2board.reset_traffic_method') === 0) {
+        if ((int)config('v2board.reset_traffic_method') === 0 ||
+            (isset($user->plan->reset_traffic_method) && $user->plan->reset_traffic_method === 0))
+        {
             return $lastDay - $today;
         }
-        if ((int)config('v2board.reset_traffic_method') === 1) {
+        if ((int)config('v2board.reset_traffic_method') === 1 ||
+            (isset($user->plan->reset_traffic_method) && $user->plan->reset_traffic_method === 1))
+        {
             if ((int)$day >= (int)$today && (int)$day >= (int)$lastDay) {
                 return $lastDay - $today;
             }
@@ -209,4 +212,26 @@ class UserController extends Controller
         }
         return null;
     }
+
+
+    public function getQuickLoginUrl(Request $request)
+    {
+        $user = User::find($request->session()->get('id'));
+        if (!$user) {
+            abort(500, __('The user does not exist'));
+        }
+
+        $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
+        ]);
+    }
 }

app/Http/Kernel.php

@@ -35,6 +35,7 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,
+            \App\Http\Middleware\CORS::class,
         ],
 
         'api' => [

app/Http/Middleware/User.php

@@ -15,8 +15,9 @@ class User
      */
     public function handle($request, Closure $next)
     {
-        if ($request->input('auth_data')) {
-            $authData = explode(':', base64_decode($request->input('auth_data')));
+        $authorization = $request->input('auth_data') ?? $request->header('authorization');
+        if ($authorization) {
+            $authData = explode(':', base64_decode($authorization));
             if (!isset($authData[1]) || !isset($authData[0])) abort(403, '鉴权失败，请重新登入');
             $user = \App\Models\User::where('password', $authData[1])
                 ->where('email', $authData[0])

app/Http/Requests/Admin/ConfigSave.php

@@ -25,6 +25,10 @@ class ConfigSave extends FormRequest
             'commission_withdraw_limit' => 'nullable|numeric',
             'commission_withdraw_method' => 'nullable|array',
             'withdraw_close_enable' => 'in:0,1',
+            'commission_distribution_enable' => 'in:0,1',
+            'commission_distribution_l1' => 'nullable|numeric',
+            'commission_distribution_l2' => 'nullable|numeric',
+            'commission_distribution_l3' => 'nullable|numeric',
             // site
             'stop_register' => 'in:0,1',
             'email_verify' => 'in:0,1',
@@ -42,9 +46,11 @@ class ConfigSave extends FormRequest
             'recaptcha_key' => '',
             'recaptcha_site_key' => '',
             'tos_url' => 'nullable|url',
+            'currency' => '',
+            'currency_symbol' => '',
             // subscribe
             'plan_change_enable' => 'in:0,1',
-            'reset_traffic_method' => 'in:0,1',
+            'reset_traffic_method' => 'in:0,1,2',
             'surplus_enable' => 'in:0,1',
             'new_order_event_id' => 'in:0,1',
             'renew_order_event_id' => 'in:0,1',
@@ -88,14 +94,11 @@ class ConfigSave extends FormRequest
             'frontend_theme' => '',
             'frontend_theme_sidebar' => 'in:dark,light',
             'frontend_theme_header' => 'in:dark,light',
-            'frontend_theme_color' => 'in:default,darkblue,black',
+            'frontend_theme_color' => 'in:default,darkblue,black,green',
             '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' => '',
@@ -109,6 +112,7 @@ class ConfigSave extends FormRequest
             'telegram_bot_token' => '',
             'telegram_discuss_id' => '',
             'telegram_channel_id' => '',
+            'telegram_discuss_link' => 'nullable|url',
             // app
             'windows_version' => '',
             'windows_download_url' => '',
@@ -126,7 +130,8 @@ class ConfigSave extends FormRequest
             'app_url.url' => '站点URL格式不正确，必须携带http(s)://',
             'subscribe_url.url' => '订阅URL格式不正确，必须携带http(s)://',
             'server_token.min' => '通讯密钥长度必须大于16位',
-            'tos_url.url' => '服务条款URL格式不正确'
+            'tos_url.url' => '服务条款URL格式不正确，必须携带http(s)://',
+            'telegram_discuss_link.url' => 'Telegram群组地址必须为URL格式，必须携带http(s)://'
         ];
     }
 }

app/Http/Requests/Admin/CouponGenerate.php

@@ -21,7 +21,9 @@ class CouponGenerate extends FormRequest
             'started_at' => 'required|integer',
             'ended_at' => 'required|integer',
             'limit_use' => 'nullable|integer',
+            'limit_use_with_user' => 'nullable|integer',
             'limit_plan_ids' => 'nullable|array',
+            'limit_period' => 'nullable|array',
             'code' => ''
         ];
     }
@@ -40,8 +42,10 @@ class CouponGenerate extends FormRequest
             'started_at.integer' => '开始时间格式有误',
             'ended_at.required' => '结束时间不能为空',
             'ended_at.integer' => '结束时间格式有误',
-            'limit_use.integer' => '使用次数格式有误',
-            'limit_plan_ids.array' => '指定订阅格式有误'
+            'limit_use.integer' => '最大使用次数格式有误',
+            'limit_use_with_user.integer' => '限制用户使用次数格式有误',
+            'limit_plan_ids.array' => '指定订阅格式有误',
+            'limit_period.array' => '指定周期格式有误'
         ];
     }
 }

app/Http/Requests/Admin/CouponSave.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Admin;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class CouponSave extends FormRequest
-{
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            '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 [
-            '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/OrderAssign.php

@@ -17,7 +17,7 @@ class OrderAssign extends FormRequest
             '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'
+            'period' => 'required|in:month_price,quarter_price,half_year_price,year_price,two_year_price,three_year_price,onetime_price,reset_price'
         ];
     }
 
@@ -27,8 +27,8 @@ class OrderAssign extends FormRequest
             'plan_id.required' => '订阅不能为空',
             'email.required' => '邮箱不能为空',
             'total_amount.required' => '支付金额不能为空',
-            'cycle.required' => '订阅周期不能为空',
-            'cycle.in' => '订阅周期格式有误'
+            'period.required' => '订阅周期不能为空',
+            'period.in' => '订阅周期格式有误'
         ];
     }
 }

app/Http/Requests/Admin/OrderFetch.php

@@ -14,7 +14,7 @@ class OrderFetch extends FormRequest
     public function rules()
     {
         return [
-            'filter.*.key' => 'required|in:email,trade_no,status,commission_status,user_id,invite_user_id',
+            'filter.*.key' => 'required|in:email,trade_no,status,commission_status,user_id,invite_user_id,callback_no',
             'filter.*.condition' => 'required|in:>,<,=,>=,<=,模糊,!=',
             'filter.*.value' => ''
         ];

app/Http/Requests/Admin/PlanSave.php

@@ -25,7 +25,8 @@ class PlanSave extends FormRequest
             'two_year_price' => 'nullable|integer',
             'three_year_price' => 'nullable|integer',
             'onetime_price' => 'nullable|integer',
-            'reset_price' => 'nullable|integer'
+            'reset_price' => 'nullable|integer',
+            'reset_traffic_method' => 'nullable|integer|in:0,1,2'
         ];
     }
 
@@ -44,7 +45,9 @@ class PlanSave extends FormRequest
             'two_year_price.integer' => '两年付金额格式有误',
             'three_year_price.integer' => '三年付金额格式有误',
             'onetime_price.integer' => '一次性金额有误',
-            'reset_price.integer' => '流量重置包金额有误'
+            'reset_price.integer' => '流量重置包金额有误',
+            'reset_traffic_method.integer' => '流量重置方式格式有误',
+            'reset_traffic_method.in' => '流量重置方式格式有误'
         ];
     }
 }

app/Http/Requests/Admin/ServerV2raySave.php

@@ -24,12 +24,11 @@ class ServerV2raySave extends FormRequest
             'tls' => 'required',
             'tags' => 'nullable|array',
             'rate' => 'required|numeric',
-            'alter_id' => 'required|integer',
             'network' => 'required|in:tcp,kcp,ws,http,domainsocket,quic,grpc',
-            'networkSettings' => '',
-            'ruleSettings' => '',
-            'tlsSettings' => '',
-            'dnsSettings' => ''
+            'networkSettings' => 'nullable|array',
+            'ruleSettings' => 'nullable|array',
+            'tlsSettings' => 'nullable|array',
+            'dnsSettings' => 'nullable|array'
         ];
     }
 
@@ -48,7 +47,11 @@ class ServerV2raySave extends FormRequest
             'rate.required' => '倍率不能为空',
             'rate.numeric' => '倍率格式不正确',
             'network.required' => '传输协议不能为空',
-            'network.in' => '传输协议格式不正确'
+            'network.in' => '传输协议格式不正确',
+            'networkSettings.array' => '传输协议配置有误',
+            'ruleSettings.array' => '规则配置有误',
+            'tlsSettings.array' => 'tls配置有误',
+            'dnsSettings.array' => 'dns配置有误'
         ];
     }
 }

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,two_year_price,three_year_price,onetime_price,reset_price'
+            'period' => 'required|in:month_price,quarter_price,half_year_price,year_price,two_year_price,three_year_price,onetime_price,reset_price'
         ];
     }
 
@@ -23,8 +23,8 @@ class OrderSave extends FormRequest
     {
         return [
             'plan_id.required' => __('Plan ID cannot be empty'),
-            'cycle.required' => __('Plan cycle cannot be empty'),
-            'cycle.in' => __('Wrong plan cycle')
+            'period.required' => __('Plan period cannot be empty'),
+            'period.in' => __('Wrong plan period')
         ];
     }
 }

app/Http/Routes/AdminRoute.php

@@ -17,6 +17,7 @@ class AdminRoute
             $router->get ('/config/getEmailTemplate', 'Admin\\ConfigController@getEmailTemplate');
             $router->get ('/config/getThemeTemplate', 'Admin\\ConfigController@getThemeTemplate');
             $router->post('/config/setTelegramWebhook', 'Admin\\ConfigController@setTelegramWebhook');
+            $router->post('/config/testSendMail', 'Admin\\ConfigController@testSendMail');
             // Plan
             $router->get ('/plan/fetch', 'Admin\\PlanController@fetch');
             $router->post('/plan/save', 'Admin\\PlanController@save');
@@ -63,9 +64,11 @@ class AdminRoute
             });
             // 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');
+            $router->post('/order/paid', 'Admin\\OrderController@paid');
+            $router->post('/order/cancel', 'Admin\\OrderController@cancel');
+            $router->post('/order/detail', 'Admin\\OrderController@detail');
             // User
             $router->get ('/user/fetch', 'Admin\\UserController@fetch');
             $router->post('/user/update', 'Admin\\UserController@update');
@@ -85,6 +88,7 @@ class AdminRoute
             $router->post('/notice/save', 'Admin\\NoticeController@save');
             $router->post('/notice/update', 'Admin\\NoticeController@update');
             $router->post('/notice/drop', 'Admin\\NoticeController@drop');
+            $router->post('/notice/show', 'Admin\\NoticeController@show');
             // Ticket
             $router->get ('/ticket/fetch', 'Admin\\TicketController@fetch');
             $router->post('/ticket/reply', 'Admin\\TicketController@reply');
@@ -93,6 +97,7 @@ class AdminRoute
             $router->get ('/coupon/fetch', 'Admin\\CouponController@fetch');
             $router->post('/coupon/generate', 'Admin\\CouponController@generate');
             $router->post('/coupon/drop', 'Admin\\CouponController@drop');
+            $router->post('/coupon/show', 'Admin\\CouponController@show');
             // Knowledge
             $router->get ('/knowledge/fetch', 'Admin\\KnowledgeController@fetch');
             $router->get ('/knowledge/getCategory', 'Admin\\KnowledgeController@getCategory');
@@ -106,6 +111,8 @@ class AdminRoute
             $router->post('/payment/getPaymentForm', 'Admin\\PaymentController@getPaymentForm');
             $router->post('/payment/save', 'Admin\\PaymentController@save');
             $router->post('/payment/drop', 'Admin\\PaymentController@drop');
+            // System
+            $router->get ('/system/getStatus', 'Admin\\SystemController@getStatus');
         });
     }
 }

app/Http/Routes/GuestRoute.php

@@ -18,6 +18,7 @@ class GuestRoute
             $router->match(['get', 'post'], '/payment/notify/{method}/{uuid}', 'Guest\\PaymentController@notify');
             // Comm
             $router->get ('/comm/config', 'Guest\\CommController@config');
+            $router->get ('/comm/getHitokoto', 'Guest\\CommController@getHitokoto');
         });
     }
 }

app/Http/Routes/UserRoute.php

@@ -20,11 +20,15 @@ class UserRoute
             $router->get ('/getSubscribe', 'User\\UserController@getSubscribe');
             $router->get ('/getStat', 'User\\UserController@getStat');
             $router->post('/transfer', 'User\\UserController@transfer');
+            $router->post('/getQuickLoginUrl', 'User\\UserController@getQuickLoginUrl');
             // Order
             $router->post('/order/save', 'User\\OrderController@save');
             $router->post('/order/checkout', 'User\\OrderController@checkout');
             $router->get ('/order/check', 'User\\OrderController@check');
-            $router->get ('/order/details', 'User\\OrderController@details');
+            // TODO: 1.5.6 remove
+            $router->get ('/order/details', 'User\\OrderController@detail');
+            // TODO: 1.5.6 remove
+            $router->get ('/order/detail', 'User\\OrderController@detail');
             $router->get ('/order/fetch', 'User\\OrderController@fetch');
             $router->get ('/order/getPaymentMethod', 'User\\OrderController@getPaymentMethod');
             $router->post('/order/cancel', 'User\\OrderController@cancel');
@@ -44,7 +48,6 @@ class UserRoute
             $router->post('/ticket/withdraw', 'User\\TicketController@withdraw');
             // Server
             $router->get ('/server/fetch', 'User\\ServerController@fetch');
-            $router->get ('/server/log/fetch', 'User\\ServerController@logFetch');
             // Coupon
             $router->post('/coupon/check', 'User\\CouponController@check');
             // Telegram
@@ -55,6 +58,8 @@ class UserRoute
             // Knowledge
             $router->get ('/knowledge/fetch', 'User\\KnowledgeController@fetch');
             $router->get ('/knowledge/getCategory', 'User\\KnowledgeController@getCategory');
+            // Stat
+            $router->get ('/stat/getTrafficLog', 'User\\StatController@getTrafficLog');
         });
     }
 }

app/Jobs/OrderHandleJob.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\Order;
+use App\Services\OrderService;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class OrderHandleJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    protected $order;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($tradeNo)
+    {
+        $this->onQueue('order_handle');
+        $this->order = Order::where('trade_no', $tradeNo)
+            ->lockForUpdate()
+            ->first();
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        if (!$this->order) return;
+        $orderService = new OrderService($this->order);
+        switch ($this->order->status) {
+            // cancel
+            case 0:
+                if ($this->order->created_at <= (time() - 1800)) {
+                    $orderService->cancel();
+                }
+                break;
+            case 1:
+                $orderService->open();
+                break;
+        }
+    }
+}

app/Jobs/SendEmailJob.php

@@ -21,10 +21,9 @@ class SendEmailJob implements ShouldQueue
      *
      * @return void
      */
-    public function __construct($params)
+    public function __construct($params, $queue = 'send_email')
     {
-        $this->delay(now()->addSecond(2));
-        $this->onQueue('send_email');
+        $this->onQueue($queue);
         $this->params = $params;
     }
 
@@ -60,11 +59,15 @@ class SendEmailJob implements ShouldQueue
             $error = $e->getMessage();
         }
 
-        MailLog::create([
+        $log = [
             'email' => $params['email'],
             'subject' => $params['subject'],
             'template_name' => $params['template_name'],
             'error' => isset($error) ? $error : NULL
-        ]);
+        ];
+
+        MailLog::create($log);
+        $log['config'] = config('mail');
+        return $log;
     }
 }

app/Jobs/StatServerJob.php

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

app/Jobs/StatUserJob.php

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

app/Jobs/TrafficFetchJob.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Jobs;
+
+use App\Models\User;
+use App\Services\MailService;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class TrafficFetchJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    protected $u;
+    protected $d;
+    protected $userId;
+    protected $server;
+    protected $protocol;
+
+    public $tries = 3;
+    public $timeout = 3;
+
+    /**
+     * Create a new job instance.
+     *
+     * @return void
+     */
+    public function __construct($u, $d, $userId, $server, $protocol)
+    {
+        $this->onQueue('traffic_fetch');
+        $this->u = $u;
+        $this->d = $d;
+        $this->userId = $userId;
+        $this->server = $server;
+        $this->protocol = $protocol;
+    }
+
+    /**
+     * Execute the job.
+     *
+     * @return void
+     */
+    public function handle()
+    {
+        $user = User::lockForUpdate()->find($this->userId);
+        if (!$user) return;
+        
+        $user->t = time();
+        $user->u = $user->u + $this->u;
+        $user->d = $user->d + $this->d;
+        if (!$user->save()) throw new \Exception('流量更新失败');
+        $mailService = new MailService();
+        $mailService->remindTraffic($user);
+    }
+}

app/Models/CommissionLog.php

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

app/Models/Coupon.php

@@ -9,4 +9,10 @@ class Coupon extends Model
     protected $table = 'v2_coupon';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp',
+        'limit_plan_ids' => 'array',
+        'limit_period' => 'array'
+    ];
 }

app/Models/InviteCode.php

@@ -8,4 +8,8 @@ class InviteCode extends Model
 {
     protected $table = 'v2_invite_code';
     protected $dateFormat = 'U';
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp'
+    ];
 }

app/Models/Knowledge.php

@@ -9,4 +9,8 @@ class Knowledge extends Model
     protected $table = 'v2_knowledge';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp'
+    ];
 }

app/Models/MailLog.php

@@ -9,4 +9,8 @@ class MailLog extends Model
     protected $table = 'v2_mail_log';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp'
+    ];
 }

app/Models/Notice.php

@@ -9,4 +9,8 @@ class Notice extends Model
     protected $table = 'v2_notice';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp'
+    ];
 }

app/Models/Order.php

@@ -9,4 +9,9 @@ class Order extends Model
     protected $table = 'v2_order';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp',
+        'surplus_order_ids' => 'array'
+    ];
 }

app/Models/Payment.php

@@ -9,4 +9,9 @@ class Payment extends Model
     protected $table = 'v2_payment';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp',
+        'config' => 'array'
+    ];
 }

app/Models/Plan.php

@@ -9,4 +9,8 @@ class Plan extends Model
     protected $table = 'v2_plan';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp'
+    ];
 }

app/Models/Server.php

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

app/Models/ServerGroup.php

@@ -8,4 +8,8 @@ class ServerGroup extends Model
 {
     protected $table = 'v2_server_group';
     protected $dateFormat = 'U';
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp'
+    ];
 }

app/Models/ServerLog.php

@@ -9,4 +9,8 @@ class ServerLog extends Model
 {
     protected $table = 'v2_server_log';
     protected $dateFormat = 'U';
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp'
+    ];
 }

app/Models/ServerShadowsocks.php

@@ -9,4 +9,10 @@ class ServerShadowsocks extends Model
     protected $table = 'v2_server_shadowsocks';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp',
+        'group_id' => 'array',
+        'tags' => 'array'
+    ];
 }

app/Models/ServerStat.php

@@ -9,4 +9,8 @@ class ServerStat extends Model
     protected $table = 'v2_server_stat';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp'
+    ];
 }

app/Models/ServerTrojan.php

@@ -9,4 +9,10 @@ class ServerTrojan extends Model
     protected $table = 'v2_server_trojan';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp',
+        'group_id' => 'array',
+        'tags' => 'array'
+    ];
 }

app/Models/ServerV2ray.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ServerV2ray extends Model
+{
+    protected $table = 'v2_server_v2ray';
+    protected $dateFormat = 'U';
+    protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp',
+        'group_id' => 'array',
+        'tlsSettings' => 'array',
+        'networkSettings' => 'array',
+        'dnsSettings' => 'array',
+        'ruleSettings' => 'array',
+        'tags' => 'array'
+    ];
+}

app/Models/StatOrder.php

@@ -9,4 +9,8 @@ class StatOrder extends Model
     protected $table = 'v2_stat_order';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp'
+    ];
 }

app/Models/StatServer.php

@@ -9,4 +9,8 @@ class StatServer extends Model
     protected $table = 'v2_stat_server';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp'
+    ];
 }

app/Models/StatUser.php

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

app/Models/Ticket.php

@@ -9,4 +9,8 @@ class Ticket extends Model
     protected $table = 'v2_ticket';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp'
+    ];
 }

app/Models/TicketMessage.php

@@ -9,4 +9,8 @@ class TicketMessage extends Model
     protected $table = 'v2_ticket_message';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp'
+    ];
 }

app/Models/User.php

@@ -9,4 +9,8 @@ class User extends Model
     protected $table = 'v2_user';
     protected $dateFormat = 'U';
     protected $guarded = ['id'];
+    protected $casts = [
+        'created_at' => 'timestamp',
+        'updated_at' => 'timestamp'
+    ];
 }

app/Payments/AlipayF2F.php

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

app/Payments/BTCPay.php

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

app/Payments/CoinPayments.php

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

app/Payments/Coinbase.php

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

app/Payments/MGate.php

@@ -8,6 +8,8 @@ namespace App\Payments;
 use \Curl\Curl;
 
 class MGate {
+    private $config;
+
     public function __construct($config)
     {
         $this->config = $config;
@@ -47,6 +49,8 @@ class MGate {
         $str = http_build_query($params) . $this->config['mgate_app_secret'];
         $params['sign'] = md5($str);
         $curl = new Curl();
+        $curl->setUserAgent('MGate');
+        $curl->setOpt(CURLOPT_SSL_VERIFYPEER, 0);
         $curl->post($this->config['mgate_url'] . '/v1/gateway/fetch', http_build_query($params));
         $result = $curl->response;
         if (!$result) {

app/Payments/StripeAlipay.php

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