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

改进Route类的分组参数

Browse Source
This commit is contained in:
thinkphp
2016-06-16 18:23:14 +08:00
parent bf19ff0d52
commit bbb53484bc
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Route.php
View File

@@ -211,8 +211,6 @@ class Route
public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = [], $group = '') public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = [], $group = '')
{ {
$group = $group ?: self::$group; $group = $group ?: self::$group;
$option = $option ? array_merge(self::$option, $option) : self::$option;
$type = strtoupper($type); $type = strtoupper($type);
if (strpos($type, '|')) { if (strpos($type, '|')) {
foreach (explode('|', $type) as $val) { foreach (explode('|', $type) as $val) {
@@ -665,7 +663,7 @@ class Route
if (!empty(self::$rules['*'])) { if (!empty(self::$rules['*'])) {
// 合并任意请求的路由规则 // 合并任意请求的路由规则
$rules = array_merge(self::$rules['*'], $rules); $rules = array_merge_recursive(self::$rules['*'], $rules);
} }
// 检测域名部署 // 检测域名部署
@@ -721,7 +719,7 @@ class Route
$pattern = array_merge($pattern, isset($route[2]) ? $route[2] : []); $pattern = array_merge($pattern, isset($route[2]) ? $route[2] : []);
$route = $route[0]; $route = $route[0];
$option = array_merge($option, $option1); $option = array_merge($option, $option1);
} }dump($option);
$result = self::checkRule($key, $route, $url, $pattern, $option); $result = self::checkRule($key, $route, $url, $pattern, $option);
if (false !== $result) { if (false !== $result) {
$request->route(['rule' => $key, 'route' => $route, 'pattern' => $pattern, 'option' => $option]); $request->route(['rule' => $key, 'route' => $route, 'pattern' => $pattern, 'option' => $option]);