From fa3a084dd6d3da34f25d0459e58ca22963ab5e5a Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 5 Jan 2016 15:59:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E7=BB=91=E5=AE=9A=E6=94=B9?=
 =?UTF-8?q?=E8=BF=9B=20=E6=94=AF=E6=8C=81=E7=BB=91=E5=AE=9A=E5=88=B0?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=88=86=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/App.php   |  6 +-----
 library/think/Route.php | 27 +++++++++++++++++----------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/library/think/App.php b/library/think/App.php
index 86bde164..d63f1a0c 100644
--- a/library/think/App.php
+++ b/library/think/App.php
@@ -406,11 +406,7 @@ class App
             $_SERVER['PATH_INFO'] = preg_replace($config['url_html_suffix'] ? '/\.(' . trim($config['url_html_suffix'], '.') . ')$/i' : '/\.' . __EXT__ . '$/i', '', __INFO__);
             $depr                 = $config['pathinfo_depr'];
             // 还原劫持后真实pathinfo
-            $path_info =
-                (defined('BIND_MODULE') ? BIND_MODULE . $depr : '') .
-                (defined('BIND_CONTROLLER') ? BIND_CONTROLLER . $depr : '') .
-                (defined('BIND_ACTION') ? BIND_ACTION . $depr : '') .
-                $_SERVER['PATH_INFO'];
+            $path_info = $_SERVER['PATH_INFO'];
 
             // 路由检测
             if (!empty($config['url_route_on'])) {
diff --git a/library/think/Route.php b/library/think/Route.php
index 00e9b6bd..a2f6a72e 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -79,7 +79,7 @@ class Route
         } else {
             if (is_array($rule)) {
                 // 检查域名部署
-                if (isset($rule['[__domain__'])) {
+                if (isset($rule['__domain__'])) {
                     self::domain($rule['__domain__']);
                     unset($rule['__domain__']);
                 }
@@ -222,14 +222,14 @@ class Route
                     $result = $rule;
                 }
                 if (0 === strpos($result, '\\')) {
-                    // 绑定到行为
-                    self::$bind = [];
-                } elseif (0 === strpos($result, '@')) {
-                    // 绑定到控制器
-                    self::$bind = [];
+                    // 绑定到类
+                    self::$bind = ['class' => $result];
+                } elseif (0 === strpos($result, '[')) {
+                    // 绑定到分组
+                    self::$bind = ['group' => substr($result, 1, -1)];
                 } else {
                     // 绑定到模块/控制器
-                    self::$bind = explode('/', $result);
+                    self::$bind = ['module' => explode('/', $result)];
                 }
             }
         }
@@ -241,13 +241,15 @@ class Route
         // 检测域名部署
         self::checkDomain();
 
-        if (!empty(self::$bind)) {
-            $url = implode('/', self::$bind) . '/' . $url;
-        }
         // 优先检测是否存在PATH_INFO
         if (empty($url)) {
             $url = '/';
         }
+
+        if (isset(self::$bind['module'])) {
+            $url = implode('/', self::$bind['module']) . '/' . $url;
+        }
+
         // 分隔符替换 确保路由定义使用统一的分隔符
         if ('/' != $depr) {
             $url = str_replace($depr, '/', $url);
@@ -265,8 +267,13 @@ class Route
             // 合并任意请求的路由规则
             $rules = array_merge(self::$rules['*'], $rules);
         }
+
         // 路由规则检测
         if (!empty($rules)) {
+            if (isset(self::$bind['group'])) {
+                // 绑定到分组
+                $rules = $rules[self::$bind['group']];
+            }
             foreach ($rules as $rule => $val) {
                 $option  = $val['option'];
                 $pattern = $val['pattern'];