From 87e5ef5800c13fe2b3cd518d1c2de1f11824e805 Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Mon, 15 Aug 2022 17:05:37 +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/Controllers/WelcomeController.php       | 3 +++
 beike/Installer/Helpers/EnvironmentManager.php          | 6 +++---
 database/migrations/2021_12_26_111435_create_tables.php | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/beike/Installer/Controllers/WelcomeController.php b/beike/Installer/Controllers/WelcomeController.php
index 00e5e56b..1a1ecdc9 100644
--- a/beike/Installer/Controllers/WelcomeController.php
+++ b/beike/Installer/Controllers/WelcomeController.php
@@ -17,6 +17,9 @@ class WelcomeController extends Controller
 {
     public function index()
     {
+        if (installed()) {
+            exit('Already installed');
+        }
         return view('installer::welcome');
     }
 }
diff --git a/beike/Installer/Helpers/EnvironmentManager.php b/beike/Installer/Helpers/EnvironmentManager.php
index 3c28fdfa..6fe659fa 100644
--- a/beike/Installer/Helpers/EnvironmentManager.php
+++ b/beike/Installer/Helpers/EnvironmentManager.php
@@ -98,7 +98,7 @@ class EnvironmentManager
         'APP_NAME=\''.$request->app_name."'\n".
         'APP_ENV='.$request->environment."\n".
         'APP_KEY='.'base64:'.base64_encode(Str::random(32))."\n".
-        'APP_DEBUG=false\n'.
+        'APP_DEBUG=false'."\n".
         'APP_LOG_LEVEL='.$request->app_log_level."\n".
         'APP_URL='.$request->app_url."\n\n".
         'DB_CONNECTION='.$request->database_connection."\n".
@@ -107,8 +107,8 @@ class EnvironmentManager
         'DB_DATABASE='.$request->database_name."\n".
         'DB_USERNAME='.$request->database_username."\n".
         'DB_PASSWORD='.$request->database_password."\n\n".
-        'BROADCAST_DRIVER=log\n'.
-        'CACHE_DRIVER=file\n'.
+        'BROADCAST_DRIVER=log'."\n".
+        'CACHE_DRIVER=file'."\n".
         'SESSION_DRIVER=file'."\n".
         'QUEUE_DRIVER=sync'."\n\n".
         'MAIL_DRIVER='.$request->mail_driver."\n".
diff --git a/database/migrations/2021_12_26_111435_create_tables.php b/database/migrations/2021_12_26_111435_create_tables.php
index f4ded272..e94e6f88 100644
--- a/database/migrations/2021_12_26_111435_create_tables.php
+++ b/database/migrations/2021_12_26_111435_create_tables.php
@@ -113,7 +113,7 @@ class CreateTables extends Migration
             $table->string('type')->comment('类型,包括 system、plugin');
             $table->string('space')->comment('配置组, 比如 stripe, paypal, flat_shipping');
             $table->string('name')->comment('配置名称, 类似字段名');
-            $table->string('value')->comment('配置值');
+            $table->text('value')->comment('配置值');
             $table->boolean('json')->default(false);
             $table->timestamps();
         });