Merge pull request #439 from v2board/dev

1.5.1

app/Console/Commands/CheckCommission.php

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

app/Console/Commands/CheckOrder.php

@@ -7,8 +7,6 @@ use Illuminate\Console\Command;
 use App\Models\Order;
 use App\Models\User;
 use App\Models\Plan;
-use App\Utils\Helper;
-use App\Models\Coupon;
 use Illuminate\Support\Facades\DB;
 
 class CheckOrder extends Command
@@ -46,113 +44,19 @@ class CheckOrder extends Command
     {
         $orders = Order::get();
         foreach ($orders as $item) {
+            $orderService = new OrderService($item);
             switch ($item->status) {
                 // cancel
                 case 0:
                     if (strtotime($item->created_at) <= (time() - 1800)) {
-                        $orderService = new OrderService($item);
                         $orderService->cancel();
                     }
                     break;
                 case 1:
-                    $this->orderHandle($item);
+                    $orderService->open();
                     break;
             }
 
         }
     }
-
-    private function orderHandle(Order $order)
-    {
-        $user = User::find($order->user_id);
-        $plan = Plan::find($order->plan_id);
-
-        if ($order->refund_amount) {
-            $user->balance = $user->balance + $order->refund_amount;
-        }
-        DB::beginTransaction();
-        if ($order->surplus_order_ids) {
-            try {
-                Order::whereIn('id', json_decode($order->surplus_order_ids))->update([
-                    'status' => 4
-                ]);
-            } catch (\Exception $e) {
-                DB::rollback();
-                abort(500, '开通失败');
-            }
-        }
-        switch ((string)$order->cycle) {
-            case 'onetime_price':
-                $this->buyByOneTime($order, $user, $plan);
-                break;
-            case 'reset_price':
-                $this->buyReset($user);
-                break;
-            default:
-                $this->buyByCycle($order, $user, $plan);
-        }
-        if (!$user->save()) {
-            DB::rollBack();
-            abort(500, '开通失败');
-        }
-        $order->status = 3;
-        if (!$order->save()) {
-            DB::rollBack();
-            abort(500, '开通失败');
-        }
-
-        DB::commit();
-    }
-
-    private function buyReset(User $user)
-    {
-        $user->u = 0;
-        $user->d = 0;
-    }
-
-    private function buyByCycle(Order $order, User $user, Plan $plan)
-    {
-        // change plan process
-        if ((int)$order->type === 3) {
-            $user->expired_at = time();
-        }
-        $user->transfer_enable = $plan->transfer_enable * 1073741824;
-
-        // 续费重置&类型=续费
-        if ((int)config('v2board.renew_reset_traffic_enable', 1) && $order->type === 2) $this->buyReset($user);
-        // 购买前用户过期为NULL（一次性）
-        if ($user->expired_at === NULL) $this->buyReset($user);
-        // 新购
-        if ($order->type === 1) $this->buyReset($user);
-        $user->plan_id = $plan->id;
-        $user->group_id = $plan->group_id;
-        $user->expired_at = $this->getTime($order->cycle, $user->expired_at);
-    }
-
-    private function buyByOneTime(Order $order, User $user, Plan $plan)
-    {
-        $user->transfer_enable = $plan->transfer_enable * 1073741824;
-        $user->u = 0;
-        $user->d = 0;
-        $user->plan_id = $plan->id;
-        $user->group_id = $plan->group_id;
-        $user->expired_at = NULL;
-    }
-
-    private function getTime($str, $timestamp)
-    {
-        if ($timestamp < time()) {
-            $timestamp = time();
-        }
-        switch ($str) {
-            case 'month_price':
-                return strtotime('+1 month', $timestamp);
-            case 'quarter_price':
-                return strtotime('+3 month', $timestamp);
-            case 'half_year_price':
-                return strtotime('+6 month', $timestamp);
-            case 'year_price':
-                return strtotime('+12 month', $timestamp);
-        }
-    }
 }

app/Console/Commands/ResetTraffic.php

@@ -7,7 +7,7 @@ use App\Models\User;
 
 class ResetTraffic extends Command
 {
-    protected $user;
+    protected $builder;
     /**
      * The name and signature of the console command.
      *
@@ -30,7 +30,7 @@ class ResetTraffic extends Command
     public function __construct()
     {
         parent::__construct();
-        $this->user = User::where('expired_at', '!=', NULL)
+        $this->builder = User::where('expired_at', '!=', NULL)
             ->where('expired_at', '>', time());
     }
 
@@ -54,11 +54,11 @@ class ResetTraffic extends Command
         }
     }
 
-    private function resetByMonthFirstDay($user):void
+    private function resetByMonthFirstDay():void
     {
-        $user = $this->user;
+        $builder = $this->builder;
         if ((string)date('d') === '01') {
-            $user->update([
+            $builder->update([
                 'u' => 0,
                 'd' => 0
             ]);
@@ -67,10 +67,10 @@ class ResetTraffic extends Command
 
     private function resetByExpireDay():void
     {
-        $user = $this->user;
+        $builder = $this->builder;
         $lastDay = date('d', strtotime('last day of +0 months'));
         $users = [];
-        foreach ($user->get() as $item) {
+        foreach ($builder->get() as $item) {
             $expireDay = date('d', $item->expired_at);
             $today = date('d');
             if ($expireDay === $today) {

app/Console/Commands/SendRemindMail.php

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

app/Console/Commands/Test.php

@@ -2,6 +2,7 @@
 
 namespace App\Console\Commands;
 
+use App\Services\PaymentService;
 use Illuminate\Console\Command;
 
 class Test extends Command
@@ -37,5 +38,7 @@ class Test extends Command
      */
     public function handle()
     {
+        $paymentService = new PaymentService('MGate');
+        var_dump($paymentService->form());
     }
 }

app/Console/Commands/V2boardCache.php

@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Utils\CacheKey;
-use Illuminate\Console\Command;
-use App\Models\ServerLog;
-use App\Models\ServerStat;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\DB;
-
-class V2boardCache extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'v2board:cache';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = '缓存任务';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-    }
-
-    private function cacheServerStat()
-    {
-        $serverLogs = ServerLog::select(
-            'server_id',
-            DB::raw("sum(u) as u"),
-            DB::raw("sum(d) as d"),
-            DB::raw("count(*) as online")
-        )
-            ->where('updated_at', '>=', time() - 3600)
-            ->groupBy('server_id')
-            ->get();
-        foreach ($serverLogs as $serverLog) {
-            $data = [
-                'server_id' => $serverLog->server_id,
-                'u' => $serverLog->u,
-                'd' => $serverLog->d,
-                'online' => $serverLog->online
-            ];
-//            ServerStat::create($data);
-        }
-    }
-}

app/Console/Commands/V2boardStatistics.php

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

app/Console/Kernel.php

@@ -25,7 +25,7 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
         // v2board
-        $schedule->command('v2board:cache')->hourly();
+        $schedule->command('v2board:statistics')->daily();
         // check
         $schedule->command('check:order')->everyMinute();
         $schedule->command('check:commission')->everyMinute();

app/Http/Controllers/Admin/ConfigController.php

@@ -46,7 +46,10 @@ class ConfigController extends Controller
                     'invite_gen_limit' => config('v2board.invite_gen_limit', 5),
                     'invite_never_expire' => config('v2board.invite_never_expire', 0),
                     'commission_first_time_enable' => config('v2board.commission_first_time_enable', 1),
-                    'commission_auto_check_enable' => config('v2board.commission_auto_check_enable', 1)
+                    'commission_auto_check_enable' => config('v2board.commission_auto_check_enable', 1),
+                    'commission_withdraw_limit' => config('v2board.commission_withdraw_limit', 100),
+                    'commission_withdraw_method' => config('v2board.commission_withdraw_method', Dict::WITHDRAW_METHOD_WHITELIST_DEFAULT),
+                    'withdraw_close_enable' => config('v2board.withdraw_close_enable', 0)
                 ],
                 'site' => [
                     'safe_mode_enable' => (int)config('v2board.safe_mode_enable', 0),
@@ -60,12 +63,17 @@ class ConfigController extends Controller
                     'try_out_hour' => (int)config('v2board.try_out_hour', 1),
                     'email_whitelist_enable' => (int)config('v2board.email_whitelist_enable', 0),
                     'email_whitelist_suffix' => config('v2board.email_whitelist_suffix', Dict::EMAIL_WHITELIST_SUFFIX_DEFAULT),
-                    'email_gmail_limit_enable' => config('v2board.email_gmail_limit_enable', 0)
+                    'email_gmail_limit_enable' => config('v2board.email_gmail_limit_enable', 0),
+                    'recaptcha_enable' => (int)config('v2board.recaptcha_enable', 0),
+                    'recaptcha_key' => config('v2board.recaptcha_key'),
+                    'recaptcha_site_key' => config('v2board.recaptcha_site_key'),
+                    'tos_url' => config('v2board.tos_url')
                 ],
                 'subscribe' => [
                     'plan_change_enable' => (int)config('v2board.plan_change_enable', 1),
                     'reset_traffic_method' => (int)config('v2board.reset_traffic_method', 0),
-                    'renew_reset_traffic_enable' => (int)config('v2board.renew_reset_traffic_enable', 1)
+                    'renew_reset_traffic_enable' => (int)config('v2board.renew_reset_traffic_enable', 0),
+                    'surplus_enable' => (int)config('v2board.surplus_enable', 1)
                 ],
                 'pay' => [
                     // alipay
@@ -103,7 +111,9 @@ class ConfigController extends Controller
                     'frontend_theme_header' => config('v2board.frontend_theme_header', 'dark'),
                     'frontend_theme_color' => config('v2board.frontend_theme_color', 'default'),
                     'frontend_background_url' => config('v2board.frontend_background_url'),
-                    'frontend_admin_path' => config('v2board.frontend_admin_path', 'admin')
+                    'frontend_admin_path' => config('v2board.frontend_admin_path', 'admin'),
+                    'frontend_customer_service_method' => config('v2board.frontend_customer_service_method', 0),
+                    'frontend_customer_service_id' => config('v2board.frontend_customer_service_id'),
                 ],
                 'server' => [
                     'server_token' => config('v2board.server_token'),
@@ -127,6 +137,14 @@ class ConfigController extends Controller
                 'telegram' => [
                     'telegram_bot_enable' => config('v2board.telegram_bot_enable', 0),
                     'telegram_bot_token' => config('v2board.telegram_bot_token')
+                ],
+                'app' => [
+                    'windows_version' => config('v2board.windows_version'),
+                    'windows_download_url' => config('v2board.windows_download_url'),
+                    'macos_version' => config('v2board.macos_version'),
+                    'macos_download_url' => config('v2board.macos_download_url'),
+                    'android_version' => config('v2board.android_version'),
+                    'android_download_url' => config('v2board.android_download_url')
                 ]
             ]
         ]);
@@ -147,7 +165,9 @@ class ConfigController extends Controller
             abort(500, '修改失败');
         }
         if (function_exists('opcache_reset')) {
-            opcache_reset();
+            if (opcache_reset() === false) {
+                abort(500, '缓存清除失败，请卸载或检查opcache配置状态');
+            }
         }
         \Artisan::call('config:cache');
         return response([

app/Http/Controllers/Admin/CouponController.php

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

app/Http/Controllers/Admin/KnowledgeController.php

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

app/Http/Controllers/Admin/MailController.php

@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Admin;
-
-use App\Http\Requests\Admin\MailSend;
-use App\Services\UserService;
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Jobs\SendEmailJob;
-
-class MailController extends Controller
-{
-    public function send(MailSend $request)
-    {
-        $userService = new UserService();
-        $users = [];
-        switch ($request->input('type')) {
-            case 1: $users = $userService->getAllUsers();
-            break;
-            case 2: $users = $userService->getUsersByIds($request->input('receiver'));
-            break;
-            // available users
-            case 3: $users = $userService->getAvailableUsers();
-            break;
-            // un available users
-            case 4: $users = $userService->getUnAvailbaleUsers();
-            break;
-        }
-
-        foreach ($users as $user) {
-            SendEmailJob::dispatch([
-                'email' => $user->email,
-                'subject' => $request->input('subject'),
-                'template_name' => 'notify',
-                'template_value' => [
-                    'name' => config('v2board.app_name', 'V2Board'),
-                    'url' => config('v2board.app_url'),
-                    'content' => $request->input('content')
-                ]
-            ]);
-        }
-
-        return response([
-            'data' => true
-        ]);
-    }
-}

app/Http/Controllers/Admin/OrderController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\Admin\OrderAssign;
 use App\Http\Requests\Admin\OrderUpdate;
+use App\Http\Requests\Admin\OrderFetch;
 use App\Services\OrderService;
 use App\Utils\Helper;
 use Illuminate\Http\Request;
@@ -15,25 +16,36 @@ use Illuminate\Support\Facades\DB;
 
 class OrderController extends Controller
 {
-    public function fetch(Request $request)
+    private function filter(Request $request, &$builder)
+    {
+        if ($request->input('filter')) {
+            foreach ($request->input('filter') as $filter) {
+                if ($filter['key'] === 'email') {
+                    $user = User::where('email', "%{$filter['value']}%")->first();
+                    if (!$user) continue;
+                    $builder->where('user_id', $user->id);
+                    continue;
+                }
+                if ($filter['condition'] === '模糊') {
+                    $filter['condition'] = 'like';
+                    $filter['value'] = "%{$filter['value']}%";
+                }
+                $builder->where($filter['key'], $filter['condition'], $filter['value']);
+            }
+        }
+    }
+
+    public function fetch(OrderFetch $request)
     {
         $current = $request->input('current') ? $request->input('current') : 1;
         $pageSize = $request->input('pageSize') >= 10 ? $request->input('pageSize') : 10;
         $orderModel = Order::orderBy('created_at', 'DESC');
-        if ($request->input('trade_no')) {
-            $orderModel->where('trade_no', $request->input('trade_no'));
-        }
         if ($request->input('is_commission')) {
             $orderModel->where('invite_user_id', '!=', NULL);
-            $orderModel->where('status', 3);
+            $orderModel->whereNotIn('status', [0, 2]);
             $orderModel->where('commission_balance', '>', 0);
         }
-        if ($request->input('id')) {
-            $orderModel->where('id', $request->input('id'));
-        }
-        if ($request->input('user_id')) {
-            $orderModel->where('user_id', $request->input('user_id'));
-        }
+        $this->filter($request, $orderModel);
         $total = $orderModel->count();
         $res = $orderModel->forPage($current, $pageSize)
             ->get();

app/Http/Controllers/Admin/PaymentController.php

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

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

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

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

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

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

@@ -3,38 +3,14 @@
 namespace App\Http\Controllers\Admin\Server;
 
 use App\Http\Requests\Admin\ServerTrojanSave;
-use App\Http\Requests\Admin\ServerTrojanSort;
 use App\Http\Requests\Admin\ServerTrojanUpdate;
 use App\Services\ServerService;
-use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\ServerTrojan;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\DB;
 
 class TrojanController extends Controller
 {
-    public function fetch(Request $request)
-    {
-        $server = ServerTrojan::orderBy('sort', 'ASC')->get();
-        for ($i = 0; $i < count($server); $i++) {
-            if (!empty($server[$i]['tags'])) {
-                $server[$i]['tags'] = json_decode($server[$i]['tags']);
-            }
-            $server[$i]['group_id'] = json_decode($server[$i]['group_id']);
-            $server[$i]['online'] = Cache::get(CacheKey::get('SERVER_TROJAN_ONLINE_USER', $server[$i]['parent_id'] ? $server[$i]['parent_id'] : $server[$i]['id']));
-            if ($server[$i]['parent_id']) {
-                $server[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $server[$i]['parent_id']));
-            } else {
-                $server[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $server[$i]['id']));
-            }
-        }
-        return response([
-            'data' => $server
-        ]);
-    }
-
     public function save(ServerTrojanSave $request)
     {
         $params = $request->validated();
@@ -117,22 +93,6 @@ class TrojanController extends Controller
             'data' => true
         ]);
     }
-
-    public function sort(ServerTrojanSort $request)
-    {
-        DB::beginTransaction();
-        foreach ($request->input('server_ids') as $k => $v) {
-            if (!ServerTrojan::find($v)->update(['sort' => $k + 1])) {
-                DB::rollBack();
-                abort(500, '保存失败');
-            }
-        }
-        DB::commit();
-        return response([
-            'data' => true
-        ]);
-    }
-
     public function viewConfig(Request $request)
     {
         $serverService = new ServerService();

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

@@ -3,38 +3,14 @@
 namespace App\Http\Controllers\Admin\Server;
 
 use App\Http\Requests\Admin\ServerV2raySave;
-use App\Http\Requests\Admin\ServerV2raySort;
 use App\Http\Requests\Admin\ServerV2rayUpdate;
 use App\Services\ServerService;
-use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\Server;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\DB;
 
 class V2rayController extends Controller
 {
-    public function fetch(Request $request)
-    {
-        $server = Server::orderBy('sort', 'ASC')->get();
-        for ($i = 0; $i < count($server); $i++) {
-            if (!empty($server[$i]['tags'])) {
-                $server[$i]['tags'] = json_decode($server[$i]['tags']);
-            }
-            $server[$i]['group_id'] = json_decode($server[$i]['group_id']);
-            $server[$i]['online'] = Cache::get(CacheKey::get('SERVER_V2RAY_ONLINE_USER', $server[$i]['parent_id'] ? $server[$i]['parent_id'] : $server[$i]['id']));
-            if ($server[$i]['parent_id']) {
-                $server[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $server[$i]['parent_id']));
-            } else {
-                $server[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $server[$i]['id']));
-            }
-        }
-        return response([
-            'data' => $server
-        ]);
-    }
-
     public function save(ServerV2raySave $request)
     {
         $params = $request->validated();
@@ -145,24 +121,9 @@ class V2rayController extends Controller
     public function viewConfig(Request $request)
     {
         $serverService = new ServerService();
-        $config = $serverService->getVmessConfig($request->input('node_id'), 23333);
+        $config = $serverService->getV2RayConfig($request->input('node_id'), 23333);
         return response([
             'data' => $config
         ]);
     }
-
-    public function sort(ServerV2raySort $request)
-    {
-        DB::beginTransaction();
-        foreach ($request->input('server_ids') as $k => $v) {
-            if (!Server::find($v)->update(['sort' => $k + 1])) {
-                DB::rollBack();
-                abort(500, '保存失败');
-            }
-        }
-        DB::commit();
-        return response([
-            'data' => true
-        ]);
-    }
 }

app/Http/Controllers/Admin/StatController.php

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

app/Http/Controllers/Admin/TutorialController.php

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

app/Http/Controllers/Admin/UserController.php

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

app/Http/Controllers/Client/AppController.php

@@ -18,25 +18,30 @@ class AppController extends Controller
 
     public function getConfig(Request $request)
     {
-        $server = [];
+        $servers = [];
         $user = $request->user;
         $userService = new UserService();
         if ($userService->isAvailable($user)) {
             $serverService = new ServerService();
-            $servers = $serverService->getAllServers($user);
+            $servers = $serverService->getAvailableServers($user);
         }
         $config = Yaml::parseFile(base_path() . '/resources/rules/app.clash.yaml');
         $proxy = [];
         $proxies = [];
 
-        foreach ($servers['vmess'] as $item) {
-            array_push($proxy, Clash::buildVmess($user->uuid, $item));
-            array_push($proxies, $item->name);
-        }
-
-        foreach ($servers['trojan'] as $item) {
-            array_push($proxy, Clash::buildTrojan($user->uuid, $item));
-            array_push($proxies, $item->name);
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                array_push($proxy, Clash::buildShadowsocks($user['uuid'], $item));
+                array_push($proxies, $item['name']);
+            }
+            if ($item['type'] === 'v2ray') {
+                array_push($proxy, Clash::buildVmess($user['uuid'], $item));
+                array_push($proxies, $item['name']);
+            }
+            if ($item['type'] === 'trojan') {
+                array_push($proxy, Clash::buildTrojan($user['uuid'], $item));
+                array_push($proxies, $item['name']);
+            }
         }
 
         $config['proxies'] = array_merge($config['proxies'] ? $config['proxies'] : [], $proxy);
@@ -46,12 +51,36 @@ class AppController extends Controller
         die(Yaml::dump($config));
     }
 
-    public function getVersion()
+    public function getVersion(Request $request)
     {
+        if (strpos($request->header('user-agent'), 'tidalab/4.0.0') !== false
+            || strpos($request->header('user-agent'), 'tunnelab/4.0.0') !== false
+        ) {
+            if (strpos($request->header('user-agent'), 'Win64') !== false) {
+                return response([
+                    'data' => [
+                        'version' => config('v2board.windows_version'),
+                        'download_url' => config('v2board.windows_download_url')
+                    ]
+                ]);
+            } else {
+                return response([
+                    'data' => [
+                        'version' => config('v2board.macos_version'),
+                        'download_url' => config('v2board.macos_download_url')
+                    ]
+                ]);
+            }
+            return;
+        }
         return response([
             'data' => [
-                'version' => '4.0.0',
-                'download_url' => ''
+                'windows_version' => config('v2board.windows_version'),
+                'windows_download_url' => config('v2board.windows_download_url'),
+                'macos_version' => config('v2board.macos_version'),
+                'macos_download_url' => config('v2board.macos_download_url'),
+                'android_version' => config('v2board.android_version'),
+                'android_download_url' => config('v2board.android_download_url')
             ]
         ]);
     }
@@ -80,7 +109,7 @@ class AppController extends Controller
         $json->outbound->settings->vnext[0]->address = (string)$server->host;
         $json->outbound->settings->vnext[0]->port = (int)$server->port;
         $json->outbound->settings->vnext[0]->users[0]->id = (string)$user->uuid;
-        $json->outbound->settings->vnext[0]->users[0]->alterId = (int)$user->v2ray_alter_id;
+        $json->outbound->settings->vnext[0]->users[0]->alterId = (int)$server->alter_id;
         $json->outbound->settings->vnext[0]->remark = (string)$server->name;
         $json->outbound->streamSettings->network = $server->network;
         if ($server->networkSettings) {

app/Http/Controllers/Client/ClientController.php

@@ -8,6 +8,8 @@ use App\Utils\Clash;
 use App\Utils\QuantumultX;
 use App\Utils\Shadowrocket;
 use App\Utils\Surge;
+use App\Utils\Surfboard;
+use App\Utils\URLSchemes;
 use Illuminate\Http\Request;
 use App\Models\Server;
 use App\Utils\Helper;
@@ -18,117 +20,173 @@ class ClientController extends Controller
 {
     public function subscribe(Request $request)
     {
+        $flag = $request->input('flag')
+            ?? (isset($_SERVER['HTTP_USER_AGENT'])
+                ? $_SERVER['HTTP_USER_AGENT']
+                : '');
+        $flag = strtolower($flag);
         $user = $request->user;
         // account not expired and is not banned.
         $userService = new UserService();
         if ($userService->isAvailable($user)) {
             $serverService = new ServerService();
-            $servers = $serverService->getAllServers($user);
-
-            if (isset($_SERVER['HTTP_USER_AGENT'])) {
-                $_SERVER['HTTP_USER_AGENT'] = strtolower($_SERVER['HTTP_USER_AGENT']);
-                if (strpos($_SERVER['HTTP_USER_AGENT'], 'quantumult%20x') !== false) {
-                    die($this->quantumultX($user, $servers['vmess'], $servers['trojan']));
+            $servers = $serverService->getAvailableServers($user);
+            if ($flag) {
+                if (strpos($flag, 'quantumult%20x') !== false) {
+                    die($this->quantumultX($user, $servers));
                 }
-                if (strpos($_SERVER['HTTP_USER_AGENT'], 'quantumult') !== false) {
-                    die($this->quantumult($user, $servers['vmess']));
+                if (strpos($flag, 'quantumult') !== false) {
+                    die($this->quantumult($user, $servers));
                 }
-                if (strpos($_SERVER['HTTP_USER_AGENT'], 'clash') !== false) {
-                    die($this->clash($user, $servers['vmess'], $servers['trojan']));
+                if (strpos($flag, 'clash') !== false) {
+                    die($this->clash($user, $servers));
                 }
-                if (strpos($_SERVER['HTTP_USER_AGENT'], 'surfboard') !== false) {
-                    die($this->surfboard($user, $servers['vmess']));
+                if (strpos($flag, 'surfboard') !== false) {
+                    die($this->surfboard($user, $servers));
                 }
-                if (strpos($_SERVER['HTTP_USER_AGENT'], 'surge') !== false) {
-                    die($this->surge($user, $servers['vmess'], $servers['trojan']));
+                if (strpos($flag, 'surge') !== false) {
+                    die($this->surge($user, $servers));
                 }
-                if (strpos($_SERVER['HTTP_USER_AGENT'], 'shadowrocket') !== false) {
-                    die($this->shadowrocket($user, $servers['vmess'], $servers['trojan']));
+                if (strpos($flag, 'shadowrocket') !== false) {
+                    die($this->shadowrocket($user, $servers));
+                }
+                if (strpos($flag, 'shadowsocks') !== false) {
+                    die($this->shaodowsocksSIP008($user, $servers));
                 }
             }
-            die($this->origin($user, $servers['vmess'], $servers['trojan']));
+            die($this->origin($user, $servers));
         }
     }
     // TODO: Ready to stop support
-    private function quantumult($user, $vmess = [])
+    private function quantumult($user, $servers = [])
     {
         $uri = '';
-        header('subscription-userinfo: upload=' . $user->u . '; download=' . $user->d . ';total=' . $user->transfer_enable);
-        foreach ($vmess as $item) {
-            $str = '';
-            $str .= $item->name . '= vmess, ' . $item->host . ', ' . $item->port . ', chacha20-ietf-poly1305, "' . $user->uuid . '", over-tls=' . ($item->tls ? "true" : "false") . ', certificate=0, group=' . config('v2board.app_name', 'V2Board');
-            if ($item->network === 'ws') {
-                $str .= ', obfs=ws';
-                if ($item->networkSettings) {
-                    $wsSettings = json_decode($item->networkSettings);
-                    if (isset($wsSettings->path)) $str .= ', obfs-path="' . $wsSettings->path . '"';
-                    if (isset($wsSettings->headers->Host)) $str .= ', obfs-header="Host:' . $wsSettings->headers->Host . '"';
+        header('subscription-userinfo: upload=' . $user['u'] . '; download=' . $user['d'] . ';total=' . $user['transfer_enable']);
+        foreach ($servers as $item) {
+            if ($item['type'] === 'v2ray') {
+                $str = '';
+                $str .= $item['name'] . '= vmess, ' . $item['host'] . ', ' . $item['port'] . ', chacha20-ietf-poly1305, "' . $user['uuid'] . '", over-tls=' . ($item['tls'] ? "true" : "false") . ', certificate=0, group=' . config('v2board.app_name', 'V2Board');
+                if ($item['network'] === 'ws') {
+                    $str .= ', obfs=ws';
+                    if ($item['networkSettings']) {
+                        $wsSettings = json_decode($item['networkSettings'], true);
+                        if (isset($wsSettings['path'])) $str .= ', obfs-path="' . $wsSettings['path'] . '"';
+                        if (isset($wsSettings['headers']['Host'])) $str .= ', obfs-header="Host:' . $wsSettings['headers']['Host'] . '"';
+                    }
                 }
+                $uri .= "vmess://" . base64_encode($str) . "\r\n";
             }
-            $uri .= "vmess://" . base64_encode($str) . "\r\n";
         }
         return base64_encode($uri);
     }
 
-    private function shadowrocket($user, $vmess = [], $trojan = [])
+    private function shadowrocket($user, $servers = [])
     {
         $uri = '';
         //display remaining traffic and expire date
-        $upload = round($user->u / (1024*1024*1024), 2);
-        $download = round($user->d / (1024*1024*1024), 2);
-        $totalTraffic = round($user->transfer_enable / (1024*1024*1024), 2);
-        $expiredDate = date('Y-m-d', $user->expired_at);
+        $upload = round($user['u'] / (1024*1024*1024), 2);
+        $download = round($user['d'] / (1024*1024*1024), 2);
+        $totalTraffic = round($user['transfer_enable'] / (1024*1024*1024), 2);
+        $expiredDate = date('Y-m-d', $user['expired_at']);
         $uri .= "STATUS=🚀↑:{$upload}GB,↓:{$download}GB,TOT:{$totalTraffic}GB💡Expires:{$expiredDate}\r\n";
-        foreach ($vmess as $item) {
-            $uri .= Shadowrocket::buildVmess($user->uuid, $item);
-        }
-        foreach ($trojan as $item) {
-            $uri .= Shadowrocket::buildTrojan($user->uuid, $item);
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                $uri .= Shadowrocket::buildShadowsocks($user['uuid'], $item);
+            }
+            if ($item['type'] === 'v2ray') {
+                $uri .= Shadowrocket::buildVmess($user['uuid'], $item);
+            }
+            if ($item['type'] === 'trojan') {
+                $uri .= Shadowrocket::buildTrojan($user['uuid'], $item);
+            }
         }
         return base64_encode($uri);
     }
 
-    private function quantumultX($user, $vmess = [], $trojan = [])
+    private function quantumultX($user, $servers = [])
     {
         $uri = '';
-        header("subscription-userinfo: upload={$user->u}; download={$user->d}; total={$user->transfer_enable}; expire={$user->expired_at}");
-        foreach ($vmess as $item) {
-            $uri .= QuantumultX::buildVmess($user->uuid, $item);
-        }
-        foreach ($trojan as $item) {
-            $uri .= QuantumultX::buildTrojan($user->uuid, $item);
+        header("subscription-userinfo: upload={$user['u']}; download={$user['d']}; total={$user['transfer_enable']}; expire={$user['expired_at']}");
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                $uri .= QuantumultX::buildShadowsocks($user['uuid'], $item);
+            }
+            if ($item['type'] === 'v2ray') {
+                $uri .= QuantumultX::buildVmess($user['uuid'], $item);
+            }
+            if ($item['type'] === 'trojan') {
+                $uri .= QuantumultX::buildTrojan($user['uuid'], $item);
+            }
         }
         return base64_encode($uri);
     }
 
-    private function origin($user, $vmess = [], $trojan = [])
+    private function origin($user, $servers = [])
     {
         $uri = '';
-        foreach ($vmess as $item) {
-            $uri .= Helper::buildVmessLink($item, $user);
-        }
-        foreach ($trojan as $item) {
-            $uri .= Helper::buildTrojanLink($item, $user);
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                $uri .= URLSchemes::buildShadowsocks($item, $user);
+            }
+            if ($item['type'] === 'v2ray') {
+                $uri .= URLSchemes::buildVmess($item, $user);
+            }
+            if ($item['type'] === 'trojan') {
+                $uri .= URLSchemes::buildTrojan($item, $user);
+            }
         }
         return base64_encode($uri);
     }
 
-    private function surge($user, $vmess = [], $trojan = [])
+    private function shaodowsocksSIP008($user, $servers = [])
+    {
+        $configs = [];
+        $subs = [];
+        $subs['servers'] = [];
+        $subs['bytes_used'] = '';
+        $subs['bytes_remaining'] = '';
+
+        $bytesUsed = $user['u'] + $user['d'];
+        $bytesRemaining = $user['transfer_enable'] - $bytesUsed;
+
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                array_push($configs, URLSchemes::buildShadowsocksSIP008($item, $user));
+            }
+        }
+
+        $subs['version'] = 1;
+        $subs['bytes_used'] = $bytesUsed;
+        $subs['bytes_remaining'] = $bytesRemaining;
+        $subs['servers'] = array_merge($subs['servers'] ? $subs['servers'] : [], $configs);
+
+        return json_encode($subs, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
+    }
+
+    private function surge($user, $servers = [])
     {
         $proxies = '';
         $proxyGroup = '';
-        foreach ($vmess as $item) {
-            // [Proxy]
-            $proxies .= Surge::buildVmess($user->uuid, $item);
-            // [Proxy Group]
-            $proxyGroup .= $item->name . ', ';
-        }
 
-        foreach ($trojan as $item) {
-            // [Proxy]
-            $proxies .= Surge::buildTrojan($user->uuid, $item);
-            // [Proxy Group]
-            $proxyGroup .= $item->name . ', ';
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                // [Proxy]
+                $proxies .= Surge::buildShadowsocks($user['uuid'], $item);
+                // [Proxy Group]
+                $proxyGroup .= $item['name'] . ', ';
+            }
+            if ($item['type'] === 'v2ray') {
+                // [Proxy]
+                $proxies .= Surge::buildVmess($user['uuid'], $item);
+                // [Proxy Group]
+                $proxyGroup .= $item['name'] . ', ';
+            }
+            if ($item['type'] === 'trojan') {
+                // [Proxy]
+                $proxies .= Surge::buildTrojan($user['uuid'], $item);
+                // [Proxy Group]
+                $proxyGroup .= $item['name'] . ', ';
+            }
         }
 
         $defaultConfig = base_path() . '/resources/rules/default.surge.conf';
@@ -148,31 +206,24 @@ class ClientController extends Controller
         return $config;
     }
 
-    private function surfboard($user, $vmess = [])
+    private function surfboard($user, $servers = [])
     {
         $proxies = '';
         $proxyGroup = '';
-        foreach ($vmess as $item) {
-            // [Proxy]
-            $proxies .= $item->name . ' = vmess, ' . $item->host . ', ' . $item->port . ', username=' . $user->uuid;
-            if ($item->tls) {
-                $tlsSettings = json_decode($item->tlsSettings);
-                $proxies .= ', tls=' . ($item->tls ? "true" : "false");
-                if (isset($tlsSettings->allowInsecure)) {
-                  $proxies .= ', skip-cert-verify=' . ($tlsSettings->allowInsecure ? "true" : "false");
-                }
+
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                // [Proxy]
+                $proxies .= Surfboard::buildShadowsocks($user['uuid'], $item);
+                // [Proxy Group]
+                $proxyGroup .= $item['name'] . ', ';
             }
-            if ($item->network == 'ws') {
-                $proxies .= ', ws=true';
-                if ($item->networkSettings) {
-                    $wsSettings = json_decode($item->networkSettings);
-                    if (isset($wsSettings->path)) $proxies .= ', ws-path=' . $wsSettings->path;
-                    if (isset($wsSettings->headers->Host)) $proxies .= ', ws-headers=host:' . $wsSettings->headers->Host;
-                }
+            if ($item['type'] === 'v2ray') {
+                // [Proxy]
+                $proxies .= Surfboard::buildVmess($user['uuid'], $item);
+                // [Proxy Group]
+                $proxyGroup .= $item['name'] . ', ';
             }
-            $proxies .= "\r\n";
-            // [Proxy Group]
-            $proxyGroup .= $item->name . ', ';
         }
 
         $defaultConfig = base_path() . '/resources/rules/default.surfboard.conf';
@@ -192,7 +243,7 @@ class ClientController extends Controller
         return $config;
     }
 
-    private function clash($user, $vmess = [], $trojan = [])
+    private function clash($user, $servers = [])
     {
         $defaultConfig = base_path() . '/resources/rules/default.clash.yaml';
         $customConfig = base_path() . '/resources/rules/custom.clash.yaml';
@@ -203,19 +254,25 @@ class ClientController extends Controller
         }
         $proxy = [];
         $proxies = [];
-        foreach ($vmess as $item) {
-            array_push($proxy, Clash::buildVmess($user->uuid, $item));
-            array_push($proxies, $item->name);
-        }
 
-
-        foreach ($trojan as $item) {
-            array_push($proxy, Clash::buildTrojan($user->uuid, $item));
-            array_push($proxies, $item->name);
+        foreach ($servers as $item) {
+            if ($item['type'] === 'shadowsocks') {
+                array_push($proxy, Clash::buildShadowsocks($user['uuid'], $item));
+                array_push($proxies, $item['name']);
+            }
+            if ($item['type'] === 'v2ray') {
+                array_push($proxy, Clash::buildVmess($user['uuid'], $item));
+                array_push($proxies, $item['name']);
+            }
+            if ($item['type'] === 'trojan') {
+                array_push($proxy, Clash::buildTrojan($user['uuid'], $item));
+                array_push($proxies, $item['name']);
+            }
         }
 
         $config['proxies'] = array_merge($config['proxies'] ? $config['proxies'] : [], $proxy);
         foreach ($config['proxy-groups'] as $k => $v) {
+            if (!is_array($config['proxy-groups'][$k]['proxies'])) continue;
             $config['proxy-groups'][$k]['proxies'] = array_merge($config['proxy-groups'][$k]['proxies'], $proxies);
         }
         $yaml = Yaml::dump($config);

app/Http/Controllers/Guest/CommController.php

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

app/Http/Controllers/Guest/OrderController.php

@@ -1,176 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Guest;
-
-use App\Services\OrderService;
-use App\Services\TelegramService;
-use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
-use App\Models\Order;
-use Library\Epay;
-use Omnipay\Omnipay;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Cache;
-use Library\BitpayX;
-use Library\MGate;
-
-class OrderController extends Controller
-{
-    public function alipayNotify(Request $request)
-    {
-        // Log::info('alipayNotifyData: ' . json_encode($_POST));
-        $gateway = Omnipay::create('Alipay_AopF2F');
-        $gateway->setSignType('RSA2'); //RSA/RSA2
-        $gateway->setAppId(config('v2board.alipay_appid'));
-        $gateway->setPrivateKey(config('v2board.alipay_privkey')); // 可以是路径，也可以是密钥内容
-        $gateway->setAlipayPublicKey(config('v2board.alipay_pubkey')); // 可以是路径，也可以是密钥内容
-        $request = $gateway->completePurchase();
-        $request->setParams($_POST); //Optional
-        try {
-            /** @var \Omnipay\Alipay\Responses\AopCompletePurchaseResponse $response */
-            $response = $request->send();
-
-            if ($response->isPaid()) {
-                /**
-                 * Payment is successful
-                 */
-                if (!$this->handle($_POST['out_trade_no'], $_POST['trade_no'])) {
-                    abort(500, 'fail');
-                }
-
-                die('success'); //The response should be 'success' only
-            } else {
-                /**
-                 * Payment is not successful
-                 */
-                die('fail');
-            }
-        } catch (Exception $e) {
-            /**
-             * Payment is not successful
-             */
-            die('fail');
-        }
-    }
-
-    public function stripeNotify(Request $request)
-    {
-        // Log::info('stripeNotifyData: ' . json_encode($request->input()));
-
-        \Stripe\Stripe::setApiKey(config('v2board.stripe_sk_live'));
-        try {
-            $event = \Stripe\Webhook::constructEvent(
-                file_get_contents('php://input'),
-                $_SERVER['HTTP_STRIPE_SIGNATURE'],
-                config('v2board.stripe_webhook_key')
-            );
-        } catch (\Stripe\Error\SignatureVerification $e) {
-            abort(400);
-        }
-        switch ($event->type) {
-            case 'source.chargeable':
-                $object = $event->data->object;
-                \Stripe\Charge::create([
-                    'amount' => $object->amount,
-                    'currency' => $object->currency,
-                    'source' => $object->id,
-                    'metadata' => json_decode($object->metadata, true)
-                ]);
-                die('success');
-                break;
-            case 'charge.succeeded':
-                $object = $event->data->object;
-                if ($object->status === 'succeeded') {
-                    $metaData = isset($object->metadata->out_trade_no) ? $object->metadata : $object->source->metadata;
-                    $tradeNo = $metaData->out_trade_no;
-                    if (!$tradeNo) {
-                        abort(500, 'trade no is not found in metadata');
-                    }
-                    if (!$this->handle($tradeNo, $object->balance_transaction)) {
-                        abort(500, 'fail');
-                    }
-                    die('success');
-                }
-                break;
-            default:
-                abort(500, 'event is not support');
-        }
-    }
-
-    public function bitpayXNotify(Request $request)
-    {
-        $inputString = file_get_contents('php://input', 'r');
-        // Log::info('bitpayXNotifyData: ' . $inputString);
-        $inputStripped = str_replace(array("\r", "\n", "\t", "\v"), '', $inputString);
-        $inputJSON = json_decode($inputStripped, true); //convert JSON into array
-
-        $bitpayX = new BitpayX(config('v2board.bitpayx_appsecret'));
-        $params = [
-            'status' => $inputJSON['status'],
-            'order_id' => $inputJSON['order_id'],
-            'merchant_order_id' => $inputJSON['merchant_order_id'],
-            'price_amount' => $inputJSON['price_amount'],
-            'price_currency' => $inputJSON['price_currency'],
-            'pay_amount' => $inputJSON['pay_amount'],
-            'pay_currency' => $inputJSON['pay_currency'],
-            'created_at_t' => $inputJSON['created_at_t']
-        ];
-        $strToSign = $bitpayX->prepareSignId($inputJSON['merchant_order_id']);
-        if (!$bitpayX->verify($strToSign, $inputJSON['token'])) {
-            abort(500, 'sign error');
-        }
-        if ($params['status'] !== 'PAID') {
-            abort(500, 'order is not paid');
-        }
-        if (!$this->handle($params['merchant_order_id'], $params['order_id'])) {
-            abort(500, 'order process fail');
-        }
-        die(json_encode([
-            'status' => 200
-        ]));
-    }
-
-    public function mgateNotify(Request $request)
-    {
-        $mgate = new MGate(config('v2board.mgate_url'), config('v2board.mgate_app_id'), config('v2board.mgate_app_secret'));
-        if (!$mgate->verify($request->input())) {
-            abort(500, 'fail');
-        }
-        if (!$this->handle($request->input('out_trade_no'), $request->input('trade_no'))) {
-            abort(500, 'fail');
-        }
-        die('success');
-    }
-
-    public function epayNotify(Request $request)
-    {
-        $epay = new Epay(config('v2board.epay_url'), config('v2board.epay_pid'), config('v2board.epay_key'));
-        if (!$epay->verify($request->input())) {
-            abort(500, 'fail');
-        }
-        if (!$this->handle($request->input('out_trade_no'), $request->input('trade_no'))) {
-            abort(500, 'fail');
-        }
-        die('success');
-    }
-
-    private function handle($tradeNo, $callbackNo)
-    {
-        $order = Order::where('trade_no', $tradeNo)->first();
-        if (!$order) {
-            abort(500, 'order is not found');
-        }
-        $orderService = new OrderService($order);
-        if (!$orderService->success($callbackNo)) {
-            return false;
-        }
-        $telegramService = new TelegramService();
-        $message = sprintf(
-            "💰成功收款%s元\n———————————————\n订单号：%s",
-            $order->total_amount / 100,
-            $order->trade_no
-        );
-        $telegramService->sendMessageWithAdmin($message);
-        return true;
-    }
-}

app/Http/Controllers/Guest/PaymentController.php

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

app/Http/Controllers/Guest/TelegramController.php

@@ -73,7 +73,7 @@ class TelegramController extends Controller
         $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']) ? 'send' : 'reply';
+        $obj->message_type = !isset($data['message']['reply_to_message']['text']) ? 'send' : 'reply';
         $obj->text = $data['message']['text'];
         if ($obj->message_type === 'reply') {
             $obj->reply_text = $data['message']['reply_to_message']['text'];
@@ -184,7 +184,7 @@ class TelegramController extends Controller
             abort(500, '用户不存在');
         }
         $ticketService = new TicketService();
-        if ($user->is_admin) {
+        if ($user->is_admin || $user->is_staff) {
             $ticketService->replyByAdmin(
                 $ticketId,
                 $msg->text,
@@ -194,4 +194,6 @@ class TelegramController extends Controller
         $telegramService = new TelegramService();
         $telegramService->sendMessage($msg->chat_id, "#`{$ticketId}` 的工单已回复成功", 'markdown');
     }
+
+
 }

app/Http/Controllers/Passport/AuthController.php

@@ -14,11 +14,19 @@ use App\Models\InviteCode;
 use App\Utils\Helper;
 use App\Utils\Dict;
 use App\Utils\CacheKey;
+use ReCaptcha\ReCaptcha;
 
 class AuthController extends Controller
 {
     public function register(AuthRegister $request)
     {
+        if ((int)config('v2board.recaptcha_enable', 0)) {
+            $recaptcha = new ReCaptcha(config('v2board.recaptcha_key'));
+            $recaptchaResp = $recaptcha->verify($request->input('recaptcha_data'));
+            if (!$recaptchaResp->isSuccess()) {
+                abort(500, '验证码有误');
+            }
+        }
         if ((int)config('v2board.email_whitelist_enable', 0)) {
             if (!Helper::emailSuffixVerify(
                 $request->input('email'),
@@ -123,7 +131,8 @@ class AuthController extends Controller
         }
 
         $data = [
-            'token' => $user->token
+            'token' => $user->token,
+            'auth_data' => base64_encode("{$user->email}:{$user->password}")
         ];
         $request->session()->put('email', $user->email);
         $request->session()->put('id', $user->id);
@@ -131,12 +140,15 @@ class AuthController extends Controller
             $request->session()->put('is_admin', true);
             $data['is_admin'] = true;
         }
+        if ($user->is_staff) {
+            $request->session()->put('is_staff', true);
+            $data['is_staff'] = true;
+        }
         return response([
             'data' => $data
         ]);
     }
 
-    // 准备废弃
     public function token2Login(Request $request)
     {
         if ($request->input('token')) {
@@ -146,7 +158,7 @@ class AuthController extends Controller
             } else {
                 $location = url($redirect);
             }
-            return header('Location:' . $location);
+            return redirect()->to($location)->send();
         }
 
         if ($request->input('verify')) {
@@ -178,7 +190,7 @@ class AuthController extends Controller
     {
         $user = User::where('token', $request->input('token'))->first();
         if (!$user) {
-            abort(500, '用户不存在');
+            abort(500, '令牌有误');
         }
 
         $code = Helper::guid();
@@ -189,6 +201,30 @@ class AuthController extends Controller
         ]);
     }
 
+    public function getQuickLoginUrl(Request $request)
+    {
+        $authData = explode(':', base64_decode($request->input('auth_data')));
+        $user = User::where('email', $authData[0])
+            ->where('password', $authData[1])
+            ->first();
+        if (!$user) {
+            abort(500, '令牌有误');
+        }
+
+        $code = Helper::guid();
+        $key = CacheKey::get('TEMP_TOKEN', $code);
+        Cache::put($key, $user->id, 60);
+        $redirect = '/#/login?verify=' . $code . '&redirect=' . ($request->input('redirect') ? $request->input('redirect') : 'dashboard');
+        if (config('v2board.app_url')) {
+            $url = config('v2board.app_url') . $redirect;
+        } else {
+            $url = url($redirect);
+        }
+        return response([
+            'data' => $url
+        ]);
+    }
+
     public function check(Request $request)
     {
         $data = [

app/Http/Controllers/Passport/CommController.php

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

app/Http/Controllers/Server/DeepbworkController.php

@@ -47,12 +47,11 @@ class DeepbworkController extends Controller
             $user->v2ray_user = [
                 "uuid" => $user->uuid,
                 "email" => sprintf("%s@v2board.user", $user->uuid),
-                "alter_id" => $user->v2ray_alter_id,
-                "level" => $user->v2ray_level,
+                "alter_id" => $server->alter_id,
+                "level" => 0,
             ];
             unset($user['uuid']);
-            unset($user['v2ray_alter_id']);
-            unset($user['v2ray_level']);
+            unset($user['email']);
             array_push($result, $user);
         }
         return response([
@@ -64,7 +63,7 @@ class DeepbworkController extends Controller
     // 后端提交数据
     public function submit(Request $request)
     {
-        // Log::info('serverSubmitData:' . $request->input('node_id') . ':' . file_get_contents('php://input'));
+//         Log::info('serverSubmitData:' . $request->input('node_id') . ':' . file_get_contents('php://input'));
         $server = Server::find($request->input('node_id'));
         if (!$server) {
             return response([
@@ -75,27 +74,25 @@ class DeepbworkController extends Controller
         $data = file_get_contents('php://input');
         $data = json_decode($data, true);
         Cache::put(CacheKey::get('SERVER_V2RAY_ONLINE_USER', $server->id), count($data), 3600);
-        $serverService = new ServerService();
+        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'])) {
-                return response([
-                    'ret' => 0,
-                    'msg' => 'user fetch fail'
-                ]);
+        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;
+                }
             }
-
-            $serverService->log(
-                $item['user_id'],
-                $request->input('node_id'),
-                $item['u'],
-                $item['d'],
-                $server->rate,
-                'vmess'
-            );
+        } catch (\Exception $e) {
+            DB::rollBack();
+            return response([
+                'ret' => 0,
+                'msg' => 'user fetch fail'
+            ]);
         }
+        DB::commit();
 
         return response([
             'ret' => 1,
@@ -113,7 +110,7 @@ class DeepbworkController extends Controller
         }
         $serverService = new ServerService();
         try {
-            $json = $serverService->getVmessConfig($nodeId, $localPort);
+            $json = $serverService->getV2RayConfig($nodeId, $localPort);
         } catch (\Exception $e) {
             abort(500, $e->getMessage());
         }

app/Http/Controllers/Server/PoseidonController.php

@@ -45,12 +45,11 @@ class PoseidonController extends Controller
             $user->v2ray_user = [
                 "uuid" => $user->uuid,
                 "email" => sprintf("%s@v2board.user", $user->uuid),
-                "alter_id" => $user->v2ray_alter_id,
-                "level" => $user->v2ray_level,
+                "alter_id" => $server->alter_id,
+                "level" => 0,
             ];
             unset($user['uuid']);
-            unset($user['v2ray_alter_id']);
-            unset($user['v2ray_level']);
+            unset($user['email']);
             array_push($result, $user);
         }
 
@@ -68,23 +67,14 @@ class PoseidonController extends Controller
         $data = file_get_contents('php://input');
         $data = json_decode($data, true);
         Cache::put(CacheKey::get('SERVER_V2RAY_ONLINE_USER', $server->id), count($data), 3600);
-        $serverService = new ServerService();
+        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'])) {
+            if (!$userService->trafficFetch($u, $d, $item['user_id'], $server, 'vmess')) {
                 return $this->error("user fetch fail", 500);
             }
-
-            $serverService->log(
-                $item['user_id'],
-                $request->input('node_id'),
-                $item['u'],
-                $item['d'],
-                $server->rate,
-                'vmess'
-            );
         }
 
         return $this->success('');
@@ -103,7 +93,7 @@ class PoseidonController extends Controller
 
         $serverService = new ServerService();
         try {
-            $json = $serverService->getVmessConfig($nodeId, $localPort);
+            $json = $serverService->getV2RayConfig($nodeId, $localPort);
             $json->poseidon = [
               'license_key' => (string)config('v2board.server_license'),
             ];
@@ -146,9 +136,23 @@ class PoseidonController extends Controller
     }
 
     protected function success($data) {
+         $req = request();
+        // Only for "GET" method
+        if (!$req->isMethod('GET') || !$data) {
+            return response([
+                'msg' => 'ok',
+                'data' => $data,
+            ]);
+        }
+
+        $etag = sha1(json_encode($data));
+        if ($etag == $req->header("IF-NONE-MATCH")) {
+            return response(null, 304);
+        }
+
         return response([
             'msg' => 'ok',
             'data' => $data,
-        ]);
+        ])->header('ETAG', $etag);
     }
 }

app/Http/Controllers/Server/ShadowsocksTidalabController.php

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

app/Http/Controllers/Server/TrojanTidalabController.php

@@ -48,8 +48,7 @@ class TrojanTidalabController extends Controller
                 "password" => $user->uuid,
             ];
             unset($user['uuid']);
-            unset($user['v2ray_alter_id']);
-            unset($user['v2ray_level']);
+            unset($user['email']);
             array_push($result, $user);
         }
         return response([
@@ -72,27 +71,25 @@ class TrojanTidalabController extends Controller
         $data = file_get_contents('php://input');
         $data = json_decode($data, true);
         Cache::put(CacheKey::get('SERVER_TROJAN_ONLINE_USER', $server->id), count($data), 3600);
-        $serverService = new ServerService();
+        Cache::put(CacheKey::get('SERVER_TROJAN_LAST_PUSH_AT', $server->id), time(), 3600);
         $userService = new UserService();
-        foreach ($data as $item) {
-            $u = $item['u'] * $server->rate;
-            $d = $item['d'] * $server->rate;
-            if (!$userService->trafficFetch($u, $d, $item['user_id'])) {
-                return response([
-                    'ret' => 0,
-                    'msg' => 'user fetch fail'
-                ]);
+        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;
+                }
             }
-
-            $serverService->log(
-                $item['user_id'],
-                $request->input('node_id'),
-                $item['u'],
-                $item['d'],
-                $server->rate,
-                'trojan'
-            );
+        } catch (\Exception $e) {
+            DB::rollBack();
+            return response([
+                'ret' => 0,
+                'msg' => 'user fetch fail'
+            ]);
         }
+        DB::commit();
 
         return response([
             'ret' => 1,

app/Http/Controllers/Staff/NoticeController.php

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

app/Http/Controllers/Staff/PlanController.php

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

app/Http/Controllers/Staff/TicketController.php

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

app/Http/Controllers/Staff/UserController.php

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

app/Http/Controllers/User/CommController.php

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

app/Http/Controllers/User/CouponController.php

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

app/Http/Controllers/User/InviteController.php

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

app/Http/Controllers/User/KnowledgeController.php

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

app/Http/Controllers/User/OrderController.php

@@ -4,8 +4,10 @@ namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\User\OrderSave;
+use App\Models\Payment;
 use App\Services\CouponService;
 use App\Services\OrderService;
+use App\Services\PaymentService;
 use App\Services\UserService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
@@ -40,7 +42,7 @@ class OrderController extends Controller
             }
         }
         return response([
-            'data' => $order
+            'data' => $order->makeHidden(['id', 'user_id'])
         ]);
     }
 
@@ -50,12 +52,12 @@ class OrderController extends Controller
             ->where('trade_no', $request->input('trade_no'))
             ->first();
         if (!$order) {
-            abort(500, '订单不存在');
+            abort(500, __('user.order.details.order_not_exist'));
         }
         $order['plan'] = Plan::find($order->plan_id);
         $order['try_out_plan_id'] = (int)config('v2board.try_out_plan_id');
         if (!$order['plan']) {
-            abort(500, '订阅不存在');
+            abort(500, __('user.order.details.plan_not_exist'));
         }
         return response([
             'data' => $order
@@ -66,39 +68,38 @@ class OrderController extends Controller
     {
         $userService = new UserService();
         if ($userService->isNotCompleteOrderByUserId($request->session()->get('id'))) {
-            abort(500, '您有未付款或开通中的订单，请稍后或取消再试');
+            abort(500, __('user.order.save.exist_open_order'));
         }
 
         $plan = Plan::find($request->input('plan_id'));
         $user = User::find($request->session()->get('id'));
 
         if (!$plan) {
-            abort(500, '该订阅不存在');
+            abort(500, __('user.order.save.plan_not_exist'));
         }
 
         if ((!$plan->show && !$plan->renew) || (!$plan->show && $user->plan_id !== $plan->id)) {
             if ($request->input('cycle') !== 'reset_price') {
-                abort(500, '该订阅已售罄');
+                abort(500, __('user.order.save.plan_stop_sell'));
             }
         }
 
-        if (!$plan->renew && $user->plan_id == $plan->id) {
-            abort(500, '该订阅无法续费，请更换其他订阅');
+        if (!$plan->renew && $user->plan_id == $plan->id && $request->input('cycle') !== 'reset_price') {
+            abort(500, __('user.order.save.plan_stop_renew'));
         }
 
         if ($plan[$request->input('cycle')] === NULL) {
-            if ($request->input('cycle') === 'reset_price') {
-                abort(500, '该订阅当前不支持重置流量');
+            abort(500, __('user.order.save.plan_stop'));
+        }
+
+        if ($request->input('cycle') === 'reset_price') {
+            if ($user->expired_at <= time() || !$user->plan_id) {
+                abort(500, __('user.order.save.plan_exist_not_buy_package'));
             }
-            abort(500, '该订阅周期无法进行购买，请选择其他周期');
         }
 
-        if ($request->input('cycle') === 'reset_price' && !$user->plan_id) {
-            abort(500, '必须存在订阅才可以购买流量重置包');
-        }
-
-        if ($request->input('cycle') === 'reset_price' && $user->expired_at <= time()) {
-            abort(500, '当前订阅已过期，无法购买重置包');
+        if (!$plan->show && $plan->renew && !$userService->isAvailable($user)) {
+            abort(500, __('user.order.save.plan_expired'));
         }
 
         DB::beginTransaction();
@@ -114,8 +115,9 @@ class OrderController extends Controller
             $couponService = new CouponService($request->input('coupon_code'));
             if (!$couponService->use($order)) {
                 DB::rollBack();
-                abort(500, '优惠券使用失败');
+                abort(500, __('user.order.save.coupon_use_failed'));
             }
+            $order->coupon_id = $couponService->getId();
         }
 
         $orderService->setVipDiscount($user);
@@ -128,14 +130,14 @@ class OrderController extends Controller
             if ($remainingBalance > 0) {
                 if (!$userService->addBalance($order->user_id, - $order->total_amount)) {
                     DB::rollBack();
-                    abort(500, '余额不足');
+                    abort(500, __('user.order.save.insufficient_balance'));
                 }
                 $order->balance_amount = $order->total_amount;
                 $order->total_amount = 0;
             } else {
                 if (!$userService->addBalance($order->user_id, - $user->balance)) {
                     DB::rollBack();
-                    abort(500, '余额不足');
+                    abort(500, __('user.order.save.insufficient_balance'));
                 }
                 $order->balance_amount = $user->balance;
                 $order->total_amount = $order->total_amount - $user->balance;
@@ -144,7 +146,7 @@ class OrderController extends Controller
 
         if (!$order->save()) {
             DB::rollback();
-            abort(500, '订单创建失败');
+            abort(500, __('user.order.save.order_create_failed'));
         }
 
         DB::commit();
@@ -163,7 +165,7 @@ class OrderController extends Controller
             ->where('status', 0)
             ->first();
         if (!$order) {
-            abort(500, '订单不存在或已支付');
+            abort(500, __('user.order.checkout.order_not_exist_or_paid'));
         }
         // free process
         if ($order->total_amount <= 0) {
@@ -175,71 +177,20 @@ class OrderController extends Controller
                 'data' => true
             ]);
         }
-        switch ($method) {
-            // return type => 0: QRCode / 1: URL / 2: No action
-            case 0:
-                // alipayF2F
-                if (!(int)config('v2board.alipay_enable')) {
-                    abort(500, '支付方式不可用');
-                }
-                return response([
-                    'type' => 0,
-                    'data' => $this->alipayF2F($tradeNo, $order->total_amount)
-                ]);
-            case 2:
-                // stripeAlipay
-                if (!(int)config('v2board.stripe_alipay_enable')) {
-                    abort(500, '支付方式不可用');
-                }
-                return response([
-                    'type' => 1,
-                    'data' => $this->stripeAlipay($order)
-                ]);
-            case 3:
-                // stripeWepay
-                if (!(int)config('v2board.stripe_wepay_enable')) {
-                    abort(500, '支付方式不可用');
-                }
-                return response([
-                    'type' => 0,
-                    'data' => $this->stripeWepay($order)
-                ]);
-            case 4:
-                // bitpayX
-                if (!(int)config('v2board.bitpayx_enable')) {
-                    abort(500, '支付方式不可用');
-                }
-                return response([
-                    'type' => 1,
-                    'data' => $this->bitpayX($order)
-                ]);
-            case 5:
-                if (!(int)config('v2board.mgate_enable')) {
-                    abort(500, '支付方式不可用');
-                }
-                return response([
-                    'type' => 1,
-                    'data' => $this->mgate($order)
-                ]);
-            case 6:
-                if (!(int)config('v2board.stripe_card_enable')) {
-                    abort(500, '支付方式不可用');
-                }
-                return response([
-                    'type' => 2,
-                    'data' => $this->stripeCard($order, $request->input('token'))
-                ]);
-            case 7:
-                if (!(int)config('v2board.epay_enable')) {
-                    abort(500, '支付方式不可用');
-                }
-                return response([
-                    'type' => 1,
-                    'data' => $this->epay($order)
-                ]);
-            default:
-                abort(500, '支付方式不存在');
-        }
+        $payment = Payment::find($method);
+        if (!$payment || $payment->enable !== 1) abort(500, __('user.order.checkout.pay_method_not_use'));
+        $paymentService = new PaymentService($payment->payment, $payment->id);
+        $result = $paymentService->pay([
+            'trade_no' => $tradeNo,
+            'total_amount' => $order->total_amount,
+            'user_id' => $order->user_id,
+            'stripe_token' => $request->input('token')
+        ]);
+        $order->update(['payment_id' => $method]);
+        return response([
+            'type' => $result['type'],
+            'data' => $result['data']
+        ]);
     }
 
     public function check(Request $request)
@@ -249,7 +200,7 @@ class OrderController extends Controller
             ->where('user_id', $request->session()->get('id'))
             ->first();
         if (!$order) {
-            abort(500, '订单不存在');
+            abort(500, __('user.order.check.order_not_exist'));
         }
         return response([
             'data' => $order->status
@@ -258,241 +209,38 @@ class OrderController extends Controller
 
     public function getPaymentMethod()
     {
-        $data = [];
-        if ((int)config('v2board.alipay_enable')) {
-            $alipayF2F = new \StdClass();
-            $alipayF2F->name = '支付宝';
-            $alipayF2F->method = 0;
-            $alipayF2F->icon = 'alipay';
-            array_push($data, $alipayF2F);
-        }
-
-        if ((int)config('v2board.stripe_alipay_enable')) {
-            $stripeAlipay = new \StdClass();
-            $stripeAlipay->name = '支付宝';
-            $stripeAlipay->method = 2;
-            $stripeAlipay->icon = 'alipay';
-            array_push($data, $stripeAlipay);
-        }
-
-        if ((int)config('v2board.stripe_wepay_enable')) {
-            $stripeWepay = new \StdClass();
-            $stripeWepay->name = '微信';
-            $stripeWepay->method = 3;
-            $stripeWepay->icon = 'wechat';
-            array_push($data, $stripeWepay);
-        }
-
-        if ((int)config('v2board.bitpayx_enable')) {
-            $bitpayX = new \StdClass();
-            $bitpayX->name = config('v2board.bitpayx_name', '在线支付');
-            $bitpayX->method = 4;
-            $bitpayX->icon = 'wallet';
-            array_push($data, $bitpayX);
-        }
-
-        if ((int)config('v2board.mgate_enable')) {
-            $obj = new \StdClass();
-            $obj->name = config('v2board.mgate_name', '在线支付');
-            $obj->method = 5;
-            $obj->icon = 'wallet';
-            array_push($data, $obj);
-        }
-
-        if ((int)config('v2board.stripe_card_enable')) {
-            $obj = new \StdClass();
-            $obj->name = '信用卡';
-            $obj->method = 6;
-            $obj->icon = 'card';
-            array_push($data, $obj);
-        }
-
-        if ((int)config('v2board.epay_enable')) {
-            $obj = new \StdClass();
-            $obj->name = config('v2board.epay_name', '在线支付');
-            $obj->method = 7;
-            $obj->icon = 'wallet';
-            array_push($data, $obj);
-        }
+        $methods = Payment::select([
+            'id',
+            'name',
+            'payment'
+        ])
+            ->where('enable', 1)->get();
 
         return response([
-            'data' => $data
+            'data' => $methods
         ]);
     }
 
     public function cancel(Request $request)
     {
         if (empty($request->input('trade_no'))) {
-            abort(500, '参数有误');
+            abort(500, __('user.order.cancel.params_wrong'));
         }
         $order = Order::where('trade_no', $request->input('trade_no'))
             ->where('user_id', $request->session()->get('id'))
             ->first();
         if (!$order) {
-            abort(500, '订单不存在');
+            abort(500, __('user.order.cancel.order_not_exist'));
         }
         if ($order->status !== 0) {
-            abort(500, '只可以取消待支付订单');
+            abort(500, __('user.order.cancel.only_cancel_pending_order'));
         }
         $orderService = new OrderService($order);
         if (!$orderService->cancel()) {
-            abort(500, '取消失败');
+            abort(500, __('user.order.cancel.cancel_failed'));
         }
         return response([
             'data' => true
         ]);
     }
-
-    private function alipayF2F($tradeNo, $totalAmount)
-    {
-        $gateway = Omnipay::create('Alipay_AopF2F');
-        $gateway->setSignType('RSA2'); //RSA/RSA2
-        $gateway->setAppId(config('v2board.alipay_appid'));
-        $gateway->setPrivateKey(config('v2board.alipay_privkey')); // 可以是路径，也可以是密钥内容
-        $gateway->setAlipayPublicKey(config('v2board.alipay_pubkey')); // 可以是路径，也可以是密钥内容
-        $gateway->setNotifyUrl(url('/api/v1/guest/order/alipayNotify'));
-        $request = $gateway->purchase();
-        $request->setBizContent([
-            'subject' => config('v2board.app_name', 'V2Board') . ' - 订阅',
-            'out_trade_no' => $tradeNo,
-            'total_amount' => $totalAmount / 100
-        ]);
-        /** @var \Omnipay\Alipay\Responses\AopTradePreCreateResponse $response */
-        $response = $request->send();
-        $result = $response->getAlipayResponse();
-        if ($result['code'] !== '10000') {
-            abort(500, $result['sub_msg']);
-        }
-        // 获取收款二维码内容
-        return $response->getQrCode();
-    }
-
-    private function stripeAlipay($order)
-    {
-        $currency = config('v2board.stripe_currency', 'hkd');
-        $exchange = Helper::exchange('CNY', strtoupper($currency));
-        if (!$exchange) {
-            abort(500, '货币转换超时，请稍后再试');
-        }
-        Stripe::setApiKey(config('v2board.stripe_sk_live'));
-        $source = Source::create([
-            'amount' => floor($order->total_amount * $exchange),
-            'currency' => $currency,
-            'type' => 'alipay',
-            'statement_descriptor' => $order->trade_no,
-            'metadata' => [
-                'user_id' => $order->user_id,
-                'out_trade_no' => $order->trade_no,
-                'identifier' => ''
-            ],
-            'redirect' => [
-                'return_url' => config('v2board.app_url', env('APP_URL')) . '/#/order'
-            ]
-        ]);
-        if (!$source['redirect']['url']) {
-            abort(500, '支付网关请求失败');
-        }
-        return $source['redirect']['url'];
-    }
-
-    private function stripeWepay($order)
-    {
-        $currency = config('v2board.stripe_currency', 'hkd');
-        $exchange = Helper::exchange('CNY', strtoupper($currency));
-        if (!$exchange) {
-            abort(500, '货币转换超时，请稍后再试');
-        }
-        Stripe::setApiKey(config('v2board.stripe_sk_live'));
-        $source = Source::create([
-            'amount' => floor($order->total_amount * $exchange),
-            'currency' => $currency,
-            'type' => 'wechat',
-            'metadata' => [
-                'user_id' => $order->user_id,
-                'out_trade_no' => $order->trade_no,
-                'identifier' => ''
-            ],
-            'redirect' => [
-                'return_url' => config('v2board.app_url', env('APP_URL')) . '/#/order'
-            ]
-        ]);
-        if (!$source['wechat']['qr_code_url']) {
-            abort(500, '支付网关请求失败');
-        }
-        return $source['wechat']['qr_code_url'];
-    }
-
-    private function stripeCard($order, string $token)
-    {
-        $currency = config('v2board.stripe_currency', 'hkd');
-        $exchange = Helper::exchange('CNY', strtoupper($currency));
-        if (!$exchange) {
-            abort(500, '货币转换超时，请稍后再试');
-        }
-        Stripe::setApiKey(config('v2board.stripe_sk_live'));
-        try {
-            $charge = \Stripe\Charge::create([
-                'amount' => floor($order->total_amount * $exchange),
-                'currency' => $currency,
-                'source' => $token,
-                'metadata' => [
-                    'user_id' => $order->user_id,
-                    'out_trade_no' => $order->trade_no,
-                    'identifier' => ''
-                ]
-            ]);
-        } catch (\Exception $e) {
-            abort(500, '遇到了点问题，请刷新页面稍后再试');
-        }
-        info($charge);
-        if (!$charge->paid) {
-            abort(500, '扣款失败，请检查信用卡信息');
-        }
-        return $charge->paid;
-    }
-
-    private function bitpayX($order)
-    {
-        $bitpayX = new BitpayX(config('v2board.bitpayx_appsecret'));
-        $params = [
-            'merchant_order_id' => $order->trade_no,
-            'price_amount' => $order->total_amount / 100,
-            'price_currency' => 'CNY',
-            'title' => '支付单号：' . $order->trade_no,
-            'description' => '充值：' . $order->total_amount / 100 . ' 元',
-            'callback_url' => url('/api/v1/guest/order/bitpayXNotify'),
-            'success_url' => config('v2board.app_url', env('APP_URL')) . '/#/order',
-            'cancel_url' => config('v2board.app_url', env('APP_URL')) . '/#/order'
-        ];
-        $strToSign = $bitpayX->prepareSignId($params['merchant_order_id']);
-        $params['token'] = $bitpayX->sign($strToSign);
-        $result = $bitpayX->mprequest($params);
-        // Log::info('bitpayXSubmit: ' . json_encode($result));
-        return isset($result['payment_url']) ? $result['payment_url'] : false;
-    }
-
-    private function mgate($order)
-    {
-        $mgate = new MGate(config('v2board.mgate_url'), config('v2board.mgate_app_id'), config('v2board.mgate_app_secret'));
-        $result = $mgate->pay([
-            'app_id' => config('v2board.mgate_app_id'),
-            'out_trade_no' => $order->trade_no,
-            'total_amount' => $order->total_amount,
-            'notify_url' => url('/api/v1/guest/order/mgateNotify'),
-            'return_url' => config('v2board.app_url', env('APP_URL')) . '/#/order'
-        ]);
-        return $result;
-    }
-
-    private function epay($order)
-    {
-        $epay = new Epay(config('v2board.epay_url'), config('v2board.epay_pid'), config('v2board.epay_key'));
-        return $epay->pay([
-            'money' => $order->total_amount / 100,
-            'name' => $order->trade_no,
-            'notify_url' => url('/api/v1/guest/order/epayNotify'),
-            'return_url' => config('v2board.app_url', env('APP_URL')) . '/#/order',
-            'out_trade_no' => $order->trade_no
-        ]);
-    }
 }

app/Http/Controllers/User/PlanController.php

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

app/Http/Controllers/User/ServerController.php

@@ -23,8 +23,7 @@ class ServerController extends Controller
         $userService = new UserService();
         if ($userService->isAvailable($user)) {
             $serverService = new ServerService();
-            $servers = $serverService->getAllServers($user);
-            $servers = array_merge($servers['vmess'], $servers['trojan']);
+            $servers = $serverService->getAvailableServers($user);
         }
         return response([
             'data' => $servers

app/Http/Controllers/User/TicketController.php

@@ -8,6 +8,7 @@ use App\Http\Requests\User\TicketWithdraw;
 use App\Jobs\SendTelegramJob;
 use App\Models\User;
 use App\Services\TelegramService;
+use App\Utils\Dict;
 use Illuminate\Http\Request;
 use App\Models\Ticket;
 use App\Models\TicketMessage;
@@ -22,7 +23,7 @@ class TicketController extends Controller
                 ->where('user_id', $request->session()->get('id'))
                 ->first();
             if (!$ticket) {
-                abort(500, '工单不存在');
+                abort(500, __('user.ticket.fetch.ticket_not_exist'));
             }
             $ticket['message'] = TicketMessage::where('ticket_id', $ticket->id)->get();
             for ($i = 0; $i < count($ticket['message']); $i++) {
@@ -55,7 +56,7 @@ class TicketController extends Controller
     {
         DB::beginTransaction();
         if ((int)Ticket::where('status', 0)->where('user_id', $request->session()->get('id'))->count()) {
-            abort(500, '存在其他工单尚未处理');
+            abort(500, __('user.ticket.save.exist_other_open_ticket'));
         }
         $ticket = Ticket::create(array_merge($request->only([
             'subject',
@@ -66,7 +67,7 @@ class TicketController extends Controller
         ]));
         if (!$ticket) {
             DB::rollback();
-            abort(500, '工单创建失败');
+            abort(500, __('user.ticket.save.ticket_create_failed'));
         }
         $ticketMessage = TicketMessage::create([
             'user_id' => $request->session()->get('id'),
@@ -75,7 +76,7 @@ class TicketController extends Controller
         ]);
         if (!$ticketMessage) {
             DB::rollback();
-            abort(500, '工单创建失败');
+            abort(500, __('user.ticket.save.ticket_create_failed'));
         }
         DB::commit();
         $this->sendNotify($ticket, $ticketMessage);
@@ -87,22 +88,22 @@ class TicketController extends Controller
     public function reply(Request $request)
     {
         if (empty($request->input('id'))) {
-            abort(500, '参数错误');
+            abort(500, __('user.ticket.reply.params_wrong'));
         }
         if (empty($request->input('message'))) {
-            abort(500, '消息不能为空');
+            abort(500, __('user.ticket.reply.message_not_empty'));
         }
         $ticket = Ticket::where('id', $request->input('id'))
             ->where('user_id', $request->session()->get('id'))
             ->first();
         if (!$ticket) {
-            abort(500, '工单不存在');
+            abort(500, __('user.ticket.reply.ticket_not_exist'));
         }
         if ($ticket->status) {
-            abort(500, '工单已关闭，无法回复');
+            abort(500, __('user.ticket.reply.ticket_close_not_reply'));
         }
         if ($request->session()->get('id') == $this->getLastMessage($ticket->id)->user_id) {
-            abort(500, '请等待技术支持回复');
+            abort(500, __('user.ticket.reply.wait_reply'));
         }
         DB::beginTransaction();
         $ticketMessage = TicketMessage::create([
@@ -113,7 +114,7 @@ class TicketController extends Controller
         $ticket->last_reply_user_id = $request->session()->get('id');
         if (!$ticketMessage || !$ticket->save()) {
             DB::rollback();
-            abort(500, '工单回复失败');
+            abort(500, __('user.ticket.reply.ticket_reply_failed'));
         }
         DB::commit();
         $this->sendNotify($ticket, $ticketMessage);
@@ -126,17 +127,17 @@ class TicketController extends Controller
     public function close(Request $request)
     {
         if (empty($request->input('id'))) {
-            abort(500, '参数错误');
+            abort(500, __('user.ticket.close.params_wrong'));
         }
         $ticket = Ticket::where('id', $request->input('id'))
             ->where('user_id', $request->session()->get('id'))
             ->first();
         if (!$ticket) {
-            abort(500, '工单不存在');
+            abort(500, __('user.ticket.close.ticket_not_exist'));
         }
         $ticket->status = 1;
         if (!$ticket->save()) {
-            abort(500, '关闭失败');
+            abort(500, __('user.ticket.close.close_failed'));
         }
         return response([
             'data' => true
@@ -152,8 +153,25 @@ class TicketController extends Controller
 
     public function withdraw(TicketWithdraw $request)
     {
+        if ((int)config('v2board.withdraw_close_enable', 0)) {
+            abort(500, 'user.ticket.withdraw.not_support_withdraw');
+        }
+        if (!in_array(
+            $request->input('withdraw_method'),
+            config(
+                'v2board.commission_withdraw_method',
+                Dict::WITHDRAW_METHOD_WHITELIST_DEFAULT
+            )
+        )) {
+            abort(500, __('user.ticket.withdraw.not_support_withdraw_method'));
+        }
+        $user = User::find($request->session()->get('id'));
+        $limit = config('v2board.commission_withdraw_limit', 100);
+        if ($limit > ($user->commission_balance / 100)) {
+            abort(500, __('user.ticket.withdraw.system_require_withdraw_limit', ['limit' => $limit]));
+        }
         DB::beginTransaction();
-        $subject = '[提现申请]本工单由系统发出';
+        $subject = __('user.ticket.withdraw.ticket_subject');
         $ticket = Ticket::create([
             'subject' => $subject,
             'level' => 2,
@@ -162,15 +180,12 @@ class TicketController extends Controller
         ]);
         if (!$ticket) {
             DB::rollback();
-            abort(500, '工单创建失败');
+            abort(500, __('user.ticket.withdraw.ticket_create_failed'));
         }
-        $methodText = [
-            'alipay' => '支付宝',
-            'paypal' => '贝宝(Paypal)',
-            'usdt' => 'USDT',
-            'btc' => '比特币'
-        ];
-        $message = "提现方式：{$methodText[$request->input('withdraw_method')]}\r\n提现账号：{$request->input('withdraw_account')}\r\n";
+        $message = __('user.ticket.withdraw.ticket_message', [
+            'method' => $request->input('withdraw_method'),
+            'account' => $request->input('withdraw_account')
+        ]);
         $ticketMessage = TicketMessage::create([
             'user_id' => $request->session()->get('id'),
             'ticket_id' => $ticket->id,
@@ -178,7 +193,7 @@ class TicketController extends Controller
         ]);
         if (!$ticketMessage) {
             DB::rollback();
-            abort(500, '工单创建失败');
+            abort(500, __('user.ticket.withdraw.ticket_create_failed'));
         }
         DB::commit();
         $this->sendNotify($ticket, $ticketMessage);
@@ -190,6 +205,6 @@ class TicketController extends Controller
     private function sendNotify(Ticket $ticket, TicketMessage $ticketMessage)
     {
         $telegramService = new TelegramService();
-        $telegramService->sendMessageWithAdmin("📮工单提醒 #{$ticket->id}\n———————————————\n主题：\n`{$ticket->subject}`\n内容：\n`{$ticketMessage->message}`");
+        $telegramService->sendMessageWithAdmin("📮工单提醒 #{$ticket->id}\n———————————————\n主题：\n`{$ticket->subject}`\n内容：\n`{$ticketMessage->message}`", true);
     }
 }

app/Http/Controllers/User/TutorialController.php

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

app/Http/Controllers/User/UserController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
+use App\Http\Requests\User\UserTransfer;
 use App\Http\Requests\User\UserUpdate;
 use App\Http\Requests\User\UserChangePassword;
 use Illuminate\Http\Request;
@@ -27,17 +28,20 @@ class UserController extends Controller
     public function changePassword(UserChangePassword $request)
     {
         $user = User::find($request->session()->get('id'));
+        if (!$user) {
+            abort(500, __('user.user.changePassword.user_not_exist'));
+        }
         if (!Helper::multiPasswordVerify(
             $user->password_algo,
             $request->input('old_password'),
             $user->password)
         ) {
-            abort(500, '旧密码有误');
+            abort(500, __('user.user.changePassword.old_password_wrong'));
         }
         $user->password = password_hash($request->input('new_password'), PASSWORD_DEFAULT);
         $user->password_algo = NULL;
         if (!$user->save()) {
-            abort(500, '保存失败');
+            abort(500, __('user.user.changePassword.save_failed'));
         }
         $request->session()->flush();
         return response([
@@ -54,7 +58,6 @@ class UserController extends Controller
                 'last_login_at',
                 'created_at',
                 'banned',
-                'is_admin',
                 'remind_expire',
                 'remind_traffic',
                 'expired_at',
@@ -66,6 +69,9 @@ class UserController extends Controller
                 'telegram_id'
             ])
             ->first();
+        if (!$user) {
+            abort(500, __('user.user.info.user_not_exist'));
+        }
         $user['avatar_url'] = 'https://cdn.v2ex.com/gravatar/' . md5($user->email) . '?s=64&d=identicon';
         return response([
             'data' => $user
@@ -91,11 +97,25 @@ class UserController extends Controller
 
     public function getSubscribe(Request $request)
     {
-        $user = User::find($request->session()->get('id'));
+        $user = User::where('id', $request->session()->get('id'))
+            ->select([
+                'id',
+                'plan_id',
+                'token',
+                'expired_at',
+                'u',
+                'd',
+                'transfer_enable',
+                'email'
+            ])
+            ->first();
+        if (!$user) {
+            abort(500, __('user.user.getSubscribe.user_not_exist'));
+        }
         if ($user->plan_id) {
             $user['plan'] = Plan::find($user->plan_id);
             if (!$user['plan']) {
-                abort(500, '订阅计划不存在');
+                abort(500, __('user.user.getSubscribe.plan_not_exist'));
             }
         }
         $user['subscribe_url'] = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user['token'];
@@ -108,10 +128,13 @@ class UserController extends Controller
     public function resetSecurity(Request $request)
     {
         $user = User::find($request->session()->get('id'));
+        if (!$user) {
+            abort(500, __('user.user.resetSecurity.user_not_exist'));
+        }
         $user->uuid = Helper::guid(true);
         $user->token = Helper::guid();
         if (!$user->save()) {
-            abort(500, '重置失败');
+            abort(500, __('user.user.resetSecurity.reset_failed'));
         }
         return response([
             'data' => config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user->token
@@ -127,12 +150,12 @@ class UserController extends Controller
 
         $user = User::find($request->session()->get('id'));
         if (!$user) {
-            abort(500, '该用户不存在');
+            abort(500, __('user.user.update.user_not_exist'));
         }
         try {
             $user->update($updateData);
         } catch (\Exception $e) {
-            abort(500, '保存失败');
+            abort(500, __('user.user.update.save_failed'));
         }
 
         return response([
@@ -140,22 +163,19 @@ class UserController extends Controller
         ]);
     }
 
-    public function transfer(Request $request)
+    public function transfer(UserTransfer $request)
     {
         $user = User::find($request->session()->get('id'));
         if (!$user) {
-            abort(500, '该用户不存在');
-        }
-        if ($request->input('transfer_amount') <= 0) {
-            abort(500, '参数错误');
+            abort(500, __('user.user.transfer.user_not_exist'));
         }
         if ($request->input('transfer_amount') > $user->commission_balance) {
-            abort(500, '推广佣金余额不足');
+            abort(500, __('user.user.transfer.insufficient_commission_balance'));
         }
         $user->commission_balance = $user->commission_balance - $request->input('transfer_amount');
         $user->balance = $user->balance + $request->input('transfer_amount');
         if (!$user->save()) {
-            abort(500, '划转失败');
+            abort(500, __('user.user.transfer.transfer_failed'));
         }
         return response([
             'data' => true
@@ -173,6 +193,9 @@ class UserController extends Controller
             return $lastDay - $today;
         }
         if ((int)config('v2board.reset_traffic_method') === 1) {
+            if ((int)$day >= (int)$today && (int)$day >= (int)$lastDay) {
+                return $lastDay - $today;
+            }
             if ((int)$day >= (int)$today) {
                 return $day - $today;
             } else {

app/Http/Kernel.php

@@ -43,7 +43,7 @@ class Kernel extends HttpKernel
             \Illuminate\Session\Middleware\StartSession::class,
             \App\Http\Middleware\ForceJson::class,
             \App\Http\Middleware\CORS::class,
-            'throttle:120,1',
+            \App\Http\Middleware\Language::class,
             'bindings',
         ],
     ];
@@ -68,7 +68,7 @@ class Kernel extends HttpKernel
         'user' => \App\Http\Middleware\User::class,
         'admin' => \App\Http\Middleware\Admin::class,
         'client' => \App\Http\Middleware\Client::class,
-        'server' => \App\Http\Middleware\Server::class,
+        'staff' => \App\Http\Middleware\Staff::class,
     ];
 
     /**

app/Http/Middleware/Language.php

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

app/Http/Middleware/Staff.php

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

app/Http/Middleware/User.php

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

app/Http/Requests/Admin/ConfigSave.php

@@ -22,6 +22,9 @@ class ConfigSave extends FormRequest
             'invite_never_expire' => 'in:0,1',
             'commission_first_time_enable' => 'in:0,1',
             'commission_auto_check_enable' => 'in:0,1',
+            'commission_withdraw_limit' => 'nullable|numeric',
+            'commission_withdraw_method' => 'nullable|array',
+            'withdraw_close_enable' => 'in:0,1',
             // site
             'stop_register' => 'in:0,1',
             'email_verify' => 'in:0,1',
@@ -33,12 +36,17 @@ class ConfigSave extends FormRequest
             'try_out_plan_id' => 'integer',
             'try_out_hour' => 'numeric',
             'email_whitelist_enable' => 'in:0,1',
-            'email_whitelist_suffix' => '',
+            'email_whitelist_suffix' => 'nullable|array',
             'email_gmail_limit_enable' => 'in:0,1',
+            'recaptcha_enable' => 'in:0,1',
+            'recaptcha_key' => '',
+            'recaptcha_site_key' => '',
+            'tos_url' => 'nullable|url',
             // subscribe
             'plan_change_enable' => 'in:0,1',
             'reset_traffic_method' => 'in:0,1',
             'renew_reset_traffic_enable' => 'in:0,1',
+            'surplus_enable' => 'in:0,1',
             // server
             'server_token' => 'nullable|min:16',
             'server_license' => 'nullable',
@@ -80,8 +88,10 @@ class ConfigSave extends FormRequest
             'frontend_theme_color' => 'in:default,darkblue,black',
             'frontend_background_url' => 'nullable|url',
             'frontend_admin_path' => '',
+            'frontend_customer_service_method' => '',
+            'frontend_customer_service_id' => '',
             // tutorial
-            'apple_id' => 'email',
+            'apple_id' => 'nullable|email',
             'apple_id_password' => '',
             // email
             'email_template' => '',
@@ -95,7 +105,14 @@ class ConfigSave extends FormRequest
             'telegram_bot_enable' => 'in:0,1',
             'telegram_bot_token' => '',
             'telegram_discuss_id' => '',
-            'telegram_channel_id' => ''
+            'telegram_channel_id' => '',
+            // app
+            'windows_version' => '',
+            'windows_download_url' => '',
+            'macos_version' => '',
+            'macos_download_url' => '',
+            'android_version' => '',
+            'android_download_url' => ''
         ];
     }
 
@@ -104,7 +121,9 @@ class ConfigSave extends FormRequest
         // illiteracy prompt
         return [
             'app_url.url' => '站点URL格式不正确，必须携带http(s)://',
-            'subscribe_url.url' => '订阅URL格式不正确，必须携带http(s)://'
+            'subscribe_url.url' => '订阅URL格式不正确，必须携带http(s)://',
+            'server_token.min' => '通讯密钥长度必须大于16位',
+            'tos_url.url' => '服务条款URL格式不正确'
         ];
     }
 }

app/Http/Requests/Admin/CouponGenerate.php

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

app/Http/Requests/Admin/KnowledgeCategorySave.php

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

app/Http/Requests/Admin/KnowledgeCategorySort.php

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

app/Http/Requests/Admin/KnowledgeSave.php

@@ -4,7 +4,7 @@ namespace App\Http\Requests\Admin;
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class TutorialSave extends FormRequest
+class KnowledgeSave extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
@@ -14,10 +14,10 @@ class TutorialSave extends FormRequest
     public function rules()
     {
         return [
+            'category' => 'required',
+            'language' => 'required',
             'title' => 'required',
-            // 1:windows 2:macos 3:ios 4:android 5:linux 6:router
-            'category_id' => 'required|in:1,2,3,4,5,6',
-            'steps' => 'required'
+            'body' => 'required'
         ];
     }
 
@@ -25,9 +25,9 @@ class TutorialSave extends FormRequest
     {
         return [
             'title.required' => '标题不能为空',
-            'category_id.required' => '分类不能为空',
-            'category_id.in' => '分类格式不正确',
-            'steps.required' => '教程步骤不能为空'
+            'category.required' => '分类不能为空',
+            'body.required' => '内容不能为空',
+            'language.required' => '语言不能为空'
         ];
     }
 }

app/Http/Requests/Admin/KnowledgeSort.php

@@ -4,7 +4,7 @@ namespace App\Http\Requests\Admin;
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class ServerTrojanSort extends FormRequest
+class KnowledgeSort extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
@@ -14,15 +14,15 @@ class ServerTrojanSort extends FormRequest
     public function rules()
     {
         return [
-            'server_ids' => 'required|array'
+            'knowledge_ids' => 'required|array'
         ];
     }
 
     public function messages()
     {
         return [
-            'server_ids.required' => '服务器ID不能为空',
-            'server_ids.array' => '服务器ID格式有误'
+            'knowledge_ids.required' => '知识ID不能为空',
+            'knowledge_ids.array' => '知识ID格式有误'
         ];
     }
 }

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,onetime_price,reset_price'
+            'cycle' => 'required|in:month_price,quarter_price,half_year_price,year_price,two_year_price,three_year_price,onetime_price,reset_price'
         ];
     }
 

app/Http/Requests/Admin/OrderFetch.php

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

app/Http/Requests/Admin/OrderUpdate.php

@@ -15,7 +15,7 @@ class OrderUpdate extends FormRequest
     {
         return [
             'status' => 'in:0,1,2,3',
-            'commission_status' => 'in:0,1,2'
+            'commission_status' => 'in:0,1,3'
         ];
     }
 

app/Http/Requests/Admin/PlanSave.php

@@ -22,6 +22,8 @@ class PlanSave extends FormRequest
             'quarter_price' => 'nullable|integer',
             'half_year_price' => 'nullable|integer',
             'year_price' => 'nullable|integer',
+            'two_year_price' => 'nullable|integer',
+            'three_year_price' => 'nullable|integer',
             'onetime_price' => 'nullable|integer',
             'reset_price' => 'nullable|integer'
         ];
@@ -39,6 +41,8 @@ class PlanSave extends FormRequest
             'quarter_price.integer' => '季付金额格式有误',
             'half_year_price.integer' => '半年付金额格式有误',
             'year_price.integer' => '年付金额格式有误',
+            'two_year_price.integer' => '两年付金额格式有误',
+            'three_year_price.integer' => '三年付金额格式有误',
             'onetime_price.integer' => '一次性金额有误',
             'reset_price.integer' => '流量重置包金额有误'
         ];

app/Http/Requests/Admin/ServerShadowsocksSave.php

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

app/Http/Requests/Admin/ServerShadowsocksUpdate.php

@@ -4,25 +4,25 @@ namespace App\Http\Requests\Admin;
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class TutorialSort extends FormRequest
+class ServerShadowsocksUpdate extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
      *
      * @return array
      */
+
     public function rules()
     {
         return [
-            'tutorial_ids' => 'required|array'
+            'show' => 'in:0,1'
         ];
     }
 
     public function messages()
     {
         return [
-            'tutorial_ids.required' => '教程ID不能为空',
-            'tutorial_ids.array' => '教程ID格式有误'
+            'show.in' => '显示状态格式不正确'
         ];
     }
 }

app/Http/Requests/Admin/ServerV2raySave.php

@@ -24,6 +24,7 @@ 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',
             'networkSettings' => '',
             'ruleSettings' => '',

app/Http/Requests/Admin/UserFetch.php

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

app/Http/Requests/Admin/UserGenerate.php

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

app/Http/Requests/Admin/UserSendMail.php

@@ -4,7 +4,7 @@ namespace App\Http\Requests\Admin;
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class ServerV2raySort extends FormRequest
+class UserSendMail extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
@@ -14,15 +14,16 @@ class ServerV2raySort extends FormRequest
     public function rules()
     {
         return [
-            'server_ids' => 'required|array'
+            'subject' => 'required',
+            'content' => 'required',
         ];
     }
 
     public function messages()
     {
         return [
-            'server_ids.required' => '服务器ID不能为空',
-            'server_ids.array' => '服务器ID格式有误'
+            'subject.required' => '主题不能为空',
+            'content.required' => '发送内容不能为空'
         ];
     }
 }

app/Http/Requests/Admin/UserUpdate.php

@@ -15,7 +15,7 @@ class UserUpdate extends FormRequest
     {
         return [
             'email' => 'required|email',
-            'password' => 'nullable',
+            'password' => 'nullable|min:8',
             'transfer_enable' => 'numeric',
             'expired_at' => 'nullable|integer',
             'banned' => 'required|in:0,1',
@@ -23,10 +23,12 @@ class UserUpdate extends FormRequest
             'commission_rate' => 'nullable|integer|min:0|max:100',
             'discount' => 'nullable|integer|min:0|max:100',
             'is_admin' => 'required|in:0,1',
+            'is_staff' => 'required|in:0,1',
             'u' => 'integer',
             'd' => 'integer',
             'balance' => 'integer',
-            'commission_balance' => 'integer'
+            'commission_balance' => 'integer',
+            'remarks' => 'nullable'
         ];
     }
 
@@ -41,6 +43,8 @@ class UserUpdate extends FormRequest
             'banned.in' => '是否封禁格式不正确',
             'is_admin.required' => '是否管理员不能为空',
             'is_admin.in' => '是否管理员格式不正确',
+            'is_staff.required' => '是否员工不能为空',
+            'is_staff.in' => '是否员工格式不正确',
             'plan_id.integer' => '订阅计划格式不正确',
             'commission_rate.integer' => '推荐返利比例格式不正确',
             'commission_rate.nullable' => '推荐返利比例格式不正确',
@@ -53,7 +57,8 @@ class UserUpdate extends FormRequest
             'u.integer' => '上行流量格式不正确',
             'd.integer' => '下行流量格式不正确',
             'balance.integer' => '余额格式不正确',
-            'commission_balance.integer' => '佣金格式不正确'
+            'commission_balance.integer' => '佣金格式不正确',
+            'password.min' => '密码长度最小8位'
         ];
     }
 }

app/Http/Requests/Staff/UserUpdate.php

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

app/Http/Requests/User/OrderSave.php

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

app/Http/Requests/User/TicketWithdraw.php

@@ -14,7 +14,7 @@ class TicketWithdraw  extends FormRequest
     public function rules()
     {
         return [
-            'withdraw_method' => 'required|in:alipay,paypal,usdt,btc',
+            'withdraw_method' => 'required',
             'withdraw_account' => 'required'
         ];
     }

app/Http/Requests/User/UserTransfer.php

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

app/Http/Routes/AdminRoute.php

@@ -26,6 +26,8 @@ class AdminRoute
             $router->get ('/server/group/fetch', 'Admin\\Server\\GroupController@fetch');
             $router->post('/server/group/save', 'Admin\\Server\\GroupController@save');
             $router->post('/server/group/drop', 'Admin\\Server\\GroupController@drop');
+            $router->get ('/server/manage/getNodes', 'Admin\\Server\\ManageController@getNodes');
+            $router->post('/server/manage/sort', 'Admin\\Server\\ManageController@sort');
             $router->group([
                 'prefix' => 'server/trojan'
             ], function ($router) {
@@ -48,6 +50,16 @@ class AdminRoute
                 $router->post('sort', 'Admin\\Server\\V2rayController@sort');
                 $router->post('viewConfig', 'Admin\\Server\\V2rayController@viewConfig');
             });
+            $router->group([
+                'prefix' => 'server/shadowsocks'
+            ], function ($router) {
+                $router->get ('fetch', 'Admin\\Server\\ShadowsocksController@fetch');
+                $router->post('save', 'Admin\\Server\\ShadowsocksController@save');
+                $router->post('drop', 'Admin\\Server\\ShadowsocksController@drop');
+                $router->post('update', 'Admin\\Server\\ShadowsocksController@update');
+                $router->post('copy', 'Admin\\Server\\ShadowsocksController@copy');
+                $router->post('sort', 'Admin\\Server\\ShadowsocksController@sort');
+            });
             // Order
             $router->get ('/order/fetch', 'Admin\\OrderController@fetch');
             $router->post('/order/repair', 'Admin\\OrderController@repair');
@@ -57,8 +69,16 @@ class AdminRoute
             $router->get ('/user/fetch', 'Admin\\UserController@fetch');
             $router->post('/user/update', 'Admin\\UserController@update');
             $router->get ('/user/getUserInfoById', 'Admin\\UserController@getUserInfoById');
-            // Stat
+            $router->post('/user/generate', 'Admin\\UserController@generate');
+            $router->post('/user/dumpCSV', 'Admin\\UserController@dumpCSV');
+            $router->post('/user/sendMail', 'Admin\\UserController@sendMail');
+            $router->post('/user/ban', 'Admin\\UserController@ban');
+            $router->post('/user/resetSecret', 'Admin\\UserController@resetSecret');
+            $router->post('/user/setInviteUser', 'Admin\\UserController@setInviteUser');
+            // StatOrder
             $router->get ('/stat/getOverride', 'Admin\\StatController@getOverride');
+            $router->get ('/stat/getServerLastRank', 'Admin\\StatController@getServerLastRank');
+            $router->get ('/stat/getOrder', 'Admin\\StatController@getOrder');
             // Notice
             $router->get ('/notice/fetch', 'Admin\\NoticeController@fetch');
             $router->post('/notice/save', 'Admin\\NoticeController@save');
@@ -68,18 +88,23 @@ class AdminRoute
             $router->get ('/ticket/fetch', 'Admin\\TicketController@fetch');
             $router->post('/ticket/reply', 'Admin\\TicketController@reply');
             $router->post('/ticket/close', 'Admin\\TicketController@close');
-            // Mail
-            $router->post('/mail/send', 'Admin\\MailController@send');
             // Coupon
             $router->get ('/coupon/fetch', 'Admin\\CouponController@fetch');
-            $router->post('/coupon/save', 'Admin\\CouponController@save');
+            $router->post('/coupon/generate', 'Admin\\CouponController@generate');
             $router->post('/coupon/drop', 'Admin\\CouponController@drop');
-            // Tutorial
-            $router->get ('/tutorial/fetch', 'Admin\\TutorialController@fetch');
-            $router->post('/tutorial/save', 'Admin\\TutorialController@save');
-            $router->post('/tutorial/show', 'Admin\\TutorialController@show');
-            $router->post('/tutorial/drop', 'Admin\\TutorialController@drop');
-            $router->post('/tutorial/sort', 'Admin\\TutorialController@sort');
+            // Knowledge
+            $router->get ('/knowledge/fetch', 'Admin\\KnowledgeController@fetch');
+            $router->get ('/knowledge/getCategory', 'Admin\\KnowledgeController@getCategory');
+            $router->post('/knowledge/save', 'Admin\\KnowledgeController@save');
+            $router->post('/knowledge/show', 'Admin\\KnowledgeController@show');
+            $router->post('/knowledge/drop', 'Admin\\KnowledgeController@drop');
+            $router->post('/knowledge/sort', 'Admin\\KnowledgeController@sort');
+            // Payment
+            $router->get ('/payment/fetch', 'Admin\\PaymentController@fetch');
+            $router->get ('/payment/getPaymentMethods', 'Admin\\PaymentController@getPaymentMethods');
+            $router->post('/payment/getPaymentForm', 'Admin\\PaymentController@getPaymentForm');
+            $router->post('/payment/save', 'Admin\\PaymentController@save');
+            $router->post('/payment/drop', 'Admin\\PaymentController@drop');
         });
     }
 }

app/Http/Routes/GuestRoute.php

@@ -12,14 +12,12 @@ class GuestRoute
         ], function ($router) {
             // Plan
             $router->get ('/plan/fetch', 'Guest\\PlanController@fetch');
-            // Order
-            $router->post('/order/alipayNotify', 'Guest\\OrderController@alipayNotify');
-            $router->post('/order/stripeNotify', 'Guest\\OrderController@stripeNotify');
-            $router->post('/order/bitpayXNotify', 'Guest\\OrderController@bitpayXNotify');
-            $router->post('/order/mgateNotify', 'Guest\\OrderController@mgateNotify');
-            $router->post('/order/epayNotify', 'Guset\\OrderController@epayNotify');
             // Telegram
             $router->post('/telegram/webhook', 'Guest\\TelegramController@webhook');
+            // Payment
+            $router->match(['get', 'post'], '/payment/notify/{method}/{uuid}', 'Guest\\PaymentController@notify');
+            // Comm
+            $router->get ('/comm/config', 'Guest\\CommController@config');
         });
     }
 }

app/Http/Routes/PassportRoute.php

@@ -17,6 +17,7 @@ class PassportRoute
             $router->get ('/auth/check', 'Passport\\AuthController@check');
             $router->post('/auth/forget', 'Passport\\AuthController@forget');
             $router->post('/auth/getTempToken', 'Passport\\AuthController@getTempToken');
+            $router->post('/auth/getQuickLoginUrl', 'Passport\\AuthController@getQuickLoginUrl');
             // Comm
             $router->get ('/comm/config', 'Passport\\CommController@config');
             $router->post('/comm/sendEmailVerify', 'Passport\\CommController@sendEmailVerify');

app/Http/Routes/StaffRoute.php

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

app/Http/Routes/UserRoute.php

@@ -34,10 +34,6 @@ class UserRoute
             $router->get ('/invite/save', 'User\\InviteController@save');
             $router->get ('/invite/fetch', 'User\\InviteController@fetch');
             $router->get ('/invite/details', 'User\\InviteController@details');
-            // Tutorial
-            $router->get ('/tutorial/getSubscribeUrl', 'User\\TutorialController@getSubscribeUrl');
-            $router->get ('/tutorial/getAppleID', 'User\\TutorialController@getAppleID');
-            $router->get ('/tutorial/fetch', 'User\\TutorialController@fetch');
             // Notice
             $router->get ('/notice/fetch', 'User\\NoticeController@fetch');
             // Ticket
@@ -55,6 +51,10 @@ class UserRoute
             $router->get ('/telegram/getBotInfo', 'User\\TelegramController@getBotInfo');
             // Comm
             $router->get ('/comm/config', 'User\\CommController@config');
+            $router->Post('/comm/getStripePublicKey', 'User\\CommController@getStripePublicKey');
+            // Knowledge
+            $router->get ('/knowledge/fetch', 'User\\KnowledgeController@fetch');
+            $router->get ('/knowledge/getCategory', 'User\\KnowledgeController@getCategory');
         });
     }
 }

app/Jobs/StatServerJob.php

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

app/Models/Knowledge.php

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

app/Models/Payment.php

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

app/Models/ServerShadowsocks.php

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

app/Models/StatOrder.php

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

app/Models/StatServer.php

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

app/Payments/AlipayF2F.php

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

app/Payments/EPay.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Payments;
+
+class EPay {
+    public function __construct($config)
+    {
+        $this->config = $config;
+    }
+
+    public function form()
+    {
+        return [
+            'url' => [
+                'label' => 'URL',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'pid' => [
+                'label' => 'PID',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'key' => [
+                'label' => 'KEY',
+                'description' => '',
+                'type' => 'input',
+            ]
+        ];
+    }
+
+    public function pay($order)
+    {
+        $params = [
+            'money' => $order['total_amount'] / 100,
+            'name' => $order['trade_no'],
+            'notify_url' => $order['notify_url'],
+            'return_url' => $order['return_url'],
+            'out_trade_no' => $order['trade_no'],
+            'pid' => $this->config['pid']
+        ];
+        ksort($params);
+        reset($params);
+        $str = stripslashes(urldecode(http_build_query($params))) . $this->config['key'];
+        $params['sign'] = md5($str);
+        $params['sign_type'] = 'MD5';
+        return [
+            'type' => 1, // 0:qrcode 1:url
+            'data' => $this->config['url'] . '/submit.php?' . http_build_query($params)
+        ];
+    }
+
+    public function notify($params)
+    {
+        $sign = $params['sign'];
+        unset($params['sign']);
+        unset($params['sign_type']);
+        ksort($params);
+        reset($params);
+        $str = stripslashes(urldecode(http_build_query($params))) . $this->config['key'];
+        if ($sign !== md5($str)) {
+            return false;
+        }
+        return [
+            'trade_no' => $params['out_trade_no'],
+            'callback_no' => $params['trade_no']
+        ];
+    }
+}

app/Payments/MGate.php

@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * 自己写别抄，抄NMB抄
+ */
+namespace App\Payments;
+
+use \Curl\Curl;
+
+class MGate {
+    public function __construct($config)
+    {
+        $this->config = $config;
+    }
+
+    public function form()
+    {
+        return [
+            'mgate_url' => [
+                'label' => 'API地址',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'mgate_app_id' => [
+                'label' => 'APPID',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'mgate_app_secret' => [
+                'label' => 'AppSecret',
+                'description' => '',
+                'type' => 'input',
+            ]
+        ];
+    }
+
+    public function pay($order)
+    {
+        $params = [
+            'out_trade_no' => $order['trade_no'],
+            'total_amount' => $order['total_amount'],
+            'notify_url' => $order['notify_url'],
+            'return_url' => $order['return_url']
+        ];
+        $params['app_id'] = $this->config['mgate_app_id'];
+        ksort($params);
+        $str = http_build_query($params) . $this->config['mgate_app_secret'];
+        $params['sign'] = md5($str);
+        $curl = new Curl();
+        $curl->post($this->config['mgate_url'] . '/v1/gateway/fetch', http_build_query($params));
+        $result = $curl->response;
+        if (!$result) {
+            abort(500, '网络异常');
+        }
+        if ($curl->error) {
+            if (isset($result->errors)) {
+                $errors = (array)$result->errors;
+                abort(500, $errors[array_keys($errors)[0]][0]);
+            }
+            if (isset($result->message)) {
+                abort(500, $result->message);
+            }
+            abort(500, '未知错误');
+        }
+        $curl->close();
+        if (!isset($result->data->trade_no)) {
+            abort(500, '接口请求失败');
+        }
+        return [
+            'type' => 1, // 0:qrcode 1:url
+            'data' => $result->data->pay_url
+        ];
+    }
+
+    public function notify($params)
+    {
+        $sign = $params['sign'];
+        unset($params['sign']);
+        ksort($params);
+        reset($params);
+        $str = http_build_query($params) . $this->config['mgate_app_secret'];
+        if ($sign !== md5($str)) {
+            return false;
+        }
+        return [
+            'trade_no' => $params['out_trade_no'],
+            'callback_no' => $params['trade_no']
+        ];
+    }
+}

app/Payments/StripeAlipay.php

@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * 自己写别抄，抄NMB抄
+ */
+namespace App\Payments;
+
+use Stripe\Source;
+use Stripe\Stripe;
+
+class StripeAlipay {
+    public function __construct($config)
+    {
+        $this->config = $config;
+    }
+
+    public function form()
+    {
+        return [
+            'currency' => [
+                'label' => '货币单位',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'stripe_sk_live' => [
+                'label' => 'SK_LIVE',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'stripe_webhook_key' => [
+                'label' => 'WebHook密钥签名',
+                'description' => '',
+                'type' => 'input',
+            ]
+        ];
+    }
+
+    public function pay($order)
+    {
+        $currency = $this->config['currency'];
+        $exchange = $this->exchange('CNY', strtoupper($currency));
+        if (!$exchange) {
+            abort(500, __('user.order.stripeAlipay.currency_convert_timeout'));
+        }
+        Stripe::setApiKey($this->config['stripe_sk_live']);
+        $source = Source::create([
+            'amount' => floor($order['total_amount'] * $exchange),
+            'currency' => $currency,
+            'type' => 'alipay',
+            'statement_descriptor' => $order['trade_no'],
+            'metadata' => [
+                'user_id' => $order['user_id'],
+                'out_trade_no' => $order['trade_no'],
+                'identifier' => ''
+            ],
+            'redirect' => [
+                'return_url' => $order['return_url']
+            ]
+        ]);
+        if (!$source['redirect']['url']) {
+            abort(500, __('user.order.stripeAlipay.gateway_request_failed'));
+        }
+        return [
+            'type' => 1,
+            'data' => $source['redirect']['url']
+        ];
+    }
+
+    public function notify($params)
+    {
+        \Stripe\Stripe::setApiKey($this->config['stripe_sk_live']);
+        try {
+            $event = \Stripe\Webhook::constructEvent(
+                file_get_contents('php://input'),
+                $_SERVER['HTTP_STRIPE_SIGNATURE'],
+                $this->config['stripe_webhook_key']
+            );
+        } catch (\Stripe\Error\SignatureVerification $e) {
+            abort(400);
+        }
+        switch ($event->type) {
+            case 'source.chargeable':
+                $object = $event->data->object;
+                \Stripe\Charge::create([
+                    'amount' => $object->amount,
+                    'currency' => $object->currency,
+                    'source' => $object->id,
+                    'metadata' => json_decode($object->metadata, true)
+                ]);
+                break;
+            case 'charge.succeeded':
+                $object = $event->data->object;
+                if ($object->status === 'succeeded') {
+                    $metaData = isset($object->metadata->out_trade_no) ? $object->metadata : $object->source->metadata;
+                    $tradeNo = $metaData->out_trade_no;
+                    return [
+                        'trade_no' => $tradeNo,
+                        'callback_no' => $object->balance_transaction
+                    ];
+                }
+                break;
+            default:
+                abort(500, 'event is not support');
+        }
+        die('success');
+    }
+
+    private function exchange($from, $to)
+    {
+        $result = file_get_contents('https://api.exchangerate.host/latest?symbols=' . $to . '&base=' . $from);
+        $result = json_decode($result, true);
+        return $result['rates'][$to];
+    }
+}

app/Payments/StripeCredit.php

@@ -0,0 +1,121 @@
+<?php
+
+/**
+ * 自己写别抄，抄NMB抄
+ */
+namespace App\Payments;
+
+use Stripe\Source;
+use Stripe\Stripe;
+
+class StripeCredit {
+    public function __construct($config)
+    {
+        $this->config = $config;
+    }
+
+    public function form()
+    {
+        return [
+            'currency' => [
+                'label' => '货币单位',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'stripe_sk_live' => [
+                'label' => 'SK_LIVE',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'stripe_pk_live' => [
+                'label' => 'PK_LIVE',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'stripe_webhook_key' => [
+                'label' => 'WebHook密钥签名',
+                'description' => '',
+                'type' => 'input',
+            ]
+        ];
+    }
+
+    public function pay($order)
+    {
+        info($order);
+        $currency = $this->config['currency'];
+        $exchange = $this->exchange('CNY', strtoupper($currency));
+        if (!$exchange) {
+            abort(500, __('user.order.stripeCard.currency_convert_timeout'));
+        }
+        Stripe::setApiKey($this->config['stripe_sk_live']);
+        try {
+            $charge = \Stripe\Charge::create([
+                'amount' => floor($order['total_amount'] * $exchange),
+                'currency' => $currency,
+                'source' => $order['stripe_token'],
+                'metadata' => [
+                    'user_id' => $order['user_id'],
+                    'out_trade_no' => $order['trade_no'],
+                    'identifier' => ''
+                ]
+            ]);
+        } catch (\Exception $e) {
+            info($e);
+            abort(500, __('user.order.stripeCard.was_problem'));
+        }
+        if (!$charge->paid) {
+            abort(500, __('user.order.stripeCard.deduction_failed'));
+        }
+        return [
+            'type' => 2,
+            'data' => $charge->paid
+        ];
+    }
+
+    public function notify($params)
+    {
+        \Stripe\Stripe::setApiKey($this->config['stripe_sk_live']);
+        try {
+            $event = \Stripe\Webhook::constructEvent(
+                file_get_contents('php://input'),
+                $_SERVER['HTTP_STRIPE_SIGNATURE'],
+                $this->config['stripe_webhook_key']
+            );
+        } catch (\Stripe\Error\SignatureVerification $e) {
+            abort(400);
+        }
+        switch ($event->type) {
+            case 'source.chargeable':
+                $object = $event->data->object;
+                \Stripe\Charge::create([
+                    'amount' => $object->amount,
+                    'currency' => $object->currency,
+                    'source' => $object->id,
+                    'metadata' => json_decode($object->metadata, true)
+                ]);
+                break;
+            case 'charge.succeeded':
+                $object = $event->data->object;
+                if ($object->status === 'succeeded') {
+                    $metaData = isset($object->metadata->out_trade_no) ? $object->metadata : $object->source->metadata;
+                    $tradeNo = $metaData->out_trade_no;
+                    return [
+                        'trade_no' => $tradeNo,
+                        'callback_no' => $object->balance_transaction
+                    ];
+                }
+                break;
+            default:
+                abort(500, 'event is not support');
+        }
+        die('success');
+    }
+
+    private function exchange($from, $to)
+    {
+        $result = file_get_contents('https://api.exchangerate.host/latest?symbols=' . $to . '&base=' . $from);
+        $result = json_decode($result, true);
+        return $result['rates'][$to];
+    }
+}

app/Payments/StripeWepay.php

@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * 自己写别抄，抄NMB抄
+ */
+namespace App\Payments;
+
+use Stripe\Source;
+use Stripe\Stripe;
+
+class StripeWepay {
+    public function __construct($config)
+    {
+        $this->config = $config;
+    }
+
+    public function form()
+    {
+        return [
+            'currency' => [
+                'label' => '货币单位',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'stripe_sk_live' => [
+                'label' => 'SK_LIVE',
+                'description' => '',
+                'type' => 'input',
+            ],
+            'stripe_webhook_key' => [
+                'label' => 'WebHook密钥签名',
+                'description' => '',
+                'type' => 'input',
+            ]
+        ];
+    }
+
+    public function pay($order)
+    {
+        $currency = $this->config['currency'];
+        $exchange = $this->exchange('CNY', strtoupper($currency));
+        if (!$exchange) {
+            abort(500, __('user.order.stripeAlipay.currency_convert_timeout'));
+        }
+        Stripe::setApiKey($this->config['stripe_sk_live']);
+        $source = Source::create([
+            'amount' => floor($order['total_amount'] * $exchange),
+            'currency' => $currency,
+            'type' => 'wechat',
+            'statement_descriptor' => $order['trade_no'],
+            'metadata' => [
+                'user_id' => $order['user_id'],
+                'out_trade_no' => $order['trade_no'],
+                'identifier' => ''
+            ],
+            'redirect' => [
+                'return_url' => $order['return_url']
+            ]
+        ]);
+        if (!$source['wechat']['qr_code_url']) {
+            abort(500, __('user.order.stripeWepay.gateway_request_failed'));
+        }
+        return [
+            'type' => 0,
+            'data' => $source['wechat']['qr_code_url']
+        ];
+    }
+
+    public function notify($params)
+    {
+        \Stripe\Stripe::setApiKey($this->config['stripe_sk_live']);
+        try {
+            $event = \Stripe\Webhook::constructEvent(
+                file_get_contents('php://input'),
+                $_SERVER['HTTP_STRIPE_SIGNATURE'],
+                $this->config['stripe_webhook_key']
+            );
+        } catch (\Stripe\Error\SignatureVerification $e) {
+            abort(400);
+        }
+        switch ($event->type) {
+            case 'source.chargeable':
+                $object = $event->data->object;
+                \Stripe\Charge::create([
+                    'amount' => $object->amount,
+                    'currency' => $object->currency,
+                    'source' => $object->id,
+                    'metadata' => json_decode($object->metadata, true)
+                ]);
+                break;
+            case 'charge.succeeded':
+                $object = $event->data->object;
+                if ($object->status === 'succeeded') {
+                    $metaData = isset($object->metadata->out_trade_no) ? $object->metadata : $object->source->metadata;
+                    $tradeNo = $metaData->out_trade_no;
+                    return [
+                        'trade_no' => $tradeNo,
+                        'callback_no' => $object->balance_transaction
+                    ];
+                }
+                break;
+            default:
+                abort(500, 'event is not support');
+        }
+        die('success');
+    }
+
+    private function exchange($from, $to)
+    {
+        $result = file_get_contents('https://api.exchangerate.host/latest?symbols=' . $to . '&base=' . $from);
+        $result = json_decode($result, true);
+        return $result['rates'][$to];
+    }
+}

app/Services/CouponService.php

@@ -51,4 +51,9 @@ class CouponService
         }
         return true;
     }
+
+    public function getId()
+    {
+        return $this->coupon->id;
+    }
 }

app/Services/MailService.php

@@ -2,6 +2,38 @@
 
 namespace App\Services;
 
+use App\Jobs\SendEmailJob;
+use App\Models\User;
+use App\Utils\CacheKey;
+use Illuminate\Support\Facades\Cache;
+
 class MailService
 {
+    public function remindTraffic (User $user)
+    {
+        if (!$user->remind_traffic) return;
+        if (!$this->remindTrafficIsWarnValue(($user->u + $user->d), $user->transfer_enable)) return;
+        $flag = CacheKey::get('LAST_SEND_EMAIL_REMIND_TRAFFIC', $user->id);
+        if (Cache::get($flag)) return;
+        if (!Cache::put($flag, 1, 24 * 3600)) return;
+        SendEmailJob::dispatch([
+            'email' => $user->email,
+            'subject' => '在' . config('v2board.app_name', 'V2board') . '的流量使用已达到80%',
+            'template_name' => 'remindTraffic',
+            'template_value' => [
+                'name' => config('v2board.app_name', 'V2Board'),
+                'url' => config('v2board.app_url')
+            ]
+        ]);
+    }
+
+    private function remindTrafficIsWarnValue($ud, $transfer_enable)
+    {
+        if (!$ud) return false;
+        if (!$transfer_enable) return false;
+        $percentage = ($ud / $transfer_enable) * 100;
+        if ($percentage < 80) return false;
+        if ($percentage >= 100) return false;
+        return true;
+    }
 }

app/Services/OrderService.php

@@ -9,6 +9,14 @@ use Illuminate\Support\Facades\DB;
 
 class OrderService
 {
+    CONST STR_TO_TIME = [
+        'month_price' => 1,
+        'quarter_price' => 3,
+        'half_year_price' => 6,
+        'year_price' => 12,
+        'two_year_price' => 24,
+        'three_year_price' => 36
+    ];
     public $order;
 
     public function __construct(Order $order)
@@ -16,6 +24,52 @@ class OrderService
         $this->order = $order;
     }
 
+    public function open()
+    {
+        $order = $this->order;
+        $user = User::find($order->user_id);
+        $plan = Plan::find($order->plan_id);
+
+        if ($order->refund_amount) {
+            $user->balance = $user->balance + $order->refund_amount;
+        }
+        DB::beginTransaction();
+        if ($order->surplus_order_ids) {
+            try {
+                Order::whereIn('id', json_decode($order->surplus_order_ids))->update([
+                    'status' => 4
+                ]);
+            } catch (\Exception $e) {
+                DB::rollback();
+                abort(500, '开通失败');
+            }
+        }
+        switch ((string)$order->cycle) {
+            case 'onetime_price':
+                $this->buyByOneTime($user, $plan);
+                break;
+            case 'reset_price':
+                $this->buyByResetTraffic($user);
+                break;
+            default:
+                $this->buyByCycle($order, $user, $plan);
+        }
+
+        if ((int)config('v2board.renew_reset_traffic_enable', 0)) $this->buyByResetTraffic($user);
+
+        if (!$user->save()) {
+            DB::rollBack();
+            abort(500, '开通失败');
+        }
+        $order->status = 3;
+        if (!$order->save()) {
+            DB::rollBack();
+            abort(500, '开通失败');
+        }
+
+        DB::commit();
+    }
+
     public function cancel():bool
     {
         $order = $this->order;
@@ -36,20 +90,15 @@ class OrderService
         return true;
     }
 
-    public function create()
-    {
-
-    }
-
     public function setOrderType(User $user)
     {
         $order = $this->order;
         if ($order->cycle === 'reset_price') {
             $order->type = 4;
-        } else if ($user->plan_id !== NULL && $order->plan_id !== $user->plan_id && $user->expired_at > time()) { // 用户订阅存在且用户订阅与购买订阅不同且用户订阅未过期 === 更换
+        } else if ($user->plan_id !== NULL && $order->plan_id !== $user->plan_id && ($user->expired_at > time() || $user->expired_at === NULL)) {
             if (!(int)config('v2board.plan_change_enable', 1)) abort(500, '目前不允许更改订阅，请联系客服或提交工单操作');
             $order->type = 3;
-            $this->getSurplusValue($user, $order);
+            if ((int)config('v2board.surplus_enable', 1)) $this->getSurplusValue($user, $order);
             if ($order->surplus_amount >= $order->total_amount) {
                 $order->refund_amount = $order->surplus_amount - $order->total_amount;
                 $order->total_amount = 0;
@@ -78,7 +127,7 @@ class OrderService
         if ($user->invite_user_id && $order->total_amount > 0) {
             $order->invite_user_id = $user->invite_user_id;
             $commissionFirstTime = (int)config('v2board.commission_first_time_enable', 1);
-            if (!$commissionFirstTime || ($commissionFirstTime && !Order::where('user_id', $user->id)->where('status', 3)->first())) {
+            if (!$commissionFirstTime || ($commissionFirstTime && !$this->haveValidOrder($user))) {
                 $inviter = User::find($user->invite_user_id);
                 if ($inviter && $inviter->commission_rate) {
                     $order->commission_balance = $order->total_amount * ($inviter->commission_rate / 100);
@@ -89,6 +138,13 @@ class OrderService
         }
     }
 
+    private function haveValidOrder(User $user)
+    {
+        return Order::where('user_id', $user->id)
+            ->whereNotIn('status', [0, 2])
+            ->first();
+    }
+
     private function getSurplusValue(User $user, Order $order)
     {
         if ($user->expired_at === NULL) {
@@ -106,31 +162,35 @@ class OrderService
         if ($user->discount && $trafficUnitPrice) {
             $trafficUnitPrice = $trafficUnitPrice - ($trafficUnitPrice * $user->discount / 100);
         }
-        $notUsedTrafficPrice = $plan->transfer_enable - (($user->u + $user->d) / 1073741824);
-        $result = $trafficUnitPrice * $notUsedTrafficPrice;
+        $notUsedTraffic = $plan->transfer_enable - (($user->u + $user->d) / 1073741824);
+        $result = $trafficUnitPrice * $notUsedTraffic;
         $orderModel = Order::where('user_id', $user->id)->where('cycle', '!=', 'reset_price')->where('status', 3);
         $order->surplus_amount = $result > 0 ? $result : 0;
-        $order->surplus_order_ids = json_encode(array_map(function ($v) { return $v['id'];}, $orderModel->get()->toArray()));
+        $order->surplus_order_ids = json_encode(array_column($orderModel->get()->toArray(), 'id'));
+    }
+
+    private function orderIsUsed(Order $order):bool
+    {
+        $month = self::STR_TO_TIME[$order->cycle];
+        $orderExpireDay = strtotime('+' . $month . ' month', $order->created_at->timestamp);
+        if ($orderExpireDay < time()) return true;
+        return false;
     }
 
     private function getSurplusValueByCycle(User $user, Order $order)
     {
-        $strToMonth = [
-            'month_price' => 1,
-            'quarter_price' => 3,
-            'half_year_price' => 6,
-            'year_price' => 12
-        ];
         $orderModel = Order::where('user_id', $user->id)
             ->where('cycle', '!=', 'reset_price')
             ->where('status', 3);
+        $orders = $orderModel->get();
         $orderSurplusMonth = 0;
         $orderSurplusAmount = 0;
         $userSurplusMonth = ($user->expired_at - time()) / 2678400;
-        foreach ($orderModel->get() as $item) {
+        foreach ($orders as $k => $item) {
             // 兼容历史余留问题
             if ($item->cycle === 'onetime_price') continue;
-            $orderSurplusMonth = $orderSurplusMonth + $strToMonth[$item->cycle];
+            if ($this->orderIsUsed($item)) continue;
+            $orderSurplusMonth = $orderSurplusMonth + self::STR_TO_TIME[$item->cycle];
             $orderSurplusAmount = $orderSurplusAmount + ($item['total_amount'] + $item['balance_amount']);
         }
         if (!$orderSurplusMonth || !$orderSurplusAmount) return;
@@ -145,7 +205,7 @@ class OrderService
             return;
         }
         $order->surplus_amount = $orderSurplusAmount > 0 ? $orderSurplusAmount : 0;
-        $order->surplus_order_ids = json_encode(array_map(function ($v) { return $v['id'];}, $orderModel->get()->toArray()));
+        $order->surplus_order_ids = json_encode(array_column($orders->toArray(), 'id'));
     }
 
     public function success(string $callbackNo)
@@ -158,4 +218,57 @@ class OrderService
         $order->callback_no = $callbackNo;
         return $order->save();
     }
+
+
+    private function buyByResetTraffic(User $user)
+    {
+        $user->u = 0;
+        $user->d = 0;
+    }
+
+    private function buyByCycle(Order $order, User $user, Plan $plan)
+    {
+        // change plan process
+        if ((int)$order->type === 3) {
+            $user->expired_at = time();
+        }
+        $user->transfer_enable = $plan->transfer_enable * 1073741824;
+        // 从一次性转换到循环
+        if ($user->expired_at === NULL) $this->buyByResetTraffic($user);
+        // 新购
+        if ($order->type === 1) $this->buyByResetTraffic($user);
+        $user->plan_id = $plan->id;
+        $user->group_id = $plan->group_id;
+        $user->expired_at = $this->getTime($order->cycle, $user->expired_at);
+    }
+
+    private function buyByOneTime(User $user, Plan $plan)
+    {
+        $this->buyByResetTraffic($user);
+        $user->transfer_enable = $plan->transfer_enable * 1073741824;
+        $user->plan_id = $plan->id;
+        $user->group_id = $plan->group_id;
+        $user->expired_at = NULL;
+    }
+
+    private function getTime($str, $timestamp)
+    {
+        if ($timestamp < time()) {
+            $timestamp = time();
+        }
+        switch ($str) {
+            case 'month_price':
+                return strtotime('+1 month', $timestamp);
+            case 'quarter_price':
+                return strtotime('+3 month', $timestamp);
+            case 'half_year_price':
+                return strtotime('+6 month', $timestamp);
+            case 'year_price':
+                return strtotime('+12 month', $timestamp);
+            case 'two_year_price':
+                return strtotime('+24 month', $timestamp);
+            case 'three_year_price':
+                return strtotime('+36 month', $timestamp);
+        }
+    }
 }

app/Services/PaymentService.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Services;
+
+
+use App\Models\Payment;
+
+class PaymentService
+{
+    public function __construct($method, $id = NULL, $uuid = NULL)
+    {
+        $this->method = $method;
+        $this->class = '\\App\\Payments\\' . $this->method;
+        if (!class_exists($this->class)) abort(500, 'gate is not found');
+        if ($id) $payment = Payment::find($id)->toArray();
+        if ($uuid) $payment = Payment::where('uuid', $uuid)->first()->toArray();
+        $this->config = [];
+        if (isset($payment)) {
+            $this->config = json_decode($payment['config'], true);
+            $this->config['enable'] = $payment['enable'];
+            $this->config['id'] = $payment['id'];
+            $this->config['uuid'] = $payment['uuid'];
+        };
+        $this->payment = new $this->class($this->config);
+    }
+
+    public function notify($params)
+    {
+        if (!$this->config['enable']) abort(500, 'gate is not enable');
+        return $this->payment->notify($params);
+    }
+
+    public function pay($order)
+    {
+        return $this->payment->pay([
+            'notify_url' => url("/api/v1/guest/payment/notify/{$this->method}/{$this->config['uuid']}"),
+            'return_url' => config('v2board.app_url', env('APP_URL')) . '/#/order/' . $order['trade_no'],
+            'trade_no' => $order['trade_no'],
+            'total_amount' => $order['total_amount'],
+            'user_id' => $order['user_id'],
+            'stripe_token' => $order['stripe_token']
+        ]);
+    }
+
+    public function form()
+    {
+        $form = $this->payment->form();
+        $keys = array_keys($form);
+        foreach ($keys as $key) {
+            if (isset($this->config[$key])) $form[$key]['value'] = $this->config[$key];
+        }
+        return $form;
+    }
+}

app/Services/ServerService.php

@@ -3,72 +3,105 @@
 namespace App\Services;
 
 use App\Models\ServerLog;
+use App\Models\ServerShadowsocks;
 use App\Models\User;
 use App\Models\Server;
 use App\Models\ServerTrojan;
 use App\Utils\CacheKey;
 use App\Utils\Helper;
+use App\Utils\URLSchemes;
 use Illuminate\Support\Facades\Cache;
 
 class ServerService
 {
 
-    CONST V2RAY_CONFIG = '{"api":{"services":["HandlerService","StatsService"],"tag":"api"},"dns":{},"stats":{},"inbound":{"port":443,"protocol":"vmess","settings":{"clients":[]},"sniffing":{"enabled":true,"destOverride":["http","tls"]},"streamSettings":{"network":"tcp"},"tag":"proxy"},"inboundDetour":[{"listen":"0.0.0.0","port":23333,"protocol":"dokodemo-door","settings":{"address":"0.0.0.0"},"tag":"api"}],"log":{"loglevel":"debug","access":"access.log","error":"error.log"},"outbound":{"protocol":"freedom","settings":{}},"outboundDetour":[{"protocol":"blackhole","settings":{},"tag":"block"}],"routing":{"rules":[{"inboundTag":"api","outboundTag":"api","type":"field"}]},"policy":{"levels":{"0":{"handshake":4,"connIdle":300,"uplinkOnly":5,"downlinkOnly":30,"statsUserUplink":true,"statsUserDownlink":true}}}}';
+    CONST V2RAY_CONFIG = '{"api":{"services":["HandlerService","StatsService"],"tag":"api"},"dns":{},"stats":{},"inbound":{"port":443,"protocol":"vmess","settings":{"clients":[]},"sniffing":{"enabled":true,"destOverride":["http","tls"]},"streamSettings":{"network":"tcp"},"tag":"proxy"},"inboundDetour":[{"listen":"127.0.0.1","port":23333,"protocol":"dokodemo-door","settings":{"address":"0.0.0.0"},"tag":"api"}],"log":{"loglevel":"debug","access":"access.log","error":"error.log"},"outbound":{"protocol":"freedom","settings":{}},"outboundDetour":[{"protocol":"blackhole","settings":{},"tag":"block"}],"routing":{"rules":[{"inboundTag":"api","outboundTag":"api","type":"field"}]},"policy":{"levels":{"0":{"handshake":4,"connIdle":300,"uplinkOnly":5,"downlinkOnly":30,"statsUserUplink":true,"statsUserDownlink":true}}}}';
     CONST TROJAN_CONFIG = '{"run_type":"server","local_addr":"0.0.0.0","local_port":443,"remote_addr":"www.taobao.com","remote_port":80,"password":[],"ssl":{"cert":"server.crt","key":"server.key","sni":"domain.com"},"api":{"enabled":true,"api_addr":"127.0.0.1","api_port":10000}}';
-    public function getVmess(User $user, $all = false):array
+    public function getV2ray(User $user, $all = false):array
     {
-        $vmess = [];
+        $servers = [];
         $model = Server::orderBy('sort', 'ASC');
         if (!$all) {
             $model->where('show', 1);
         }
-        $vmesss = $model->get();
-        foreach ($vmesss as $k => $v) {
-            $groupId = json_decode($vmesss[$k]['group_id']);
+        $v2ray = $model->get();
+        for ($i = 0; $i < count($v2ray); $i++) {
+            $v2ray[$i]['type'] = 'v2ray';
+            $groupId = json_decode($v2ray[$i]['group_id']);
             if (in_array($user->group_id, $groupId)) {
-                $vmesss[$k]['link'] = Helper::buildVmessLink($vmesss[$k], $user);
-                if ($vmesss[$k]['parent_id']) {
-                    $vmesss[$k]['last_check_at'] = Cache::get(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $vmesss[$k]['parent_id']));
+                $v2ray[$i]['link'] = URLSchemes::buildVmess($v2ray[$i], $user);
+                if ($v2ray[$i]['parent_id']) {
+                    $v2ray[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $v2ray[$i]['parent_id']));
                 } else {
-                    $vmesss[$k]['last_check_at'] = Cache::get(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $vmesss[$k]['id']));
+                    $v2ray[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_V2RAY_LAST_CHECK_AT', $v2ray[$i]['id']));
                 }
-                array_push($vmess, $vmesss[$k]);
+                array_push($servers, $v2ray[$i]->toArray());
             }
         }
 
 
-        return $vmess;
+        return $servers;
     }
 
-    public function getTrojan(User $user, $all = false)
+    public function getTrojan(User $user, $all = false):array
     {
-        $trojan = [];
+        $servers = [];
         $model = ServerTrojan::orderBy('sort', 'ASC');
         if (!$all) {
             $model->where('show', 1);
         }
-        $trojans = $model->get();
-        foreach ($trojans as $k => $v) {
-            $groupId = json_decode($trojans[$k]['group_id']);
+        $trojan = $model->get();
+        for ($i = 0; $i < count($trojan); $i++) {
+            $trojan[$i]['type'] = 'trojan';
+            $groupId = json_decode($trojan[$i]['group_id']);
+            $trojan[$i]['link'] = URLSchemes::buildTrojan($trojan[$i], $user);
             if (in_array($user->group_id, $groupId)) {
-                if ($trojans[$k]['parent_id']) {
-                    $trojans[$k]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $trojans[$k]['parent_id']));
+                if ($trojan[$i]['parent_id']) {
+                    $trojan[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $trojan[$i]['parent_id']));
                 } else {
-                    $trojans[$k]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $trojans[$k]['id']));
+                    $trojan[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_TROJAN_LAST_CHECK_AT', $trojan[$i]['id']));
                 }
-                array_push($trojan, $trojans[$k]);
+                array_push($servers, $trojan[$i]->toArray());
+            }
+        }
+        return $servers;
+    }
+
+    public function getShadowsocks(User $user, $all = false)
+    {
+        $servers = [];
+        $model = ServerShadowsocks::orderBy('sort', 'ASC');
+        if (!$all) {
+            $model->where('show', 1);
+        }
+        $shadowsocks = $model->get();
+        for ($i = 0; $i < count($shadowsocks); $i++) {
+            $shadowsocks[$i]['type'] = 'shadowsocks';
+            $groupId = json_decode($shadowsocks[$i]['group_id']);
+            $shadowsocks[$i]['link'] = URLSchemes::buildShadowsocks($shadowsocks[$i], $user);
+            if (in_array($user->group_id, $groupId)) {
+                if ($shadowsocks[$i]['parent_id']) {
+                    $shadowsocks[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_SHADOWSOCKS_LAST_CHECK_AT', $shadowsocks[$i]['parent_id']));
+                } else {
+                    $shadowsocks[$i]['last_check_at'] = Cache::get(CacheKey::get('SERVER_SHADOWSOCKS_LAST_CHECK_AT', $shadowsocks[$i]['id']));
+                }
+                array_push($servers, $shadowsocks[$i]->toArray());
             }
 
         }
-        return $trojan;
+        return $servers;
     }
 
-    public function getAllServers(User $user, $all = false)
+    public function getAvailableServers(User $user, $all = false)
     {
-        return [
-            'vmess' => $this->getVmess($user, $all),
-            'trojan' => $this->getTrojan($user, $all)
-        ];
+        $servers = array_merge(
+            $this->getShadowsocks($user, $all),
+            $this->getV2ray($user, $all),
+            $this->getTrojan($user, $all)
+        );
+        $tmp = array_column($servers, 'sort');
+        array_multisort($tmp, SORT_ASC, $servers);
+        return $servers;
     }
 
 
@@ -88,21 +121,19 @@ class ServerService
                 'u',
                 'd',
                 'transfer_enable',
-                'uuid',
-                'v2ray_alter_id',
-                'v2ray_level'
+                'uuid'
             ])
             ->get();
     }
 
-    public function getVmessConfig(int $nodeId, int $localPort)
+    public function getV2RayConfig(int $nodeId, int $localPort)
     {
         $server = Server::find($nodeId);
         if (!$server) {
             abort(500, '节点不存在');
         }
         $json = json_decode(self::V2RAY_CONFIG);
-        $json->log->loglevel = config('v2board.server_log_level', 'none');
+        $json->log->loglevel = (int)config('v2board.server_log_enable') ? 'debug' : 'none';
         $json->inboundDetour[0]->port = (int)$localPort;
         $json->inbound->port = (int)$server->server_port;
         $json->inbound->streamSettings->network = $server->network;
@@ -239,6 +270,7 @@ class ServerService
             ->where('user_id', $userId)
             ->where('rate', $rate)
             ->where('method', $method)
+            ->lockForUpdate()
             ->first();
         if ($serverLog) {
             $serverLog->u = $serverLog->u + $u;
@@ -256,4 +288,74 @@ class ServerService
             $serverLog->save();
         }
     }
+
+    public function getShadowsocksServers()
+    {
+        $server = ServerShadowsocks::orderBy('sort', 'ASC')->get();
+        for ($i = 0; $i < count($server); $i++) {
+            $server[$i]['type'] = 'shadowsocks';
+            if (!empty($server[$i]['tags'])) {
+                $server[$i]['tags'] = json_decode($server[$i]['tags']);
+            }
+            $server[$i]['group_id'] = json_decode($server[$i]['group_id']);
+        }
+        return $server->toArray();
+    }
+
+    public function getV2rayServers()
+    {
+        $server = Server::orderBy('sort', 'ASC')->get();
+        for ($i = 0; $i < count($server); $i++) {
+            $server[$i]['type'] = 'v2ray';
+            if (!empty($server[$i]['tags'])) {
+                $server[$i]['tags'] = json_decode($server[$i]['tags']);
+            }
+            if (!empty($server[$i]['dnsSettings'])) {
+                $server[$i]['dnsSettings'] = json_decode($server[$i]['dnsSettings']);
+            }
+            if (!empty($server[$i]['tlsSettings'])) {
+                $server[$i]['tlsSettings'] = json_decode($server[$i]['tlsSettings']);
+            }
+            if (!empty($server[$i]['ruleSettings'])) {
+                $server[$i]['ruleSettings'] = json_decode($server[$i]['ruleSettings']);
+            }
+            $server[$i]['group_id'] = json_decode($server[$i]['group_id']);
+        }
+        return $server->toArray();
+    }
+
+    public function getTrojanServers()
+    {
+        $server = ServerTrojan::orderBy('sort', 'ASC')->get();
+        for ($i = 0; $i < count($server); $i++) {
+            $server[$i]['type'] = 'trojan';
+            if (!empty($server[$i]['tags'])) {
+                $server[$i]['tags'] = json_decode($server[$i]['tags']);
+            }
+            $server[$i]['group_id'] = json_decode($server[$i]['group_id']);
+        }
+        return $server->toArray();
+    }
+
+    public function mergeData(&$servers)
+    {
+        foreach ($servers as $k => $v) {
+            $serverType = strtoupper($servers[$k]['type']);
+            $servers[$k]['online'] = Cache::get(CacheKey::get("SERVER_{$serverType}_ONLINE_USER", $servers[$k]['parent_id'] ? $servers[$k]['parent_id'] : $servers[$k]['id']));
+            if ($servers[$k]['parent_id']) {
+                $servers[$k]['last_check_at'] = Cache::get(CacheKey::get("SERVER_{$serverType}_LAST_CHECK_AT", $servers[$k]['parent_id']));
+                $servers[$k]['last_push_at'] = Cache::get(CacheKey::get("SERVER_{$serverType}_LAST_PUSH_AT", $servers[$k]['parent_id']));
+            } else {
+                $servers[$k]['last_check_at'] = Cache::get(CacheKey::get("SERVER_{$serverType}_LAST_CHECK_AT", $servers[$k]['id']));
+                $servers[$k]['last_push_at'] = Cache::get(CacheKey::get("SERVER_{$serverType}_LAST_PUSH_AT", $servers[$k]['id']));
+            }
+            if ((time() - 300) >= $servers[$k]['last_check_at']) {
+                $servers[$k]['available_status'] = 0;
+            } else if ((time() - 300) >= $servers[$k]['last_push_at']) {
+                $servers[$k]['available_status'] = 1;
+            } else {
+                $servers[$k]['available_status'] = 2;
+            }
+        }
+    }
 }

app/Services/TelegramService.php

@@ -46,10 +46,15 @@ class TelegramService {
         return $response;
     }
 
-    public function sendMessageWithAdmin($message)
+    public function sendMessageWithAdmin($message, $isStaff = false)
     {
         if (!config('v2board.telegram_bot_enable', 0)) return;
-        $users = User::where('is_admin', 1)
+        $users = User::where(function ($query) use ($isStaff) {
+            $query->where('is_admin', 1);
+            if ($isStaff) {
+                $query->orWhere('is_staff', 1);
+            }
+        })
             ->where('telegram_id', '!=', NULL)
             ->get();
         foreach ($users as $user) {

app/Services/UserService.php

@@ -3,6 +3,7 @@
 namespace App\Services;
 
 use App\Models\Order;
+use App\Models\Server;
 use App\Models\User;
 
 class UserService
@@ -76,11 +77,12 @@ class UserService
         return true;
     }
 
-    public function trafficFetch(int $u, int $d, int $userId):bool
+    public function trafficFetch(int $u, int $d, int $userId, object $server, string $protocol):bool
     {
-        $user = User::find($userId);
+        $user = User::lockForUpdate()
+            ->find($userId);
         if (!$user) {
-            return false;
+            return true;
         }
         $user->t = time();
         $user->u = $user->u + $u;
@@ -88,6 +90,20 @@ class UserService
         if (!$user->save()) {
             return false;
         }
+        $mailService = new MailService();
+        $serverService = new ServerService();
+        try {
+            $mailService->remindTraffic($user);
+            $serverService->log(
+                $userId,
+                $server->id,
+                $u,
+                $d,
+                $server->rate,
+                $protocol
+            );
+        } catch (\Exception $e) {
+        }
         return true;
     }
 }

app/Utils/CacheKey.php

@@ -5,13 +5,19 @@ namespace App\Utils;
 class CacheKey
 {
     CONST KEYS = [
-        'EMAIL_VERIFY_CODE' => '邮箱验证吗',
+        'EMAIL_VERIFY_CODE' => '邮箱验证码',
         'LAST_SEND_EMAIL_VERIFY_TIMESTAMP' => '最后一次发送邮箱验证码时间',
         'SERVER_V2RAY_ONLINE_USER' => '节点在线用户',
         'SERVER_V2RAY_LAST_CHECK_AT' => '节点最后检查时间',
+        'SERVER_V2RAY_LAST_PUSH_AT' => '节点最后推送时间',
         'SERVER_TROJAN_ONLINE_USER' => 'trojan节点在线用户',
         'SERVER_TROJAN_LAST_CHECK_AT' => 'trojan节点最后检查时间',
-        'TEMP_TOKEN' => '临时令牌'
+        'SERVER_TROJAN_LAST_PUSH_AT' => 'trojan节点最后推送时间',
+        'SERVER_SHADOWSOCKS_ONLINE_USER' => 'ss节点在线用户',
+        'SERVER_SHADOWSOCKS_LAST_CHECK_AT' => 'ss节点最后检查时间',
+        'SERVER_SHADOWSOCKS_LAST_PUSH_AT' => 'ss节点最后推送时间',
+        'TEMP_TOKEN' => '临时令牌',
+        'LAST_SEND_EMAIL_REMIND_TRAFFIC'
     ];
 
     public static function get(string $key, $uniqueValue)

app/Utils/Clash.php

@@ -5,51 +5,66 @@ namespace App\Utils;
 
 class Clash
 {
+    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['name'] = $server['name'];
         $array['type'] = 'vmess';
-        $array['server'] = $server->host;
-        $array['port'] = $server->port;
+        $array['server'] = $server['host'];
+        $array['port'] = $server['port'];
         $array['uuid'] = $uuid;
-        $array['alterId'] = 2;
+        $array['alterId'] = $server['alter_id'];
         $array['cipher'] = 'auto';
         $array['udp'] = true;
-        if ($server->tls) {
-            $tlsSettings = json_decode($server->tlsSettings);
+
+        if ($server['tls']) {
             $array['tls'] = true;
-            if (isset($tlsSettings->allowInsecure)) $array['skip-cert-verify'] = ($tlsSettings->allowInsecure ? true : false );
-            if (isset($tlsSettings->serverName)) $array['servername'] = $tlsSettings->serverName;
-        }
-        if ($server->network == 'ws') {
-            $array['network'] = $server->network;
-            if ($server->networkSettings) {
-                $wsSettings = json_decode($server->networkSettings);
-                if (isset($wsSettings->path)) $array['ws-path'] = $wsSettings->path;
-                if (isset($wsSettings->headers->Host)) $array['ws-headers'] = [
-                    'Host' => $wsSettings->headers->Host
-                ];
+            if ($server['tlsSettings']) {
+                $tlsSettings = json_decode($server['tlsSettings'], true);
+                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 = json_decode($server['networkSettings'], true);
+                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']];
+            }
+        }
+
         return $array;
     }
 
     public static function buildTrojan($password, $server)
     {
         $array = [];
-        $array['name'] = $server->name;
+        $array['name'] = $server['name'];
         $array['type'] = 'trojan';
-        $array['server'] = $server->host;
-        $array['port'] = $server->port;
+        $array['server'] = $server['host'];
+        $array['port'] = $server['port'];
         $array['password'] = $password;
         $array['udp'] = true;
-        $array['sni'] = $server->server_name;
-        if ($server->allow_insecure) {
-            $array['skip-cert-verify'] = true;
-        } else {
-            $array['skip-cert-verify'] = false;
-        }
+        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;
     }
 }

app/Utils/Dict.php

@@ -15,4 +15,9 @@ class Dict
         'yeah.net',
         'foxmail.com'
     ];
+    CONST WITHDRAW_METHOD_WHITELIST_DEFAULT = [
+        '支付宝',
+        'USDT',
+        'Paypal'
+    ];
 }

app/Utils/Helper.php

@@ -3,6 +3,7 @@
 namespace App\Utils;
 
 use App\Models\Server;
+use App\Models\ServerShadowsocks;
 use App\Models\ServerTrojan;
 use App\Models\User;
 
@@ -24,7 +25,7 @@ class Helper
 
     public static function exchange($from, $to)
     {
-        $result = file_get_contents('https://api.exchangeratesapi.io/latest?symbols=' . $to . '&base=' . $from);
+        $result = file_get_contents('https://api.exchangerate.host/latest?symbols=' . $to . '&base=' . $from);
         $result = json_decode($result, true);
         return $result['rates'][$to];
     }
@@ -57,42 +58,6 @@ class Helper
         return $str;
     }
 
-    public static function buildTrojanLink(ServerTrojan $server, User $user)
-    {
-        $server->name = rawurlencode($server->name);
-        $query = http_build_query([
-            'allowInsecure' => $server->allow_insecure,
-            'peer' => $server->server_name,
-            'sni' => $server->server_name
-        ]);
-        $uri = "trojan://{$user->uuid}@{$server->host}:{$server->port}?{$query}#{$server->name}";
-        $uri .= "\r\n";
-        return $uri;
-    }
-
-    public static function buildVmessLink(Server $server, User $user)
-    {
-        $config = [
-            "v" => "2",
-            "ps" => $server->name,
-            "add" => $server->host,
-            "port" => $server->port,
-            "id" => $user->uuid,
-            "aid" => "2",
-            "net" => $server->network,
-            "type" => "none",
-            "host" => "",
-            "path" => "",
-            "tls" => $server->tls ? "tls" : ""
-        ];
-        if ((string)$server->network === 'ws') {
-            $wsSettings = json_decode($server->networkSettings);
-            if (isset($wsSettings->path)) $config['path'] = $wsSettings->path;
-            if (isset($wsSettings->headers->Host)) $config['host'] = $wsSettings->headers->Host;
-        }
-        return "vmess://" . base64_encode(json_encode($config)) . "\r\n";
-    }
-
     public static function multiPasswordVerify($algo, $password, $hash)
     {
         switch($algo) {