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

改进Url生成类对路由映射和没有动态变量的支持

Browse Source
This commit is contained in:
thinkphp
2016-03-31 08:22:18 +08:00
parent 561e57af5c
commit 07b52db1a2
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
library/think/Url.php
View File

@@ -208,13 +208,13 @@ class Url
public static function getRouteUrl($alias, &$vars = []) public static function getRouteUrl($alias, &$vars = [])
{ {
foreach ($alias as $key => $val) { foreach ($alias as $key => $val) {
list($url, $pattern) = $val; list($url, $pattern, $param) = $val;
// 解析安全替换 // 解析安全替换
if (strpos($url, '$')) { if (strpos($url, '$')) {
$url = str_replace('$', '[--think--]', $url); $url = str_replace('$', '[--think--]', $url);
} }
// 检查变量匹配 // 检查变量匹配
if (self::pattern($pattern, $vars)) { if ($pattern && self::pattern($pattern, $vars)) {
foreach ($pattern as $key => $val) { foreach ($pattern as $key => $val) {
if (isset($vars[$key])) { if (isset($vars[$key])) {
$url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key . '', '<' . $key . '>'], $vars[$key], $url); $url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key . '', '<' . $key . '>'], $vars[$key], $url);
@@ -224,6 +224,9 @@ class Url
} }
} }
return $url; return $url;
} elseif (!empty($param) && $param == $vars) {
$vars = [];
return $url;
} }
} }
return false; return false;
@@ -237,9 +240,6 @@ class Url
} }
// 获取路由定义 // 获取路由定义
$rules = Route::getRules(); $rules = Route::getRules();
if (empty($rules)) {
return [];
}
foreach ($rules as $rule => $val) { foreach ($rules as $rule => $val) {
if (!empty($val['routes'])) { if (!empty($val['routes'])) {
foreach ($val['routes'] as $key => $route) { foreach ($val['routes'] as $key => $route) {
@@ -247,34 +247,43 @@ class Url
$key = array_shift($route); $key = array_shift($route);
} }
$route = $route[0]; $route = $route[0];
$param = [];
if (is_array($route)) { if (is_array($route)) {
$route = implode('\\', $route); $route = implode('\\', $route);
} elseif ($route instanceof \Closure) { } elseif ($route instanceof \Closure) {
continue; continue;
} elseif (strpos($route, '?')) { } elseif (strpos($route, '?')) {
$route = strstr($route, '?', true); list($route, $str) = explode('?', $route, 2);
parse_str($str, $param);
} }
$var = self::parseVar($rule . '/' . $key); $var = self::parseVar($rule . '/' . $key);
$alias[$route][] = [$rule . '/' . $key, $var]; $alias[$route][] = [$rule . '/' . $key, $var, $param];
} }
} else { } else {
$route = $val['route']; $route = $val['route'];
$param = [];
if (is_array($route)) { if (is_array($route)) {
$route = implode('\\', $route); $route = implode('\\', $route);
} elseif ($route instanceof \Closure) { } elseif ($route instanceof \Closure) {
continue; continue;
} elseif (strpos($route, '?')) { } elseif (strpos($route, '?')) {
$route = strstr($route, '?', true); list($route, $str) = explode('?', $route, 2);
parse_str($str, $param);
} }
$var = self::parseVar($rule); $var = self::parseVar($rule);
$alias[$route][] = [$rule, $var]; $alias[$route][] = [$rule, $var, $param];
} }
} }
// 检测路由映射 // 检测路由映射
$maps = Route::map(); $maps = Route::map();
foreach ($maps as $rule => $route) { foreach ($maps as $rule => $route) {
$alias[$route][] = [$rule, []]; $param = [];
if (strpos($route, '?')) {
list($route, $str) = explode('?', $route, 2);
parse_str($str, $param);
}
$alias[$route][] = [$rule, [], $param];
} }
!APP_DEBUG && Cache::set('think_route_alias', $alias); !APP_DEBUG && Cache::set('think_route_alias', $alias);
return $alias; return $alias;