From 7d48f9bde515ecdc78ba7d1de5dd89993a553f14 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Thu, 21 Apr 2022 17:25:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=93=E5=BC=80pdf?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E6=96=87=E4=BB=B6=E5=90=8D=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=87=BA=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/File.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/Models/File.php b/app/Models/File.php index 02e6a7efd..b5c244b32 100644 --- a/app/Models/File.php +++ b/app/Models/File.php @@ -343,8 +343,6 @@ class File extends AbstractModel $filePath = $data['path']; $fileSize = $data['size']; $fileExt = $data['ext']; - $fileDotExt = '.' . $fileExt; - $fileName = Base::rightDelete($data['name'], $fileDotExt) . $fileDotExt; $publicPath = public_path($filePath); // switch ($fileExt) { @@ -393,11 +391,16 @@ class File extends AbstractModel } else { $url = 'http://' . env('APP_IPPR') . '.3/' . $filePath; } + if ($fileExt != 'pdf') { + $fileDotExt = ".{$fileExt}"; + $fileName = Base::rightDelete($data['name'], $fileDotExt) . $fileDotExt; + $url = Base::urlAddparameter($url, [ + 'fullfilename' => $fileName + ]); + } $data['content'] = [ 'preview' => true, - 'url' => base64_encode(Base::urlAddparameter($url, [ - 'fullfilename' => $fileName - ])), + 'url' => base64_encode($url), ]; $data['file_mode'] = 'preview'; }