From 029de410a8587b4ab16597f2d94b3819b8d0e34d Mon Sep 17 00:00:00 2001 From: koogua Date: Thu, 3 Dec 2020 14:37:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?!23=20=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AF=BE=E6=97=B6=E5=90=8E=E8=BF=9B=E5=85=A5=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2500=E9=94=99=E8=AF=AF=20*=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=B7=BB=E5=8A=A0=E8=AF=BE=E6=97=B6=E5=90=8E=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2500=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Admin/Controllers/ChapterController.php | 2 -- app/Http/Admin/Views/chapter/edit_lesson_vod.volt | 4 +++- app/Http/Admin/Views/course/edit_basic.volt | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Http/Admin/Controllers/ChapterController.php b/app/Http/Admin/Controllers/ChapterController.php index 9b0ff8e7..1c81ebbc 100644 --- a/app/Http/Admin/Controllers/ChapterController.php +++ b/app/Http/Admin/Controllers/ChapterController.php @@ -110,8 +110,6 @@ class ChapterController extends Controller $this->view->pick('chapter/edit_lesson'); - $resources = $chapterService->getResources($chapter->id); - $cos = $chapterService->getSettings('cos'); $this->view->setVar('cos', $cos); diff --git a/app/Http/Admin/Views/chapter/edit_lesson_vod.volt b/app/Http/Admin/Views/chapter/edit_lesson_vod.volt index 95be1e74..6dceb8ef 100644 --- a/app/Http/Admin/Views/chapter/edit_lesson_vod.volt +++ b/app/Http/Admin/Views/chapter/edit_lesson_vod.volt @@ -1,3 +1,5 @@ +{% set file_id = vod ? vod.file_id : '' %} + {% if play_urls %}
视频信息 @@ -51,7 +53,7 @@
- +
diff --git a/app/Http/Admin/Views/course/edit_basic.volt b/app/Http/Admin/Views/course/edit_basic.volt index e28afa78..bf0f5709 100644 --- a/app/Http/Admin/Views/course/edit_basic.volt +++ b/app/Http/Admin/Views/course/edit_basic.volt @@ -30,10 +30,10 @@
- - - - + + + +
From edc6edbfda2554c08465a9dea44911126302d8cf Mon Sep 17 00:00:00 2001 From: koogua Date: Mon, 7 Dec 2020 13:37:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?!34=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=AF=BE=E6=97=B6=E7=9B=B8=E5=85=B3=E5=B1=9E=E6=80=A7=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9C=AA=E7=94=9F=E6=88=90=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20*=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E8=AF=BE?= =?UTF-8?q?=E6=97=B6=E7=9B=B8=E5=85=B3=E5=B1=9E=E6=80=A7=E8=A1=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9C=AA=E7=94=9F=E6=88=90=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Admin/Services/Chapter.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Admin/Services/Chapter.php b/app/Http/Admin/Services/Chapter.php index de9372e4..5a387d95 100644 --- a/app/Http/Admin/Services/Chapter.php +++ b/app/Http/Admin/Services/Chapter.php @@ -78,6 +78,7 @@ class Chapter extends Service $data['parent_id'] = $parent->id; $data['free'] = $validator->checkFreeStatus($post['free']); $data['priority'] = $chapterRepo->maxLessonPriority($post['parent_id']); + $parentId = $parent->id; } else { $data['priority'] = $chapterRepo->maxChapterPriority($post['course_id']); $data['parent_id'] = $parentId; @@ -120,7 +121,7 @@ class Chapter extends Service } if ($attrs === false) { - throw new \RuntimeException("Create Chapter {$course->model} Attrs Failed"); + throw new \RuntimeException("Create Chapter Related Attrs Failed"); } } From 3b99ddae269de0a2588930c8a011f598c2b378c1 Mon Sep 17 00:00:00 2001 From: koogua Date: Mon, 7 Dec 2020 21:06:33 +0800 Subject: [PATCH 3/4] =?UTF-8?q?!35=20=E4=BF=AE=E5=A4=8D=E8=85=BE=E8=AE=AF?= =?UTF-8?q?=E4=BA=91=E5=9B=9E=E8=B0=83=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E6=94=B9=E5=8F=98=E5=AF=BC=E8=87=B4=E7=9A=84=E9=94=99=E8=AF=AF?= =?UTF-8?q?=20*=20=E4=BF=AE=E5=A4=8D=E8=85=BE=E8=AE=AF=E4=BA=91=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E6=94=B9=E5=8F=98?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E9=94=99=E8=AF=AF=EF=BC=8C=E7=BC=A9?= =?UTF-8?q?=E7=9F=ADvod=5Fevent=E8=AE=A1=E5=88=92=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Tasks/VodEventTask.php | 12 +++--------- app/Http/Admin/Services/ChapterContent.php | 14 ++++++++++---- scheduler.php | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/Console/Tasks/VodEventTask.php b/app/Console/Tasks/VodEventTask.php index 0189960b..49d86fc7 100644 --- a/app/Console/Tasks/VodEventTask.php +++ b/app/Console/Tasks/VodEventTask.php @@ -45,7 +45,8 @@ class VodEventTask extends Task protected function handleNewFileUploadEvent($event) { $fileId = $event['FileUploadEvent']['FileId']; - $format = $event['FileUploadEvent']['MediaBasicInfo']['Type']; + $width = $event['FileUploadEvent']['MetaData']['Height']; + $height = $event['FileUploadEvent']['MetaData']['Width']; $duration = $event['FileUploadEvent']['MetaData']['Duration']; $chapterRepo = new ChapterRepo(); @@ -56,7 +57,7 @@ class VodEventTask extends Task $vodService = new VodService(); - if ($this->isAudioFile($format)) { + if ($width == 0 && $height == 0) { $vodService->createTransAudioTask($fileId); } else { $vodService->createTransVideoTask($fileId); @@ -144,13 +145,6 @@ class VodEventTask extends Task return $vodService->confirmEvents($handles); } - protected function isAudioFile($format) - { - $formats = ['mp3', 'm4a', 'wav', 'flac', 'ogg']; - - return in_array(strtolower($format), $formats); - } - protected function updateVodAttrs(ChapterModel $chapter) { $courseStats = new CourseStatService(); diff --git a/app/Http/Admin/Services/ChapterContent.php b/app/Http/Admin/Services/ChapterContent.php index f02962d1..09fccf37 100644 --- a/app/Http/Admin/Services/ChapterContent.php +++ b/app/Http/Admin/Services/ChapterContent.php @@ -81,10 +81,20 @@ class ChapterContent extends Service $vod = $chapterRepo->findChapterVod($chapter->id); + /** + * 无新文件上传 + */ if ($fileId == $vod->file_id) { return; } + /** + * 删除旧文件 + */ + if ($vod->file_id) { + $this->deleteVodFile($vod->file_id); + } + $vod->update([ 'file_id' => $fileId, 'file_transcode' => '', @@ -102,10 +112,6 @@ class ChapterContent extends Service $chapter->update(['attrs' => $attrs]); $this->updateCourseVodAttrs($vod->course_id); - - if (!empty($vod->file_id)) { - $this->deleteVodFile($vod->file_id); - } } protected function updateChapterLive(ChapterModel $chapter) diff --git a/scheduler.php b/scheduler.php index ddc820e2..b038b608 100644 --- a/scheduler.php +++ b/scheduler.php @@ -20,7 +20,7 @@ $scheduler->php($script, $bin, ['--task' => 'sync_learning', '--action' => 'main ->at('*/7 * * * *'); $scheduler->php($script, $bin, ['--task' => 'vod_event', '--action' => 'main']) - ->at('*/9 * * * *'); + ->at('*/5 * * * *'); $scheduler->php($script, $bin, ['--task' => 'close_trade', '--action' => 'main']) ->at('*/13 * * * *'); From 6b56711fe9cc64a2300f7ce0a82ae0724f139da6 Mon Sep 17 00:00:00 2001 From: koogua Date: Tue, 8 Dec 2020 12:44:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?!36=20=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=90=8E=E8=BF=9B=E5=85=A5=E5=88=97=E8=A1=A8?= =?UTF-8?q?500=E9=94=99=E8=AF=AF=20*=20=E4=BF=AE=E5=A4=8D=E6=9C=AA?= =?UTF-8?q?=E5=A1=AB=E5=85=85=E6=95=99=E5=B8=88=E5=92=8C=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=9A=84=E5=88=97=E8=A1=A8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Admin/Views/course/list.volt | 8 ++++++-- app/Http/Admin/Views/im/group/list.volt | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Http/Admin/Views/course/list.volt b/app/Http/Admin/Views/course/list.volt index 450a3641..b4ed45a7 100644 --- a/app/Http/Admin/Views/course/list.volt +++ b/app/Http/Admin/Views/course/list.volt @@ -9,6 +9,8 @@ 直播 {% elseif value == 3 %} 专栏 + {% else %} + 未知 {% endif %} {%- endmacro %} @@ -22,19 +24,21 @@ 中级 {% elseif value == 4 %} 高级 + {% else %} + 未知 {% endif %} {%- endmacro %} {%- macro category_info(category) %} - {% if category %} + {% if category.id is defined %} {% set url = url({'for':'admin.course.list'},{'category_id':category.id}) %} 分类：{{ category.name }} {% endif %} {%- endmacro %} {%- macro teacher_info(teacher) %} - {% if teacher %} + {% if teacher.id is defined %} {% set url = url({'for':'admin.course.list'},{'teacher_id':teacher.id}) %} 讲师：{{ teacher.name }} {% endif %} diff --git a/app/Http/Admin/Views/im/group/list.volt b/app/Http/Admin/Views/im/group/list.volt index 6570f894..7934d5b4 100644 --- a/app/Http/Admin/Views/im/group/list.volt +++ b/app/Http/Admin/Views/im/group/list.volt @@ -9,11 +9,13 @@ 聊 {% elseif value == 3 %} 职 + {% else %} + 未知 {% endif %} {%- endmacro %} {%- macro owner_info(owner) %} - {% if owner %} + {% if owner.id is defined %} {{ owner.name }}（{{ owner.id }}） {% else %} 未设置