Merge branch 'develop'

# Conflicts: # config/route.php
2025-11-11 16:46:22 +08:00
parent 6c59fdef10
commit 80fbf6c35a
17 changed files with 1030 additions and 110 deletions
@@ -91,7 +91,7 @@ class UploadController
            $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'))
+                ->path(config('oss.oss_main_dir') . $sceneUrl . date('Ymd'))
                ->size(1024*1024*5)
                ->extYes($mimes)
                ->upload($file);
@@ -132,7 +132,7 @@ class UploadController
            }

            $result = Storage::adapter('oss')
-                ->path('x_server/' . $sceneUrl . date('Ymd'))
+                ->path(config('oss.oss_main_dir') . $sceneUrl . date('Ymd'))
                ->size(1024*1024*5)
                ->extYes(['image/jpeg','image/png'])
                ->extNo(['image/gif'])