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

修正Loader类

Browse Source
This commit is contained in:
thinkphp
2016-01-05 09:34:29 +08:00
parent 4b389c10ed
commit 80328b4aaa
1 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
library/think/App.php
View File

@@ -91,7 +91,7 @@ class App
break; break;
case 'module': case 'module':
// 模块/控制器/操作 // 模块/控制器/操作
$data = self::module(self::$dispatch['data'], $config); $data = self::module(self::$dispatch['data'], self::$dispatch['bind'], $config);
break; break;
case 'action': case 'action':
// 执行操作 // 执行操作
@@ -154,9 +154,14 @@ class App
} }
// 执行 模块/控制器/操作 // 执行 模块/控制器/操作
private static function module($result, $config) private static function module($result, $bind, $config)
{ {
if (APP_MULTI_MODULE) { if (APP_MULTI_MODULE) {
if (!empty($bind)) {
(!defined('BIND_MODULE') && !empty($bind[0])) && define('BIND_MODULE', $bind[0]);
(!defined('BIND_CONTROLLER') && !empty($bind[1])) && define('BIND_CONTROLLER', $bind[1]);
(!defined('BIND_ACTION') && !empty($bind[2])) && define('BIND_ACTION', $bind[2]);
}
// 多模块部署 // 多模块部署
$module = strtolower($result[0] ?: $config['default_module']); $module = strtolower($result[0] ?: $config['default_module']);
if ($maps = $config['url_module_map']) { if ($maps = $config['url_module_map']) {
@@ -383,25 +388,11 @@ class App
// 解析PATH_INFO // 解析PATH_INFO
self::parsePathinfo($config); self::parsePathinfo($config);
// 检测域名部署
if (!IS_CLI && !empty($config['url_domain_deploy'])) {
if ($config['url_domain_rules']) {
// 注册域名路由规则
Route::domain($config['url_domain_rules']);
}
// 检测域名路由
if ($match = Route::checkDomain()) {
(!defined('BIND_MODULE') && !empty($match[0])) && define('BIND_MODULE', $match[0]);
(!defined('BIND_CONTROLLER') && !empty($match[1])) && define('BIND_CONTROLLER', $match[1]);
(!defined('BIND_ACTION') && !empty($match[2])) && define('BIND_ACTION', $match[2]);
}
}
if (empty($_SERVER['PATH_INFO'])) { if (empty($_SERVER['PATH_INFO'])) {
$_SERVER['PATH_INFO'] = ''; $_SERVER['PATH_INFO'] = '';
define('__INFO__', ''); define('__INFO__', '');
define('__EXT__', ''); define('__EXT__', '');
$result = ['type' => 'module', 'data' => [null, null, null]]; $result = ['type' => 'module', 'data' => [null, null, null], 'bind' => []];
} else { } else {
$_SERVER['PATH_INFO'] = trim($_SERVER['PATH_INFO'], '/'); $_SERVER['PATH_INFO'] = trim($_SERVER['PATH_INFO'], '/');
define('__INFO__', $_SERVER['PATH_INFO']); define('__INFO__', $_SERVER['PATH_INFO']);
@@ -416,10 +407,10 @@ class App
$depr = $config['pathinfo_depr']; $depr = $config['pathinfo_depr'];
// 还原劫持后真实pathinfo // 还原劫持后真实pathinfo
$path_info = $path_info =
(defined('BIND_MODULE') ? BIND_MODULE . $depr : '') . (defined('BIND_MODULE') ? BIND_MODULE . $depr : '') .
(defined('BIND_CONTROLLER') ? BIND_CONTROLLER . $depr : '') . (defined('BIND_CONTROLLER') ? BIND_CONTROLLER . $depr : '') .
(defined('BIND_ACTION') ? BIND_ACTION . $depr : '') . (defined('BIND_ACTION') ? BIND_ACTION . $depr : '') .
$_SERVER['PATH_INFO']; $_SERVER['PATH_INFO'];
// 路由检测 // 路由检测
if (!empty($config['url_route_on'])) { if (!empty($config['url_route_on'])) {