改名

composer.json

@@ -36,8 +36,9 @@
   "autoload": {
     "psr-4": {
       "Kiri\\": "kiri-engine/",
+      "Kiri\\Gateway\\": "kiri-gateway/",
       "Gii\\": "kiri-gii/",
-      "Annotation\\": "kiri-note/"
+      "Note\\": "kiri-note/"
     },
     "files": [
       "error.php",

function.php

@@ -3,8 +3,8 @@
 defined('APP_PATH') or define('APP_PATH', realpath(__DIR__ . '/../../'));
 
 
-use Annotation\Annotation;
+use Note\Note;
-use Annotation\Route\Route;
+use Note\Route\Route;
 use Http\Handler\Router;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Config;
@@ -180,12 +180,12 @@ if (!function_exists('annotation')) {
 
 
 	/**
-	 * @return Annotation
+	 * @return Note
 	 * @throws Exception
 	 */
-	function annotation(): Annotation
+	function annotation(): Note
 	{
-		return Kiri::getAnnotation();
+		return Kiri::getNote();
 	}
 
 
@@ -204,7 +204,7 @@ if (!function_exists('scan_directory')) {
 	 */
 	function scan_directory($dir, $namespace, array $exclude = [])
 	{
-		$annotation = Kiri::app()->getAnnotation();
+		$annotation = Kiri::app()->getNote();
 		$annotation->read($dir, $namespace, $exclude);
 
 		injectRuntime($dir, $exclude);
@@ -224,7 +224,7 @@ if (!function_exists('injectRuntime')) {
 	 */
 	function injectRuntime(string $path, array $exclude = [])
 	{
-		$fileLists = Kiri::getAnnotation()->runtime($path, $exclude);
+		$fileLists = Kiri::getNote()->runtime($path, $exclude);
 		$di = Kiri::getDi();
 
 		$router = [];

kiri-engine/Abstracts/BaseApplication.php

@@ -10,7 +10,7 @@ declare(strict_types=1);
 namespace Kiri\Abstracts;
 
 
-use Annotation\Annotation as SAnnotation;
+use Note\Note as SNote;
 use Database\Connection;
 use Exception;
 use Http\Handler\Router;
@@ -392,10 +392,10 @@ abstract class BaseApplication extends Component
 
 
 	/**
-	 * @return SAnnotation
+	 * @return SNote
 	 * @throws
 	 */
-	public function getAnnotation(): SAnnotation
+	public function getNote(): SNote
 	{
 		return $this->get('annotation');
 	}
@@ -450,7 +450,7 @@ abstract class BaseApplication extends Component
 			'error'           => ['class' => ErrorHandler::class],
 			'config'          => ['class' => Config::class],
 			'logger'          => ['class' => Logger::class],
-			'annotation'      => ['class' => SAnnotation::class],
+			'annotation'      => ['class' => SNote::class],
 			'databases'       => ['class' => Connection::class],
 			'jwt'             => ['class' => Jwt::class],
 			'async'           => ['class' => Async::class],

kiri-engine/Abstracts/Logger.php

@@ -2,7 +2,7 @@
 
 namespace Kiri\Abstracts;
 
-use Annotation\Inject;
+use Note\Inject;
 use Exception;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;

kiri-engine/Abstracts/TraitApplication.php

@@ -4,7 +4,7 @@
 namespace Kiri\Abstracts;
 
 
-use Annotation\Annotation as SAnnotation;
+use Note\Note as SNote;
 use Database\Connection;
 use Database\DatabasesProviders;
 use Http\Handler\Client\Client;
@@ -25,7 +25,7 @@ use Kiri\Jwt\JWTAuth;
  * @property Async $async
  * @property Logger $logger
  * @property JWTAuth $jwt
- * @property SAnnotation $annotation
+ * @property SNote $annotation
  * @property BaseGoto $goto
  * @property Client $client
  * @property Connection $databases

kiri-engine/Cache/Redis.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 namespace Kiri\Cache;
 
-use Annotation\Inject;
+use Note\Inject;
 use Exception;
 use Server\Events\OnWorkerExit;
 use Kiri\Abstracts\Component;

kiri-engine/Di/Container.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 namespace Kiri\Di;
 
-use Annotation\Inject;
+use Note\Inject;
 use Closure;
 use Exception;
 use Kiri\Abstracts\BaseObject;

kiri-engine/Di/NoteManager.php

@@ -236,7 +236,7 @@ class NoteManager
      * @param string $method
      * @return mixed
      */
-    public static function getPropertyByAnnotation(string $attribute, string $class, string $method): mixed
+    public static function getPropertyByNote(string $attribute, string $class, string $method): mixed
     {
         $class = self::getAttributeTrees($attribute, $class);
         if (empty($class) || !isset($class['property'])) {

kiri-engine/Error/Logger.php

@@ -9,7 +9,7 @@ declare(strict_types=1);
 
 namespace Kiri\Error;
 
-use Annotation\Inject;
+use Note\Inject;
 use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Core\Json;

kiri-engine/FileListen/HotReload.php

@@ -2,7 +2,7 @@
 
 namespace Kiri\FileListen;
 
-use Annotation\Inject;
+use Note\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Error\Logger;

kiri-engine/Kiri.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Kiri;
 
 
-use Annotation\Annotation;
+use Note\Note;
 use Database\Collection;
 use Database\ModelInterface;
 use Exception;
@@ -156,12 +156,12 @@ class Kiri
 
 
 	/**
-	 * @return Annotation
+	 * @return Note
 	 * @throws Exception
 	 */
-	public static function getAnnotation(): Annotation
+	public static function getNote(): Note
 	{
-		return static::app()->getAnnotation();
+		return static::app()->getNote();
 	}
 
 

kiri-engine/Runtime.php

@@ -43,7 +43,7 @@ class Runtime extends Command
 	public function execute(InputInterface $input, OutputInterface $output): int
 	{
 		// TODO: Implement onHandler() method.
-		$annotation = Kiri::app()->getAnnotation();
+		$annotation = Kiri::app()->getNote();
 
 		$runtime = storage(static::CACHE_NAME);
 		$config = storage(static::CONFIG_NAME);

kiri-gateway/Collector.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Kiri\Gateway;
+
+class Collector
+{
+
+
+	public function get()
+	{
+	}
+
+
+}

kiri-gateway/GatewayServer.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Kiri\Gateway;
+
+use Swoole\Http\Request;
+use Swoole\Http\Response;
+
+class GatewayServer
+{
+
+
+	/**
+	 * @param Request $request
+	 * @param Response $response
+	 */
+	public function onRequest(Request $request, Response $response)
+	{
+
+
+	}
+
+
+}

kiri-gateway/HashMap.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Kiri\Gateway;
+
+class HashMap
+{
+
+
+	const HTTP = 1;
+	const TCP = 2;
+	const UDP = 2;
+
+
+	public string $domain;
+
+
+	public string $path;
+
+
+	public string $scheme;
+
+
+	public string $method;
+
+
+	public string $proxy_host;
+
+
+	public string $proxy_port;
+
+
+	public int $type = self::HTTP;
+
+
+}

kiri-gii/GiiController.php

@@ -68,9 +68,9 @@ namespace {$namespace};
 		} else {
 			$import = "use Kiri;
 use Exception;
-use Annotation\Target;
+use Note\Target;
-use Annotation\Route\Middleware;
+use Note\Route\Middleware;
-use Annotation\Route\Route;
+use Note\Route\Route;
 use Kiri\Core\Str;
 use Kiri\Core\Json;
 use Http\Context\Request;

kiri-gii/GiiJsonRpc.php

@@ -51,8 +51,8 @@ interface ' . ucfirst($name) . 'RpcInterface
 namespace Rpc\Producers;
 
 
-use Annotation\Target;
+use Note\Target;
-use Annotation\Mapping;
+use Note\Mapping;
 use Rpc\\' . ucfirst($name) . 'RpcInterface;
 use Exception;
 use Kiri\Rpc\JsonRpcConsumers;
@@ -86,8 +86,8 @@ class ' . ucfirst($name) . 'RpcService extends JsonRpcConsumers implements ' . u
 namespace Rpc\Consumers;
 
 
-use Annotation\Target;
+use Note\Target;
-use Kiri\Rpc\Annotation\JsonRpc;
+use Kiri\Rpc\Note\JsonRpc;
 use Http\Handler\Controller;
 use Rpc\\' . ucfirst($name) . 'RpcInterface;
 

kiri-gii/GiiModel.php

@@ -69,11 +69,11 @@ namespace ' . $namespace . ';
 					$html .= $imports . PHP_EOL;
 				}
 
-				if (!str_contains($imports, 'Database\Annotation\Set')) {
+				if (!str_contains($imports, 'Database\Note\Set')) {
-					$html .= 'use Database\Annotation\Set;' . PHP_EOL;
+					$html .= 'use Database\Note\Set;' . PHP_EOL;
 				}
-				if (!str_contains($imports, 'Database\Annotation\Get')) {
+				if (!str_contains($imports, 'Database\Note\Get')) {
-					$html .= 'use Database\Annotation\Get;' . PHP_EOL;
+					$html .= 'use Database\Note\Get;' . PHP_EOL;
 				}
 			} catch (\Throwable $e) {
 				logger()->addError($e, 'throwable');
@@ -87,11 +87,11 @@ namespace ' . $namespace . ';
 
 
 use Exception;
-use Annotation\Target;
+use Note\Target;
 use Kiri\Core\Json;
 use Database\Connection;
-use Database\Annotation\Get;
+use Database\Note\Get;
-use Database\Annotation\Set;
+use Database\Note\Set;
 use Database\Relation;
 use Database\Model;
 ' . PHP_EOL;

kiri-gii/GiiRpcClient.php

@@ -36,9 +36,9 @@ class GiiRpcClient extends GiiBase
 		
 namespace App\Client\Rpc;
 
-use Annotation\Rpc\Consumer;
+use Note\Rpc\Consumer;
-use Annotation\Rpc\RpcClient;
+use Note\Rpc\RpcClient;
-use Annotation\Target;
+use Note\Target;
 use Exception;
 use Rpc\Client;
 use Kiri\Core\Json;

kiri-gii/GiiRpcService.php

@@ -33,8 +33,8 @@ class GiiRpcService extends GiiBase
 		
 namespace App\Rpc;
 
-use Annotation\Route\RpcProducer;
+use Note\Route\RpcProducer;
-use Annotation\Target;
+use Note\Target;
 use Exception;
 use Http\Controller;
 use Kiri\Core\Json;

kiri-note/Aspect.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Annotation;
+namespace Note;
 
 
 use Exception;
@@ -10,7 +10,7 @@ defined('ASPECT_ERROR') or define('ASPECT_ERROR', 'Aspect annotation must implem
 
 /**
  * Class Aspect
- * @package Annotation
+ * @package Note
  */
 #[\Attribute(\Attribute::TARGET_METHOD)] class Aspect extends Attribute
 {

kiri-note/Attribute.php

@@ -1,14 +1,14 @@
 <?php
 
 
-namespace Annotation;
+namespace Note;
 
 
 /**
  * Class Attribute
- * @package Annotation
+ * @package Note
  */
-abstract class Attribute implements IAnnotation
+abstract class Attribute implements INote
 {
 
 

kiri-note/Event.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Annotation;
+namespace Note;
 
 
 use Exception;
@@ -11,7 +11,7 @@ use Kiri\Kiri;
 
 /**
  * Class Event
- * @package Annotation
+ * @package Note
  */
 #[\Attribute(\Attribute::TARGET_METHOD)] class Event extends Attribute
 {

kiri-note/INote.php

@@ -1,11 +1,11 @@
 <?php
 
 
-namespace Annotation;
+namespace Note;
 
 
 
-interface IAnnotation
+interface INote
 {
 
     /**

kiri-note/Inject.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Annotation;
+namespace Note;
 
 
 use Exception;
@@ -12,7 +12,7 @@ use ReflectionProperty;
 
 /**
  * Class Inject
- * @package Annotation
+ * @package Note
  */
 #[\Attribute(\Attribute::TARGET_PROPERTY)] class Inject extends Attribute
 {

kiri-note/Loader.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Annotation;
+namespace Note;
 
 
 use DirectoryIterator;
@@ -15,7 +15,7 @@ use Throwable;
 
 /**
  * Class Loader
- * @package Annotation
+ * @package Note
  */
 class Loader extends BaseObject
 {

kiri-note/Mapping.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Annotation;
+namespace Note;
 
 use Kiri\Kiri;
 

kiri-note/Note.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Annotation;
+namespace Note;
 
 
 use DirectoryIterator;
@@ -10,10 +10,10 @@ use ReflectionException;
 use Kiri\Abstracts\Component;
 
 /**
- * Class Annotation
+ * Class Note
- * @package Annotation
+ * @package Note
  */
-class Annotation extends Component
+class Note extends Component
 {
 
 

kiri-note/Route/Document.php

@@ -1,14 +1,14 @@
 <?php
 
 
-namespace Annotation\Route;
+namespace Note\Route;
 
 
-use Annotation\Attribute;
+use Note\Attribute;
 
 /**
  * Class Document
- * @package Annotation\Route
+ * @package Note\Route
  */
 #[\Attribute(\Attribute::TARGET_METHOD)] class Document extends Attribute
 {

kiri-note/Route/Middleware.php

@@ -1,16 +1,16 @@
 <?php
 
 
-namespace Annotation\Route;
+namespace Note\Route;
 
 
-use Annotation\Attribute;
+use Note\Attribute;
 use Http\Handler\Abstracts\MiddlewareManager;
 use Psr\Http\Server\MiddlewareInterface;
 
 /**
  * Class Middleware
- * @package Annotation\Route
+ * @package Note\Route
  */
 #[\Attribute(\Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)] class Middleware extends Attribute
 {

kiri-note/Route/Route.php

@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Annotation\Route;
+namespace Note\Route;
 
 
-use Annotation\Attribute;
+use Note\Attribute;
 use Http\Handler\Router;
 use Kiri\Kiri;
 

kiri-note/Route/Socket.php

@@ -1,14 +1,14 @@
 <?php
 
 
-namespace Annotation\Route;
+namespace Note\Route;
 
 
-use Annotation\Attribute;
+use Note\Attribute;
 
 /**
  * Class Socket
- * @package Annotation
+ * @package Note
  */
 #[\Attribute(\Attribute::TARGET_METHOD)] class Socket extends Attribute
 {

kiri-note/Target.php

@@ -1,12 +1,12 @@
 <?php
 
 
-namespace Annotation;
+namespace Note;
 
 
 /**
  * Class Target
- * @package Annotation
+ * @package Note
  */
 #[\Attribute(\Attribute::TARGET_CLASS)] class Target extends Attribute
 {

kiri-note/Task.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Annotation;
+namespace Note;
 
 
 use Exception;
@@ -11,7 +11,7 @@ use Server\Tasker\AsyncTaskExecute;
 
 /**
  * Class Task
- * @package Annotation
+ * @package Note
  * Task任务
  */
 #[\Attribute(\Attribute::TARGET_CLASS)] class Task extends Attribute

kiri-server/CoroutineServer.php

@@ -2,7 +2,7 @@
 
 namespace Kiri\Server;
 
-use Annotation\Inject;
+use Note\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Error\Logger;

kiri-server/SoloAsyncServer.php

@@ -2,13 +2,14 @@
 
 namespace Kiri\Server;
 
-use Annotation\Inject;
+use Note\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Error\Logger;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
 use Kiri\Server\Abstracts\BaseProcess;
+use ReflectionException;
 use Swoole\Http\Server as HServer;
 use Swoole\Process;
 use Swoole\Server;
@@ -54,7 +55,7 @@ class SoloAsyncServer implements SwooleServerInterface
 
 
 	/**
-	 * @throws ConfigException|\ReflectionException
+	 * @throws ConfigException|ReflectionException
 	 */
 	private function startProcess()
 	{
@@ -100,7 +101,7 @@ class SoloAsyncServer implements SwooleServerInterface
 
 	/**
 	 * @param Server\Port|Server|HServer|WServer $server
-	 * @throws \ReflectionException
+	 * @throws ReflectionException
 	 */
 	private function eventListener(mixed $server, array $config): Server\Port|HServer|Server|WServer
 	{