muzi
/
apeblog
mirror of https://github.com/1099438829/apeblog
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修正配置文件错误的bug

This commit is contained in:
liyukun 2021-08-15 23:12:53 +08:00
parent 46787a6e75
commit 488ab94020
2 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/admin/controller/Files.php
View File

@ -22,20 +22,21 @@ class Files extends AuthController
public function image() public function image()
{ {
$file = $this->request->file("file"); $file = $this->request->file("file");
switch (system_config("storage_type")) $storage_type = system_config("storage_type") ?:1;//默认未本地存储
switch ($storage_type)
{ {
case 1: case 1:
$savename = Filesystem::putFile( 'image', $file); $savename = Filesystem::putFile( 'images', $file);
$filePath = "/uploads/".$savename; $filePath = "/uploads/".$savename;
break; break;
case 2: case 2:
$savename = Filesystem::putFile( 'image', $file); $savename = Filesystem::putFile( 'images', $file);
$ext = $file->getOriginalExtension(); $ext = $file->getOriginalExtension();
$key = '/image/'.date('Ymd')."/".substr(md5($file->getRealPath()) , 0, 5). date('YmdHis') . rand(0, 9999) . '.' . $ext; $key = '/image/'.date('Ymd')."/".substr(md5($file->getRealPath()) , 0, 5). date('YmdHis') . rand(0, 9999) . '.' . $ext;
$filePath = QcloudCoService::put($key, $file->getRealPath()); $filePath = QcloudCoService::put($key, $file->getRealPath());
break; break;
} }
return Attachment::addAttachment($this->request->param("cid",0),$savename,$filePath,'image',$file->getMime(),$file->getSize(),system_config("storage_type")) ? app("json")->code()->success("上传成功",['filePath'=>$filePath,"name"=>$savename]) : app("json")->fail("上传失败"); return Attachment::addAttachment($this->request->param("cid",0),$savename,$filePath,'images',$file->getMime(),$file->getSize(),$storage_type) ? app("json")->code()->success("上传成功",['filePath'=>$filePath,"name"=>$savename]) : app("json")->fail("上传失败");
} }
/** /**
@ -78,14 +79,11 @@ class Files extends AuthController
{ {
if($request->isPost()) { if($request->isPost()) {
// 获取表单上传文件 例如上传了001.jpg // 获取表单上传文件 例如上传了001.jpg
$file = $request->file('file');//根据表单name替换imgFile $file = $this->request->file('file');//根据表单name替换imgFile
$type = $this->request->post("type"); $type = $this->request->post("type");
$type = $type ?:'files'; $type = $type ?:'files';
switch (system_config("storage_type")) switch ($type) {
{ case 'files':
case 1:
switch ($type) {
case 'files':
$fileSize = 10 * 1024 * 1024; $fileSize = 10 * 1024 * 1024;
$fileExt = 'pdf,doc,docx,png,jpeg,jpg,text,mp4'; $fileExt = 'pdf,doc,docx,png,jpeg,jpg,text,mp4';
break; break;
@ -97,6 +95,10 @@ class Files extends AuthController
$fileSize = 5 * 1024 * 1024; $fileSize = 5 * 1024 * 1024;
$fileExt = 'pdf,doc,docx'; $fileExt = 'pdf,doc,docx';
break; break;
case 'image':
$fileSize = 5 * 1024 * 1024;
$fileExt = 'png,jpeg,jpg';
break;
case 'images': case 'images':
$fileSize = 5 * 1024 * 1024; $fileSize = 5 * 1024 * 1024;
$fileExt = 'png,jpeg,jpg'; $fileExt = 'png,jpeg,jpg';
@ -118,24 +120,12 @@ class Files extends AuthController
// 限制文件后缀，多个后缀以英文逗号分割 // 限制文件后缀，多个后缀以英文逗号分割
'fileExt' => $fileExt 'fileExt' => $fileExt
// 更多规则请看“上传验证”的规则，文档地址https://www.kancloud.cn/manual/thinkphp6_0/1037629#_444 // 更多规则请看“上传验证”的规则，文档地址https://www.kancloud.cn/manual/thinkphp6_0/1037629#_444
]])->check(['file' => $file]); ]])->check(['file' => $file]);
$savename = Filesystem::putFile( $type, $file); $savename = Filesystem::putFile( $type, $file);
$filePath = "/uploads/".$savename; $filePath = "/uploads/".$savename;
$res = Attachment::addAttachment($this->request->param("cid",0),basename($savename),$filePath,$type,$file->getMime(),$file->getSize(),system_config("storage_type")); return $savename ? app("json")->code()->success("上传成功",['filePath'=>$filePath,"name"=>basename($savename)]) : app("json")->fail("上传失败");
return $res? app("json")->code()->success("上传成功",['filePath'=>$filePath,"name"=>basename($savename)]) : app("json")->fail("上传失败"); } catch (ValidateException $e) {
} catch (ValidateException $e) { return app("json")->fail($e->getMessage());
return app("json")->fail($e->getMessage());
}
break;
case 2:
return app("json")->fail('上传失败');
$savename = Filesystem::putFile( 'image', $file);
$ext = $file->getOriginalExtension();
$key = '/image/'.date('Ymd')."/".substr(md5($file->getRealPath()) , 0, 5). date('YmdHis') . rand(0, 9999) . '.' . $ext;
$filePath = QcloudCoService::put($key, $file->getRealPath());
$res = Attachment::addAttachment($this->request->param("cid",0),basename($savename),$filePath,$type,$file->getMime(),$file->getSize(),system_config("storage_type"));
return $res? app("json")->code()->success("上传成功",['filePath'=>$filePath,"name"=>basename($savename)]) : app("json")->fail("上传失败");
break;
} }
}else{ }else{
return app("json")->fail('上传失败'); return app("json")->fail('上传失败');

2
app/admin/view/system_config/base.html
View File

@ -114,7 +114,7 @@
function upload(inputName) { function upload(inputName) {
var formData = new FormData(); var formData = new FormData();
formData.append("file",$("#file"+inputName)[0].files[0]); formData.append("file",$("#file"+inputName)[0].files[0]);
formData.append("cid",0); formData.append("type","images");
formData.append("storage",1); formData.append("storage",1);
$.ajax({ $.ajax({
type:'POST', type:'POST',