Merge branch 'develop' into feature/mzl_dev

# Conflicts: # config/route.php
2025-10-30 14:39:10 +08:00
parent a7d623656d
commit 8c3a445a39
32 changed files with 2004 additions and 7 deletions
@@ -87,12 +87,15 @@ class UploadController
            }
            $originalName = $file->getUploadName();

+            $ossservice = new OssService();
+            $mimes = $ossservice->getMimeTypes(['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'txt', 'zip', 'rar']);
+
            $result = Storage::adapter('oss')
                ->path('x_server/' . $sceneUrl . date('Ymd'))
                ->size(1024*1024*5)
+                ->extYes($mimes)
                ->upload($file);
-            
-            $ossservice = new OssService();
+

            $data = [
                'original_name' => $originalName,