From 4205b68b8cf813514f7b8dfccfe4e14e12eaa23c Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Tue, 14 Nov 2023 11:39:14 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=8E=8B=E7=BC=A9=E4=B8=8B=E8=BD=BD?=
=?UTF-8?q?=E6=94=B9=E5=90=8D=E6=89=93=E5=8C=85=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/Api/FileController.php | 2 +-
app/Http/Controllers/Api/SystemController.php | 2 ++
app/Models/File.php | 3 ++-
app/Models/WebSocketDialog.php | 1 +
language/original-web.txt | 9 +++++----
resources/assets/js/pages/manage/file.vue | 12 ++++++------
.../manage/setting/components/SystemSetting.vue | 10 ++++++++++
7 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/app/Http/Controllers/Api/FileController.php b/app/Http/Controllers/Api/FileController.php
index 2ba044cd0..626b971ba 100755
--- a/app/Http/Controllers/Api/FileController.php
+++ b/app/Http/Controllers/Api/FileController.php
@@ -1014,7 +1014,7 @@ class FileController extends AbstractController
}
/**
- * @api {get} api/file/download/zip 20. 压缩下载
+ * @api {get} api/file/download/zip 20. 打包下载
*
* @apiDescription 需要token身份
* @apiVersion 1.0.0
diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php
index 8388207c8..76569fecb 100755
--- a/app/Http/Controllers/Api/SystemController.php
+++ b/app/Http/Controllers/Api/SystemController.php
@@ -74,6 +74,7 @@ class SystemController extends AbstractController
'image_compress',
'image_save_local',
'start_home',
+ 'file_upload_limit',
])) {
unset($all[$key]);
}
@@ -114,6 +115,7 @@ class SystemController extends AbstractController
$setting['image_compress'] = $setting['image_compress'] ?: 'open';
$setting['image_save_local'] = $setting['image_save_local'] ?: 'open';
$setting['start_home'] = $setting['start_home'] ?: 'close';
+ $setting['file_upload_limit'] = $setting['file_upload_limit'] ?: '';
//
return Base::retSuccess('success', $setting ?: json_decode('{}'));
}
diff --git a/app/Models/File.php b/app/Models/File.php
index ab9ad5aa6..86c9c4c49 100644
--- a/app/Models/File.php
+++ b/app/Models/File.php
@@ -244,9 +244,10 @@ class File extends AbstractModel
"type" => 'more',
"autoThumb" => false,
"path" => $path,
+ "size" => 100 * 1024
]);
if (Base::isError($data)) {
- return $data;
+ throw new ApiException($data['msg']);
}
$data = $data['data'];
//
diff --git a/app/Models/WebSocketDialog.php b/app/Models/WebSocketDialog.php
index 8dbae3777..3826578e5 100644
--- a/app/Models/WebSocketDialog.php
+++ b/app/Models/WebSocketDialog.php
@@ -616,6 +616,7 @@ class WebSocketDialog extends AbstractModel
"type" => 'more',
"path" => $path,
"fileName" => $fileName,
+ "size" => 100 * 1024
]);
}
//
diff --git a/language/original-web.txt b/language/original-web.txt
index 7950bde53..1a0638c3f 100644
--- a/language/original-web.txt
+++ b/language/original-web.txt
@@ -1382,7 +1382,8 @@ APP推送
未设置时间
检测到所属的任务列表已被删除，该操作将会还原任务列表，你确定要还原归档吗？
-压缩下载
-你确定要下载【(*)】文件吗？
-你确定要下载(*)等(*)个文件吗？
-此文件夹内已有共享文件夹，子文件的共享状态将被取消，是否继续？
\ No newline at end of file
+打包下载
+你确定要打包下载【(*)】文件吗？
+你确定要打包下载(*)等(*)个文件吗？
+此文件夹内已有共享文件夹，子文件的共享状态将被取消，是否继续？
+文件上传限制
\ No newline at end of file
diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue
index ecb5d9d80..181233665 100644
--- a/resources/assets/js/pages/manage/file.vue
+++ b/resources/assets/js/pages/manage/file.vue
@@ -50,8 +50,8 @@
{{$L('剪切')}}