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

update

Browse Source
This commit is contained in:
Tokumeikoi
2020-03-31 00:22:49 +08:00
parent 79f53f2836
commit 42607a789d
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Services/ServerService.php
View File

@@ -43,9 +43,9 @@ class ServerService
$json->inboundDetour[0]->port = (int)$localPort; $json->inboundDetour[0]->port = (int)$localPort;
$json->inbound->port = (int)$server->server_port; $json->inbound->port = (int)$server->server_port;
$json->inbound->streamSettings->network = $server->network; $json->inbound->streamSettings->network = $server->network;
$json = $this->setNetwork($server, $json); $this->setNetwork($server, $json);
$json = $this->setRule($server, $json); $this->setRule($server, $json);
$json = $this->setTls($server, $json); $this->setTls($server, $json);
return $json; return $json;
} }
@@ -81,7 +81,6 @@ class ServerService
break; break;
} }
} }
return $json;
} }
private function setRule(Server $server, object $json) private function setRule(Server $server, object $json)
@@ -105,7 +104,6 @@ class ServerService
array_push($json->routing->rules, $protocolObj); array_push($json->routing->rules, $protocolObj);
} }
} }
return $json;
} }
private function setTls(Server $server, object $json) private function setTls(Server $server, object $json)
@@ -126,6 +124,5 @@ class ServerService
} }
$json->inbound->streamSettings->tlsSettings->certificates[0] = $tls; $json->inbound->streamSettings->tlsSettings->certificates[0] = $tls;
} }
return $json;
} }
} }