diff --git a/CHANGELOG.md b/CHANGELOG.md index 091cff25..3e1502d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ -### [v1.6.7](https://gitee.com/koogua/course-tencent-cloud/releases/v1.6.7)(2023-10-30) +### [v1.6.7](https://gitee.com/koogua/course-tencent-cloud/releases/v1.6.7)(2023-12-15) +- 增加文章分类功能 +- 增加问题分类功能 +- 增加审核等批量功能 +- 增加若干业务插件埋点 +- 精简重构大量业务逻辑 +- 移除秒杀营销功能 +- 已发现的问题修复 ### [v1.6.6](https://gitee.com/koogua/course-tencent-cloud/releases/v1.6.6)(2023-08-30) diff --git a/app/Console/Migrations/V20231201101515.php b/app/Console/Migrations/V20231201101515.php new file mode 100644 index 00000000..0fbecd3f --- /dev/null +++ b/app/Console/Migrations/V20231201101515.php @@ -0,0 +1,87 @@ +handleCourseUsers(); + $this->handleChapterUsers(); + } + + protected function handleCourseUsers() + { + $courseUsers = $this->findCourseUsers(); + + if ($courseUsers->count() == 0) return; + + $mappings = []; + + /** + * 只保留第一条记录 + */ + foreach ($courseUsers as $courseUser) { + $key = $courseUser->course_id . '-' . $courseUser->user_id; + if (!isset($mappings[$key])) { + $mappings[$key] = 1; + } else { + $courseUser->deleted = 1; + $courseUser->update(); + } + } + } + + protected function handleChapterUsers() + { + $chapterUsers = $this->findChapterUsers(); + + if ($chapterUsers->count() == 0) return; + + /** + * 只保留第一条记录 + */ + foreach ($chapterUsers as $chapterUser) { + $key = $chapterUser->chapter_id . '-' . $chapterUser->user_id; + if (!isset($mappings[$key])) { + $mappings[$key] = 1; + } else { + $chapterUser->deleted = 1; + $chapterUser->update(); + } + } + } + + /** + * @return ResultsetInterface|CourseUserModel[] + */ + protected function findCourseUsers() + { + return CourseUserModel::query() + ->where('deleted = 0') + ->orderBy('id DESC') + ->execute(); + } + + /** + * @return ResultsetInterface|ChapterUserModel[] + */ + protected function findChapterUsers() + { + return ChapterUserModel::query() + ->where('deleted = 0') + ->orderBy('id DESC') + ->execute(); + } + +} \ No newline at end of file diff --git a/app/Http/Home/Controllers/TeacherController.php b/app/Http/Home/Controllers/TeacherController.php index 91b2ab65..6dfc10c6 100644 --- a/app/Http/Home/Controllers/TeacherController.php +++ b/app/Http/Home/Controllers/TeacherController.php @@ -31,7 +31,7 @@ class TeacherController extends Controller return $this->response->redirect($location); } - $this->seo->prependTitle('教师'); + $this->seo->prependTitle('师资'); } /** diff --git a/app/Http/Home/Views/teacher/list.volt b/app/Http/Home/Views/teacher/list.volt index 8d8fb097..2b850ea3 100644 --- a/app/Http/Home/Views/teacher/list.volt +++ b/app/Http/Home/Views/teacher/list.volt @@ -6,7 +6,7 @@
diff --git a/db/migrations/20210403184518.php b/db/migrations/20210403184518.php index cc46ce94..787453a3 100644 --- a/db/migrations/20210403184518.php +++ b/db/migrations/20210403184518.php @@ -155,7 +155,7 @@ final class V20210403184518 extends AbstractMigration 'id' => 5, 'parent_id' => 0, 'level' => 1, - 'name' => '教师', + 'name' => '师资', 'path' => ',5,', 'target' => '_self', 'url' => '/teacher/list',