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

改进Url类

Browse Source
This commit is contained in:
thinkphp
2016-01-09 14:13:51 +08:00
parent 77c37ef537
commit 87c8f3f634
2 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Route.php
View File

@@ -153,7 +153,7 @@ class Route
} }
// 注册get请求的路由规则 // 注册get请求的路由规则
public static function get($rule, $route = '', $option = [], $pattern = []) public static function get($rule = '', $route = '', $option = [], $pattern = [])
{ {
if ('' == $rule) { if ('' == $rule) {
// 获取路由定义 // 获取路由定义
@@ -163,7 +163,7 @@ class Route
} }
// 注册post请求的路由规则 // 注册post请求的路由规则
public static function post($rule, $route = '', $option = [], $pattern = []) public static function post($rule = '', $route = '', $option = [], $pattern = [])
{ {
if ('' == $rule) { if ('' == $rule) {
// 获取路由定义 // 获取路由定义
@@ -173,7 +173,7 @@ class Route
} }
// 注册put请求的路由规则 // 注册put请求的路由规则
public static function put($rule, $route = '', $option = [], $pattern = []) public static function put($rule = '', $route = '', $option = [], $pattern = [])
{ {
if ('' == $rule) { if ('' == $rule) {
// 获取路由定义 // 获取路由定义
@@ -183,7 +183,7 @@ class Route
} }
// 注册delete请求的路由规则 // 注册delete请求的路由规则
public static function delete($rule, $route = '', $option = [], $pattern = []) public static function delete($rule = '', $route = '', $option = [], $pattern = [])
{ {
if ('' == $rule) { if ('' == $rule) {
// 获取路由定义 // 获取路由定义

38
library/think/Url.php
View File

@@ -48,23 +48,38 @@ class Url
$match = self::checkRoute($url, $vars, $domain, $type); $match = self::checkRoute($url, $vars, $domain, $type);
if (false === $match) { if (false === $match) {
// 路由不存在 直接解析 // 路由不存在 直接解析
// 检测URL绑定
$type = Route::bind('type');
if ($type) {
$bind = Route::bind($type);
if (0 === strpos($url, $bind)) {
$url = strstr($url, $bind, true);
}
}
if (false !== strpos($url, '\\')) { if (false !== strpos($url, '\\')) {
// 解析到类
$url = ltrim(str_replace('\\', '/', $url), '/'); $url = ltrim(str_replace('\\', '/', $url), '/');
} elseif (0 === strpos($url, '@')) { } elseif (0 === strpos($url, '@')) {
// 解析到控制器
$url = substr($url, 1); $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); $url = str_replace(['\\d', '$'], '', $match);
} }
// 检测URL绑定
$type = Route::bind('type');
if ($type) {
$bind = Route::bind($type);
if (0 === strpos($url, $bind)) {
$url = substr($url, strlen($bind) + 1);
}
}
// 还原URL分隔符
$depr = Config::get('pathinfo_depr');
$url = str_replace('/', $depr, $url);
// 替换变量
$params = []; $params = [];
foreach ($vars as $key => $val) { foreach ($vars as $key => $val) {
if (false !== strpos($url, '[:' . $key . ']')) { if (false !== strpos($url, '[:' . $key . ']')) {
@@ -75,10 +90,8 @@ class Url
$params[$key] = $val; $params[$key] = $val;
} }
} }
// URL组装 // URL组装
$depr = Config::get('pathinfo_depr'); $url = Config::get('base_url') . '/' . $url;
$url = Config::get('base_url') . '/' . $url;
// URL后缀 // URL后缀
$suffix = self::parseSuffix($suffix); $suffix = self::parseSuffix($suffix);
// 参数组装 // 参数组装
@@ -99,9 +112,6 @@ class Url
$url .= $suffix; $url .= $suffix;
} }
if (!empty($anchor)) {
$url .= '#' . $anchor;
}
if ($domain) { if ($domain) {
if (true === $domain) { if (true === $domain) {
$domain = $_SERVER['HTTP_HOST']; $domain = $_SERVER['HTTP_HOST'];