From 3923c2dbb59ce6c8fcba538f945f59f25c97aaee Mon Sep 17 00:00:00 2001 From: thinkphp Date: Mon, 8 Aug 2016 16:56:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B7=AF=E7=94=B1=E5=88=86?= =?UTF-8?q?=E7=BB=84=E7=9A=84=E5=AE=8C=E5=85=A8=E5=8C=B9=E9=85=8D=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/Route.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/library/think/Route.php b/library/think/Route.php index 2ada5acf..95904ee0 100644 --- a/library/think/Route.php +++ b/library/think/Route.php @@ -401,8 +401,16 @@ class Route } else { $route = $val; } + + $options = isset($option1) ? $option1 : $option; + $patterns = isset($pattern1) ? $pattern1 : $pattern; + if ('$' == substr($key, -1, 1)) { + // 是否完整匹配 + $options['complete_match'] = true; + $key = substr($key, 0, -1); + } $vars = self::parseVar($key); - $item[] = ['rule' => $key, 'route' => $route, 'var' => $vars, 'option' => isset($option1) ? $option1 : $option, 'pattern' => isset($pattern1) ? $pattern1 : $pattern]; + $item[] = ['rule' => $key, 'route' => $route, 'var' => $vars, 'option' => $options, 'pattern' => $patterns]; } self::$rules['*'][$name] = ['rule' => $item, 'route' => '', 'var' => [], 'option' => $option, 'pattern' => $pattern]; }