wesmiler

app/Helpers/common.php

@@ -875,11 +875,11 @@ if (!function_exists('get_format_images')) {
 
         $datas = [];
         foreach ($images as $v) {
-            $url = isset($v[$key]) ? $v[$key] : '';
+            $url = isset($v[$key]) ? $v[$key] : $v;
             if ($url) {
-                $datas[] = [
+                $datas[] = $key? [
                     $key=> get_image_path($url)
-                ];
+                ] : get_image_path($url);
             }
         }
 

app/Services/Api/VideoService.php

@@ -364,7 +364,7 @@ class VideoService extends BaseService
 
         // 视频
         $fileUrl = isset($params['file_url'])? trim($params['file_url']) : '';
-        $albums = isset($params['albums'])? $params['albums'] : [];
+        $albums = isset($params['album_urls'])? $params['album_urls'] : [];
         if($type == 1) {
             if($fileUrl){
                 $result = upload_video($request,'video');
@@ -386,18 +386,8 @@ class VideoService extends BaseService
                 $this->error = 2211;
                 return false;
             }
-            $files = [];
-            foreach ($albums as $album){
-                $result = upload_base64($album);
-                $url = isset($result['file_path'])? $result['file_path'] : '';
-                if(empty($url)){
-                    $this->error = 2212;
-                    return false;
-                }
-                $files[] = ['url'=> $url];
-            }
 
-            $albums = $files;
+            $albums = get_format_images($albums);
         }
 
         $title = isset($params['title']) && $params['title']? trim($params['title']) : "{$nickname} 发布的短视频";
@@ -413,7 +403,7 @@ class VideoService extends BaseService
             'tags'  =>  $tags && is_array($tags)? implode(',', $tags) : $tags,
             'file_url'  => $fileUrl,
             'thumb'  => $thumb,
-            'albums'  => $albums? json_encode($albums) : '',
+            'albums'  => $albums? $albums : '',
             'music_hash'  => isset($params['music_hash'])? trim($params['music_hash']) : '',
             'music_name'  => isset($params['music_name'])? trim($params['music_name']) : '',
             'music_url'  => $musicUrl,