ComposerUpdate

app/admin/view/config/storage-local.html

@@ -26,6 +26,16 @@
             </div>
         </div>
 
+        <div class="layui-form-item">
+            <label class="layui-form-label" for="storage.local_http_domain">
+                <span class="color-green font-w7">访问域名</span><br><span class="nowrap color-desc">Domain</span>
+            </label>
+            <div class="layui-input-block">
+                <input id="storage.local_http_domain" type="text" name="storage.local_http_domain" value="{:sysconf('storage.local_http_domain')}" placeholder="请输入上传后的访问域名 (非必填项)" class="layui-input">
+                <p class="help-block">填写上传后的访问域名（不指定时根据当前访问地址自动计算），如：static.ctolog.com</p>
+            </div>
+        </div>
+
         <div class="hr-line-dashed margin-left-40"></div>
         <input type="hidden" name="storage.type" value="local">
 

composer.lock

@@ -879,12 +879,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/zoujingli/ThinkLibrary.git",
-                "reference": "c5ae2601c499d95776061aeda087478f7912c2c5"
+                "reference": "54dfd26bd7de6bb86d233f4bb03b80d3b475ce7f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c5ae2601c499d95776061aeda087478f7912c2c5",
+                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/54dfd26bd7de6bb86d233f4bb03b80d3b475ce7f",
-                "reference": "c5ae2601c499d95776061aeda087478f7912c2c5",
+                "reference": "54dfd26bd7de6bb86d233f4bb03b80d3b475ce7f",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -928,7 +928,7 @@
             ],
             "description": "ThinkPHP v6.0 Development Library",
             "homepage": "http://framework.thinkadmin.top",
-            "time": "2020-07-30T09:50:41+00:00"
+            "time": "2020-07-30T10:54:48+00:00"
         },
         {
             "name": "zoujingli/wechat-developer",

vendor/composer/installed.json

@@ -903,12 +903,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "c5ae2601c499d95776061aeda087478f7912c2c5"
+            "reference": "54dfd26bd7de6bb86d233f4bb03b80d3b475ce7f"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c5ae2601c499d95776061aeda087478f7912c2c5",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/54dfd26bd7de6bb86d233f4bb03b80d3b475ce7f",
-            "reference": "c5ae2601c499d95776061aeda087478f7912c2c5",
+            "reference": "54dfd26bd7de6bb86d233f4bb03b80d3b475ce7f",
             "shasum": "",
             "mirrors": [
                 {
@@ -924,7 +924,7 @@
             "ext-json": "*",
             "topthink/framework": "^6.0"
         },
-        "time": "2020-07-30T09:50:41+00:00",
+        "time": "2020-07-30T10:54:48+00:00",
         "type": "library",
         "extra": {
             "think": {

vendor/services.php

@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-07-30 17:53:29
+// This file is automatically generated at:2020-07-30 19:00:19
 declare (strict_types = 1);
 return array (
   0 => 'think\\admin\\Library',

vendor/zoujingli/think-library/src/storage/AliossStorage.php

@@ -51,7 +51,7 @@ class AliossStorage extends Storage
 
     /**
      * 初始化入口
-     * @return Storage
+     * @return static
      * @throws \think\admin\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException

vendor/zoujingli/think-library/src/storage/LocalStorage.php

@@ -27,26 +27,22 @@ class LocalStorage extends Storage
 
     /**
      * 初始化入口
-     * @return Storage
+     * @return static
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
     protected function initialize()
     {
-        // 计算链接前缀
         $type = strtolower(sysconf('storage.local_http_protocol'));
-        if ($type === 'path') {
+        if ($type === 'follow') $type = $this->app->request->scheme();
-            $file = $this->app->request->baseFile(false);
+        $this->prefix = trim(dirname($this->app->request->baseFile(false)), '\\/');
-            $this->prefix = trim(dirname($file), '\\/');
+        if ($type !== 'path') {
-        } else {
+            $domain = sysconf('storage.local_http_domain') ?: $this->app->request->host();
-            $this->prefix = dirname($this->app->request->basefile(true));
-            list(, $domain) = explode('://', strtr($this->prefix, '\\', '/'));
             if ($type === 'auto') $this->prefix = "//{$domain}";
             elseif ($type === 'http') $this->prefix = "http://{$domain}";
             elseif ($type === 'https') $this->prefix = "https://{$domain}";
         }
-        // 初始化配置并返回当前实例
         return parent::initialize();
     }
 

vendor/zoujingli/think-library/src/storage/QiniuStorage.php

@@ -31,7 +31,7 @@ class QiniuStorage extends Storage
 
     /**
      * 初始化入口
-     * @return Storage
+     * @return static
      * @throws \think\admin\Exception
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException