From d4d93c2c178c7fd9fc901a467d81aea4987887e1 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Tue, 26 Feb 2019 14:04:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/config/app.php | 3 + application/admin/controller/Ueditor.php | 9 +- extend/base/Uploader.php | 126 ++++++++++++++++++++--- 3 files changed, 120 insertions(+), 18 deletions(-) diff --git a/application/admin/config/app.php b/application/admin/config/app.php index 809c8b8b4..fb4bd7fd1 100755 --- a/application/admin/config/app.php +++ b/application/admin/config/app.php @@ -75,6 +75,9 @@ return [ // 上传大小限制，单位B 'scrawlMaxSize' => MyC('home_max_limit_image', 2048000, true), + // 上传图片格式显示 + 'scrawlAllowFiles' => ['.png', '.jpg', '.jpeg', '.gif', '.bmp'], + // 图片访问路径前缀 'scrawlUrlPrefix' => '', diff --git a/application/admin/controller/Ueditor.php b/application/admin/controller/Ueditor.php index 5bcc30649..85460bd80 100755 --- a/application/admin/controller/Ueditor.php +++ b/application/admin/controller/Ueditor.php @@ -171,7 +171,7 @@ class Ueditor extends Common */ private function ActionUpload() { - $base64 = "upload"; + $type = "file"; switch(htmlspecialchars($this->current_action)) { case 'uploadimage': @@ -181,6 +181,7 @@ class Ueditor extends Common "allowFiles" => $this->current_config['imageAllowFiles'] ); $field_name = $this->current_config['imageFieldName']; + $type = "image"; break; case 'uploadscrawl': @@ -191,7 +192,7 @@ class Ueditor extends Common "oriName" => "scrawl.png" ); $field_name = $this->current_config['scrawlFieldName']; - $base64 = "base64"; + $type = "base64"; break; case 'uploadvideo': @@ -201,6 +202,7 @@ class Ueditor extends Common "allowFiles" => $this->current_config['videoAllowFiles'] ); $field_name = $this->current_config['videoFieldName']; + $type = "video"; break; case 'uploadfile': @@ -211,10 +213,11 @@ class Ueditor extends Common "allowFiles" => $this->current_config['fileAllowFiles'] ); $field_name = $this->current_config['fileFieldName']; + $type = "file"; } /* 生成上传实例对象并完成上传 */ - $up = new \base\Uploader($field_name, $temp_config, $base64); + $up = new \base\Uploader($field_name, $temp_config, $type); /** * 得到上传文件所对应的各个参数,数组结构 diff --git a/extend/base/Uploader.php b/extend/base/Uploader.php index d60efd3b1..f46584319 100755 --- a/extend/base/Uploader.php +++ b/extend/base/Uploader.php @@ -43,7 +43,7 @@ class Uploader "ERROR_TYPE_NOT_ALLOWED" => "文件类型不允许", "ERROR_CREATE_DIR" => "目录创建失败", "ERROR_DIR_NOT_WRITEABLE" => "目录没有写权限", - "ERROR_FILE_MOVE" => "保存出错,图片有误", + "ERROR_FILE_MOVE" => "保存出错,文件有误", "ERROR_FILE_NOT_FOUND" => "找不到上传文件", "ERROR_WRITE_CONTENT" => "写入文件内容错误", "ERROR_UNKNOWN" => "未知错误", @@ -52,6 +52,8 @@ class Uploader "ERROR_HTTP_CONTENTTYPE" => "链接contentType不正确", "INVALID_URL" => "非法 URL", "INVALID_IP" => "非法 IP", + "ERROR_IMAGE_SAVE" => "保存出错,图片有误", + "ERROR_UPLOAD_TYPE" => "操作类型有误", ); /** @@ -65,21 +67,107 @@ class Uploader $this->fileField = $fileField; $this->config = $config; $this->type = $type; - if ($type == "remote") { - $this->saveRemote(); - } else if($type == "base64") { - $this->upBase64(); - } else { - $this->upFile(); + switch($this->type) + { + // 抓取远程文件 + case 'remote' : + $this->saveRemote(); + break; + + // base64文件 + case 'base64' : + $this->uploadBase64(); + break; + + // 图片 + case 'image' : + $this->uploadImage(); + break; + + // 文件、视频 + case 'file' : + case 'video' : + $this->uploadFile(); + break; + + // 默认 + default : + $this->stateInfo = $this->getStateInfo("ERROR_UPLOAD_TYPE"); + } + } + + /** + * 文件上传 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-02-26 + * @desc description + */ + private function uploadFile() + { + $file = $this->file = $_FILES[$this->fileField]; + if (!$file) { + $this->stateInfo = $this->getStateInfo("ERROR_FILE_NOT_FOUND"); + return; + } + if ($this->file['error']) { + $this->stateInfo = $this->getStateInfo($file['error']); + return; + } else if (!file_exists($file['tmp_name'])) { + $this->stateInfo = $this->getStateInfo("ERROR_TMP_FILE_NOT_FOUND"); + return; + } else if (!is_uploaded_file($file['tmp_name'])) { + $this->stateInfo = $this->getStateInfo("ERROR_TMPFILE"); + return; + } + + $this->oriName = $file['name']; + $this->fileSize = $file['size']; + $this->fileType = $this->getFileExt(); + $this->fullName = $this->getFullName(); + $this->filePath = $this->getFilePath(); + $this->fileName = $this->getFileName(); + $dirname = dirname($this->filePath); + + //检查文件大小是否超出限制 + if (!$this->checkSize()) { + $this->stateInfo = $this->getStateInfo("ERROR_SIZE_EXCEED"); + return; + } + + //检查是否不允许的文件格式 + if (!$this->checkType()) { + $this->stateInfo = $this->getStateInfo("ERROR_TYPE_NOT_ALLOWED"); + return; + } + + //创建目录失败 + if (!is_dir($dirname) && !@mkdir($dirname, 0777, true)) { + $this->stateInfo = $this->getStateInfo("ERROR_CREATE_DIR"); + return; + } else if (!is_writeable($dirname)) { + $this->stateInfo = $this->getStateInfo("ERROR_DIR_NOT_WRITEABLE"); + return; + } + + //移动文件 + if (!(move_uploaded_file($file["tmp_name"], $this->filePath) && file_exists($this->filePath))) { //移动失败 + $this->stateInfo = $this->getStateInfo("ERROR_FILE_MOVE"); + } else { //移动成功 + $this->stateInfo = $this->stateMap[0]; } - //$this->stateMap['ERROR_TYPE_NOT_ALLOWED'] = iconv('unicode', 'utf-8', $this->stateMap['ERROR_TYPE_NOT_ALLOWED']); } /** - * 上传文件的主处理方法 - * @return mixed + * 图片上传 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-02-26 + * @desc description */ - private function upFile() + private function uploadImage() { $file = $this->file = $_FILES[$this->fileField]; if (!$file) { @@ -150,7 +238,7 @@ class Uploader } if(!file_exists($this->filePath)) { - $this->stateInfo = $this->getStateInfo("ERROR_FILE_MOVE"); + $this->stateInfo = $this->getStateInfo("ERROR_IMAGE_SAVE"); } else { $this->stateInfo = $this->stateMap[0]; } @@ -158,9 +246,13 @@ class Uploader /** * 处理base64编码的图片上传 - * @return mixed + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-02-26 + * @desc description */ - private function upBase64() + private function uploadBase64() { $base64Data = $_POST[$this->fileField]; $img = base64_decode($base64Data); @@ -199,7 +291,11 @@ class Uploader /** * 拉取远程图片 - * @return mixed + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-02-26 + * @desc description */ private function saveRemote() { -- GitLab