diff --git a/app/Components/Client/QuantumultX.php b/app/Components/Client/QuantumultX.php index 5c82e43b..d2f85435 100644 --- a/app/Components/Client/QuantumultX.php +++ b/app/Components/Client/QuantumultX.php @@ -27,7 +27,7 @@ class QuantumultX "password={$server['passwd']}", "ssr-protocol={$server['protocol']}", "ssr-protocol-param={$server['protocol_param']}", - "obfs={$server['obs']}", + "obfs={$server['obfs']}", "obfs-host={$server['obfs_param']}", 'fast-open=true', "udp-relay={$server['udp']}", diff --git a/app/Http/Controllers/User/SubscribeController.php b/app/Http/Controllers/User/SubscribeController.php index f80bbea2..5d76ffaa 100644 --- a/app/Http/Controllers/User/SubscribeController.php +++ b/app/Http/Controllers/User/SubscribeController.php @@ -105,7 +105,7 @@ class SubscribeController extends Controller } if ($target) { - if (strpos($target, 'quantumult%20x') !== false) { + if (strpos($target, 'quantumult x') !== false) { exit($this->quantumultX($user, $servers)); } if (strpos($target, 'quantumult') !== false) { diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index ae453007..52094dfb 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -64,6 +64,22 @@ class UserController extends Controller //付费用户判断 $view['paying_user'] = $user->activePayingUser(); $view['userLoginLog'] = UserLoginLog::whereUserId($user->id)->latest()->first(); // 近期登录日志 + + $nodes = $user->userAccessNodes()->get(); + $subType = []; + if ($nodes->whereIn('type', [1, 4])->isNotEmpty()) { + $subType[] = 'ss'; + } + if ($nodes->where('type', 2)->isNotEmpty()) { + $subType[] = 'v2'; + } + if ($nodes->where('type', 3)->isNotEmpty()) { + $subType[] = 'trojan'; + } + + $view['subscribe_status'] = $user->subscribe->status; + $view['subType'] = $subType; + $view['subUrl'] = route('sub', $user->subscribe->code); $view = array_merge($view, $this->dataFlowChart($user->id)); return view('user.index', $view); diff --git a/resources/views/admin/logs/onlineIPMonitor.blade.php b/resources/views/admin/logs/onlineIPMonitor.blade.php index ee04f481..05d9efae 100644 --- a/resources/views/admin/logs/onlineIPMonitor.blade.php +++ b/resources/views/admin/logs/onlineIPMonitor.blade.php @@ -95,7 +95,6 @@ @section('javascript') - + + @if(sysConfig('is_push_bear') && sysConfig('push_bear_qrcode')) @endif