diff --git a/Annotation/Annotation.php b/Annotation/Annotation.php index 17af6002..b7b6e584 100644 --- a/Annotation/Annotation.php +++ b/Annotation/Annotation.php @@ -65,7 +65,7 @@ class Annotation extends Component * @return $this * @throws ReflectionException|NotFindPropertyException|NotFindClassException */ - public function readControllers(string $path, string $namespace, string $alias = 'root'): static + public function read(string $path, string $namespace, string $alias = 'root'): static { return $this->scanDir(glob($path . '*'), $namespace, $alias); } diff --git a/Database/DatabasesProviders.php b/Database/DatabasesProviders.php index be414686..fad0ccb7 100644 --- a/Database/DatabasesProviders.php +++ b/Database/DatabasesProviders.php @@ -51,7 +51,7 @@ class DatabasesProviders extends Providers public function scanModel() { $attributes = Snowflake::app()->getAttributes(); - $attributes->readControllers(MODEL_PATH, 'App\Models', 'models'); + $attributes->read(MODEL_PATH, 'App\Models', 'models'); } diff --git a/HttpServer/Server.php b/HttpServer/Server.php index 4893cc5e..dec611cc 100644 --- a/HttpServer/Server.php +++ b/HttpServer/Server.php @@ -461,20 +461,7 @@ class Server extends HttpService $router->loadRouterSetting(); $attributes = Snowflake::app()->getAttributes(); - $attributes->readControllers(CONTROLLER_PATH, 'App\Http\Controllers', 'controllers'); -// -// $aliases = $attributes->getAlias('controllers'); -// if (count($aliases) < 1) { -// return; -// } -// foreach ($aliases as $alias) { -// $handler = $alias['handler']; -// foreach ($alias['attributes'] as $key => $attribute) { -// if ($attribute instanceof IAnnotation) { -// $attribute->execute($handler); -// } -// } -// } + $attributes->read(CONTROLLER_PATH, 'App\Http\Controllers', 'controllers'); }); } @@ -487,7 +474,7 @@ class Server extends HttpService $event = Snowflake::app()->getEvent(); $event->on(Event::SERVER_WORKER_START, function () { $attributes = Snowflake::app()->getAttributes(); - $attributes->readControllers(SOCKET_PATH, 'App\Websocket', 'sockets'); + $attributes->read(SOCKET_PATH, 'App\Websocket', 'sockets'); }); } diff --git a/System/Application.php b/System/Application.php index c028d364..6c993401 100644 --- a/System/Application.php +++ b/System/Application.php @@ -136,13 +136,13 @@ class Application extends BaseApplication $this->debug('scan system files...'); $annotation = Snowflake::app()->getAttributes(); - $annotation->readControllers(__DIR__ . '/../Console/', 'Console', 'system'); - $annotation->readControllers(__DIR__ . '/../Database/', 'Database', 'system'); - $annotation->readControllers(__DIR__ . '/../Gii/', 'Gii', 'system'); - $annotation->readControllers(__DIR__ . '/../HttpServer/', 'HttpServer', 'system'); - $annotation->readControllers(__DIR__ . '/../Kafka/', 'Kafka', 'system'); - $annotation->readControllers(__DIR__ . '/../System/', 'Snowflake', 'system'); - $annotation->readControllers(__DIR__ . '/../Validator/', 'Validator', 'system'); + $annotation->read(__DIR__ . '/../Console/', 'Console', 'system'); + $annotation->read(__DIR__ . '/../Database/', 'Database', 'system'); + $annotation->read(__DIR__ . '/../Gii/', 'Gii', 'system'); + $annotation->read(__DIR__ . '/../HttpServer/', 'HttpServer', 'system'); + $annotation->read(__DIR__ . '/../Kafka/', 'Kafka', 'system'); + $annotation->read(__DIR__ . '/../System/', 'Snowflake', 'system'); + $annotation->read(__DIR__ . '/../Validator/', 'Validator', 'system'); }