From 0147e7f1e11e564d623cfc473a6e0bd0ea1defb9 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Mon, 20 Jun 2022 18:38:43 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=B8=8A=E4=BC=A0=E9=99=90=E5=88=B6?= =?UTF-8?q?=E6=94=B9=E4=B8=BA1G?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/FileController.php | 4 ++-- app/Module/Base.php | 4 ++-- config/laravels.php | 6 +++--- docker/nginx/default.conf | 2 +- docker/php/php.ini | 6 +++--- resources/assets/js/components/MDEditor/index.vue | 2 +- .../assets/js/pages/manage/components/DialogUpload.vue | 6 +++--- resources/assets/js/pages/manage/components/TaskUpload.vue | 2 +- resources/assets/js/pages/manage/file.vue | 6 +++--- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/Api/FileController.php b/app/Http/Controllers/Api/FileController.php index e1b9c669c..1f279e405 100755 --- a/app/Http/Controllers/Api/FileController.php +++ b/app/Http/Controllers/Api/FileController.php @@ -705,8 +705,8 @@ class FileController extends AbstractController 'xls', 'xlsx' => "excel", 'ppt', 'pptx' => "ppt", 'wps' => "wps", - 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw' => "picture", - 'rar', 'zip', 'jar', '7-zip', 'tar', 'gzip', '7z' => "archive", + 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw', 'svg' => "picture", + 'rar', 'zip', 'jar', '7-zip', 'tar', 'gzip', '7z', 'gz', 'apk', 'dmg' => "archive", 'tif', 'tiff' => "tif", 'dwg', 'dxf' => "cad", 'ofd' => "ofd", diff --git a/app/Module/Base.php b/app/Module/Base.php index bab4628bd..8f15ebb25 100755 --- a/app/Module/Base.php +++ b/app/Module/Base.php @@ -2328,8 +2328,8 @@ class Base 'drawio', 'mind', 'docx', 'wps', 'doc', 'xls', 'xlsx', 'ppt', 'pptx', - 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw', - 'rar', 'zip', 'jar', '7-zip', 'tar', 'gzip', '7z', + 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw', 'svg', + 'rar', 'zip', 'jar', '7-zip', 'tar', 'gzip', '7z', 'gz', 'apk', 'dmg', 'tif', 'tiff', 'dwg', 'dxf', 'ofd', diff --git a/config/laravels.php b/config/laravels.php index e407cd1b5..5c0cc00e0 100644 --- a/config/laravels.php +++ b/config/laravels.php @@ -300,9 +300,9 @@ return [ 'log_level' => 4, 'log_file' => storage_path(sprintf('logs/swoole-%s.log', date('Y-m'))), 'document_root' => base_path('public'), - 'buffer_output_size' => 512 * 1024 * 1024, - 'socket_buffer_size' => 512 * 1024 * 1024, - 'package_max_length' => 512 * 1024 * 1024, + 'buffer_output_size' => 2 * 1024 * 1024, + 'socket_buffer_size' => 8 * 1024 * 1024, + 'package_max_length' => 1024 * 1024 * 1024, // 1GB 'reload_async' => true, 'max_wait_time' => 60, 'enable_reuse_port' => true, diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf index 3942ab18f..9b6894baf 100644 --- a/docker/nginx/default.conf +++ b/docker/nginx/default.conf @@ -25,7 +25,7 @@ server { root /var/www/public; - client_max_body_size 512M; + client_max_body_size 1024M; autoindex off; index index.html index.htm index.php; diff --git a/docker/php/php.ini b/docker/php/php.ini index 7a76ff14a..4ff560963 100644 --- a/docker/php/php.ini +++ b/docker/php/php.ini @@ -427,7 +427,7 @@ max_input_time = 60 ; Maximum amount of memory a script may consume ; http://php.net/memory-limit -memory_limit = 512M +memory_limit = 1024M ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Error handling and logging ; @@ -700,7 +700,7 @@ auto_globals_jit = On ; Its value may be 0 to disable the limit. It is ignored if POST data reading ; is disabled through enable_post_data_reading. ; http://php.net/post-max-size -post_max_size = 512M +post_max_size = 1024M ; Automatically add files before PHP document. ; http://php.net/auto-prepend-file @@ -852,7 +852,7 @@ file_uploads = On ; Maximum allowed size for uploaded files. ; http://php.net/upload-max-filesize -upload_max_filesize = 512M +upload_max_filesize = 1024M ; Maximum number of files that can be uploaded via a single request max_file_uploads = 100 diff --git a/resources/assets/js/components/MDEditor/index.vue b/resources/assets/js/components/MDEditor/index.vue index f18f2200b..90700448e 100755 --- a/resources/assets/js/components/MDEditor/index.vue +++ b/resources/assets/js/components/MDEditor/index.vue @@ -159,7 +159,7 @@ uploadIng: 0, uploadFormat: ['jpg', 'jpeg', 'png', 'gif', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'esp', 'pdf', 'rar', 'zip', 'gz', 'ai', 'avi', 'bmp', 'cdr', 'eps', 'mov', 'mp3', 'mp4', 'pr', 'psd', 'svg', 'tif'], actionUrl: $A.apiUrl('system/fileupload'), - maxSize: 204800 + maxSize: 1024000 }; }, mounted() { diff --git a/resources/assets/js/pages/manage/components/DialogUpload.vue b/resources/assets/js/pages/manage/components/DialogUpload.vue index 84e8e5cf8..df245c11d 100644 --- a/resources/assets/js/pages/manage/components/DialogUpload.vue +++ b/resources/assets/js/pages/manage/components/DialogUpload.vue @@ -28,7 +28,7 @@ export default { }, maxSize: { type: Number, - default: 204800 + default: 1024000 } }, @@ -39,8 +39,8 @@ export default { 'drawio', 'mind', 'docx', 'wps', 'doc', 'xls', 'xlsx', 'ppt', 'pptx', - 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw', - 'rar', 'zip', 'jar', '7-zip', 'tar', 'gzip', '7z', + 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw', 'svg', + 'rar', 'zip', 'jar', '7-zip', 'tar', 'gzip', '7z', 'gz', 'apk', 'dmg', 'tif', 'tiff', 'dwg', 'dxf', 'ofd', diff --git a/resources/assets/js/pages/manage/components/TaskUpload.vue b/resources/assets/js/pages/manage/components/TaskUpload.vue index 0821dfd01..e21666750 100644 --- a/resources/assets/js/pages/manage/components/TaskUpload.vue +++ b/resources/assets/js/pages/manage/components/TaskUpload.vue @@ -19,7 +19,7 @@ export default { props: { maxSize: { type: Number, - default: 204800 + default: 1024000 } }, diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue index 5036652d7..fdf6e378d 100644 --- a/resources/assets/js/pages/manage/file.vue +++ b/resources/assets/js/pages/manage/file.vue @@ -450,8 +450,8 @@ export default { 'drawio', 'mind', 'docx', 'wps', 'doc', 'xls', 'xlsx', 'ppt', 'pptx', - 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw', - 'rar', 'zip', 'jar', '7-zip', 'tar', 'gzip', '7z', + 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'ico', 'raw', 'svg', + 'rar', 'zip', 'jar', '7-zip', 'tar', 'gzip', '7z', 'gz', 'apk', 'dmg', 'tif', 'tiff', 'dwg', 'dxf', 'ofd', @@ -470,7 +470,7 @@ export default { 'rp', ], uploadAccept: '', - maxSize: 204800, + maxSize: 1024000, contextMenuItem: {}, contextMenuVisible: false,