|
| xqd
@@ -58,8 +58,8 @@ class PosterController extends Controller
|
|
|
private function _createSave()
|
|
|
{
|
|
|
$data = (array) request('data');
|
|
|
- if (isset($data['video_url'])) {
|
|
|
- $data['video_url'] = $this->uploadVideo($data['video_url'], '');
|
|
|
+ if (request()->file('video_url')) {
|
|
|
+ $data['video_url'] = $this->uploadVideo(request()->file('video_url'), '');
|
|
|
}
|
|
|
if (!empty($data['posters']['url'])) {
|
|
|
foreach ($data['posters']['url'] as $key => $val) {
|
|
| xqd
@@ -95,8 +95,8 @@ class PosterController extends Controller
|
|
|
if (!empty($data)) {
|
|
|
$data = $data[0];
|
|
|
$data['posters'] = json_decode($data['posters'], true);
|
|
|
- $data['banner'] = json_decode($data['banner'], true);
|
|
|
- $data['words'] = json_decode($data['words'], true);
|
|
|
+ $data['video_url'] = json_decode($data['video_url'], true);
|
|
|
+ $data['video_url'] = $data['video_url']['url'];
|
|
|
}
|
|
|
return view('admin.album.poster.edit', compact('data'));
|
|
|
}
|
|
| xqd
@@ -107,8 +107,9 @@ class PosterController extends Controller
|
|
|
private function updateSave()
|
|
|
{
|
|
|
$data = (array) request('data');
|
|
|
- if (isset($data['video_url'])) {
|
|
|
- $data['video_url'] = $this->uploadVideo($data['video_url'], request('id'));
|
|
|
+
|
|
|
+ if (request()->file('video_url')) {
|
|
|
+ $data['video_url'] = $this->uploadVideo(request()->file('video_url'), request('id'));
|
|
|
}
|
|
|
if (!empty($data['posters']['url'])) {
|
|
|
foreach ($data['posters']['url'] as $key => $val) {
|
|
| xqd
@@ -133,7 +134,7 @@ class PosterController extends Controller
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- public function uploadVideo($video,$id)
|
|
|
+ public function uploadVideo($video, $id)
|
|
|
{
|
|
|
// dd($video);
|
|
|
// 判断图片有效性
|
|
| xqd
@@ -143,8 +144,10 @@ class PosterController extends Controller
|
|
|
if ($id) {
|
|
|
$check = AlbumPosterModel::where([['id',$id]])->first();
|
|
|
if ($check) {
|
|
|
- $res = json_decode($check->upload_video, true);
|
|
|
- OSS::publicDeleteObject(config('alioss.BucketName'), $res['oss_key']);
|
|
|
+ $res = json_decode($check->video_url, true);
|
|
|
+ if ($res != '') {
|
|
|
+ OSS::publicDeleteObject(config('alioss.BucketName'), $res['oss_key']);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
| xqd
@@ -155,7 +158,6 @@ class PosterController extends Controller
|
|
|
$ex = $video->getClientOriginalExtension();
|
|
|
$key = time() . rand(10000, 99999999) . '.' . $ex;
|
|
|
//阿里 OSS 文件上传
|
|
|
-
|
|
|
$result = OSS::publicUpload(config('alioss.BucketName'), $key, $videoPath);
|
|
|
if ($result) {
|
|
|
$data['oss_key'] = $key;
|