bugfix

Author: songzou

README.md

@@ -1,13 +1,14 @@
 laravel-admin-ext/config
 ========================
 
-[![StyleCI](https://styleci.io/repos/97664136/shield?branch=master)](https://styleci.io/repos/97664136)
 [![Packagist](https://img.shields.io/packagist/l/laravel-admin-ext/config.svg?maxAge=2592000)](https://packagist.org/packages/laravel-admin-ext/config)
 [![Total Downloads](https://img.shields.io/packagist/dt/laravel-admin-ext/config.svg?style=flat-square)](https://packagist.org/packages/laravel-admin-ext/config)
 
+Inspired by https://github.com/laravel-backpack/settings.
 
+## Screenshot
 
-Inspired by https://github.com/laravel-backpack/settings.
+![wx20170810-100226](https://user-images.githubusercontent.com/1479100/29151322-0879681a-7db3-11e7-8005-03310686c884.png)
 
 ## Installation
 
@@ -17,7 +18,7 @@ $ composer require laravel-admin-ext/config
 $ php artisan migrate
 ```
 
-Open `app/Providers/AppServiceProvider.php`, and call the `Config::boot` method within the `boot` method:
+Open `app/Providers/AppServiceProvider.php`, and call the `Config::load()` method within the `boot` method:
 
 ```php
 <?php
@@ -31,12 +32,12 @@ class AppServiceProvider extends ServiceProvider
 {
     public function boot()
     {
-        Config::boot();
+        Config::load();
     }
 }
 ```
 
-then run: 
+Then run: 
 
 ```
 $ php artisan admin:import config

src/Config.php

@@ -4,10 +4,21 @@
 
 use Encore\Admin\Admin;
 use Encore\Admin\Extension;
-use Illuminate\Support\Facades\Route;
 
 class Config extends Extension
 {
+    /**
+     * Load configure into laravel from database.
+     *
+     * @return void
+     */
+    public static function load()
+    {
+        foreach (ConfigModel::all(['name', 'value']) as $config) {
+            config([$config['name'] => $config['value']]);
+        }
+    }
+
     /**
      * Bootstrap this package.
      *
@@ -17,8 +28,6 @@ public static function boot()
     {
         static::registerRoutes();
 
-        static::loadConfig();
-
         Admin::extend('config', __CLASS__);
     }
 
@@ -29,29 +38,12 @@ public static function boot()
      */
     protected static function registerRoutes()
     {
-        /* @var \Illuminate\Routing\Router $router */
-        Route::group(['prefix' => config('admin.route.prefix')], function ($router) {
-
-            $attributes = array_merge([
-                'middleware' => config('admin.route.middleware'),
-            ], static::config('route', []));
-
-            Route::group($attributes, function ($router) {
-
-                /* @var \Illuminate\Routing\Router $router */
-                $router->resource('config', 'Encore\Admin\Config\ConfigController');
-            });
-
+        parent::routes(function ($router) {
+            /* @var \Illuminate\Routing\Router $router */
+            $router->resource('config', 'Encore\Admin\Config\ConfigController');
         });
     }
 
-    protected static function loadConfig()
-    {
-        foreach (ConfigModel::all(['name', 'value']) as $config) {
-            config([$config['name'] => $config['value']]);
-        }
-    }
-
     /**
      * {@inheritdoc}
      */

src/ConfigServiceProvider.php

@@ -14,5 +14,7 @@ public function boot()
         if ($this->app->runningInConsole()) {
             $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
         }
+
+        Config::boot();
     }
 }