变更

Abstracts/AsyncServer.php

@@ -14,13 +14,13 @@ use Psr\Log\LoggerInterface;
 use ReflectionException;
 use Kiri\Server\Config as SConfig;
 use Kiri\Di\LocalService;
-use Swoole\Runtime;
 use Swoole\Server;
 use Kiri\Server\ServerInterface;
 use Kiri\Server\Constant;
 use Kiri\Events\EventDispatch;
 use Kiri\Exception\NotFindClassException;
 use Kiri\Server\Events\OnServerBeforeStart;
+use Kiri\Di\Inject\Container;
 
 /**
  *
@@ -44,11 +44,11 @@ class AsyncServer implements ServerInterface
 	 * @param LoggerInterface $logger
 	 * @param ProcessManager $processManager
 	 */
-	public function __construct(public Config             $config,
-	                            public ContainerInterface $container,
-	                            public EventDispatch      $dispatch,
-	                            public LoggerInterface    $logger,
-	                            public ProcessManager     $processManager)
+	public function __construct(#[Container(Config::class)] public Config                         $config,
+	                            #[Container(ContainerInterface::class)] public ContainerInterface $container,
+	                            #[Container(EventDispatch::class)] public EventDispatch           $dispatch,
+	                            #[Container(LoggerInterface::class)] public LoggerInterface       $logger,
+	                            #[Container(ProcessManager::class)] public ProcessManager         $processManager)
 	{
 	}
 

Abstracts/ProcessManager.php

@@ -12,10 +12,10 @@ use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Swoole\Coroutine;
 use Swoole\Process;
-use Kiri\Annotation\Inject;
 use Psr\Container\ContainerInterface;
 use Kiri\Events\EventProvider;
 use Kiri\Server\ServerInterface;
+use Kiri\Di\Inject\Container;
 use Kiri\Server\Events\OnServerBeforeStart;
 
 class ProcessManager extends Component
@@ -29,11 +29,11 @@ class ProcessManager extends Component
 	/**
 	 * @var ContainerInterface
 	 */
-	#[Inject(ContainerInterface::class)]
+	#[Container(ContainerInterface::class)]
 	public ContainerInterface $container;
 
 
-	#[Inject(EventProvider::class)]
+	#[Container(EventProvider::class)]
 	public EventProvider $provider;
 
 	/**

Abstracts/Server.php

@@ -4,12 +4,10 @@
 namespace Kiri\Server\Abstracts;
 
 
-use Kiri\Annotation\Inject;
 use Exception;
-use Kiri\Abstracts\Config;
-use Kiri\Exception\ConfigException;
 use Kiri;
 use Psr\Log\LoggerInterface;
+use Kiri\Di\Inject\Container;
 
 
 /**
@@ -23,7 +21,7 @@ abstract class Server
 	/**
 	 * @var LoggerInterface
 	 */
-	#[Inject(LoggerInterface::class)]
+	#[Container(LoggerInterface::class)]
 	public LoggerInterface $logger;