Merge branch 'develop'

app/Http/Controllers/UploadController.php

@@ -28,7 +28,7 @@ class UploadController extends Controller
                 $height = Image::make($filePath)->height();
                 //要保存的文件名 时间+扩展名
                 $filename = time() . '_' . uniqid() . '.' . $kuoname;
-                $fileurl = time() . '_' . uniqid() . '.' . $kuoname . '?' . $width . '_' . $height;
+                $fileurl = $filename . '?' . $width . '_' . $height;
             } else {
                 //要保存的文件名 时间+扩展名
                 $fileurl = $filename = time() . '_' . uniqid() . '.' . $kuoname;
@@ -48,6 +48,7 @@ class UploadController extends Controller
 
     public function uploadImages(Request $request)
     {
+        $path = $request->get('path') ? $request->get('path') . '/' : date('Ym') . '/';
         $files = $request->file('image');
         $fileCount = count($files);
         $urls = [];
@@ -66,9 +67,9 @@ class UploadController extends Controller
                 //要保存的文件名 时间+扩展名
                 $fileurl = $filename = time() . '_' . uniqid() . '.' . $kuoname;
             }
-            $imageUrl = Storage::put($filename, file_get_contents($filePath));
+            $imageUrl = Storage::put($path . $filename, file_get_contents($filePath));
             if ($imageUrl) {
-                array_push($urls, $fileurl);
+                array_push($urls, $path . $fileurl);
             } else {
                 Log::debug('文件上传失败。' . $filename);
             }
@@ -95,14 +96,14 @@ class UploadController extends Controller
             //计算音乐时长
             $laravel_mp3 = new LaravelMP3();
             $details = $laravel_mp3->getDuration($filePath);
-            Log::debug('文件类型'.$kuoname);
+            Log::debug('文件类型' . $kuoname);
             //要保存的文件名 时间+扩展名
             $filename = time() . '_' . uniqid() . '*' . $kuoname;
 
             $mp3Url = Storage::put($path . $filename, file_get_contents($filePath));
             Log::debug('upload_url:' . $mp3Url);
             if ($mp3Url) {
-                $data = ['url' => config('customer.chxq_oss_url') . $path . $filename,'music_duration' => $details];
+                $data = ['url' => config('customer.chxq_oss_url') . $path . $filename, 'music_duration' => $details];
                 return $data;
             } else {
                 return 'mp3上传失败,请重试';