yanyu/v2board
1
0
Fork 0
mirror of https://github.com/v2board/v2board.git synced 2025-10-31 09:21:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/v2board/v2board into dev

Browse Source
This commit is contained in:
tokumeikoi
2022-01-05 15:08:33 +08:00
parent 870e82e155 77e9e3adeb
commit b4e657f463
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Client/Protocols/Clash.php
View File

@@ -115,18 +115,19 @@ class Clash
$array['network'] = 'ws'; $array['network'] = 'ws';
if ($server['networkSettings']) { if ($server['networkSettings']) {
$wsSettings = $server['networkSettings']; $wsSettings = $server['networkSettings'];
$array['ws-opts'] = [];
if (isset($wsSettings['path']) && !empty($wsSettings['path'])) if (isset($wsSettings['path']) && !empty($wsSettings['path']))
$array['ws-path'] = $wsSettings['path']; $array['ws-opts']['path'] = $wsSettings['path'];
if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host'])) if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
$array['ws-headers'] = ['Host' => $wsSettings['headers']['Host']]; $array['ws-opts']['headers'] = ['Host' => $wsSettings['headers']['Host']];
} }
} }
if ($server['network'] === 'grpc') { if ($server['network'] === 'grpc') {
$array['network'] = 'grpc'; $array['network'] = 'grpc';
if ($server['networkSettings']) { if ($server['networkSettings']) {
$grpcObject = $server['networkSettings']; $grpcSettings = $server['networkSettings'];
$array['grpc-opts'] = []; $array['grpc-opts'] = [];
$array['grpc-opts']['grpc-service-name'] = $grpcObject['serviceName']; $array['grpc-opts']['grpc-service-name'] = $grpcSettings['serviceName'];
} }
} }

9
app/Http/Controllers/Client/Protocols/Stash.php
View File

@@ -116,18 +116,19 @@ class Stash
$array['network'] = 'ws'; $array['network'] = 'ws';
if ($server['networkSettings']) { if ($server['networkSettings']) {
$wsSettings = $server['networkSettings']; $wsSettings = $server['networkSettings'];
$array['ws-opts'] = [];
if (isset($wsSettings['path']) && !empty($wsSettings['path'])) if (isset($wsSettings['path']) && !empty($wsSettings['path']))
$array['ws-path'] = $wsSettings['path']; $array['ws-opts']['path'] = $wsSettings['path'];
if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host'])) if (isset($wsSettings['headers']['Host']) && !empty($wsSettings['headers']['Host']))
$array['ws-headers'] = ['Host' => $wsSettings['headers']['Host']]; $array['ws-opts']['headers'] = ['Host' => $wsSettings['headers']['Host']];
} }
} }
if ($server['network'] === 'grpc') { if ($server['network'] === 'grpc') {
$array['network'] = 'grpc'; $array['network'] = 'grpc';
if ($server['networkSettings']) { if ($server['networkSettings']) {
$grpcObject = $server['networkSettings']; $grpcSettings = $server['networkSettings'];
$array['grpc-opts'] = []; $array['grpc-opts'] = [];
$array['grpc-opts']['grpc-service-name'] = $grpcObject['serviceName']; $array['grpc-opts']['grpc-service-name'] = $grpcSettings['serviceName'];
} }
} }