upadte:优化路由写入

extend/catcher/command/TestCommand.php

@@ -0,0 +1,10 @@
+<?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~2020 http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------

extend/catcher/command/stubs/command.stub

@@ -1,4 +1,14 @@
 <?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+
 namespace {NAMESPACE};
 
 use think\console\Command;

extend/catcher/command/stubs/controller.stub

@@ -1,4 +1,14 @@
 <?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+
 namespace {NAMESPACE};
 
 use catcher\base\CatchController;

extend/catcher/command/stubs/event.stub

@@ -1,4 +1,14 @@
 <?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+
 declare (strict_types = 1);
 
 namespace {NAMESPACE};

extend/catcher/command/stubs/migrate.stub

@@ -1,4 +1,13 @@
 <?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
 
 use think\migration\Migrator;
 use think\migration\db\Column;

extend/catcher/command/stubs/migration.stub

@@ -1,4 +1,13 @@
 <?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
 
 use think\migration\Migrator;
 use think\migration\db\Column;

extend/catcher/command/stubs/permissionSeed.stub

@@ -1,4 +1,13 @@
 <?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
 
 use think\migration\Seeder;
 

extend/catcher/command/stubs/request.stub

@@ -1,4 +1,14 @@
 <?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+
 namespace {NAMESPACE};
 
 use catcher\base\CatchRequest;

extend/catcher/command/stubs/route.stub

@@ -1,7 +1,15 @@
 <?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
 
-// you should user `$router`
+// you should use `$router`
 $router->group(function () use ($router){
-
+})->middleware('auth');
-});
 

extend/catcher/command/stubs/seed.stub

@@ -1,4 +1,13 @@
 <?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
 
 use think\migration\Seeder;
 

extend/catcher/command/stubs/seeder.stub

@@ -1,4 +1,13 @@
 <?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
 
 use think\migration\Seeder;
 

extend/catcher/command/stubs/service.stub

@@ -1,4 +1,14 @@
 <?php
+// +----------------------------------------------------------------------
+// | CatchAdmin [Just Like ～ ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2017~{$year} http://catchadmin.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( https://github.com/yanwenwu/catch-admin/blob/master/LICENSE.txt )
+// +----------------------------------------------------------------------
+// | Author: JaguarJack [ njphper@gmail.com ]
+// +----------------------------------------------------------------------
+
 namespace {NAMESPACE};
 
 use catcher\ModuleService;

extend/catcher/generate/factory/Route.php

@@ -20,26 +20,62 @@ class Route extends Factory
         $route = [];
 
         if ($this->restful) {
-            $route[] = sprintf("\$router->resource('%s', '\%s')->middleware('auth')", $this->controllerName, $this->controller);
+            $route[] = sprintf("\$router->resource('%s', '\%s');", $this->controllerName, $this->controller);
         }
 
         if (!empty($this->methods)) {
             foreach ($this->methods as $method) {
-                $route[] = sprintf("\$router->%s('%s/%s', '\%s@%s')->middleware('auth')", $method[1], $this->controllerName, $method[0], $this->controller, $method[0] );
+                $route[] = sprintf("\$router->%s('%s/%s', '\%s@%s');", $method[1], $this->controllerName, $method[0], $this->controller, $method[0] );
             }
         }
 
         $router = $this->getModulePath($this->controller) . DIRECTORY_SEPARATOR . 'route.php';
 
-        $comment = PHP_EOL . '//' . $this->controllerName . '路由' . PHP_EOL;
+        $comment = '// ' . $this->controllerName . '路由';
 
+        array_unshift($route, $comment);
         if (file_exists($router)) {
-            return file_put_contents($router, PHP_EOL . $comment . implode(';'. PHP_EOL , $route) . ';', FILE_APPEND);
+            return file_put_contents($router, $this->parseRoute($router, $route));
         }
 
         return file_put_contents($router, $this->header() . $comment. implode(';'. PHP_EOL , $route) . ';');
     }
 
+    protected function parseRoute($path, $route)
+    {
+        $file = new \SplFileObject($path);
+        // 保留所有行
+        $lines = [];
+        // 结尾之后的数据
+        $down = [];
+        // 结尾数据
+        $end = '';
+        while (!$file->eof()) {
+            $lines[] = rtrim($file->current(), PHP_EOL);
+            $file->next();
+        }
+
+        while (count($lines)) {
+            $line = array_pop($lines);
+            if (strpos($line, '})') !== false) {
+                $end = $line;
+                break;
+            }
+            array_unshift($down, $line);
+        }
+
+        $router = implode(PHP_EOL, $lines) . PHP_EOL;
+
+        $routes = array_merge($down, $route);
+
+        foreach ($routes as $r) {
+            if ($r) {
+                $router .= "\t" . $r . PHP_EOL;
+            }
+        }
+        return $router .= $end;
+    }
+
     /**
      * set class
      *