diff --git a/application/common.php b/application/common.php index 32a29a18..2eea8480 100755 --- a/application/common.php +++ b/application/common.php @@ -86,15 +86,8 @@ if (!function_exists('cdnurl')) { { $url = preg_match("/^https?:\/\/(.*)/i", $url) ? $url : \think\Config::get('upload.cdnurl') . $url; if ($domain && !preg_match("/^(http:\/\/|https:\/\/)/i", $url)) { - if (is_bool($domain)) { - $public = \think\Config::get('view_replace_str.__PUBLIC__'); - $url = rtrim($public, '/') . $url; - if (!preg_match("/^(http:\/\/|https:\/\/)/i", $url)) { - $url = request()->domain() . $url; - } - } else { - $url = $domain . $url; - } + $domain = is_bool($domain) ? request()->domain() : $domain; + $url = $domain . $url; } return $url; } diff --git a/public/assets/js/require-backend.min.js b/public/assets/js/require-backend.min.js index 0def1513..23935be2 100644 --- a/public/assets/js/require-backend.min.js +++ b/public/assets/js/require-backend.min.js @@ -6181,6 +6181,13 @@ define('upload',['jquery', 'bootstrap', 'plupload', 'template'], function ($, un previewtpl: '