fix：修改app namespace

we7coreteam · Sep 9, 2021 · 57db0d5 · 57db0d5
1 parent 98aa733
commit 57db0d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Src/Core/Route/Provider/RouterProvider.php b/Src/Core/Route/Provider/RouterProvider.php
@@ -32,6 +32,7 @@ public function register() {
 			$enableStatic = $this->config->get('server.common.enable_static_handler', true);
 
 			return new Router($routeCollector, [
+				'app_namespace' => App::getApp()->getAppNamespace(),
 				'document_root' => $documentRoot,
 				'enable_static_handler' => $enableStatic
 			]);

diff --git a/Src/Core/Route/Router.php b/Src/Core/Route/Router.php
@@ -41,7 +41,7 @@ class Router implements RouterInterface {
 	 * @var array
 	 */
 	private $currentMiddleware = [];
-	private $defaultNamespace = 'W7\App';
+	private $defaultNamespace;
 	private $defaultModule = 'system';
 
 	private $name = '';
@@ -50,6 +50,7 @@ public function __construct(RouteCollector $routeCollector = null, $config = [])
 		if (!$routeCollector) {
 			$routeCollector = new RouteCollector(new Std(), new GroupCountBased());
 		}
+		$this->defaultNamespace = $config['app_namespace'] ?? '';
 		$this->routerCollector = $routeCollector;
 		$this->config = $config;
 	}