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/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");
}
}
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/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 %}
未设置
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 * * * *');