From 02cf4ac8c058d88254e9992ddb88bba0dc657348 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 11 Jan 2016 10:48:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BUrl=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E7=B1=BB=E5=AF=B9=E5=9F=9F=E5=90=8D=E9=83=A8=E7=BD=B2=E7=9A=84?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Url.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/library/think/Url.php b/library/think/Url.php
index 1a12ab06..2b0f1d0f 100644
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -101,8 +101,7 @@ class Url
                 $params[$key] = $val;
             }
         }
-        // URL组装
-        $url = Config::get('base_url') . '/' . $url;
+
         // URL后缀
         $suffix = self::parseSuffix($suffix);
         // 参数组装
@@ -134,14 +133,17 @@ class Url
                         $rule = is_array($rule) ? $rule[0] : $rule;
                         if (false === strpos($key, '*') && 0 === strpos($url, $rule)) {
                             $domain = $key . strstr($domain, '.'); // 生成对应子域名
-                            $url    = substr_replace($url, '', 0, strlen($rule));
                             break;
                         }
                     }
                 }
             }
-            $url = (self::isSsl() ? 'https://' : 'http://') . $domain . $url;
+            $domain = (self::isSsl() ? 'https://' : 'http://') . $domain;
+        } else {
+            $domain = '';
         }
+        // URL组装
+        $url = $domain . Config::get('base_url') . '/' . $url;
         return $url;
     }