Revert "改名"

This reverts commit fdf58326

Annotation/JsonRpc.php

@@ -5,7 +5,7 @@ namespace Kiri\Rpc\Annotation;
 use Kiri\Abstracts\Config;
 use Kiri\Core\Network;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Rpc\RpcManager;
 use Kiri\Annotation\Attribute;
 use ReflectionException;
@@ -70,7 +70,7 @@ use ReflectionException;
 			"Check"             => [
 				"CheckId"                        => "service:rpc.json.{$this->service}." . $this->uniqueId,
 				"Name"                           => "service " . $this->service . ' health check',
-				"Annotations"                          => "Script based health check",
+				"Notes"                          => "Script based health check",
 				"ServiceID"                      => $this->service,
 				"TCP"                            => $this->checkUrl,
 				"Interval"                       => "5s",

ClientPool.php

@@ -6,7 +6,7 @@ use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Context;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Pool\Alias;
 use Kiri\Pool\Pool;
 use Swoole\Client;

JsonRpcConsumers.php

@@ -4,10 +4,10 @@ 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;
 use Kiri\Pool\Pool;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Message\ResponseInterface;

JsonRpcPoolTransporter.php

@@ -4,8 +4,8 @@ namespace Kiri\Rpc;
 
 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,30 +2,30 @@
 
 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;
 use Kiri\Context;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\Annotation\Inject;
 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;
@@ -94,7 +94,7 @@ class RpcJsonp extends Component implements OnConnectInterface, OnReceiveInterfa
 			return;
 		}
 		$async_time = (int)Config::get('consul.async_time', 1000);
-		Timer::tick($async_time, static function ($timeId) {
+		Timer::tick(5000, static function ($timeId) {
 			if (env('state', 'start') == 'exit') {
 				Timer::clear($timeId);
 				return;
@@ -264,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,11 +2,11 @@
 
 namespace Kiri\Rpc;
 
-use Http\Handler\Handler;
 use Kiri\Abstracts\Component;
 use Kiri\Consul\Agent;
 use Kiri\Consul\Health;
-use Kiri\Kiri;
+use Kiri;
+use Kiri\Message\Handler\Handler;
 use ReflectionException;
 
 class RpcManager extends Component
@@ -117,6 +117,7 @@ class RpcManager extends Component
 	{
 		$agent = Kiri::getDi()->get(Agent::class);
 		foreach ($this->_rpc as $list) {
+			$agent->service->deregister($list['config']['ID']);
 			$data = $agent->service->register($list['config']);
 			if ($data->getStatusCode() != 200) {
 				return;

config.php

@@ -3,7 +3,7 @@
 
 use Kiri\Rpc\RpcJsonp;
 use Kiri\Rpc\TestRpcService;
-use Server\Constant;
+use Kiri\Server\Constant;
 
 return [
 	'rpc' => [