From 26270b2ca9daff4b9cec81c82572ae3c9e15dc00 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 20 May 2016 18:03:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BRoute=E7=B1=BB=EF=BC=8C?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=88=86=E7=BB=84=E5=90=8D=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Route.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/library/think/Route.php b/library/think/Route.php
index 53ff4580..125d024b 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -468,7 +468,14 @@ class Route
 
                 if (!empty($val['routes'])) {
                     // 分组路由
-                    if (0 !== strpos($url, $rule)) {
+                    if ($pos = strpos($rule, ':')) {
+                        $str = substr($rule, 0, $pos);
+                    } elseif ($pos = strpos($rule, '<')) {
+                        $str = substr($rule, 0, $pos);
+                    } else {
+                        $str = $rule;
+                    }
+                    if (0 !== strpos($url, $str)) {
                         continue;
                     }
                     // 匹配到路由分组