Merge branch 'dev'

2025-06-16 22:57:47 +08:00 · 2022-06-12 19:47:56 +08:00
parent 93eaf0ae36 dec00ebe54
commit ecef0315a0
102 changed files with 1697 additions and 877 deletions
--- a/app/Console/Commands/CheckCommission.php
+++ b/app/Console/Commands/CheckCommission.php
@ -98,6 +98,7 @@ class CheckCommission extends Command
            if (!$inviter) continue;
            if (!isset($commissionShareLevels[$l])) continue;
            $commissionBalance = $order->commission_balance * ($commissionShareLevels[$l] / 100);
+            if (!$commissionBalance) continue;
            if ((int)config('v2board.withdraw_close_enable', 0)) {
                $inviter->balance = $inviter->balance + $commissionBalance;
            } else {
--- a/app/Console/Commands/ClearUser.php
+++ b/app/Console/Commands/ClearUser.php
@ -0,0 +1,51 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Ticket;
+use App\Models\User;
+use Illuminate\Console\Command;
+
+class ClearUser extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'clear:user';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '清理用户';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $builder = User::where('plan_id', NULL)
+            ->where('transfer_enable', 0)
+            ->where('expired_at', 0)
+            ->where('last_login_at', NULL);
+        $count = $builder->count();
+        if ($builder->delete()) {
+            $this->info("已删除${count}位没有任何数据的用户");
+        }
+    }
+}
--- a/app/Console/Commands/ResetPassword.php
+++ b/app/Console/Commands/ResetPassword.php
@ -0,0 +1,54 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Plan;
+use App\Utils\Helper;
+use Illuminate\Console\Command;
+use App\Models\User;
+use Illuminate\Support\Facades\DB;
+
+class ResetPassword extends Command
+{
+    protected $builder;
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'reset:password {email}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '重置用户密码';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $user = User::where('email', $this->argument('email'))->first();
+        if (!$user) abort(500, '邮箱不存在');
+        $password = Helper::guid(false);
+        $user->password = password_hash($password, PASSWORD_DEFAULT);
+        $user->password_algo = null;
+        if (!$user->save()) abort(500, '重置失败');
+        $this->info("!!!重置成功!!!");
+        $this->info("新密码为：{$password}，请尽快修改密码。");
+    }
+}
--- a/app/Console/Commands/ResetTraffic.php
+++ b/app/Console/Commands/ResetTraffic.php
@ -69,6 +69,12 @@ class ResetTraffic extends Command
                        // no action
                        case 2:
                            break;
+                        // year first day
+                        case 3:
+                            $this->resetByYearFirstDay($builder);
+                        // year expire day
+                        case 4:
+                            $this->resetByExpireYear($builder);
                    }
                    break;
                }
@ -85,10 +91,46 @@ class ResetTraffic extends Command
                case ($resetMethod['method'] === 2): {
                    break;
                }
+                case ($resetMethod['method'] === 3): {
+                    $builder = with(clone($this->builder))->whereIn('plan_id', $planIds);
+                    $this->resetByYearFirstDay($builder);
+                    break;
+                }
+                case ($resetMethod['method'] === 4): {
+                    $builder = with(clone($this->builder))->whereIn('plan_id', $planIds);
+                    $this->resetByExpireYear($builder);
+                    break;
+                }
            }
        }
    }

+    private function resetByExpireYear($builder):void
+    {
+        $users = [];
+        foreach ($builder->get() as $item) {
+            $expireDay = date('m-d', $item->expired_at);
+            $today = date('m-d');
+            if ($expireDay === $today) {
+                array_push($users, $item->id);
+            }
+        }
+        User::whereIn('id', $users)->update([
+            'u' => 0,
+            'd' => 0
+        ]);
+    }
+
+    private function resetByYearFirstDay($builder):void
+    {
+        if ((string)date('md') === '0101') {
+            $builder->update([
+                'u' => 0,
+                'd' => 0
+            ]);
+        }
+    }
+
    private function resetByMonthFirstDay($builder):void
    {
        if ((string)date('d') === '01') {
--- a/app/Console/Commands/Test.php
+++ b/app/Console/Commands/Test.php
@ -7,6 +7,8 @@ use App\Models\User;
 use App\Utils\CacheKey;
 use App\Utils\Helper;
 use Illuminate\Console\Command;
+use Illuminate\Filesystem\Filesystem;
+use Illuminate\Foundation\Console\ConfigCacheCommand;
 use Illuminate\Support\Facades\Cache;
 use Matriphe\Larinfo;

--- a/app/Console/Commands/V2boardStatistics.php
+++ b/app/Console/Commands/V2boardStatistics.php
@ -2,12 +2,10 @@

 namespace App\Console\Commands;

-use App\Jobs\StatServerJob;
 use Illuminate\Console\Command;
 use App\Models\Order;
 use App\Models\StatOrder;
-use App\Models\ServerLog;
-use Illuminate\Support\Facades\DB;
+use App\Models\CommissionLog;

 class V2boardStatistics extends Command
 {
@ -50,14 +48,16 @@ class V2boardStatistics extends Command
    {
        $endAt = strtotime(date('Y-m-d'));
        $startAt = strtotime('-1 day', $endAt);
-        $builder = Order::where('paid_at', '>=', $startAt)
+        $orderBuilder = Order::where('paid_at', '>=', $startAt)
            ->where('paid_at', '<', $endAt)
            ->whereNotIn('status', [0, 2]);
-        $orderCount = $builder->count();
-        $orderAmount = $builder->sum('total_amount');
-        $builder = $builder->whereNotNull('actual_commission_balance');
-        $commissionCount = $builder->count();
-        $commissionAmount = $builder->sum('actual_commission_balance');
+        $orderCount = $orderBuilder->count();
+        $orderAmount = $orderBuilder->sum('total_amount');
+        $commissionBuilder = CommissionLog::where('created_at', '>=', $startAt)
+            ->where('created_at', '<', $endAt)
+            ->where('get_amount', '>', 0);
+        $commissionCount = $commissionBuilder->count();
+        $commissionAmount = $commissionBuilder->sum('get_amount');
        $data = [
            'order_count' => $orderCount,
            'order_amount' => $orderAmount,
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@ -3,7 +3,10 @@
 namespace App\Exceptions;

 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Illuminate\Support\Arr;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Throwable;
+use Facade\Ignition\Exceptions\ViewException;

 class Handler extends ExceptionHandler
 {
@ -50,6 +53,27 @@ class Handler extends ExceptionHandler
     */
    public function render($request, Throwable $exception)
    {
+        if ($exception instanceof ViewException) {
+            return response([
+                'message' => "主题初始化发生错误，请在后台对主题检查或配置后重试。"
+            ]);
+        }
        return parent::render($request, $exception);
    }
+
+
+    protected function convertExceptionToArray(Throwable $e)
+    {
+        return config('app.debug') ? [
+            'message' => $e->getMessage(),
+            'exception' => get_class($e),
+            'file' => $e->getFile(),
+            'line' => $e->getLine(),
+            'trace' => collect($e->getTrace())->map(function ($trace) {
+                return Arr::except($trace, ['args']);
+            })->all(),
+        ] : [
+            'message' => $this->isHttpException($e) ? $e->getMessage() : __("Uh-oh, we've had some problems, we're working on it."),
+        ];
+    }
 }
--- a/app/Http/Controllers/Admin/ConfigController.php
+++ b/app/Http/Controllers/Admin/ConfigController.php
@ -8,6 +8,8 @@ use App\Services\TelegramService;
 use Illuminate\Http\Request;
 use App\Utils\Dict;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Mail;

 class ConfigController extends Controller
@ -54,152 +56,134 @@ class ConfigController extends Controller

    public function setTelegramWebhook(Request $request)
    {
+        $hookUrl = url('/api/v1/guest/telegram/webhook?access_token=' . md5(config('v2board.telegram_bot_token', $request->input('telegram_bot_token'))));
        $telegramService = new TelegramService($request->input('telegram_bot_token'));
        $telegramService->getMe();
-        $telegramService->setWebhook(
-            url(
-                '/api/v1/guest/telegram/webhook?access_token=' . md5(config('v2board.telegram_bot_token', $request->input('telegram_bot_token')))
-            )
-        );
+        $telegramService->setWebhook($hookUrl);
        return response([
            'data' => true
        ]);
    }

-    public function fetch()
+    public function fetch(Request $request)
    {
+        $key = $request->input('key');
+        $data = [
+            'invite' => [
+                'invite_force' => (int)config('v2board.invite_force', 0),
+                'invite_commission' => config('v2board.invite_commission', 10),
+                'invite_gen_limit' => config('v2board.invite_gen_limit', 5),
+                'invite_never_expire' => config('v2board.invite_never_expire', 0),
+                'commission_first_time_enable' => config('v2board.commission_first_time_enable', 1),
+                'commission_auto_check_enable' => config('v2board.commission_auto_check_enable', 1),
+                'commission_withdraw_limit' => config('v2board.commission_withdraw_limit', 100),
+                'commission_withdraw_method' => config('v2board.commission_withdraw_method', Dict::WITHDRAW_METHOD_WHITELIST_DEFAULT),
+                'withdraw_close_enable' => config('v2board.withdraw_close_enable', 0),
+                'commission_distribution_enable' => config('v2board.commission_distribution_enable', 0),
+                'commission_distribution_l1' => config('v2board.commission_distribution_l1'),
+                'commission_distribution_l2' => config('v2board.commission_distribution_l2'),
+                'commission_distribution_l3' => config('v2board.commission_distribution_l3')
+            ],
+            'site' => [
+                'logo' => config('v2board.logo'),
+                'force_https' => (int)config('v2board.force_https', 0),
+                'safe_mode_enable' => (int)config('v2board.safe_mode_enable', 0),
+                'stop_register' => (int)config('v2board.stop_register', 0),
+                'email_verify' => (int)config('v2board.email_verify', 0),
+                'app_name' => config('v2board.app_name', 'V2Board'),
+                'app_description' => config('v2board.app_description', 'V2Board is best!'),
+                'app_url' => config('v2board.app_url'),
+                'subscribe_url' => config('v2board.subscribe_url'),
+                'try_out_plan_id' => (int)config('v2board.try_out_plan_id', 0),
+                'try_out_hour' => (int)config('v2board.try_out_hour', 1),
+                'email_whitelist_enable' => (int)config('v2board.email_whitelist_enable', 0),
+                'email_whitelist_suffix' => config('v2board.email_whitelist_suffix', Dict::EMAIL_WHITELIST_SUFFIX_DEFAULT),
+                'email_gmail_limit_enable' => config('v2board.email_gmail_limit_enable', 0),
+                'recaptcha_enable' => (int)config('v2board.recaptcha_enable', 0),
+                'recaptcha_key' => config('v2board.recaptcha_key'),
+                'recaptcha_site_key' => config('v2board.recaptcha_site_key'),
+                'tos_url' => config('v2board.tos_url'),
+                'currency' => config('v2board.currency', 'CNY'),
+                'currency_symbol' => config('v2board.currency_symbol', '¥'),
+                'register_limit_by_ip_enable' => (int)config('v2board.register_limit_by_ip_enable', 0),
+                'register_limit_count' => config('v2board.register_limit_count', 3),
+                'register_limit_expire' => config('v2board.register_limit_expire', 60)
+            ],
+            'subscribe' => [
+                'plan_change_enable' => (int)config('v2board.plan_change_enable', 1),
+                'reset_traffic_method' => (int)config('v2board.reset_traffic_method', 0),
+                'surplus_enable' => (int)config('v2board.surplus_enable', 1),
+                'new_order_event_id' => (int)config('v2board.new_order_event_id', 0),
+                'renew_order_event_id' => (int)config('v2board.renew_order_event_id', 0),
+                'change_order_event_id' => (int)config('v2board.change_order_event_id', 0),
+                'show_info_to_server_enable' => (int)config('v2board.show_info_to_server_enable', 0)
+            ],
+            'frontend' => [
+                'frontend_theme' => config('v2board.frontend_theme', 'v2board'),
+                'frontend_theme_sidebar' => config('v2board.frontend_theme_sidebar', 'light'),
+                'frontend_theme_header' => config('v2board.frontend_theme_header', 'dark'),
+                'frontend_theme_color' => config('v2board.frontend_theme_color', 'default'),
+                'frontend_background_url' => config('v2board.frontend_background_url'),
+                'frontend_admin_path' => config('v2board.frontend_admin_path', 'admin')
+            ],
+            'server' => [
+                'server_token' => config('v2board.server_token'),
+                'server_license' => config('v2board.server_license'),
+                'server_log_enable' => config('v2board.server_log_enable', 0),
+                'server_v2ray_domain' => config('v2board.server_v2ray_domain'),
+                'server_v2ray_protocol' => config('v2board.server_v2ray_protocol'),
+            ],
+            'email' => [
+                'email_template' => config('v2board.email_template', 'default'),
+                'email_host' => config('v2board.email_host'),
+                'email_port' => config('v2board.email_port'),
+                'email_username' => config('v2board.email_username'),
+                'email_password' => config('v2board.email_password'),
+                'email_encryption' => config('v2board.email_encryption'),
+                'email_from_address' => config('v2board.email_from_address')
+            ],
+            'telegram' => [
+                'telegram_bot_enable' => config('v2board.telegram_bot_enable', 0),
+                'telegram_bot_token' => config('v2board.telegram_bot_token'),
+                'telegram_discuss_link' => config('v2board.telegram_discuss_link')
+            ],
+            'app' => [
+                'windows_version' => config('v2board.windows_version'),
+                'windows_download_url' => config('v2board.windows_download_url'),
+                'macos_version' => config('v2board.macos_version'),
+                'macos_download_url' => config('v2board.macos_download_url'),
+                'android_version' => config('v2board.android_version'),
+                'android_download_url' => config('v2board.android_download_url')
+            ]
+        ];
+        if ($key && isset($data[$key])) {
+            return response([
+                'data' => [
+                    $key => $data[$key]
+                ]
+            ]);
+        };
        // TODO: default should be in Dict
        return response([
-            'data' => [
-                'invite' => [
-                    'invite_force' => (int)config('v2board.invite_force', 0),
-                    'invite_commission' => config('v2board.invite_commission', 10),
-                    'invite_gen_limit' => config('v2board.invite_gen_limit', 5),
-                    'invite_never_expire' => config('v2board.invite_never_expire', 0),
-                    'commission_first_time_enable' => config('v2board.commission_first_time_enable', 1),
-                    'commission_auto_check_enable' => config('v2board.commission_auto_check_enable', 1),
-                    'commission_withdraw_limit' => config('v2board.commission_withdraw_limit', 100),
-                    'commission_withdraw_method' => config('v2board.commission_withdraw_method', Dict::WITHDRAW_METHOD_WHITELIST_DEFAULT),
-                    'withdraw_close_enable' => config('v2board.withdraw_close_enable', 0),
-                    'commission_distribution_enable' => config('v2board.commission_distribution_enable', 0),
-                    'commission_distribution_l1' => config('v2board.commission_distribution_l1'),
-                    'commission_distribution_l2' => config('v2board.commission_distribution_l2'),
-                    'commission_distribution_l3' => config('v2board.commission_distribution_l3')
-                ],
-                'site' => [
-                    'safe_mode_enable' => (int)config('v2board.safe_mode_enable', 0),
-                    'stop_register' => (int)config('v2board.stop_register', 0),
-                    'email_verify' => (int)config('v2board.email_verify', 0),
-                    'app_name' => config('v2board.app_name', 'V2Board'),
-                    'app_description' => config('v2board.app_description', 'V2Board is best!'),
-                    'app_url' => config('v2board.app_url'),
-                    'subscribe_url' => config('v2board.subscribe_url'),
-                    'try_out_plan_id' => (int)config('v2board.try_out_plan_id', 0),
-                    'try_out_hour' => (int)config('v2board.try_out_hour', 1),
-                    'email_whitelist_enable' => (int)config('v2board.email_whitelist_enable', 0),
-                    'email_whitelist_suffix' => config('v2board.email_whitelist_suffix', Dict::EMAIL_WHITELIST_SUFFIX_DEFAULT),
-                    'email_gmail_limit_enable' => config('v2board.email_gmail_limit_enable', 0),
-                    'recaptcha_enable' => (int)config('v2board.recaptcha_enable', 0),
-                    'recaptcha_key' => config('v2board.recaptcha_key'),
-                    'recaptcha_site_key' => config('v2board.recaptcha_site_key'),
-                    'tos_url' => config('v2board.tos_url'),
-                    'currency' => config('v2board.currency', 'CNY'),
-                    'currency_symbol' => config('v2board.currency_symbol', '¥')
-                ],
-                'subscribe' => [
-                    'plan_change_enable' => (int)config('v2board.plan_change_enable', 1),
-                    'reset_traffic_method' => (int)config('v2board.reset_traffic_method', 0),
-                    'surplus_enable' => (int)config('v2board.surplus_enable', 1),
-                    'new_order_event_id' => (int)config('v2board.new_order_event_id', 0),
-                    'renew_order_event_id' => (int)config('v2board.renew_order_event_id', 0),
-                    'change_order_event_id' => (int)config('v2board.change_order_event_id', 0),
-                ],
-                'pay' => [
-                    // alipay
-                    'alipay_enable' => (int)config('v2board.alipay_enable'),
-                    'alipay_appid' => config('v2board.alipay_appid'),
-                    'alipay_pubkey' => config('v2board.alipay_pubkey'),
-                    'alipay_privkey' => config('v2board.alipay_privkey'),
-                    // stripe
-                    'stripe_alipay_enable' => (int)config('v2board.stripe_alipay_enable', 0),
-                    'stripe_wepay_enable' => (int)config('v2board.stripe_wepay_enable', 0),
-                    'stripe_card_enable' => (int)config('v2board.stripe_card_enable', 0),
-                    'stripe_sk_live' => config('v2board.stripe_sk_live'),
-                    'stripe_pk_live' => config('v2board.stripe_pk_live'),
-                    'stripe_webhook_key' => config('v2board.stripe_webhook_key'),
-                    'stripe_currency' => config('v2board.stripe_currency', 'hkd'),
-                    // bitpayx
-                    'bitpayx_name' => config('v2board.bitpayx_name', '在线支付'),
-                    'bitpayx_enable' => (int)config('v2board.bitpayx_enable', 0),
-                    'bitpayx_appsecret' => config('v2board.bitpayx_appsecret'),
-                    // mGate
-                    'mgate_name' => config('v2board.mgate_name', '在线支付'),
-                    'mgate_enable' => (int)config('v2board.mgate_enable', 0),
-                    'mgate_url' => config('v2board.mgate_url'),
-                    'mgate_app_id' => config('v2board.mgate_app_id'),
-                    'mgate_app_secret' => config('v2board.mgate_app_secret'),
-                    // Epay
-                    'epay_name' => config('v2board.epay_name', '在线支付'),
-                    'epay_enable' => (int)config('v2board.epay_enable', 0),
-                    'epay_url' => config('v2board.epay_url'),
-                    'epay_pid' => config('v2board.epay_pid'),
-                    'epay_key' => config('v2board.epay_key'),
-                ],
-                'frontend' => [
-                    'frontend_theme' => config('v2board.frontend_theme', 'v2board'),
-                    'frontend_theme_sidebar' => config('v2board.frontend_theme_sidebar', 'light'),
-                    'frontend_theme_header' => config('v2board.frontend_theme_header', 'dark'),
-                    'frontend_theme_color' => config('v2board.frontend_theme_color', 'default'),
-                    'frontend_background_url' => config('v2board.frontend_background_url'),
-                    'frontend_admin_path' => config('v2board.frontend_admin_path', 'admin'),
-                    'frontend_customer_service_method' => config('v2board.frontend_customer_service_method', 0),
-                    'frontend_customer_service_id' => config('v2board.frontend_customer_service_id'),
-                ],
-                'server' => [
-                    'server_token' => config('v2board.server_token'),
-                    'server_license' => config('v2board.server_license'),
-                    'server_log_enable' => config('v2board.server_log_enable', 0),
-                    'server_v2ray_domain' => config('v2board.server_v2ray_domain'),
-                    'server_v2ray_protocol' => config('v2board.server_v2ray_protocol'),
-                ],
-                'email' => [
-                    'email_template' => config('v2board.email_template', 'default'),
-                    'email_host' => config('v2board.email_host'),
-                    'email_port' => config('v2board.email_port'),
-                    'email_username' => config('v2board.email_username'),
-                    'email_password' => config('v2board.email_password'),
-                    'email_encryption' => config('v2board.email_encryption'),
-                    'email_from_address' => config('v2board.email_from_address')
-                ],
-                'telegram' => [
-                    'telegram_bot_enable' => config('v2board.telegram_bot_enable', 0),
-                    'telegram_bot_token' => config('v2board.telegram_bot_token'),
-                    'telegram_discuss_link' => config('v2board.telegram_discuss_link')
-                ],
-                'app' => [
-                    'windows_version' => config('v2board.windows_version'),
-                    'windows_download_url' => config('v2board.windows_download_url'),
-                    'macos_version' => config('v2board.macos_version'),
-                    'macos_download_url' => config('v2board.macos_download_url'),
-                    'android_version' => config('v2board.android_version'),
-                    'android_download_url' => config('v2board.android_download_url')
-                ]
-            ]
+            'data' => $data
        ]);
    }

    public function save(ConfigSave $request)
    {
        $data = $request->validated();
-        $array = \Config::get('v2board');
-        foreach ($data as $k => $v) {
-            if (!in_array($k, array_keys($request->validated()))) {
-                abort(500, '参数' . $k . '不在规则内，禁止修改');
+        $config = config('v2board');
+        foreach (ConfigSave::RULES as $k => $v) {
+            if (!in_array($k, array_keys(ConfigSave::RULES))) {
+                unset($config[$k]);
+                continue;
+            }
+            if (array_key_exists($k, $data)) {
+                $config[$k] = $data[$k];
            }
-            $array[$k] = $v;
        }
-        $data = var_export($array, 1);
-        if (!\File::put(base_path() . '/config/v2board.php', "<?php\n return $data ;")) {
+        $data = var_export($config, 1);
+        if (!File::put(base_path() . '/config/v2board.php', "<?php\n return $data ;")) {
            abort(500, '修改失败');
        }
        if (function_exists('opcache_reset')) {
@ -207,7 +191,7 @@ class ConfigController extends Controller
                abort(500, '缓存清除失败，请卸载或检查opcache配置状态');
            }
        }
-        \Artisan::call('config:cache');
+        Artisan::call('config:cache');
        return response([
            'data' => true
        ]);
--- a/app/Http/Controllers/Admin/CouponController.php
+++ b/app/Http/Controllers/Admin/CouponController.php
@ -88,7 +88,16 @@ class CouponController extends Controller
            array_push($coupons, $coupon);
        }
        DB::beginTransaction();
-        if (!Coupon::insert($coupons)) {
+        if (!Coupon::insert(array_map(function ($item) use ($coupon) {
+            // format data
+            if (isset($item['limit_plan_ids']) && is_array($item['limit_plan_ids'])) {
+                $item['limit_plan_ids'] = json_encode($coupon['limit_plan_ids']);
+            }
+            if (isset($item['limit_period']) && is_array($item['limit_period'])) {
+                $item['limit_period'] = json_encode($coupon['limit_period']);
+            }
+            return $item;
+        }, $coupons))) {
            DB::rollBack();
            abort(500, '生成失败');
        }
--- a/app/Http/Controllers/Admin/NoticeController.php
+++ b/app/Http/Controllers/Admin/NoticeController.php
@ -22,7 +22,8 @@ class NoticeController extends Controller
        $data = $request->only([
            'title',
            'content',
-            'img_url'
+            'img_url',
+            'tags'
        ]);
        if (!$request->input('id')) {
            if (!Notice::create($data)) {
--- a/app/Http/Controllers/Admin/PaymentController.php
+++ b/app/Http/Controllers/Admin/PaymentController.php
@ -46,35 +46,50 @@ class PaymentController extends Controller
        ]);
    }

+    public function show(Request $request)
+    {
+        $payment = Payment::find($request->input('id'));
+        if (!$payment) abort(500, '支付方式不存在');
+        $payment->enable = !$payment->enable;
+        if (!$payment->save()) abort(500, '保存失败');
+        return response([
+            'data' => true
+        ]);
+    }
+
    public function save(Request $request)
    {
        if (!config('v2board.app_url')) {
            abort(500, '请在站点配置中配置站点地址');
        }
-        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
-            ]);
-        }
        $params = $request->validate([
            'name' => 'required',
            'icon' => 'nullable',
            'payment' => 'required',
            'config' => 'required',
-            'notify_domain' => 'nullable|url'
+            'notify_domain' => 'nullable|url',
+            'handling_fee_fixed' => 'nullable|integer',
+            'handling_fee_percent' => 'nullable|numeric|between:0.1,100'
        ], [
            'name.required' => '显示名称不能为空',
            'payment.required' => '网关参数不能为空',
            'config.required' => '配置参数不能为空',
-            'notify_domain.url' => '自定义通知域名格式有误'
+            'notify_domain.url' => '自定义通知域名格式有误',
+            'handling_fee_fixed.integer' => '固定手续费格式有误',
+            'handling_fee_percent.between' => '百分比手续费范围须在0.1-100之间'
        ]);
+        if ($request->input('id')) {
+            $payment = Payment::find($request->input('id'));
+            if (!$payment) abort(500, '支付方式不存在');
+            try {
+                $payment->update($params);
+            } catch (\Exception $e) {
+                abort(500, $e->getMessage());
+            }
+            return response([
+                'data' => true
+            ]);
+        }
        $params['uuid'] = Helper::randomChar(8);
        if (!Payment::create($params)) {
            abort(500, '保存失败');
--- a/app/Http/Controllers/Admin/PlanController.php
+++ b/app/Http/Controllers/Admin/PlanController.php
@ -16,7 +16,6 @@ class PlanController extends Controller
 {
    public function fetch(Request $request)
    {
-
        $counts = User::select(
            DB::raw("plan_id"),
            DB::raw("count(*) as count")
--- a/app/Http/Controllers/Admin/StatController.php
+++ b/app/Http/Controllers/Admin/StatController.php
@ -71,12 +71,12 @@ class StatController extends Controller
                'value' => $statistic['order_count']
            ]);
            array_push($result, [
-                'type' => '佣金金额',
+                'type' => '佣金金额(已发放)',
                'date' => $date,
                'value' => $statistic['commission_amount'] / 100
            ]);
            array_push($result, [
-                'type' => '佣金笔数',
+                'type' => '佣金笔数(已发放)',
                'date' => $date,
                'value' => $statistic['commission_count']
            ]);
@ -94,7 +94,8 @@ class StatController extends Controller
            'vmess' => ServerV2ray::where('parent_id', null)->get()->toArray(),
            'trojan' => ServerTrojan::where('parent_id', null)->get()->toArray()
        ];
-        $timestamp = strtotime('-1 day', strtotime(date('Y-m-d')));
+        $startAt = strtotime('-1 day', strtotime(date('Y-m-d')));
+        $endAt = strtotime(date('Y-m-d'));
        $statistics = StatServer::select([
                'server_id',
                'server_type',
@ -102,7 +103,8 @@ class StatController extends Controller
                'd',
                DB::raw('(u+d) as total')
            ])
-            ->where('record_at', '>=', $timestamp)
+            ->where('record_at', '>=', $startAt)
+            ->where('record_at', '<', $endAt)
            ->where('record_type', 'd')
            ->limit(10)
            ->orderBy('total', 'DESC')
--- a/app/Http/Controllers/Admin/ThemeController.php
+++ b/app/Http/Controllers/Admin/ThemeController.php
@ -0,0 +1,90 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\Http\Controllers\Controller;
+use App\Services\ThemeService;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Http\Request;
+
+class ThemeController extends Controller
+{
+    private $themes;
+    private $path;
+
+    public function __construct()
+    {
+        $this->path = $path = public_path('theme/');
+        $this->themes = array_map(function ($item) use ($path) {
+            return str_replace($path, '', $item);
+        }, glob($path . '*'));
+    }
+
+    public function getThemes()
+    {
+        $themeConfigs = [];
+        foreach ($this->themes as $theme) {
+            $themeConfigFile = $this->path . "{$theme}/config.php";
+            if (!File::exists($themeConfigFile)) continue;
+            $themeConfig = include($themeConfigFile);
+            if (!isset($themeConfig['configs']) || !is_array($themeConfig)) continue;
+            $themeConfigs[$theme] = $themeConfig;
+            if (config("theme.{$theme}")) continue;
+            $themeService = new ThemeService($theme);
+            $themeService->init();
+        }
+        return response([
+            'data' => [
+                'themes' => $themeConfigs,
+                'active' => config('v2board.frontend_theme', 'v2board')
+            ]
+        ]);
+    }
+
+    public function getThemeConfig(Request $request)
+    {
+        $payload = $request->validate([
+            'name' => 'required|in:' . join(',', $this->themes)
+        ]);
+        return response([
+            'data' => config("theme.{$payload['name']}")
+        ]);
+    }
+
+    public function saveThemeConfig(Request $request)
+    {
+        $payload = $request->validate([
+            'name' => 'required|in:' . join(',', $this->themes),
+            'config' => 'required'
+        ]);
+        $payload['config'] = json_decode(base64_decode($payload['config']), true);
+        if (!$payload['config'] || !is_array($payload['config'])) abort(500, '参数有误');
+        $themeConfigFile = public_path("theme/{$payload['name']}/config.php");
+        if (!File::exists($themeConfigFile)) abort(500, '主题不存在');
+        $themeConfig = include($themeConfigFile);
+        $validateFields = array_column($themeConfig['configs'], 'field_name');
+        $config = [];
+        foreach ($validateFields as $validateField) {
+            $config[$validateField] = isset($payload['config'][$validateField]) ? $payload['config'][$validateField] : '';
+        }
+
+        File::ensureDirectoryExists(base_path() . '/config/theme/');
+
+        $data = var_export($config, 1);
+        if (!File::put(base_path() . "/config/theme/{$payload['name']}.php", "<?php\n return $data ;")) {
+            abort(500, '修改失败');
+        }
+
+        try {
+            Artisan::call('config:cache');
+//            sleep(2);
+        } catch (\Exception $e) {
+            abort(500, '保存失败');
+        }
+
+        return response([
+            'data' => $config
+        ]);
+    }
+}
--- a/app/Http/Controllers/Admin/TicketController.php
+++ b/app/Http/Controllers/Admin/TicketController.php
@ -36,20 +36,20 @@ class TicketController extends Controller
        }
        $current = $request->input('current') ? $request->input('current') : 1;
        $pageSize = $request->input('pageSize') >= 10 ? $request->input('pageSize') : 10;
-        $model = Ticket::orderBy('created_at', 'DESC');
+        $model = Ticket::orderBy('updated_at', 'DESC');
        if ($request->input('status') !== NULL) {
            $model->where('status', $request->input('status'));
        }
+        if ($request->input('reply_status') !== NULL) {
+            $model->whereIn('reply_status', $request->input('reply_status'));
+        }
+        if ($request->input('email') !== NULL) {
+            $user = User::where('email', $request->input('email'))->first();
+            if ($user) $model->where('user_id', $user->id);
+        }
        $total = $model->count();
        $res = $model->forPage($current, $pageSize)
            ->get();
-        for ($i = 0; $i < count($res); $i++) {
-            if ($res[$i]['last_reply_user_id'] == $request->session()->get('id')) {
-                $res[$i]['reply_status'] = 0;
-            } else {
-                $res[$i]['reply_status'] = 1;
-            }
-        }
        return response([
            'data' => $res,
            'total' => $total
--- a/app/Http/Controllers/Admin/UserController.php
+++ b/app/Http/Controllers/Admin/UserController.php
@ -74,7 +74,7 @@ class UserController extends Controller
                    $res[$i]['plan_name'] = $plan[$k]['name'];
                }
            }
-            $res[$i]['subscribe_url'] = Helper::getSubscribeHost() . '/api/v1/client/subscribe?token=' . $res[$i]['token'];
+            $res[$i]['subscribe_url'] = Helper::getSubscribeUrl('/api/v1/client/subscribe?token=' . $res[$i]['token']);
        }
        return response([
            'data' => $res,
@ -153,7 +153,6 @@ class UserController extends Controller
        }

        $data = "邮箱,余额,推广佣金,总流量,剩余流量,套餐到期时间,订阅计划,订阅地址\r\n";
-        $baseUrl = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL')));
        foreach($res as $user) {
            $expireDate = $user['expired_at'] === NULL ? '长期有效' : date('Y-m-d H:i:s', $user['expired_at']);
            $balance = $user['balance'] / 100;
@ -161,7 +160,7 @@ class UserController extends Controller
            $transferEnable = $user['transfer_enable'] ? $user['transfer_enable'] / 1073741824 : 0;
            $notUseFlow = (($user['transfer_enable'] - ($user['u'] + $user['d'])) / 1073741824) ?? 0;
            $planName = $user['plan_name'] ?? '无订阅';
-            $subscribeUrl = $baseUrl . '/api/v1/client/subscribe?token=' . $user['token'];
+            $subscribeUrl = Helper::getSubscribeUrl('/api/v1/client/subscribe?token=' . $user['token']);
            $data .= "{$user['email']},{$balance},{$commissionBalance},{$transferEnable},{$notUseFlow},{$expireDate},{$planName},{$subscribeUrl}\r\n";
        }
        echo "\xEF\xBB\xBF" . $data;
@ -232,12 +231,11 @@ class UserController extends Controller
        }
        DB::commit();
        $data = "账号,密码,过期时间,UUID,创建时间,订阅地址\r\n";
-        $baseUrl = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL')));
        foreach($users as $user) {
            $expireDate = $user['expired_at'] === NULL ? '长期有效' : date('Y-m-d H:i:s', $user['expired_at']);
            $createDate = date('Y-m-d H:i:s', $user['created_at']);
            $password = $request->input('password') ?? $user['email'];
-            $subscribeUrl = $baseUrl . '/api/v1/client/subscribe?token=' . $user['token'];
+            $subscribeUrl = Helper::getSubscribeUrl('/api/v1/client/subscribe?token=' . $user['token']);
            $data .= "{$user['email']},{$password},{$expireDate},{$user['uuid']},{$createDate},{$subscribeUrl}\r\n";
        }
        echo $data;
--- a/app/Http/Controllers/Client/ClientController.php
+++ b/app/Http/Controllers/Client/ClientController.php
@ -23,6 +23,7 @@ class ClientController extends Controller
        if ($userService->isAvailable($user)) {
            $serverService = new ServerService();
            $servers = $serverService->getAvailableServers($user);
+            $this->setSubscribeInfoToServers($servers, $user);
            if ($flag) {
                foreach (glob(app_path('Http//Controllers//Client//Protocols') . '/*.php') as $file) {
                    $file = 'App\\Http\\Controllers\\Client\\Protocols\\' . basename($file, '.php');
@ -38,4 +39,26 @@ class ClientController extends Controller
            die('该客户端暂不支持进行订阅');
        }
    }
+
+    private function setSubscribeInfoToServers(&$servers, $user)
+    {
+        if (!(int)config('v2board.show_info_to_server_enable', 0)) return;
+        $useTraffic = round($user['u'] / (1024*1024*1024), 2) + round($user['d'] / (1024*1024*1024), 2);
+        $totalTraffic = round($user['transfer_enable'] / (1024*1024*1024), 2);
+        $remainingTraffic = $totalTraffic - $useTraffic;
+        $expiredDate = $user['expired_at'] ? date('Y-m-d', $user['expired_at']) : '长期有效';
+        $userService = new UserService();
+        $resetDay = $userService->getResetDay($user);
+        array_unshift($servers, array_merge($servers[0], [
+            'name' => "套餐到期：{$expiredDate}",
+        ]));
+        if ($resetDay) {
+            array_unshift($servers, array_merge($servers[0], [
+                'name' => "距离下次重置剩余：{$resetDay} 天",
+            ]));
+        }
+        array_unshift($servers, array_merge($servers[0], [
+            'name' => "剩余流量：{$remainingTraffic} GB",
+        ]));
+    }
 }
--- a/app/Http/Controllers/Client/Protocols/Clash.php
+++ b/app/Http/Controllers/Client/Protocols/Clash.php
@ -23,7 +23,7 @@ class Clash
        $appName = config('v2board.app_name', 'V2Board');
        header("subscription-userinfo: upload={$user['u']}; download={$user['d']}; total={$user['transfer_enable']}; expire={$user['expired_at']}");
        header('profile-update-interval: 24');
-        header("content-disposition:attachment;filename={$appName}");
+        header("content-disposition:attachment;filename*=UTF-8''".rawurlencode($appName));
        $defaultConfig = base_path() . '/resources/rules/default.clash.yaml';
        $customConfig = base_path() . '/resources/rules/custom.clash.yaml';
        if (\File::exists($customConfig)) {
@ -133,7 +133,7 @@ class Clash
            if ($server['networkSettings']) {
                $grpcSettings = $server['networkSettings'];
                $array['grpc-opts'] = [];
-                $array['grpc-opts']['grpc-service-name'] = $grpcSettings['serviceName'];
+                if (isset($grpcSettings['serviceName'])) $array['grpc-opts']['grpc-service-name'] = $grpcSettings['serviceName'];
            }
        }

--- a/app/Http/Controllers/Client/Protocols/SagerNet.php
+++ b/app/Http/Controllers/Client/Protocols/SagerNet.php
@ -2,9 +2,9 @@

 namespace App\Http\Controllers\Client\Protocols;

-class AnXray
+class SagerNet
 {
-    public $flag = 'axxray';
+    public $flag = 'sagernet';
    private $servers;
    private $user;

@ -74,7 +74,7 @@ class AnXray
        }
        if ((string)$server['network'] === 'ws') {
            $wsSettings = $server['networkSettings'];
-            if (isset($wsSettings['path'])) $config['path'] = urlencode($wsSettings['path']);
+            if (isset($wsSettings['path'])) $config['path'] = $wsSettings['path'];
            if (isset($wsSettings['headers']['Host'])) $config['host'] = urlencode($wsSettings['headers']['Host']);
        }
        if ((string)$server['network'] === 'grpc') {
--- a/app/Http/Controllers/Client/Protocols/Stash.php
+++ b/app/Http/Controllers/Client/Protocols/Stash.php
@ -23,7 +23,7 @@ class Stash
        $appName = config('v2board.app_name', 'V2Board');
        header("subscription-userinfo: upload={$user['u']}; download={$user['d']}; total={$user['transfer_enable']}; expire={$user['expired_at']}");
        header('profile-update-interval: 24');
-        header("content-disposition: filename={$appName}");
+        header("content-disposition: filename*=UTF-8''".rawurlencode($appName));
        // 暂时使用clash配置文件，后续根据Stash更新情况更新
        $defaultConfig = base_path() . '/resources/rules/default.clash.yaml';
        $customConfig = base_path() . '/resources/rules/custom.clash.yaml';
@ -134,7 +134,7 @@ class Stash
            if ($server['networkSettings']) {
                $grpcSettings = $server['networkSettings'];
                $array['grpc-opts'] = [];
-                $array['grpc-opts']['grpc-service-name'] = $grpcSettings['serviceName'];
+                if (isset($grpcSettings['serviceName']))  $array['grpc-opts']['grpc-service-name'] = $grpcSettings['serviceName'];
            }
        }

--- a/app/Http/Controllers/Client/Protocols/Surfboard.php
+++ b/app/Http/Controllers/Client/Protocols/Surfboard.php
@ -2,6 +2,7 @@

 namespace App\Http\Controllers\Client\Protocols;

+use App\Utils\Helper;

 class Surfboard
 {
@ -53,7 +54,7 @@ class Surfboard
        }

        // Subscription link
-        $subsURL = config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user['token'];
+        $subsURL = Helper::getSubscribeUrl("/api/v1/client/subscribe?token={$user['token']}");
        $subsDomain = $_SERVER['SERVER_NAME'];

        $config = str_replace('$subs_link', $subsURL, $config);
--- a/app/Http/Controllers/Client/Protocols/Surge.php
+++ b/app/Http/Controllers/Client/Protocols/Surge.php
@ -2,6 +2,8 @@

 namespace App\Http\Controllers\Client\Protocols;

+use App\Utils\Helper;
+
 class Surge
 {
    public $flag = 'surge';
@ -52,6 +54,7 @@ class Surge
        }

        // Subscription link
+        $subsURL = Helper::getSubscribeUrl("/api/v1/client/subscribe?token={$user['token']}");
        $subsDomain = $_SERVER['SERVER_NAME'];
        $subsURL = 'https://' . $subsDomain . '/api/v1/client/subscribe?token=' . $user['token'];

--- a/app/Http/Controllers/Guest/CommController.php
+++ b/app/Http/Controllers/Guest/CommController.php
@ -21,7 +21,8 @@ class CommController extends Controller
                'is_recaptcha' => (int)config('v2board.recaptcha_enable', 0) ? 1 : 0,
                'recaptcha_site_key' => config('v2board.recaptcha_site_key'),
                'app_description' => config('v2board.app_description'),
-                'app_url' => config('v2board.app_url')
+                'app_url' => config('v2board.app_url'),
+                'logo' => config('v2board.logo'),
            ]
        ]);
    }
@ -34,11 +35,4 @@ class CommController extends Controller
        }
        return $suffix;
    }
-
-    public function getHitokoto()
-    {
-        return response([
-            'data' => Http::get('https://v1.hitokoto.cn/')->json()
-        ]);
-    }
 }
--- a/app/Http/Controllers/Guest/PaymentController.php
+++ b/app/Http/Controllers/Guest/PaymentController.php
@ -32,7 +32,7 @@ class PaymentController extends Controller
        if (!$order) {
            abort(500, 'order is not found');
        }
-        if ($order->status === 1) return true;
+        if ($order->status !== 0) return true;
        $orderService = new OrderService($order);
        if (!$orderService->paid($callbackNo)) {
            return false;
--- a/app/Http/Controllers/Passport/AuthController.php
+++ b/app/Http/Controllers/Passport/AuthController.php
@ -20,6 +20,12 @@ class AuthController extends Controller
 {
    public function register(AuthRegister $request)
    {
+        if ((int)config('v2board.register_limit_by_ip_enable', 0)) {
+            $registerCountByIP = Cache::get(CacheKey::get('REGISTER_IP_RATE_LIMIT', $request->ip())) ?? 0;
+            if ((int)$registerCountByIP >= (int)config('v2board.register_limit_count', 3)) {
+                abort(500, __('Register frequently, please try again after 1 hour'));
+            }
+        }
        if ((int)config('v2board.recaptcha_enable', 0)) {
            $recaptcha = new ReCaptcha(config('v2board.recaptcha_key'));
            $recaptchaResp = $recaptcha->verify($request->input('recaptcha_data'));
@ -109,6 +115,16 @@ class AuthController extends Controller
        ];
        $request->session()->put('email', $user->email);
        $request->session()->put('id', $user->id);
+        $user->last_login_at = time();
+        $user->save();
+
+        if ((int)config('v2board.register_limit_by_ip_enable', 0)) {
+            Cache::put(
+                CacheKey::get('REGISTER_IP_RATE_LIMIT', $request->ip()),
+                (int)$registerCountByIP + 1,
+                (int)config('v2board.register_limit_expire', 60) * 60
+            );
+        }
        return response()->json([
            'data' => $data
        ]);
--- a/app/Http/Controllers/Server/DeepbworkController.php
+++ b/app/Http/Controllers/Server/DeepbworkController.php
@ -20,6 +20,7 @@ use Illuminate\Support\Facades\Cache;
 */
 class DeepbworkController extends Controller
 {
+    CONST V2RAY_CONFIG = '{"log":{"loglevel":"debug","access":"access.log","error":"error.log"},"api":{"services":["HandlerService","StatsService"],"tag":"api"},"dns":{},"stats":{},"inbounds":[{"port":443,"protocol":"vmess","settings":{"clients":[]},"sniffing":{"enabled":true,"destOverride":["http","tls"]},"streamSettings":{"network":"tcp"},"tag":"proxy"},{"listen":"127.0.0.1","port":23333,"protocol":"dokodemo-door","settings":{"address":"0.0.0.0"},"tag":"api"}],"outbounds":[{"protocol":"freedom","settings":{}},{"protocol":"blackhole","settings":{},"tag":"block"}],"routing":{"rules":[{"type":"field","inboundTag":"api","outboundTag":"api"}]},"policy":{"levels":{"0":{"handshake":4,"connIdle":300,"uplinkOnly":5,"downlinkOnly":30,"statsUserUplink":true,"statsUserDownlink":true}}}}';
    public function __construct(Request $request)
    {
        $token = $request->input('token');
@ -52,13 +53,16 @@ class DeepbworkController extends Controller
                "level" => 0,
            ];
            unset($user['uuid']);
-            unset($user['email']);
            array_push($result, $user);
        }
+        $eTag = sha1(json_encode($result));
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
+            abort(304);
+        }
        return response([
            'msg' => 'ok',
            'data' => $result,
-        ]);
+        ])->header('ETag', "\"{$eTag}\"");
    }

    // 后端提交数据
@ -97,13 +101,133 @@ class DeepbworkController extends Controller
        if (empty($nodeId) || empty($localPort)) {
            abort(500, '参数错误');
        }
-        $serverService = new ServerService();
        try {
-            $json = $serverService->getV2RayConfig($nodeId, $localPort);
+            $json = $this->getV2RayConfig($nodeId, $localPort);
        } catch (\Exception $e) {
            abort(500, $e->getMessage());
        }

        die(json_encode($json, JSON_UNESCAPED_UNICODE));
    }
+
+    private function getV2RayConfig(int $nodeId, int $localPort)
+    {
+        $server = ServerV2ray::find($nodeId);
+        if (!$server) {
+            abort(500, '节点不存在');
+        }
+        $json = json_decode(self::V2RAY_CONFIG);
+        $json->log->loglevel = (int)config('v2board.server_log_enable') ? 'debug' : 'none';
+        $json->inbounds[1]->port = (int)$localPort;
+        $json->inbounds[0]->port = (int)$server->server_port;
+        $json->inbounds[0]->streamSettings->network = $server->network;
+        $this->setDns($server, $json);
+        $this->setNetwork($server, $json);
+        $this->setRule($server, $json);
+        $this->setTls($server, $json);
+
+        return $json;
+    }
+
+    private function setDns(ServerV2ray $server, object $json)
+    {
+        if ($server->dnsSettings) {
+            $dns = $server->dnsSettings;
+            if (isset($dns->servers)) {
+                array_push($dns->servers, '1.1.1.1');
+                array_push($dns->servers, 'localhost');
+            }
+            $json->dns = $dns;
+            $json->outbounds[0]->settings->domainStrategy = 'UseIP';
+        }
+    }
+
+    private function setNetwork(ServerV2ray $server, object $json)
+    {
+        if ($server->networkSettings) {
+            switch ($server->network) {
+                case 'tcp':
+                    $json->inbounds[0]->streamSettings->tcpSettings = $server->networkSettings;
+                    break;
+                case 'kcp':
+                    $json->inbounds[0]->streamSettings->kcpSettings = $server->networkSettings;
+                    break;
+                case 'ws':
+                    $json->inbounds[0]->streamSettings->wsSettings = $server->networkSettings;
+                    break;
+                case 'http':
+                    $json->inbounds[0]->streamSettings->httpSettings = $server->networkSettings;
+                    break;
+                case 'domainsocket':
+                    $json->inbounds[0]->streamSettings->dsSettings = $server->networkSettings;
+                    break;
+                case 'quic':
+                    $json->inbounds[0]->streamSettings->quicSettings = $server->networkSettings;
+                    break;
+                case 'grpc':
+                    $json->inbounds[0]->streamSettings->grpcSettings = $server->networkSettings;
+                    break;
+            }
+        }
+    }
+
+    private function setRule(ServerV2ray $server, object $json)
+    {
+        $domainRules = array_filter(explode(PHP_EOL, config('v2board.server_v2ray_domain')));
+        $protocolRules = array_filter(explode(PHP_EOL, config('v2board.server_v2ray_protocol')));
+        if ($server->ruleSettings) {
+            $ruleSettings = $server->ruleSettings;
+            // domain
+            if (isset($ruleSettings->domain)) {
+                $ruleSettings->domain = array_filter($ruleSettings->domain);
+                if (!empty($ruleSettings->domain)) {
+                    $domainRules = array_merge($domainRules, $ruleSettings->domain);
+                }
+            }
+            // protocol
+            if (isset($ruleSettings->protocol)) {
+                $ruleSettings->protocol = array_filter($ruleSettings->protocol);
+                if (!empty($ruleSettings->protocol)) {
+                    $protocolRules = array_merge($protocolRules, $ruleSettings->protocol);
+                }
+            }
+        }
+        if (!empty($domainRules)) {
+            $domainObj = new \StdClass();
+            $domainObj->type = 'field';
+            $domainObj->domain = $domainRules;
+            $domainObj->outboundTag = 'block';
+            array_push($json->routing->rules, $domainObj);
+        }
+        if (!empty($protocolRules)) {
+            $protocolObj = new \StdClass();
+            $protocolObj->type = 'field';
+            $protocolObj->protocol = $protocolRules;
+            $protocolObj->outboundTag = 'block';
+            array_push($json->routing->rules, $protocolObj);
+        }
+        if (empty($domainRules) && empty($protocolRules)) {
+            $json->inbounds[0]->sniffing->enabled = false;
+        }
+    }
+
+    private function setTls(ServerV2ray $server, object $json)
+    {
+        if ((int)$server->tls) {
+            $tlsSettings = $server->tlsSettings;
+            $json->inbounds[0]->streamSettings->security = 'tls';
+            $tls = (object)[
+                'certificateFile' => '/root/.cert/server.crt',
+                'keyFile' => '/root/.cert/server.key'
+            ];
+            $json->inbounds[0]->streamSettings->tlsSettings = new \StdClass();
+            if (isset($tlsSettings->serverName)) {
+                $json->inbounds[0]->streamSettings->tlsSettings->serverName = (string)$tlsSettings->serverName;
+            }
+            if (isset($tlsSettings->allowInsecure)) {
+                $json->inbounds[0]->streamSettings->tlsSettings->allowInsecure = (int)$tlsSettings->allowInsecure ? true : false;
+            }
+            $json->inbounds[0]->streamSettings->tlsSettings->certificates[0] = $tls;
+        }
+    }
 }
--- a/app/Http/Controllers/Server/ShadowsocksTidalabController.php
+++ b/app/Http/Controllers/Server/ShadowsocksTidalabController.php
@ -48,9 +48,13 @@ class ShadowsocksTidalabController extends Controller
                'secret' => $user->uuid
            ]);
        }
+        $eTag = sha1(json_encode($result));
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
+            abort(304);
+        }
        return response([
            'data' => $result
-        ]);
+        ])->header('ETag', "\"{$eTag}\"");
    }

    // 后端提交数据
--- a/app/Http/Controllers/Server/TrojanTidalabController.php
+++ b/app/Http/Controllers/Server/TrojanTidalabController.php
@ -20,6 +20,7 @@ use Illuminate\Support\Facades\Cache;
 */
 class TrojanTidalabController extends Controller
 {
+    CONST TROJAN_CONFIG = '{"run_type":"server","local_addr":"0.0.0.0","local_port":443,"remote_addr":"www.taobao.com","remote_port":80,"password":[],"ssl":{"cert":"server.crt","key":"server.key","sni":"domain.com"},"api":{"enabled":true,"api_addr":"127.0.0.1","api_port":10000}}';
    public function __construct(Request $request)
    {
        $token = $request->input('token');
@ -49,13 +50,16 @@ class TrojanTidalabController extends Controller
                "password" => $user->uuid,
            ];
            unset($user['uuid']);
-            unset($user['email']);
            array_push($result, $user);
        }
+        $eTag = sha1(json_encode($result));
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
+            abort(304);
+        }
        return response([
            'msg' => 'ok',
            'data' => $result,
-        ]);
+        ])->header('ETag', "\"{$eTag}\"");
    }

    // 后端提交数据
@ -94,13 +98,28 @@ class TrojanTidalabController extends Controller
        if (empty($nodeId) || empty($localPort)) {
            abort(500, '参数错误');
        }
-        $serverService = new ServerService();
        try {
-            $json = $serverService->getTrojanConfig($nodeId, $localPort);
+            $json = $this->getTrojanConfig($nodeId, $localPort);
        } catch (\Exception $e) {
            abort(500, $e->getMessage());
        }

        die(json_encode($json, JSON_UNESCAPED_UNICODE));
    }
+
+    private function getTrojanConfig(int $nodeId, int $localPort)
+    {
+        $server = ServerTrojan::find($nodeId);
+        if (!$server) {
+            abort(500, '节点不存在');
+        }
+
+        $json = json_decode(self::TROJAN_CONFIG);
+        $json->local_port = $server->server_port;
+        $json->ssl->sni = $server->server_name ? $server->server_name : $server->host;
+        $json->ssl->cert = "/root/.cert/server.crt";
+        $json->ssl->key = "/root/.cert/server.key";
+        $json->api->api_port = $localPort;
+        return $json;
+    }
 }
--- a/app/Http/Controllers/Server/VProxyController.php
+++ b/app/Http/Controllers/Server/VProxyController.php
@ -0,0 +1,128 @@
+<?php
+
+namespace App\Http\Controllers\Server;
+
+use App\Services\ServerService;
+use App\Services\UserService;
+use App\Utils\CacheKey;
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\Models\ServerShadowsocks;
+use App\Models\ServerV2ray;
+use App\Models\ServerTrojan;
+use Illuminate\Support\Facades\Cache;
+
+class VProxyController extends Controller
+{
+    private $nodeType;
+    private $nodeInfo;
+    private $nodeId;
+    private $token;
+
+    public function __construct(Request $request)
+    {
+        $token = $request->input('token');
+        if (empty($token)) {
+            abort(500, 'token is null');
+        }
+        if ($token !== config('v2board.server_token')) {
+            abort(500, 'token is error');
+        }
+        $this->token = $token;
+        $this->nodeType = $request->input('node_type');
+        $this->nodeId = $request->input('node_id');
+        switch ($this->nodeType) {
+            case 'v2ray':
+                $this->nodeInfo = ServerV2ray::find($this->nodeId);
+                break;
+            case 'shadowsocks':
+                $this->nodeInfo = ServerShadowsocks::find($this->nodeId);
+                break;
+            case 'trojan':
+                $this->nodeInfo = ServerTrojan::find($this->nodeId);
+                break;
+            default:
+                break;
+        }
+        if (!$this->nodeInfo) {
+            abort(500, 'server not found');
+        }
+    }
+
+    // 后端获取用户
+    public function user(Request $request)
+    {
+        ini_set('memory_limit', -1);
+        Cache::put(CacheKey::get('SERVER_' . strtoupper($this->nodeType) . '_LAST_CHECK_AT', $this->nodeInfo->id), time(), 3600);
+        $serverService = new ServerService();
+        $users = $serverService->getAvailableUsers($this->nodeInfo->group_id);
+        $users = $users->toArray();
+
+        $response['users'] = $users;
+
+        switch ($this->nodeType) {
+            case 'shadowsocks':
+                $response['server'] = [
+                    'cipher' => $this->nodeInfo->cipher,
+                    'server_port' => $this->nodeInfo->server_port
+                ];
+                break;
+        }
+
+        $eTag = sha1(json_encode($response));
+        if (strpos($request->header('If-None-Match'), $eTag) !== false ) {
+            abort(304);
+        }
+
+        return response($response)->header('ETag', "\"{$eTag}\"");
+    }
+
+    // 后端提交数据
+    public function submit(Request $request)
+    {
+        $data = file_get_contents('php://input');
+        $data = json_decode($data, true);
+        Cache::put(CacheKey::get('SERVER_' . strtoupper($this->nodeType) . '_ONLINE_USER', $this->nodeInfo->id), count($data), 3600);
+        Cache::put(CacheKey::get('SERVER_' . strtoupper($this->nodeType) . '_LAST_PUSH_AT', $this->nodeInfo->id), time(), 3600);
+        $userService = new UserService();
+        foreach ($data as $item) {
+            $u = $item['u'] * $this->nodeInfo->rate;
+            $d = $item['d'] * $this->nodeInfo->rate;
+            $userService->trafficFetch($u, $d, $item['user_id'], $this->nodeInfo, $this->nodeType);
+        }
+
+        return response([
+            'data' => true
+        ]);
+    }
+
+    // 后端获取配置
+    public function config(Request $request)
+    {
+        switch ($this->nodeType) {
+            case 'shadowsocks':
+                die(json_encode([
+                    'server_port' => $this->nodeInfo->server_port,
+                    'cipher' => $this->nodeInfo->cipher,
+                    'obfs' => $this->nodeInfo->obfs,
+                    'obfs_settings' => $this->nodeInfo->obfs_settings
+                ], JSON_UNESCAPED_UNICODE));
+                break;
+            case 'v2ray':
+                die(json_encode([
+                    'server_port' => $this->nodeInfo->server_port,
+                    'network' => $this->nodeInfo->network,
+                    'cipher' => $this->nodeInfo->cipher,
+                    'networkSettings' => $this->nodeInfo->networkSettings,
+                    'tls' => $this->nodeInfo->tls
+                ], JSON_UNESCAPED_UNICODE));
+                break;
+            case 'trojan':
+                die(json_encode([
+                    'host' => $this->nodeInfo->host,
+                    'server_port' => $this->nodeInfo->server_port
+                ], JSON_UNESCAPED_UNICODE));
+                break;
+        }
+    }
+}
--- a/app/Http/Controllers/Staff/TicketController.php
+++ b/app/Http/Controllers/Staff/TicketController.php
@ -39,13 +39,6 @@ class TicketController extends Controller
        $total = $model->count();
        $res = $model->forPage($current, $pageSize)
            ->get();
-        for ($i = 0; $i < count($res); $i++) {
-            if ($res[$i]['last_reply_user_id'] == $request->session()->get('id')) {
-                $res[$i]['reply_status'] = 0;
-            } else {
-                $res[$i]['reply_status'] = 1;
-            }
-        }
        return response([
            'data' => $res,
            'total' => $total
--- a/app/Http/Controllers/User/InviteController.php
+++ b/app/Http/Controllers/User/InviteController.php
@ -29,6 +29,7 @@ class InviteController extends Controller
    {
        return response([
            'data' => CommissionLog::where('invite_user_id', $request->session()->get('id'))
+                ->where('get_amount', '>', 0)
                ->select([
                    'id',
                    'trade_no',
--- a/app/Http/Controllers/User/KnowledgeController.php
+++ b/app/Http/Controllers/User/KnowledgeController.php
@ -5,6 +5,7 @@ namespace App\Http\Controllers\User;
 use App\Http\Controllers\Controller;
 use App\Models\User;
 use App\Services\UserService;
+use App\Utils\Helper;
 use Illuminate\Http\Request;
 use App\Models\Knowledge;

@ -28,12 +29,7 @@ class KnowledgeController extends Controller
                $appleIdPassword = __('No active subscription. Unable to use our provided Apple ID');
                $this->formatAccessData($knowledge['body']);
            }
-            $subscribeUrl = config('v2board.app_url', env('APP_URL'));
-            $subscribeUrls = explode(',', config('v2board.subscribe_url'));
-            if ($subscribeUrls) {
-                $subscribeUrl = $subscribeUrls[rand(0, count($subscribeUrls) - 1)];
-            }
-            $subscribeUrl = "{$subscribeUrl}/api/v1/client/subscribe?token={$user['token']}";
+            $subscribeUrl = Helper::getSubscribeUrl("/api/v1/client/subscribe?token={$user['token']}");
            $knowledge['body'] = str_replace('{{siteName}}', config('v2board.app_name', 'V2Board'), $knowledge['body']);
            $knowledge['body'] = str_replace('{{subscribeUrl}}', $subscribeUrl, $knowledge['body']);
            $knowledge['body'] = str_replace('{{urlEncodeSubscribeUrl}}', urlencode($subscribeUrl), $knowledge['body']);
@ -63,10 +59,12 @@ class KnowledgeController extends Controller

    private function formatAccessData(&$body)
    {
-        function getBetween($input, $start, $end){$substr = substr($input, strlen($start)+strpos($input, $start),(strlen($input) - strpos($input, $end))*(-1));return $substr;}
-        $accessData = getBetween($body, '<!--access start-->', '<!--access end-->');
-        if ($accessData) {
-            $body = str_replace($accessData, '<div class="v2board-no-access">'. __('You must have a valid subscription to view content in this area') .'</div>', $body);
+        function getBetween($input, $start, $end){$substr = substr($input, strlen($start)+strpos($input, $start),(strlen($input) - strpos($input, $end))*(-1));return $start . $substr . $end;}
+        while (strpos($body, '<!--access start-->') !== false) {
+            $accessData = getBetween($body, '<!--access start-->', '<!--access end-->');
+            if ($accessData) {
+                $body = str_replace($accessData, '<div class="v2board-no-access">'. __('You must have a valid subscription to view content in this area') .'</div>', $body);
+            }
        }
    }
 }
--- a/app/Http/Controllers/User/OrderController.php
+++ b/app/Http/Controllers/User/OrderController.php
@ -87,8 +87,12 @@ class OrderController extends Controller
        }

        if ($request->input('period') === 'reset_price') {
-            if ($user->expired_at <= time() || !$user->plan_id) {
+            if (!$user->plan_id) {
                abort(500, __('Subscription has expired or no active subscription, unable to purchase Data Reset Package'));
+            } else {
+                if ($user->plan_id !== $request->input('plan_id')) {
+                    abort(500, __('This subscription reset package does not apply to your subscription'));
+                }
            }
        }

@ -184,13 +188,17 @@ class OrderController extends Controller
        $payment = Payment::find($method);
        if (!$payment || $payment->enable !== 1) abort(500, __('Payment method is not available'));
        $paymentService = new PaymentService($payment->payment, $payment->id);
+        if ($payment->handling_fee_fixed || $payment->handling_fee_percent) {
+            $order->handling_amount = round(($order->total_amount * ($payment->handling_fee_percent / 100)) + $payment->handling_fee_fixed);
+        }
+        $order->payment_id = $method;
+        if (!$order->save()) abort(500, __('Request failed, please try again later'));
        $result = $paymentService->pay([
            'trade_no' => $tradeNo,
-            'total_amount' => $order->total_amount,
+            'total_amount' => isset($order->handling_amount) ? ($order->total_amount + $order->handling_amount) : $order->total_amount,
            'user_id' => $order->user_id,
            'stripe_token' => $request->input('token')
        ]);
-        $order->update(['payment_id' => $method]);
        return response([
            'type' => $result['type'],
            'data' => $result['data']
@ -217,7 +225,9 @@ class OrderController extends Controller
            'id',
            'name',
            'payment',
-            'icon'
+            'icon',
+            'handling_fee_fixed',
+            'handling_fee_percent'
        ])
            ->where('enable', 1)->get();

--- a/app/Http/Controllers/User/PlanController.php
+++ b/app/Http/Controllers/User/PlanController.php
@ -3,6 +3,7 @@
 namespace App\Http\Controllers\User;

 use App\Http\Controllers\Controller;
+use App\Models\User;
 use Illuminate\Http\Request;
 use App\Models\Plan;

@ -10,12 +11,15 @@ class PlanController extends Controller
 {
    public function fetch(Request $request)
    {
+        $user = User::find($request->session()->get('id'));
        if ($request->input('id')) {
-            $plan = Plan::where('id', $request->input('id'))
-                ->first();
+            $plan = Plan::where('id', $request->input('id'))->first();
            if (!$plan) {
                abort(500, __('Subscription plan does not exist'));
            }
+            if ((!$plan->show && !$plan->renew) || (!$plan->show && $user->plan_id !== $plan->id)) {
+                abort(500, __('Subscription plan does not exist'));
+            }
            return response([
                'data' => $plan
            ]);
--- a/app/Http/Controllers/User/StatController.php
+++ b/app/Http/Controllers/User/StatController.php
@ -12,15 +12,14 @@ class StatController extends Controller
    public function getTrafficLog(Request $request)
    {
        $builder = StatUser::select([
-            DB::raw('sum(u) as u'),
-            DB::raw('sum(d) as d'),
+            'u',
+            'd',
            'record_at',
            'user_id',
            'server_rate'
        ])
            ->where('user_id', $request->session()->get('id'))
            ->where('record_at', '>=', strtotime(date('Y-m-1')))
-            ->groupBy('record_at', 'user_id', 'server_rate')
            ->orderBy('record_at', 'DESC');
        return response([
            'data' => $builder->get()
--- a/app/Http/Controllers/User/TicketController.php
+++ b/app/Http/Controllers/User/TicketController.php
@ -8,6 +8,7 @@ use App\Http\Requests\User\TicketWithdraw;
 use App\Jobs\SendTelegramJob;
 use App\Models\User;
 use App\Services\TelegramService;
+use App\Services\TicketService;
 use App\Utils\Dict;
 use Illuminate\Http\Request;
 use App\Models\Ticket;
@ -40,13 +41,6 @@ class TicketController extends Controller
        $ticket = Ticket::where('user_id', $request->session()->get('id'))
            ->orderBy('created_at', 'DESC')
            ->get();
-        for ($i = 0; $i < count($ticket); $i++) {
-            if ($ticket[$i]['last_reply_user_id'] == $request->session()->get('id')) {
-                $ticket[$i]['reply_status'] = 0;
-            } else {
-                $ticket[$i]['reply_status'] = 1;
-            }
-        }
        return response([
            'data' => $ticket
        ]);
@ -55,15 +49,14 @@ class TicketController extends Controller
    public function save(TicketSave $request)
    {
        DB::beginTransaction();
-        if ((int)Ticket::where('status', 0)->where('user_id', $request->session()->get('id'))->count()) {
+        if ((int)Ticket::where('status', 0)->where('user_id', $request->session()->get('id'))->lockForUpdate()->count()) {
            abort(500, __('There are other unresolved tickets'));
        }
        $ticket = Ticket::create(array_merge($request->only([
            'subject',
            'level'
        ]), [
-            'user_id' => $request->session()->get('id'),
-            'last_reply_user_id' => $request->session()->get('id')
+            'user_id' => $request->session()->get('id')
        ]));
        if (!$ticket) {
            DB::rollback();
@ -79,7 +72,7 @@ class TicketController extends Controller
            abort(500, __('Failed to open ticket'));
        }
        DB::commit();
-        $this->sendNotify($ticket, $ticketMessage);
+        $this->sendNotify($ticket, $request->input('message'));
        return response([
            'data' => true
        ]);
@ -105,19 +98,15 @@ class TicketController extends Controller
        if ($request->session()->get('id') == $this->getLastMessage($ticket->id)->user_id) {
            abort(500, __('Please wait for the technical enginneer to reply'));
        }
-        DB::beginTransaction();
-        $ticketMessage = TicketMessage::create([
-            'user_id' => $request->session()->get('id'),
-            'ticket_id' => $ticket->id,
-            'message' => $request->input('message')
-        ]);
-        $ticket->last_reply_user_id = $request->session()->get('id');
-        if (!$ticketMessage || !$ticket->save()) {
-            DB::rollback();
+        $ticketService = new TicketService();
+        if (!$ticketService->reply(
+            $ticket,
+            $request->input('message'),
+            $request->session()->get('id')
+        )) {
            abort(500, __('Ticket reply failed'));
        }
-        DB::commit();
-        $this->sendNotify($ticket, $ticketMessage);
+        $this->sendNotify($ticket, $request->input('message'));
        return response([
            'data' => true
        ]);
@ -175,8 +164,7 @@ class TicketController extends Controller
        $ticket = Ticket::create([
            'subject' => $subject,
            'level' => 2,
-            'user_id' => $request->session()->get('id'),
-            'last_reply_user_id' => $request->session()->get('id')
+            'user_id' => $request->session()->get('id')
        ]);
        if (!$ticket) {
            DB::rollback();
@ -196,15 +184,15 @@ class TicketController extends Controller
            abort(500, __('Failed to open ticket'));
        }
        DB::commit();
-        $this->sendNotify($ticket, $ticketMessage);
+        $this->sendNotify($ticket, $message);
        return response([
            'data' => true
        ]);
    }

-    private function sendNotify(Ticket $ticket, TicketMessage $ticketMessage)
+    private function sendNotify(Ticket $ticket, string $message)
    {
        $telegramService = new TelegramService();
-        $telegramService->sendMessageWithAdmin("📮工单提醒 #{$ticket->id}\n———————————————\n主题：\n`{$ticket->subject}`\n内容：\n`{$ticketMessage->message}`", true);
+        $telegramService->sendMessageWithAdmin("📮工单提醒 #{$ticket->id}\n———————————————\n主题：\n`{$ticket->subject}`\n内容：\n`{$message}`", true);
    }
 }
--- a/app/Http/Controllers/User/UserController.php
+++ b/app/Http/Controllers/User/UserController.php
@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\User\UserTransfer;
 use App\Http\Requests\User\UserUpdate;
 use App\Http\Requests\User\UserChangePassword;
+use App\Services\UserService;
 use App\Utils\CacheKey;
 use Illuminate\Http\Request;
 use App\Models\User;
@ -120,8 +121,9 @@ class UserController extends Controller
                abort(500, __('Subscription plan does not exist'));
            }
        }
-        $user['subscribe_url'] = Helper::getSubscribeHost() . "/api/v1/client/subscribe?token={$user['token']}";
-        $user['reset_day'] = $this->getResetDay($user);
+        $user['subscribe_url'] = Helper::getSubscribeUrl("/api/v1/client/subscribe?token={$user['token']}");
+        $userService = new UserService();
+        $user['reset_day'] = $userService->getResetDay($user);
        return response([
            'data' => $user
        ]);
@ -139,7 +141,7 @@ class UserController extends Controller
            abort(500, __('Reset failed'));
        }
        return response([
-            'data' => config('v2board.subscribe_url', config('v2board.app_url', env('APP_URL'))) . '/api/v1/client/subscribe?token=' . $user->token
+            'data' => Helper::getSubscribeUrl('/api/v1/client/subscribe?token=' . $user->token)
        ]);
    }

@ -184,36 +186,6 @@ class UserController extends Controller
        ]);
    }

-    private function getResetDay(User $user)
-    {
-        if ($user->expired_at <= time() || $user->expired_at === NULL) return null;
-        // if reset method is not reset
-        if (isset($user->plan->reset_traffic_method) && $user->plan->reset_traffic_method === 2) return null;
-        $day = date('d', $user->expired_at);
-        $today = date('d');
-        $lastDay = date('d', strtotime('last day of +0 months'));
-
-        if ((int)config('v2board.reset_traffic_method') === 0 ||
-            (isset($user->plan->reset_traffic_method) && $user->plan->reset_traffic_method === 0))
-        {
-            return $lastDay - $today;
-        }
-        if ((int)config('v2board.reset_traffic_method') === 1 ||
-            (isset($user->plan->reset_traffic_method) && $user->plan->reset_traffic_method === 1))
-        {
-            if ((int)$day >= (int)$today && (int)$day >= (int)$lastDay) {
-                return $lastDay - $today;
-            }
-            if ((int)$day >= (int)$today) {
-                return $day - $today;
-            } else {
-                return $lastDay - $today + $day;
-            }
-        }
-        return null;
-    }
-
-
    public function getQuickLoginUrl(Request $request)
    {
        $user = User::find($request->session()->get('id'));
--- a/app/Http/Middleware/Client.php
+++ b/app/Http/Middleware/Client.php
@ -2,8 +2,10 @@

 namespace App\Http\Middleware;

+use App\Utils\CacheKey;
 use Closure;
 use App\Models\User;
+use Illuminate\Support\Facades\Cache;

 class Client
 {
--- a/app/Http/Requests/Admin/ConfigSave.php
+++ b/app/Http/Requests/Admin/ConfigSave.php
@ -6,6 +6,89 @@ use Illuminate\Foundation\Http\FormRequest;

 class ConfigSave extends FormRequest
 {
+    const RULES = [
+        // invite & commission
+        'invite_force' => 'in:0,1',
+        'invite_commission' => 'integer',
+        'invite_gen_limit' => 'integer',
+        'invite_never_expire' => 'in:0,1',
+        'commission_first_time_enable' => 'in:0,1',
+        'commission_auto_check_enable' => 'in:0,1',
+        'commission_withdraw_limit' => 'nullable|numeric',
+        'commission_withdraw_method' => 'nullable|array',
+        'withdraw_close_enable' => 'in:0,1',
+        'commission_distribution_enable' => 'in:0,1',
+        'commission_distribution_l1' => 'nullable|numeric',
+        'commission_distribution_l2' => 'nullable|numeric',
+        'commission_distribution_l3' => 'nullable|numeric',
+        // site
+        'logo' => 'nullable|url',
+        'force_https' => 'in:0,1',
+        'safe_mode_enable' => 'in:0,1',
+        'stop_register' => 'in:0,1',
+        'email_verify' => 'in:0,1',
+        'app_name' => '',
+        'app_description' => '',
+        'app_url' => 'nullable|url',
+        'subscribe_url' => 'nullable',
+        'try_out_enable' => 'in:0,1',
+        'try_out_plan_id' => 'integer',
+        'try_out_hour' => 'numeric',
+        'email_whitelist_enable' => 'in:0,1',
+        'email_whitelist_suffix' => 'nullable|array',
+        'email_gmail_limit_enable' => 'in:0,1',
+        'recaptcha_enable' => 'in:0,1',
+        'recaptcha_key' => '',
+        'recaptcha_site_key' => '',
+        'tos_url' => 'nullable|url',
+        'currency' => '',
+        'currency_symbol' => '',
+        'register_limit_by_ip_enable' => 'in:0,1',
+        'register_limit_count' => 'integer',
+        'register_limit_expire' => 'integer',
+        // subscribe
+        'plan_change_enable' => 'in:0,1',
+        'reset_traffic_method' => 'in:0,1,2,3,4',
+        'surplus_enable' => 'in:0,1',
+        'new_order_event_id' => 'in:0,1',
+        'renew_order_event_id' => 'in:0,1',
+        'change_order_event_id' => 'in:0,1',
+        'show_info_to_server_enable' => 'in:0,1',
+        // server
+        'server_token' => 'nullable|min:16',
+        'server_license' => 'nullable',
+        'server_log_enable' => 'in:0,1',
+        'server_v2ray_domain' => '',
+        'server_v2ray_protocol' => '',
+        // frontend
+        'frontend_theme' => '',
+        'frontend_theme_sidebar' => 'in:dark,light',
+        'frontend_theme_header' => 'in:dark,light',
+        'frontend_theme_color' => 'in:default,darkblue,black,green',
+        'frontend_background_url' => 'nullable|url',
+        'frontend_admin_path' => '',
+        // email
+        'email_template' => '',
+        'email_host' => '',
+        'email_port' => '',
+        'email_username' => '',
+        'email_password' => '',
+        'email_encryption' => '',
+        'email_from_address' => '',
+        // telegram
+        'telegram_bot_enable' => 'in:0,1',
+        'telegram_bot_token' => '',
+        'telegram_discuss_id' => '',
+        'telegram_channel_id' => '',
+        'telegram_discuss_link' => 'nullable|url',
+        // app
+        'windows_version' => '',
+        'windows_download_url' => '',
+        'macos_version' => '',
+        'macos_download_url' => '',
+        'android_version' => '',
+        'android_download_url' => ''
+    ];
    /**
     * Get the validation rules that apply to the request.
     *
@ -13,114 +96,7 @@ class ConfigSave extends FormRequest
     */
    public function rules()
    {
-        return [
-            // invite & commission
-            'safe_mode_enable' => 'in:0,1',
-            'invite_force' => 'in:0,1',
-            'invite_commission' => 'integer',
-            'invite_gen_limit' => 'integer',
-            'invite_never_expire' => 'in:0,1',
-            'commission_first_time_enable' => 'in:0,1',
-            'commission_auto_check_enable' => 'in:0,1',
-            'commission_withdraw_limit' => 'nullable|numeric',
-            'commission_withdraw_method' => 'nullable|array',
-            'withdraw_close_enable' => 'in:0,1',
-            'commission_distribution_enable' => 'in:0,1',
-            'commission_distribution_l1' => 'nullable|numeric',
-            'commission_distribution_l2' => 'nullable|numeric',
-            'commission_distribution_l3' => 'nullable|numeric',
-            // site
-            'stop_register' => 'in:0,1',
-            'email_verify' => 'in:0,1',
-            'app_name' => '',
-            'app_description' => '',
-            'app_url' => 'nullable|url',
-            'subscribe_url' => 'nullable',
-            'try_out_enable' => 'in:0,1',
-            'try_out_plan_id' => 'integer',
-            'try_out_hour' => 'numeric',
-            'email_whitelist_enable' => 'in:0,1',
-            'email_whitelist_suffix' => 'nullable|array',
-            'email_gmail_limit_enable' => 'in:0,1',
-            'recaptcha_enable' => 'in:0,1',
-            'recaptcha_key' => '',
-            'recaptcha_site_key' => '',
-            'tos_url' => 'nullable|url',
-            'currency' => '',
-            'currency_symbol' => '',
-            // subscribe
-            'plan_change_enable' => 'in:0,1',
-            'reset_traffic_method' => 'in:0,1,2',
-            'surplus_enable' => 'in:0,1',
-            'new_order_event_id' => 'in:0,1',
-            'renew_order_event_id' => 'in:0,1',
-            'change_order_event_id' => 'in:0,1',
-            // server
-            'server_token' => 'nullable|min:16',
-            'server_license' => 'nullable',
-            'server_log_enable' => 'in:0,1',
-            'server_v2ray_domain' => '',
-            'server_v2ray_protocol' => '',
-            // alipay
-            'alipay_enable' => 'in:0,1',
-            'alipay_appid' => 'nullable|integer|min:16',
-            'alipay_pubkey' => 'max:2048',
-            'alipay_privkey' => 'max:2048',
-            // stripe
-            'stripe_alipay_enable' => 'in:0,1',
-            'stripe_wepay_enable' => 'in:0,1',
-            'stripe_card_enable' => 'in:0,1',
-            'stripe_sk_live' => '',
-            'stripe_pk_live' => '',
-            'stripe_webhook_key' => '',
-            'stripe_currency' => 'in:hkd,usd,sgd,eur,gbp,jpy,cad',
-            // bitpayx
-            'bitpayx_name' => '',
-            'bitpayx_enable' => 'in:0,1',
-            'bitpayx_appsecret' => '',
-            // mGate
-            'mgate_name' => '',
-            'mgate_enable' => 'in:0,1',
-            'mgate_url' => 'nullable|url',
-            'mgate_app_id' => '',
-            'mgate_app_secret' => '',
-            // Epay
-            'epay_name' => '',
-            'epay_enable' => 'in:0,1',
-            'epay_url' => 'nullable|url',
-            'epay_pid' => '',
-            'epay_key' => '',
-            // frontend
-            'frontend_theme' => '',
-            'frontend_theme_sidebar' => 'in:dark,light',
-            'frontend_theme_header' => 'in:dark,light',
-            'frontend_theme_color' => 'in:default,darkblue,black,green',
-            'frontend_background_url' => 'nullable|url',
-            'frontend_admin_path' => '',
-            'frontend_customer_service_method' => '',
-            'frontend_customer_service_id' => '',
-            // email
-            'email_template' => '',
-            'email_host' => '',
-            'email_port' => '',
-            'email_username' => '',
-            'email_password' => '',
-            'email_encryption' => '',
-            'email_from_address' => '',
-            // telegram
-            'telegram_bot_enable' => 'in:0,1',
-            'telegram_bot_token' => '',
-            'telegram_discuss_id' => '',
-            'telegram_channel_id' => '',
-            'telegram_discuss_link' => 'nullable|url',
-            // app
-            'windows_version' => '',
-            'windows_download_url' => '',
-            'macos_version' => '',
-            'macos_download_url' => '',
-            'android_version' => '',
-            'android_download_url' => ''
-        ];
+        return self::RULES;
    }

    public function messages()
@ -131,7 +107,8 @@ class ConfigSave extends FormRequest
            'subscribe_url.url' => '订阅URL格式不正确，必须携带http(s)://',
            'server_token.min' => '通讯密钥长度必须大于16位',
            'tos_url.url' => '服务条款URL格式不正确，必须携带http(s)://',
-            'telegram_discuss_link.url' => 'Telegram群组地址必须为URL格式，必须携带http(s)://'
+            'telegram_discuss_link.url' => 'Telegram群组地址必须为URL格式，必须携带http(s)://',
+            'logo.url' => 'LOGO URL格式不正确，必须携带https(s)://'
        ];
    }
 }
--- a/app/Http/Requests/Admin/NoticeSave.php
+++ b/app/Http/Requests/Admin/NoticeSave.php
@ -16,7 +16,8 @@ class NoticeSave extends FormRequest
        return [
            'title' => 'required',
            'content' => 'required',
-            'img_url' => 'nullable|url'
+            'img_url' => 'nullable|url',
+            'tags' => 'nullable|array'
        ];
    }

@ -25,7 +26,8 @@ class NoticeSave extends FormRequest
        return [
            'title.required' => '标题不能为空',
            'content.required' => '内容不能为空',
-            'img_url.url' => '图片URL格式不正确'
+            'img_url.url' => '图片URL格式不正确',
+            'tags.array' => '标签格式不正确'
        ];
    }
 }
--- a/app/Http/Requests/Admin/PlanSave.php
+++ b/app/Http/Requests/Admin/PlanSave.php
@ -26,7 +26,7 @@ class PlanSave extends FormRequest
            'three_year_price' => 'nullable|integer',
            'onetime_price' => 'nullable|integer',
            'reset_price' => 'nullable|integer',
-            'reset_traffic_method' => 'nullable|integer|in:0,1,2'
+            'reset_traffic_method' => 'nullable|integer|in:0,1,2,3,4'
        ];
    }

--- a/app/Http/Requests/Admin/ServerShadowsocksSave.php
+++ b/app/Http/Requests/Admin/ServerShadowsocksSave.php
@ -22,6 +22,8 @@ class ServerShadowsocksSave extends FormRequest
            'port' => 'required',
            'server_port' => 'required',
            'cipher' => 'required|in:aes-128-gcm,aes-256-gcm,chacha20-ietf-poly1305',
+            'obfs' => 'nullable|in:http',
+            'obfs_settings' => 'nullable|array',
            'tags' => 'nullable|array',
            'rate' => 'required|numeric'
        ];
@ -40,7 +42,9 @@ class ServerShadowsocksSave extends FormRequest
            'cipher.required' => '加密方式不能为空',
            'tags.array' => '标签格式不正确',
            'rate.required' => '倍率不能为空',
-            'rate.numeric' => '倍率格式不正确'
+            'rate.numeric' => '倍率格式不正确',
+            'obfs.in' => '混淆格式不正确',
+            'obfs_settings.array' => '混淆设置格式不正确'
        ];
    }
 }
--- a/app/Http/Routes/AdminRoute.php
+++ b/app/Http/Routes/AdminRoute.php
@ -111,8 +111,13 @@ class AdminRoute
            $router->post('/payment/getPaymentForm', 'Admin\\PaymentController@getPaymentForm');
            $router->post('/payment/save', 'Admin\\PaymentController@save');
            $router->post('/payment/drop', 'Admin\\PaymentController@drop');
+            $router->post('/payment/show', 'Admin\\PaymentController@show');
            // System
            $router->get ('/system/getStatus', 'Admin\\SystemController@getStatus');
+            // Theme
+            $router->get ('/theme/getThemes', 'Admin\\ThemeController@getThemes');
+            $router->post('/theme/saveThemeConfig', 'Admin\\ThemeController@saveThemeConfig');
+            $router->post('/theme/getThemeConfig', 'Admin\\ThemeController@getThemeConfig');
        });
    }
 }
--- a/app/Http/Routes/GuestRoute.php
+++ b/app/Http/Routes/GuestRoute.php
@ -18,7 +18,6 @@ class GuestRoute
            $router->match(['get', 'post'], '/payment/notify/{method}/{uuid}', 'Guest\\PaymentController@notify');
            // Comm
            $router->get ('/comm/config', 'Guest\\CommController@config');
-            $router->get ('/comm/getHitokoto', 'Guest\\CommController@getHitokoto');
        });
    }
 }
--- a/app/Jobs/StatServerJob.php
+++ b/app/Jobs/StatServerJob.php
@ -50,6 +50,7 @@ class StatServerJob implements ShouldQueue

        $data = StatServer::where('record_at', $recordAt)
            ->where('server_id', $this->server->id)
+            ->where('server_type', $this->protocol)
            ->lockForUpdate()
            ->first();
        if ($data) {
--- a/app/Jobs/StatUserJob.php
+++ b/app/Jobs/StatUserJob.php
@ -52,7 +52,7 @@ class StatUserJob implements ShouldQueue
        }

        $data = StatUser::where('record_at', $recordAt)
-            ->where('server_id', $this->server->id)
+            ->where('server_rate', $this->server->rate)
            ->where('user_id', $this->userId)
            ->first();
        if ($data) {
@ -67,8 +67,6 @@ class StatUserJob implements ShouldQueue
        } else {
            if (!StatUser::create([
                'user_id' => $this->userId,
-                'server_id' => $this->server->id,
-                'server_type' => $this->protocol,
                'server_rate' => $this->server->rate,
                'u' => $this->u,
                'd' => $this->d,
--- a/app/Models/Notice.php
+++ b/app/Models/Notice.php
@ -11,6 +11,7 @@ class Notice extends Model
    protected $guarded = ['id'];
    protected $casts = [
        'created_at' => 'timestamp',
-        'updated_at' => 'timestamp'
+        'updated_at' => 'timestamp',
+        'tags' => 'array'
    ];
 }
--- a/app/Models/ServerShadowsocks.php
+++ b/app/Models/ServerShadowsocks.php
@ -13,6 +13,7 @@ class ServerShadowsocks extends Model
        'created_at' => 'timestamp',
        'updated_at' => 'timestamp',
        'group_id' => 'array',
-        'tags' => 'array'
+        'tags' => 'array',
+        'obfs_settings' => 'array'
    ];
 }
--- a/app/Payments/CoinPayments.php
+++ b/app/Payments/CoinPayments.php
@ -28,7 +28,8 @@ class CoinPayments {
        ];
    }

-    public function pay($order) {
+    public function pay($order)
+    {

        // IPN notifications are slow, when the transaction is successful, we should return to the user center to avoid user confusion
        $parseUrl = parse_url($order['return_url']);
@ -53,12 +54,12 @@ class CoinPayments {

        return [
            'type' => 1, // Redirect to url
-            'data' =>  'https://www.coinpayments.net/index.php?' . $params_string,
-            'custom_result' => 'IPN OK'
+            'data' =>  'https://www.coinpayments.net/index.php?' . $params_string
        ];
    }

-    public function notify($params) {
+    public function notify($params)
+    {

        if (!isset($params['merchant']) || $params['merchant'] != trim($this->config['coinpayments_merchant_id'])) {
            abort(500, 'No or incorrect Merchant ID passed');
@ -75,24 +76,22 @@ class CoinPayments {

        $hmac = hash_hmac("sha512", $request, trim($this->config['coinpayments_ipn_secret']));

-        // if (!hash_equals($hmac, $signHeader)) {
-        // if ($hmac != $_SERVER['HTTP_HMAC']) { <-- Use this if you are running a version of PHP below 5.6.0 without the hash_equals function
-        //     $this->dieSendMessage(400, 'HMAC signature does not match');
+        // if ($hmac != $signHeader) { <-- Use this if you are running a version of PHP below 5.6.0 without the hash_equals function
+        //     abort(400, 'HMAC signature does not match');
        // }

-        if ($hmac != $signHeader) {
+        if (!hash_equals($hmac, $signHeader)) {
            abort(400, 'HMAC signature does not match');
        }

        // HMAC Signature verified at this point, load some variables.
-
        $status = $params['status'];
-
        if ($status >= 100 || $status == 2) {
            // payment is complete or queued for nightly payout, success
            return [
                'trade_no' => $params['item_number'],
-                'callback_no' => $params['txn_id']
+                'callback_no' => $params['txn_id'],
+                'custom_result' => 'IPN OK'
            ];
        } else if ($status < 0) {
            //payment error, this is usually final but payments will sometimes be reopened if there was no exchange rate conversion or with seller consent
@ -101,7 +100,5 @@ class CoinPayments {
            //payment is pending, you can optionally add a note to the order page
            die('IPN OK: pending');
        }
-
    }
-
 }
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@ -24,6 +24,9 @@ class RouteServiceProvider extends ServiceProvider
    public function boot()
    {
        //
+        if (config('v2board.force_https')) {
+            resolve(\Illuminate\Routing\UrlGenerator::class)->forceScheme('https');
+        }

        parent::boot();
    }
--- a/app/Services/OrderService.php
+++ b/app/Services/OrderService.php
@ -6,6 +6,8 @@ use App\Jobs\OrderHandleJob;
 use App\Models\Order;
 use App\Models\Plan;
 use App\Models\User;
+use App\Utils\CacheKey;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;

 class OrderService
@ -163,18 +165,17 @@ class OrderService
    private function getSurplusValueByOneTime(User $user, Order $order)
    {
        $lastOneTimeOrder = Order::where('user_id', $user->id)
-            ->where('period', 'onetime')
+            ->where('period', 'onetime_price')
            ->where('status', 3)
            ->orderBy('id', 'DESC')
            ->first();
        if (!$lastOneTimeOrder) return;
-        $plan = Plan::find($lastOneTimeOrder->plan_id);
-        if (!$plan) return;
-        $trafficUnitPrice = $plan->onetime_price / $plan->transfer_enable;
-        if ($user->discount && $trafficUnitPrice) {
-            $trafficUnitPrice = $trafficUnitPrice - ($trafficUnitPrice * $user->discount / 100);
-        }
-        $notUsedTraffic = $plan->transfer_enable - (($user->u + $user->d) / 1073741824);
+        $nowUserTraffic = $user->transfer_enable / 1073741824;
+        if (!$nowUserTraffic) return;
+        $paidTotalAmount = ($lastOneTimeOrder->total_amount + $lastOneTimeOrder->balance_amount);
+        if (!$paidTotalAmount) return;
+        $trafficUnitPrice = $paidTotalAmount / $nowUserTraffic;
+        $notUsedTraffic = $nowUserTraffic - (($user->u + $user->d) / 1073741824);
        $result = $trafficUnitPrice * $notUsedTraffic;
        $orderModel = Order::where('user_id', $user->id)->where('period', '!=', 'reset_price')->where('status', 3);
        $order->surplus_amount = $result > 0 ? $result : 0;
--- a/app/Services/PaymentService.php
+++ b/app/Services/PaymentService.php
@ -47,7 +47,7 @@ class PaymentService

        return $this->payment->pay([
            'notify_url' => $notifyUrl,
-            'return_url' => config('v2board.app_url', env('APP_URL')) . '/#/order/' . $order['trade_no'],
+            'return_url' => config('v2board.app_url') . '/#/order/' . $order['trade_no'],
            'trade_no' => $order['trade_no'],
            'total_amount' => $order['total_amount'],
            'user_id' => $order['user_id'],
--- a/app/Services/ServerService.php
+++ b/app/Services/ServerService.php
@ -14,8 +14,6 @@ use Illuminate\Support\Facades\Cache;
 class ServerService
 {

-    CONST V2RAY_CONFIG = '{"log":{"loglevel":"debug","access":"access.log","error":"error.log"},"api":{"services":["HandlerService","StatsService"],"tag":"api"},"dns":{},"stats":{},"inbounds":[{"port":443,"protocol":"vmess","settings":{"clients":[]},"sniffing":{"enabled":true,"destOverride":["http","tls"]},"streamSettings":{"network":"tcp"},"tag":"proxy"},{"listen":"127.0.0.1","port":23333,"protocol":"dokodemo-door","settings":{"address":"0.0.0.0"},"tag":"api"}],"outbounds":[{"protocol":"freedom","settings":{}},{"protocol":"blackhole","settings":{},"tag":"block"}],"routing":{"rules":[{"type":"field","inboundTag":"api","outboundTag":"api"}]},"policy":{"levels":{"0":{"handshake":4,"connIdle":300,"uplinkOnly":5,"downlinkOnly":30,"statsUserUplink":true,"statsUserDownlink":true}}}}';
-    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 getV2ray(User $user, $all = false):array
    {
        $servers = [];
@ -117,153 +115,11 @@ class ServerService
            ->where('banned', 0)
            ->select([
                'id',
-                'email',
-                't',
-                'u',
-                'd',
-                'transfer_enable',
                'uuid'
            ])
            ->get();
    }

-    public function getV2RayConfig(int $nodeId, int $localPort)
-    {
-        $server = ServerV2ray::find($nodeId);
-        if (!$server) {
-            abort(500, '节点不存在');
-        }
-        $json = json_decode(self::V2RAY_CONFIG);
-        $json->log->loglevel = (int)config('v2board.server_log_enable') ? 'debug' : 'none';
-        $json->inbounds[1]->port = (int)$localPort;
-        $json->inbounds[0]->port = (int)$server->server_port;
-        $json->inbounds[0]->streamSettings->network = $server->network;
-        $this->setDns($server, $json);
-        $this->setNetwork($server, $json);
-        $this->setRule($server, $json);
-        $this->setTls($server, $json);
-
-        return $json;
-    }
-
-    public function getTrojanConfig(int $nodeId, int $localPort)
-    {
-        $server = ServerTrojan::find($nodeId);
-        if (!$server) {
-            abort(500, '节点不存在');
-        }
-
-        $json = json_decode(self::TROJAN_CONFIG);
-        $json->local_port = $server->server_port;
-        $json->ssl->sni = $server->server_name ? $server->server_name : $server->host;
-        $json->ssl->cert = "/root/.cert/server.crt";
-        $json->ssl->key = "/root/.cert/server.key";
-        $json->api->api_port = $localPort;
-        return $json;
-    }
-
-    private function setDns(ServerV2ray $server, object $json)
-    {
-        if ($server->dnsSettings) {
-            $dns = $server->dnsSettings;
-            if (isset($dns->servers)) {
-                array_push($dns->servers, '1.1.1.1');
-                array_push($dns->servers, 'localhost');
-            }
-            $json->dns = $dns;
-            $json->outbounds[0]->settings->domainStrategy = 'UseIP';
-        }
-    }
-
-    private function setNetwork(ServerV2ray $server, object $json)
-    {
-        if ($server->networkSettings) {
-            switch ($server->network) {
-                case 'tcp':
-                    $json->inbounds[0]->streamSettings->tcpSettings = $server->networkSettings;
-                    break;
-                case 'kcp':
-                    $json->inbounds[0]->streamSettings->kcpSettings = $server->networkSettings;
-                    break;
-                case 'ws':
-                    $json->inbounds[0]->streamSettings->wsSettings = $server->networkSettings;
-                    break;
-                case 'http':
-                    $json->inbounds[0]->streamSettings->httpSettings = $server->networkSettings;
-                    break;
-                case 'domainsocket':
-                    $json->inbounds[0]->streamSettings->dsSettings = $server->networkSettings;
-                    break;
-                case 'quic':
-                    $json->inbounds[0]->streamSettings->quicSettings = $server->networkSettings;
-                    break;
-                case 'grpc':
-                    $json->inbounds[0]->streamSettings->grpcSettings = $server->networkSettings;
-                    break;
-            }
-        }
-    }
-
-    private function setRule(ServerV2ray $server, object $json)
-    {
-        $domainRules = array_filter(explode(PHP_EOL, config('v2board.server_v2ray_domain')));
-        $protocolRules = array_filter(explode(PHP_EOL, config('v2board.server_v2ray_protocol')));
-        if ($server->ruleSettings) {
-            $ruleSettings = $server->ruleSettings;
-            // domain
-            if (isset($ruleSettings->domain)) {
-                $ruleSettings->domain = array_filter($ruleSettings->domain);
-                if (!empty($ruleSettings->domain)) {
-                    $domainRules = array_merge($domainRules, $ruleSettings->domain);
-                }
-            }
-            // protocol
-            if (isset($ruleSettings->protocol)) {
-                $ruleSettings->protocol = array_filter($ruleSettings->protocol);
-                if (!empty($ruleSettings->protocol)) {
-                    $protocolRules = array_merge($protocolRules, $ruleSettings->protocol);
-                }
-            }
-        }
-        if (!empty($domainRules)) {
-            $domainObj = new \StdClass();
-            $domainObj->type = 'field';
-            $domainObj->domain = $domainRules;
-            $domainObj->outboundTag = 'block';
-            array_push($json->routing->rules, $domainObj);
-        }
-        if (!empty($protocolRules)) {
-            $protocolObj = new \StdClass();
-            $protocolObj->type = 'field';
-            $protocolObj->protocol = $protocolRules;
-            $protocolObj->outboundTag = 'block';
-            array_push($json->routing->rules, $protocolObj);
-        }
-        if (empty($domainRules) && empty($protocolRules)) {
-            $json->inbounds[0]->sniffing->enabled = false;
-        }
-    }
-
-    private function setTls(ServerV2ray $server, object $json)
-    {
-        if ((int)$server->tls) {
-            $tlsSettings = $server->tlsSettings;
-            $json->inbounds[0]->streamSettings->security = 'tls';
-            $tls = (object)[
-                'certificateFile' => '/root/.cert/server.crt',
-                'keyFile' => '/root/.cert/server.key'
-            ];
-            $json->inbounds[0]->streamSettings->tlsSettings = new \StdClass();
-            if (isset($tlsSettings->serverName)) {
-                $json->inbounds[0]->streamSettings->tlsSettings->serverName = (string)$tlsSettings->serverName;
-            }
-            if (isset($tlsSettings->allowInsecure)) {
-                $json->inbounds[0]->streamSettings->tlsSettings->allowInsecure = (int)$tlsSettings->allowInsecure ? true : false;
-            }
-            $json->inbounds[0]->streamSettings->tlsSettings->certificates[0] = $tls;
-        }
-    }
-
    public function log(int $userId, int $serverId, int $u, int $d, float $rate, string $method)
    {
        if (($u + $d) < 10240) return true;
--- a/app/Services/ThemeService.php
+++ b/app/Services/ThemeService.php
@ -0,0 +1,48 @@
+<?php
+
+namespace App\Services;
+
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\File;
+
+class ThemeService
+{
+    private $path;
+    private $theme;
+
+    public function __construct($theme)
+    {
+        $this->theme = $theme;
+        $this->path = $path = public_path('theme/');
+    }
+
+    public function init()
+    {
+        $themeConfigFile = $this->path . "{$this->theme}/config.php";
+        if (!File::exists($themeConfigFile)) return;
+        $themeConfig = include($themeConfigFile);
+        $configs = $themeConfig['configs'];
+        $data = [];
+        foreach ($configs as $config) {
+            $data[$config['field_name']] = isset($config['default_value']) ? $config['default_value'] : '';
+        }
+
+        $data = var_export($data, 1);
+        try {
+            if (!File::put(base_path() . "/config/theme/{$this->theme}.php", "<?php\n return $data ;")) {
+                abort(500, "{$this->theme}初始化失败");
+            }
+        } catch (\Exception $e) {
+            abort(500, '请检查V2Board目录权限');
+        }
+
+        try {
+            Artisan::call('config:cache');
+            while (true) {
+                if (config("theme.{$this->theme}")) break;
+            }
+        } catch (\Exception $e) {
+            abort(500, "{$this->theme}初始化失败");
+        }
+    }
+}
--- a/app/Services/TicketService.php
+++ b/app/Services/TicketService.php
@ -10,6 +10,27 @@ use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;

 class TicketService {
+    public function reply($ticket, $message, $userId)
+    {
+        DB::beginTransaction();
+        $ticketMessage = TicketMessage::create([
+            'user_id' => $userId,
+            'ticket_id' => $ticket->id,
+            'message' => $message
+        ]);
+        if ($userId !== $ticket->user_id) {
+            $ticket->reply_status = 0;
+        } else {
+            $ticket->reply_status = 1;
+        }
+        if (!$ticketMessage || !$ticket->save()) {
+            DB::rollback();
+            return false;
+        }
+        DB::commit();
+        return $ticketMessage;
+    }
+
    public function replyByAdmin($ticketId, $message, $userId):void
    {
        $ticket = Ticket::where('id', $ticketId)
@ -24,7 +45,11 @@ class TicketService {
            'ticket_id' => $ticket->id,
            'message' => $message
        ]);
-        $ticket->last_reply_user_id = $userId;
+        if ($userId !== $ticket->user_id) {
+            $ticket->reply_status = 0;
+        } else {
+            $ticket->reply_status = 1;
+        }
        if (!$ticketMessage || !$ticket->save()) {
            DB::rollback();
            abort(500, '工单回复失败');
--- a/app/Services/UserService.php
+++ b/app/Services/UserService.php
@ -15,6 +15,52 @@ use Illuminate\Support\Facades\DB;

 class UserService
 {
+    public function getResetDay(User $user)
+    {
+        if ($user->expired_at <= time() || $user->expired_at === NULL) return null;
+        // if reset method is not reset
+        if (isset($user->plan->reset_traffic_method) && $user->plan->reset_traffic_method === 2) return null;
+
+        if ((int)config('v2board.reset_traffic_method') === 0 ||
+            (isset($user->plan->reset_traffic_method) && $user->plan->reset_traffic_method === 0))
+        {
+            $day = date('d', $user->expired_at);
+            $today = date('d');
+            $lastDay = date('d', strtotime('last day of +0 months'));
+            return $lastDay - $today;
+        }
+        if ((int)config('v2board.reset_traffic_method') === 1 ||
+            (isset($user->plan->reset_traffic_method) && $user->plan->reset_traffic_method === 1))
+        {
+            $day = date('d', $user->expired_at);
+            $today = date('d');
+            $lastDay = date('d', strtotime('last day of +0 months'));
+            if ((int)$day >= (int)$today && (int)$day >= (int)$lastDay) {
+                return $lastDay - $today;
+            }
+            if ((int)$day >= (int)$today) {
+                return $day - $today;
+            } else {
+                return $lastDay - $today + $day;
+            }
+        }
+        if ((int)config('v2board.reset_traffic_method') === 3 ||
+            (isset($user->plan->reset_traffic_method) && $user->plan->reset_traffic_method === 3))
+        {
+            $nextYear = strtotime(date("Y-01-01", strtotime('+1 year')));
+            return (int)(($nextYear - time()) / 86400);
+        }
+        if ((int)config('v2board.reset_traffic_method') === 4 ||
+            (isset($user->plan->reset_traffic_method) && $user->plan->reset_traffic_method === 4))
+        {
+            $md = date('m-d', $user->expired_at);
+            $nowYear = strtotime(date("Y-{$md}"));
+            $nextYear = strtotime('+1 year', $nowYear);
+            return (int)(($nextYear - time()) / 86400);
+        }
+        return null;
+    }
+
    public function isAvailable(User $user)
    {
        if (!$user->banned && $user->transfer_enable && ($user->expired_at > time() || $user->expired_at === NULL)) {
--- a/app/Utils/CacheKey.php
+++ b/app/Utils/CacheKey.php
@ -18,7 +18,8 @@ class CacheKey
        'SERVER_SHADOWSOCKS_LAST_PUSH_AT' => 'ss节点最后推送时间',
        'TEMP_TOKEN' => '临时令牌',
        'LAST_SEND_EMAIL_REMIND_TRAFFIC' => '最后发送流量邮件提醒',
-        'SCHEDULE_LAST_CHECK_AT' => '计划任务最后检查时间'
+        'SCHEDULE_LAST_CHECK_AT' => '计划任务最后检查时间',
+        'REGISTER_IP_RATE_LIMIT' => '注册频率限制'
    ];

    public static function get(string $key, $uniqueValue)
--- a/app/Utils/Helper.php
+++ b/app/Utils/Helper.php
@ -103,14 +103,12 @@ class Helper
        }
    }

-    public static function getSubscribeHost()
+    public static function getSubscribeUrl($path)
    {
-        $subscribeUrl = config('v2board.app_url');
        $subscribeUrls = explode(',', config('v2board.subscribe_url'));
-        if ($subscribeUrls && $subscribeUrls[0]) {
-            $subscribeUrl = $subscribeUrls[rand(0, count($subscribeUrls) - 1)];
-        }
-        return $subscribeUrl;
+        $subscribeUrl = $subscribeUrls[rand(0, count($subscribeUrls) - 1)];
+        if ($subscribeUrl) return $subscribeUrl . $path;
+        return url($path);
    }

    public static function randomPort($range) {