From 6561dcfcbb628f85662d28f250dd4400b958ee42 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 1 Aug 2016 22:03:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BRoute=E7=9A=84=E5=88=86?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/Route.php b/library/think/Route.php
index 66acbe79..ead06c95 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -273,10 +273,10 @@ class Route
             self::$name[$name] = [$rule, $vars];
         }
         if ($group) {
-            if (isset(self::$rules[$type][$group]) && true === self::$rules[$type][$group]) {
-                self::$rules[$type][$group] = isset(self::$rules['*'][$group]) ? self::$rules['*'][$group] : [];
+            if ('*' != $type) {
+                $option['method'] = $type;
             }
-            self::$rules[$type][$group]['rule'][] = ['rule' => $rule, 'route' => $route, 'var' => $vars, 'option' => $option, 'pattern' => $pattern];
+            self::$rules['*'][$group]['rule'][] = ['rule' => $rule, 'route' => $route, 'var' => $vars, 'option' => $option, 'pattern' => $pattern];
         } else {
             if ('*' != $type && isset(self::$rules['*'][$rule])) {
                 unset(self::$rules['*'][$rule]);
@@ -825,7 +825,7 @@ class Route
             if (!self::checkOption($option, $url, $request)) {
                 continue;
             }
-            $key = str_replace('[think]', '/', $key);
+
             if (is_array($rule)) {
                 // 分组路由
                 if (($pos = strpos($key, ':')) || ($pos = strpos($key, '<'))) {