改名

Annotation/Route/Middleware.php

@@ -6,6 +6,8 @@ namespace Annotation\Route;
 
 use Annotation\Attribute;
 use HttpServer\Route\MiddlewareManager;
+use ReflectionException;
+use Snowflake\Exception\NotFindClassException;
 use Snowflake\Snowflake;
 use HttpServer\IInterface\Middleware as IMiddleware;
 
@@ -30,7 +32,7 @@ use HttpServer\IInterface\Middleware as IMiddleware;
 
         $array = [];
         foreach ($this->middleware as $value) {
-            $sn = Snowflake::createObject($value);
+            $sn = di($value);
             if (!($sn instanceof IMiddleware)) {
                 continue;
             }
@@ -43,7 +45,9 @@ use HttpServer\IInterface\Middleware as IMiddleware;
 	/**
 	 * @param mixed $class
 	 * @param mixed|null $method
-     * @return Middleware
+	 * @return $this
+	 * @throws ReflectionException
+	 * @throws NotFindClassException
 	 */
     public function execute(mixed $class, mixed $method = null): static
     {

Annotation/Route/Route.php

@@ -7,7 +7,6 @@ namespace Annotation\Route;
 use Annotation\Attribute;
 use Exception;
 use HttpServer\Route\Router;
-use Snowflake\Exception\ConfigException;
 use Snowflake\Snowflake;
 
 #[\Attribute(\Attribute::TARGET_METHOD)] class Route extends Attribute
@@ -38,8 +37,6 @@ use Snowflake\Snowflake;
 	{
 		// TODO: Implement setHandler() method.
 		$router = Snowflake::app()->getRouter();
-        $node = $router->addRoute($this->uri, [$class, $method], $this->method);
-        if ($node !== null) {
 		$attribute = Snowflake::getDi()->getMethodAttribute($class::class, $method);
 		foreach ($attribute as $item) {
 			if ($item instanceof Route) {
@@ -47,7 +44,7 @@ use Snowflake\Snowflake;
 			}
 			$item->execute($class, $method);
 		}
-        }
+		$router->addRoute($this->uri, [$class, $method], $this->method);
 		return $router;
 	}