From a8a202ad6b58ea5319539f2590ab12530206df3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Thu, 2 Dec 2021 14:38:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Note/JsonRpc.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Note/JsonRpc.php b/src/Note/JsonRpc.php index 74a9722..fd61404 100644 --- a/src/Note/JsonRpc.php +++ b/src/Note/JsonRpc.php @@ -49,23 +49,20 @@ use ReflectionException; protected function create(): array { $rpcPort = Config::get('rpc.port'); - return [ + $defaultConfig = [ "ID" => "rpc.json.{$this->service}." . $this->uniqueId, "Name" => $this->service, "EnableTagOverride" => false, "TaggedAddresses" => [ - "lan" => [ + "lan_ipv4" => [ "address" => "127.0.0.1", "port" => $rpcPort ], - "wan" => [ + "wan_ipv4" => [ "address" => Network::local(), "port" => $rpcPort ] ], - "Meta" => $this->meta, - "Address" => Network::local(), - "Port" => $rpcPort, "Check" => [ "CheckId" => "service:rpc.json.{$this->service}." . $this->uniqueId, "Name" => "service " . $this->service . ' health check', @@ -77,6 +74,13 @@ use ReflectionException; "DeregisterCriticalServiceAfter" => "30s" ], ]; + if (!empty($this->meta)) { + $defaultConfig["Meta"] = $this->meta; + } + if (!empty($this->tags)) { + $defaultConfig["tags"] = $this->tags; + } + return $defaultConfig; }