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] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E5=AE=8C=E5=96=84=EF=BC=8C?=
 =?UTF-8?q?=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;
                         }
                     }
                 }