From 04e2b1ffe548cd89c94750fa1efc2f076a3b5fcb Mon Sep 17 00:00:00 2001
From: JaguarJack <njphper@gmail.com>
Date: Tue, 8 Sep 2020 14:34:03 +0800
Subject: [PATCH] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?domain=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/filesystem.php                                |  2 +-
 .../command/install/InstallProjectCommand.php        | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/config/filesystem.php b/config/filesystem.php
index a233f26..1411e0c 100644
--- a/config/filesystem.php
+++ b/config/filesystem.php
@@ -10,7 +10,7 @@ return [
         'local'  => [
             'type' => 'local',
             'root' =>  app()->getRootPath() . 'public'.DIRECTORY_SEPARATOR.'images',
-            'domain' => env('app.api_url'),
+            'domain' => env('app.domain'),
         ],
         'public' => [
             // 磁盘类型
diff --git a/extend/catcher/command/install/InstallProjectCommand.php b/extend/catcher/command/install/InstallProjectCommand.php
index bef0b4e..d80a174 100644
--- a/extend/catcher/command/install/InstallProjectCommand.php
+++ b/extend/catcher/command/install/InstallProjectCommand.php
@@ -113,6 +113,12 @@ class InstallProjectCommand extends Command
             return false;
         }
 
+        // 设置 app domain
+        $appDomain = strtolower($this->output->ask($this->input, '👉 first, you should set app domain: '));
+        if (strpos('http://', $appDomain) === false || strpos('https://', $appDomain) === false) {
+            $appDomain = 'http://' . $appDomain;
+        }
+
         $answer = strtolower($this->output->ask($this->input, '🤔️ Did You Need to Set Database information? (Y/N): '));
 
         if ($answer === 'y' || $answer === 'yes') {
@@ -144,7 +150,7 @@ class InstallProjectCommand extends Command
 
             $this->databaseLink = [$host, $database, $username, $password, $port, $charset, $prefix];
 
-            $this->generateEnvFile($host, $database, $username, $password, $port, $charset, $prefix);
+            $this->generateEnvFile($host, $database, $username, $password, $port, $charset, $prefix, $appDomain);
         }
     }
 
@@ -263,13 +269,15 @@ class InstallProjectCommand extends Command
      * @param $port
      * @param $charset
      * @param $prefix
+     * @param $appDomain
      * @return void
      */
-    protected function generateEnvFile($host, $database, $username, $password, $port, $charset, $prefix): void
+    protected function generateEnvFile($host, $database, $username, $password, $port, $charset, $prefix, $appDomain): void
     {
         try {
             $env = \parse_ini_file(root_path() . '.example.env', true);
 
+            $env['APP']['DOMAIN'] = $appDomain;
             $env['DATABASE']['HOSTNAME'] = $host;
             $env['DATABASE']['DATABASE'] = $database;
             $env['DATABASE']['USERNAME'] = $username;