From 58feddd930e2c4594e8c2172aea441a1b0bc1d8f Mon Sep 17 00:00:00 2001 From: Anyon Date: Wed, 8 Jan 2020 15:50:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/view/api/upload.js | 2 +- composer.lock | 8 ++++---- vendor/composer/autoload_classmap.php | 1 + vendor/composer/autoload_static.php | 1 + vendor/composer/installed.json | 8 ++++---- vendor/services.php | 2 +- vendor/zoujingli/think-library/src/Storage.php | 9 ++++----- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/admin/view/api/upload.js b/app/admin/view/api/upload.js index e22e06053..30427a57e 100644 --- a/app/admin/view/api/upload.js +++ b/app/admin/view/api/upload.js @@ -103,7 +103,7 @@ define(['md5'], function (SparkMD5, allowExtsMimes) { function setFileXdata(file, xmd5) { file.xmd5 = xmd5; - file.xkey = file.xmd5.substr(0, 16) + '/' + file.xmd5.substr(16, 16) + '.' + file.xext; + file.xkey = file.xmd5.substr(0, 2) + '/' + file.xmd5.substr(2, 30) + '.' + file.xext; delete file.chunk_idx; delete file.chunk_size; delete file.chunk_total; diff --git a/composer.lock b/composer.lock index f429ce6e0..f5a840d40 100644 --- a/composer.lock +++ b/composer.lock @@ -909,12 +909,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "8c49f31c04ed4bf34710e43d4115aeba37bbcfaa" + "reference": "cd754db0e9921b7aa6cf617887cdc8b122fe8c46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8c49f31c04ed4bf34710e43d4115aeba37bbcfaa", - "reference": "8c49f31c04ed4bf34710e43d4115aeba37bbcfaa", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/cd754db0e9921b7aa6cf617887cdc8b122fe8c46", + "reference": "cd754db0e9921b7aa6cf617887cdc8b122fe8c46", "shasum": "", "mirrors": [ { @@ -958,7 +958,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2020-01-08T02:36:41+00:00" + "time": "2020-01-08T07:48:20+00:00" }, { "name": "zoujingli/wechat-developer", diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index a46b6aa10..9950c50cb 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -203,6 +203,7 @@ return array( 'app\\wechat\\controller\\Menu' => $baseDir . '/app/wechat/controller/Menu.php', 'app\\wechat\\controller\\News' => $baseDir . '/app/wechat/controller/News.php', 'app\\wechat\\controller\\api\\Js' => $baseDir . '/app/wechat/controller/api/Js.php', + 'app\\wechat\\controller\\api\\Login' => $baseDir . '/app/wechat/controller/api/Login.php', 'app\\wechat\\controller\\api\\Push' => $baseDir . '/app/wechat/controller/api/Push.php', 'app\\wechat\\controller\\api\\Review' => $baseDir . '/app/wechat/controller/api/Review.php', 'app\\wechat\\controller\\api\\Test' => $baseDir . '/app/wechat/controller/api/Test.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index af778f86d..2f10b1566 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -336,6 +336,7 @@ class ComposerStaticInit2b1316f37dd8fe5c4c25969e0b842e8e 'app\\wechat\\controller\\Menu' => __DIR__ . '/../..' . '/app/wechat/controller/Menu.php', 'app\\wechat\\controller\\News' => __DIR__ . '/../..' . '/app/wechat/controller/News.php', 'app\\wechat\\controller\\api\\Js' => __DIR__ . '/../..' . '/app/wechat/controller/api/Js.php', + 'app\\wechat\\controller\\api\\Login' => __DIR__ . '/../..' . '/app/wechat/controller/api/Login.php', 'app\\wechat\\controller\\api\\Push' => __DIR__ . '/../..' . '/app/wechat/controller/api/Push.php', 'app\\wechat\\controller\\api\\Review' => __DIR__ . '/../..' . '/app/wechat/controller/api/Review.php', 'app\\wechat\\controller\\api\\Test' => __DIR__ . '/../..' . '/app/wechat/controller/api/Test.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index b6cd35991..69d9600c6 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": "8c49f31c04ed4bf34710e43d4115aeba37bbcfaa" + "reference": "cd754db0e9921b7aa6cf617887cdc8b122fe8c46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8c49f31c04ed4bf34710e43d4115aeba37bbcfaa", - "reference": "8c49f31c04ed4bf34710e43d4115aeba37bbcfaa", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/cd754db0e9921b7aa6cf617887cdc8b122fe8c46", + "reference": "cd754db0e9921b7aa6cf617887cdc8b122fe8c46", "shasum": "", "mirrors": [ { @@ -956,7 +956,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2020-01-08T02:36:41+00:00", + "time": "2020-01-08T07:48:20+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 2b72210b0..7ca1ca4a2 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.php b/vendor/zoujingli/think-library/src/Storage.php index 5313778bc..7db19dde4 100644 --- a/vendor/zoujingli/think-library/src/Storage.php +++ b/vendor/zoujingli/think-library/src/Storage.php @@ -112,11 +112,10 @@ abstract class Storage */ public static function name($url, $ext = '', $pre = '', $fun = 'md5'): string { - empty($ext) && $ext = pathinfo($url, 4); - empty($ext) || $ext = trim($ext, '.\\/'); - empty($pre) || $pre = trim($pre, '.\\/'); - $splits = array_merge([$pre], str_split($fun($url), 16)); - return trim(join('/', $splits), '/') . '.' . strtolower($ext ? $ext : 'tmp'); + if (empty($ext)) $ext = pathinfo($url, 4); + list($xmd, $ext) = [$fun($url), trim($ext, '.\\/')]; + $attr = [trim($pre, '.\\/'), substr($xmd, 0, 2), substr($xmd, 2, 30)]; + return trim(join('/', $attr), '/') . '.' . strtolower($ext ? $ext : 'tmp'); } /**