改进多应用的判断

top-think · Aug 15, 2019 · 949fb11 · 949fb11
1 parent a1c09e2
commit 949fb11
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/src/think/Http.php b/src/think/Http.php
@@ -177,8 +177,11 @@ protected function runWithRequest(Request $request)
             $this->app->middleware->import(include $this->app->getBasePath() . 'middleware.php');
         }
 
-        if ($this->multi) {
-            $this->parseMultiApp();
+        $autoMulti = $this->app->config->get('app.auto_multi_app', false);
+
+        if ($this->multi || $autoMulti) {
+            $this->multi(true);
+            $this->parseMultiApp($autoMulti);
         }
 
         // 设置开启事件机制
@@ -270,10 +273,11 @@ protected function getScriptName(): string
 
     /**
      * 解析多应用
+     * @param bool $autoMulti 自动多应用
      */
-    protected function parseMultiApp(): void
+    protected function parseMultiApp($autoMulti): void
     {
-        if ($this->app->config->get('app.auto_multi_app', false)) {
+        if ($autoMulti) {
             // 自动多应用识别
             $this->bindDomain = false;
 

diff --git a/src/think/console/Command.php b/src/think/console/Command.php
@@ -28,7 +28,7 @@ abstract class Command
     private $console;
     private $name;
     private $processTitle;
-    private $aliases                         = [];
+    private $aliases = [];
     private $definition;
     private $help;
     private $description;
@@ -500,4 +500,14 @@ protected function table(Table $table): string
         $this->output->writeln($content);
         return $content;
     }
+
+    /**
+     * 判断当前应用是否多应用
+     * @return bool
+     */
+    protected function isMultiApp(): bool
+    {
+        $autoMulti = $this->app->config->get('app.auto_multi_app', false);
+        return $autoMulti || !is_dir($this->app->getBasePath() . 'controller');
+    }
 }
diff --git a/src/think/console/command/RouteList.php b/src/think/console/command/RouteList.php
@@ -42,7 +42,7 @@ protected function execute(Input $input, Output $output)
     {
         $app = $input->getArgument('app');
 
-        if (empty($app) && !is_dir($this->app->getBasePath() . 'controller')) {
+        if (empty($app) && $this->isMultiApp()) {
             $output->writeln('<error>Miss app name!</error>');
             return false;
         }

diff --git a/src/think/console/command/optimize/Route.php b/src/think/console/command/optimize/Route.php
@@ -29,7 +29,7 @@ protected function execute(Input $input, Output $output)
     {
         $app = $input->getArgument('app');
 
-        if (empty($app) && !is_dir($this->app->getBasePath() . 'controller')) {
+        if (empty($app) && $this->isMultiApp()) {
             $output->writeln('<error>Miss app name!</error>');
             return false;
         }

diff --git a/src/think/console/command/optimize/Schema.php b/src/think/console/command/optimize/Schema.php
@@ -48,7 +48,7 @@ protected function execute(Input $input, Output $output)
             $dbName = $input->getOption('db');
             $tables = $this->app->db->getConnection()->getTables($dbName);
         } else {
-            if (empty($app) && !is_dir($this->app->getBasePath() . 'controller')) {
+            if (empty($app) && $this->isMultiApp()) {
                 $output->writeln('<error>Miss app name!</error>');
                 return false;
             }