|
|
@@ -225,16 +225,16 @@ class Stroage extends Model
|
|
|
}
|
|
|
|
|
|
// 表格文件转PDF
|
|
|
- // if(in_array($fileType, ['xls','xlsx','doc','docx'])){
|
|
|
- if(in_array($fileType, ['xls','xlsx'])){
|
|
|
+ if(in_array($fileType, ['xls','xlsx','doc','docx'])){
|
|
|
+ //if(in_array($fileType, ['xls','xlsx'])){
|
|
|
$file = Stroage::convertFile($file);
|
|
|
return Stroage::getPdfFilePage($file);
|
|
|
}
|
|
|
|
|
|
// 其他文件
|
|
|
$fileTypes = config('files.fileTypes');
|
|
|
- // $fileTypes = $fileTypes? $fileTypes : ['doc','docx','ppt','pptx'];
|
|
|
- $fileTypes = $fileTypes? $fileTypes : ['ppt','pptx'];
|
|
|
+ $fileTypes = $fileTypes? $fileTypes : ['doc','docx','ppt','pptx'];
|
|
|
+ //$fileTypes = $fileTypes? $fileTypes : ['ppt','pptx'];
|
|
|
if(!in_array($fileType, $fileTypes)){
|
|
|
return 0;
|
|
|
}
|
|
|
@@ -247,7 +247,7 @@ class Stroage extends Model
|
|
|
// 获取页数文件内容
|
|
|
$pageFile = Stroage::getZipPageFile($zipFile);
|
|
|
|
|
|
- var_dump($pageFile);
|
|
|
+ //var_dump($pageFile);
|
|
|
if(!is_file($pageFile)){
|
|
|
return 0;
|
|
|
}
|