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, " $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 +}