feat: 重组路由信息

Author: rehiy

index.php

@@ -3,7 +3,4 @@
 define('APP_ROOT', strtr(__DIR__, '\\', '/') . '/');
 
 require APP_ROOT . 'library/autoload.php';
-
-App::boot(
-    $argv[1] ?? array_shift($_GET)
-);
+App::boot($argv[1] ?? reset($_GET));

library/app/app.php

@@ -2,23 +2,26 @@
 
 class App
 {
-    /**
-     * @var AppRouter $router
-     */
-    public static $router;
-
     /**
      * 启动指定模块
      * @param string $url
      * @return void
      */
     public static function boot($url)
     {
-        // 注册页面路由器
-        self::$router = new AppRouter();
-        require APP_MODULES . 'route.php';
-        $match = self::$router->match($url ?: '/');
-        call_user_func($match['target'], $match['params'])->output();
+        $router = new AppRouter();
+        if (is_file(APP_MODULES . 'route.php')) {
+            require APP_MODULES . 'route.php';
+        }
+        // 回退路由
+        $router->map('GET', '*', function ($args) {
+            $model = new ErrorModel($args);
+            $model->warning('not found', $args);
+            return $model;
+        });
+        // 匹配路由
+        $request = $router->match($url ?: '/');
+        $request['target']($request['params'])->output();
     }
 
     /**

modules/route.php

@@ -2,15 +2,15 @@
 
 // 默认首页
 
-self::$router->map('GET', '/', function ($args) {
+$router->map('GET', '/', function ($args) {
     $model = new HomeModel();
     $model->view($args);
     return $model;
 });
 
 // 重建缓存
 
-self::$router->map('GET', '/admin/build', function ($args) {
+$router->map('GET', '/admin/build', function ($args) {
     $model = new AdminModel();
     $model->build($args);
     return $model;
@@ -21,18 +21,10 @@
 foreach (App::cache('index') as $category) {
     foreach ($category['routes'] as $route) {
         $rt = $route + ['cid' => $category['id']];
-        self::$router->map($rt['method'], $rt['route'], function ($args) use ($rt) {
+        $router->map($rt['method'], $rt['route'], function ($args) use ($rt) {
             $model = new $rt['model'](); // 初始化模型
             $model->{$rt['action']}($rt + $args);
             return $model;
         });
     }
 }
-
-// 回退路由
-
-self::$router->map('GET', '*', function ($args) {
-    $model = new ErrorModel($args);
-    $model->warning('not found', $args);
-    return $model;
-});