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

内核更新

Browse Source
This commit is contained in:
molong
2016-09-14 13:39:11 +08:00
parent d639c7d5f5
commit 3a6802216e
9 changed files with 136 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/library/think/Route.php
View File

@@ -32,10 +32,10 @@ class Route
'HEAD' => [],
'OPTIONS' => [],
'*' => [],
'map' => [],
'alias' => [],
'domain' => [],
'pattern' => [],
'name' => [],
];
// REST路由操作方法定义
@@ -63,8 +63,6 @@ class Route
private static $bind = [];
// 当前分组信息
private static $group = [];
// 路由命名标识（用于快速URL生成）
private static $name = [];
// 当前子域名绑定
private static $domainBind;
private static $domainRule;
@@ -137,19 +135,22 @@ class Route
}
/**
* 设置路由绑定
* 设置或者获取路由标识
* @access public
* @param string|array $name 路由命名标识 数组表示批量设置
* @param array $value 路由地址及变量信息
* @return array
*/
public static function name($name = '')
public static function name($name = '', $value = null)
{
if (is_array($name)) {
return self::$name = $name;
return self::$rules['name'] = $name;
} elseif ('' === $name) {
return self::$name;
return self::$rules['name'];
} elseif (!is_null($value)) {
self::$rules['name'][$name][] = $value;
} else {
return isset(self::$name[$name]) ? self::$name[$name] : null;
return isset(self::$rules['name'][$name]) ? self::$rules['name'][$name] : null;
}
}
@@ -304,7 +305,7 @@ class Route
}
$vars = self::parseVar($rule);
if (isset($name)) {
self::$name[$name][] = [$rule, $vars, self::$domain];
self::name($name, [$rule, $vars, self::$domain]);
}
if ($group) {
if ('*' != $type) {
@@ -424,7 +425,7 @@ class Route
$vars = self::parseVar($key);
$item[] = ['rule' => $key, 'route' => $route, 'var' => $vars, 'option' => $options, 'pattern' => $patterns];
// 设置路由标识
self::$name[$route][] = [$key, $vars, self::$domain];
self::name($route, [$key, $vars, self::$domain]);
}
self::$rules['*'][$name] = ['rule' => $item, 'route' => '', 'var' => [], 'option' => $option, 'pattern' => $pattern];
}
@@ -683,7 +684,7 @@ class Route
return true === $rules ? self::$rules : self::$rules[$rules];
} else {
$rules = self::$rules;
unset($rules['pattern'], $rules['alias'], $rules['domain']);
unset($rules['pattern'], $rules['alias'], $rules['domain'], $rules['name']);
return $rules;
}
}
@@ -1177,7 +1178,7 @@ class Route
self::parseUrlParams(empty($path) ? '' : implode('/', $path));
// 封装路由
$route = [$module, $controller, $action];
if (isset(self::$name[implode($depr, $route)])) {
if (isset(self::$rules['name'][implode($depr, $route)])) {
throw new HttpException(404, 'invalid request:' . $url);
}
}
@@ -1367,7 +1368,7 @@ class Route
$bind[$key] = $result;
}
}
$matches = array_merge($matches, $bind);
Request::instance()->bind($bind);
}
// 解析额外参数