diff --git a/src/JsonRpcConsumers.php b/src/JsonRpcConsumers.php index 15d78a3..76cfd1a 100644 --- a/src/JsonRpcConsumers.php +++ b/src/JsonRpcConsumers.php @@ -95,13 +95,15 @@ abstract class JsonRpcConsumers implements OnRpcConsumerInterface */ private function get_consul($service): array { - $sf = Kiri::getDi()->get(Catalog::class); +// $sf = Kiri::getDi()->get(Catalog::class); +// +// $content = $sf->service($service)->getBody()->getContents(); +// +// $content = json_decode($content, true); +// +// return $content[array_rand($content)]; - $content = $sf->service($service)->getBody()->getContents(); - - $content = json_decode($content, true); - - return $content[array_rand($content)]; + return ['ServiceAddress' => '127.0.0.1', 'ServicePort' => 9526]; } diff --git a/src/RpcJsonp.php b/src/RpcJsonp.php index 9383c4f..c4a6228 100644 --- a/src/RpcJsonp.php +++ b/src/RpcJsonp.php @@ -172,9 +172,7 @@ class RpcJsonp extends Component implements OnConnectInterface, OnReceiveInterfa { $controller = Kiri::getDi()->get($handler[0]); - $params = array_merge($params, $data['params']); - - $dispatcher = $controller->{$handler[1]}(...$params); + $dispatcher = $controller->{$handler[1]}(...$data['params']); return ['jsonrpc' => '2.0', 'result' => $dispatcher, 'id' => $data['id'] ?? null]; } diff --git a/src/RpcManager.php b/src/RpcManager.php index 1ecf4ee..f1286c7 100644 --- a/src/RpcManager.php +++ b/src/RpcManager.php @@ -25,9 +25,11 @@ class RpcManager if (!isset(static::$_rpc[$name])) static::$_rpc[$name] = []; foreach ($lists as $reflection) { - $params = Kiri::getDi()->getMethodParameters($class, $reflection->getName()); + $methodName = $reflection->getName(); - static::$_rpc[$name][] = [$reflection->getName(), $params]; + $params = Kiri::getDi()->getMethodParameters($class, $methodName); + + static::$_rpc[$name][$methodName] = [[$class, $methodName], $params]; } return true; }