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
@@ -50,7 +50,7 @@ class UploadService
            $size = filesize($filePath) ?: 0;

            $sceneUrl = $scene ? ($scene . '/') : '';
-            $dir = 'x_server/' . $sceneUrl . date('Ymd') . '/';
+            $dir = config('oss.oss_main_dir') . $sceneUrl . date('Ymd') . '/';
            // 使用传入的 original_name 命名（缺少扩展名时补上推断的扩展名），并做简单安全处理
            $safeBaseName = preg_replace('/[\\\\\/]+/', '_', $originalName);
            if ($extension && strtolower(pathinfo($safeBaseName, PATHINFO_EXTENSION)) !== strtolower($extension)) {