From 20c74f7f569825b738e25e0d486f9ecf9580bd26 Mon Sep 17 00:00:00 2001 From: aipaw Date: Tue, 13 Jul 2021 08:01:22 +0800 Subject: [PATCH] no message --- app/Models/FileContent.php | 2 +- database/seeders/FilesTableSeeder.php | 4 ++-- .../assets/statics/{empty => office}/empty.docx | Bin .../assets/statics/{empty => office}/empty.pptx | Bin .../assets/statics/{empty => office}/empty.xlsx | Bin 5 files changed, 3 insertions(+), 3 deletions(-) rename resources/assets/statics/{empty => office}/empty.docx (100%) rename resources/assets/statics/{empty => office}/empty.pptx (100%) rename resources/assets/statics/{empty => office}/empty.xlsx (100%) diff --git a/app/Models/FileContent.php b/app/Models/FileContent.php index badb6f8b..ced6d89b 100644 --- a/app/Models/FileContent.php +++ b/app/Models/FileContent.php @@ -52,7 +52,7 @@ class FileContent extends AbstractModel $content = Base::json2array($content); if (in_array($type, ['word', 'excel', 'ppt'])) { if (empty($content)) { - return Response::download(resource_path('assets/statics/empty/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $type))); + return Response::download(resource_path('assets/statics/office/empty.' . str_replace(['word', 'excel', 'ppt'], ['docx', 'xlsx', 'pptx'], $type))); } return Response::download(public_path($content['url'])); } diff --git a/database/seeders/FilesTableSeeder.php b/database/seeders/FilesTableSeeder.php index 70696d3f..ebe5cbbd 100644 --- a/database/seeders/FilesTableSeeder.php +++ b/database/seeders/FilesTableSeeder.php @@ -238,7 +238,7 @@ class FilesTableSeeder extends Seeder 'cid' => 0, 'name' => '会议发言', 'type' => 'word', - 'size' => 0, + 'size' => 10994, 'userid' => 1, 'share' => 1, 'created_id' => 1, @@ -253,7 +253,7 @@ class FilesTableSeeder extends Seeder 'cid' => 0, 'name' => '产品介绍', 'type' => 'ppt', - 'size' => 0, + 'size' => 26882, 'userid' => 1, 'share' => 1, 'created_id' => 1, diff --git a/resources/assets/statics/empty/empty.docx b/resources/assets/statics/office/empty.docx similarity index 100% rename from resources/assets/statics/empty/empty.docx rename to resources/assets/statics/office/empty.docx diff --git a/resources/assets/statics/empty/empty.pptx b/resources/assets/statics/office/empty.pptx similarity index 100% rename from resources/assets/statics/empty/empty.pptx rename to resources/assets/statics/office/empty.pptx diff --git a/resources/assets/statics/empty/empty.xlsx b/resources/assets/statics/office/empty.xlsx similarity index 100% rename from resources/assets/statics/empty/empty.xlsx rename to resources/assets/statics/office/empty.xlsx