From 58c59ec23efc125be76778bf071720567e63249c Mon Sep 17 00:00:00 2001
From: shuipf <admin@abc3210.com>
Date: Tue, 26 Apr 2016 09:45:16 +0800
Subject: [PATCH 1/3] Update Url.php
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改parseDomain方法，判断是否有配置url_domain_root
---
 library/think/Url.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/library/think/Url.php b/library/think/Url.php
index c6c7fbfc..3b3346b5 100644
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -148,13 +148,18 @@ class Url
                 // 自动判断域名
                 $domain = $_SERVER['HTTP_HOST'];
                 if (Config::get('url_domain_deploy')) {
-                    // 开启子域名部署
-                    $domain = $_SERVER['HTTP_HOST'];
+                    // 根域名
+                    $urlDomainRoot = Config::get('url_domain_root');
                     foreach (Route::domain() as $key => $rule) {
                         $rule = is_array($rule) ? $rule[0] : $rule;
                         if (false === strpos($key, '*') && 0 === strpos($url, $rule)) {
                             $url    = ltrim($url, $rule);
-                            $domain = $key . strstr($domain, '.'); // 生成对应子域名
+                            // 生成对应子域名
+                            if(!empty($urlDomainRoot)){
+                                $domain = $key . strstr($domain, '.');
+                            }else{
+                                $domain = $key;
+                            }
                             break;
                         }
                     }

From 3eab80b0160448dad226c977c1d7b3e01a424ae6 Mon Sep 17 00:00:00 2001
From: shuipf <admin@abc3210.com>
Date: Tue, 26 Apr 2016 10:08:35 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=B9*=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Url.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/library/think/Url.php b/library/think/Url.php
index 3b3346b5..200812e9 100644
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -154,13 +154,18 @@ class Url
                         $rule = is_array($rule) ? $rule[0] : $rule;
                         if (false === strpos($key, '*') && 0 === strpos($url, $rule)) {
                             $url    = ltrim($url, $rule);
+                            $domain = $key;
                             // 生成对应子域名
                             if(!empty($urlDomainRoot)){
-                                $domain = $key . strstr($domain, '.');
-                            }else{
-                                $domain = $key;
+                                $domain .= $urlDomainRoot;
                             }
                             break;
+                        }else if(false !== strpos($key, '*')){
+                            $domain = str_replace('*',strstr($domain,'.',true),$key);
+                            if(!empty($urlDomainRoot)){
+                                $domain .= $urlDomainRoot;
+                            }
+                            echo $domain;exit;
                         }
                     }
                 }

From d6d6dbff436d74746c0134ad8ea09b964a6fbf4c Mon Sep 17 00:00:00 2001
From: shuipf <admin@abc3210.com>
Date: Tue, 26 Apr 2016 10:10:45 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Url.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/think/Url.php b/library/think/Url.php
index 200812e9..d4738bc5 100644
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -165,7 +165,7 @@ class Url
                             if(!empty($urlDomainRoot)){
                                 $domain .= $urlDomainRoot;
                             }
-                            echo $domain;exit;
+                            break;
                         }
                     }
                 }