Revert "改名"

This reverts commit fdf58326

Annotation/JsonRpc.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Kiri\Rpc\Note;
+namespace Kiri\Rpc\Annotation;
 
 use Kiri\Abstracts\Config;
 use Kiri\Core\Network;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
 use Kiri\Rpc\RpcManager;
-use Note\Attribute;
+use Kiri\Annotation\Attribute;
 use ReflectionException;
 
 #[\Attribute(\Attribute::TARGET_CLASS)] class JsonRpc extends Attribute
@@ -23,10 +23,11 @@ use ReflectionException;
 	 * @param array $tags
 	 * @param array $meta
 	 * @param array $checkOptions
+	 * @param string $checkUrl
 	 */
-	public function __construct(public string $service, public string $driver, public array $tags = [], public array $meta = [], public array $checkOptions = [])
+	public function __construct(public string $service, public string $driver, public array $tags = [], public array $meta = [], public array $checkOptions = [], public string $checkUrl = '')
 	{
-		$this->uniqueId = preg_replace('/(\w{11})(\w{4})(\w{3})(\w{8})(\w{6})/', '$1-$2-$3-$4-$5', md5(__DIR__ . '.' . md5(Network::local())));
+		$this->uniqueId = preg_replace('/(\w{11})(\w{4})(\w{3})(\w{8})(\w{6})/', '$1-$2-$3-$4-$5', md5(__DIR__ . 'Annotation' . md5(Network::local())));
 	}
 
 
@@ -49,6 +50,9 @@ use ReflectionException;
 	protected function create(): array
 	{
 		$rpcPort = Config::get('rpc.port');
+		if (empty($this->checkUrl)) {
+			$this->checkUrl = Network::local() . ":" . Config::get('rpc.port');
+		}
 		$defaultConfig = [
 			"ID"                => "rpc.json.{$this->service}." . $this->uniqueId,
 			"Name"              => $this->service,
@@ -66,9 +70,9 @@ use ReflectionException;
 			"Check"             => [
 				"CheckId"                        => "service:rpc.json.{$this->service}." . $this->uniqueId,
 				"Name"                           => "service " . $this->service . ' health check',
-				"Notes"                          => "Script based health check",
+				"Annotations"                          => "Script based health check",
 				"ServiceID"                      => $this->service,
-				"TCP"                            => Network::local() . ":" . Config::get('rpc.port'),
+				"TCP"                            => $this->checkUrl,
 				"Interval"                       => "5s",
 				"Timeout"                        => "1s",
 				"DeregisterCriticalServiceAfter" => "30s"

JsonRpcConsumers.php

@@ -4,8 +4,8 @@ namespace Kiri\Rpc;
 
 
 use Exception;
-use Http\Message\ServerRequest;
+use Kiri\Message\ServerRequest;
-use Http\Message\Stream;
+use Kiri\Message\Stream;
 use Kiri\Core\Number;
 use Kiri\Kiri;
 use Kiri\Pool\Pool;
@@ -110,6 +110,7 @@ abstract class JsonRpcConsumers implements OnRpcConsumerInterface
 	 * @param $service
 	 * @return array
 	 * @throws RpcServiceException|\ReflectionException
+	 * @throws Exception
 	 */
 	private function get_consul($service): array
 	{

JsonRpcPoolTransporter.php

@@ -2,10 +2,10 @@
 
 namespace Kiri\Rpc;
 
-use Note\Inject;
+use Kiri\Annotation\Inject;
 use Exception;
-use Http\Message\Response;
+use Kiri\Message\Response;
-use Http\Message\Stream;
+use Kiri\Message\Stream;
 use Kiri\Abstracts\Config;
 use Kiri\Exception\ConfigException;
 use Psr\Http\Client\ClientInterface;

JsonRpcTransporter.php

@@ -2,8 +2,8 @@
 
 namespace Kiri\Rpc;
 
-use Http\Message\Response;
+use Kiri\Message\Response;
-use Http\Message\Stream;
+use Kiri\Message\Stream;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;

RpcJsonp.php

@@ -2,10 +2,10 @@
 
 namespace Kiri\Rpc;
 
-use Http\Constrict\RequestInterface;
+use Kiri\Message\Constrict\RequestInterface;
-use Http\Handler\Handler;
+use Kiri\Message\Handler\Handler;
-use Http\Handler\Router;
+use Kiri\Message\Handler\Router;
-use Http\Message\ServerRequest;
+use Kiri\Message\ServerRequest;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
 use Kiri\Consul\Agent;
@@ -13,19 +13,19 @@ use Kiri\Context;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
-use Note\Inject;
+use Kiri\Annotation\Inject;
-use Note\Note;
+use Kiri\Annotation\Annotation;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use ReflectionException;
-use Server\Contract\OnCloseInterface;
+use Kiri\Server\Contract\OnCloseInterface;
-use Server\Contract\OnConnectInterface;
+use Kiri\Server\Contract\OnConnectInterface;
-use Server\Contract\OnReceiveInterface;
+use Kiri\Server\Contract\OnReceiveInterface;
-use Server\Events\OnBeforeShutdown;
+use Kiri\Server\Events\OnBeforeShutdown;
-use Server\Events\OnServerBeforeStart;
+use Kiri\Server\Events\OnServerBeforeStart;
-use Server\Events\OnTaskerStart;
+use Kiri\Server\Events\OnTaskerStart;
-use Server\Events\OnWorkerStart;
+use Kiri\Server\Events\OnWorkerStart;
 use Swoole\Coroutine;
 use Swoole\Coroutine\Channel;
 use Swoole\Server;
@@ -43,13 +43,10 @@ class RpcJsonp extends Component implements OnConnectInterface, OnReceiveInterfa
 	public Router $router;
 
 
-	#[Inject(Note::class)]
+	#[Inject(Annotation::class)]
-	public Note $annotation;
+	public Annotation $annotation;
 
 
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
 
 	private RpcManager $manager;
 
@@ -72,6 +69,7 @@ class RpcJsonp extends Component implements OnConnectInterface, OnReceiveInterfa
 
 	/**
 	 * @param OnBeforeShutdown $beforeShutdown
+	 * @return void
 	 * @throws ContainerExceptionInterface
 	 * @throws NotFoundExceptionInterface
 	 */
@@ -108,7 +106,6 @@ class RpcJsonp extends Component implements OnConnectInterface, OnReceiveInterfa
 
 	/**
 	 * @param OnServerBeforeStart $server
-	 * @throws ReflectionException
 	 */
 	public function register(OnServerBeforeStart $server)
 	{
@@ -267,10 +264,9 @@ class RpcJsonp extends Component implements OnConnectInterface, OnReceiveInterfa
 
 
 	/**
-	 * @param Server $server
 	 * @param int $fd
 	 */
-	public function onClose(Server $server, int $fd): void
+	public function onClose(int $fd): void
 	{
 		// TODO: Implement onClose() method.
 	}

RpcManager.php

@@ -2,7 +2,7 @@
 
 namespace Kiri\Rpc;
 
-use Http\Handler\Handler;
+use Kiri\Message\Handler\Handler;
 use Kiri\Abstracts\Component;
 use Kiri\Consul\Agent;
 use Kiri\Consul\Health;
@@ -112,7 +112,6 @@ class RpcManager extends Component
 
 
 	/**
-	 * @throws ReflectionException
 	 */
 	public function register()
 	{
@@ -120,7 +119,7 @@ class RpcManager extends Component
 		foreach ($this->_rpc as $list) {
 			$data = $agent->service->register($list['config']);
 			if ($data->getStatusCode() != 200) {
-				exit($data->getBody());
+				return;
 			}
 		}
 	}

composer.json

@@ -16,7 +16,7 @@
   },
   "autoload": {
     "psr-4": {
-      "Kiri\\Rpc\\": "src/"
+      "Kiri\\Rpc\\": "./"
     }
   },
   "require-dev": {

config.php

@@ -3,7 +3,7 @@
 
 use Kiri\Rpc\RpcJsonp;
 use Kiri\Rpc\TestRpcService;
-use Server\Constant;
+use Kiri\Server\Constant;
 
 return [
 	'rpc' => [
@@ -61,7 +61,7 @@ return [
 				"node"       => "t2.320",
 				"checkId"    => "service:redis1",
 				"name"       => "Redis health check",
-				"notes"      => "Script based health check",
+				"Annotations"      => "Script based health check",
 				"status"     => "passing",
 				"serviceID"  => "redis1",
 				"definition" => [