From 4b743713a73c99135a495ee23e758d91d036a516 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 25 May 2016 23:00:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E5=B8=B8=E9=87=8F=20CONF=5FPATH=20=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base.php                |  1 +
 library/think/App.php   | 14 +++++++-------
 library/think/Build.php |  2 +-
 mode/console/App.php    | 20 ++++++++++----------
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/base.php b/base.php
index df8eba84..272fd268 100644
--- a/base.php
+++ b/base.php
@@ -32,6 +32,7 @@ defined('CACHE_PATH') or define('CACHE_PATH', RUNTIME_PATH . 'cache' . DS);
 defined('TEMP_PATH') or define('TEMP_PATH', RUNTIME_PATH . 'temp' . DS);
 defined('VENDOR_PATH') or define('VENDOR_PATH', ROOT_PATH . 'vendor' . DS);
 defined('EXT') or define('EXT', '.php');
+defined('CONF_PATH') or define('CONF_PATH', APP_PATH); // 配置文件目录
 defined('CONF_EXT') or define('CONF_EXT', EXT); // 配置文件后缀
 defined('MODEL_LAYER') or define('MODEL_LAYER', 'model');
 defined('VIEW_LAYER') or define('VIEW_LAYER', 'view');
diff --git a/library/think/App.php b/library/think/App.php
index f58350f6..7bb61231 100644
--- a/library/think/App.php
+++ b/library/think/App.php
@@ -302,29 +302,29 @@ class App
         } else {
             $path = APP_PATH . $module;
             // 加载模块配置
-            $config = Config::load(APP_PATH . $module . 'config' . CONF_EXT);
+            $config = Config::load(CONF_PATH . $module . 'config' . CONF_EXT);
 
             // 加载应用状态配置
             if ($config['app_status']) {
-                $config = Config::load(APP_PATH . $module . $config['app_status'] . CONF_EXT);
+                $config = Config::load(CONF_PATH . $module . $config['app_status'] . CONF_EXT);
             }
 
             // 读取扩展配置文件
             if ($config['extra_config_list']) {
                 foreach ($config['extra_config_list'] as $name => $file) {
-                    $filename = $path . $file . CONF_EXT;
+                    $filename = CONF_PATH . $module . $file . CONF_EXT;
                     Config::load($filename, is_string($name) ? $name : pathinfo($filename, PATHINFO_FILENAME));
                 }
             }
 
             // 加载别名文件
-            if (is_file($path . 'alias' . EXT)) {
-                Loader::addMap(include $path . 'alias' . EXT);
+            if (is_file(CONF_PATH . $module . 'alias' . EXT)) {
+                Loader::addMap(include CONF_PATH . $module . 'alias' . EXT);
             }
 
             // 加载行为扩展文件
-            if (is_file($path . 'tags' . EXT)) {
-                Hook::import(include $path . 'tags' . EXT);
+            if (is_file(CONF_PATH . $module . 'tags' . EXT)) {
+                Hook::import(include CONF_PATH . $module . 'tags' . EXT);
             }
 
             // 加载公共文件
diff --git a/library/think/Build.php b/library/think/Build.php
index 5cc2147e..ada56595 100644
--- a/library/think/Build.php
+++ b/library/think/Build.php
@@ -186,7 +186,7 @@ class Build
      */
     protected static function buildCommon($module)
     {
-        $filename = APP_PATH . ($module ? $module . DS : '') . 'config.php';
+        $filename = CONF_PATH . ($module ? $module . DS : '') . 'config.php';
         if (!is_file($filename)) {
             file_put_contents($filename, "<?php\n//配置文件\nreturn [\n\n];");
         }
diff --git a/mode/console/App.php b/mode/console/App.php
index 01594d58..7376a84a 100644
--- a/mode/console/App.php
+++ b/mode/console/App.php
@@ -27,8 +27,8 @@ class App
         // 实例化console
         $console = new Console('Think Console', '0.1');
         // 读取指令集
-        if (is_file(APP_PATH . 'command' . EXT)) {
-            $commands = include APP_PATH . 'command' . EXT;
+        if (is_file(CONF_PATH . 'command' . EXT)) {
+            $commands = include CONF_PATH . 'command' . EXT;
             if (is_array($commands)) {
                 foreach ($commands as $command) {
                     if (class_exists($command) && is_subclass_of($command, "\\think\\console\\command\\Command")) {
@@ -52,29 +52,29 @@ class App
             $config = Config::get();
         } else {
             // 加载模块配置
-            $config = Config::load(APP_PATH . 'config' . EXT);
+            $config = Config::load(CONF_PATH . 'config' . CONF_EXT);
 
             // 加载应用状态配置
             if ($config['app_status']) {
-                $config = Config::load(APP_PATH . $config['app_status'] . EXT);
+                $config = Config::load(CONF_PATH . $config['app_status'] . CONF_EXT);
             }
 
             // 读取扩展配置文件
             if ($config['extra_config_list']) {
                 foreach ($config['extra_config_list'] as $name => $file) {
-                    $filename = APP_PATH . $file . EXT;
+                    $filename = CONF_PATH . $file . CONF_EXT;
                     Config::load($filename, is_string($name) ? $name : pathinfo($filename, PATHINFO_FILENAME));
                 }
             }
 
             // 加载别名文件
-            if (is_file(APP_PATH . 'alias' . EXT)) {
-                Loader::addMap(include APP_PATH . 'alias' . EXT);
+            if (is_file(CONF_PATH . 'alias' . EXT)) {
+                Loader::addMap(include CONF_PATH . 'alias' . EXT);
             }
 
             // 加载行为扩展文件
-            if (is_file(APP_PATH . 'tags' . EXT)) {
-                Hook::import(include APP_PATH . 'tags' . EXT);
+            if (is_file(CONF_PATH . 'tags' . EXT)) {
+                Hook::import(include CONF_PATH . 'tags' . EXT);
             }
 
             // 加载公共文件
@@ -104,4 +104,4 @@ class App
         // 监听app_init
         Hook::listen('app_init');
     }
-}
\ No newline at end of file
+}