diff --git a/application/project/controller/File.php b/application/project/controller/File.php index 3846c88..515df8d 100644 --- a/application/project/controller/File.php +++ b/application/project/controller/File.php @@ -117,16 +117,15 @@ class File extends BasicApi $ext = $ext[count($ext) - 1]; $fileUrl = "{$path}/{$fileName}-{$i}.{$ext}"; $site_url = FileService::getFileUrl($fileUrl, 'local'); -// $blob = file_get_contents($site_url); - $blob .= file_get_contents($site_url); - + $blob = file_get_contents($site_url); +// $blob .= file_get_contents($site_url); $fileList[] = env('root_path') . $fileUrl; - -// $result = FileService::$type($path2, $blob); -// unset($blob); -// unset($site_url); + $result = FileService::$type($path2, $blob, true); + unset($blob); + unset($site_url); + unset($fileUrl); } - $result = FileService::$type($path2, $blob); +// $result = FileService::$type($path2, $blob); $fileData['size'] = $data['totalSize']; $fileData['path_name'] = $result['key']; $fileData['file_url'] = $result['url']; @@ -135,10 +134,11 @@ class File extends BasicApi !isset($data['taskCode']) && $data['taskCode'] = ''; $fileResult = \app\common\Model\File::createFile($data['projectCode'], $fileData); + unset($fileData); unset($info); //文件碎片移除 foreach ($fileList as $file) { - unlink($file); + @unlink($file); } $fileInfo = \app\common\Model\File::where(['code' => $fileResult['code']])->find(); if ($data['taskCode']) { diff --git a/extend/service/FileService.php b/extend/service/FileService.php index 326fa7c..7c34523 100644 --- a/extend/service/FileService.php +++ b/extend/service/FileService.php @@ -305,12 +305,12 @@ class FileService * @param string $content * @return array|null */ - public static function local($filename, $content) + public static function local($filename, $content, $append = false) { try { $realfile = env('root_path') . $filename; !file_exists(dirname($realfile)) && mkdir(dirname($realfile), 0755, true); - if (file_put_contents($realfile, $content, FILE_APPEND)) { + if (file_put_contents($realfile, $content, $append ? FILE_APPEND : 0)) { $url = pathinfo(request()->baseFile(true), PATHINFO_DIRNAME) . '/' . $filename; return ['file' => $realfile, 'hash' => md5_file($realfile), 'key' => "{$filename}", 'url' => $url]; }