diff --git a/app/admin/view/config/storage-alioss.html b/app/admin/view/config/storage-alioss.html
index 1e9ba041f..59b34b756 100644
--- a/app/admin/view/config/storage-alioss.html
+++ b/app/admin/view/config/storage-alioss.html
@@ -2,7 +2,7 @@
-
文件将上传到阿里云 OSS 存储,需要配置 OSS 公开访问及跨域策略。
+
文件将上传到阿里云 OSS 存储,需要配置 OSS 公开访问及跨域策略
直传需要配置跨域规则,设置来源为 *,允许 Methods 为 POST,允许 Headers 为 *
@@ -12,7 +12,7 @@
@@ -30,7 +30,7 @@
{/if}
{/foreach}
- 阿里云OSS存储访问协议,其中 https 需要配置证书才能使用,auto 为相对协议。
+ 阿里云OSS存储访问协议,其中 https 需要配置证书才能使用(auto 为相对协议)
@@ -48,7 +48,7 @@
{/if}
{/foreach}
- 阿里云OSS存储空间所在区域,需要严格对应储存所在区域才能上传文件。
+ 阿里云OSS存储空间所在区域,需要严格对应储存所在区域才能上传文件
@@ -78,7 +78,7 @@
@@ -88,7 +88,7 @@
diff --git a/app/admin/view/config/storage-local.html b/app/admin/view/config/storage-local.html
index 1a291b31f..615e7104a 100644
--- a/app/admin/view/config/storage-local.html
+++ b/app/admin/view/config/storage-local.html
@@ -16,6 +16,24 @@
+
+
diff --git a/app/admin/view/config/storage-qiniu.html b/app/admin/view/config/storage-qiniu.html
index 1e04dea58..35fb27eab 100644
--- a/app/admin/view/config/storage-qiniu.html
+++ b/app/admin/view/config/storage-qiniu.html
@@ -2,7 +2,7 @@
-
文件将上传到七牛云存储,对象存储需要配置为公开访问的 Bucket 空间。
+
文件将上传到七牛云存储,对象存储需要配置为公开访问的 Bucket 空间
完成实名认证后可获得10G免费存储空间哦!
我要免费申请
@@ -12,7 +12,7 @@
@@ -30,7 +30,7 @@
{/if}
{/foreach}
- 七牛云存储访问协议,其中 https 需要配置证书才能使用,auto 为相对协议。
+ 七牛云存储访问协议,其中 https 需要配置证书才能使用(auto 为相对协议)
@@ -49,7 +49,7 @@
{$area}
{/foreach}
- 七牛云存储空间所在区域,需要严格对应储存所在区域才能上传文件。
+ 七牛云存储空间所在区域,需要严格对应储存所在区域才能上传文件
@@ -79,7 +79,7 @@
@@ -89,7 +89,7 @@
diff --git a/app/admin/view/full.html b/app/admin/view/full.html
index a5a7ccb12..9d44100fd 100644
--- a/app/admin/view/full.html
+++ b/app/admin/view/full.html
@@ -2,7 +2,7 @@
-
+ {block name="title"}{$title|default=''}{if !empty($title)} · {/if}{:sysconf('site_name')}{/block}
diff --git a/composer.lock b/composer.lock
index b10b6edbe..e99ccad91 100644
--- a/composer.lock
+++ b/composer.lock
@@ -909,12 +909,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
- "reference": "7d1a3dfdeab8aa4868dea3c1407170680127c412"
+ "reference": "373ab0c31fc4247e9f71ecb86bf5f1e6e0dadea5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/7d1a3dfdeab8aa4868dea3c1407170680127c412",
- "reference": "7d1a3dfdeab8aa4868dea3c1407170680127c412",
+ "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/373ab0c31fc4247e9f71ecb86bf5f1e6e0dadea5",
+ "reference": "373ab0c31fc4247e9f71ecb86bf5f1e6e0dadea5",
"shasum": "",
"mirrors": [
{
@@ -958,7 +958,7 @@
],
"description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top",
- "time": "2020-01-10T04:15:10+00:00"
+ "time": "2020-01-11T07:36:56+00:00"
},
{
"name": "zoujingli/wechat-developer",
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 27a3c19d0..963b38712 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -935,12 +935,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
- "reference": "7d1a3dfdeab8aa4868dea3c1407170680127c412"
+ "reference": "373ab0c31fc4247e9f71ecb86bf5f1e6e0dadea5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/7d1a3dfdeab8aa4868dea3c1407170680127c412",
- "reference": "7d1a3dfdeab8aa4868dea3c1407170680127c412",
+ "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/373ab0c31fc4247e9f71ecb86bf5f1e6e0dadea5",
+ "reference": "373ab0c31fc4247e9f71ecb86bf5f1e6e0dadea5",
"shasum": "",
"mirrors": [
{
@@ -956,7 +956,7 @@
"ext-json": "*",
"topthink/framework": "^6.0"
},
- "time": "2020-01-10T04:15:10+00:00",
+ "time": "2020-01-11T07:36:56+00:00",
"type": "library",
"extra": {
"think": {
diff --git a/vendor/services.php b/vendor/services.php
index 289d8337e..7f6757c77 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
'think\\app\\Service',
diff --git a/vendor/zoujingli/think-library/src/storage/LocalStorage.php b/vendor/zoujingli/think-library/src/storage/LocalStorage.php
index 47ffacdb2..1009e7606 100644
--- a/vendor/zoujingli/think-library/src/storage/LocalStorage.php
+++ b/vendor/zoujingli/think-library/src/storage/LocalStorage.php
@@ -24,13 +24,28 @@ use think\admin\Storage;
*/
class LocalStorage extends Storage
{
+
/**
* 初始化入口
* @return LocalStorage
+ * @throws \think\db\exception\DataNotFoundException
+ * @throws \think\db\exception\DbException
+ * @throws \think\db\exception\ModelNotFoundException
*/
protected function initialize(): Storage
{
- $this->prefix = dirname($this->app->request->basefile(true));
+ // 计算链接前缀
+ $type = strtolower(sysconf('storage.local_http_protocol'));
+ if ($type === 'path') {
+ $file = $this->app->request->baseFile(false);
+ $this->prefix = dirname(strtr($file, '\\', '/'));
+ } else {
+ $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 $this;
}