mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-05 22:52:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

APP_MULTI_MODULE常量改为app_multi_module配置参数

Browse Source
This commit is contained in:
thinkphp
2016-06-14 08:12:14 +08:00
parent eb026e02a6
commit 87a3c5577c
9 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/App.php
View File

@@ -55,7 +55,7 @@ class App
$request->langset(Lang::detect());
// 加载系统语言包
Lang::load(THINK_PATH . 'lang' . DS . $request->langset() . EXT);
if (!APP_MULTI_MODULE) {
if (!$config['app_multi_module']) {
Lang::load(APP_PATH . 'lang' . DS . $request->langset() . EXT);
}
}
@@ -205,7 +205,7 @@ class App
if (is_string($result)) {
$result = explode('/', $result);
}
if (APP_MULTI_MODULE) {
if ($config['app_multi_module']) {
// 多模块部署
$module = strip_tags(strtolower($result[0] ?: $config['default_module']));
$bind = Route::bind('module');
@@ -326,7 +326,7 @@ class App
private static function init($module = '')
{
// 定位模块目录
$module = ($module && APP_MULTI_MODULE) ? $module . DS : '';
$module = ($module) ? $module . DS : '';
// 加载初始化文件
if (is_file(APP_PATH . $module . 'init' . EXT)) {

2
library/think/Build.php
View File

@@ -88,7 +88,7 @@ class Build
*/
public static function module($module = '', $list = [])
{
$module = APP_MULTI_MODULE ? $module : '';
$module = $module ? $module : '';
if (!is_dir(APP_PATH . $module)) {
// 创建模块目录
mkdir(APP_PATH . $module);

2
library/think/Loader.php
View File

@@ -463,6 +463,6 @@ class Loader
$array = explode('\\', $name);
$class = self::parseName(array_pop($array), 1) . (CLASS_APPEND_SUFFIX || $appendSuffix ? ucfirst($layer) : '');
$path = $array ? implode('\\', $array) . '\\' : '';
return APP_NAMESPACE . '\\' . (APP_MULTI_MODULE ? $module . '\\' : '') . $layer . '\\' . $path . $class;
return APP_NAMESPACE . '\\' . ($module ? $module . '\\' : '') . $layer . '\\' . $path . $class;
}
}

4
library/think/Route.php
View File

@@ -1004,7 +1004,7 @@ class Route
if (isset($path)) {
if ($reverse) {
// 解析模块
$module = APP_MULTI_MODULE ? array_shift($path) : null;
$module = Config::get('app_multi_module') ? array_shift($path) : null;
if ($autoSearch) {
// 自动搜索控制器
$dir = APP_PATH . ($module ? $module . DS : '') . 'controller';
@@ -1038,7 +1038,7 @@ class Route
} else {
$action = array_pop($path);
$controller = !empty($path) ? array_pop($path) : null;
$module = APP_MULTI_MODULE && !empty($path) ? array_pop($path) : null;
$module = Config::get('app_multi_module') && !empty($path) ? array_pop($path) : null;
$method = Request::instance()->method();
// REST 操作方法支持
if ('[rest]' == $action) {