|
@@ -338,12 +338,12 @@ class Stroage extends Model
|
|
|
* @param $file 文件
|
|
* @param $file 文件
|
|
|
* @return mixed
|
|
* @return mixed
|
|
|
*/
|
|
*/
|
|
|
- public static function onLineConvertFile($file)
|
|
|
|
|
|
|
+ public static function onLineConvertFile($file, $type='pdf')
|
|
|
{
|
|
{
|
|
|
$fileType = getFileType($file);
|
|
$fileType = getFileType($file);
|
|
|
$pathFile = preg_match("/^files/", $file) ? UPLOAD_PATH . $file : $file;
|
|
$pathFile = preg_match("/^files/", $file) ? UPLOAD_PATH . $file : $file;
|
|
|
$path = dirname($pathFile) . '/';
|
|
$path = dirname($pathFile) . '/';
|
|
|
- $filename = str_replace('.' . $fileType, '.pdf', $file);
|
|
|
|
|
|
|
+ $filename = str_replace('.' . $fileType, '.'.$type, $file);
|
|
|
$typeData = config('files.convertTypes');
|
|
$typeData = config('files.convertTypes');
|
|
|
$minType = isset($typeData[$fileType]) ? $typeData[$fileType] : '';
|
|
$minType = isset($typeData[$fileType]) ? $typeData[$fileType] : '';
|
|
|
if (empty($minType)) {
|
|
if (empty($minType)) {
|