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

改进路由分组

Browse Source
This commit is contained in:
thinkphp
2016-07-27 16:59:35 +08:00
parent b332e55dd2
commit d99b6ffb23
1 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
library/think/Route.php
View File

@@ -59,10 +59,8 @@ class Route
private static $subDomain = ''; private static $subDomain = '';
// 域名绑定 // 域名绑定
private static $bind = []; private static $bind = [];
// 当前分组 // 当前分组信息
private static $group = ''; private static $group = [];
// 当前参数
private static $option = [];
/** /**
* 注册变量规则 * 注册变量规则
@@ -184,9 +182,14 @@ class Route
*/ */
public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = []) public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = [])
{ {
$group = self::$group; $group = self::getGroup('name');
$option = array_merge(self::$option, $option); if (!is_null($group)) {
$type = strtoupper($type); // 路由分组
$option = array_merge(self::getGroup('option'), $option);
$pattern = array_merge(self::getGroup('pattern'), $pattern);
}
$type = strtoupper($type);
if (strpos($type, '|')) { if (strpos($type, '|')) {
$option['method'] = $type; $option['method'] = $type;
@@ -251,29 +254,33 @@ class Route
} }
/** /**
* 设置当前的路由分组 * 获取当前的分组信息
* @access public * @access public
* @param array $option 路由参数 * @param string $type 分组信息名称 name option pattern
* @return void * @return mixed
*/ */
public static function setGroup($name) public static function getGroup($type)
{ {
if (self::$group) { if (isset(self::$group[$type])) {
self::$group = self::$group . '/' . ltrim($name, '/'); return self::$group[$type];
} else { } else {
self::$group = $name; return null;
} }
} }
/** /**
* 设置当前的路由参数 * 设置当前的路由分组
* @access public * @access public
* @param array $option 路由参数 * @param string $name 分组名称
* @param array $option 分组路由参数
* @param array $pattern 分组变量规则
* @return void * @return void
*/ */
public static function setOption($option) public static function setGroup($name, $option = [], $pattern = [])
{ {
self::$option = $option; self::$group['name'] = $name;
self::$group['option'] = $option ?: [];
self::$group['pattern'] = $pattern ?: [];
} }
/** /**
@@ -282,34 +289,31 @@ class Route
* @param string|array $name 分组名称或者参数 * @param string|array $name 分组名称或者参数
* @param array|\Closure $routes 路由地址 * @param array|\Closure $routes 路由地址
* @param array $option 路由参数 * @param array $option 路由参数
* @param string $type 请求类型
* @param array $pattern 变量规则 * @param array $pattern 变量规则
* @return void * @return void
*/ */
public static function group($name, $routes, $option = [], $type = '*', $pattern = []) public static function group($name, $routes, $option = [], $pattern = [])
{ {
if (is_array($name)) { if (is_array($name)) {
$option = $name; $option = $name;
$name = isset($option['name']) ? $option['name'] : ''; $name = isset($option['name']) ? $option['name'] : '';
} }
$type = strtoupper($type);
if (!empty($name)) { if (!empty($name)) {
// 分组 // 分组
if ($routes instanceof \Closure) { if ($routes instanceof \Closure) {
$curentGroup = self::$group; $curentGroup = self::getGroup('name');
$currentOption = self::$option;
self::setGroup($name);
self::setOption($option);
call_user_func_array($routes, []);
self::$group = $curentGroup;
self::setOption($currentOption);
if ($curentGroup) { if ($curentGroup) {
$name = $curentGroup . '/' . $name; $name = $curentGroup . '/' . ltrim($name, '/');
} }
self::$rules[$type][$name]['route'] = ''; $currentOption = self::getGroup('option');
self::$rules[$type][$name]['var'] = self::parseVar($name); $currentPattern = self::getGroup('pattern');
self::$rules[$type][$name]['option'] = $option; self::setGroup($name, $option, $pattern);
self::$rules[$type][$name]['pattern'] = $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;
} else { } else {
foreach ($routes as $key => $val) { foreach ($routes as $key => $val) {
@@ -326,27 +330,29 @@ class Route
$vars = self::parseVar($key); $vars = self::parseVar($key);
$item[] = ['rule' => $key, 'route' => $route, 'var' => $vars, 'option' => isset($option1) ? $option1 : $option, 'pattern' => isset($pattern1) ? $pattern1 : $pattern]; $item[] = ['rule' => $key, 'route' => $route, 'var' => $vars, 'option' => isset($option1) ? $option1 : $option, 'pattern' => isset($pattern1) ? $pattern1 : $pattern];
} }
self::$rules[$type][$name] = ['rule' => $item, 'route' => '', 'var' => [], 'option' => $option, 'pattern' => $pattern]; self::$rules['*'][$name] = ['rule' => $item, 'route' => '', 'var' => [], 'option' => $option, 'pattern' => $pattern];
} }
if ('*' == $type) {
foreach (['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS'] as $method) { foreach (['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD', 'OPTIONS'] as $method) {
if (!isset(self::$rules[$method][$name])) { if (!isset(self::$rules[$method][$name])) {
self::$rules[$method][$name] = true; self::$rules[$method][$name] = true;
} else { } else {
self::$rules[$method][$name] = array_merge(self::$rules['*'][$name], self::$rules[$method][$name]); self::$rules[$method][$name] = array_merge(self::$rules['*'][$name], self::$rules[$method][$name]);
}
} }
} }
} else { } else {
if ($routes instanceof \Closure) { if ($routes instanceof \Closure) {
// 闭包注册 // 闭包注册
$currentOption = self::$option; $curentGroup = self::getGroup('name');
self::setOption($option); $currentOption = self::getGroup('option');
$currentPattern = self::getGroup('pattern');
self::setGroup($name, $option, $pattern);
call_user_func_array($routes, []); call_user_func_array($routes, []);
self::setOption($currentOption); self::setGroup($currentGroup, $currentOption, $currentPattern);
} else { } else {
// 批量注册路由 // 批量注册路由
self::rule($routes, '', $type, $option, $pattern); self::rule($routes, '', '*', $option, $pattern);
} }
} }
} }