tcjlj/Xboard
1
0
Fork 0
mirror of https://github.com/cedar2025/Xboard.git synced 2025-02-02 15:38:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: 修复vless的 ws、grpc订阅问题

Browse Source
This commit is contained in:
gua 2023-11-17 16:34:16 +08:00
parent c66aea9de2
commit 4387f9de11
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Protocols/ClashMeta.php
View File

@ -217,8 +217,8 @@ class ClashMeta
if ($server['network'] === 'ws') { if ($server['network'] === 'ws') {
$array['network'] = 'ws'; $array['network'] = 'ws';
if ($server['networkSettings']) { if ($server['network_settings']) {
$wsSettings = $server['networkSettings']; $wsSettings = $server['network_settings'];
$array['ws-opts'] = []; $array['ws-opts'] = [];
if (isset($wsSettings['path']) && !empty($wsSettings['path'])) if (isset($wsSettings['path']) && !empty($wsSettings['path']))
$array['ws-opts']['path'] = $wsSettings['path']; $array['ws-opts']['path'] = $wsSettings['path'];

4
app/Protocols/General.php
View File

@ -143,13 +143,13 @@ class General
} }
// 如果传输协议为ws // 如果传输协议为ws
if ((string)$server['network'] === 'ws') { if ((string)$server['network'] === 'ws') {
$wsSettings = $server['networkSettings']; $wsSettings = $server['network_settings'];
if (isset($wsSettings['path'])) $config['path'] = $wsSettings['path']; if (isset($wsSettings['path'])) $config['path'] = $wsSettings['path'];
if (isset($wsSettings['headers']['Host'])) $config['host'] = $wsSettings['headers']['Host']; if (isset($wsSettings['headers']['Host'])) $config['host'] = $wsSettings['headers']['Host'];
} }
// 传输协议为grpc // 传输协议为grpc
if ((string)$server['network'] === 'grpc') { if ((string)$server['network'] === 'grpc') {
$grpcSettings = $server['networkSettings']; $grpcSettings = $server['network_settings'];
if (isset($grpcSettings['serviceName'])) $config['serviceName'] = $grpcSettings['serviceName']; if (isset($grpcSettings['serviceName'])) $config['serviceName'] = $grpcSettings['serviceName'];
} }

4
app/Protocols/Passwall.php
View File

@ -131,13 +131,13 @@ class Passwall
} }
// 如果传输协议为ws // 如果传输协议为ws
if ((string)$server['network'] === 'ws') { if ((string)$server['network'] === 'ws') {
$wsSettings = $server['networkSettings']; $wsSettings = $server['network_settings'];
if (isset($wsSettings['path'])) $config['path'] = $wsSettings['path']; if (isset($wsSettings['path'])) $config['path'] = $wsSettings['path'];
if (isset($wsSettings['headers']['Host'])) $config['host'] = $wsSettings['headers']['Host']; if (isset($wsSettings['headers']['Host'])) $config['host'] = $wsSettings['headers']['Host'];
} }
// 传输协议为grpc // 传输协议为grpc
if ((string)$server['network'] === 'grpc') { if ((string)$server['network'] === 'grpc') {
$grpcSettings = $server['networkSettings']; $grpcSettings = $server['network_settings'];
if (isset($grpcSettings['serviceName'])) $config['serviceName'] = $grpcSettings['serviceName']; if (isset($grpcSettings['serviceName'])) $config['serviceName'] = $grpcSettings['serviceName'];
} }

4
app/Protocols/V2rayN.php
View File

@ -144,13 +144,13 @@ class V2rayN
} }
// 如果传输协议为ws // 如果传输协议为ws
if ((string)$server['network'] === 'ws') { if ((string)$server['network'] === 'ws') {
$wsSettings = $server['networkSettings']; $wsSettings = $server['network_settings'];
if (isset($wsSettings['path'])) $config['path'] = $wsSettings['path']; if (isset($wsSettings['path'])) $config['path'] = $wsSettings['path'];
if (isset($wsSettings['headers']['Host'])) $config['host'] = $wsSettings['headers']['Host']; if (isset($wsSettings['headers']['Host'])) $config['host'] = $wsSettings['headers']['Host'];
} }
// 传输协议为grpc // 传输协议为grpc
if ((string)$server['network'] === 'grpc') { if ((string)$server['network'] === 'grpc') {
$grpcSettings = $server['networkSettings']; $grpcSettings = $server['network_settings'];
if (isset($grpcSettings['serviceName'])) $config['serviceName'] = $grpcSettings['serviceName']; if (isset($grpcSettings['serviceName'])) $config['serviceName'] = $grpcSettings['serviceName'];
} }

4
app/Protocols/V2rayNG.php
View File

@ -131,13 +131,13 @@ class V2rayNG
} }
// 如果传输协议为ws // 如果传输协议为ws
if ((string)$server['network'] === 'ws') { if ((string)$server['network'] === 'ws') {
$wsSettings = $server['networkSettings']; $wsSettings = $server['network_settings'];
if (isset($wsSettings['path'])) $config['path'] = $wsSettings['path']; if (isset($wsSettings['path'])) $config['path'] = $wsSettings['path'];
if (isset($wsSettings['headers']['Host'])) $config['host'] = $wsSettings['headers']['Host']; if (isset($wsSettings['headers']['Host'])) $config['host'] = $wsSettings['headers']['Host'];
} }
// 传输协议为grpc // 传输协议为grpc
if ((string)$server['network'] === 'grpc') { if ((string)$server['network'] === 'grpc') {
$grpcSettings = $server['networkSettings']; $grpcSettings = $server['network_settings'];
if (isset($grpcSettings['serviceName'])) $config['serviceName'] = $grpcSettings['serviceName']; if (isset($grpcSettings['serviceName'])) $config['serviceName'] = $grpcSettings['serviceName'];
} }