xinyouhe/fdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/stock_next' into develop

Browse Source
This commit is contained in:
WIN-C27C5MSVTPO\16961
2025-09-09 14:10:08 +08:00
parent 99a63ff181 1119cc390b
commit 38062d1fb4
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/common/controller/UploadController.php
+2 -2
View File
@@ -87,7 +87,7 @@ class UploadController
$originalName = $file->getUploadName(); $originalName = $file->getUploadName();
$result = Storage::adapter('oss') $result = Storage::adapter('oss')
->path('vehicle_album/' . $sceneUrl . date('Ymd')) ->path('x_server/' . $sceneUrl . date('Ymd'))
->size(1024*1024*5) ->size(1024*1024*5)
->upload($file); ->upload($file);
@@ -128,7 +128,7 @@ class UploadController
} }
$result = Storage::adapter('oss') $result = Storage::adapter('oss')
->path('vehicle_album/' . $sceneUrl . date('Ymd')) ->path('x_server/' . $sceneUrl . date('Ymd'))
->size(1024*1024*5) ->size(1024*1024*5)
->extYes(['image/jpeg','image/png']) ->extYes(['image/jpeg','image/png'])
->extNo(['image/gif']) ->extNo(['image/gif'])
app/common/service/UploadService.php
+2 -2
View File
@@ -14,7 +14,7 @@ class UploadService
* *
* @param Request $request * @param Request $request
* - path: 本地文件绝对路径 * - path: 本地文件绝对路径
* - scene: 业务分区/场景（可选） * - scene: 业务分区/场景
* - category: 文件分类（可选） * - category: 文件分类（可选）
* - original_name: 原始文件名（可选） * - original_name: 原始文件名（可选）
*/ */
@@ -24,7 +24,7 @@ class UploadService
$filePath = $param['path']; $filePath = $param['path'];
$scene = $param['scene']; $scene = $param['scene'];
$category = $param['category']??'general'; $category = $param['category']??'general';
$providedOriginalName = $param['original_name']; $providedOriginalName = $param['original_name']??'';
if (empty($filePath)) { if (empty($filePath)) {
Log::error('本地文件路径不能为空',$param); Log::error('本地文件路径不能为空',$param);