From f96d302ad5e9af8d01f60016df0138edbd70a178 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 16 Aug 2016 16:19:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=85=8D=E7=BD=AE=E5=92=8C?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=E9=85=8D=E7=BD=AE=E7=9A=84=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4=20=E4=BE=BF=E4=BA=8E?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=AD?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=9B=B4=E6=94=B9=E6=89=A9=E5=B1=95=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/App.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/think/App.php b/library/think/App.php
index c52c0ff7..c0fed042 100644
--- a/library/think/App.php
+++ b/library/think/App.php
@@ -424,11 +424,6 @@ class App
             // 加载模块配置
             $config = Config::load(CONF_PATH . $module . 'config' . CONF_EXT);
 
-            // 加载应用状态配置
-            if ($config['app_status']) {
-                $config = Config::load(CONF_PATH . $module . $config['app_status'] . CONF_EXT);
-            }
-
             // 读取扩展配置文件
             if ($config['extra_config_list']) {
                 foreach ($config['extra_config_list'] as $name => $file) {
@@ -437,6 +432,11 @@ class App
                 }
             }
 
+            // 加载应用状态配置
+            if ($config['app_status']) {
+                $config = Config::load(CONF_PATH . $module . $config['app_status'] . CONF_EXT);
+            }
+
             // 加载别名文件
             if (is_file(CONF_PATH . $module . 'alias' . EXT)) {
                 Loader::addClassMap(include CONF_PATH . $module . 'alias' . EXT);