From 4ceb4f4d957f3fce75cb99d4ce6db6484e57c7ad Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 22 May 2017 15:46:02 +0800
Subject: [PATCH] =?UTF-8?q?Url=E7=B1=BB=E6=94=B9=E8=BF=9B?=
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 24a2b4e3..a354b68c 100644
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -272,7 +272,7 @@ class Url
                 $domain .= '.' . $rootDomain;
             }
         }
-        return ($request->isSsl() ? 'https://' : 'http://') . $domain;
+        return ($request->isSsl() || Config::get('is_https') ? 'https://' : 'http://') . $domain;
     }
 
     // 解析URL后缀