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

改进自动路由标识生成 支持不同的路由规则 指向同一个路由标识，改进Url自动生成对路由标识的支持

Browse Source
This commit is contained in:
thinkphp
2016-08-23 18:03:31 +08:00
parent 0885e14f24
commit 369bbc9d99
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
library/think/Url.php
View File

@@ -234,18 +234,19 @@ class Url
// 匹配路由地址
public static function getRuleUrl($rule, &$vars = [])
{
list($url, $pattern) = $rule;
foreach ($pattern as $key => $val) {
if (isset($vars[$key])) {
$url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key . '', '<' . $key . '>'], $vars[$key], $url);
unset($vars[$key]);
} elseif (2 == $val) {
$url = str_replace(['/[:' . $key . ']', '[:' . $key . ']', '<' . $key . '?>'], '', $url);
} else {
return false;
foreach ($rule as $item) {
list($url, $pattern) = $item;
foreach ($pattern as $key => $val) {
if (isset($vars[$key])) {
$url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key . '', '<' . $key . '>'], $vars[$key], $url);
unset($vars[$key]);
return $url;
} elseif (2 == $val) {
return str_replace(['/[:' . $key . ']', '[:' . $key . ']', '<' . $key . '?>'], '', $url);
}
}
}
return $url;
return false;
}
// 指定当前生成URL地址的root