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

改进Url生成的别名获取后的域名和后缀拼接

Browse Source
This commit is contained in:
thinkphp
2016-01-09 21:53:15 +08:00
parent 25f31081e8
commit f779f2ca07
1 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
library/think/Url.php
View File

@@ -26,10 +26,6 @@ class Url
*/ */
public static function build($url = '', $vars = '', $suffix = true, $domain = true) public static function build($url = '', $vars = '', $suffix = true, $domain = true)
{ {
// 检测是否存在路由别名
if ($aliasUrl = Route::getRouteUrl($url, $vars)) {
return $aliasUrl;
}
// 解析参数 // 解析参数
if (is_string($vars)) { if (is_string($vars)) {
// aaa=1&bbb=2 转换成数组 // aaa=1&bbb=2 转换成数组
@@ -44,30 +40,37 @@ class Url
$vars = array_merge($params, $vars); $vars = array_merge($params, $vars);
} }
// 检测路由 // 检测是否存在路由别名
$match = self::checkRoute($url, $vars, $domain, $type); if ($aliasUrl = Route::getRouteUrl($url, $vars)) {
if (false === $match) { // 存在别名定义则优先
// 路由不存在 直接解析 return $aliasUrl;
if (false !== strpos($url, '\\')) {
// 解析到类
$url = ltrim(str_replace('\\', '/', $url), '/');
} elseif (0 === strpos($url, '@')) {
// 解析到控制器
$url = substr($url, 1);
} else {
// 解析到 模块/控制器/操作
$path = explode('/', $url);
$len = count($path);
if (2 == $len) {
$url = (APP_MULTI_MODULE ? MODULE_NAME . '/' : '') . $url;
} elseif (1 == $len) {
$url = (APP_MULTI_MODULE ? MODULE_NAME . '/' : '') . CONTROLLER_NAME . '/' . $url;
}
}
} else { } else {
// 处理路由规则中的特殊内容 // 检测路由
$url = str_replace(['\\d', '$'], '', $match); $match = self::checkRoute($url, $vars, $domain);
if (false === $match) {
// 路由不存在 直接解析
if (false !== strpos($url, '\\')) {
// 解析到类
$url = ltrim(str_replace('\\', '/', $url), '/');
} elseif (0 === strpos($url, '@')) {
// 解析到控制器
$url = substr($url, 1);
} else {
// 解析到 模块/控制器/操作
$path = explode('/', $url);
$len = count($path);
if (2 == $len) {
$url = (APP_MULTI_MODULE ? MODULE_NAME . '/' : '') . $url;
} elseif (1 == $len) {
$url = (APP_MULTI_MODULE ? MODULE_NAME . '/' : '') . CONTROLLER_NAME . '/' . $url;
}
}
} else {
// 处理路由规则中的特殊内容
$url = str_replace(['\\d', '$'], '', $match);
}
} }
// 检测URL绑定 // 检测URL绑定
$type = Route::bind('type'); $type = Route::bind('type');
if ($type) { if ($type) {