wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

使用config()替换env()获取配置

This commit is contained in:
Edward Yang 2023-01-11 15:38:44 +08:00
parent 1eb219cc0e
commit 0927019297
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
beike/Config/beike.php
View File

@ -14,5 +14,6 @@ return [
'version' => '1.2.5', 'version' => '1.2.5',
'build' => '20221226', 'build' => '20221226',
'admin_name' => env('ADMIN_NAME'),
'force_url_https' => env('APP_FORCE_HTTPS', false), 'force_url_https' => env('APP_FORCE_HTTPS', false),
]; ];

2
beike/Helpers.php
View File

@ -58,7 +58,7 @@ function plugin_setting($key, $default = null)
*/ */
function admin_name(): string function admin_name(): string
{ {
if ($envAdminName = env('ADMIN_NAME')) { if ($envAdminName = config('beike.admin_name')) {
return Str::snake($envAdminName); return Str::snake($envAdminName);
} elseif ($settingAdminName = system_setting('base.admin_name')) { } elseif ($settingAdminName = system_setting('base.admin_name')) {
return Str::snake($settingAdminName); return Str::snake($settingAdminName);

3
beike/Installer/Controllers/DatabaseController.php
View File

@ -33,7 +33,8 @@ class DatabaseController extends Controller
{ {
DB::statement('SET FOREIGN_KEY_CHECKS = 0'); DB::statement('SET FOREIGN_KEY_CHECKS = 0');
$rows = DB::select('SHOW TABLES'); $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) { foreach ($tables as $table) {
Schema::drop($table); Schema::drop($table);
} }