From 920b8982f7876178b4b00e83bfaa84981d1a6674 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 15 Jan 2016 17:09:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E8=B5=84=E6=BA=90=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E6=95=B0=E6=8D=AE=E4=BF=9D=E5=AD=98=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=20=E4=BE=BF=E4=BA=8E=E8=AE=BE=E7=BD=AE=E5=92=8C=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/Route.php b/library/think/Route.php
index c9441daf..1de74931 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -25,13 +25,13 @@ class Route
 
     // REST路由操作方法定义
     private static $rest = [
-        'index'  => ['GET', ''],
-        'create' => ['GET', '/create'],
-        'read'   => ['GET', '/:id'],
-        'edit'   => ['GET', '/:id/edit'],
-        'save'   => ['POST', ''],
-        'update' => ['PUT', '/:id'],
-        'delete' => ['DELETE', '/:id'],
+        'index'  => ['GET', '', 'index'],
+        'create' => ['GET', '/create', 'create'],
+        'read'   => ['GET', '/:id', 'read'],
+        'edit'   => ['GET', '/:id/edit', 'edit'],
+        'save'   => ['POST', '', 'save'],
+        'update' => ['PUT', '/:id', 'update'],
+        'delete' => ['DELETE', '/:id', 'delete'],
     ];
 
     // URL映射规则
@@ -212,18 +212,18 @@ class Route
                 if (strpos($val[1], ':id') && isset($option['var'][$rule])) {
                     $val[1] = str_replace(':id', ':' . $option['var'][$rule], $val[1]);
                 }
-                self::register($rule . $val[1] . '$', $route . '/' . $key, $val[0], $option, $pattern);
+                self::register($rule . $val[1] . '$', $route . '/' . $val[2], $val[0], $option, $pattern);
             }
         }
     }
 
     // rest方法定义和修改
-    public static function rest($method, $resocure = '')
+    public static function rest($name, $resocure = [])
     {
-        if (is_array($method)) {
-            self::$rest = array_merge(self::$rest, $method);
+        if (is_array($name)) {
+            self::$rest = array_merge(self::$rest, $name);
         } else {
-            self::$rest[$method] = $resource;
+            self::$rest[$name] = $resource;
         }
     }