diff --git a/app/Http/Controllers/Api/WebApi/SSController.php b/app/Http/Controllers/Api/WebApi/SSController.php index c11dee66..c64188e9 100644 --- a/app/Http/Controllers/Api/WebApi/SSController.php +++ b/app/Http/Controllers/Api/WebApi/SSController.php @@ -12,13 +12,13 @@ class SSController extends CoreController { $data = [ 'id' => $node->id, - 'method' => $node->profile['method'], + 'method' => $node->profile['method'] ?? '', 'speed_limit' => $node->getRawOriginal('speed_limit'), 'client_limit' => $node->client_limit, 'redirect_url' => sysConfig('redirect_url'), ]; - if ($node->profile['passwd']) { + if (! empty($node->profile['passwd'])) { $data['port'] = $node->port; } diff --git a/app/Http/Controllers/Api/WebApi/SSRController.php b/app/Http/Controllers/Api/WebApi/SSRController.php index ed01b5b8..fd4f3524 100644 --- a/app/Http/Controllers/Api/WebApi/SSRController.php +++ b/app/Http/Controllers/Api/WebApi/SSRController.php @@ -12,9 +12,9 @@ class SSRController extends CoreController { return $this->returnData('获取节点信息成功', 200, 'success', [ 'id' => $node->id, - 'method' => $node->profile['method'], - 'protocol' => $node->profile['protocol'], - 'obfs' => $node->profile['obfs'], + 'method' => $node->profile['method'] ?? '', + 'protocol' => $node->profile['protocol'] ?? '', + 'obfs' => $node->profile['obfs'] ?? '', 'obfs_param' => $node->profile['obfs_param'] ?? '', 'is_udp' => $node->is_udp, 'speed_limit' => $node->getRawOriginal('speed_limit'), @@ -39,7 +39,7 @@ class SSRController extends CoreController 'method' => $user->method, 'protocol' => $user->protocol, 'obfs' => $user->obfs, - 'obfs_param' => $node->profile['obfs_param'], + 'obfs_param' => $node->profile['obfs_param'] ?? '', 'speed_limit' => $user->getRawOriginal('speed_limit'), 'enable' => $user->enable, ]; diff --git a/app/Http/Controllers/Api/WebApi/V2RayController.php b/app/Http/Controllers/Api/WebApi/V2RayController.php index 6300b834..4a5ee4e7 100644 --- a/app/Http/Controllers/Api/WebApi/V2RayController.php +++ b/app/Http/Controllers/Api/WebApi/V2RayController.php @@ -12,7 +12,7 @@ class V2RayController extends CoreController public function getNodeInfo(Node $node): JsonResponse { $cert = NodeCertificate::whereDomain($node->profile['v2_host'])->first(); - $tlsProvider = $node->profile['tls_provider'] ?: sysConfig('v2ray_tls_provider'); + $tlsProvider = ! empty($node->profile['tls_provider']) ? $node->profile['tls_provider'] : sysConfig('v2ray_tls_provider'); if (! $tlsProvider) { $tlsProvider = null; } @@ -28,14 +28,14 @@ class V2RayController extends CoreController 'key' => $cert ? $cert->key : '', 'pem' => $cert ? $cert->pem : '', 'v2_license' => (string) sysConfig('v2ray_license'), - 'v2_alter_id' => $node->profile['v2_alter_id'], + 'v2_alter_id' => $node->profile['v2_alter_id'] ?? '', 'v2_port' => $node->port, - 'v2_method' => $node->profile['v2_method'], - 'v2_net' => $node->profile['v2_net'], - 'v2_type' => $node->profile['v2_type'], - 'v2_host' => $node->profile['v2_host'], - 'v2_path' => $node->profile['v2_path'], - 'v2_tls' => (bool) $node->profile['v2_tls'], + 'v2_method' => $node->profile['v2_method'] ?? '', + 'v2_net' => $node->profile['v2_net'] ?? '', + 'v2_type' => $node->profile['v2_type'] ?? '', + 'v2_host' => $node->profile['v2_host'] ?? '', + 'v2_path' => $node->profile['v2_path'] ?? '', + 'v2_tls' => (bool) ($node->profile['v2_tls'] ?? false), 'v2_tls_provider' => $tlsProvider, ]); } diff --git a/config/bobclient.php b/config/bobclient.php index 68c0de8c..3b0ed9bb 100644 --- a/config/bobclient.php +++ b/config/bobclient.php @@ -12,7 +12,7 @@ return [ 'login' => [ 'telegram_url' => '', // 留空的话则不展示telegram群 'qq_url' => '', // 留空的话则不展示QQ群 - 'background_img' => 'https://demo.proxypanel.ml/assets/images/logo64.png', // 背景图片地址,图片宽高不超过 860px * 544px 就行 (留空为默认的背景图) + 'background_img' => 'https://demo.proxypanel.cf/assets/images/logo64.png', // 背景图片地址,图片宽高不超过 860px * 544px 就行 (留空为默认的背景图) 'text' => '一键开启
极速上网体验', 'text_color' => 'rgba(255, 255, 255, 0.8);', // 文字和按钮颜色 默认颜色 rgba(255, 255, 255, 0.8); 'button_color' => '#8077f1', // 文字和按钮颜色 默认颜色:#8077f1(v2版本配置) @@ -50,5 +50,5 @@ return [ ], // 个人中心头像 - 'user_avatar' => 'https://demo.proxypanel.ml/assets/images/avatar.svg', + 'user_avatar' => 'https://demo.proxypanel.cf/assets/images/avatar.svg', ]; diff --git a/database/seeds/PresetSeeder.php b/database/seeds/PresetSeeder.php index 0767fdd3..dcc5aa93 100644 --- a/database/seeds/PresetSeeder.php +++ b/database/seeds/PresetSeeder.php @@ -141,7 +141,7 @@ class PresetSeeder extends Seeder 'website_name' => 'ProxyPanel', 'is_reset_password' => 1, 'reset_password_times' => 3, - 'website_url' => 'https://demo.proxypanel.ml', + 'website_url' => 'https://demo.proxypanel.cf', 'active_times' => 3, 'is_checkin' => 1, 'min_rand_traffic' => 10, diff --git a/readme.md b/readme.md index 9d13cbdc..25ef1c2c 100644 --- a/readme.md +++ b/readme.md @@ -3,7 +3,7 @@ Support but not limited to: Shadowsocks,ShadowsocksR,ShadowsocksRR,V2Ray,Trojan,VNET -- [Demo](https://demo.proxypanel.ml/) Demo will always on dev/latest code, rather than the stable version. +- [Demo](https://demo.proxypanel.cf/) Demo will always on dev/latest code, rather than the stable version. - Account: test@test.com - Password: 123456 - [**WIKI**](https://proxypanel.gitbook.io/wiki/) diff --git a/resources/views/admin/config/system.blade.php b/resources/views/admin/config/system.blade.php index ca92a073..5684ccd9 100644 --- a/resources/views/admin/config/system.blade.php +++ b/resources/views/admin/config/system.blade.php @@ -120,7 +120,7 @@ - + diff --git a/resources/views/admin/node/index.blade.php b/resources/views/admin/node/index.blade.php index bf74a0b0..6b0ad659 100644 --- a/resources/views/admin/node/index.blade.php +++ b/resources/views/admin/node/index.blade.php @@ -60,9 +60,9 @@ {{$node->transfer}} {{$node->traffic_rate}} - @if(isset($node->profile['passwd'])) + @isset($node->profile['passwd']) - @endif + @endisset @if($node->relay_node_id) @endif diff --git a/resources/views/admin/node/info.blade.php b/resources/views/admin/node/info.blade.php index 22f1fb7a..7d9ca26d 100644 --- a/resources/views/admin/node/info.blade.php +++ b/resources/views/admin/node/info.blade.php @@ -480,7 +480,7 @@ $('#v2_port').val('{{$node->port}}'); $('#v2_sni').val('{{$node->profile['v2_sni'] ?? null}}'); v2_path.val('{{$node->profile['v2_path'] ?? null}}'); - @if($node->profile['v2_tls']) + @if($node->profile['v2_tls'] ?? false) $('#v2_tls').click(); @endif $('#tls_provider').val('{!! $node->tls_provider !!}'); diff --git a/resources/views/admin/user/export.blade.php b/resources/views/admin/user/export.blade.php index 1774395c..247291b0 100644 --- a/resources/views/admin/user/export.blade.php +++ b/resources/views/admin/user/export.blade.php @@ -33,7 +33,7 @@ @endcan - @if($node->profile['passwd']) @endif + @if(!empty($node->profile['passwd'])) @endif @if($node->ipv6) IPv6 @endif {{$node->server}}