From 3ac8a5d4a42b356d4e6439adba61943cc6f0a80f Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 15 Jan 2016 12:32:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B5=84=E6=BA=90=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E5=B5=8C=E5=A5=97=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Route.php | 44 +++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/library/think/Route.php b/library/think/Route.php
index 9b5da48f..5dfe6d97 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -21,9 +21,9 @@ class Route
         'DELETE' => [],
         'HEAD'   => [],
         '*'      => [],
-        'REST'   => [],
     ];
 
+    // REST路由操作方法定义
     private static $rest = [
         'index'  => ['GET', ''],
         'create' => ['GET', '/create'],
@@ -33,6 +33,7 @@ class Route
         'update' => ['PUT', '/:id'],
         'delete' => ['DELETE', '/:id'],
     ];
+
     // URL映射规则
     private static $map = [];
     // 子域名部署规则
@@ -187,26 +188,32 @@ class Route
         if (is_array($rule)) {
             foreach ($rule as $key => $val) {
                 if (is_array($val)) {
-                    $val = array_pad($val, 3, []);
-                    self::resource($key, $val[0], $val[1], $val[2]);
-                } else {
-                    self::resource($key, $val, $option, $pattern);
+                    list($val, $option, $pattern) = array_pad($val, 3, []);
                 }
+                self::resource($key, $val, $option, $pattern);
             }
         } else {
             if (strpos($rule, '.')) {
                 // 注册嵌套资源路由
-                list($rule1, $rule2) = explode('.', $rule);
-                self::get($rule1 . '/:' . $rule1 . '_id/' . $rule2 . '/:' . $rule2 . '_id$', $route . '/read', $option, $pattern);
-            } else {
-                // 注册资源路由
-                foreach (self::$rest as $key => $val) {
-                    if ((isset($option['only']) && !in_array($key, $option['only']))
-                        || (isset($option['except']) && in_array($key, $option['except']))) {
-                        continue;
+                $array = explode('.', $rule);
+                $last  = array_pop($array);
+                $item  = [];
+                foreach ($array as $val) {
+                    if (isset($option['rule'][$val])) {
+                        $item[] = $val . '/:' . $option['rule'][$val];
+                    } else {
+                        $item[] = $val . '/:' . $val . '_id';
                     }
-                    self::register($rule . $val[1] . '$', $route . '/' . $key, $val[0], $option, $pattern);
                 }
+                $rule = implode('/', $item) . '/' . $last;
+            }
+            // 注册资源路由
+            foreach (self::$rest as $key => $val) {
+                if ((isset($option['only']) && !in_array($key, $option['only']))
+                    || (isset($option['except']) && in_array($key, $option['except']))) {
+                    continue;
+                }
+                self::register($rule . $val[1] . '$', $route . '/' . $key, $val[0], $option, $pattern);
             }
         }
     }
@@ -251,11 +258,10 @@ class Route
                 }
                 // 子域名配置
                 if (!empty($domain)) {
-                    // 记录子域名
-                    self::$subDomain = join('.', $domain);
-                    // 二级域名
-                    $subDomain = implode('.', $domain);
-                    $domain2   = array_pop($domain); 
+                    // 当前子域名
+                    $subDomain       = implode('.', $domain);
+                    self::$subDomain = $subDomain;
+                    $domain2         = array_pop($domain);
                     if ($domain) {
                         // 存在三级域名
                         $domain3 = array_pop($domain);