molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

内核更新

Browse Source
This commit is contained in:
龙渊
2016-08-03 23:44:44 +08:00
parent d6e2aa4068
commit 8094b9249a
9 changed files with 181 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/library/think/Route.php
+119 -90
View File
@@ -65,6 +65,9 @@ class Route
// 路由命名标识（用于快速URL生成）
private static $name = [];
// 当前子域名绑定
private static $domainBind;
private static $domainRule;
// 当前域名
private static $domain;
/**
@@ -96,13 +99,32 @@ class Route
{
if (is_array($domain)) {
foreach ($domain as $key => $item) {
self::$rules['domain'][$key] = [$item, $option, $pattern];
self::domain($key, $item, $option, $pattern);
}
} else {
self::$rules['domain'][$domain] = [$rule, $option, $pattern];
if ($rule instanceof \Closure) {
// 执行闭包
self::setDomain($domain);
call_user_func_array($rule, []);
self::setDomain(null);
} elseif (is_array($rule)) {
self::setDomain($domain);
self::group('', function () use ($rule) {
// 动态注册域名的路由规则
self::registerRules($rule);
}, $option, $pattern);
self::setDomain(null);
} else {
self::$rules['domain'][$domain]['[bind]'] = [$rule, $option, $pattern];
}
}
}
private static function setDomain($domain)
{
self::$domain = $domain;
}
/**
* 设置路由绑定
* @access public
@@ -211,7 +233,7 @@ class Route
public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = [])
{
$group = self::getGroup('name');
if (!is_null($group)) {
if (!empty($group)) {
// 路由分组
$option = array_merge(self::getGroup('option'), $option);
$pattern = array_merge(self::getGroup('pattern'), $pattern);
@@ -270,19 +292,34 @@ class Route
}
$vars = self::parseVar($rule);
if (isset($name)) {
self::$name[$name] = [$rule, $vars];
self::$name[$name] = [$rule, $vars, self::$domain];
}
if ($group) {
self::$rules[$type][$group]['rule'][] = ['rule' => $rule, 'route' => $route, 'var' => $vars, 'option' => $option, 'pattern' => $pattern];
if ('*' != $type) {
$option['method'] = $type;
}
if (self::$domain) {
self::$rules['domain'][self::$domain]['*'][$group]['rule'][] = ['rule' => $rule, 'route' => $route, 'var' => $vars, 'option' => $option, 'pattern' => $pattern];
} else {
self::$rules['*'][$group]['rule'][] = ['rule' => $rule, 'route' => $route, 'var' => $vars, 'option' => $option, 'pattern' => $pattern];
}
} else {
if ('*' != $type && isset(self::$rules['*'][$rule])) {
unset(self::$rules['*'][$rule]);
}
self::$rules[$type][$rule] = ['rule' => $rule, 'route' => $route, 'var' => $vars, 'option' => $option, 'pattern' => $pattern];
if (self::$domain) {
self::$rules['domain'][self::$domain][$type][$rule] = ['rule' => $rule, 'route' => $route, 'var' => $vars, 'option' => $option, 'pattern' => $pattern];
} else {
self::$rules[$type][$rule] = ['rule' => $rule, 'route' => $route, 'var' => $vars, 'option' => $option, 'pattern' => $pattern];
}
if ('*' == $type) {
// 注册路由快捷方式
foreach (['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS'] as $method) {
self::$rules[$method][$rule] = true;
if (self::$domain) {
self::$rules['domain'][self::$domain][$method][$rule] = true;
} else {
self::$rules[$method][$rule] = true;
}
}
}
}
@@ -299,7 +336,7 @@ class Route
if (isset(self::$group[$type])) {
return self::$group[$type];
} else {
return null;
return 'name' == $type ? null : [];
}
}
@@ -333,30 +370,33 @@ class Route
$option = $name;
$name = isset($option['name']) ? $option['name'] : '';
}
// 分组
$currentGroup = self::getGroup('name');
if ($currentGroup) {
$name = $currentGroup . ($name ? '/' . ltrim($name, '/') : '');
}
if (!empty($name)) {
// 分组
$currentGroup = self::getGroup('name');
if ($currentGroup) {
$name = $currentGroup . '/' . ltrim($name, '/');
}
if ($routes instanceof \Closure) {
$currentOption = self::getGroup('option');
$currentPattern = self::getGroup('pattern');
self::setGroup($name, $option, $pattern);
self::setGroup($name, array_merge($currentOption, $option), array_merge($currentPattern, $pattern));
call_user_func_array($routes, []);
self::setGroup($currentGroup, $currentOption, $currentPattern);
self::$rules['*'][$name]['route'] = '';
self::$rules['*'][$name]['var'] = self::parseVar($name);
self::$rules['*'][$name]['option'] = $option;
self::$rules['*'][$name]['pattern'] = $pattern;
if ($currentGroup != $name) {
self::$rules['*'][$name]['route'] = '';
self::$rules['*'][$name]['var'] = self::parseVar($name);
self::$rules['*'][$name]['option'] = $option;
self::$rules['*'][$name]['pattern'] = $pattern;
}
} else {
$item = [];
foreach ($routes as $key => $val) {
if (is_numeric($key)) {
$key = array_shift($val);
}
if (is_array($val)) {
$route = $val[0];
$option1 = array_merge($option, $val[1]);
$option1 = array_merge($option, isset($val[1]) ? $val[1] : []);
$pattern1 = array_merge($pattern, isset($val[2]) ? $val[2] : []);
} else {
$route = $val;
@@ -375,22 +415,16 @@ class Route
}
}
} elseif ($routes instanceof \Closure) {
// 闭包注册
$currentOption = self::getGroup('option');
$currentPattern = self::getGroup('pattern');
self::setGroup('', array_merge($currentOption, $option), array_merge($currentPattern, $pattern));
call_user_func_array($routes, []);
self::setGroup($currentGroup, $currentOption, $currentPattern);
} else {
if ($routes instanceof \Closure) {
// 闭包注册
$currentGroup = self::getGroup('name');
$currentOption = self::getGroup('option');
$currentPattern = self::getGroup('pattern');
if ($currentGroup) {
$name = $currentGroup . '/' . ltrim($name, '/');
}
self::setGroup($name, $option, $pattern);
call_user_func_array($routes, []);
self::setGroup($currentGroup, $currentOption, $currentPattern);
} else {
// 批量注册路由
self::rule($routes, '', '*', $option, $pattern);
}
// 批量注册路由
self::rule($routes, '', '*', $option, $pattern);
}
}
@@ -624,7 +658,7 @@ class Route
if (is_array($rules)) {
self::$rules = $rules;
} elseif ($rules) {
return self::$rules[$rules];
return true === $rules ? self::$rules : self::$rules[$rules];
} else {
$rules = self::$rules;
unset($rules['pattern'], $rules['alias'], $rules['domain']);
@@ -636,10 +670,11 @@ class Route
* 检测子域名部署
* @access public
* @param Request $request Request请求对象
* @param array $currentRules 当前路由规则
* @param string $method 请求类型
* @return void
*/
public static function checkDomain($request, $method = 'GET')
public static function checkDomain($request, &$currentRules, $method = 'GET')
{
// 域名规则
$rules = self::$rules['domain'];
@@ -684,55 +719,45 @@ class Route
}
}
if (!empty($item)) {
self::$domain = true;
// 解析子域名部署规则
list($rule, $option, $pattern) = $item;
if (!empty($option['https']) && !$request->isSsl()) {
// https检测
throw new HttpException(404, 'must use https request:' . $host);
}
if ($rule instanceof \Closure) {
// 执行闭包
$reflect = new \ReflectionFunction($rule);
self::$bind = $reflect->invokeArgs([]);
return;
} elseif (is_array($rule)) {
// 清空当前路由规则
self::$rules[$method] = [];
self::$rules['*'] = [];
self::group('', function () use ($rule) {
// 动态注册域名的路由规则
self::registerRules($rule);
}, $option, $pattern);
return;
}
if (strpos($rule, '?')) {
// 传入其它参数
$array = parse_url($rule);
$result = $array['path'];
parse_str($array['query'], $params);
if (isset($panDomain)) {
$pos = array_search('*', $params);
if (false !== $pos) {
// 泛域名作为参数
$params[$pos] = $panDomain;
}
if (isset($item['[bind]'])) {
// 解析子域名部署规则
list($rule, $option, $pattern) = $item['[bind]'];
if (!empty($option['https']) && !$request->isSsl()) {
// https检测
throw new HttpException(404, 'must use https request:' . $host);
}
$_GET = array_merge($_GET, $params);
} else {
$result = $rule;
}
if (0 === strpos($result, '\\')) {
// 绑定到命名空间 例如 \app\index\behavior
self::$bind = ['type' => 'namespace', 'namespace' => $result];
} elseif (0 === strpos($result, '@')) {
// 绑定到类 例如 @app\index\controller\User
self::$bind = ['type' => 'class', 'class' => substr($result, 1)];
if (strpos($rule, '?')) {
// 传入其它参数
$array = parse_url($rule);
$result = $array['path'];
parse_str($array['query'], $params);
if (isset($panDomain)) {
$pos = array_search('*', $params);
if (false !== $pos) {
// 泛域名作为参数
$params[$pos] = $panDomain;
}
}
$_GET = array_merge($_GET, $params);
} else {
$result = $rule;
}
if (0 === strpos($result, '\\')) {
// 绑定到命名空间 例如 \app\index\behavior
self::$bind = ['type' => 'namespace', 'namespace' => $result];
} elseif (0 === strpos($result, '@')) {
// 绑定到类 例如 @app\index\controller\User
self::$bind = ['type' => 'class', 'class' => substr($result, 1)];
} else {
// 绑定到模块/控制器 例如 index/user
self::$bind = ['type' => 'module', 'module' => $result];
}
self::$domainBind = true;
} else {
// 绑定到模块/控制器 例如 index/user
self::$bind = ['type' => 'module', 'module' => $result];
self::$domainRule = $item;
$currentRules = isset($item[$method]) ? $item[$method] : $item['*'];
}
}
}
@@ -762,13 +787,12 @@ class Route
}
}
$method = $request->method();
// 检测域名部署
if ($checkDomain) {
self::checkDomain($request, $method);
}
// 获取当前请求类型的路由规则
$rules = self::$rules[$method];
// 检测域名部署
if ($checkDomain) {
self::checkDomain($request, $rules, $method);
}
// 检测URL绑定
$return = self::checkUrlBind($url, $rules, $depr);
if (false !== $return) {
@@ -781,7 +805,7 @@ class Route
// 静态路由规则检测
$rule = $rules[$url];
if (true === $rule) {
$rule = self::$rules['*'][$url];
$rule = self::getRouteExpress($url);
}
if (!empty($rule['route'])) {
return self::parseRule($url, $rule['route'], $url, $rule['option']);
@@ -795,6 +819,11 @@ class Route
return false;
}
private static function getRouteExpress($key)
{
return self::$domainRule ? self::$domainRule['*'][$key] : self::$rules['*'][$key];
}
/**
* 检测路由规则
* @access private
@@ -809,7 +838,7 @@ class Route
{
foreach ($rules as $key => $item) {
if (true === $item) {
$item = self::$rules['*'][$key];
$item = self::getRouteExpress($key);
}
if (!isset($item['rule'])) {
continue;
@@ -925,7 +954,7 @@ class Route
return self::bindToNamespace($url, $bind, $depr);
case 'module':
// 如果有模块/控制器绑定 针对路由到 模块/控制器 有效
$url = (empty(self::$domain) ? $bind . '/' : '') . ltrim($url, '/');
$url = (empty(self::$domainBind) ? $bind . '/' : '') . ltrim($url, '/');
break;
}
}