Revert "改名"

This reverts commit fdf58326

.phpstorm.meta.php

@@ -4,8 +4,11 @@ namespace PHPSTORM_META {
 
     // Reflect
 	use Kiri\Di\Container;
+	use Psr\Container\ContainerInterface;
 
+	override(ContainerInterface::get(0), map('@'));
 	override(Container::get(0), map('@'));
+	override(Container::make(0), map('@'));
 	override(Container::create(0), map('@'));
 //    override(\Hyperf\Utils\Context::get(0), map('@'));
 //    override(\make(0), map('@'));

composer.json

@@ -21,22 +21,24 @@
     "ext-xml": "*",
     "ext-curl": "*",
     "ext-openssl": "*",
-    "symfony/console": "^v5.3",
+    "symfony/console": "v5.3.10",
     "psr/log": "1.*",
     "ext-sockets": "*",
     "ext-pcntl": "*",
     "ext-posix": "*",
     "composer-runtime-api": "^2.0",
-    "swiftmailer/swiftmailer": "^6.0",
+    "swiftmailer/swiftmailer": "v6.3.*",
     "psr/container": "^2.0",
-    "psr/http-server-middleware": "^1.0",
-    "game-worker/kiri-event": "v1.0"
+    "psr/http-server-middleware": "1.0.1",
+    "game-worker/kiri-event": "^v1.0",
+    "ext-inotify": "*"
   },
   "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,7 +3,6 @@
 defined('APP_PATH') or define('APP_PATH', realpath(__DIR__ . '/../../'));
 
 
-use Annotation\Annotation;
 use Http\Handler\Router;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Config;
@@ -14,10 +13,11 @@ use Kiri\Error\Logger;
 use Kiri\Events\EventDispatch;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
-use Kiri\Exception\NotFindClassException;
 use Kiri\Kiri;
+use Note\Note;
+use Note\Route\Route;
 use Psr\Log\LoggerInterface;
-use Server\ServerManager;
+use Swoole\Process;
 use Swoole\WebSocket\Server;
 
 if (!function_exists('make')) {
@@ -29,7 +29,7 @@ if (!function_exists('make')) {
 	 * @return mixed
 	 * @throws
 	 */
-	function make($name, $default = null): mixed
+	function make($name, $default = NULL): mixed
 	{
 		if (class_exists($name)) {
 			return Kiri::createObject($name);
@@ -44,7 +44,7 @@ if (!function_exists('make')) {
 			return Kiri::app()->get($default);
 		}
 		$class = Kiri::createObject($default);
-		class_alias($name, $default, true);
+		class_alias($name, $default, TRUE);
 		return $class;
 	}
 
@@ -52,6 +52,54 @@ if (!function_exists('make')) {
 }
 
 
+if (!function_exists('map')) {
+
+
+	/**
+	 * @param array $params
+	 * @param Closure $closure
+	 * @return mixed
+	 */
+	function map(array $params, Closure $closure): mixed
+	{
+		return array_map($closure, $params);
+	}
+
+}
+
+
+if (!function_exists('checkPortIsAlready')) {
+
+
+	/**
+	 * @param $port
+	 * @return bool|string
+	 * @throws Exception
+	 */
+	function checkPortIsAlready($port): bool|string
+	{
+		if (!Kiri::getPlatform()->isLinux()) {
+			exec("lsof -i :" . $port . " | grep -i 'LISTEN' | awk '{print $2}'", $output);
+			if (empty($output)) return FALSE;
+			$output = explode(PHP_EOL, $output[0]);
+			return $output[0];
+		}
+
+		$serverPid = file_get_contents(storage('.swoole.pid'));
+		if (!empty($serverPid) && shell_exec('ps -ef | grep ' . $serverPid . ' | grep -v grep')) {
+			Process::kill($serverPid, 0) && Process::kill($serverPid, SIGTERM);
+		}
+
+		exec('netstat -lnp | grep ' . $port . ' | grep "LISTEN" | awk \'{print $7}\'', $output);
+		if (empty($output)) {
+			return FALSE;
+		}
+		return explode('/', $output[0])[0];
+	}
+
+}
+
+
 if (!function_exists('done')) {
 
 	/**
@@ -59,12 +107,26 @@ if (!function_exists('done')) {
 	 */
 	function done()
 	{
-		ServerManager::setEnv('state', 'exit');
+		set_env('state', 'exit');
 	}
 
 }
 
 
+if (!function_exists('set_env')) {
+
+
+	/**
+	 * @param $key
+	 * @param $value
+	 */
+	function set_env($key, $value)
+	{
+		putenv(sprintf('%s=%s', $key, $value));
+	}
+
+}
+
 if (!function_exists('enable_file_modification_listening')) {
 
 
@@ -110,7 +172,7 @@ if (!function_exists('now')) {
 	 */
 	function now(): string
 	{
-		return date('Y-m-d H:i:s') . '.' . str_replace(time() . '.', '', (string)microtime(true));
+		return date('Y-m-d H:i:s') . '.' . str_replace(time() . '.', '', (string)microtime(TRUE));
 	}
 }
 
@@ -130,16 +192,16 @@ if (!function_exists('workerName')) {
 }
 
 
-if (!function_exists('annotation')) {
+if (!function_exists('note')) {
 
 
 	/**
-	 * @return Annotation
+	 * @return Note
 	 * @throws Exception
 	 */
-	function annotation(): Annotation
+	function annotation(): Note
 	{
-		return Kiri::getAnnotation();
+		return Kiri::getNote();
 	}
 
 
@@ -158,7 +220,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);
@@ -166,6 +228,22 @@ if (!function_exists('scan_directory')) {
 
 }
 
+if (!class_exists('ReturnTypeWillChange')) {
+
+	/**
+	 * @since 8.1
+	 */
+	#[Attribute(Attribute::TARGET_METHOD)]
+	final class ReturnTypeWillChange
+	{
+		public function __construct()
+		{
+		}
+	}
+
+
+}
+
 
 if (!function_exists('injectRuntime')) {
 
@@ -178,10 +256,15 @@ 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 = [];
 		foreach ($fileLists as $class) {
 			foreach (NoteManager::getTargetNote($class) as $value) {
+				if (!method_exists($value, 'execute')) {
+					continue;
+				}
 				$value->execute($class);
 			}
 			$methods = $di->getMethodAttribute($class);
@@ -190,10 +273,26 @@ if (!function_exists('injectRuntime')) {
 					continue;
 				}
 				foreach ($attribute as $item) {
-					$item->execute($class, $method);
+					if ($item instanceof Route) {
+						$router[] = [$item, $class, $method];
+					} else {
+						if (!method_exists($item, 'execute')) {
+							continue;
+						}
+						$item->execute($class, $method);
+					}
 				}
 			}
 		}
+		if (!empty($router)) {
+			foreach ($router as $class) {
+				[$item, $class, $method] = $class;
+				if (!method_exists($item, 'execute')) {
+					continue;
+				}
+				$item->execute($class, $method);
+			}
+		}
 	}
 
 }
@@ -238,25 +337,28 @@ if (!function_exists('isUrl')) {
 	 * @param bool $get_info
 	 * @return false|array
 	 */
-	function isUrl($url, bool $get_info = true): bool|array
+	function isUrl($url, bool $get_info = TRUE): bool|array
 	{
 		if (str_starts_with($url, '/')) {
-			return false;
+			return FALSE;
 		}
 		$queryMatch = '/((http[s]?):\/\/)?(([\w\-\_]+\.)+\w+(:\d+)?)(\/.*)?/';
 		if (!preg_match($queryMatch, $url, $outPut)) {
-			return false;
+			return FALSE;
 		}
-		$port = str_replace(':', '', $outPut[5]);
 
-		[$isHttps, $domain, $port, $path] = [$outPut[2] == 'https', $outPut[3], $port, $outPut[6] ?? ''];
-		if ($isHttps && empty($port)) {
+		[$scheme, $host, $port, $user, $pass, $query, $path, $fragment] = parse_url($url);
+		if ($scheme == 'https' && empty($port)) {
 			$port = 443;
 		}
 
+		if (!empty($query)) $path .= '?' . $query;
+		if (!empty($fragment)) $path .= '#' . $fragment;
+
+
 		unset($outPut);
 
-		return [$isHttps == 'https', $domain, $port, $path];
+		return [$scheme == 'https', $host, $port, $path];
 	}
 
 }
@@ -271,8 +373,8 @@ if (!function_exists('split_request_uri')) {
 	 */
 	function split_request_uri($url): bool|array
 	{
-		if (($parse = isUrl($url, null)) === false) {
-			return false;
+		if (($parse = isUrl($url, NULL)) === FALSE) {
+			return FALSE;
 		}
 
 		[$isHttps, $domain, $port, $path] = $parse;
@@ -296,7 +398,7 @@ if (!function_exists('hadDomain')) {
 	function hadDomain($url): bool|array
 	{
 		$param = split_request_uri($url);
-		return !is_array($param) ? false : $param[0];
+		return !is_array($param) ? FALSE : $param[0];
 	}
 
 }
@@ -345,7 +447,7 @@ if (!function_exists('loadByDir')) {
 				classAutoload($namespace, $value);
 			} else {
 				$pos = strpos($value, '.php');
-				if ($pos === false || strlen($value) - 4 != $pos) {
+				if ($pos === FALSE || strlen($value) - 4 != $pos) {
 					continue;
 				}
 
@@ -398,8 +500,6 @@ if (!function_exists('fire')) {
 
 	/**
 	 * @param object $event
-	 * @throws NotFindClassException
-	 * @throws ReflectionException
 	 */
 	function fire(object $event)
 	{
@@ -425,7 +525,7 @@ if (!function_exists('instance_load')) {
 
 	function instance_load()
 	{
-		$content = json_decode(file_get_contents(__DIR__ . '/composer.json'), true);
+		$content = json_decode(file_get_contents(__DIR__ . '/composer.json'), TRUE);
 		if (isset($content['autoload']) && isset($content['autoload']['psr-4'])) {
 			$psr4 = $content['autoload']['psr-4'];
 			foreach ($psr4 as $namespace => $dirname) {
@@ -475,7 +575,7 @@ if (!function_exists('trim_blank')) {
 	 * @param bool $htmlTags
 	 * @return array|string|null
 	 */
-	function trim_blank(string $content, int $len = 0, string $encode = 'utf-8', bool $htmlTags = true): array|string|null
+	function trim_blank(string $content, int $len = 0, string $encode = 'utf-8', bool $htmlTags = TRUE): array|string|null
 	{
 		$str = trim($content);
 		if ($htmlTags) {
@@ -494,7 +594,7 @@ if (!function_exists('trim_blank')) {
 
 if (!function_exists('get_file_extension')) {
 
-	function get_file_extension($filename)
+	function get_file_extension($filename): bool|int|string
 	{
 		$mime_types = [
 			'txt'  => 'text/plain',
@@ -715,12 +815,12 @@ if (!function_exists('get_file_extension')) {
 		$ext = strtolower(array_pop($explode));
 		if (array_key_exists($ext, $mime_types)) {
 			return $ext;
-		} elseif (function_exists('finfo_open')) {
+		} else if (function_exists('finfo_open')) {
 			$fInfo = finfo_open(FILEINFO_MIME);
 			$mimeType = finfo_file($fInfo, $filename);
 			finfo_close($fInfo);
 			$mimeType = current(explode('; ', $mimeType));
-			if (($search = array_search($mimeType, $mime_types)) == false) {
+			if (($search = array_search($mimeType, $mime_types)) == FALSE) {
 				return $mimeType;
 			}
 			return $search;
@@ -745,7 +845,7 @@ if (!function_exists('storage')) {
 		if (!empty($path)) {
 			$path = ltrim($path, '/');
 			if (!is_dir($basePath . '/' . $path)) {
-				mkdir($basePath . '/' . $path, 0777, true);
+				mkdir($basePath . '/' . $path, 0777, TRUE);
 			}
 		}
 		if (empty($fileName)) {
@@ -769,7 +869,7 @@ if (!function_exists('event')) {
 	 * @param bool $isAppend
 	 * @throws Exception
 	 */
-	function event($name, $callback, bool $isAppend = true)
+	function event($name, $callback, bool $isAppend = TRUE)
 	{
 		$pro = di(EventProvider::class);
 		$pro->on($name, $callback, 0);
@@ -786,7 +886,7 @@ if (!function_exists('name')) {
 	 * @throws ConfigException
 	 * @throws Exception
 	 */
-	function name(int $pid, string $prefix = null)
+	function name(int $pid, string $prefix = NULL)
 	{
 		if (Kiri::getPlatform()->isMac()) {
 			return;
@@ -817,10 +917,10 @@ if (!function_exists('env')) {
 	 * @param null $default
 	 * @return array|string|null
 	 */
-	#[Pure] function env($key, $default = null): null|array|string
+	#[Pure] function env($key, $default = NULL): null|array|string
 	{
 		$env = getenv($key);
-		if ($env === false) {
+		if ($env === FALSE) {
 			return $default;
 		}
 		return $env;
@@ -843,17 +943,43 @@ if (!function_exists('di')) {
 
 }
 
+
+if (!function_exists('interval')) {
+
+
+	/**
+	 * @param callable $callback
+	 * @param int $interval
+	 * @param bool $is
+	 */
+	function interval(callable $callback, int $interval = 1000, bool $is = FALSE)
+	{
+		usleep($interval * 1000);
+
+		$callback();
+
+		interval($callback, $interval, $is);
+	}
+
+}
+
+
 if (!function_exists('duplicate')) {
 
 
 	/**
 	 * @param string $className
 	 * @return mixed
+	 * @throws ReflectionException
 	 */
 	function duplicate(string $className): mixed
 	{
 		$class = di($className);
-		return clone $class;
+		$clone = clone $class;
+		if (method_exists($clone, 'clear')) {
+			$clone->clear();
+		}
+		return $clone;
 	}
 
 }
@@ -905,7 +1031,7 @@ if (!function_exists('swoole_unserialize')) {
 	function swoole_unserialize($data): mixed
 	{
 		if (empty($data)) {
-			return null;
+			return NULL;
 		}
 //        if (class_exists('swoole_serialize')) {
 //            return \swoole_serialize::unpack($data);
@@ -986,7 +1112,7 @@ if (!function_exists('jTraceEx')) {
 	 * @param bool $toHtml
 	 * @return string
 	 */
-	function jTraceEx($e, $seen = null, bool $toHtml = false): string
+	function jTraceEx($e, $seen = NULL, bool $toHtml = FALSE): string
 	{
 		$starter = $seen ? 'Caused by: ' : '';
 		$result = [];
@@ -1002,12 +1128,12 @@ if (!function_exists('jTraceEx')) {
 				count($value) && array_key_exists('class', $value) ? str_replace('\\', '.', $value['class']) : '',
 				count($value) && array_key_exists('class', $value) && array_key_exists('function', $value) ? '.' : '',
 				count($value) && array_key_exists('function', $value) ? str_replace('\\', '.', $value['function']) : '(main)',
-				$line === null ? $file : basename($file),
-				$line === null ? '' : ':',
-				$line === null ? '' : $line);
+				$line === NULL ? $file : basename($file),
+				$line === NULL ? '' : ':',
+				$line === NULL ? '' : $line);
 
 			$file = array_key_exists('file', $value) ? $value['file'] : 'Unknown Source';
-			$line = array_key_exists('file', $value) && array_key_exists('line', $value) && $value['line'] ? $value['line'] : null;
+			$line = array_key_exists('file', $value) && array_key_exists('line', $value) && $value['line'] ? $value['line'] : NULL;
 		}
 		$result = join($toHtml ? "<br>" : "\n", $result);
 		if ($prev) {
@@ -1031,7 +1157,7 @@ if (!function_exists('swoole_substr_json_decode')) {
 	 */
 	function swoole_substr_json_decode($packet, int $length = 0): mixed
 	{
-		return json_decode($packet, true);
+		return json_decode($packet, TRUE);
 	}
 
 }

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;
@@ -25,11 +25,11 @@ use Kiri\Error\Logger;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\InitException;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Jwt\Jwt;
 use Kiri\Kiri;
 use ReflectionException;
 use Server\ServerManager;
-use Server\SInterface\OnTaskInterface;
+use Server\Contract\OnTaskInterface;
+use Server\Tasker\AsyncTaskExecute;
 use Swoole\Table;
 
 /**
@@ -211,7 +211,7 @@ abstract class BaseApplication extends Component
 	 */
 	public function task(OnTaskInterface $execute): void
 	{
-		di(ServerManager::class)->task($execute);
+		di(AsyncTaskExecute::class)->execute($execute);
 	}
 
 
@@ -223,22 +223,21 @@ abstract class BaseApplication extends Component
 	 */
 	private function addEvent($key, $value): void
 	{
-		$eventProvider = di(EventProvider::class);
 		if ($value instanceof \Closure || is_object($value)) {
-			$eventProvider->on($key, $value, 0);
+			$this->eventProvider->on($key, $value, 0);
 			return;
 		}
 
 
 		if (is_array($value)) {
 			if (is_object($value[0]) && !($value[0] instanceof \Closure)) {
-				$eventProvider->on($key, $value, 0);
+				$this->eventProvider->on($key, $value, 0);
 				return;
 			}
 
 			if (is_string($value[0])) {
 				$value[0] = Kiri::createObject($value[0]);
-				$eventProvider->on($key, $value, 0);
+				$this->eventProvider->on($key, $value, 0);
 				return;
 			}
 
@@ -247,7 +246,7 @@ abstract class BaseApplication extends Component
 				if (!is_callable($item, true)) {
 					throw new InitException("Class does not hav callback.");
 				}
-				$eventProvider->on($key, $item, 0);
+				$this->eventProvider->on($key, $item, 0);
 			}
 		}
 
@@ -372,16 +371,6 @@ abstract class BaseApplication extends Component
 	}
 
 
-	/**
-	 * @return Jwt
-	 * @throws
-	 */
-	public function getJwt(): Jwt
-	{
-		return $this->get('jwt');
-	}
-
-
 	/**
 	 * @return Server
 	 * @throws
@@ -403,12 +392,12 @@ abstract class BaseApplication extends Component
 
 
 	/**
-	 * @return SAnnotation
+	 * @return SNote
 	 * @throws
 	 */
-	public function getAnnotation(): SAnnotation
+	public function getNote(): SNote
 	{
-		return $this->get('annotation');
+		return $this->get('note');
 	}
 
 
@@ -461,7 +450,7 @@ abstract class BaseApplication extends Component
 			'error'           => ['class' => ErrorHandler::class],
 			'config'          => ['class' => Config::class],
 			'logger'          => ['class' => Logger::class],
-			'annotation'      => ['class' => SAnnotation::class],
+			'note'      => ['class' => SNote::class],
 			'databases'       => ['class' => Connection::class],
 			'jwt'             => ['class' => Jwt::class],
 			'async'           => ['class' => Async::class],

kiri-engine/Abstracts/BaseObject.php

@@ -1,223 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: whwyy
- * Date: 2018/3/30 0030
- * Time: 14:10
- */
-declare(strict_types=1);
-
-namespace Kiri\Abstracts;
-
-use Exception;
-use JetBrains\PhpStorm\Pure;
-use Kiri\Kiri;
-use Swoole\Coroutine;
-
-/**
- * Class BaseObject
- * @package Kiri\Kiri\Base
- */
-class BaseObject implements Configure
-{
-
-    /**
-     * BaseAbstract constructor.
-     *
-     * @param array $config
-     * @throws Exception
-     */
-    public function __construct(array $config = [])
-    {
-        if (!empty($config) && is_array($config)) {
-            Kiri::configure($this, $config);
-        }
-    }
-
-
-    /**
-     * @throws Exception
-     */
-    public function init()
-    {
-    }
-
-
-    /**
-     * @param array|callable $callback
-     * @param object $scope
-     */
-    public function async_create(array|callable $callback, object $scope)
-    {
-        Coroutine::create($callback, $scope);
-    }
-
-
-    /**
-     * @return string
-     */
-    #[Pure] public static function className(): string
-    {
-        return static::class;
-    }
-
-    /**
-     * @param $name
-     * @param $value
-     *
-     * @throws Exception
-     */
-    public function __set($name, $value)
-    {
-        $method = 'set' . ucfirst($name);
-        if (method_exists($this, $method)) {
-            $this->{$method}($value);
-        } else {
-            throw new Exception('The set name ' . $name . ' not find in class ' . static::class);
-        }
-    }
-
-    /**
-     * @param $name
-     *
-     * @return mixed
-     * @throws Exception
-     */
-    public function __get($name): mixed
-    {
-        $method = 'get' . ucfirst($name);
-        if (method_exists($this, $method)) {
-            return $this->$method();
-        } else {
-            throw new Exception('The get name ' . $name . ' not find in class ' . static::class);
-        }
-    }
-
-
-    /**
-     * @param $message
-     * @param string $model
-     * @return bool
-     * @throws Exception
-     */
-    public function addError($message, string $model = 'app'): bool
-    {
-        if ($message instanceof \Throwable) {
-            $this->error(jTraceEx($message));
-        } else {
-            if (!is_string($message)) {
-                $message = json_encode($message, JSON_UNESCAPED_UNICODE);
-            }
-            $this->error($message);
-        }
-        return FALSE;
-    }
-
-
-    /**
-     * @return Logger
-     * @throws Exception
-     */
-    private function logger(): Logger
-    {
-        return Kiri::getDi()->get(Logger::class);
-    }
-
-
-    /**
-     * @param mixed $message
-     * @param string $method
-     * @param string $file
-     * @throws Exception
-     */
-    public function debug(mixed $message, string $method = __METHOD__, string $file = __FILE__)
-    {
-        if (!is_string($message)) {
-            $message = print_r($message, true);
-        }
-        $message = "\033[35m[" . date('Y-m-d H:i:s') . '][DEBUG]: ' . $message . "\033[0m";
-        $message .= PHP_EOL;
-
-        $this->logger()->debug(Logger::DEBUG, [$message, $method, $file]);
-    }
-
-
-    /**
-     * @param mixed $message
-     * @param string $method
-     * @param string $file
-     * @throws Exception
-     */
-    public function info(mixed $message, string $method = __METHOD__, string $file = __FILE__)
-    {
-        if (!is_string($message)) {
-            $message = print_r($message, true);
-        }
-        $message = "\033[34m[" . date('Y-m-d H:i:s') . '][INFO]: ' . $message . "\033[0m";
-        $message .= PHP_EOL;
-
-        $this->logger()->info(Logger::NOTICE, [$message, $method, $file]);
-    }
-
-
-    /**
-     * @param mixed $message
-     * @param string $method
-     * @param string $file
-     * @throws Exception
-     */
-    public function success(mixed $message, string $method = __METHOD__, string $file = __FILE__)
-    {
-        if (!is_string($message)) {
-            $message = print_r($message, true);
-        }
-
-        $message = "\033[36m[" . date('Y-m-d H:i:s') . '][SUCCESS]: ' . $message . "\033[0m";
-        $message .= PHP_EOL;
-
-        $this->logger()->notice(Logger::NOTICE, [$message, $method, $file]);
-    }
-
-
-    /**
-     * @param mixed $message
-     * @param string $method
-     * @param string $file
-     * @throws Exception
-     */
-    public function warning(mixed $message, string $method = __METHOD__, string $file = __FILE__)
-    {
-        if (!is_string($message)) {
-            $message = print_r($message, true);
-        }
-
-        $message = "\033[33m[" . date('Y-m-d H:i:s') . '][WARNING]: ' . $message . "\033[0m";
-        $message .= PHP_EOL;
-
-        $this->logger()->critical(Logger::NOTICE, [$message, $method, $file]);
-    }
-
-
-    /**
-     * @param mixed $message
-     * @param null $method
-     * @param null $file
-     * @throws Exception
-     */
-    public function error(mixed $message, $method = null, $file = null)
-    {
-        if ($message instanceof \Throwable) {
-            $message = $message->getMessage() . " on line " . $message->getLine() . " at file " . $message->getFile();
-        }
-        $content = (empty($method) ? '' : $method . ': ') . $message;
-
-        $message = "\033[41;37m[" . date('Y-m-d H:i:s') . '][ERROR]: ' . $content . "\033[0m";
-
-        if (!empty($file)) {
-            $message .= PHP_EOL . "\033[41;37m[" . date('Y-m-d H:i:s') . '][ERROR]: ' . $file . "\033[0m";
-        }
-
-        $this->logger()->error(Logger::ERROR, [$message, $method, $file]);
-    }
-
-}

kiri-engine/Abstracts/Component.php

@@ -11,45 +11,253 @@ namespace Kiri\Abstracts;
 
 
 use Exception;
-
 use JetBrains\PhpStorm\Pure;
-use Kiri\Exception\ComponentException;
+use Kiri\Di\Container;
+use Kiri\Events\EventProvider;
 use Kiri\Kiri;
+use Note\Inject;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Class Component
  * @package Kiri\Kiri\Base
+ * @property ContainerInterface|Container $container
+ * @property EventProvider $eventProvider
  */
-class Component extends BaseObject
+class Component implements Configure
 {
 
 
+
 	/**
-	 * @param $name
-	 * @param $value
+	 * BaseAbstract constructor.
+	 *
+	 * @param array $config
 	 * @throws Exception
 	 */
-	public function __set($name, $value)
+	public function __construct(array $config = [])
 	{
-		if (property_exists($this, $name)) {
-			$this->$name = $value;
-		} else {
-			parent::__set($name, $value);
+		if (!empty($config) && is_array($config)) {
+			Kiri::configure($this, $config);
 		}
 	}
 
 
+	/**
+	 * @return Container|ContainerInterface
+	 */
+	#[Pure] public function getContainer(): ContainerInterface|Container
+	{
+		return Kiri::getDi();
+	}
+
+
+	/**
+	 * @return EventProvider
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 */
+	public function getEventProvider(): EventProvider
+	{
+		return $this->getContainer()->get(EventProvider::class);
+	}
+
+
+	/**
+	 * @throws Exception
+	 */
+	public function init()
+	{
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	#[Pure] public static function className(): string
+	{
+		return static::class;
+	}
+
 	/**
 	 * @param $name
+	 * @param $value
+	 *
+	 * @throws Exception
+	 */
+	public function __set($name, $value)
+	{
+		$method = 'set' . ucfirst($name);
+		if (method_exists($this, $method)) {
+			$this->{$method}($value);
+		} else {
+			throw new Exception('The set name ' . $name . ' not find in class ' . static::class);
+		}
+	}
+
+	/**
+	 * @param $name
+	 *
 	 * @return mixed
 	 * @throws Exception
 	 */
 	public function __get($name): mixed
 	{
-		if (property_exists($this, $name)) {
-			return $this->$name ?? null;
+		$method = 'get' . ucfirst($name);
+		if (method_exists($this, $method)) {
+			return $this->$method();
 		} else {
-			return parent::__get($name);
+			throw new Exception('The get name ' . $name . ' not find in class ' . static::class);
 		}
 	}
+
+
+	/**
+	 * @param $message
+	 * @param string $model
+	 * @return bool
+	 * @throws Exception
+	 */
+	public function addError($message, string $model = 'app'): bool
+	{
+		if ($message instanceof \Throwable) {
+			$this->error(jTraceEx($message));
+		} else {
+			if (!is_string($message)) {
+				$message = json_encode($message, JSON_UNESCAPED_UNICODE);
+			}
+			$this->error($message);
+		}
+		return FALSE;
+	}
+
+
+	/**
+	 * @return Logger
+	 * @throws Exception
+	 */
+	private function logger(): Logger
+	{
+		return Kiri::getDi()->get(Logger::class);
+	}
+
+
+	/**
+	 * @param mixed $message
+	 * @param string $method
+	 * @param string $file
+	 * @throws Exception
+	 */
+	public function debug(mixed $message, string $method = '', string $file = '')
+	{
+		if (!is_string($message)) {
+			$message = print_r($message, true);
+		}
+//		$message = "\033[35m" . $message . "\033[0m";
+
+		$context = [];
+		if (!empty($method)) $context['method'] = $method;
+		if (!empty($file)) $context['file'] = $file;
+
+		$this->logger()->debug($message, $context);
+	}
+
+
+	/**
+	 * @param mixed $message
+	 * @param string $method
+	 * @param string $file
+	 * @throws Exception
+	 */
+	public function info(mixed $message, string $method = '', string $file = '')
+	{
+		if (!is_string($message)) {
+			$message = print_r($message, true);
+		}
+//		$message = "\033[34m" . $message . "\033[0m";
+
+		$context = [];
+		if (!empty($method)) $context['method'] = $method;
+		if (!empty($file)) $context['file'] = $file;
+
+		$this->logger()->info($message, $context);
+	}
+
+
+	/**
+	 * @param mixed $message
+	 * @param string $method
+	 * @param string $file
+	 * @throws Exception
+	 */
+	public function success(mixed $message, string $method = '', string $file = '')
+	{
+		if (!is_string($message)) {
+			$message = print_r($message, true);
+		}
+
+//		$message = "\033[36m" . $message . "\033[0m";
+
+		$context = [];
+		if (!empty($method)) $context['method'] = $method;
+		if (!empty($file)) $context['file'] = $file;
+
+		$this->logger()->notice($message, $context);
+	}
+
+
+	/**
+	 * @param mixed $message
+	 * @param string $method
+	 * @param string $file
+	 * @throws Exception
+	 */
+	public function warning(mixed $message, string $method = '', string $file = '')
+	{
+		if (!is_string($message)) {
+			$message = print_r($message, true);
+		}
+
+//		$message = "\033[33m" . $message . "\033[0m";
+
+		$context = [];
+		if (!empty($method)) $context['method'] = $method;
+		if (!empty($file)) $context['file'] = $file;
+
+		$this->logger()->critical($message, $context);
+	}
+
+
+	/**
+	 * @param mixed $message
+	 * @param null $method
+	 * @param null $file
+	 * @throws Exception
+	 */
+	public function error(mixed $message, $method = null, $file = null)
+	{
+		if ($message instanceof \Throwable) {
+			$message = $message->getMessage() . " on line " . $message->getLine() . " at file " . $message->getFile();
+		}
+
+		$context = [];
+		if (is_string($method)) {
+			$message = (empty($method) ? '' : $method . ': ') . $message;
+		} else {
+			if (is_null($method)) {
+				$method = [];
+			}
+			$context = $method;
+		}
+//		$message = "\033[41;37m" . $message . "\033[0m";
+
+		if (!empty($method)) $context['method'] = $method;
+		if (!empty($file)) $context['file'] = $file;
+
+		$this->logger()->error($message, $context);
+	}
+
 }

kiri-engine/Abstracts/Config.php

@@ -23,15 +23,15 @@ class Config extends Component
 
 	const ERROR_MESSAGE = 'The not find %s in app configs.';
 
-	protected mixed $data = [];
+	protected static mixed $data = [];
 
 
 	/**
 	 * @return mixed
 	 */
-	public function getData(): mixed
+	public static function getData(): mixed
 	{
-		return $this->data;
+		return static::$data;
 	}
 
 
@@ -40,23 +40,21 @@ class Config extends Component
 	 * @param $value
 	 * @return mixed
 	 */
-	public function setData($key, $value): mixed
+	public static function setData($key, $value): mixed
 	{
-		return $this->data[$key] = $value;
+		return static::$data[$key] = $value;
 	}
 
 
 	/**
 	 * @param array $configs
-	 * @throws Exception
 	 */
 	public static function sets(array $configs)
 	{
-		$config = Kiri::app()->getConfig();
 		if (empty($configs)) {
 			return;
 		}
-        $config->data = $configs;
+		static::$data = $configs;
 	}
 
 	/**
@@ -64,11 +62,11 @@ class Config extends Component
 	 * @param bool $try
 	 * @param mixed|null $default
 	 * @return mixed
-	 * @throws
+	 * @throws ConfigException
 	 */
 	public static function get($key, mixed $default = null, bool $try = FALSE): mixed
 	{
-		$instance = Kiri::app()->getConfig()->getData();
+		$instance = static::$data;
 		if (!str_contains($key, '.')) {
 			return $instance[$key] ?? $default;
 		}
@@ -94,27 +92,23 @@ class Config extends Component
 	 * @param $key
 	 * @param $value
 	 * @return mixed
-	 * @throws Exception
 	 */
 	public static function set($key, $value): mixed
 	{
-		$config = Kiri::app()->getConfig();
-		return $config->setData($key, $value);
+		return static::setData($key, $value);
 	}
 
 	/**
 	 * @param $key
 	 * @param bool $must_not_null
 	 * @return bool
-	 * @throws Exception
 	 */
 	public static function has($key, bool $must_not_null = false): bool
 	{
-		$config = Kiri::app()->getConfig();
-		if (!isset($config->data[$key])) {
+		if (!isset(static::$data[$key])) {
 			return false;
 		}
-		$config = $config->data[$key];
+		$config = static::$data[$key];
 		if ($must_not_null === false) {
 			return true;
 		}

kiri-engine/Abstracts/Logger.php

@@ -2,11 +2,13 @@
 
 namespace Kiri\Abstracts;
 
-use Annotation\Inject;
+use DirectoryIterator;
 use Exception;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
+use Kiri\Kiri;
 use Psr\Log\LoggerInterface;
+use ReflectionException;
 use Server\Events\OnWorkerStop;
 
 
@@ -26,12 +28,6 @@ class Logger implements LoggerInterface
 	const DEBUG = 'debug';
 
 
-	/**
-	 * @var EventProvider
-	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
 	private array $_loggers = [];
 
 
@@ -39,11 +35,12 @@ class Logger implements LoggerInterface
 
 
 	/**
-	 * 监听事件
+	 * @return void
+	 * @throws ReflectionException
 	 */
 	public function init()
 	{
-		$this->eventProvider->on(OnWorkerStop::class, [$this, 'onAfterRequest']);
+		Kiri::getDi()->get(EventProvider::class)->on(OnWorkerStop::class, [$this, 'onAfterRequest']);
 	}
 
 
@@ -158,7 +155,7 @@ class Logger implements LoggerInterface
 	{
 		// TODO: Implement log() method.
 		$levels = Config::get('log.level', Logger::LOGGER_LEVELS);
-		if (!in_array($level, $levels)) {
+		if (!in_array($level, $levels) || str_contains($message, 'Event::rshutdown')) {
 			return;
 		}
 
@@ -179,13 +176,44 @@ class Logger implements LoggerInterface
 		$loggers = implode(PHP_EOL, $this->_loggers);
 		$this->_loggers = [];
 		if (!empty($loggers)) {
-			$filename = storage('log-' . date('Y-m-d') . '.log', 'logs/');
+			$filename = storage('log-' . date('Y-m-d') . '.log', 'log/');
 
 			file_put_contents($filename, $loggers);
 		}
 	}
 
 
+	/**
+	 * @return void
+	 * @throws Exception
+	 */
+	public function flush()
+	{
+		$this->removeFile(storage());
+	}
+
+
+	/**
+	 * @param string $dirname
+	 * @return void
+	 */
+	private function removeFile(string $dirname)
+	{
+		$paths = new DirectoryIterator($dirname);
+		/** @var DirectoryIterator $path */
+		foreach ($paths as $path) {
+			if ($path->isDot() || str_starts_with($path->getFilename(), '.')) {
+				continue;
+			}
+			if ($path->isDir()) {
+				$directory = rtrim($path->getRealPath(), '/');
+				$this->removeFile($directory);
+			}
+			@unlink($path->getRealPath());
+		}
+	}
+
+
 	/**
 	 * @param $message
 	 * @param $context
@@ -194,7 +222,7 @@ class Logger implements LoggerInterface
 	private function _string($message, $context): string
 	{
 		if (!empty($context)) {
-			return $message . ' ' . print_r($context, true) . PHP_EOL;
+			return $message . ' ' . PHP_EOL . print_r($context, TRUE) . PHP_EOL;
 		}
 		return $message . PHP_EOL;
 	}

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;
@@ -14,7 +14,7 @@ use Server\Server;
 use Kiri\Crontab\Producer;
 use Kiri\Async;
 use Kiri\Error\Logger;
-use Kiri\Jwt\Jwt;
+use Kiri\Jwt\JWTAuth;
 
 /**
  * Trait TraitApplication
@@ -24,8 +24,8 @@ use Kiri\Jwt\Jwt;
  * @property DatabasesProviders $db
  * @property Async $async
  * @property Logger $logger
- * @property Jwt $jwt
- * @property SAnnotation $annotation
+ * @property JWTAuth $jwt
+ * @property SNote $annotation
  * @property BaseGoto $goto
  * @property Client $client
  * @property Connection $databases

kiri-engine/Application.php

@@ -223,8 +223,8 @@ class Application extends BaseApplication
 	}
 
 
+
 	/**
-	 * @throws NotFindClassException
 	 * @throws ReflectionException
 	 * @throws Exception
 	 */
@@ -240,6 +240,8 @@ class Application extends BaseApplication
 	}
 
 
+
+
 	/**
 	 * @param $className
 	 * @param null $abstracts

kiri-engine/Async.php

@@ -7,6 +7,7 @@ namespace Kiri;
 use Exception;
 use Kiri\Abstracts\Component;
 use Server\ServerManager;
+use Server\Tasker\AsyncTaskExecute;
 
 /**
  * Class Async
@@ -36,8 +37,8 @@ class Async extends Component
      */
     public function dispatch(string $name, array $params = [])
     {
-    	$context  = di(ServerManager::class);
-    	$context->task(static::$_absences[$name], $params);
+    	$context = di(AsyncTaskExecute::class);
+    	$context->execute(static::$_absences[$name], $params);
     }
 
 }

kiri-engine/Cache/Base/Redis.php

@@ -2,12 +2,12 @@
 
 namespace Kiri\Cache\Base;
 
+use Exception;
 use Kiri\Abstracts\Logger;
 use Kiri\Exception\RedisConnectException;
 use Kiri\Kiri;
 use Kiri\Pool\StopHeartbeatCheck;
 use RedisException;
-use Kiri\Context;
 use Swoole\Timer;
 
 
@@ -22,9 +22,21 @@ class Redis implements StopHeartbeatCheck
 
 	private ?\Redis $pdo = null;
 
+	public string $host;
 
-	private int $_transaction = 0;
+	public int $port;
 
+	public int $database = 0;
+
+	public string $auth = '';
+
+	public string $prefix = '';
+
+	public int $timeout = 30;
+
+	public int $read_timeout = 30;
+
+	public array $pool = [];
 
 	private int $_timer = -1;
 
@@ -32,18 +44,18 @@ class Redis implements StopHeartbeatCheck
 
 
 	/**
-	 * @param string $host
-	 * @param int $port
-	 * @param int $database
-	 * @param string $auth
-	 * @param string $prefix
-	 * @param int $timeout
-	 * @param int $read_timeout
+	 * @param array $config
 	 */
-	public function __construct(public string $host, public int $port, public int $database = 0,
-	                            public string $auth = '', public string $prefix = '', public int $timeout = 30,
-	                            public int    $read_timeout = 30)
+	public function __construct(array $config)
 	{
+		$this->host = $config['host'];
+		$this->port = $config['port'];
+		$this->database = $config['databases'];
+		$this->auth = $config['auth'];
+		$this->prefix = $config['prefix'];
+		$this->timeout = $config['timeout'];
+		$this->read_timeout = $config['read_timeout'];
+		$this->pool = $config['pool'];
 	}
 
 
@@ -61,21 +73,28 @@ class Redis implements StopHeartbeatCheck
 		if (env('state', 'start') == 'exit') {
 			return;
 		}
-		if ($this->_timer === -1 && Context::inCoroutine()) {
-			$this->_timer = Timer::tick(1000, function () {
-				try {
-					if (env('state', 'start') == 'exit') {
-						Kiri::getDi()->get(Logger::class)->critical('timer end');
-						$this->stopHeartbeatCheck();
-					}
-					if (time() - $this->_last > 10 * 60) {
-						$this->stopHeartbeatCheck();
-						$this->pdo = null;
-					}
-				} catch (\Throwable $throwable) {
-					error($throwable);
-				}
-			});
+		if ($this->_timer === -1) {
+			$this->_timer = Timer::tick(1000, fn() => $this->waite());
+		}
+	}
+
+
+	/**
+	 * @throws Exception
+	 */
+	private function waite(): void
+	{
+		try {
+			if (env('state', 'start') == 'exit') {
+				Kiri::getDi()->get(Logger::class)->critical('timer end');
+				$this->stopHeartbeatCheck();
+			}
+			if (time() - $this->_last > intval($this->pool['tick'] ?? 60)) {
+				$this->stopHeartbeatCheck();
+				$this->pdo = null;
+			}
+		} catch (\Throwable $throwable) {
+			error($throwable);
 		}
 	}
 

kiri-engine/Cache/Redis.php

@@ -9,9 +9,7 @@ declare(strict_types=1);
 
 namespace Kiri\Cache;
 
-use Annotation\Inject;
 use Exception;
-use Server\Events\OnWorkerExit;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
 use Kiri\Core\Json;
@@ -19,6 +17,9 @@ use Kiri\Events\EventProvider;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
 use Kiri\Pool\Redis as PoolRedis;
+use Note\Inject;
+use Server\Events\OnWorkerExit;
+use Swoole\Timer;
 
 /**
  * Class Redis
@@ -28,11 +29,17 @@ use Kiri\Pool\Redis as PoolRedis;
 class Redis extends Component
 {
 
-	/**
-	 * @var EventProvider
-	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
+
+	const REDIS_OPTION_HOST = 'host';
+	const REDIS_OPTION_PORT = 'port';
+	const REDIS_OPTION_PREFIX = 'prefix';
+	const REDIS_OPTION_AUTH = 'auth';
+	const REDIS_OPTION_DATABASES = 'databases';
+	const REDIS_OPTION_TIMEOUT = 'timeout';
+	const REDIS_OPTION_POOL = 'pool';
+	const REDIS_OPTION_POOL_TICK = 'tick';
+	const REDIS_OPTION_POOL_MIN = 'min';
+	const REDIS_OPTION_POOL_MAX = 'max';
 
 
 	/**
@@ -41,11 +48,11 @@ class Redis extends Component
 	 */
 	public function init()
 	{
-        $connections = Kiri::getDi()->get(PoolRedis::class);
+		$connections = Kiri::getDi()->get(PoolRedis::class);
 
 		$config = $this->get_config();
 
-		$length = Config::get('connections.pool.max', 10);
+		$length = Config::get('cache.redis.pool.max', 10);
 
 		$this->eventProvider->on(OnWorkerExit::class, [$this, 'destroy'], 0);
 
@@ -74,6 +81,25 @@ class Redis extends Component
 	}
 
 
+    /**
+     * @param $key
+     * @param int $timeout
+     * @return bool
+     */
+    public function waite($key, int $timeout = 5): bool
+    {
+        $time = time();
+        while (!$this->setNx($key, 1)) {
+            if (time()- $time >= $timeout) {
+                return FALSE;
+            }
+            usleep(1000);
+        }
+        $this->expire($key, $timeout);
+        return TRUE;
+    }
+
+
 	/**
 	 * @param $key
 	 * @param int $timeout
@@ -111,7 +137,7 @@ SCRIPT;
 	 */
 	public function release()
 	{
-        $connections = Kiri::getDi()->get(PoolRedis::class);
+		$connections = Kiri::getDi()->get(PoolRedis::class);
 		$connections->release($this->get_config(), true);
 	}
 
@@ -135,7 +161,7 @@ SCRIPT;
 	 */
 	public function proxy($name, $arguments): mixed
 	{
-        $connections = Kiri::getDi()->get(PoolRedis::class);
+		$connections = Kiri::getDi()->get(PoolRedis::class);
 
 		$config = $this->get_config();
 

kiri-engine/Context.php

@@ -24,10 +24,13 @@ class Context extends BaseContext
 	 */
 	public static function setContext($id, $context, $coroutineId = null): mixed
 	{
-		if (Coroutine::getCid() === -1) {
-			return static::$_contents[$id] = $context;
-		}
-		return Coroutine::getContext($coroutineId)[$id] = $context;
+        if (is_null($coroutineId)) {
+            $coroutineId = Coroutine::getCid();
+        }
+		if (Coroutine::getCid() !== -1) {
+            return Coroutine::getContext($coroutineId)[$id] = $context;
+        }
+        return static::$_contents[$id] = $context;
 	}
 
 	/**
@@ -38,6 +41,9 @@ class Context extends BaseContext
 	 */
 	public static function increment($id, int $value = 1, $coroutineId = null): bool|int
 	{
+        if (is_null($coroutineId)) {
+            $coroutineId = Coroutine::getCid();
+        }
 		if (!isset(Coroutine::getContext($coroutineId)[$id])) {
 			Coroutine::getContext($coroutineId)[$id] = 0;
 		}
@@ -52,6 +58,9 @@ class Context extends BaseContext
 	 */
 	public static function decrement($id, int $value = 1, $coroutineId = null): bool|int
 	{
+        if (is_null($coroutineId)) {
+            $coroutineId = Coroutine::getCid();
+        }
 		if (!isset(Coroutine::getContext($coroutineId)[$id])) {
 			Coroutine::getContext($coroutineId)[$id] = 0;
 		}
@@ -81,6 +90,9 @@ class Context extends BaseContext
 	 */
 	private static function loadByContext($id, $default = null, $coroutineId = null): mixed
 	{
+        if (is_null($coroutineId)) {
+            $coroutineId = Coroutine::getCid();
+        }
 		return Coroutine::getContext($coroutineId)[$id] ?? $default;
 	}
 
@@ -115,6 +127,9 @@ class Context extends BaseContext
 	 */
 	public static function remove(string $id, $coroutineId = null)
 	{
+        if (is_null($coroutineId)) {
+            $coroutineId = Coroutine::getCid();
+        }
 		if (!static::hasContext($id, $coroutineId)) {
 			return;
 		}
@@ -150,8 +165,9 @@ class Context extends BaseContext
 		if (!isset(static::$_contents[$id])) {
 			return false;
 		}
-		if (!empty($key) && !isset(static::$_contents[$id][$key])) {
-			return false;
+        $value = static::$_contents[$id];
+        if (!empty($key) && is_array($value)) {
+			return isset($value[$key]);
 		}
 		return true;
 	}
@@ -165,11 +181,15 @@ class Context extends BaseContext
 	 */
 	private static function searchByCoroutine($id, $key = null, $coroutineId = null): bool
 	{
+        if (is_null($coroutineId)) {
+            $coroutineId = Coroutine::getCid();
+        }
 		if (!isset(Coroutine::getContext($coroutineId)[$id])) {
 			return false;
 		}
-		if ($key !== null) {
-			return isset((Coroutine::getContext($coroutineId)[$id] ?? [])[$key]);
+        $value = Coroutine::getContext($coroutineId)[$id];
+		if ($key !== null && is_array($value)) {
+			return isset($value[$key]);
 		}
 		return true;
 	}

kiri-engine/Core/DateFormat.php

@@ -27,7 +27,7 @@ class DateFormat
 		if ($time === null) {
 			$time = time();
 		} else if (is_numeric($time)) {
-			$length = strlen(floatval($time));
+			$length = strlen((string)$time);
 			if ($length != 10 && $length != 13) {
 				return false;
 			}
@@ -86,9 +86,7 @@ class DateFormat
 			return false;
 		}
 
-		$time = date('t', $time);
-
-		return $time;
+		return date('t', $time);
 	}
 
 	/**

kiri-engine/Core/Dtl.php

@@ -21,6 +21,7 @@ class Dtl extends Component
 	/**
 	 * Dtl constructor.
 	 * @param $params
+	 * @throws Exception
 	 */
 	public function __construct($params)
 	{
@@ -35,9 +36,6 @@ class Dtl extends Component
 	 */
 	public function toArray(): array
 	{
-		if (!is_array($this->params)) {
-			return ArrayAccess::toArray($this->params);
-		}
 		return $this->params;
 	}
 

kiri-engine/Core/HashMap.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace Kiri\Core;
+
+use JetBrains\PhpStorm\Pure;
+use ReturnTypeWillChange;
+
+class HashMap implements \ArrayAccess
+{
+
+	/**
+	 * @var array
+	 */
+	private array $lists = [];
+
+
+	/**
+	 * @param string $key
+	 * @param $value
+	 */
+	public function put(string $key, $value)
+	{
+		$this->lists[$key] = $value;
+	}
+
+
+	/**
+	 * @param string $key
+	 * @return mixed
+	 */
+	#[Pure] public function get(string $key): mixed
+	{
+		if (!$this->has($key)) {
+			return null;
+		}
+		return $this->lists[$key];
+	}
+
+
+	/**
+	 * @param string $key
+	 */
+	public function del(string $key)
+	{
+		if (!$this->has($key)) {
+			return;
+		}
+		unset($this->lists[$key]);
+	}
+
+
+	/**
+	 * @param string $key
+	 * @return bool
+	 */
+	public function has(string $key): bool
+	{
+		return array_key_exists($key, $this->lists);
+	}
+
+
+	/**
+	 * @param mixed $offset
+	 * @return bool
+	 */
+	public function offsetExists(mixed $offset): bool
+	{
+		return isset($this->lists[$offset]);
+	}
+
+
+	/**
+	 * @param mixed $offset
+	 * @return mixed
+	 */
+	#[Pure] public function offsetGet(mixed $offset): mixed
+	{
+		return $this->get($offset);
+	}
+
+
+	/**
+	 * @param mixed $offset
+	 * @param mixed $value
+	 */
+	#[ReturnTypeWillChange]
+	public function offsetSet(mixed $offset, mixed $value)
+	{
+		$this->put($offset, $value);
+	}
+
+
+	/**
+	 * @param mixed $offset
+	 */
+	#[ReturnTypeWillChange]
+	public function offsetUnset(mixed $offset)
+	{
+		unset($this->lists[$offset]);
+	}
+}

kiri-engine/Core/Help.php

@@ -59,6 +59,7 @@ class Help
 	/**
 	 * @param $xml
 	 * @return mixed
+	 * @throws Exception
 	 */
 	public static function toArray($xml): mixed
 	{
@@ -200,6 +201,9 @@ class Help
 	 */
 	public static function sendEmail($email, string $Subject, $messageContent)
 	{
+		if (!class_exists('\Swift_Mailer')) {
+			return;
+		}
 		$mailer = new \Swift_Mailer((new \Swift_SmtpTransport($email['host'], $email['port']))
 			->setUsername($email['username'])->setPassword($email['password']));
 		$message = (new \Swift_Message($Subject))

kiri-engine/Core/Json.php

@@ -43,7 +43,7 @@ class Json
 	 * @param bool $asArray
 	 * @return mixed
 	 */
-	public static function decode($data, $asArray = true): mixed
+	public static function decode($data, bool $asArray = true): mixed
 	{
 		if (is_array($data) || is_numeric($data)) {
 			return $data;
@@ -55,22 +55,21 @@ class Json
 
 	/**
 	 * @param $code
-	 * @param string $message
-	 * @param array $data
+	 * @param string|array $message
+	 * @param array|int $data
 	 * @param int $count
 	 * @param array $exPageInfo
-	 * @return mixed
-	 * @throws
+	 * @return string|bool
 	 */
-	public static function to($code, $message = '', $data = [], $count = 0, $exPageInfo = []): mixed
+	public static function to($code, string|array $message = '', array|int $data = [], int $count = 0, array $exPageInfo = []): string|bool
 	{
 		$params['code'] = $code;
 		if (!is_string($message)) {
-			$params['param'] = $message;
-			if (!empty($data)) {
-				$params['exPageInfo'] = $data;
-			}
-			$params['message'] = 'System success.';
+            $params['message'] = 'System success.';
+            $params['param'] = $message;
+            if (!empty($data)) {
+                $params['exPageInfo'] = $data;
+            }
 		} else {
 			$params['message'] = $message;
 			$params['param'] = $data;

kiri-engine/Core/Network.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Kiri\Core;
+
+class Network
+{
+
+
+	/**
+	 * @return string
+	 */
+	public static function local(): string
+	{
+		return current(swoole_get_local_ip());
+	}
+
+
+}

kiri-engine/Core/Str.php

@@ -14,264 +14,270 @@ use Exception;
 class Str
 {
 
-	const STRING = 'abcdefghijklmnopqrstuvwxyz';
+    const STRING = 'abcdefghijklmnopqrstuvwxyz';
 
-	const NUMBER = '01234567890';
+    const NUMBER = '01234567890';
 
-	/**
-	 * @param int $length
-	 *
-	 * @return string
-	 * 获取随机字符串
-	 */
-	public static function rand(int $length = 20): string
-	{
-		$string = '';
-		if ($length < 1) $length = 20;
-		$default = self::STRING . strtoupper(self::STRING) . self::NUMBER;
-		$default = str_split($default);
-		$string .= str_repeat($default[array_rand($default)], $length);
-		return (string)$string;
-	}
+    /**
+     * @param int $length
+     *
+     * @return string
+     * 获取随机字符串
+     */
+    public static function rand(int $length = 20): string
+    {
+        $string = '';
+        if ($length < 1) $length = 20;
+        $default = self::STRING . strtoupper(self::STRING) . self::NUMBER;
+        $default = str_split($default);
+        for ($i = 0; $i < $length; $i++) {
+            shuffle($default);
+            $string .= $default[array_rand($default)];
+        }
+        return $string;
+    }
 
-	/**
-	 * @param int $length
-	 *
-	 * @return int|string 获取随机数字
-	 * 获取随机数字
-	 */
-	public static function random(int $length = 20): int|string
-	{
-		$number = '';
-		$default = str_split(self::NUMBER);
-		if ($length < 1) $length = 1;
-		$number .= str_repeat($default[array_rand($default)], $length);
-		return $number;
-	}
+    /**
+     * @param int $length
+     *
+     * @return int|string 获取随机数字
+     * 获取随机数字
+     */
+    public static function random(int $length = 20): int|string
+    {
+        $number = '';
+        $default = str_split(self::NUMBER);
+        if ($length < 1) $length = 1;
+        for ($i = 0; $i < $length; $i++) {
+            shuffle($default);
+            $number .= $default[array_rand($default)];
+        }
+        return $number;
+    }
 
-	/**
-	 * @param        $string
-	 * @param        $sullen
-	 * @param bool $strip_tags
-	 * @param string $append
-	 *
-	 * @return string
-	 */
-	public static function cut_str_utf8($string, $sullen, bool $strip_tags = true, string $append = '...'): string
-	{
-		if ($strip_tags) {
-			$string = strip_tags($string);
-		}//去掉签标
-		$pa = "/[\x01-\x7f]|[\xc2-\xdf][\x80-\xbf]|\xe0[\xa0-\xbf][\x80-\xbf]|[\xe1-\xef][\x80-\xbf][\x80-\xbf]|\xf0[\x90-\xbf][\x80-\xbf][\x80-\xbf]|[\xf1-\xf7][\x80-\xbf][\x80-\xbf][\x80-\xbf]/";
-		preg_match_all($pa, $string, $t_string);
-		$str = "";
-		for ($i = 0; $i < count($t_string[0]); $i++) {
-			$str .= $t_string[0][$i];
-			//转为gbk，一个汉字长度为2
-			if (strlen(@iconv('utf-8', 'gbk', $str)) >= $sullen) {
-				if ($i != count($t_string[0]) - 1) $str .= $append;
-				break;
-			}
-		}
-		return $str;
-	}
+    /**
+     * @param        $string
+     * @param        $sullen
+     * @param bool $strip_tags
+     * @param string $append
+     *
+     * @return string
+     */
+    public static function cut_str_utf8($string, $sullen, bool $strip_tags = TRUE, string $append = '...'): string
+    {
+        if ($strip_tags) {
+            $string = strip_tags($string);
+        }//去掉签标
+        $pa = "/[\x01-\x7f]|[\xc2-\xdf][\x80-\xbf]|\xe0[\xa0-\xbf][\x80-\xbf]|[\xe1-\xef][\x80-\xbf][\x80-\xbf]|\xf0[\x90-\xbf][\x80-\xbf][\x80-\xbf]|[\xf1-\xf7][\x80-\xbf][\x80-\xbf][\x80-\xbf]/";
+        preg_match_all($pa, $string, $t_string);
+        $str = "";
+        for ($i = 0; $i < count($t_string[0]); $i++) {
+            $str .= $t_string[0][$i];
+            //转为gbk，一个汉字长度为2
+            if (strlen(@iconv('utf-8', 'gbk', $str)) >= $sullen) {
+                if ($i != count($t_string[0]) - 1) $str .= $append;
+                break;
+            }
+        }
+        return $str;
+    }
 
-	/**
-	 * @param $data
-	 *
-	 * @param null $callback
-	 * @return bool
-	 * 判断是否为json字符串
-	 */
-	public static function isJson($data, $callback = null): bool
-	{
-		$json = !is_null(json_decode($data)) && !is_numeric($data);
-		if ($json && is_callable($callback, true)) {
-			return call_user_func($callback, $data);
-		}
-		return $json;
-	}
+    /**
+     * @param $data
+     *
+     * @param null $callback
+     * @return bool
+     * 判断是否为json字符串
+     */
+    public static function isJson($data, $callback = NULL): bool
+    {
+        $json = !is_null(json_decode($data)) && !is_numeric($data);
+        if ($json && is_callable($callback, TRUE)) {
+            return call_user_func($callback, $data);
+        }
+        return $json;
+    }
 
-	/**
-	 * @param $data
-	 *
-	 * @param null $callBack
-	 * @return bool
-	 * 判断是否序列化字符串
-	 */
-	public static function isSerialize($data, $callBack = null): bool
-	{
-		$false = !empty($data) && swoole_unserialize($data) !== false;
-		if ($false && is_callable($callBack, true)) {
-			return call_user_func($callBack, $data);
-		}
-		return $false;
-	}
+    /**
+     * @param $data
+     *
+     * @param null $callBack
+     * @return bool
+     * 判断是否序列化字符串
+     */
+    public static function isSerialize($data, $callBack = NULL): bool
+    {
+        $false = !empty($data) && swoole_unserialize($data) !== FALSE;
+        if ($false && is_callable($callBack, TRUE)) {
+            return call_user_func($callBack, $data);
+        }
+        return $false;
+    }
 
-	/**
-	 * @param     $string
-	 * @param int $length
-	 *
-	 * @param string $append
-	 * @return string
-	 */
-	public static function cut($string, int $length = 20, string $append = '...'): string
-	{
-		if (empty($string)) {
-			return '';
-		}
-		if ($length < 1) {
-			$length = 1;
-		}
-		$array = str_split($string);
-		if (count($array) <= $length) {
-			return implode('', $array);
-		}
-		$string = implode('', array_slice($array, 0, $length));
-		if (!empty($append)) {
-			$string .= $append;
-		}
-		return $string;
-	}
+    /**
+     * @param     $string
+     * @param int $length
+     *
+     * @param string $append
+     * @return string
+     */
+    public static function cut($string, int $length = 20, string $append = '...'): string
+    {
+        if (empty($string)) {
+            return '';
+        }
+        if ($length < 1) {
+            $length = 1;
+        }
+        $array = str_split($string);
+        if (count($array) <= $length) {
+            return implode('', $array);
+        }
+        $string = implode('', array_slice($array, 0, $length));
+        if (!empty($append)) {
+            $string .= $append;
+        }
+        return $string;
+    }
 
-	/**
-	 * @param        $str
-	 * @param int $number
-	 * @param string $key
-	 *
-	 * @return string
-	 */
-	public static function encrypt($str, int $number = 10, string $key = 'xshucai.com'): string
-	{
-		$res = [];
-		$add = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-		$len = strlen($key) < 0 ? 1 : (strlen($key) + 5 > strlen($add) ? strlen($add) - 5 : strlen($key));
-		if ($number < 1) $number = 10;
-		$array = str_split($str);
-		asort($array);
-		$str = implode('', $array);
-		for ($i = 0; $i < $number; $i++) {
-			$_tmp = md5($key) . md5($str) . mb_substr($add, $len, $len + 5, 'utf-8');
-			$res[] = md5($_tmp);
-		}
-		sort($res, SORT_STRING);
-		return hash('sha384', implode('', $res));
-	}
+    /**
+     * @param        $str
+     * @param int $number
+     * @param string $key
+     *
+     * @return string
+     */
+    public static function encrypt($str, int $number = 10, string $key = 'xshucai.com'): string
+    {
+        $res = [];
+        $add = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+        $len = strlen($key) < 0 ? 1 : (strlen($key) + 5 > strlen($add) ? strlen($add) - 5 : strlen($key));
+        if ($number < 1) $number = 10;
+        $array = str_split($str);
+        asort($array);
+        $str = implode('', $array);
+        for ($i = 0; $i < $number; $i++) {
+            $_tmp = md5($key) . md5($str) . mb_substr($add, $len, $len + 5, 'utf-8');
+            $res[] = md5($_tmp);
+        }
+        sort($res, SORT_STRING);
+        return hash('sha384', implode('', $res));
+    }
 
-	/**
-	 * @param $file
-	 * @param $type
-	 * @return string
-	 */
-	public static function filename($file, $type): string
-	{
-		switch ($type) {
-			case 'image/png':
-				return md5_file($file) . '.png';
-			case 'image/jpeg':
-			case 'image/jpg':
-				return md5_file($file) . '.jpg';
-			case 'image/gif':
-				return md5_file($file) . '.gif';
-				break;
-		}
-		return md5_file($file);
-	}
+    /**
+     * @param $file
+     * @param $type
+     * @return string
+     */
+    public static function filename($file, $type): string
+    {
+        switch ($type) {
+            case 'image/png':
+                return md5_file($file) . '.png';
+            case 'image/jpeg':
+            case 'image/jpg':
+                return md5_file($file) . '.jpg';
+            case 'image/gif':
+                return md5_file($file) . '.gif';
+                break;
+        }
+        return md5_file($file);
+    }
 
-	/**
-	 * @param $endTime
-	 * @param int|null $startTime
-	 * @return array
-	 * 剩余天，带分秒
-	 */
-	public static function timeout($endTime, int $startTime = null): array
-	{
-		$endTime = $endTime - (!empty($startTime) ? $startTime : time());
+    /**
+     * @param $endTime
+     * @param int|null $startTime
+     * @return array
+     * 剩余天，带分秒
+     */
+    public static function timeout($endTime, int $startTime = NULL): array
+    {
+        $endTime = $endTime - (!empty($startTime) ? $startTime : time());
 
-		$day = intval($endTime / (3600 * 24));
+        $day = intval($endTime / (3600 * 24));
 
-		$hours = intval(($endTime - ($day * (3600 * 24))) / 3600);
+        $hours = intval(($endTime - ($day * (3600 * 24))) / 3600);
 
-		$minute = intval(($endTime - ($day * (3600 * 24) + $hours * 3600)) / 60);
+        $minute = intval(($endTime - ($day * (3600 * 24) + $hours * 3600)) / 60);
 
-		$scrod = intval(($endTime - ($day * (3600 * 24) + $hours * 3600 + $minute * 60)));
+        $scrod = intval(($endTime - ($day * (3600 * 24) + $hours * 3600 + $minute * 60)));
 
-		return [$day, $hours, $minute, $scrod];
-	}
+        return [$day, $hours, $minute, $scrod];
+    }
 
 
-	/**
-	 * @return false|int
-	 */
-	public static function get_sy_time(): bool|int
-	{
-		$time = strtotime('+1days', strtotime(date('Y-m-d')));
+    /**
+     * @return false|int
+     */
+    public static function get_sy_time(): bool|int
+    {
+        $time = strtotime('+1days', strtotime(date('Y-m-d')));
 
-		return $time - time();
-	}
+        return $time - time();
+    }
 
-	/**
-	 * @param string $string
-	 * @return string
-	 */
-	public static function encode(string $string): string
-	{
-		return addslashes($string);
-	}
+    /**
+     * @param string $string
+     * @return string
+     */
+    public static function encode(string $string): string
+    {
+        return addslashes($string);
+    }
 
-	/**
-	 * @param string $string
-	 * @return string|string[]|null
-	 * 清除标点符号
-	 */
-	public static function clear(string $string): array|string|null
-	{
-		$char = '。、！？：；﹑•＂…‘’“”〝〞∕¦‖—　〈〉﹞﹝「」‹›〖〗】【»«』『〕〔》《﹐¸﹕︰﹔！¡？¿﹖﹌﹏﹋＇´ˊˋ―﹫︳︴¯＿￣﹢﹦﹤‐­˜﹟﹩﹠﹪﹡﹨﹍﹉﹎﹊ˇ︵︶︷︸︹︿﹀︺︽︾ˉ﹁﹂﹃﹄︻︼（）';
-		return preg_replace(array("/[[:punct:]]/i", '/[' . $char . ']/u', '/[ ]{2,}/'), '', $string);
-	}
+    /**
+     * @param string $string
+     * @return string|string[]|null
+     * 清除标点符号
+     */
+    public static function clear(string $string): array|string|null
+    {
+        $char = '。、！？：；﹑•＂…‘’“”〝〞∕¦‖—　〈〉﹞﹝「」‹›〖〗】【»«』『〕〔》《﹐¸﹕︰﹔！¡？¿﹖﹌﹏﹋＇´ˊˋ―﹫︳︴¯＿￣﹢﹦﹤‐­˜﹟﹩﹠﹪﹡﹨﹍﹉﹎﹊ˇ︵︶︷︸︹︿﹀︺︽︾ˉ﹁﹂﹃﹄︻︼（）';
+        return preg_replace(["/[[:punct:]]/i", '/[' . $char . ']/u', '/[ ]{2,}/'], '', $string);
+    }
 
 
-	/**
-	 * @param int $user
-	 * @param array $param
-	 * @param null $requestTime
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public static function token(int $user, array $param = [], $requestTime = NULL): string
-	{
-		$str = '';
-		if (!$requestTime) {
-			$requestTime = microtime(true);
-		}
-		$_user = str_split(md5($user . md5((string)$user)));
-		ksort($_user);
-		foreach ($_user as $key => $val) {
-			$str .= md5(sha1($key . $val . 'www.xshucai.com'));
-		}
-		if (is_array($param)) {
-			foreach ($param as $key => $val) {
-				$str .= md5($str . sha1($key . md5($val)));
-			}
-		}
-		$str .= sha1(base64_encode((string)$requestTime));
+    /**
+     * @param int $user
+     * @param array $param
+     * @param null $requestTime
+     *
+     * @return string
+     * @throws Exception
+     */
+    public static function token(int $user, array $param = [], $requestTime = NULL): string
+    {
+        $str = '';
+        if (!$requestTime) {
+            $requestTime = microtime(TRUE);
+        }
+        $_user = str_split(md5($user . md5((string)$user)));
+        ksort($_user);
+        foreach ($_user as $key => $val) {
+            $str .= md5(sha1($key . $val . 'www.xshucai.com'));
+        }
+        if (is_array($param)) {
+            foreach ($param as $key => $val) {
+                $str .= md5($str . sha1($key . md5($val)));
+            }
+        }
+        $str .= sha1(base64_encode((string)$requestTime));
 
-		$md5 = md5($str . $user);
+        $md5 = md5($str . $user);
 
-		return preg_replace('/(\w{10})(\w{3})(\w{4})(\w{9})(\w{6})/', '$1-$2-$3-$4-$5', $md5);
-	}
+        return preg_replace('/(\w{10})(\w{3})(\w{4})(\w{9})(\w{6})/', '$1-$2-$3-$4-$5', $md5);
+    }
 
 
-	/**
-	 * @param string $str
-	 * @param bool $unfairest
-	 * @return string
-	 */
-	public static function convertUnderline(string $str, bool $unfairest = true): string
-	{
-		$str = ucwords(str_replace('_', ' ', $str));
-		$str = str_replace(' ', '', lcfirst($str));
-		return $unfairest ? ucfirst($str) : $str;
-	}
+    /**
+     * @param string $str
+     * @param bool $unfairest
+     * @return string
+     */
+    public static function convertUnderline(string $str, bool $unfairest = TRUE): string
+    {
+        $str = ucwords(str_replace('_', ' ', $str));
+        $str = str_replace(' ', '', lcfirst($str));
+        return $unfairest ? ucfirst($str) : $str;
+    }
 }

kiri-engine/Di/Container.php

@@ -9,10 +9,10 @@ declare(strict_types=1);
 
 namespace Kiri\Di;
 
-use Annotation\Inject;
+use Kiri\Abstracts\Component;
+use Note\Inject;
 use Closure;
 use Exception;
-use Kiri\Abstracts\BaseObject;
 use Kiri\Abstracts\Logger;
 use Kiri\Kiri;
 use Psr\Log\LoggerInterface;
@@ -21,12 +21,13 @@ use ReflectionException;
 use ReflectionFunction;
 use ReflectionMethod;
 use ReflectionProperty;
+use Psr\Container\ContainerInterface;
 
 /**
  * Class Container
  * @package Kiri\Di
  */
-class Container extends BaseObject implements ContainerInterface
+class Container implements ContainerInterface
 {
 
 	/**
@@ -61,26 +62,39 @@ class Container extends BaseObject implements ContainerInterface
 	];
 
 
-	/**
-	 * @param       $class
-	 * @param array $constrict
-	 * @param array $config
-	 *
-	 * @return mixed
-	 * @throws
-	 */
-	public function get($class, array $constrict = [], array $config = []): mixed
+    /**
+     * @param string $id
+     * @return mixed
+     * @throws
+     */
+	public function get(string $id): mixed
 	{
-		if ($this->isInterface($class)) {
-			$class = $this->_interfaces[$class];
-		}
-		if (!isset($this->_singletons[$class])) {
-			$this->_singletons[$class] = $this->resolve($class, $constrict, $config);
-		}
-		return $this->_singletons[$class];
+		return $this->make($id, [], []);
 	}
 
 
+
+    /**
+     * @param $class
+     * @param array $constrict
+     * @param array $config
+     * @return mixed
+     * @throws ReflectionException
+     * @throws Exception
+     */
+    public function make($class, array $constrict = [], array $config = []): mixed
+    {
+        if ($this->isInterface($class)) {
+            $class = $this->_interfaces[$class];
+        }
+        if (!isset($this->_singletons[$class])) {
+            $this->_singletons[$class] = $this->resolve($class, $constrict, $config);
+        }
+        return $this->_singletons[$class];
+    }
+
+
+
 	/**
 	 * @param string $interface
 	 * @param string $class
@@ -94,7 +108,6 @@ class Container extends BaseObject implements ContainerInterface
 	/**
 	 * @param $class
 	 * @return bool
-	 * @throws ReflectionException
 	 */
 	public function isInterface($class): bool
 	{
@@ -198,7 +211,6 @@ class Container extends BaseObject implements ContainerInterface
 	 * @param $className
 	 * @param $method
 	 * @return array
-	 * @throws ReflectionException
 	 */
 	public function getMethodAttribute($className, $method = null): array
 	{
@@ -214,7 +226,6 @@ class Container extends BaseObject implements ContainerInterface
 	 * @param string $class
 	 * @param string|null $property
 	 * @return ReflectionProperty|ReflectionProperty[]|null
-	 * @throws ReflectionException
 	 */
 	public function getClassReflectionProperty(string $class, string $property = null): ReflectionProperty|null|array
 	{
@@ -247,7 +258,6 @@ class Container extends BaseObject implements ContainerInterface
 	/**
 	 * @param $class
 	 * @return ReflectionClass
-	 * @throws ReflectionException
 	 */
 	private function resolveDependencies($class): ReflectionClass
 	{
@@ -326,9 +336,6 @@ class Container extends BaseObject implements ContainerInterface
 		if (!isset($this->_parameters[$class])) {
 			$this->_parameters[$class] = [];
 		}
-		if (!isset($this->_parameters[$class][$method])) {
-			$this->_parameters[$class][$method] = [];
-		}
 		return $this->_parameters[$class][$method] = $parameters;
 	}
 
@@ -347,7 +354,6 @@ class Container extends BaseObject implements ContainerInterface
 	/**
 	 * @param ReflectionMethod|ReflectionFunction $reflectionMethod
 	 * @return array
-	 * @throws ReflectionException
 	 */
 	private function resolveMethodParameters(ReflectionMethod|ReflectionFunction $reflectionMethod): array
 	{
@@ -381,7 +387,6 @@ class Container extends BaseObject implements ContainerInterface
 	/**
 	 * @param $class
 	 * @return ReflectionClass|null
-	 * @throws ReflectionException
 	 */
 	public function getReflect($class): ?ReflectionClass
 	{
@@ -435,4 +440,13 @@ class Container extends BaseObject implements ContainerInterface
 		}
 		return $old;
 	}
+
+    /**
+     * @param string $id
+     * @return bool
+     */
+    public function has(string $id): bool
+    {
+        return isset($this->_singletons[$id]) || isset($this->_interfaces[$id]);
+    }
 }

kiri-engine/Di/ContainerInterface.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace Kiri\Di;
-
-
-/**
- * @mixin Container
- */
-interface ContainerInterface
-{
-
-}

kiri-engine/Di/NoteManager.php

@@ -11,279 +11,293 @@ class NoteManager
 {
 
 
-    private static array $_classTarget = [];
-    private static array $_classMethodNote = [];
-    private static array $_classMethod = [];
-    private static array $_classPropertyNote = [];
-    private static array $_classProperty = [];
-    private static array $_mapping = [];
+	private static array $_classTarget = [];
+	private static array $_classMethodNote = [];
+	private static array $_classMethod = [];
+	private static array $_classPropertyNote = [];
+	private static array $_classProperty = [];
+	private static array $_mapping = [];
 
 
-    /**
-     * @param ReflectionClass $class
-     */
-    public static function setTargetNote(ReflectionClass $class)
-    {
-        $className = $class->getName();
-        if (!isset(static::$_classTarget[$className])) {
-            static::$_classTarget[$className] = [];
-        }
-        foreach ($class->getAttributes() as $attribute) {
-            if (!class_exists($attribute->getName())) {
-                continue;
-            }
-
-            $instance = $attribute->newInstance();
-
-            static::$_classTarget[$className][] = $instance;
-
-            self::setMappingClass($attribute, $className);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public static function clear()
+	{
+		static::$_classTarget = [];
+		static::$_classMethodNote = [];
+		static::$_classMethod = [];
+		static::$_classPropertyNote = [];
+		static::$_classProperty = [];
+		static::$_mapping = [];
+	}
 
 
-    /**
-     * @param ReflectionAttribute $attribute
-     * @param string $class
-     */
-    public static function setMappingClass(ReflectionAttribute $attribute, string $class)
-    {
-        if (!isset(static::$_mapping[$attribute->getName()])) {
-            static::$_mapping[$attribute->getName()] = [];
-        }
-        if (!isset(static::$_mapping[$attribute->getName()][$class])) {
-            static::$_mapping[$attribute->getName()][$class] = [];
-        }
-    }
+	/**
+	 * @param ReflectionClass $class
+	 */
+	public static function setTargetNote(ReflectionClass $class)
+	{
+		$className = $class->getName();
+		if (!isset(static::$_classTarget[$className])) {
+			static::$_classTarget[$className] = [];
+		}
+		foreach ($class->getAttributes() as $attribute) {
+			if (!class_exists($attribute->getName())) {
+				continue;
+			}
+
+			$instance = $attribute->newInstance();
+
+			static::$_classTarget[$className][] = $instance;
+
+			self::setMappingClass($attribute, $className);
+		}
+	}
 
 
-    /**
-     * @param ReflectionAttribute $attribute
-     * @param string $class
-     * @param string $method
-     * @param mixed $instance
-     */
-    public static function setMappingMethod(ReflectionAttribute $attribute, string $class, string $method, mixed $instance)
-    {
-        self::setMappingClass($attribute, $class);
-
-        if (!isset(static::$_mapping[$attribute->getName()][$class]['method'])) {
-            static::$_mapping[$attribute->getName()][$class]['method'] = [];
-        }
-        static::$_mapping[$attribute->getName()][$class]['method'][] = [$method => $instance];
-    }
+	/**
+	 * @param ReflectionAttribute $attribute
+	 * @param string $class
+	 */
+	public static function setMappingClass(ReflectionAttribute $attribute, string $class)
+	{
+		if (!isset(static::$_mapping[$attribute->getName()])) {
+			static::$_mapping[$attribute->getName()] = [];
+		}
+		if (!isset(static::$_mapping[$attribute->getName()][$class])) {
+			static::$_mapping[$attribute->getName()][$class] = [];
+		}
+	}
 
 
-    /**
-     * @param ReflectionAttribute $attribute
-     * @param string $class
-     * @param string $property
-     * @param $instance
-     */
-    public static function setMappingProperty(ReflectionAttribute $attribute, string $class, string $property, $instance)
-    {
-        self::setMappingClass($attribute, $class);
+	/**
+	 * @param ReflectionAttribute $attribute
+	 * @param string $class
+	 * @param string $method
+	 * @param mixed $instance
+	 */
+	public static function setMappingMethod(ReflectionAttribute $attribute, string $class, string $method, mixed $instance)
+	{
+		self::setMappingClass($attribute, $class);
 
-        $mapping = static::$_mapping[$attribute->getName()][$class];
-        if (!isset($mapping['property'])) {
-            $mapping['property'] = [];
-        }
-        $mapping['property'][] = [$property => $instance];
-        static::$_mapping[$attribute->getName()][$class] = $mapping;
-    }
+		if (!isset(static::$_mapping[$attribute->getName()][$class]['method'])) {
+			static::$_mapping[$attribute->getName()][$class]['method'] = [];
+		}
+		static::$_mapping[$attribute->getName()][$class]['method'][] = [$method => $instance];
+	}
 
 
-    /**
-     * @param mixed $class
-     * @return array
-     */
-    public static function getTargetNote(mixed $class): array
-    {
-        if (!is_string($class)) {
-            $class = $class::class;
-        }
-        return static::$_classTarget[$class] ?? [];
-    }
+	/**
+	 * @param ReflectionAttribute $attribute
+	 * @param string $class
+	 * @param string $property
+	 * @param $instance
+	 */
+	public static function setMappingProperty(ReflectionAttribute $attribute, string $class, string $property, $instance)
+	{
+		self::setMappingClass($attribute, $class);
+
+		$mapping = static::$_mapping[$attribute->getName()][$class];
+		if (!isset($mapping['property'])) {
+			$mapping['property'] = [];
+		}
+		$mapping['property'][] = [$property => $instance];
+		static::$_mapping[$attribute->getName()][$class] = $mapping;
+	}
 
 
-    /**
-     * @param ReflectionClass $class
-     */
-    public static function setMethodNote(ReflectionClass $class)
-    {
-        $className = $class->getName();
-        static::$_classMethodNote[$className] = static::$_classMethod[$className] = [];
-        foreach ($class->getMethods() as $ReflectionMethod) {
-            static::$_classMethod[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
-            static::$_classMethodNote[$className][$ReflectionMethod->getName()] = [];
-            foreach ($ReflectionMethod->getAttributes() as $attribute) {
-                if (!class_exists($attribute->getName())) {
-                    continue;
-                }
-                $instance = $attribute->newInstance();
-
-                static::$_classMethodNote[$className][$ReflectionMethod->getName()][] = $instance;
-
-                self::setMappingMethod($attribute, $className, $ReflectionMethod->getName(), $instance);
-            }
-        }
-    }
+	/**
+	 * @param mixed $class
+	 * @return array
+	 */
+	public static function getTargetNote(mixed $class): array
+	{
+		if (!is_string($class)) {
+			$class = $class::class;
+		}
+		return static::$_classTarget[$class] ?? [];
+	}
 
 
-    /**
-     * @param string $class
-     * @param string $method
-     * @return bool
-     */
-    public static function hasMethod(string $class, string $method): bool
-    {
-        return isset(static::$_classMethod[$class]) && isset(static::$_classMethod[$class][$method]);
-    }
+	/**
+	 * @param ReflectionClass $class
+	 */
+	public static function setMethodNote(ReflectionClass $class)
+	{
+		$className = $class->getName();
+		static::$_classMethodNote[$className] = static::$_classMethod[$className] = [];
+		foreach ($class->getMethods() as $ReflectionMethod) {
+			static::$_classMethod[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
+			static::$_classMethodNote[$className][$ReflectionMethod->getName()] = [];
+			foreach ($ReflectionMethod->getAttributes() as $attribute) {
+				if (!class_exists($attribute->getName())) {
+					continue;
+				}
+				$instance = $attribute->newInstance();
+
+				static::$_classMethodNote[$className][$ReflectionMethod->getName()][] = $instance;
+
+				self::setMappingMethod($attribute, $className, $ReflectionMethod->getName(), $instance);
+			}
+		}
+	}
 
 
-    /**
-     * @param ReflectionClass $class
-     * @return array
-     */
-    #[Pure] public static function getMethodNote(ReflectionClass $class): array
-    {
-        return static::$_classMethodNote[$class->getName()] ?? [];
-    }
+	/**
+	 * @param string $class
+	 * @param string $method
+	 * @return bool
+	 */
+	public static function hasMethod(string $class, string $method): bool
+	{
+		return isset(static::$_classMethod[$class]) && isset(static::$_classMethod[$class][$method]);
+	}
 
 
-    /**
-     * @param \ReflectionClass $reflect
-     * @return \ReflectionMethod|null
-     */
-    public static function resolveTarget(ReflectionClass $reflect): ?\ReflectionMethod
-    {
-        NoteManager::setPropertyNote($reflect);
-        NoteManager::setTargetNote($reflect);
-        NoteManager::setMethodNote($reflect);
-
-        return $reflect->getConstructor();
-    }
+	/**
+	 * @param ReflectionClass $class
+	 * @return array
+	 */
+	#[Pure] public static function getMethodNote(ReflectionClass $class): array
+	{
+		return static::$_classMethodNote[$class->getName()] ?? [];
+	}
 
 
-    /**
-     * @param ReflectionClass $class
-     */
-    public static function setPropertyNote(ReflectionClass $class)
-    {
-        $className = $class->getName();
-        static::$_classProperty[$className] = static::$_classPropertyNote[$className] = [];
-        foreach ($class->getProperties(ReflectionProperty::IS_PRIVATE | ReflectionProperty::IS_PUBLIC |
-            ReflectionProperty::IS_PROTECTED) as $ReflectionMethod) {
-            static::$_classProperty[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
-            foreach ($ReflectionMethod->getAttributes() as $attribute) {
-                if (!class_exists($attribute->getName())) {
-                    continue;
-                }
+	/**
+	 * @param \ReflectionClass $reflect
+	 * @return \ReflectionMethod|null
+	 */
+	public static function resolveTarget(ReflectionClass $reflect): ?\ReflectionMethod
+	{
+		NoteManager::setPropertyNote($reflect);
+		NoteManager::setTargetNote($reflect);
+		NoteManager::setMethodNote($reflect);
 
-                $instance = $attribute->newInstance();
-
-                static::$_classPropertyNote[$className][$ReflectionMethod->getName()] = $instance;
-
-                self::setMappingProperty($attribute, $className, $ReflectionMethod->getName(), $instance);
-            }
-        }
-    }
+		return $reflect->getConstructor();
+	}
 
 
-    /**
-     * @param string $attribute
-     * @param string|null $class
-     * @return array[]
-     */
-    public static function getAttributeTrees(string $attribute, string $class = null): array
-    {
-        $mapping = static::$_mapping[$attribute] ?? [];
-        if (empty($mapping) || empty($class)) {
-            return $mapping;
-        }
-        return $mapping[$class] ?? [];
-    }
+	/**
+	 * @param ReflectionClass $class
+	 */
+	public static function setPropertyNote(ReflectionClass $class)
+	{
+		$className = $class->getName();
+		static::$_classProperty[$className] = static::$_classPropertyNote[$className] = [];
+		foreach ($class->getProperties(ReflectionProperty::IS_PRIVATE | ReflectionProperty::IS_PUBLIC |
+			ReflectionProperty::IS_PROTECTED) as $ReflectionMethod) {
+			static::$_classProperty[$className][$ReflectionMethod->getName()] = $ReflectionMethod;
+			foreach ($ReflectionMethod->getAttributes() as $attribute) {
+				if (!class_exists($attribute->getName())) {
+					continue;
+				}
+
+				$instance = $attribute->newInstance();
+
+				static::$_classPropertyNote[$className][$ReflectionMethod->getName()] = $instance;
+
+				self::setMappingProperty($attribute, $className, $ReflectionMethod->getName(), $instance);
+			}
+		}
+	}
 
 
-    /**
-     * @param string $attribute
-     * @param string $class
-     * @param string|null $method
-     * @return array
-     */
-    public static function getSpecify_annotation(string $attribute, string $class, string $method = null): mixed
-    {
-        $class = self::getAttributeTrees($attribute, $class);
-        if (empty($class) || !isset($class['method'])){
-            return null;
-        }
-        if (empty($method)) {
-            return $class['method'];
-        }
-        foreach ($class['method'] as $value) {
-            $key = key($value);
-            if ($method == $key) {
-                return $value[$key];
-            }
-        }
-        return null;
-    }
+	/**
+	 * @param string $attribute
+	 * @param string|null $class
+	 * @return array[]
+	 */
+	public static function getAttributeTrees(string $attribute, string $class = null): array
+	{
+		$mapping = static::$_mapping[$attribute] ?? [];
+		if (empty($mapping) || empty($class)) {
+			return $mapping;
+		}
+		return $mapping[$class] ?? [];
+	}
 
 
-    /**
-     * @param string $attribute
-     * @param string $class
-     * @param string $method
-     * @return mixed
-     */
-    public static function getPropertyByAnnotation(string $attribute, string $class, string $method): mixed
-    {
-        $class = self::getAttributeTrees($attribute, $class);
-        if (empty($class) || !isset($class['property'])) {
-            return [];
-        }
-        foreach ($class['property'] as $value) {
-            $key = key($value);
-            if ($method == $key) {
-                return $value[$key];
-            }
-        }
-        return null;
-    }
+	/**
+	 * @param string $attribute
+	 * @param string $class
+	 * @param string|null $method
+	 * @return array
+	 */
+	public static function getSpecify_annotation(string $attribute, string $class, string $method = null): mixed
+	{
+		$class = self::getAttributeTrees($attribute, $class);
+		if (empty($class) || !isset($class['method'])) {
+			return null;
+		}
+		if (empty($method)) {
+			return $class['method'];
+		}
+		foreach ($class['method'] as $value) {
+			$key = key($value);
+			if ($method == $key) {
+				return $value[$key];
+			}
+		}
+		return null;
+	}
 
 
-    /**
-     * @param ReflectionClass|string $class
-     * @return array
-     * @throws \ReflectionException
-     */
-    public static function getMethods(ReflectionClass|string $class): array
-    {
-        if (is_string($class)) {
-            $class = self::getReflect($class);
-        }
-        return static::$_classMethod[$class->getName()] ?? [];
-    }
+	/**
+	 * @param string $attribute
+	 * @param string $class
+	 * @param string $method
+	 * @return mixed
+	 */
+	public static function getPropertyByNote(string $attribute, string $class, string $method): mixed
+	{
+		$class = self::getAttributeTrees($attribute, $class);
+		if (empty($class) || !isset($class['property'])) {
+			return [];
+		}
+		foreach ($class['property'] as $value) {
+			$key = key($value);
+			if ($method == $key) {
+				return $value[$key];
+			}
+		}
+		return null;
+	}
 
 
-    /**
-     * @param ReflectionClass $class
-     * @return ReflectionProperty[]
-     */
-    #[Pure] public static function getProperty(ReflectionClass $class): array
-    {
-        return static::$_classProperty[$class->getName()] ?? [];
-    }
+	/**
+	 * @param ReflectionClass|string $class
+	 * @return array
+	 * @throws \ReflectionException
+	 */
+	public static function getMethods(ReflectionClass|string $class): array
+	{
+		if (is_string($class)) {
+			$class = self::getReflect($class);
+		}
+		return static::$_classMethod[$class->getName()] ?? [];
+	}
 
 
-    /**
-     * @param ReflectionClass $class
-     * @return array
-     */
-    #[Pure] public static function getPropertyNote(ReflectionClass $class): array
-    {
-        return static::$_classPropertyNote[$class->getName()] ?? [];
-    }
+	/**
+	 * @param ReflectionClass $class
+	 * @return ReflectionProperty[]
+	 */
+	#[Pure] public static function getProperty(ReflectionClass $class): array
+	{
+		return static::$_classProperty[$class->getName()] ?? [];
+	}
+
+
+	/**
+	 * @param ReflectionClass $class
+	 * @return array
+	 */
+	#[Pure] public static function getPropertyNote(ReflectionClass $class): array
+	{
+		return static::$_classPropertyNote[$class->getName()] ?? [];
+	}
 
 
 }

kiri-engine/Error/Logger.php

@@ -9,11 +9,10 @@ declare(strict_types=1);
 
 namespace Kiri\Error;
 
-use Annotation\Inject;
+use Note\Inject;
 use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Core\Json;
-use Kiri\Events\EventProvider;
 use Kiri\Kiri;
 use Psr\Log\LoggerInterface;
 use Throwable;
@@ -29,11 +28,6 @@ class Logger extends Component
 	private array $logs = [];
 
 
-	/** @var EventProvider */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
-
 	/**
 	 * inject logger
 	 *

kiri-engine/Error/LoggerAspect.php

@@ -5,29 +5,35 @@ namespace Kiri\Error;
 
 
 use Exception;
+use Http\Aspect\OnAspectInterface;
+use Http\Aspect\OnJoinPointInterface;
 use Http\Constrict\RequestInterface;
-use Kiri\IAspect;
 use Kiri\Kiri;
+use Psr\Log\LoggerInterface;
 
 
 /**
  * Class LoggerAspect
  * @package Kiri\Error
  */
-class LoggerAspect implements IAspect
+class LoggerAspect implements OnAspectInterface
 {
 
-	private float $time;
-
 
 	/**
-	 * @param mixed $handler
-	 * @param array $params
+	 * @param OnJoinPointInterface $joinPoint
 	 * @return mixed
+	 * @throws Exception
 	 */
-	public function invoke(mixed $handler, array $params = []): mixed
+	public function process(OnJoinPointInterface $joinPoint): mixed
 	{
-		return call_user_func($handler, ...$params);
+		$time = microtime(true);
+
+		$response = $joinPoint->process();
+
+		$this->print_runtime($time);
+
+		return $response;
 	}
 
 
@@ -38,26 +44,10 @@ class LoggerAspect implements IAspect
 	private function print_runtime($startTime)
 	{
 		$request = Kiri::getDi()->get(RequestInterface::class);
-
 		$runTime = round(microtime(true) - $startTime, 6);
-		echo sprintf('run %s use time %6f', $request->getUri()->__toString(), $runTime);
-		echo PHP_EOL;
+
+		$logger = Kiri::getDi()->get(LoggerInterface::class);
+		$logger->debug(sprintf('run %s use time %6f', $request->getUri()->__toString(), $runTime));
 	}
 
-
-	public function before(): void
-	{
-		// TODO: Implement before() method.
-		$this->time = microtime(true);
-	}
-
-
-	/**
-	 * @throws Exception
-	 */
-	public function after(mixed $response): void
-	{
-		// TODO: Implement after() method.
-		$this->print_runtime($this->time);
-	}
 }

kiri-engine/Error/LoggerProcess.php

@@ -5,13 +5,12 @@ namespace Kiri\Error;
 
 
 use Exception;
-use JetBrains\PhpStorm\Pure;
 use Kiri\Core\Json;
 use Kiri\Exception\ComponentException;
 use Kiri\Kiri;
+use Server\Abstracts\BaseProcess;
 use Swoole\Coroutine;
 use Swoole\Process;
-use Server\Abstracts\BaseProcess;
 
 /**
  * Class LoggerProcess
@@ -20,22 +19,15 @@ use Server\Abstracts\BaseProcess;
 class LoggerProcess extends BaseProcess
 {
 
-	/**
-	 * @param Process $process
-	 * @return string
-	 */
-	#[Pure] public function getProcessName(Process $process): string
-	{
-		// TODO: Implement getProcessName() method.
-		return get_called_class();
-	}
+
+	public string $name = 'logger process';
 
 
 	/**
 	 * @param Process $process
 	 * @throws ComponentException
 	 */
-	public function onHandler(Process $process): void
+	public function process(Process $process): void
 	{
 		// TODO: Implement onHandler() method.
 		$this->message($process);
@@ -49,8 +41,7 @@ class LoggerProcess extends BaseProcess
 	 */
 	public function message(Process $process)
 	{
-		if ($this->checkProcessIsStop()) {
-			$this->exit();
+		if ($this->isStop()) {
 			return;
 		}
 		$message = Json::decode($process->read());

kiri-engine/Event.php

@@ -6,14 +6,13 @@ namespace Kiri;
 
 
 use Exception;
-use Kiri\Abstracts\BaseObject;
-use Swoole\Coroutine;
+use Kiri\Abstracts\Component;
 
 /**
  * Class Event
  * @package Kiri
  */
-class Event extends BaseObject
+class Event extends Component
 {
 
 	public bool $isVide = true;

kiri-engine/FileListen/HotReload.php

@@ -4,13 +4,17 @@ namespace Kiri\FileListen;
 
 use Exception;
 use Kiri\Abstracts\Config;
-use Kiri\Abstracts\Logger;
+use Kiri\Core\Json;
+use Kiri\Error\Logger;
 use Kiri\Exception\ConfigException;
 use Kiri\Kiri;
+use Note\Inject;
 use Swoole\Coroutine;
 use Swoole\Process;
+use Swoole\Timer;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 
@@ -21,105 +25,211 @@ class HotReload extends Command
 {
 
 
-	public bool $isReloading = false;
-	public bool $isReloadingOut = false;
-	public ?array $dirs = [];
-	public int $events;
+    public bool $isReloading = FALSE;
+    public bool $isReloadingOut = FALSE;
+    public ?array $dirs = [];
 
-	public int $int = -1;
+    public int $events;
+
+    public int $int = -1;
 
 
-	protected mixed $source = null;
-	protected mixed $pipes = [];
-
-	protected ?Coroutine\Channel $channel = null;
+    private ?Process $process = NULL;
 
 
-	/**
-	 *
-	 */
-	protected function configure()
-	{
-		$this->setName('sw:wather')
-			->setDescription('server start');
-	}
+    public Inotify|Scaner $driver;
 
 
-	/**
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 * @return int
-	 * @throws ConfigException
-	 * @throws Exception
-	 */
-	public function execute(InputInterface $input, OutputInterface $output): int
-	{
-		// TODO: Implement onHandler() method.
-		set_error_handler([$this, 'onErrorHandler']);
-
-		$this->dirs = Config::get('inotify', [APP_PATH . 'app']);
-		if (!extension_loaded('inotify')) {
-			$driver = Kiri::getDi()->get(Scaner::class, [$this->dirs, $this]);
-		} else {
-			$driver = Kiri::getDi()->get(Inotify::class, [$this->dirs, $this]);
-		}
-
-		if (Kiri::getPlatform()->isLinux()) {
-			swoole_set_process_name('[' . Config::get('id', 'sw service.') . '].sw:wather');
-		}
-		$this->trigger_reload();
-		Coroutine::create(function () use ($driver) {
-			$driver->start();
-		});
-		return 0;
-	}
+    #[Inject(Logger::class)]
+    public Logger $logger;
 
 
-	/**
-	 * @throws Exception
-	 */
-	private function stop(): void
-	{
-		if (is_resource($this->source)) {
-			proc_terminate($this->source);
-			while (proc_get_status($this->source)['running']) {
-				Coroutine::sleep(1);
-			}
-			proc_close($this->source);
-			$this->source = null;
-		}
-	}
+    protected mixed $source = NULL;
 
-	/**
-	 * @param $code
-	 * @param $message
-	 * @param $file
-	 * @param $line
-	 * @throws Exception
-	 */
-	public function onErrorHandler($code, $message, $file, $line)
-	{
-		if (str_contains($message, 'The file descriptor is not an inotify instance')) {
-			return;
-		}
-		debug('Error:' . $message . ' at ' . $file . ':' . $line);
-	}
+    protected mixed $pipes = [];
+
+    protected ?Coroutine\Channel $channel = NULL;
 
 
-	/**
-	 * 重启
-	 *
-	 * @throws Exception
-	 */
-	public function trigger_reload()
-	{
-		Kiri::getDi()->get(Logger::class)->warning('change reload');
+    /**
+     */
+    protected function configure()
+    {
+        $this->setName('sw:wather')->setDescription('server start');
+    }
 
-		$this->stop();
-		Coroutine::create(function () {
-			$this->source = proc_open("php " . APP_PATH . "kiri.php", [], $pipes);
-		});
-	}
+
+    /**
+     * @throws ConfigException
+     * @throws \ReflectionException
+     * @throws Exception
+     */
+    protected function initCore()
+    {
+        set_error_handler([$this, 'errorHandler']);
+        $this->dirs = Config::get('inotify', [APP_PATH . 'app']);
+        if (!extension_loaded('inotify')) {
+            $this->driver = Kiri::getDi()->make(Scaner::class, [$this->dirs, $this]);
+        } else {
+            $this->driver = Kiri::getDi()->make(Inotify::class, [$this->dirs, $this]);
+        }
+        $this->clearOtherService();
+        $this->setProcessName();
+    }
+
+
+    /**
+     * @throws ConfigException
+     */
+    public function setProcessName()
+    {
+        swoole_async_set(['enable_coroutine' => FALSE]);
+        if (Kiri::getPlatform()->isLinux()) {
+            swoole_set_process_name('[' . Config::get('id', 'sw service.') . '].sw:wather');
+        }
+    }
+
+
+    /**
+     * @throws Exception
+     */
+    public function clearOtherService()
+    {
+        if (file_exists(storage('.manager.pid'))) {
+            $pid = (int)file_get_contents(storage('.manager.pid'));
+            if ($pid > 0 && Process::kill($pid, 0)) {
+                Process::kill($pid, 15) && Process::wait(TRUE);
+            }
+        }
+        file_put_contents(storage('.manager.pid'), getmypid());
+    }
+
+
+    /**
+     * @throws Exception
+     */
+    public function errorHandler()
+    {
+        $error = func_get_args();
+
+        $path = ['file' => $error[2], 'line' => $error[3]];
+
+        if ($error[0] === 0) {
+            $error[0] = 500;
+        }
+        $data = Json::to(500, $error[1], $path);
+
+        $this->logger->error($data, 'error');
+    }
+
+
+    /**
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int
+     * @throws ConfigException
+     * @throws Exception
+     */
+    public function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $this->initCore();
+
+        $this->trigger_reload();
+        Timer::tick(1000, fn() => $this->healthCheck());
+
+        Process::signal(SIGTERM, [$this, 'onSignal']);
+        Process::signal(SIGKILL, [$this, 'onSignal']);
+
+        $this->driver->start();
+        return 0;
+    }
+
+
+    /**
+     * @throws Exception
+     */
+    public function healthCheck()
+    {
+        $pid = (int)file_get_contents(storage('.swoole.pid'));
+        if ($this->int == 1) {
+            return;
+        }
+        if (empty($pid)) {
+            $this->logger->warning('service is shutdown you need reload.');
+            $this->trigger_reload();
+        } else if (!Process::kill($pid, 0)) {
+            $this->logger->warning('service is shutdown you need reload.');
+            $this->trigger_reload();
+        }
+    }
+
+
+    /**
+     * @param $data
+     * @throws Exception
+     */
+    public function onSignal($data)
+    {
+        if (!$data) {
+            return;
+        }
+        Timer::clearAll();
+        $this->driver->clear();
+        $this->stopServer();
+        $this->stopManager();
+        while ($ret = Process::wait(TRUE)) {
+            echo "PID={$ret['pid']}\n";
+            sleep(1);
+        }
+    }
+
+
+    /**
+     * @throws Exception
+     */
+    protected function stopServer()
+    {
+        $pid = file_get_contents(storage('.swoole.pid'));
+        if (!empty($pid) && Process::kill($pid, 0)) {
+            Process::kill($pid, SIGTERM);
+        }
+    }
+
+
+    /**
+     *
+     */
+    protected function stopManager()
+    {
+        if ($this->process && Process::kill($this->process->pid, 0)) {
+            Process::kill($this->process->pid) && Process::wait(TRUE);
+        }
+    }
+
+
+    /**
+     * 重启
+     *
+     * @throws Exception
+     */
+    public function trigger_reload()
+    {
+        if ($this->int == 1) {
+            return;
+        }
+        $this->int = 1;
+        $this->logger->warning('change reload');
+
+        $this->stopServer();
+        $this->stopManager();
+
+        $this->process = new Process(function (Process $process) {
+            $process->exec(PHP_BINARY, [APP_PATH . "kiri.php", "sw:server", "restart"]);
+        });
+
+        $this->process->start();
+        $this->int = -1;
+    }
 
 
 }

kiri-engine/FileListen/Inotify.php

@@ -4,160 +4,166 @@ namespace Kiri\FileListen;
 
 use Exception;
 use Swoole\Event;
+use Swoole\Timer;
 
 class Inotify
 {
 
-	private mixed $inotify;
-	private mixed $events;
+    private mixed $inotify;
+    private mixed $events;
 
-	private array $watchFiles = [];
+    private array $watchFiles = [];
 
 
-	protected int $cid;
-
-	const IG_DIR = [APP_PATH . 'commands', APP_PATH . '.git', APP_PATH . '.gitee'];
+    public bool $isReloading = FALSE;
 
 
-	/**
-	 * @param array $dirs
-	 * @param HotReload $process
-	 */
-	public function __construct(protected array $dirs, public HotReload $process)
-	{
-	}
+    protected int $cid;
+
+    const IG_DIR = [APP_PATH . 'commands', APP_PATH . '.git', APP_PATH . '.gitee'];
 
 
-	/**
-	 * @throws Exception
-	 */
-	public function start()
-	{
-		$this->inotify = inotify_init();
-		$this->events = IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE;
-		foreach ($this->dirs as $dir) {
-			if (!is_dir($dir)) continue;
-			$this->watch($dir);
-		}
-		Event::add($this->inotify, [$this, 'check']);
-		Event::wait();
-	}
+    /**
+     * @param array $dirs
+     * @param HotReload $process
+     */
+    public function __construct(protected array $dirs, public HotReload $process)
+    {
+        set_error_handler([$this, 'error']);
+        set_exception_handler([$this, 'error']);
+    }
 
 
-	public function clear()
-	{
-		Event::del($this->inotify);
-		Event::exit();
-	}
+    /**
+     * @return void
+     */
+    public function error(): void
+    {
+
+    }
 
 
-	/**
-	 * 开始监听
-	 */
-	public function check()
-	{
-		if (!($events = inotify_read($this->inotify))) {
-			return;
-		}
-		if ($this->process->isReloading) {
-			if (!$this->process->isReloadingOut) {
-				$this->process->isReloadingOut = true;
-			}
-			return;
-		}
-		$LISTEN_TYPE = [IN_CREATE, IN_DELETE, IN_MODIFY, IN_MOVED_TO, IN_MOVED_FROM];
-		foreach ($events as $ev) {
-			if (!in_array($ev['mask'], $LISTEN_TYPE)) {
-				continue;
-			}
-			//非重启类型
-			if (str_ends_with($ev['name'], '.php')) {
-				if ($this->process->int !== -1) {
-					return;
-				}
-				$this->process->int = @swoole_timer_after(2000, [$this, 'reload']);
-
-				$this->process->isReloading = true;
-			}
-		}
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function reload()
-	{
-		$this->process->isReloading = true;
-		$this->process->trigger_reload();
-
-		$this->clearWatch();
-		foreach ($this->dirs as $root) {
-			$this->watch($root);
-		}
-		$this->process->int = -1;
-		$this->process->isReloading = FALSE;
-		$this->process->isReloadingOut = FALSE;
-	}
+    /**
+     * @throws Exception
+     */
+    public function start()
+    {
+        $this->inotify = inotify_init();
+        $this->events = IN_MODIFY | IN_DELETE | IN_CREATE | IN_MOVE;
+        foreach ($this->dirs as $dir) {
+            if (!is_dir($dir)) continue;
+            $this->watch($dir);
+        }
+        Event::add($this->inotify, [$this, 'check']);
+        Event::wait();
+    }
 
 
-	/**
-	 * @throws Exception
-	 */
-	public function clearWatch()
-	{
-		foreach ($this->watchFiles as $wd) {
-			try {
-				inotify_rm_watch($this->inotify, $wd);
-			} catch (\Throwable $exception) {
-				logger()->addError($exception, 'throwable');
-			}
-		}
-		$this->watchFiles = [];
-	}
+    public function clear()
+    {
+        Event::del($this->inotify);
+        Event::exit();
+    }
 
 
-	/**
-	 * @param $dir
-	 * @return bool
-	 * @throws Exception
-	 */
-	public function watch($dir): bool
-	{
-		//目录不存在
-		if (!is_dir($dir)) {
-			return logger()->addError("[$dir] is not a directory.");
-		}
-		//避免重复监听
-		if (isset($this->watchFiles[$dir])) {
-			return FALSE;
-		}
+    /**
+     * 开始监听
+     * @throws Exception
+     */
+    public function check()
+    {
+        if (!($events = inotify_read($this->inotify))) {
+            return;
+        }
+        if ($this->isReloading) {
+            return;
+        }
 
-		if (in_array($dir, self::IG_DIR)) {
-			return FALSE;
-		}
+        $LISTEN_TYPE = [IN_CREATE, IN_DELETE, IN_MODIFY, IN_MOVED_TO, IN_MOVED_FROM];
+        foreach ($events as $ev) {
+            if (!in_array($ev['mask'], $LISTEN_TYPE)) {
+                continue;
+            }
+            //非重启类型
+            if (str_ends_with($ev['name'], '.php')) {
+                Timer::after(3000, fn() => $this->reload());
+                $this->isReloading = TRUE;
+            }
+        }
+    }
 
-		$wd = @inotify_add_watch($this->inotify, $dir, $this->events);
-		$this->watchFiles[$dir] = $wd;
+    /**
+     * @throws Exception
+     */
+    public function reload()
+    {
+        $this->process->trigger_reload();
+        $this->clearWatch();
+        foreach ($this->dirs as $root) {
+            $this->watch($root);
+        }
+        $this->process->int = -1;
+        $this->isReloading = FALSE;
+    }
 
-		$files = scandir($dir);
-		foreach ($files as $f) {
-			if ($f == '.' || $f == '..') {
-				continue;
-			}
-			$path = $dir . '/' . $f;
-			//递归目录
-			if (is_dir($path)) {
-				$this->watch($path);
-			} else if (!str_ends_with($f, '.php')) {
-				continue;
-			}
 
-			//检测文件类型
-			if (strstr($f, '.') == '.php') {
-				$wd = @inotify_add_watch($this->inotify, $path, $this->events);
-				$this->watchFiles[$path] = $wd;
-			}
-		}
-		return TRUE;
-	}
+    /**
+     * @throws Exception
+     */
+    public function clearWatch()
+    {
+        foreach ($this->watchFiles as $wd) {
+            try {
+                @inotify_rm_watch($this->inotify, $wd);
+            } catch (\Throwable $exception) {
+//				logger()->addError($exception->getMessage(), 'throwable');
+            }
+        }
+        $this->watchFiles = [];
+    }
+
+
+    /**
+     * @param $dir
+     * @return bool
+     * @throws Exception
+     */
+    public function watch($dir): bool
+    {
+        //目录不存在
+        if (!is_dir($dir)) {
+            return logger()->addError("[$dir] is not a directory.");
+        }
+        //避免重复监听
+        if (isset($this->watchFiles[$dir])) {
+            return FALSE;
+        }
+
+        if (in_array($dir, self::IG_DIR)) {
+            return FALSE;
+        }
+
+        $wd = @inotify_add_watch($this->inotify, $dir, $this->events);
+        $this->watchFiles[$dir] = $wd;
+
+        $files = scandir($dir);
+        foreach ($files as $f) {
+            if ($f == '.' || $f == '..') {
+                continue;
+            }
+            $path = $dir . '/' . $f;
+            //递归目录
+            if (is_dir($path)) {
+                $this->watch($path);
+            } else if (!str_ends_with($f, '.php')) {
+                continue;
+            }
+            //检测文件类型
+            if (strstr($f, '.') == '.php') {
+                $wd = @inotify_add_watch($this->inotify, $path, $this->events);
+                $this->watchFiles[$path] = $wd;
+            }
+        }
+        return TRUE;
+    }
 }

kiri-engine/FileListen/Scaner.php

@@ -3,142 +3,147 @@
 namespace Kiri\FileListen;
 
 use Exception;
+use Swoole\Timer;
 
 class Scaner
 {
 
-	private array $md5Map = [];
+    private array $md5Map = [];
 
-	/**
-	 * @param array $dirs
-	 * @param HotReload $process
-	 */
-	public function __construct(protected array $dirs, public HotReload $process)
-	{
-	}
+    public bool $isReloading = FALSE;
 
 
-	/**
-	 * @throws Exception
-	 */
-	public function start(): void
-	{
-		$this->loadDirs();
-		$this->tick();
-	}
+    /**
+     * @param array $dirs
+     * @param HotReload $process
+     */
+    public function __construct(protected array $dirs, public HotReload $process)
+    {
+    }
 
 
-	/**
-	 * @param bool $isReload
-	 * @throws Exception
-	 */
-	private function loadDirs(bool $isReload = false)
-	{
-		foreach ($this->dirs as $value) {
-			if (is_bool($path = realpath($value))) {
-				continue;
-			}
-
-			if (!is_dir($path)) continue;
-
-			$this->loadByDir($path, $isReload);
-		}
-	}
+    /**
+     * @throws Exception
+     */
+    public function start(): void
+    {
+        $this->loadDirs();
+        $this->tick();
+    }
 
 
-	/**
-	 * @param $path
-	 * @param bool $isReload
-	 * @return void
-	 * @throws Exception
-	 */
-	private function loadByDir($path, bool $isReload = false): void
-	{
-		if (!is_string($path)) {
-			return;
-		}
-		$path = rtrim($path, '/');
-		foreach (glob(realpath($path) . '/*') as $value) {
-			if (is_dir($value)) {
-				$this->loadByDir($value, $isReload);
-			}
-			if (is_file($value)) {
-				if ($this->checkFile($value, $isReload)) {
-					$this->timerReload();
-					break;
-				}
-			}
-		}
-	}
+    /**
+     * @param bool $isReload
+     * @throws Exception
+     */
+    private function loadDirs(bool $isReload = FALSE)
+    {
+        foreach ($this->dirs as $value) {
+            if (is_bool($path = realpath($value))) {
+                continue;
+            }
+
+            if (!is_dir($path)) continue;
+
+            $this->loadByDir($path, $isReload);
+        }
+    }
 
 
-	/**
-	 * @param $value
-	 * @param $isReload
-	 * @return bool
-	 */
-	private function checkFile($value, $isReload): bool
-	{
-		$md5 = md5($value);
-		$mTime = filectime($value);
-		if (!isset($this->md5Map[$md5])) {
-			if ($isReload) {
-				return true;
-			}
-			$this->md5Map[$md5] = $mTime;
-		} else {
-			if ($this->md5Map[$md5] != $mTime) {
-				if ($isReload) {
-					return true;
-				}
-				$this->md5Map[$md5] = $mTime;
-			}
-		}
-		return false;
-	}
+    /**
+     * @param $path
+     * @param bool $isReload
+     * @return void
+     * @throws Exception
+     */
+    private function loadByDir($path, bool $isReload = FALSE): void
+    {
+        if (!is_string($path)) {
+            return;
+        }
+        $path = rtrim($path, '/');
+        foreach (glob(realpath($path) . '/*') as $value) {
+            if (is_dir($value)) {
+                $this->loadByDir($value, $isReload);
+            }
+            if (is_file($value)) {
+                if ($this->checkFile($value, $isReload)) {
+                    Timer::after(2000, fn() => $this->timerReload());
+                    $this->isReloading = TRUE;
+                    break;
+                }
+            }
+        }
+    }
 
 
-	/**
-	 * @throws Exception
-	 */
-	public function timerReload()
-	{
-		$this->process->isReloading = true;
-		$this->process->trigger_reload();
-
-		$this->process->int = -1;
-
-		$this->loadDirs();
-
-		$this->process->isReloading = FALSE;
-		$this->process->isReloadingOut = FALSE;
-
-		$this->tick();
-	}
+    /**
+     * @param $value
+     * @param $isReload
+     * @return bool
+     */
+    private function checkFile($value, $isReload): bool
+    {
+        $md5 = md5($value);
+        $mTime = filectime($value);
+        if (!isset($this->md5Map[$md5])) {
+            if ($isReload) {
+                return TRUE;
+            }
+            $this->md5Map[$md5] = $mTime;
+        } else {
+            if ($this->md5Map[$md5] != $mTime) {
+                if ($isReload) {
+                    return TRUE;
+                }
+                $this->md5Map[$md5] = $mTime;
+            }
+        }
+        return FALSE;
+    }
 
 
-	private bool $isStop = false;
+    /**
+     * @throws Exception
+     */
+    public function timerReload()
+    {
+        $this->isReloading = TRUE;
+        $this->process->trigger_reload();
 
-	public function clear()
-	{
-		$this->isStop = true;
-	}
+        $this->process->int = -1;
+
+        $this->loadDirs();
+
+        $this->isReloading = FALSE;
+        $this->process->isReloadingOut = FALSE;
+
+        $this->tick();
+    }
 
 
-	/**
-	 * @throws Exception
-	 */
-	public function tick()
-	{
-		if ($this->process->isReloading || $this->isStop) {
-			return;
-		}
+    private bool $isStop = FALSE;
 
-		$this->loadDirs(true);
+    public function clear()
+    {
+        $this->isStop = TRUE;
+    }
 
-		sleep(2);
 
-		$this->tick();
-	}
+    /**
+     * @throws Exception
+     */
+    public function tick()
+    {
+        if ($this->isReloading || $this->isStop) {
+            return;
+        }
+
+        $this->loadDirs(TRUE);
+
+        sleep(2);
+
+        $this->tick();
+    }
 
 }

kiri-engine/Jwt/JWTAuthMiddleware.php

@@ -1,57 +0,0 @@
-<?php
-declare(strict_types=1);
-
-
-namespace Kiri\Jwt;
-
-
-use Annotation\Inject;
-use Exception;
-use Http\Message\ServerRequest;
-use Kiri\Kiri;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use Server\Constrict\ResponseInterface;
-
-/**
- * Class CoreMiddleware
- * @package Kiri\Kiri\Route
- * 跨域中间件
- */
-class JWTAuthMiddleware implements MiddlewareInterface
-{
-
-
-	/** @var int */
-	public int $zOrder = 0;
-
-
-	#[Inject(ResponseInterface::class)]
-	public ResponseInterface $response;
-
-
-	/**
-	 * @param ServerRequest $request
-	 * @param RequestHandlerInterface $handler
-	 * @return \Psr\Http\Message\ResponseInterface
-	 * @throws Exception
-	 */
-	public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): \Psr\Http\Message\ResponseInterface
-	{
-		$authorization = $request->getHeaderLine('Authorization');
-		if (empty($authorization)) {
-			return $this->response->json(['code' => 401, 'JWT voucher cannot be empty.']);
-		}
-		if (!str_starts_with($authorization, 'Bearer ')) {
-			return $this->response->json(['code' => 401, 'JWT Voucher Format Error.']);
-		}
-		$authorization = str_replace('Bearer ', '', $authorization);
-		$jwt = Kiri::app()->getJwt();
-		if (!$jwt->validator($authorization)) {
-			return $this->response->json(['code' => 401, 'JWT Validator fail.']);
-		}
-		return $handler->handle($request);
-	}
-
-}

kiri-engine/Jwt/JWTAuthTokenException.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace Kiri\Jwt;
-
-
-use JetBrains\PhpStorm\Pure;
-use Throwable;
-
-/**
- *
- */
-class JWTAuthTokenException extends \Exception
-{
-
-
-	/**
-	 * @param string $message
-	 * @param int $code
-	 * @param Throwable|null $previous
-	 */
-	#[Pure] public function __construct($message = "", $code = 4001, Throwable $previous = null)
-	{
-		parent::__construct($message, 4001, $previous);
-	}
-
-
-}

kiri-engine/Jwt/Jwt.php

@@ -1,201 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace Kiri\Jwt;
-
-use Annotation\Inject;
-use Exception;
-use Http\Constrict\RequestInterface;
-use Kiri\Abstracts\Component;
-use Kiri\Abstracts\Config;
-use Kiri\Core\Json;
-use Kiri\Exception\ConfigException;
-
-
-/**
- * Class Jwt
- * @package Kiri\Jwt
- */
-class Jwt extends Component
-{
-
-	use JwtHelper;
-
-
-	#[Inject(RequestInterface::class)]
-	private RequestInterface $request;
-
-
-	/**
-	 * @param RequestInterface $request
-	 */
-	public function setRequest(RequestInterface $request): void
-	{
-		$this->request = $request;
-	}
-
-
-	/**
-	 * @throws ConfigException
-	 * @throws Exception
-	 * 'jwt' => [
-	 * 'scene' => 'application',
-	 * 'timeout' => 7200,
-	 * 'encrypt' => '',
-	 * 'iv'      => '',
-	 * 'key'     => '',
-	 * ]
-	 */
-	public function init()
-	{
-		$this->request = di(RequestInterface::class);
-
-		$this->public = Config::get('ssl.public', $this->public);
-		$this->private = Config::get('ssl.private', $this->private);
-		$this->timeout = Config::get('jwt.timeout', 7200);
-
-		$jwt = Config::get('jwt', []);
-		if ($jwt) {
-			$this->setScene($jwt['scene'] ?? 'application');
-			$this->setKey($jwt['key'] ?? get_called_class());
-			$length = openssl_cipher_iv_length($this->encrypt);
-			if ($length > 0) {
-				$defaultIv = openssl_random_pseudo_bytes($length);
-				$this->setIv($jwt['iv'] ?? $defaultIv);
-			}
-		}
-	}
-
-	/**
-	 * @param int $unionId
-	 *
-	 * @return string
-	 * @throws Exception
-	 */
-	public function create(int $unionId): string
-	{
-		$this->user = $unionId;
-		$this->config['time'] = time();
-		$this->data = $this->request->getHeaders();
-		if (!isset($this->data['source'])) {
-			$this->data['source'] = 'browser';
-		}
-		return $this->createEncrypt($unionId);
-	}
-
-
-	/**
-	 * @return string
-	 */
-	private function jwtHeader(): string
-	{
-		$string = openssl_encrypt(
-			json_encode(['type' => 'openssl', 'encrypt' => $this->encrypt]),
-			$this->encrypt,
-			$this->key,
-			0,
-			$this->iv
-		);
-		return str_replace('=', '', $string);
-	}
-
-
-	/**
-	 * @param $unionId
-	 * @return string
-	 * @throws Exception
-	 */
-	private function jwtBody($unionId): string
-	{
-		$json = json_encode(['unionId' => $unionId, 'createTime' => time(), 'expire_at' => time() + $this->timeout]);
-		openssl_private_encrypt($json, $encode, $this->private);
-		return base64_encode($encode);
-	}
-
-
-	/**
-	 * @param $unionId
-	 * @return string
-	 * @throws Exception
-	 */
-	private function createEncrypt($unionId): string
-	{
-		$params[] = $this->jwtHeader();
-		$params[] = $this->jwtBody($unionId);
-
-		$params[] = hash('sha256', $params[0] . $params[1]);
-		return implode('.', $params);
-	}
-
-
-	/**
-	 * @param $token
-	 * @return string|int
-	 * @throws JWTAuthTokenException
-	 */
-	public function getUnionId($token): string|int
-	{
-		$unpack = $this->unpack($token);
-		if (!$this->_validator($unpack)) {
-			throw new JWTAuthTokenException('JWT certificate has expired.');
-		}
-		return $unpack['unionId'];
-	}
-
-
-	/**
-	 * @param $token
-	 * @return bool
-	 * @throws JWTAuthTokenException
-	 */
-	public function validator($token): bool
-	{
-		return $this->_validator($this->unpack($token));
-	}
-
-
-	/**
-	 * @param $unpack
-	 * @return bool
-	 */
-	private function _validator($unpack): bool
-	{
-		if ($unpack['expire_at'] < time()) {
-			return false;
-		}
-		return true;
-	}
-
-
-	/**
-	 * @param $token
-	 * @return string
-	 * @throws JWTAuthTokenException
-	 * @throws Exception
-	 */
-	public function refresh($token): string
-	{
-		return $this->create($this->unpack($token)['unionId']);
-	}
-
-
-	/**
-	 * @param string $token
-	 * @return mixed
-	 * @throws JWTAuthTokenException
-	 */
-	private function unpack(string $token): array
-	{
-		if (count($explode = explode('.', $token)) != 3) {
-			throw new JWTAuthTokenException('JWT Voucher Format Error.');
-		}
-		if (hash('sha256', $explode[0] . $explode[1]) != $explode[2]) {
-			throw new JWTAuthTokenException('JWT Sign Validator Fail.');
-		}
-		if (!openssl_public_decrypt(base64_decode($explode[1]), $decode, $this->public)) {
-			throw new JWTAuthTokenException('JWT Voucher Unpack Error.');
-		}
-		return Json::decode($decode, true);
-	}
-
-}

kiri-engine/Jwt/JwtHelper.php

@@ -1,134 +0,0 @@
-<?php
-
-namespace Kiri\Jwt;
-
-trait JwtHelper
-{
-
-
-	/** @var int $user */
-	private int $user;
-
-	private array $data;
-
-	private array $source = ['browser', 'android', 'iphone', 'pc', 'mingame'];
-
-	private array $config = ['token' => ''];
-
-	private ?int $timeout = 7200;
-
-	private string $key = 'www.xshucai.com';
-
-
-	private string $secret = '';
-
-
-	private string $scene = 'default';
-
-
-	private string $encrypt = 'aes-128-ecb';
-
-
-	private string $iv = '';
-
-
-	private ?string $public = '-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6BuML3gtLGde7QKNuNST
-UCB9gdHC7XIpOc7Wx2I64Esj3UxWHTgp3URj0ge8zpy7A3FfBdppR7d1nwoD6Xad
-jqfjEWpTy4WwGYsOfH0tFl3wAmse0lebF4NFsS9pzrikQT6c9qsVm88pCjvg4i5t
-WhTMEnpTFDYoDR0KXlLXltQMudBBUHFaVwP0wKJ/cGX7R1Mrv35K4MXwQFOuGZkP
-hsp2rO9x5LjtSKIXbexy7WhUu6QMjD/XzgsXr9UF+ExYmBGXRVWgNFLMkiaCZ2Uz
-WlQhpQrA5/wKd76dCzjvqw9M32OiZl2lCKT73cV8GUvt7BNsM1SiPhqfY7nhO6y3
-cwIDAQAB
------END PUBLIC KEY-----';
-
-	private ?string $private = '-----BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA6BuML3gtLGde7QKNuNSTUCB9gdHC7XIpOc7Wx2I64Esj3UxW
-HTgp3URj0ge8zpy7A3FfBdppR7d1nwoD6XadjqfjEWpTy4WwGYsOfH0tFl3wAmse
-0lebF4NFsS9pzrikQT6c9qsVm88pCjvg4i5tWhTMEnpTFDYoDR0KXlLXltQMudBB
-UHFaVwP0wKJ/cGX7R1Mrv35K4MXwQFOuGZkPhsp2rO9x5LjtSKIXbexy7WhUu6QM
-jD/XzgsXr9UF+ExYmBGXRVWgNFLMkiaCZ2UzWlQhpQrA5/wKd76dCzjvqw9M32Oi
-Zl2lCKT73cV8GUvt7BNsM1SiPhqfY7nhO6y3cwIDAQABAoIBADPihJHP8XktmmCs
-43Vfv5Z3zNaKR2LA1Eph3E0xviuJYHkFqXJarbESqqW2qRQeoQeB/lXWnxYzAo4M
-tRcpNss+6FlqRVUHi3gKR7C4Yq3PTemcfIVUpAy7gYa8LJDTYZRcJMZXNDtiMbBh
-9kFZU4SBhaTTx2KLQKS9yyWOqzbBvyLXN+1+Wy477M9+MXXTKw79dO+pML6cR0yl
-pNfVR5FX5L/GB5vOtQB/Aqg/CKT8NC5MzWPnKY+TPCCHZyoZuB9dLDuWOlqsN4QX
-Y4B8fFca5yRwzHra5aGoqdaT/zGctt+I6V/f/KNQCo36f9LPxeXg1+FHvvtTj5WZ
-N8CGPzECgYEA9R7lRMXzrHE4rK0DhxQXIFbIKKtxrimqZQdbwOUeYYD2R6CDSItK
-z88RSYElmd6wiS7fYIaheXNqJ8Yu6SQFBF/yshBwjQVl9NJG94LJlgx1XnVZEju6
-OZjMUOhHXBymtXnLo16pDRl8odc4MFLRH25/vLtwChUr+Qoyt54GzFUCgYEA8mjL
-jdh94JAmcdnDXsKgjNOGyNWGDVvWoFmy8lEQsMXY1JJnEd3YfDM2prmv3vaoiXzi
-YkSETl6ZUtJqh78MnHCBY1vI6EAcKQAF/kvP2TataRCXNcGNQwn2mtq+B+heTta6
-Di8jjAdmdUAYHbmOQryBudiRYG7JEF038elzvKcCgYEAq81ByFguGBkrLev94vkz
-1Fi+5bJ0dSuC4Fit+J8eEhz/gOiB26C1iL2LUkeQgS5R8XTG37K9DpDUQJhpXMMA
-OTa+tgtLt6um8FdJokUq4V5ODSyWh28RcTklSzfifC8gsWVyU0kPl7zbW9uq6EPD
-ixI5uaBuQMLiFSUOsx+xiBkCgYEAtqXHWeVZUy7KCNavomK7XeCzmfdovgAIw2FS
-t8nk7YzlR6XYC1pAl7Ru5Ujb/v+TFaUHXkuJ9RLKK+Fna0jEU8thcl/iDTzg+vON
-kIHG5j+Qga2CgXqI2Y5URXGz5XlsNbMNFUrnWcbpqEbW5O6/BgHLLSDEyQgwbygN
-0zS3g9kCgYEAhssb7kOljdIul4lY5MXc67Zf1dp6S2bucLOxsG6cRW07b3pBz7QF
-5aPE7ZwnkzTnA4HuGGauKj+qKGAR7ve55XClAq/XipiVFrjwV/t3LC6j5DoqTJYR
-mlAZUEjsoaT9vjvjGTxl3uCm0TX5KTgtSJIt2kA1tYVjQef+/iZTHxY=
------END RSA PRIVATE KEY-----';
-
-
-
-
-	/**
-	 * @param string $publicKey
-	 */
-	public function setPublic(string $publicKey)
-	{
-		$this->public = $publicKey;
-	}
-
-	/**
-	 * @param int $timeout
-	 */
-	public function setTimeout(int $timeout)
-	{
-		$this->timeout = $timeout;
-	}
-
-
-	public function setScene(string $scene)
-	{
-		$this->scene = $scene;
-	}
-
-
-	/**
-	 * @param string $timeout
-	 */
-	public function setKey(string $timeout)
-	{
-		$this->key = $timeout;
-	}
-
-	/**
-	 * @param string $privateKey
-	 */
-	public function setPrivate(string $privateKey)
-	{
-		$this->private = $privateKey;
-	}
-
-
-	/**
-	 * @param string $privateKey
-	 */
-	public function setIv(string $privateKey)
-	{
-		$this->iv = $privateKey;
-	}
-
-
-	/**
-	 * @param string $privateKey
-	 */
-	public function setEncrypt(string $privateKey)
-	{
-		$this->encrypt = $privateKey;
-	}
-
-
-}

kiri-engine/Kiri.php

@@ -4,8 +4,10 @@ declare(strict_types=1);
 
 namespace Kiri;
 
+error_reporting(0);
 
-use Annotation\Annotation;
+
+use Note\Note;
 use Database\Collection;
 use Database\ModelInterface;
 use Exception;
@@ -13,9 +15,10 @@ use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Config;
 use Kiri\Core\Json;
 use Kiri\Di\Container;
-use Kiri\Di\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use ReflectionException;
 use Server\ServerManager;
+use Server\Tasker\AsyncTaskExecute;
 use Swoole\Coroutine;
 use Swoole\Process;
 use Swoole\WebSocket\Server;
@@ -31,7 +34,7 @@ defined('TASK_PATH') or define('TASK_PATH', APP_PATH . 'app/Async/');
 defined('LISTENER_PATH') or define('LISTENER_PATH', APP_PATH . 'app/Listener/');
 defined('KAFKA_PATH') or define('KAFKA_PATH', APP_PATH . 'app/Kafka/');
 defined('RPC_CLIENT_PATH') or define('RPC_CLIENT_PATH', APP_PATH . 'app/Client/Rpc/');
-defined('MODEL_PATH') or define('MODEL_PATH', APP_PATH . 'app/Models/');
+defined('MODEL_PATH') or define('MODEL_PATH', APP_PATH . 'app/Model/');
 
 
 /**
@@ -156,12 +159,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();
 	}
 
 
@@ -229,6 +232,15 @@ class Kiri
 	}
 
 
+	/**
+	 * @return Container
+	 */
+	public static function di(): Container
+	{
+		return static::$container;
+	}
+
+
 	/**
 	 * @param $workerId
 	 * @return mixed
@@ -448,8 +460,8 @@ class Kiri
 	 */
 	public static function async(string $class, array $params = [])
 	{
-		$manager = di(ServerManager::class);
-		$manager->task(new $class(...$params));
+		$manager = di(AsyncTaskExecute::class);
+		$manager->execute(new $class(...$params));
 	}
 
 

kiri-engine/Pool/Connection.php

@@ -113,9 +113,7 @@ class Connection extends Component
 	public function create($coroutineName, $config): Closure
 	{
 		return static function () use ($coroutineName, $config) {
-			return Kiri::getDi()->create(PDO::class, [
-				$config['database'], $config['cds'], $config['username'], $config['password'], $config['charset'] ?? 'utf8mb4'
-			]);
+			return Kiri::getDi()->create(PDO::class, [$config]);
 		};
 	}
 

kiri-engine/Pool/Pool.php

@@ -220,6 +220,13 @@ class Pool extends Component
 			return;
 		}
 		while (static::$_connections[$name]->length() > 0) {
+            if (static::$_connections[$name] instanceof Channel)
+            {
+                if (!Context::inCoroutine())
+                {
+                    break;
+                }
+            }
 			$client = static::$_connections[$name]->pop();
 			if ($client instanceof StopHeartbeatCheck) {
 				$client->stopHeartbeatCheck();

kiri-engine/Pool/Redis.php

@@ -50,11 +50,7 @@ class Redis extends Component
 	public function create(string $name, mixed $config): Closure
 	{
 		return static function () use ($name, $config) {
-			return Kiri::getDi()->create(\Kiri\Cache\Base\Redis::class, [
-				$config['host'], (int)$config['port'], $config['databases'] ?? 0,
-				$config['auth'], $config['prefix'] ?? '', $config['timeout'] ?? 30,
-				$config['read_timeout'] ?? 30
-			]);
+			return Kiri::getDi()->create(\Kiri\Cache\Base\Redis::class, [$config]);
 		};
 	}
 

kiri-engine/Proxy/AProxy.php

@@ -1,8 +0,0 @@
-<?php
-
-namespace Kiri\Proxy;
-
-abstract class AProxy
-{
-
-}

kiri-engine/Proxy/AspectProxy.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace Kiri\Proxy;
-
-use Annotation\Aspect;
-use Http\Handler\Handler;
-use Kiri\Di\NoteManager;
-use Kiri\IAspect;
-use Kiri\Kiri;
-
-
-/**
- *
- */
-class AspectProxy extends AProxy implements ProxyInterface
-{
-
-
-    /**
-     * @param Handler $executor
-     * @return mixed
-     */
-    public function proxy(Handler $executor): mixed
-    {
-        if ($executor->callback instanceof \Closure) {
-            return call_user_func($executor->callback, ...$executor->params);
-        }
-        $controller = Kiri::getDi()->get($executor->callback[0]);
-        $aspect = $this->getAspect($executor->callback);
-        if (!is_null($aspect)) {
-            $aspect->before();
-            $result = $aspect->invoke([$controller, $executor->callback[1]], $executor->params);
-            $aspect->after($result);
-        } else {
-            $result = call_user_func([$controller, $executor->callback[1]]);
-        }
-        return $result;
-    }
-
-
-    /**
-     * @param array $executor
-     * @return ?IAspect
-     */
-    protected function getAspect(array $executor): ?IAspect
-    {
-        $aspect = NoteManager::getSpecify_annotation(Aspect::class, $executor[0], $executor[1]);
-        if (!is_null($aspect)) {
-            $aspect = Kiri::getDi()->get($aspect->aspect);
-        }
-        return $aspect;
-    }
-}

kiri-engine/Proxy/ProxyInterface.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace Kiri\Proxy;
-
-use Http\Handler\Handler;
-
-interface ProxyInterface
-{
-
-
-    /**
-     * @param Handler $executor
-     * @return mixed
-     */
-    public function proxy(Handler $executor): mixed;
-
-}

kiri-engine/Runtime.php

@@ -5,6 +5,7 @@ namespace Kiri;
 
 
 use Exception;
+use Kiri\Abstracts\Config;
 use Kiri\Abstracts\Input;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -43,7 +44,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);
@@ -62,8 +63,7 @@ class Runtime extends Command
 	public function configEach(): string
 	{
 		$array = [];
-		$configs = Kiri::app()->getConfig();
-		foreach ($configs->getData() as $key => $datum) {
+		foreach (Config::getData() as $key => $datum) {
 			if ($datum instanceof \Closure) {
 				continue;
 			}

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/Gii.php

@@ -30,11 +30,11 @@ class Gii
 
 	private InputInterface $input;
 
-	public string $modelPath = APP_PATH . 'app/Models/';
-	public string $modelNamespace = 'App\\Models\\';
+	public string $modelPath = APP_PATH . 'app/Model/';
+	public string $modelNamespace = 'App\\Model\\';
 
-	public string $controllerPath = APP_PATH . 'app/Http/Controllers/';
-	public string $controllerNamespace = 'App\\Controllers\\';
+	public string $controllerPath = APP_PATH . 'app/Http/Controller/';
+	public string $controllerNamespace = 'App\\Controller\\';
 
 
 	public static array $createSqls = [];
@@ -68,7 +68,7 @@ class Gii
 		$this->input = $input;
 		$this->db = $db;
 
-		$make = $this->input->getArgument('action');
+		$make = $this->input->getOption('make');
 		if (empty($make)) {
 			throw new Exception('构建类型不能为空~');
 		}
@@ -119,10 +119,8 @@ class Gii
 	 */
 	private function makeByDatabases($make, InputInterface $input): array
 	{
-		$redis = Kiri::getDi()->get(Redis::class);
-		if ($input->hasArgument('name')) {
-			$this->tableName = $input->getArgument('name');
-			$redis->del('column:' . $this->tableName);
+		if ($input->hasOption('name')) {
+			$this->tableName = $input->getOption('name');
 		}
 		return match ($make) {
 			'controller' => $this->getTable(1, 0),
@@ -334,6 +332,7 @@ class Gii
 	private function getClassName($tableName): string
 	{
 		$res = [];
+		$tableName = str_replace($this->db->tablePrefix,'', $tableName);
 		foreach (explode('_', $tableName) as $n => $val) {
 			$res[] = ucfirst($val);
 		}

kiri-gii/GiiBase.php

@@ -24,11 +24,11 @@ abstract class GiiBase
 
 	protected InputInterface $input;
 
-	public string $modelPath = APP_PATH . 'app/Models/';
-	public string $modelNamespace = 'App\Models\\';
+	public string $modelPath = APP_PATH . 'app/Model/';
+	public string $modelNamespace = 'App\Model\\';
 
-	public string $controllerPath = APP_PATH . 'app/Http/Controllers/';
-	public string $controllerNamespace = 'App\\Controllers\\';
+	public string $controllerPath = APP_PATH . 'app/Http/Controller/';
+	public string $controllerNamespace = 'App\\Controller\\';
 
 	public ?string $module = null;
 

kiri-gii/GiiCommand.php

@@ -32,9 +32,9 @@ class GiiCommand extends Command
 	protected function configure()
 	{
 		$this->setName('sw:gii')
-			->addArgument('action', InputArgument::REQUIRED)
-			->addArgument('name', InputArgument::OPTIONAL)
-			->addArgument('databases', InputArgument::OPTIONAL)
+			->addOption('make','m', InputArgument::OPTIONAL)
+			->addOption('name','t', InputArgument::OPTIONAL)
+			->addOption('databases','d', InputArgument::OPTIONAL)
 			->setDescription('./snowflake sw:gii make=model|controller|task|interceptor|limits|middleware name=xxxx');
 	}
 
@@ -52,12 +52,12 @@ class GiiCommand extends Command
 		$gii = Kiri::app()->get('gii');
 
 		$connections = Kiri::app()->get('db');
-		if (($db = $input->getArgument('databases')) != null) {
+		if (($db = $input->getOption('databases')) != null) {
 			$gii->run($connections->get($db), $input);
 			return 1;
 		}
 
-		$action = $input->getArgument('action');
+		$action = $input->getOption('make');
 		if (!in_array($action, ['model', 'controller'])) {
 			$gii->run(null, $input);
 			return 1;

kiri-gii/GiiController.php

@@ -47,9 +47,6 @@ class GiiController extends GiiBase
 		$namespace = rtrim($path['namespace'], '\\');
 		$model_namespace = rtrim($modelPath['namespace'], '\\');
 
-		$prefix = str_replace('_', '', $this->db->tablePrefix);
-		$managerName = str_replace(ucfirst($prefix), '', $managerName);
-
 		$class = '';
 		$controller = str_replace('\\\\', '\\', "$namespace\\{$managerName}Controller");
 
@@ -68,9 +65,9 @@ namespace {$namespace};
 		} else {
 			$import = "use Kiri;
 use Exception;
-use Annotation\Target;
-use Annotation\Route\Middleware;
-use Annotation\Route\Route;
+use Note\Target;
+use Note\Route\Middleware;
+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 Annotation\Mapping;
+use Note\Target;
+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 Kiri\Rpc\Annotation\JsonRpc;
+use Note\Target;
+use Kiri\Rpc\Note\JsonRpc;
 use Http\Handler\Controller;
 use Rpc\\' . ucfirst($name) . 'RpcInterface;
 

kiri-gii/GiiModel.php

@@ -51,9 +51,6 @@ class GiiModel extends GiiBase
 
 		$namespace = rtrim($modelPath['namespace'], '\\');
 
-		$prefix = str_replace('_', '', $this->db->tablePrefix);
-		$managerName = str_replace(ucfirst($prefix), '', $managerName);
-
 		if (file_exists($modelPath['path'] . '/' . $managerName . '.php')) {
 			try {
 				$className = str_replace('\\\\', '\\', "{$modelPath['namespace']}\\{$managerName}");
@@ -69,11 +66,11 @@ namespace ' . $namespace . ';
 					$html .= $imports . PHP_EOL;
 				}
 
-				if (!str_contains($imports, 'Database\Annotation\Set')) {
-					$html .= 'use Database\Annotation\Set;' . PHP_EOL;
+				if (!str_contains($imports, 'Database\Note\Set')) {
+					$html .= 'use Database\Note\Set;' . PHP_EOL;
 				}
-				if (!str_contains($imports, 'Database\Annotation\Get')) {
-					$html .= 'use Database\Annotation\Get;' . PHP_EOL;
+				if (!str_contains($imports, 'Database\Note\Get')) {
+					$html .= 'use Database\Note\Get;' . PHP_EOL;
 				}
 			} catch (\Throwable $e) {
 				logger()->addError($e, 'throwable');
@@ -87,12 +84,12 @@ namespace ' . $namespace . ';
 
 
 use Exception;
-use Annotation\Target;
+use Note\Target;
 use Kiri\Core\Json;
 use Database\Connection;
-use Database\Annotation\Get;
-use Database\Annotation\Set;
-use Annotation\Model\Relation;
+use Database\Note\Get;
+use Database\Note\Set;
+use Database\Relation;
 use Database\Model;
 ' . PHP_EOL;
 		}
@@ -263,7 +260,7 @@ use Database\Model;
 				$field = '\'' . current($val)['Field'] . '\'';
 			}
 			$_field_one .= '
-		[' . $field . ', \'' . $key . '\'],';
+			[' . $field . ', \'' . $key . '\'],';
 		}
 		foreach ($data as $key => $val) {
 			$length = $this->getLength($val);
@@ -279,8 +276,11 @@ use Database\Model;
 	/**
 	 * @return array
 	 */
-    protected array $rules = [' . $_field_one . '
-    ];
+    public function rules(): array
+    {
+        return [' . $_field_one . '
+        ];
+    }
 ';
 	}
 
@@ -311,10 +311,10 @@ use Database\Model;
 			}
 			if (count($_val) == 1) {
 				$_tmp = '
-		[\'' . $_val[0][3] . '\', ' . ($_val[0][1] == 'enum' ? '\'enum\' => [' . $key .']' : $key) . ']';
+			[\'' . $_val[0][3] . '\', ' . ($_val[0][1] == 'enum' ? '\'enum\' => [' . $key .']' : $key) . ']';
 			} else {
 				$_tmp = '
-		[[\'' . implode('\', \'', array_column($_val, 3)) . '\'], ' . $key . ']';
+			[[\'' . implode('\', \'', array_column($_val, 3)) . '\'], ' . $key . ']';
 			}
 			$string[] = $_tmp;
 		}
@@ -338,7 +338,7 @@ use Database\Model;
 			return '';
 		}
 		return '
-		[[\'' . implode('\', \'', $data) . '\'], \'unique\'],';
+			[[\'' . implode('\', \'', $data) . '\'], \'unique\'],';
 	}
 
 	/**
@@ -358,7 +358,7 @@ use Database\Model;
 			return '';
 		}
 		return '
-		[[\'' . implode('\', \'', $data) . '\'], \'required\'],';
+			[[\'' . implode('\', \'', $data) . '\'], \'required\'],';
 	}
 
 	/**

kiri-gii/GiiRpcClient.php

@@ -36,9 +36,9 @@ class GiiRpcClient extends GiiBase
 		
 namespace App\Client\Rpc;
 
-use Annotation\Rpc\Consumer;
-use Annotation\Rpc\RpcClient;
-use Annotation\Target;
+use Note\Rpc\Consumer;
+use Note\Rpc\RpcClient;
+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 Annotation\Target;
+use Note\Route\RpcProducer;
+use Note\Target;
 use Exception;
 use Http\Controller;
 use Kiri\Core\Json;

kiri-gii/GiiTask.php

@@ -31,7 +31,7 @@ class GiiTask extends GiiBase
 		
 namespace App\Async;
 
-use Server\SInterface\OnTaskInterface;
+use Server\Contract\OnTaskInterface;
 
 ';
 

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
 {
 
 
@@ -17,6 +17,7 @@ abstract class Attribute implements IAnnotation
      * @param mixed|string $method
      * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function execute(mixed $class, mixed $method = ''): mixed
     {
         // TODO: Implement execute() method.

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,12 +1,12 @@
 <?php
 
 
-namespace Annotation;
+namespace Note;
 
 
 use DirectoryIterator;
 use Exception;
-use Kiri\Abstracts\BaseObject;
+use Kiri\Abstracts\Component;
 use Kiri\Kiri;
 use ReflectionClass;
 use ReflectionException;
@@ -15,9 +15,9 @@ use Throwable;
 
 /**
  * Class Loader
- * @package Annotation
+ * @package Note
  */
-class Loader extends BaseObject
+class Loader extends Component
 {
 
 

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
- * @package Annotation
+ * Class Note
+ * @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
 {
@@ -41,6 +41,7 @@ use Psr\Http\Server\MiddlewareInterface;
 	 * @param mixed $class
 	 * @param mixed|null $method
 	 * @return $this
+	 * @throws \ReflectionException
 	 */
 	public function execute(mixed $class, mixed $method = null): mixed
 	{

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,24 +1,25 @@
 <?php
 
 
-namespace Annotation;
+namespace Note;
 
 
 use Exception;
 use Kiri\Kiri;
+use Server\Tasker\AsyncTaskExecute;
 
 
 /**
- * Class Asynchronous
- * @package Annotation
+ * Class Task
+ * @package Note
  * Task任务
  */
-#[\Attribute(\Attribute::TARGET_CLASS)] class Asynchronous extends Attribute
+#[\Attribute(\Attribute::TARGET_CLASS)] class Task extends Attribute
 {
 
 
 	/**
-	 * Asynchronous constructor.
+	 * Task constructor.
 	 * @param string $name
 	 */
 	public function __construct(public string $name)
@@ -35,8 +36,8 @@ use Kiri\Kiri;
 	 */
     public function execute(mixed $class, mixed $method = null): bool
     {
-		$async = Kiri::app()->getAsync();
-		$async->addAsync($this->name, $class);
+		$task = Kiri::getDi()->get(AsyncTaskExecute::class);
+		$task->reg($this->name, $class);
 		return true;
 	}
 

kiri-process/OnProcessInterface.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace Kiri\Process;
-
-interface OnProcessInterface
-{
-
-	public function handle();
-
-}

kiri-process/Process.php

@@ -1,88 +0,0 @@
-<?php
-
-namespace Kiri\Process;
-
-abstract class Process implements OnProcessInterface
-{
-
-
-	/**
-	 * @var \Swoole\Process
-	 */
-	protected \Swoole\Process $process;
-
-
-	/**
-	 * @var mixed
-	 */
-	protected mixed $redirect_stdin_and_stdout = null;
-
-
-	/**
-	 * @var int
-	 */
-	protected int $pipe_type = SOCK_DGRAM;
-
-
-	/**
-	 * @var bool
-	 */
-	protected bool $enable_coroutine = true;
-
-
-	/**
-	 * @var string
-	 */
-	protected string $name = '';
-
-	/**
-	 * @return \Swoole\Process
-	 */
-	public function getProcess(): \Swoole\Process
-	{
-		return $this->process;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getRedirectStdinAndStdout(): mixed
-	{
-		return $this->redirect_stdin_and_stdout;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getPipeType(): int
-	{
-		return $this->pipe_type;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isEnableCoroutine(): bool
-	{
-		return $this->enable_coroutine;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getName(): string
-	{
-		return $this->name;
-	}
-
-
-	/**
-	 * @param \Swoole\Process $process
-	 */
-	public function start(\Swoole\Process $process)
-	{
-		$this->process = $process;
-	}
-
-
-}

kiri-process/TestProcess.php

@@ -1,52 +0,0 @@
-<?php
-
-namespace Kiri\Process;
-
-require_once 'OnProcessInterface.php';
-require_once 'Process.php';
-
-use function Co\run;
-
-class TestProcess extends Process
-{
-
-
-	protected string $name = 'test process';
-
-
-	/**
-	 */
-	public function onStart()
-	{
-	}
-
-
-	public function handle()
-	{
-		// TODO: Implement doWhile() method.
-	}
-
-
-	public function onShutdown()
-	{
-		// TODO: Implement onShutdown() method.
-	}
-}
-
-$array = [];
-
-for ($i = 0; $i < 10; $i++) {
-	$class = new TestProcess();
-	$process = new \Swoole\Process([$class, 'start'], $class->getRedirectStdinAndStdout(),
-		$class->getPipeType(), $class->isEnableCoroutine());
-	$process->start();
-
-	array_push($array, $process);
-}
-run(function () use ($array) {
-
-	foreach ($array as $value) {
-		var_dump($value->getCallback());
-	}
-
-});

kiri-websocket-server/FdCollector.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Kiri\Websocket;
+
+class FdCollector
+{
+
+
+	public function set($fd)
+	{
+
+	}
+
+}

kiri-websocket-server/Sender.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Kiri\Websocket;
+
+class Sender
+{
+
+
+	public function push($fd, $data)
+	{
+
+	}
+
+
+	public function close($fd)
+	{
+
+	}
+
+
+}

kiri-websocket-server/Server.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace Kiri\Websocket;
+
+use Http\Handler\DataGrip;
+use Http\Handler\Router;
+use Kiri\Abstracts\Component;
+use Kiri\Server\Contract\OnOpenInterface;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use ReflectionException;
+use Server\Contract\OnCloseInterface;
+use Server\Contract\OnHandshakeInterface;
+use Server\Contract\OnMessageInterface;
+use Swoole\Http\Request;
+use Swoole\Http\Response;
+use Swoole\WebSocket\CloseFrame;
+use Swoole\WebSocket\Frame;
+
+
+/**
+ *
+ */
+class Server extends Component implements OnHandshakeInterface, OnMessageInterface, OnCloseInterface
+{
+
+	public Router $router;
+
+
+	public string $serverName = 'ws';
+
+
+	public mixed $callback = null;
+
+
+	public mixed $server;
+
+
+
+	/**
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
+	 * @throws ReflectionException
+	 */
+	public function init()
+	{
+		$this->router = $this->container->get(DataGrip::class)->get($this->serverName);
+		$handler = $this->router->find('/', 'GET');
+		if (is_int($handler) || is_null($handler)) {
+			return;
+		}
+		$this->callback = $handler->callback[0];
+	}
+
+
+	/**
+	 * @param \Swoole\Server $server
+	 * @param int $fd
+	 */
+	public function onClose(\Swoole\Server $server, int $fd): void
+	{
+		if ($this->callback instanceof OnCloseInterface) {
+			$this->callback->onClose($server, $fd);
+		}
+	}
+
+
+	/**
+	 * @param Request $request
+	 * @param Response $response
+	 */
+	public function onHandshake(Request $request, Response $response): void
+	{
+		try {
+			if (!$this->callback instanceof OnHandshakeInterface) {
+				throw new \Exception('Page not found.');
+			}
+			$this->callback->onHandshake($request, $response);
+
+			$this->afterHandshake($request);
+			if ($this->server instanceof \Swoole\Coroutine\Http\Server) {
+				while (true) {
+					$data = $response->recv();
+					if ($data === '' || $data === false || $data instanceof CloseFrame) {
+						$this->onClose($this->server, $response->fd);
+						break;
+					}
+					$this->onMessage($this->server, $data);
+				}
+			}
+		} catch (\Throwable $throwable) {
+			$response->status(500, $throwable->getMessage());
+			$response->end();
+		}
+	}
+
+
+	/**
+	 * @param $request
+	 */
+	public function afterHandshake($request)
+	{
+		if (!($this->callback instanceof OnOpenInterface)) {
+			return;
+		}
+		$this->callback->onOpen($this->server, $request);
+	}
+
+
+	/**
+	 * @param \Swoole\Server $server
+	 * @param Frame $frame
+	 */
+	public function onMessage(\Swoole\Server $server, Frame $frame): void
+	{
+		if ($this->callback instanceof OnMessageInterface) {
+			$this->callback->onMessage($server, $frame);
+		}
+	}
+}

p.php

@@ -49,3 +49,42 @@
 //	after($process);
 //});
 
+
+var_dump(json_encode([
+	"Datacenter"     => "dc1",
+	"Node"           => "iz8vbi3edjyskl7kpuwudqz",
+	"SkipNodeUpdate" => false,
+	"Service"        => [
+		"ID"              => "redis1",
+		"Service"         => "FriendRpcService",
+		"Address"         => "172.26.221.211",
+		"TaggedAddresses" => [
+			"lan" => [
+				"address" => "127.0.0.1",
+				"port"    => 9627
+			],
+			"wan" => [
+				"address" => "172.26.221.211",
+				"port"    => 9627
+			]
+		],
+		"Meta"            => [
+			"redis_version" => "4.0"
+		],
+		"Port"            => 9627
+	],
+	"Check"          => [
+		"Node"       => "iz8vbi3edjyskl7kpuwudqz",
+		"CheckId"    => "service:redis1",
+		"Name"       => "Redis health check",
+		"Notes"      => "Script based health check",
+		"Status"     => "passing",
+		"ServiceID"  => "redis1",
+		"Definition" => [
+			"Http"                           => "http://172.26.221.211:9627",
+			"Interval"                       => "5s",
+			"Timeout"                        => "1s",
+			"DeregisterCriticalServiceAfter" => "30s"
+		],
+	],
+]));