From f94e780462de9391bfbda3fb52316d8f4c4c4725 Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Mon, 5 Sep 2022 18:27:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=BC=95=E5=AF=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Installer/Helpers/EnvironmentManager.php         | 4 +++-
 beike/Installer/Providers/InstallerServiceProvider.php | 1 +
 beike/Installer/Views/environment-wizard.blade.php     | 9 ---------
 beike/Installer/config.php                             | 1 -
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/beike/Installer/Helpers/EnvironmentManager.php b/beike/Installer/Helpers/EnvironmentManager.php
index 03c42ceb..63d566d6 100644
--- a/beike/Installer/Helpers/EnvironmentManager.php
+++ b/beike/Installer/Helpers/EnvironmentManager.php
@@ -94,13 +94,15 @@ class EnvironmentManager
     {
         $results = trans('installer::installer_messages.environment.success');
 
+        $app_url = $_SERVER['APP_URL'];
+
         $envFileData =
         'APP_NAME=\''.$request->app_name."'\n".
         'APP_ENV='.$request->environment."\n".
         'APP_KEY='.'base64:'.base64_encode(Str::random(32))."\n".
         'APP_DEBUG=true'."\n".
         'APP_LOG_LEVEL='.$request->app_log_level."\n".
-        'APP_URL='.$request->app_url."\n\n".
+        'APP_URL='.$app_url."\n\n".
         'DB_CONNECTION='.$request->database_connection."\n".
         'DB_HOST='.$request->database_hostname."\n".
         'DB_PORT='.$request->database_port."\n".
diff --git a/beike/Installer/Providers/InstallerServiceProvider.php b/beike/Installer/Providers/InstallerServiceProvider.php
index 6706ac90..a225a7dd 100644
--- a/beike/Installer/Providers/InstallerServiceProvider.php
+++ b/beike/Installer/Providers/InstallerServiceProvider.php
@@ -23,6 +23,7 @@ class InstallerServiceProvider extends ServiceProvider
 
         Schema::defaultStringLength(191);
 
+        $this->mergeConfigFrom(__DIR__ . '/../config.php', 'installer');
         $this->mergeConfigFrom(__DIR__ . '/../../Config/beike.php', 'beike');
         $this->loadViewsFrom(__DIR__ . '/../Views', 'installer');
 
diff --git a/beike/Installer/Views/environment-wizard.blade.php b/beike/Installer/Views/environment-wizard.blade.php
index e561a8ba..8688c7bc 100644
--- a/beike/Installer/Views/environment-wizard.blade.php
+++ b/beike/Installer/Views/environment-wizard.blade.php
@@ -20,15 +20,6 @@
       <input type="hidden" name="_token" value="{{ csrf_token() }}">
 
       <div class="row gx-4 gy-3">
-        <div class="col-sm-6">
-          <label class="form-label">
-            {{ trans($entry_key . 'app_url_label') }}
-          </label>
-          <input class="form-control {{ $errors->has('app_url') ? 'is-invalid' : '' }}" name="app_url"
-            value="{{ old('app_url', '') }}" required placeholder="{{ trans($entry_key . 'app_url_placeholder') }}">
-          <span class="invalid-feedback"
-            role="alert">{{ $errors->has('app_url') ? $errors->first('app_url') : __('common.error_required', ['name' => trans($entry_key . 'app_url_label')]) }}</span>
-        </div>
         <div class="col-sm-6">
           <label class="form-label">
             {{ trans($entry_key . 'db_connection_label') }}
diff --git a/beike/Installer/config.php b/beike/Installer/config.php
index 354255d8..760f3e3f 100644
--- a/beike/Installer/config.php
+++ b/beike/Installer/config.php
@@ -60,7 +60,6 @@ return [
     'environment' => [
         'form' => [
             'rules' => [
-                'app_url'               => 'required|url',
                 'database_connection'   => 'required|string|max:50',
                 'database_hostname'     => 'required|string|max:50',
                 'database_port'         => 'required|numeric',