From 6b42f979efaf247c0207fe7177bf60b9838df6e8 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 21 Dec 2015 22:02:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E5=AD=90=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/route.php | 12 +++++++-----
 library/think/url.php   |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/library/think/route.php b/library/think/route.php
index e84b0ffc..497ab878 100644
--- a/library/think/route.php
+++ b/library/think/route.php
@@ -34,32 +34,34 @@ class Route
     // 添加URL映射规则
     public static function map($map, $route = '')
     {
-        self::setting('map', $map, $route);
+        return self::setting('map', $map, $route);
     }
 
     // 添加变量规则
     public static function pattern($name, $rule = '')
     {
-        self::setting('pattern', $name, $rule);
+        return self::setting('pattern', $name, $rule);
     }
 
     // 添加路由别名
     public static function alias($name, $rule = '')
     {
-        self::setting('alias', $name, $rule);
+        return self::setting('alias', $name, $rule);
     }
 
     // 添加子域名部署规则
     public static function domain($domain, $rule = '')
     {
-        self::setting('domain', $domain, $rule);
+        return self::setting('domain', $domain, $rule);
     }
 
     // 属性设置
-    private static function setting($var, $name, $value = '')
+    private static function setting($var, $name = '', $value = '')
     {
         if (is_array($name)) {
             self::${$var} = array_merge(self::${$var}, $name);
+        } elseif (empty($name)) {
+            return self::${$var};
         } else {
             self::${$var}[$name] = $value;
         }
diff --git a/library/think/url.php b/library/think/url.php
index 56b70b3f..ad71f311 100644
--- a/library/think/url.php
+++ b/library/think/url.php
@@ -137,8 +137,8 @@ class Url
             if (Config::get('url_domain_deploy')) {
                 // 开启子域名部署
                 $domain = 'localhost' == $domain ? 'localhost' : 'www' . strstr($_SERVER['HTTP_HOST'], '.');
-                // '子域名'=>array('项目[/分组]');
-                foreach (Config::get('url_domain_rules') as $key => $rule) {
+                // '子域名'=>['模块[/控制器/操作]'];
+                foreach (Route::domain() as $key => $rule) {
                     $rule = is_array($rule) ? $rule[0] : $rule;
                     if (false === strpos($key, '*') && 0 === strpos($url, $rule)) {
                         $domain = $key . strstr($domain, '.'); // 生成对应子域名