From 571da499f7932e923ed5edde014d9f0bedc53538 Mon Sep 17 00:00:00 2001
From: Summer <summer@learnku.com>
Date: Fri, 1 May 2020 09:09:25 +0800
Subject: [PATCH] fix config cache

---
 .../Administrator/AdministratorServiceProvider.php       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Frozennode/Administrator/AdministratorServiceProvider.php b/src/Frozennode/Administrator/AdministratorServiceProvider.php
index 4bb136d..41b6ced 100755
--- a/src/Frozennode/Administrator/AdministratorServiceProvider.php
+++ b/src/Frozennode/Administrator/AdministratorServiceProvider.php
@@ -122,10 +122,15 @@ public function setLocale()
     public function fixConfigAndRouteCacheIfNeeded()
     {
         // Hack for laravel config cache
-
         $file = config_path('administrator.php');
         if (file_exists($file)) {
-            $this->mergeConfigFrom($file, 'administrator');
+
+            if ($this->app->configurationIsCached()) {
+                $this->app['config']->set('administrator', array_merge(
+                    require $file, $this->app['config']->get('administrator', [])
+                ));
+            }
+
             if (app()->runningInConsole()) {
                 $configs = \Config::get('administrator');
                 $configs = $this->filter_recursive($configs);