From 193195c79fde37cbccc72a68f051bfd6899069e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Thu, 13 May 2021 16:50:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/api/Upload.php | 2 +- vendor/composer/InstalledVersions.php | 6 +- vendor/composer/autoload_classmap.php | 1 - vendor/composer/autoload_static.php | 1 - vendor/composer/installed.json | 8 +- vendor/composer/installed.php | 6 +- vendor/services.php | 2 +- .../think-library/src/extend/ImageExtend.php | 149 ------------------ 8 files changed, 12 insertions(+), 163 deletions(-) delete mode 100644 vendor/zoujingli/think-library/src/extend/ImageExtend.php diff --git a/app/admin/controller/api/Upload.php b/app/admin/controller/api/Upload.php index 4a4f22dfa..38121ab46 100644 --- a/app/admin/controller/api/Upload.php +++ b/app/admin/controller/api/Upload.php @@ -139,7 +139,7 @@ class Upload extends Controller if (in_array($extension, ['jpg', 'gif', 'png', 'bmp', 'jpeg', 'wbmp'])) { [$width, $height] = getimagesize($distname); if ($width < 1 || $height < 1 && $local->del($this->name)) { - return json(['uploaded' => false, 'error' => ['message' => '图片尺寸读取失败！']]); + return json(['uploaded' => false, 'error' => ['message' => '图片读取尺寸失败！']]); } } } else { diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php index c02381f1b..484506a15 100644 --- a/vendor/composer/InstalledVersions.php +++ b/vendor/composer/InstalledVersions.php @@ -32,7 +32,7 @@ private static $installed = array ( 'aliases' => array ( ), - 'reference' => 'dec53f9ca9b07c3d9ce31ddaf6553b7c98c22389', + 'reference' => '2c3c98457bfabfff63dacfc826d66f0847c04145', 'name' => 'zoujingli/thinkadmin', ), 'versions' => @@ -171,7 +171,7 @@ private static $installed = array ( array ( 0 => '9999999-dev', ), - 'reference' => 'aaeb9dc81e7e93b6476460a9f58e752aa1e5f3ac', + 'reference' => '066e557c25c299f7df8c36f0ea602473a4229156', ), 'zoujingli/thinkadmin' => array ( @@ -180,7 +180,7 @@ private static $installed = array ( 'aliases' => array ( ), - 'reference' => 'dec53f9ca9b07c3d9ce31ddaf6553b7c98c22389', + 'reference' => '2c3c98457bfabfff63dacfc826d66f0847c04145', ), 'zoujingli/wechat-developer' => array ( diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 7d3d152c6..8a6761f30 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -325,7 +325,6 @@ return array( 'think\\admin\\extend\\DataExtend' => $vendorDir . '/zoujingli/think-library/src/extend/DataExtend.php', 'think\\admin\\extend\\ExcelExtend' => $vendorDir . '/zoujingli/think-library/src/extend/ExcelExtend.php', 'think\\admin\\extend\\HttpExtend' => $vendorDir . '/zoujingli/think-library/src/extend/HttpExtend.php', - 'think\\admin\\extend\\ImageExtend' => $vendorDir . '/zoujingli/think-library/src/extend/ImageExtend.php', 'think\\admin\\extend\\JsonRpcClient' => $vendorDir . '/zoujingli/think-library/src/extend/JsonRpcClient.php', 'think\\admin\\extend\\JsonRpcServer' => $vendorDir . '/zoujingli/think-library/src/extend/JsonRpcServer.php', 'think\\admin\\extend\\Parsedown' => $vendorDir . '/zoujingli/think-library/src/extend/Parsedown.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index ed1b77895..c2e397792 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -454,7 +454,6 @@ class ComposerStaticInit3e3e984682c06e656fe76c5d84347fb3 'think\\admin\\extend\\DataExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/DataExtend.php', 'think\\admin\\extend\\ExcelExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/ExcelExtend.php', 'think\\admin\\extend\\HttpExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/HttpExtend.php', - 'think\\admin\\extend\\ImageExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/ImageExtend.php', 'think\\admin\\extend\\JsonRpcClient' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/JsonRpcClient.php', 'think\\admin\\extend\\JsonRpcServer' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/JsonRpcServer.php', 'think\\admin\\extend\\Parsedown' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/Parsedown.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index ec9459025..fc539d121 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -849,12 +849,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "aaeb9dc81e7e93b6476460a9f58e752aa1e5f3ac" + "reference": "066e557c25c299f7df8c36f0ea602473a4229156" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/aaeb9dc81e7e93b6476460a9f58e752aa1e5f3ac", - "reference": "aaeb9dc81e7e93b6476460a9f58e752aa1e5f3ac", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/066e557c25c299f7df8c36f0ea602473a4229156", + "reference": "066e557c25c299f7df8c36f0ea602473a4229156", "shasum": "", "mirrors": [ { @@ -871,7 +871,7 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2021-05-13T08:42:48+00:00", + "time": "2021-05-13T08:49:03+00:00", "default-branch": true, "type": "library", "extra": { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 5d16a803e..27592a01e 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -6,7 +6,7 @@ 'aliases' => array ( ), - 'reference' => 'dec53f9ca9b07c3d9ce31ddaf6553b7c98c22389', + 'reference' => '2c3c98457bfabfff63dacfc826d66f0847c04145', 'name' => 'zoujingli/thinkadmin', ), 'versions' => @@ -145,7 +145,7 @@ array ( 0 => '9999999-dev', ), - 'reference' => 'aaeb9dc81e7e93b6476460a9f58e752aa1e5f3ac', + 'reference' => '066e557c25c299f7df8c36f0ea602473a4229156', ), 'zoujingli/thinkadmin' => array ( @@ -154,7 +154,7 @@ 'aliases' => array ( ), - 'reference' => 'dec53f9ca9b07c3d9ce31ddaf6553b7c98c22389', + 'reference' => '2c3c98457bfabfff63dacfc826d66f0847c04145', ), 'zoujingli/wechat-developer' => array ( diff --git a/vendor/services.php b/vendor/services.php index cbed5daf4..c9965b1b0 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/think-library/src/extend/ImageExtend.php b/vendor/zoujingli/think-library/src/extend/ImageExtend.php deleted file mode 100644 index a0ba260de..000000000 --- a/vendor/zoujingli/think-library/src/extend/ImageExtend.php +++ /dev/null @@ -1,149 +0,0 @@ -src = $src; - $this->percent = $percent; - } - - /** - * 高清压缩图片 - * @param string $saveName 提供图片名 - * @return array - */ - public function compress(string $saveName = ''): array - { - [$status, $message] = $this->_openImage(); - if (empty($status)) { - return [0, $message]; - } elseif (empty($saveName)) { - return $this->_showImage(); - } else { - return $this->_saveImage($saveName); - } - } - - /** - * 内部：打开图片 - * @return array - */ - private function _openImage(): array - { - [$width, $height, $type] = getimagesize($this->src); - if ($width < 1 || $height < 1) return [0, '读取图片尺寸失败！']; - $this->imageinfo = ['width' => $width, 'height' => $height, 'type' => image_type_to_extension($type, false)]; - $fun = "imagecreatefrom{$this->imageinfo['type']}"; - imagealphablending($this->image = $fun($this->src), true); - return $this->_thumpImage(); - } - - /** - * 内部：操作图片 - */ - private function _thumpImage(): array - { - [$srcWidth, $srcHeight] = [$this->imageinfo['width'], $this->imageinfo['height']]; - [$newWidth, $newHeight] = [intval($srcWidth * $this->percent), intval($srcHeight * $this->percent)]; - [$srcThumps, $dstBackup] = [imagecreatetruecolor($newWidth, $newHeight), imagecreatetruecolor($srcWidth, $srcHeight)]; - - [imagealphablending($srcThumps, false), imagesavealpha($srcThumps, true)]; - [imagealphablending($dstBackup, false), imagesavealpha($dstBackup, true)]; - - imagecopyresampled($srcThumps, $this->image, 0, 0, 0, 0, $newWidth, $newHeight, $srcWidth, $srcHeight); - imagecopyresampled($dstBackup, $srcThumps, 0, 0, 0, 0, $srcWidth, $srcHeight, $newWidth, $newHeight); - - [imagedestroy($srcThumps), imagedestroy($this->image)]; - - $this->image = $dstBackup; - return [1, '图片压缩成功']; - } - - /** - * 输出图片:保存图片则用 saveImage() - * @return array - */ - private function _showImage(): array - { - header("Content-Type: image/{$this->imageinfo['type']}"); - $funcs = "image{$this->imageinfo['type']}"; - $funcs($this->image); - return [1, '图片内容输出成功']; - } - - /** - * 保存图片到硬盘： - * @param string $dstImgName - * @return array - */ - private function _saveImage(string $dstImgName): array - { - if (empty($dstImgName)) return [0, '未指定存储目标路径']; - - // 如果目标图片名有后缀就用目标图片扩展名 后缀，如果没有，则用源图的扩展名 - $allowImgs = ['.jpg', '.jpeg', '.png', '.bmp', '.wbmp', '.gif']; - [$srcExt, $dstExt] = [strrchr($this->src, "."), strrchr($dstImgName, ".")]; - if (!empty($srcExt)) $srcExt = strtolower($srcExt); - if (!empty($dstExt)) $dstExt = strtolower($dstExt); - - // 有指定目标名扩展名 - if (!empty($dstExt) && in_array($dstExt, $allowImgs)) { - $dstName = $dstImgName; - } elseif (!empty($srcExt) && in_array($srcExt, $allowImgs)) { - $dstName = $dstImgName . $srcExt; - } else { - $dstName = $dstImgName . $this->imageinfo['type']; - } - - // 图片内容转换存储 - $image = "image{$this->imageinfo['type']}"; - if ($image($this->image, $dstName)) { - return [1, '图片转换存储成功！']; - } else { - return [0, '图片转换存储失败！']; - } - } - - /** - * 销毁图片 - */ - public function __destruct() - { - if (is_resource($this->image)) { - imagedestroy($this->image); - } - } -} \ No newline at end of file