From 0927019297349a11992e9530bf69b7e1a2e8193f Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@guangda.work>
Date: Wed, 11 Jan 2023 15:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8config()=E6=9B=BF=E6=8D=A2env?=
 =?UTF-8?q?()=E8=8E=B7=E5=8F=96=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Config/beike.php                             | 1 +
 beike/Helpers.php                                  | 2 +-
 beike/Installer/Controllers/DatabaseController.php | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/beike/Config/beike.php b/beike/Config/beike.php
index d48550bc..8c04c61f 100644
--- a/beike/Config/beike.php
+++ b/beike/Config/beike.php
@@ -14,5 +14,6 @@ return [
     'version'         => '1.2.5',
     'build'           => '20221226',
 
+    'admin_name'      => env('ADMIN_NAME'),
     'force_url_https' => env('APP_FORCE_HTTPS', false),
 ];
diff --git a/beike/Helpers.php b/beike/Helpers.php
index a8d19596..c760b520 100644
--- a/beike/Helpers.php
+++ b/beike/Helpers.php
@@ -58,7 +58,7 @@ function plugin_setting($key, $default = null)
  */
 function admin_name(): string
 {
-    if ($envAdminName = env('ADMIN_NAME')) {
+    if ($envAdminName = config('beike.admin_name')) {
         return Str::snake($envAdminName);
     } elseif ($settingAdminName = system_setting('base.admin_name')) {
         return Str::snake($settingAdminName);
diff --git a/beike/Installer/Controllers/DatabaseController.php b/beike/Installer/Controllers/DatabaseController.php
index 17981960..bd7a2c36 100644
--- a/beike/Installer/Controllers/DatabaseController.php
+++ b/beike/Installer/Controllers/DatabaseController.php
@@ -33,7 +33,8 @@ class DatabaseController extends Controller
     {
         DB::statement('SET FOREIGN_KEY_CHECKS = 0');
         $rows   = DB::select('SHOW TABLES');
-        $tables = array_column($rows, 'Tables_in_' . env('DB_DATABASE'));
+        $database = config('database.connections.mysql.database');
+        $tables = array_column($rows, 'Tables_in_' . $database);
         foreach ($tables as $table) {
             Schema::drop($table);
         }