From c246f2dbf39b83848ab9e9d8f2378b8e19120f49 Mon Sep 17 00:00:00 2001
From: "363126523@qq.com" <363126523@qq.com>
Date: Fri, 4 Jun 2021 11:55:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9C=A8=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E5=AD=98=E5=82=A8,=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8$domain=E5=8F=82=E6=95=B0=E4=B8=BAhttp=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E6=97=B6,=E8=BD=AC=E6=8D=A2=E5=90=8E=E7=9A=84url?=
 =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/common.php b/application/common.php
index fa160030b..27614e5f5 100755
--- a/application/common.php
+++ b/application/common.php
@@ -86,8 +86,10 @@ if (!function_exists('cdnurl')) {
     function cdnurl($url, $domain = false)
     {
         $regex = "/^((?:[a-z]+:)?\/\/|data:image\/)(.*)/i";
+        $regexDomain = "/^(?:[a-z]+:)?\/\/(.*)/i";
         $cdnurl = \think\Config::get('upload.cdnurl');
-        $url = preg_match($regex, $url) || ($cdnurl && stripos($url, $cdnurl) === 0) ? $url : $cdnurl . $url;
+        $url = !is_bool($domain) && preg_match($regexDomain, $domain) ? $domain . $url  : $url;
+        $url = preg_match($regex, $url) || ($cdnurl && stripos($url, $cdnurl) === 0) || $domain === false ? $url : $cdnurl . $url;
         if ($domain && !preg_match($regex, $url)) {
             $domain = is_bool($domain) ? request()->domain() : $domain;
             $url = $domain . $url;
-- 
Gitee