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

改进域名绑定的参数传入解析

Browse Source
This commit is contained in:
thinkphp
2016-01-07 15:54:46 +08:00
parent 8dd47fb41d
commit c5affe33ea
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
library/think/Route.php
View File

@@ -217,7 +217,6 @@ class Route
if (!empty($rule)) { if (!empty($rule)) {
// 子域名部署规则 // 子域名部署规则
// '子域名'=>'模块[/控制器/操作]' // '子域名'=>'模块[/控制器/操作]'
// '子域名'=>['模块[/控制器/操作]','var1=a&var2=b&var3=*'];
// '子域名'=>'模块[/控制器/操作]?var1=a&var2=b&var3=*'; // '子域名'=>'模块[/控制器/操作]?var1=a&var2=b&var3=*';
if ($rule instanceof \Closure) { if ($rule instanceof \Closure) {
// 执行闭包 // 执行闭包
@@ -225,11 +224,12 @@ class Route
self::$bind = $reflect->invokeArgs([]); self::$bind = $reflect->invokeArgs([]);
return; return;
} }
if (is_array($rule)) {
$result = $rule[0]; if (strpos($rule, '?')) {
if (isset($rule[1])) { // 传入其它参数
// 传入参数 $array = parse_url($rule);
parse_str($rule[1], $params); $result = $array['path'];
parse_str($array['query'], $params);
if (isset($panDomain)) { if (isset($panDomain)) {
$pos = array_search('*', $params); $pos = array_search('*', $params);
if (false !== $pos) { if (false !== $pos) {
@@ -238,17 +238,10 @@ class Route
} }
} }
$_GET = array_merge($_GET, $params); $_GET = array_merge($_GET, $params);
}
} else {
if (strpos($rule, '?')) {
$result = strstr($rule, '?', true);
$query = strstr($rule, '?');
parse_str(substr($query, 1), $params);
$_GET = array_merge($_GET, $params);
} else { } else {
$result = $rule; $result = $rule;
} }
}
if (0 === strpos($result, '\\')) { if (0 === strpos($result, '\\')) {
// 绑定到命名空间 例如 \app\index\behavior // 绑定到命名空间 例如 \app\index\behavior
self::$bind = ['type' => 'namespace', 'namespace' => $result]; self::$bind = ['type' => 'namespace', 'namespace' => $result];