diff --git a/app/Builders/ConsultList.php b/app/Builders/ConsultList.php index a2feda41..c74407bd 100644 --- a/app/Builders/ConsultList.php +++ b/app/Builders/ConsultList.php @@ -25,7 +25,7 @@ class ConsultList extends Builder $users = $this->getUsers($consults); foreach ($consults as $key => $consult) { - $consults[$key]['user'] = $users[$consult['user_id']] ?? new \stdClass(); + $consults[$key]['owner'] = $users[$consult['owner_id']] ?? new \stdClass(); } return $consults; @@ -67,7 +67,7 @@ class ConsultList extends Builder public function getUsers(array $consults) { - $ids = kg_array_column($consults, 'user_id'); + $ids = kg_array_column($consults, 'owner_id'); $userRepo = new UserRepo(); diff --git a/app/Builders/ChapterTreeList.php b/app/Builders/CourseCatalog.php similarity index 98% rename from app/Builders/ChapterTreeList.php rename to app/Builders/CourseCatalog.php index 34da6b6a..5415dae2 100644 --- a/app/Builders/ChapterTreeList.php +++ b/app/Builders/CourseCatalog.php @@ -7,7 +7,7 @@ use App\Models\Course as CourseModel; use Phalcon\Mvc\Model\Resultset; use Phalcon\Mvc\Model\ResultsetInterface; -class ChapterTreeList extends Builder +class CourseCatalog extends Builder { /** diff --git a/app/Builders/DanmuList.php b/app/Builders/DanmuList.php index 270514b4..0886ed9c 100644 --- a/app/Builders/DanmuList.php +++ b/app/Builders/DanmuList.php @@ -36,7 +36,7 @@ class DanmuList extends Builder $users = $this->getUsers($danmus); foreach ($danmus as $key => $danmu) { - $danmus[$key]['user'] = $users[$danmu['user_id']] ?? new \stdClass(); + $danmus[$key]['owner'] = $users[$danmu['owner_id']] ?? new \stdClass(); } return $danmus; @@ -78,7 +78,7 @@ class DanmuList extends Builder public function getUsers(array $danmus) { - $ids = kg_array_column($danmus, 'user_id'); + $ids = kg_array_column($danmus, 'owner_id'); $userRepo = new UserRepo(); diff --git a/app/Builders/ImGroupList.php b/app/Builders/ImGroupList.php new file mode 100644 index 00000000..7f779425 --- /dev/null +++ b/app/Builders/ImGroupList.php @@ -0,0 +1,70 @@ +getCourses($groups); + + foreach ($groups as $key => $group) { + $groups[$key]['course'] = $courses[$group['course_id']] ?? new \stdClass(); + } + + return $groups; + } + + public function handleUsers(array $groups) + { + $users = $this->getUsers($groups); + + foreach ($groups as $key => $group) { + $groups[$key]['owner'] = $users[$group['owner_id']] ?? new \stdClass(); + } + + return $groups; + } + + public function getCourses(array $groups) + { + $ids = kg_array_column($groups, 'course_id'); + + $courseRepo = new CourseRepo(); + + $courses = $courseRepo->findByIds($ids, ['id', 'title']); + + $result = []; + + foreach ($courses->toArray() as $course) { + $result[$course['id']] = $course; + } + + return $result; + } + + public function getUsers(array $groups) + { + $ids = kg_array_column($groups, 'owner_id'); + + $userRepo = new UserRepo(); + + $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']); + + $baseUrl = kg_ci_base_url(); + + $result = []; + + foreach ($users->toArray() as $user) { + $user['avatar'] = $baseUrl . $user['avatar']; + $result[$user['id']] = $user; + } + + return $result; + } + +} diff --git a/app/Builders/ReviewList.php b/app/Builders/ReviewList.php index 322a69ac..a78a1f65 100644 --- a/app/Builders/ReviewList.php +++ b/app/Builders/ReviewList.php @@ -24,7 +24,7 @@ class ReviewList extends Builder $users = $this->getUsers($reviews); foreach ($reviews as $key => $review) { - $reviews[$key]['user'] = $users[$review['user_id']] ?? new \stdClass(); + $reviews[$key]['owner'] = $users[$review['owner_id']] ?? new \stdClass(); } return $reviews; @@ -49,7 +49,7 @@ class ReviewList extends Builder public function getUsers(array $reviews) { - $ids = kg_array_column($reviews, 'user_id'); + $ids = kg_array_column($reviews, 'owner_id'); $userRepo = new UserRepo(); diff --git a/app/Caches/CourseChapterList.php b/app/Caches/CourseCatalog.php similarity index 63% rename from app/Caches/CourseChapterList.php rename to app/Caches/CourseCatalog.php index 62b12f4c..687a50ab 100644 --- a/app/Caches/CourseChapterList.php +++ b/app/Caches/CourseCatalog.php @@ -2,9 +2,9 @@ namespace App\Caches; -use App\Builders\ChapterTreeList as ChapterTreeListBuilder; +use App\Builders\CourseCatalog as CourseCatalogBuilder; -class CourseChapterList extends Cache +class CourseCatalog extends Cache { protected $lifetime = 7 * 86400; @@ -16,12 +16,12 @@ class CourseChapterList extends Cache public function getKey($id = null) { - return "course_chapter_list:{$id}"; + return "course_catalog:{$id}"; } public function getContent($id = null) { - $builder = new ChapterTreeListBuilder(); + $builder = new CourseCatalogBuilder(); $list = $builder->handle($id); diff --git a/app/Caches/UserDailyCounter.php b/app/Caches/UserDailyCounter.php index cbe76277..3382ace4 100644 --- a/app/Caches/UserDailyCounter.php +++ b/app/Caches/UserDailyCounter.php @@ -22,7 +22,6 @@ class UserDailyCounter extends Counter public function getContent($id = null) { return [ - 'favorite_count' => 0, 'danmu_count' => 0, 'consult_count' => 0, 'order_count' => 0, diff --git a/app/Http/Admin/Controllers/GroupController.php b/app/Http/Admin/Controllers/GroupController.php new file mode 100644 index 00000000..4ce56787 --- /dev/null +++ b/app/Http/Admin/Controllers/GroupController.php @@ -0,0 +1,132 @@ +getGroups(); + + $this->view->setVar('pager', $pager); + } + + /** + * @Get("/search", name="admin.group.search") + */ + public function searchAction() + { + + } + + /** + * @Get("/add", name="admin.group.add") + */ + public function addAction() + { + + } + + /** + * @Post("/create", name="admin.group.create") + */ + public function createAction() + { + $groupService = new ImGroupService(); + + $group = $groupService->createGroup(); + + $location = $this->url->get([ + 'for' => 'admin.group.edit', + 'id' => $group->id, + ]); + + $content = [ + 'location' => $location, + 'msg' => '创建群组成功', + ]; + + return $this->jsonSuccess($content); + } + + /** + * @Get("/{id:[0-9]+}/edit", name="admin.group.edit") + */ + public function editAction($id) + { + $groupService = new ImGroupService(); + + $group = $groupService->getGroup($id); + + $this->view->setVar('group', $group); + } + + /** + * @Post("/{id:[0-9]+}/update", name="admin.group.update") + */ + public function updateAction($id) + { + $groupService = new ImGroupService(); + + $groupService->updateGroup($id); + + $location = $this->url->get(['for' => 'admin.group.list']); + + $content = [ + 'location' => $location, + 'msg' => '更新群组成功', + ]; + + return $this->jsonSuccess($content); + } + + /** + * @Post("/{id:[0-9]+}/delete", name="admin.group.delete") + */ + public function deleteAction($id) + { + $groupService = new ImGroupService(); + + $groupService->deleteGroup($id); + + $location = $this->request->getHTTPReferer(); + + $content = [ + 'location' => $location, + 'msg' => '删除群组成功', + ]; + + return $this->jsonSuccess($content); + } + + /** + * @Post("/{id:[0-9]+}/restore", name="admin.group.restore") + */ + public function restoreAction($id) + { + $groupService = new ImGroupService(); + + $groupService->restoreGroup($id); + + $location = $this->request->getHTTPReferer(); + + $content = [ + 'location' => $location, + 'msg' => '还原群组成功', + ]; + + return $this->jsonSuccess($content); + } + +} diff --git a/app/Http/Admin/Services/AuthNode.php b/app/Http/Admin/Services/AuthNode.php index 077ef889..a4693f5e 100644 --- a/app/Http/Admin/Services/AuthNode.php +++ b/app/Http/Admin/Services/AuthNode.php @@ -325,6 +325,43 @@ class AuthNode extends Service ], ], ], + [ + 'id' => '2-4', + 'title' => '群组管理', + 'type' => 'menu', + 'children' => [ + [ + 'id' => '2-4-1', + 'title' => '群组列表', + 'type' => 'menu', + 'route' => 'admin.group.list', + ], + [ + 'id' => '2-4-2', + 'title' => '搜索群组', + 'type' => 'menu', + 'route' => 'admin.group.search', + ], + [ + 'id' => '2-4-3', + 'title' => '添加群组', + 'type' => 'menu', + 'route' => 'admin.group.add', + ], + [ + 'id' => '2-4-4', + 'title' => '编辑群组', + 'type' => 'button', + 'route' => 'admin.group.edit', + ], + [ + 'id' => '2-4-5', + 'title' => '删除群组', + 'type' => 'button', + 'route' => 'admin.group.delete', + ], + ], + ], [ 'id' => '2-5', 'title' => '轮播管理', diff --git a/app/Http/Admin/Services/Chapter.php b/app/Http/Admin/Services/Chapter.php index a4b1e4ab..9a730d62 100644 --- a/app/Http/Admin/Services/Chapter.php +++ b/app/Http/Admin/Services/Chapter.php @@ -3,7 +3,7 @@ namespace App\Http\Admin\Services; use App\Caches\Chapter as ChapterCache; -use App\Caches\CourseChapterList as CourseChapterListCache; +use App\Caches\CourseCatalog as CourseCatalogCache; use App\Models\Chapter as ChapterModel; use App\Models\ChapterLive as ChapterLiveModel; use App\Models\ChapterRead as ChapterReadModel; @@ -166,6 +166,8 @@ class Chapter extends Service $this->updateCourseStats($chapter); + $this->rebuildCatalogCache($chapter); + return $chapter; } @@ -185,6 +187,8 @@ class Chapter extends Service $this->updateCourseStats($chapter); + $this->rebuildCatalogCache($chapter); + return $chapter; } @@ -200,6 +204,8 @@ class Chapter extends Service $this->updateCourseStats($chapter); + $this->rebuildCatalogCache($chapter); + return $chapter; } @@ -240,8 +246,11 @@ class Chapter extends Service $cache = new ChapterCache(); $cache->rebuild($chapter->id); + } - $cache = new CourseChapterListCache(); + protected function rebuildCatalogCache(ChapterModel $chapter) + { + $cache = new CourseCatalogCache(); $cache->rebuild($chapter->course_id); } diff --git a/app/Http/Admin/Services/Consult.php b/app/Http/Admin/Services/Consult.php index e668f61e..8625cf86 100644 --- a/app/Http/Admin/Services/Consult.php +++ b/app/Http/Admin/Services/Consult.php @@ -52,11 +52,11 @@ class Consult extends Service $data = []; - if (isset($post['question'])) { + if (!empty($post['question'])) { $data['question'] = $validator->checkQuestion($post['question']); } - if (isset($post['answer'])) { + if (!empty($post['answer'])) { $data['answer'] = $validator->checkAnswer($post['answer']); } diff --git a/app/Http/Admin/Services/Course.php b/app/Http/Admin/Services/Course.php index 3f064898..04ea4b02 100644 --- a/app/Http/Admin/Services/Course.php +++ b/app/Http/Admin/Services/Course.php @@ -96,6 +96,7 @@ class Course extends Service $imGroup->course_id = $course->id; $imGroup->name = $course->title; $imGroup->about = $course->summary; + $imGroup->published = 1; if ($imGroup->create() === false) { throw new \RuntimeException('Create ImGroup Failed'); diff --git a/app/Http/Admin/Services/ImGroup.php b/app/Http/Admin/Services/ImGroup.php new file mode 100644 index 00000000..a24cd560 --- /dev/null +++ b/app/Http/Admin/Services/ImGroup.php @@ -0,0 +1,159 @@ +getParams(); + + $params['deleted'] = $params['deleted'] ?? 0; + + $sort = $pagerQuery->getSort(); + $page = $pagerQuery->getPage(); + $limit = $pagerQuery->getLimit(); + + $groupRepo = new ImGroupRepo(); + + $pager = $groupRepo->paginate($params, $sort, $page, $limit); + + return $this->handleGroups($pager); + } + + public function getGroup($id) + { + return $this->findOrFail($id); + } + + public function createGroup() + { + $post = $this->request->getPost(); + + $validator = new ImGroupValidator(); + + $data = []; + + $data['name'] = $validator->checkName($post['name']); + $data['about'] = $validator->checkAbout($post['about']); + $data['type'] = $validator->checkType($post['type']); + + $group = new ImGroupModel(); + + $group->create($data); + + return $group; + } + + public function updateGroup($id) + { + $group = $this->findOrFail($id); + + $post = $this->request->getPost(); + + $validator = new ImGroupValidator(); + + $data = []; + + if (isset($post['name'])) { + $data['name'] = $validator->checkName($post['name']); + } + + if (isset($post['about'])) { + $data['about'] = $validator->checkAbout($post['about']); + } + + if (isset($post['avatar'])) { + $data['avatar'] = $validator->checkAvatar($post['avatar']); + } + + if (isset($post['published'])) { + $data['published'] = $validator->checkPublishStatus($post['published']); + } + + if (isset($post['owner_id'])) { + $owner = $validator->checkGroupOwner($post['owner_id']); + $data['owner_id'] = $owner->id; + $this->handleGroupOwner($group, $owner); + } + + $group->update($data); + + return $group; + } + + public function deleteGroup($id) + { + $group = $this->findOrFail($id); + + $group->deleted = 1; + + $group->update(); + + return $group; + } + + public function restoreGroup($id) + { + $group = $this->findOrFail($id); + + $group->deleted = 0; + + $group->update(); + + return $group; + } + + protected function handleGroupOwner(ImGroupModel $group, UserModel $user) + { + $repo = new ImGroupUserRepo(); + + $groupUser = $repo->findGroupUser($group->id, $user->id); + + if ($groupUser) return; + + $groupUser = new ImGroupUserModel(); + $groupUser->group_id = $group->id; + $groupUser->user_id = $user->id; + $groupUser->create(); + + $group->user_count += 1; + $group->update(); + } + + protected function handleGroups($pager) + { + if ($pager->total_items > 0) { + + $builder = new ImGroupListBuilder(); + + $pipeA = $pager->items->toArray(); + $pipeB = $builder->handleUsers($pipeA); + $pipeC = $builder->objects($pipeB); + + $pager->items = $pipeC; + } + + return $pager; + } + + protected function findOrFail($id) + { + $validator = new ImGroupValidator(); + + return $validator->checkGroup($id); + } + +} diff --git a/app/Http/Admin/Views/category/list.volt b/app/Http/Admin/Views/category/list.volt index 5a0f06c3..48f66a7b 100644 --- a/app/Http/Admin/Views/category/list.volt +++ b/app/Http/Admin/Views/category/list.volt @@ -52,7 +52,7 @@ {{ item.level }} {{ item.child_count }} {{ item.course_count }} - +
diff --git a/app/Http/Admin/Views/chapter/add_lesson.volt b/app/Http/Admin/Views/chapter/add_lesson.volt index c8eb6616..a4e23008 100644 --- a/app/Http/Admin/Views/chapter/add_lesson.volt +++ b/app/Http/Admin/Views/chapter/add_lesson.volt @@ -34,7 +34,7 @@
- +
diff --git a/app/Http/Admin/Views/chapter/edit_lesson_basic.volt b/app/Http/Admin/Views/chapter/edit_lesson_basic.volt index 8819d6e1..a8ccd8d3 100644 --- a/app/Http/Admin/Views/chapter/edit_lesson_basic.volt +++ b/app/Http/Admin/Views/chapter/edit_lesson_basic.volt @@ -24,8 +24,8 @@
- - + +
diff --git a/app/Http/Admin/Views/chapter/edit_lesson_vod.volt b/app/Http/Admin/Views/chapter/edit_lesson_vod.volt index cc5f07e7..3ffdbb1c 100644 --- a/app/Http/Admin/Views/chapter/edit_lesson_vod.volt +++ b/app/Http/Admin/Views/chapter/edit_lesson_vod.volt @@ -14,7 +14,7 @@ {% for item in play_urls %} {{ item.format }} - {{ item.duration|play_duration }} + {{ item.duration|duration }} {{ item.width }} x {{ item.height }} {{ item.rate }}kbps {{ item.size }}M diff --git a/app/Http/Admin/Views/chapter/lessons_live.volt b/app/Http/Admin/Views/chapter/lessons_live.volt index 9db97dff..029ed8ed 100644 --- a/app/Http/Admin/Views/chapter/lessons_live.volt +++ b/app/Http/Admin/Views/chapter/lessons_live.volt @@ -37,7 +37,7 @@ 课 {{ live_time_info(item.attrs) }} - + diff --git a/app/Http/Admin/Views/chapter/lessons_read.volt b/app/Http/Admin/Views/chapter/lessons_read.volt index 1ee05934..e6146fc9 100644 --- a/app/Http/Admin/Views/chapter/lessons_read.volt +++ b/app/Http/Admin/Views/chapter/lessons_read.volt @@ -28,7 +28,7 @@ 课 {{ item.attrs['word_count'] }} - + diff --git a/app/Http/Admin/Views/chapter/lessons_vod.volt b/app/Http/Admin/Views/chapter/lessons_vod.volt index 16ef3794..de0421a8 100644 --- a/app/Http/Admin/Views/chapter/lessons_vod.volt +++ b/app/Http/Admin/Views/chapter/lessons_vod.volt @@ -44,8 +44,8 @@ 课 {{ file_status(item.attrs['file_status']) }} - {{ item.attrs['duration']|play_duration }} - + {{ item.attrs['duration']|duration }} + diff --git a/app/Http/Admin/Views/consult/edit.volt b/app/Http/Admin/Views/consult/edit.volt index 369d3adf..4b90ac0a 100644 --- a/app/Http/Admin/Views/consult/edit.volt +++ b/app/Http/Admin/Views/consult/edit.volt @@ -14,23 +14,23 @@
- +
- - + +
- - + +
diff --git a/app/Http/Admin/Views/consult/list.volt b/app/Http/Admin/Views/consult/list.volt index dfddee1a..98ad8c46 100644 --- a/app/Http/Admin/Views/consult/list.volt +++ b/app/Http/Admin/Views/consult/list.volt @@ -49,8 +49,8 @@ {% endif %} -

昵称：{{ item.user.name }}

-

编号：{{ item.user.id }}

+

昵称：{{ item.owner.name }}

+

编号：{{ item.owner.id }}

{{ date('Y-m-d H:i:s',item.create_time) }} diff --git a/app/Http/Admin/Views/consult/search.volt b/app/Http/Admin/Views/consult/search.volt index 52cf3633..99fc3c32 100644 --- a/app/Http/Admin/Views/consult/search.volt +++ b/app/Http/Admin/Views/consult/search.volt @@ -21,7 +21,7 @@
- +
diff --git a/app/Http/Admin/Views/course/chapters.volt b/app/Http/Admin/Views/course/chapters.volt index c5e34ab6..461c26a4 100644 --- a/app/Http/Admin/Views/course/chapters.volt +++ b/app/Http/Admin/Views/course/chapters.volt @@ -42,7 +42,7 @@ {{ item.lesson_count }} - +
diff --git a/app/Http/Admin/Views/course/edit_basic.volt b/app/Http/Admin/Views/course/edit_basic.volt index 9bd5fa4f..eb434793 100644 --- a/app/Http/Admin/Views/course/edit_basic.volt +++ b/app/Http/Admin/Views/course/edit_basic.volt @@ -11,9 +11,9 @@
{% if course.cover %} - + {% else %} - {{ image('id':'cover-img','class':'kg-cover','src':'admin/img/default_cover.png') }} + {{ image('id':'img-cover','class':'kg-cover','src':'admin/img/default_cover.png') }} {% endif %}
diff --git a/app/Http/Admin/Views/group/add.volt b/app/Http/Admin/Views/group/add.volt new file mode 100644 index 00000000..210d4a28 --- /dev/null +++ b/app/Http/Admin/Views/group/add.volt @@ -0,0 +1,37 @@ +
+ +
+ 添加群组 +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ + +
+
+ +
+ +
+ + +
+
+ +
\ No newline at end of file diff --git a/app/Http/Admin/Views/group/edit.volt b/app/Http/Admin/Views/group/edit.volt new file mode 100644 index 00000000..e4d78ec9 --- /dev/null +++ b/app/Http/Admin/Views/group/edit.volt @@ -0,0 +1,61 @@ +
+ +
+ 编辑群组 +
+ +
+ +
+ {% if group.avatar %} + + {% else %} + {{ image('id':'img-cover','class':'kg-cover','src':'admin/img/default_cover.png') }} + {% endif %} + +
+
+ 编辑 +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ + +
+
+ +
+ +
+ + +
+
+ +
+ +{{ partial('partials/cover_uploader') }} \ No newline at end of file diff --git a/app/Http/Admin/Views/group/list.volt b/app/Http/Admin/Views/group/list.volt new file mode 100644 index 00000000..0f4638f1 --- /dev/null +++ b/app/Http/Admin/Views/group/list.volt @@ -0,0 +1,63 @@ +{%- macro owner_info(owner) %} + {% if owner %} + {{ owner.name }}（{{ owner.id }}） + {% else %} + 未设置 + {% endif %} +{%- endmacro %} + +
+
+ + 群组管理 + +
+
+ + 添加群组 + +
+
+ + + + + + + + + + + + + + + + + + + + + + {% for item in pager.items %} + + + + + + + + + {% endfor %} + +
编号名称群主成员发布操作
{{ item.id }}{{ item.name }}{{ owner_info(item.owner) }}{{ item.user_count }} +
+ + +
+
+ +{{ partial('partials/pager') }} \ No newline at end of file diff --git a/app/Http/Admin/Views/group/search.volt b/app/Http/Admin/Views/group/search.volt new file mode 100644 index 00000000..671cf511 --- /dev/null +++ b/app/Http/Admin/Views/group/search.volt @@ -0,0 +1,67 @@ +
+ +
+ 搜索群组 +
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ + +
+
+ +
+ +
+ + +
+
+ +
+ +
+ + +
+
+ +
+ +
+ + +
+
+ +
\ No newline at end of file diff --git a/app/Http/Admin/Views/help/list.volt b/app/Http/Admin/Views/help/list.volt index a8755fc9..e1d4aebe 100644 --- a/app/Http/Admin/Views/help/list.volt +++ b/app/Http/Admin/Views/help/list.volt @@ -39,7 +39,7 @@ {{ item.title }} {{ date('Y-m-d H:i',item.create_time) }} {{ date('Y-m-d H:i',item.update_time) }} - + diff --git a/app/Http/Admin/Views/nav/list.volt b/app/Http/Admin/Views/nav/list.volt index 6cb6506a..397ad959 100644 --- a/app/Http/Admin/Views/nav/list.volt +++ b/app/Http/Admin/Views/nav/list.volt @@ -71,7 +71,7 @@ {{ item.child_count }} {{ position_info(item.position) }} {{ target_info(item.target) }} - +
diff --git a/app/Http/Admin/Views/partials/cover_uploader.volt b/app/Http/Admin/Views/partials/cover_uploader.volt index 2252665c..80ab226a 100644 --- a/app/Http/Admin/Views/partials/cover_uploader.volt +++ b/app/Http/Admin/Views/partials/cover_uploader.volt @@ -15,7 +15,7 @@ layer.load(); }, done: function (res, index, upload) { - $('#cover-img').attr('src', res.data.src); + $('#img-cover').attr('src', res.data.src); $('input[name=cover]').val(res.data.src); layer.closeAll('loading'); }, diff --git a/app/Http/Admin/Views/partials/pager.volt b/app/Http/Admin/Views/partials/pager.volt index 3f8b8892..c6945b16 100644 --- a/app/Http/Admin/Views/partials/pager.volt +++ b/app/Http/Admin/Views/partials/pager.volt @@ -1,8 +1,10 @@ {% if pager.total_pages > 1 %} -
- 首页 - 上页 - 下页 - 尾页 +
+
+ 首页 + 上页 + 下页 + 尾页 +
{% endif %} \ No newline at end of file diff --git a/app/Http/Admin/Views/review/edit.volt b/app/Http/Admin/Views/review/edit.volt index 944cc70a..9eb98405 100644 --- a/app/Http/Admin/Views/review/edit.volt +++ b/app/Http/Admin/Views/review/edit.volt @@ -22,8 +22,8 @@
- - + +
diff --git a/app/Http/Admin/Views/review/list.volt b/app/Http/Admin/Views/review/list.volt index aaa0619c..a05cfee1 100644 --- a/app/Http/Admin/Views/review/list.volt +++ b/app/Http/Admin/Views/review/list.volt @@ -41,8 +41,8 @@

评价：{{ substr(item.content,0,30) }}

-

昵称：{{ item.user.name }}

-

编号：{{ item.user.id }}

+

昵称：{{ item.owner.name }}

+

编号：{{ item.owner.id }}

{{ date('Y-m-d H:i:s',item.create_time) }} diff --git a/app/Http/Admin/Views/review/search.volt b/app/Http/Admin/Views/review/search.volt index fd47c8a8..8b4b714d 100644 --- a/app/Http/Admin/Views/review/search.volt +++ b/app/Http/Admin/Views/review/search.volt @@ -21,7 +21,7 @@
- +
diff --git a/app/Http/Admin/Views/slide/edit.volt b/app/Http/Admin/Views/slide/edit.volt index 2b865374..c72e5c56 100644 --- a/app/Http/Admin/Views/slide/edit.volt +++ b/app/Http/Admin/Views/slide/edit.volt @@ -18,9 +18,9 @@
{% if slide.cover %} - + {% else %} - {{ image('id':'cover-img','class':'kg-cover','src':'admin/img/default_cover.png') }} + {{ image('id':'img-cover','class':'kg-cover','src':'admin/img/default_cover.png') }} {% endif %}
diff --git a/app/Http/Admin/Views/slide/list.volt b/app/Http/Admin/Views/slide/list.volt index 53498c2d..1bf48de3 100644 --- a/app/Http/Admin/Views/slide/list.volt +++ b/app/Http/Admin/Views/slide/list.volt @@ -46,8 +46,8 @@ {{ item.id }} {{ item.title }} {{ target_info(item.target) }} - - + +
diff --git a/app/Http/Web/Controllers/ChapterController.php b/app/Http/Web/Controllers/ChapterController.php index 7837e2c6..02b664ca 100644 --- a/app/Http/Web/Controllers/ChapterController.php +++ b/app/Http/Web/Controllers/ChapterController.php @@ -4,10 +4,9 @@ namespace App\Http\Web\Controllers; use App\Services\Frontend\Chapter\ChapterInfo as ChapterInfoService; use App\Services\Frontend\Chapter\ChapterLike as ChapterLikeService; -use App\Services\Frontend\Chapter\CommentList as ChapterCommentListService; use App\Services\Frontend\Chapter\DanmuList as ChapterDanmuListService; use App\Services\Frontend\Chapter\Learning as ChapterLearningService; -use App\Services\Frontend\Course\ChapterList as CourseChapterListService; +use App\Services\Frontend\Course\ChapterList as CourseCatalogService; /** * @RoutePrefix("/chapter") @@ -33,7 +32,7 @@ class ChapterController extends Controller ]); } - $service = new CourseChapterListService(); + $service = new CourseCatalogService(); $contents = $service->handle($chapter['course']['id']); @@ -65,18 +64,6 @@ class ChapterController extends Controller return $this->jsonSuccess(['items' => $items]); } - /** - * @Get("/{id:[0-9]+}/comments", name="web.chapter.comments") - */ - public function commentsAction($id) - { - $service = new ChapterCommentListService(); - - $comments = $service->handle($id); - - return $this->jsonSuccess(['comments' => $comments]); - } - /** * @Post("/{id:[0-9]+}/like", name="web.chapter.like") */ @@ -84,9 +71,13 @@ class ChapterController extends Controller { $service = new ChapterLikeService(); - $service->handle($id); + $like = $service->handle($id); - return $this->jsonSuccess(); + $msg = $like->deleted == 0 ? '点赞成功' : '取消点赞成功'; + + $content = ['msg' => $msg]; + + return $this->jsonSuccess($content); } /** diff --git a/app/Http/Web/Controllers/ConsultController.php b/app/Http/Web/Controllers/ConsultController.php index f97ade49..6c46365c 100644 --- a/app/Http/Web/Controllers/ConsultController.php +++ b/app/Http/Web/Controllers/ConsultController.php @@ -6,6 +6,7 @@ use App\Services\Frontend\Consult\ConsultCreate as ConsultCreateService; use App\Services\Frontend\Consult\ConsultDelete as ConsultDeleteService; use App\Services\Frontend\Consult\ConsultInfo as ConsultInfoService; use App\Services\Frontend\Consult\ConsultLike as ConsultLikeService; +use App\Services\Frontend\Consult\ConsultRating as ConsultRatingService; use App\Services\Frontend\Consult\ConsultUpdate as ConsultUpdateService; use Phalcon\Mvc\View; @@ -108,9 +109,27 @@ class ConsultController extends Controller { $service = new ConsultLikeService(); + $like = $service->handle($id); + + $msg = $like->deleted == 0 ? '点赞成功' : '取消点赞成功'; + + $content = ['msg' => $msg]; + + return $this->jsonSuccess($content); + } + + /** + * @Post("/{id:[0-9]+}/rating", name="web.consult.rating") + */ + public function ratingAction($id) + { + $service = new ConsultRatingService(); + $service->handle($id); - return $this->jsonSuccess(); + $content = ['msg' => '评价成功']; + + return $this->jsonSuccess($content); } } diff --git a/app/Http/Web/Controllers/CourseController.php b/app/Http/Web/Controllers/CourseController.php index dfce713d..ba96a028 100644 --- a/app/Http/Web/Controllers/CourseController.php +++ b/app/Http/Web/Controllers/CourseController.php @@ -3,7 +3,7 @@ namespace App\Http\Web\Controllers; use App\Http\Web\Services\CourseQuery as CourseQueryService; -use App\Services\Frontend\Course\ChapterList as CourseChapterListService; +use App\Services\Frontend\Course\ChapterList as CourseCatalogService; use App\Services\Frontend\Course\ConsultList as CourseConsultListService; use App\Services\Frontend\Course\CourseInfo as CourseInfoService; use App\Services\Frontend\Course\CourseList as CourseListService; @@ -102,7 +102,7 @@ class CourseController extends Controller */ public function chaptersAction($id) { - $service = new CourseChapterListService(); + $service = new CourseCatalogService(); $chapters = $service->handle($id); @@ -206,9 +206,11 @@ class CourseController extends Controller { $service = new CourseFavoriteService(); - $service->handle($id); + $favorite = $service->handle($id); - return $this->jsonSuccess(['msg' => '收藏课程成功']); + $msg = $favorite->deleted == 0 ? '收藏成功' : '取消收藏成功'; + + return $this->jsonSuccess(['msg' => $msg]); } } diff --git a/app/Http/Web/Controllers/MyController.php b/app/Http/Web/Controllers/MyController.php index 1d3d7e26..030538ee 100644 --- a/app/Http/Web/Controllers/MyController.php +++ b/app/Http/Web/Controllers/MyController.php @@ -5,6 +5,7 @@ namespace App\Http\Web\Controllers; use App\Services\Frontend\My\AccountInfo as AccountInfoService; use App\Services\Frontend\My\ConsultList as MyConsultListService; use App\Services\Frontend\My\CourseList as MyCourseListService; +use App\Services\Frontend\My\FavoriteList as MyFavoriteListService; use App\Services\Frontend\My\ImFriendDelete as MyFriendDeleteService; use App\Services\Frontend\My\ImGroupDelete as MyGroupDeleteService; use App\Services\Frontend\My\OrderList as MyOrderListService; @@ -84,10 +85,12 @@ class MyController extends Controller */ public function favoritesAction() { - $service = new MyConsultListService(); + $service = new MyFavoriteListService(); $pager = $service->handle(); + $pager->items = kg_array_object($pager->items); + $this->view->setVar('pager', $pager); } diff --git a/app/Http/Web/Controllers/ReviewController.php b/app/Http/Web/Controllers/ReviewController.php index 5a5765ca..6135ae1b 100644 --- a/app/Http/Web/Controllers/ReviewController.php +++ b/app/Http/Web/Controllers/ReviewController.php @@ -111,9 +111,13 @@ class ReviewController extends Controller { $service = new ReviewLikeService(); - $service->handle($id); + $like = $service->handle($id); - return $this->jsonSuccess(); + $msg = $like->deleted == 0 ? '点赞成功' : '取消点赞成功'; + + $content = ['msg' => $msg]; + + return $this->jsonSuccess($content); } } diff --git a/app/Http/Web/Services/ImFriendTrait.php b/app/Http/Web/Services/ImFriendTrait.php index bdfd8808..529257eb 100644 --- a/app/Http/Web/Services/ImFriendTrait.php +++ b/app/Http/Web/Services/ImFriendTrait.php @@ -64,12 +64,16 @@ Trait ImFriendTrait $friendUser = $friendUserRepo->findFriendUser($user->id, $sender->id); if (!$friendUser) { + $friendUserModel = new ImFriendUserModel(); + $friendUserModel->create([ 'user_id' => $user->id, 'friend_id' => $sender->id, 'group_id' => $groupId, ]); + + $this->incrUserFriendCount($user); } $friendUser = $friendUserRepo->findFriendUser($sender->id, $user->id); @@ -77,12 +81,16 @@ Trait ImFriendTrait $groupId = $message->item_info['group']['id'] ?: 0; if (!$friendUser) { + $friendUserModel = new ImFriendUserModel(); + $friendUserModel->create([ 'user_id' => $sender->id, 'friend_id' => $user->id, 'group_id' => $groupId, ]); + + $this->incrUserFriendCount($sender); } $itemInfo = $message->item_info; @@ -245,4 +253,18 @@ Trait ImFriendTrait } } + protected function incrUserFriendCount(ImUserModel $user) + { + $user->friend_count += 1; + $user->update(); + } + + protected function decrUserFriendCount(ImUserModel $user) + { + if ($user->friend_count > 0) { + $user->friend_count -= 1; + $user->update(); + } + } + } diff --git a/app/Http/Web/Services/ImGroupTrait.php b/app/Http/Web/Services/ImGroupTrait.php index a55a3b4d..bceccdd5 100644 --- a/app/Http/Web/Services/ImGroupTrait.php +++ b/app/Http/Web/Services/ImGroupTrait.php @@ -67,13 +67,17 @@ Trait ImGroupTrait $groupUser = $groupUserRepo->findGroupUser($group->id, $applicant->id); if (!$groupUser) { + $groupUserModel = new ImGroupUserModel(); + $groupUserModel->create([ 'group_id' => $group->id, 'user_id' => $applicant->id, ]); - $group->user_count += 1; - $group->update(); + + $this->incrGroupUserCount($group); + + $this->incrUserGroupCount($applicant); } $itemInfo = $message->item_info; @@ -264,4 +268,32 @@ Trait ImGroupTrait } } + protected function incrUserGroupCount(ImUserModel $user) + { + $user->group_count += 1; + $user->update(); + } + + protected function decrUserGroupCount(ImUserModel $user) + { + if ($user->group_count > 0) { + $user->group_count -= 1; + $user->update(); + } + } + + protected function incrGroupUserCount(ImGroupModel $group) + { + $group->user_count += 1; + $group->update(); + } + + protected function decrGroupUserCount(ImGroupModel $group) + { + if ($group->user_count > 0) { + $group->user_count -= 1; + $group->update(); + } + } + } diff --git a/app/Http/Web/Views/consult/add.volt b/app/Http/Web/Views/consult/add.volt index 7e0665f3..9273044a 100644 --- a/app/Http/Web/Views/consult/add.volt +++ b/app/Http/Web/Views/consult/add.volt @@ -3,7 +3,7 @@ {% block content %}
- +
diff --git a/app/Http/Web/Views/consult/edit.volt b/app/Http/Web/Views/consult/edit.volt index 5ccfff52..9af5ee72 100644 --- a/app/Http/Web/Views/consult/edit.volt +++ b/app/Http/Web/Views/consult/edit.volt @@ -14,7 +14,7 @@
{{ consult.chapter.title }}
- +
@@ -34,4 +34,5 @@
+ {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/consult/show.volt b/app/Http/Web/Views/consult/show.volt index 4dd72544..c28e1d4c 100644 --- a/app/Http/Web/Views/consult/show.volt +++ b/app/Http/Web/Views/consult/show.volt @@ -1,27 +1,60 @@ {% extends 'templates/layer.volt' %} {% block content %} -
-
- -
- -
+ + {% set rating_url = url({'for':'web.consult.rating','id':consult.id}) %} + {% set answer = consult.answer ? consult.answer : '稍安勿燥，请耐心等待回复吧' %} + + +
+ +
{{ consult.course.title }}
-
- -
- - -
+
+ +
{{ consult.chapter.title }}
-
- -
- - - -
+
+ +
{{ consult.question }}
+
+ +
{{ answer }}
+
+ {% if consult.answer %} +
+ +
+ + +
+
+
+ {% endif %} + +{% endblock %} + +{% block inline_js %} + + + {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/course/consults.volt b/app/Http/Web/Views/course/consults.volt index dcdb28cf..18e49063 100644 --- a/app/Http/Web/Views/course/consults.volt +++ b/app/Http/Web/Views/course/consults.volt @@ -1,17 +1,21 @@ +{{ partial('partials/macro_course') }} + {% if pager.total_pages > 0 %}
{% for item in pager.items %} - {% set user_url = url({'for':'web.user.show','id':item.id}) %} + {% set item.answer = item.answer ? item.answer : '稍安勿燥，请耐心等待回复吧' %} + {% set owner_url = url({'for':'web.user.show','id':item.id}) %} {% set like_url = url({'for':'web.consult.like','id':item.id}) %}
- - {{ item.user.name }} + + {{ item.owner.name }}
+
{{ star_info(item.rating) }}
{{ item.question }}
-
{% if item.answer %} {{ item.answer }} {% else %} 稍安勿燥，请耐心等待我们的回复吧 {% endif %}
+
{{ item.answer }}
{{ item.create_time|time_ago }}
{{ item.user.name }} + {{ item.owner.name }}
{{ item.content }}
diff --git a/app/Http/Web/Views/my/consults.volt b/app/Http/Web/Views/my/consults.volt index d795e4cc..6c0e091b 100644 --- a/app/Http/Web/Views/my/consults.volt +++ b/app/Http/Web/Views/my/consults.volt @@ -10,7 +10,7 @@
我的咨询
{% if pager.total_pages > 0 %} - +
@@ -25,14 +25,14 @@ {% for item in pager.items %} - {% set item.answer = item.answer ? item.answer : '请耐心等待我们的回复吧' %} + {% set answer = item.answer ? item.answer : '稍安勿燥，请耐心等待回复吧' %} {% set show_url = url({'for':'web.consult.show','id':item.id}) %} {% set edit_url = url({'for':'web.consult.edit','id':item.id}) %} {% set delete_url = url({'for':'web.consult.delete','id':item.id}) %}
-

提问：{{ item.question }}

-

回复：{{ item.answer }}

+

提问：{{ item.question }}

+

回复：{{ answer }}

 {{ date('Y-m-d',item.create_time) }} diff --git a/app/Http/Web/Views/my/courses.volt b/app/Http/Web/Views/my/courses.volt index 24c360dc..1f823e9c 100644 --- a/app/Http/Web/Views/my/courses.volt +++ b/app/Http/Web/Views/my/courses.volt @@ -2,24 +2,24 @@ {% block content %} + {{ partial('partials/macro_course') }} +
{{ partial('my/menu') }}
我的课程
{% if pager.total_pages > 0 %} - +
- - + - @@ -28,13 +28,15 @@ {% set course_url = url({'for':'web.course.show','id':item.course.id}) %} {% set review_url = url({'for':'web.review.add'},{'id':item.course.id}) %} - + - - diff --git a/app/Http/Web/Views/my/favorites.volt b/app/Http/Web/Views/my/favorites.volt new file mode 100644 index 00000000..20b9cb22 --- /dev/null +++ b/app/Http/Web/Views/my/favorites.volt @@ -0,0 +1,55 @@ +{% extends 'templates/full.volt' %} + +{% block content %} + + {{ partial('partials/macro_course') }} + +
+
{{ partial('my/menu') }}
+
+
+
我的收藏
+ {% if pager.total_pages > 0 %} +
课程 进度过期时间 操作
{{ item.course.title }} +

标题：{{ item.course.title }} {{ model_info(item.course.model) }}

+

期限：{{ date('Y-m-d',item.expiry_time) }}

+

用时：{{ item.duration|duration }}

进度：{{ item.progress }}%

{{ date('Y-m-d', item.expiry_time) }} +
+ + + + + + + + + + + + + + + + {% for item in pager.items %} + {% set course_url = url({'for':'web.course.show','id':item.id}) %} + {% set favorite_url = url({'for':'web.course.favorite','id':item.id}) %} + + + + + + + {% endfor %} + +
课程人气评分操作
{{ item.title }} {{ model_info(item.model) }}{{ item.user_count }}{{ star_info(item.rating) }} + +
+ {{ partial('partials/pager') }} + {% endif %} +
+
+
+ +{% endblock %} + +{% block include_js %} + + {{ js_include('web/js/my.js') }} + +{% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Views/my/friends.volt b/app/Http/Web/Views/my/friends.volt index 6f68d60f..a032969c 100644 --- a/app/Http/Web/Views/my/friends.volt +++ b/app/Http/Web/Views/my/friends.volt @@ -4,11 +4,11 @@ {%- macro gender_info(value) %} {% if value == 1 %} - 男 + 男 {% elseif value == 2 %} - 女 + 女 {% elseif value == 3 %} - 保密 + 密 {% endif %} {%- endmacro %} diff --git a/app/Http/Web/Views/my/profile.volt b/app/Http/Web/Views/my/profile.volt index 7a365a3d..d958eb10 100644 --- a/app/Http/Web/Views/my/profile.volt +++ b/app/Http/Web/Views/my/profile.volt @@ -2,12 +2,14 @@ {% block content %} + {% set update_profile_url = url({'for':'web.my.update_profile'}) %} +
{{ partial('my/menu') }}
个人信息
-
+
@@ -38,7 +40,7 @@
-
diff --git a/app/Models/Consult.php b/app/Models/Consult.php index 15939fc3..bcb55504 100644 --- a/app/Models/Consult.php +++ b/app/Models/Consult.php @@ -40,7 +40,7 @@ class Consult extends Model * * @var int */ - public $user_id; + public $owner_id; /** * 提问 @@ -56,6 +56,13 @@ class Consult extends Model */ public $answer; + /** + * 评分 + * + * @var int + */ + public $rating; + /** * 赞成数 * @@ -91,6 +98,13 @@ class Consult extends Model */ public $deleted; + /** + * 回复时间 + * + * @var int + */ + public $answer_time; + /** * 创建时间 * @@ -131,6 +145,10 @@ class Consult extends Model { $this->update_time = time(); + if (!empty($this->answer) && $this->answer_time == 0) { + $this->answer_time = time(); + } + if ($this->deleted == 1) { $this->published = 0; } diff --git a/app/Models/ConsultLike.php b/app/Models/ConsultLike.php index 6447ec31..efa4d3d5 100644 --- a/app/Models/ConsultLike.php +++ b/app/Models/ConsultLike.php @@ -42,6 +42,13 @@ class ConsultLike extends Model */ public $create_time; + /** + * 更新时间 + * + * @var int + */ + public $update_time; + public function getSource(): string { return 'kg_consult_like'; diff --git a/app/Models/Course.php b/app/Models/Course.php index 15f60df3..c2bbc496 100644 --- a/app/Models/Course.php +++ b/app/Models/Course.php @@ -269,10 +269,10 @@ class Course extends Model break; } - if (Text::startsWith($this->cover, 'http')) { - $this->cover = self::getCoverPath($this->cover); - } elseif (empty($this->cover)) { + if (empty($this->cover)) { $this->cover = kg_default_cover_path(); + } elseif (Text::startsWith($this->cover, 'http')) { + $this->cover = self::getCoverPath($this->cover); } if (!empty($attrs)) { diff --git a/app/Models/Danmu.php b/app/Models/Danmu.php index aa08629d..95bfa59e 100644 --- a/app/Models/Danmu.php +++ b/app/Models/Danmu.php @@ -55,7 +55,7 @@ class Danmu extends Model * * @var int */ - public $user_id; + public $owner_id; /** * 内容 diff --git a/app/Models/ImGroup.php b/app/Models/ImGroup.php index aa475e9f..289e8a72 100644 --- a/app/Models/ImGroup.php +++ b/app/Models/ImGroup.php @@ -33,7 +33,7 @@ class ImGroup extends Model * * @var int */ - public $user_id; + public $owner_id; /** * 群组类型 @@ -119,10 +119,10 @@ class ImGroup extends Model { $this->create_time = time(); - if (Text::startsWith($this->avatar, 'http')) { - $this->avatar = self::getAvatarPath($this->avatar); - } elseif (empty($this->avatar)) { + if (empty($this->avatar)) { $this->avatar = kg_default_avatar_path(); + } elseif (Text::startsWith($this->avatar, 'http')) { + $this->avatar = self::getAvatarPath($this->avatar); } } @@ -151,5 +151,13 @@ class ImGroup extends Model return $url; } + public static function types() + { + return [ + self::TYPE_COURSE => '课程', + self::TYPE_CHAT => '聊天', + ]; + } + } diff --git a/app/Models/ImUser.php b/app/Models/ImUser.php index 53cfe426..dddb35fb 100644 --- a/app/Models/ImUser.php +++ b/app/Models/ImUser.php @@ -65,6 +65,20 @@ class ImUser extends Model */ public $deleted; + /** + * 好友数 + * + * @var int + */ + public $friend_count; + + /** + * 群组数 + * + * @var int + */ + public $group_count; + /** * 创建时间 * @@ -100,10 +114,10 @@ class ImUser extends Model { $this->create_time = time(); - if (Text::startsWith($this->avatar, 'http')) { - $this->avatar = self::getAvatarPath($this->avatar); - } elseif (empty($this->avatar)) { + if (empty($this->avatar)) { $this->avatar = kg_default_avatar_path(); + } elseif (Text::startsWith($this->avatar, 'http')) { + $this->avatar = self::getAvatarPath($this->avatar); } } diff --git a/app/Models/Review.php b/app/Models/Review.php index 5f140165..807791f8 100644 --- a/app/Models/Review.php +++ b/app/Models/Review.php @@ -26,7 +26,7 @@ class Review extends Model * * @var int */ - public $user_id; + public $owner_id; /** * 评价内容 diff --git a/app/Models/ReviewLike.php b/app/Models/ReviewLike.php index 871341aa..bfd03e72 100644 --- a/app/Models/ReviewLike.php +++ b/app/Models/ReviewLike.php @@ -42,6 +42,13 @@ class ReviewLike extends Model */ public $create_time; + /** + * 更新时间 + * + * @var int + */ + public $update_time; + public function getSource(): string { return 'kg_review_like'; diff --git a/app/Models/Slide.php b/app/Models/Slide.php index c7f957e5..49599cae 100644 --- a/app/Models/Slide.php +++ b/app/Models/Slide.php @@ -120,10 +120,10 @@ class Slide extends Model { $this->create_time = time(); - if (Text::startsWith($this->cover, 'http')) { - $this->cover = self::getCoverPath($this->cover); - } elseif (empty($this->cover)) { + if (empty($this->cover)) { $this->cover = kg_default_cover_path(); + } elseif (Text::startsWith($this->cover, 'http')) { + $this->cover = self::getCoverPath($this->cover); } if (is_array($this->style) && !empty($this->style)) { diff --git a/app/Models/User.php b/app/Models/User.php index f1cb233f..c41346f9 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -107,7 +107,21 @@ class User extends Model public $deleted; /** - * VIP期限 + * 课程数 + * + * @var int + */ + public $course_count; + + /** + * 收藏数 + * + * @var int + */ + public $favorite_count; + + /** + * 会员期限 * * @var int */ @@ -162,12 +176,10 @@ class User extends Model { $this->create_time = time(); - $this->im = kg_json_encode($this->_im); - - if (Text::startsWith($this->avatar, 'http')) { - $this->avatar = self::getAvatarPath($this->avatar); - } elseif (empty($this->avatar)) { + if (empty($this->avatar)) { $this->avatar = kg_default_avatar_path(); + } elseif (Text::startsWith($this->avatar, 'http')) { + $this->avatar = self::getAvatarPath($this->avatar); } } diff --git a/app/Repos/Consult.php b/app/Repos/Consult.php index 9145f504..a62a1a23 100644 --- a/app/Repos/Consult.php +++ b/app/Repos/Consult.php @@ -28,8 +28,8 @@ class Consult extends Repository $builder->andWhere('course_id = :course_id:', ['course_id' => $where['course_id']]); } - if (!empty($where['user_id'])) { - $builder->andWhere('user_id = :user_id:', ['user_id' => $where['user_id']]); + if (!empty($where['owner_id'])) { + $builder->andWhere('owner_id = :owner_id:', ['owner_id' => $where['owner_id']]); } if (isset($where['private'])) { @@ -94,7 +94,7 @@ class Consult extends Repository public function findUserLastChapterConsult($chapterId, $userId) { return ConsultModel::findFirst([ - 'conditions' => 'chapter_id = ?1 AND user_id = ?2 AND deleted = 0', + 'conditions' => 'chapter_id = ?1 AND owner_id = ?2 AND deleted = 0', 'bind' => [1 => $chapterId, 2 => $userId], 'order' => 'id DESC', ]); diff --git a/app/Repos/Course.php b/app/Repos/Course.php index 7528efb9..43c984e5 100644 --- a/app/Repos/Course.php +++ b/app/Repos/Course.php @@ -6,7 +6,6 @@ use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder; use App\Models\Category as CategoryModel; use App\Models\Chapter as ChapterModel; use App\Models\ChapterUser as ChapterUserModel; -use App\Models\Comment as CommentModel; use App\Models\Consult as ConsultModel; use App\Models\Course as CourseModel; use App\Models\CourseCategory as CourseCategoryModel; @@ -290,14 +289,6 @@ class Course extends Repository ]); } - public function countComments($courseId) - { - return (int)CommentModel::count([ - 'conditions' => 'course_id = :course_id: AND published = 1', - 'bind' => ['course_id' => $courseId], - ]); - } - public function countFavorites($courseId) { return (int)CourseFavoriteModel::count([ diff --git a/app/Repos/Danmu.php b/app/Repos/Danmu.php index a6075671..f4267114 100644 --- a/app/Repos/Danmu.php +++ b/app/Repos/Danmu.php @@ -31,8 +31,8 @@ class Danmu extends Repository $builder->andWhere('chapter_id = :chapter_id:', ['chapter_id' => $where['chapter_id']]); } - if (!empty($where['user_id'])) { - $builder->andWhere('user_id = :user_id:', ['user_id' => $where['user_id']]); + if (!empty($where['owner_id'])) { + $builder->andWhere('owner_id = :owner_id:', ['owner_id' => $where['owner_id']]); } if (isset($where['published'])) { @@ -100,8 +100,8 @@ class Danmu extends Repository $query->andWhere('chapter_id = :chapter_id:', ['chapter_id' => $where['chapter_id']]); } - if (!empty($where['user_id'])) { - $query->andWhere('user_id = :user_id:', ['user_id' => $where['user_id']]); + if (!empty($where['owner_id'])) { + $query->andWhere('owner_id = :owner_id:', ['owner_id' => $where['owner_id']]); } if (!empty($where['start_time']) && !empty($where['end_time'])) { @@ -123,7 +123,7 @@ class Danmu extends Repository public function countDanmus() { - return (int)DanmuModel::count(['conditions' => 'deleted = 0']); + return (int)DanmuModel::count(['conditions' => 'published = 1']); } } diff --git a/app/Repos/ImGroup.php b/app/Repos/ImGroup.php index dea5803f..11f7dd06 100644 --- a/app/Repos/ImGroup.php +++ b/app/Repos/ImGroup.php @@ -21,14 +21,26 @@ class ImGroup extends Repository $builder->where('1 = 1'); - if (!empty($where['course_id'])) { - $builder->andWhere('sender_id = :sender_id:', ['sender_id' => $where['sender_id']]); + if (!empty($where['id'])) { + $builder->andWhere('id = :id:', ['id' => $where['id']]); } if (!empty($where['name'])) { $builder->andWhere('name LIKE :name:', ['name' => "%{$where['name']}%"]); } + if (!empty($where['course_id'])) { + $builder->andWhere('course_id = :course_id:', ['course_id' => $where['course_id']]); + } + + if (!empty($where['owner_id'])) { + $builder->andWhere('owner_id = :owner_id:', ['owner_id' => $where['owner_id']]); + } + + if (isset($where['published'])) { + $builder->andWhere('published = :published:', ['published' => $where['published']]); + } + if (isset($where['deleted'])) { $builder->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]); } diff --git a/app/Repos/Review.php b/app/Repos/Review.php index 128bb2cd..fa84534d 100644 --- a/app/Repos/Review.php +++ b/app/Repos/Review.php @@ -28,8 +28,8 @@ class Review extends Repository $builder->andWhere('course_id = :course_id:', ['course_id' => $where['course_id']]); } - if (!empty($where['user_id'])) { - $builder->andWhere('user_id = :user_id:', ['user_id' => $where['user_id']]); + if (!empty($where['owner_id'])) { + $builder->andWhere('owner_id = :owner_id:', ['owner_id' => $where['owner_id']]); } if (isset($where['published'])) { @@ -88,8 +88,8 @@ class Review extends Repository public function findReview($courseId, $userId) { return ReviewModel::findFirst([ - 'conditions' => 'course_id = :course_id: AND user_id = :user_id:', - 'bind' => ['course_id' => $courseId, 'user_id' => $userId], + 'conditions' => 'course_id = :course_id: AND owner_id = :owner_id:', + 'bind' => ['course_id' => $courseId, 'owner_id' => $userId], ]); } diff --git a/app/Services/Frontend/Chapter/ChapterInfo.php b/app/Services/Frontend/Chapter/ChapterInfo.php index fdf5b7ac..23cc4ec4 100644 --- a/app/Services/Frontend/Chapter/ChapterInfo.php +++ b/app/Services/Frontend/Chapter/ChapterInfo.php @@ -114,6 +114,8 @@ class ChapterInfo extends FrontendService $this->joinedCourse = true; $this->incrCourseUserCount($course); + + $this->incrUserCourseCount($course); } protected function handleChapterUser(ChapterModel $chapter, UserModel $user) @@ -142,6 +144,12 @@ class ChapterInfo extends FrontendService $this->incrChapterUserCount($chapter); } + protected function incrUserCourseCount(UserModel $user) + { + $user->course_count += 1; + $user->update(); + } + protected function incrCourseUserCount(CourseModel $course) { $course->user_count += 1; diff --git a/app/Services/Frontend/Chapter/ChapterLike.php b/app/Services/Frontend/Chapter/ChapterLike.php index 139b7654..e6d50762 100644 --- a/app/Services/Frontend/Chapter/ChapterLike.php +++ b/app/Services/Frontend/Chapter/ChapterLike.php @@ -8,7 +8,7 @@ use App\Models\User as UserModel; use App\Repos\ChapterLike as ChapterLikeRepo; use App\Services\Frontend\ChapterTrait; use App\Services\Frontend\Service as FrontendService; -use App\Validators\UserDailyLimit as UserDailyLimitValidator; +use App\Validators\UserLimit as UserLimitValidator; class ChapterLike extends FrontendService { @@ -21,9 +21,9 @@ class ChapterLike extends FrontendService $user = $this->getLoginUser(); - $validator = new UserDailyLimitValidator(); + $validator = new UserLimitValidator(); - $validator->checkChapterLikeLimit($user); + $validator->checkDailyChapterLikeLimit($user); $likeRepo = new ChapterLikeRepo(); @@ -58,7 +58,7 @@ class ChapterLike extends FrontendService $this->incrUserDailyChapterLikeCount($user); - return $chapter; + return $chapterLike; } protected function incrLikeCount(ChapterModel $chapter) diff --git a/app/Services/Frontend/Chapter/DanmuList.php b/app/Services/Frontend/Chapter/DanmuList.php index 1db6cc30..27ca93b7 100644 --- a/app/Services/Frontend/Chapter/DanmuList.php +++ b/app/Services/Frontend/Chapter/DanmuList.php @@ -48,7 +48,7 @@ class DanmuList extends FrontendService foreach ($items as $item) { - $user = $users[$item['user_id']] ?? new \stdClass(); + $owner = $users[$item['owner_id']] ?? new \stdClass(); $result[] = [ 'id' => $item['id'], @@ -57,7 +57,7 @@ class DanmuList extends FrontendService 'size' => $item['size'], 'time' => $item['time'], 'position' => $item['position'], - 'user' => $user, + 'owner' => $owner, ]; } diff --git a/app/Services/Frontend/Consult/ConsultCreate.php b/app/Services/Frontend/Consult/ConsultCreate.php index 14ce6318..7a591a5d 100644 --- a/app/Services/Frontend/Consult/ConsultCreate.php +++ b/app/Services/Frontend/Consult/ConsultCreate.php @@ -10,7 +10,7 @@ use App\Services\Frontend\ChapterTrait; use App\Services\Frontend\CourseTrait; use App\Services\Frontend\Service as FrontendService; use App\Validators\Consult as ConsultValidator; -use App\Validators\UserDailyLimit as UserDailyLimitValidator; +use App\Validators\UserLimit as UserLimitValidator; class ConsultCreate extends FrontendService { @@ -28,15 +28,15 @@ class ConsultCreate extends FrontendService $course = $this->checkCourse($chapter->course_id); - $validator = new UserDailyLimitValidator(); + $validator = new UserLimitValidator(); - $validator->checkConsultLimit($user); + $validator->checkDailyConsultLimit($user); $validator = new ConsultValidator(); $question = $validator->checkQuestion($post['question']); - $validator->checkIfDuplicated($chapter->id, $user->id, $question); + $validator->checkIfDuplicated($question, $chapter->id, $user->id); $priority = $this->getPriority($course, $user); @@ -46,7 +46,7 @@ class ConsultCreate extends FrontendService $consult->priority = $priority; $consult->course_id = $course->id; $consult->chapter_id = $chapter->id; - $consult->user_id = $user->id; + $consult->owner_id = $user->id; $consult->published = 1; $consult->create(); diff --git a/app/Services/Frontend/Consult/ConsultDelete.php b/app/Services/Frontend/Consult/ConsultDelete.php index 47f33410..b1625e8a 100644 --- a/app/Services/Frontend/Consult/ConsultDelete.php +++ b/app/Services/Frontend/Consult/ConsultDelete.php @@ -29,7 +29,7 @@ class ConsultDelete extends FrontendService $validator = new ConsultValidator(); - $validator->checkOwner($user->id, $consult->user_id); + $validator->checkOwner($user->id, $consult->owner_id); $consult->update(['deleted' => 1]); diff --git a/app/Services/Frontend/Consult/ConsultInfo.php b/app/Services/Frontend/Consult/ConsultInfo.php index 53d92dd1..31b68ac7 100644 --- a/app/Services/Frontend/Consult/ConsultInfo.php +++ b/app/Services/Frontend/Consult/ConsultInfo.php @@ -28,6 +28,7 @@ class ConsultInfo extends FrontendService 'question' => $consult->question, 'answer' => $consult->answer, 'private' => $consult->private, + 'rating' => $consult->rating, 'like_count' => $consult->like_count, 'create_time' => $consult->create_time, 'update_time' => $consult->update_time, @@ -53,12 +54,12 @@ class ConsultInfo extends FrontendService $userRepo = new UserRepo(); - $user = $userRepo->findById($consult->user_id); + $owner = $userRepo->findById($consult->owner_id); - $result['user'] = [ - 'id' => $user->id, - 'name' => $user->name, - 'avatar' => $user->avatar, + $result['owner'] = [ + 'id' => $owner->id, + 'name' => $owner->name, + 'avatar' => $owner->avatar, ]; return $result; diff --git a/app/Services/Frontend/Consult/ConsultLike.php b/app/Services/Frontend/Consult/ConsultLike.php index 420c4bee..d2e53032 100644 --- a/app/Services/Frontend/Consult/ConsultLike.php +++ b/app/Services/Frontend/Consult/ConsultLike.php @@ -8,7 +8,7 @@ use App\Models\User as UserModel; use App\Services\Frontend\ConsultTrait; use App\Services\Frontend\Service as FrontendService; use App\Validators\Consult as ConsultValidator; -use App\Validators\UserDailyLimit as UserDailyLimitValidator; +use App\Validators\UserLimit as UserLimitValidator; class ConsultLike extends FrontendService { @@ -21,9 +21,9 @@ class ConsultLike extends FrontendService $user = $this->getLoginUser(); - $validator = new UserDailyLimitValidator(); + $validator = new UserLimitValidator(); - $validator->checkConsultLikeLimit($user); + $validator->checkDailyConsultLikeLimit($user); $validator = new ConsultValidator(); @@ -58,7 +58,7 @@ class ConsultLike extends FrontendService $this->incrUserDailyConsultLikeCount($user); - return $consult; + return $consultLike; } protected function incrLikeCount(ConsultModel $consult) diff --git a/app/Services/Frontend/Consult/ConsultRating.php b/app/Services/Frontend/Consult/ConsultRating.php new file mode 100644 index 00000000..17e3740c --- /dev/null +++ b/app/Services/Frontend/Consult/ConsultRating.php @@ -0,0 +1,37 @@ +request->getPost(); + + $user = $this->getLoginUser(); + + $consult = $this->checkConsult($id); + + $validator = new ConsultValidator(); + + $validator->checkOwner($user->id, $consult->user_id); + + $validator->checkIfAllowRate($consult); + + $rating = $validator->checkRating($post['rating']); + + $consult->rating = $rating; + + $consult->update(); + + return $consult; + } + +} diff --git a/app/Services/Frontend/Consult/ConsultUpdate.php b/app/Services/Frontend/Consult/ConsultUpdate.php index 35842485..81a91eb1 100644 --- a/app/Services/Frontend/Consult/ConsultUpdate.php +++ b/app/Services/Frontend/Consult/ConsultUpdate.php @@ -21,7 +21,9 @@ class ConsultUpdate extends FrontendService $validator = new ConsultValidator(); - $validator->checkOwner($user->id, $consult->user_id); + $validator->checkOwner($user->id, $consult->owner_id); + + $validator->checkIfAllowEdit($consult); $question = $validator->checkQuestion($post['question']); diff --git a/app/Services/Frontend/Course/ChapterList.php b/app/Services/Frontend/Course/ChapterList.php index 1d55942b..7533649f 100644 --- a/app/Services/Frontend/Course/ChapterList.php +++ b/app/Services/Frontend/Course/ChapterList.php @@ -2,7 +2,7 @@ namespace App\Services\Frontend\Course; -use App\Caches\CourseChapterList as CourseChapterListCache; +use App\Caches\CourseCatalog as CourseCatalogCache; use App\Models\Course as CourseModel; use App\Models\User as UserModel; use App\Repos\Course as CourseRepo; @@ -27,7 +27,7 @@ class ChapterList extends FrontendService protected function getChapters(CourseModel $course, UserModel $user) { - $cache = new CourseChapterListCache(); + $cache = new CourseCatalogCache(); $chapters = $cache->get($course->id); diff --git a/app/Services/Frontend/Course/ConsultList.php b/app/Services/Frontend/Course/ConsultList.php index 0ec190ef..53d0ea57 100644 --- a/app/Services/Frontend/Course/ConsultList.php +++ b/app/Services/Frontend/Course/ConsultList.php @@ -52,16 +52,17 @@ class ConsultList extends FrontendService foreach ($consults as $consult) { - $user = $users[$consult['user_id']] ?? new \stdClass(); + $owner = $users[$consult['owner_id']] ?? new \stdClass(); $items[] = [ 'id' => $consult['id'], 'question' => $consult['question'], 'answer' => $consult['answer'], + 'rating' => $consult['rating'], 'like_count' => $consult['like_count'], 'create_time' => $consult['create_time'], 'update_time' => $consult['update_time'], - 'user' => $user, + 'owner' => $owner, ]; } diff --git a/app/Services/Frontend/Course/Favorite.php b/app/Services/Frontend/Course/Favorite.php index 81075f51..ae33ed5a 100644 --- a/app/Services/Frontend/Course/Favorite.php +++ b/app/Services/Frontend/Course/Favorite.php @@ -8,7 +8,7 @@ use App\Models\User as UserModel; use App\Repos\CourseFavorite as CourseFavoriteRepo; use App\Services\Frontend\CourseTrait; use App\Services\Frontend\Service as FrontendService; -use App\Validators\UserDailyLimit as UserDailyLimitValidator; +use App\Validators\UserLimit as UserLimitValidator; class Favorite extends FrontendService { @@ -21,7 +21,7 @@ class Favorite extends FrontendService $user = $this->getLoginUser(); - $validator = new UserDailyLimitValidator(); + $validator = new UserLimitValidator(); $validator->checkFavoriteLimit($user); @@ -48,15 +48,19 @@ class Favorite extends FrontendService $this->decrCourseFavoriteCount($course); + $this->decrUserFavoriteCount($user); + } else { $favorite->update(['deleted' => 0]); $this->incrCourseFavoriteCount($course); + + $this->incrUserFavoriteCount($user); } } - $this->incrUserDailyFavoriteCount($user); + return $favorite; } protected function incrCourseFavoriteCount(CourseModel $course) @@ -73,9 +77,18 @@ class Favorite extends FrontendService } } - protected function incrUserDailyFavoriteCount(UserModel $user) + protected function incrUserFavoriteCount(UserModel $user) { - $this->eventsManager->fire('userDailyCounter:incrFavoriteCount', $this, $user); + $user->favorite_count += 1; + $user->update(); + } + + protected function decrUserFavoriteCount(UserModel $user) + { + if ($user->favorite_count > 0) { + $user->favorite_count -= 1; + $user->update(); + } } } diff --git a/app/Services/Frontend/Course/ReviewList.php b/app/Services/Frontend/Course/ReviewList.php index 9c035219..d8f5106e 100644 --- a/app/Services/Frontend/Course/ReviewList.php +++ b/app/Services/Frontend/Course/ReviewList.php @@ -51,7 +51,7 @@ class ReviewList extends FrontendService foreach ($reviews as $review) { - $user = $users[$review['user_id']] ?? new \stdClass(); + $owner = $users[$review['owner_id']] ?? new \stdClass(); $items[] = [ 'id' => $review['id'], @@ -59,7 +59,7 @@ class ReviewList extends FrontendService 'content' => $review['content'], 'like_count' => $review['like_count'], 'create_time' => $review['create_time'], - 'user' => $user, + 'owner' => $owner, ]; } diff --git a/app/Services/Frontend/Danmu/DanmuCreate.php b/app/Services/Frontend/Danmu/DanmuCreate.php index cc6b4544..77000352 100644 --- a/app/Services/Frontend/Danmu/DanmuCreate.php +++ b/app/Services/Frontend/Danmu/DanmuCreate.php @@ -7,7 +7,7 @@ use App\Models\User as UserModel; use App\Services\Frontend\ChapterTrait; use App\Services\Frontend\Service as FrontendService; use App\Validators\Danmu as DanmuValidator; -use App\Validators\UserDailyLimit as UserDailyLimitValidator; +use App\Validators\UserLimit as UserLimitValidator; class DanmuCreate extends FrontendService { @@ -22,9 +22,9 @@ class DanmuCreate extends FrontendService $chapter = $this->checkChapter($post['chapter_id']); - $validator = new UserDailyLimitValidator(); + $validator = new UserLimitValidator(); - $validator->checkDanmuLimit($user); + $validator->checkDailyDanmuLimit($user); $validator = new DanmuValidator(); @@ -40,7 +40,7 @@ class DanmuCreate extends FrontendService $data['course_id'] = $chapter->course_id; $data['chapter_id'] = $chapter->id; - $data['user_id'] = $user->id; + $data['owner_id'] = $user->id; $data['published'] = 1; diff --git a/app/Services/Frontend/Danmu/DanmuInfo.php b/app/Services/Frontend/Danmu/DanmuInfo.php index 6cdbed96..377ed0ae 100644 --- a/app/Services/Frontend/Danmu/DanmuInfo.php +++ b/app/Services/Frontend/Danmu/DanmuInfo.php @@ -32,12 +32,12 @@ class DanmuInfo extends FrontendService $userRepo = new UserRepo(); - $user = $userRepo->findById($danmu->user_id); + $owner = $userRepo->findById($danmu->user_id); - $result['user'] = [ - 'id' => $user->id, - 'name' => $user->name, - 'avatar' => $user->avatar, + $result['owner'] = [ + 'id' => $owner->id, + 'name' => $owner->name, + 'avatar' => $owner->avatar, ]; return $result; diff --git a/app/Services/Frontend/My/ConsultList.php b/app/Services/Frontend/My/ConsultList.php index 953271c5..3c788124 100644 --- a/app/Services/Frontend/My/ConsultList.php +++ b/app/Services/Frontend/My/ConsultList.php @@ -56,6 +56,7 @@ class ConsultList extends FrontendService 'id' => $consult['id'], 'question' => $consult['question'], 'answer' => $consult['answer'], + 'rating' => $consult['rating'], 'like_count' => $consult['like_count'], 'create_time' => $consult['create_time'], 'update_time' => $consult['update_time'], diff --git a/app/Services/Frontend/My/FavoriteList.php b/app/Services/Frontend/My/FavoriteList.php index 9960492a..9faff6d0 100644 --- a/app/Services/Frontend/My/FavoriteList.php +++ b/app/Services/Frontend/My/FavoriteList.php @@ -2,63 +2,19 @@ namespace App\Services\Frontend\My; -use App\Builders\CourseFavoriteList as CourseFavoriteListBuilder; -use App\Library\Paginator\Query as PagerQuery; -use App\Repos\CourseFavorite as CourseFavoriteRepo; use App\Services\Frontend\Service as FrontendService; -use App\Services\Frontend\UserTrait; +use App\Services\Frontend\User\FavoriteList as UserFavoriteListService; class FavoriteList extends FrontendService { - use UserTrait; - public function handle() { $user = $this->getLoginUser(); - $pagerQuery = new PagerQuery(); + $service = new UserFavoriteListService(); - $params = $pagerQuery->getParams(); - - $params['user_id'] = $user->id; - $params['deleted'] = 0; - - $sort = $pagerQuery->getSort(); - $page = $pagerQuery->getPage(); - $limit = $pagerQuery->getLimit(); - - $favoriteRepo = new CourseFavoriteRepo(); - - $pager = $favoriteRepo->paginate($params, $sort, $page, $limit); - - return $this->handleCourses($pager); - } - - protected function handleCourses($pager) - { - if ($pager->total_items == 0) { - return $pager; - } - - $builder = new CourseFavoriteListBuilder(); - - $relations = $pager->items->toArray(); - - $courses = $builder->getCourses($relations); - - $items = []; - - foreach ($relations as $relation) { - - $course = $courses[$relation['course_id']] ?? new \stdClass(); - - $items[] = $course; - } - - $pager->items = $items; - - return $pager; + return $service->handle($user->id); } } diff --git a/app/Services/Frontend/Order/OrderCreate.php b/app/Services/Frontend/Order/OrderCreate.php index f6faa631..491eedb9 100644 --- a/app/Services/Frontend/Order/OrderCreate.php +++ b/app/Services/Frontend/Order/OrderCreate.php @@ -12,7 +12,7 @@ use App\Repos\Order as OrderRepo; use App\Repos\Package as PackageRepo; use App\Services\Frontend\Service as FrontendService; use App\Validators\Order as OrderValidator; -use App\Validators\UserDailyLimit as UserDailyLimitValidator; +use App\Validators\UserLimit as UserLimitValidator; class OrderCreate extends FrontendService { @@ -23,9 +23,9 @@ class OrderCreate extends FrontendService $user = $this->getLoginUser(); - $validator = new UserDailyLimitValidator(); + $validator = new UserLimitValidator(); - $validator->checkOrderLimit($user); + $validator->checkDailyOrderLimit($user); $validator = new OrderValidator(); diff --git a/app/Services/Frontend/Review/ReviewCreate.php b/app/Services/Frontend/Review/ReviewCreate.php index 518296da..54bd2f3b 100644 --- a/app/Services/Frontend/Review/ReviewCreate.php +++ b/app/Services/Frontend/Review/ReviewCreate.php @@ -4,13 +4,11 @@ namespace App\Services\Frontend\Review; use App\Models\Course as CourseModel; use App\Models\Review as ReviewModel; -use App\Models\User as UserModel; use App\Services\Frontend\CourseTrait; use App\Services\Frontend\ReviewTrait; use App\Services\Frontend\Service as FrontendService; use App\Validators\CourseUser as CourseUserValidator; use App\Validators\Review as ReviewValidator; -use App\Validators\UserDailyLimit as UserDailyLimitValidator; class ReviewCreate extends FrontendService { @@ -26,10 +24,6 @@ class ReviewCreate extends FrontendService $user = $this->getLoginUser(); - $validator = new UserDailyLimitValidator(); - - $validator->checkReviewLimit($user); - $validator = new CourseUserValidator(); $validator->checkCourseUser($course->id, $user->id); @@ -39,7 +33,7 @@ class ReviewCreate extends FrontendService $data = [ 'course_id' => $course->id, - 'user_id' => $user->id, + 'owner_id' => $user->id, ]; $data['content'] = $validator->checkContent($post['content']); @@ -55,8 +49,6 @@ class ReviewCreate extends FrontendService $this->incrCourseReviewCount($course); - $this->incrUserDailyReviewCount($user); - return $review; } @@ -66,9 +58,4 @@ class ReviewCreate extends FrontendService $course->update(); } - protected function incrUserDailyReviewCount(UserModel $user) - { - $this->eventsManager->fire('userDailyCounter:incrReviewCount', $this, $user); - } - } diff --git a/app/Services/Frontend/Review/ReviewDelete.php b/app/Services/Frontend/Review/ReviewDelete.php index 88e51aef..54c011f8 100644 --- a/app/Services/Frontend/Review/ReviewDelete.php +++ b/app/Services/Frontend/Review/ReviewDelete.php @@ -24,9 +24,9 @@ class ReviewDelete extends FrontendService $validator = new ReviewValidator(); - $validator->checkOwner($user->id, $review->user_id); + $validator->checkOwner($user->id, $review->owner_id); - $review->delete(); + $review->update(['deleted' => 1]); $this->decrCourseReviewCount($course); diff --git a/app/Services/Frontend/Review/ReviewInfo.php b/app/Services/Frontend/Review/ReviewInfo.php index a3ec94c8..52df5978 100644 --- a/app/Services/Frontend/Review/ReviewInfo.php +++ b/app/Services/Frontend/Review/ReviewInfo.php @@ -36,9 +36,9 @@ class ReviewInfo extends FrontendService $userRepo = new UserRepo(); - $owner = $userRepo->findById($review->user_id); + $owner = $userRepo->findById($review->owner_id); - $result['user'] = [ + $result['owner'] = [ 'id' => $owner->id, 'name' => $owner->name, 'avatar' => $owner->avatar, diff --git a/app/Services/Frontend/Review/ReviewLike.php b/app/Services/Frontend/Review/ReviewLike.php index 4876e674..9e15644e 100644 --- a/app/Services/Frontend/Review/ReviewLike.php +++ b/app/Services/Frontend/Review/ReviewLike.php @@ -8,7 +8,7 @@ use App\Models\User as UserModel; use App\Services\Frontend\ReviewTrait; use App\Services\Frontend\Service as FrontendService; use App\Validators\Review as ReviewValidator; -use App\Validators\UserDailyLimit as UserDailyLimitValidator; +use App\Validators\UserLimit as UserLimitValidator; class ReviewLike extends FrontendService { @@ -21,9 +21,9 @@ class ReviewLike extends FrontendService $user = $this->getLoginUser(); - $validator = new UserDailyLimitValidator(); + $validator = new UserLimitValidator(); - $validator->checkReviewLikeLimit($user); + $validator->checkDailyReviewLikeLimit($user); $validator = new ReviewValidator(); @@ -58,7 +58,7 @@ class ReviewLike extends FrontendService $this->incrUserDailyReviewLikeCount($user); - return $review; + return $reviewLike; } protected function incrLikeCount(ReviewModel $review) diff --git a/app/Services/Frontend/Review/ReviewUpdate.php b/app/Services/Frontend/Review/ReviewUpdate.php index eec6de8f..4753ce13 100644 --- a/app/Services/Frontend/Review/ReviewUpdate.php +++ b/app/Services/Frontend/Review/ReviewUpdate.php @@ -25,7 +25,9 @@ class ReviewUpdate extends FrontendService $validator = new ReviewValidator(); - $validator->checkOwner($user->id, $review->user_id); + $validator->checkOwner($user->id, $review->owner_id); + + $validator->checkIfAllowEdit($review); $data = []; diff --git a/app/Validators/Consult.php b/app/Validators/Consult.php index 3d6fb578..e158a30c 100644 --- a/app/Validators/Consult.php +++ b/app/Validators/Consult.php @@ -3,6 +3,7 @@ namespace App\Validators; use App\Exceptions\BadRequest as BadRequestException; +use App\Models\Consult as ConsultModel; use App\Repos\Consult as ConsultRepo; use App\Repos\ConsultLike as ConsultLikeRepo; @@ -70,6 +71,15 @@ class Consult extends Validator return $value; } + public function checkRating($rating) + { + if (!in_array($rating, [1, 2, 3, 4, 5])) { + throw new BadRequestException('consult.invalid_rating'); + } + + return $rating; + } + public function checkPrivateStatus($status) { if (!in_array($status, [0, 1])) { @@ -88,7 +98,41 @@ class Consult extends Validator return $status; } - public function checkIfDuplicated($chapterId, $userId, $question) + public function checkIfAllowEdit(ConsultModel $consult) + { + /** + * (1)已回复不允许修改提问 + * (2)发表三天以后不能修改提问 + */ + $case1 = !empty($consult->answer); + $case2 = time() - $consult->create_time > 3 * 86400; + + if ($case1 || $case2) { + throw new BadRequestException('consult.edit_not_allowed'); + } + } + + public function checkIfAllowRate(ConsultModel $consult) + { + /** + * 未回复不允许评价 + */ + if (empty($consult->answer)) { + throw new BadRequestException('consult.rate_not_allowed'); + } + + /** + * 已评价，三天后不能更改评价 + */ + $case1 = $consult->rating > 0; + $case2 = time() - $consult->answer_time > 3 * 86400; + + if ($case1 && $case2) { + throw new BadRequestException('consult.rate_not_allowed'); + } + } + + public function checkIfDuplicated($question, $chapterId, $userId) { $repo = new ConsultRepo(); diff --git a/app/Validators/ImGroup.php b/app/Validators/ImGroup.php index 0755cfee..5e2a2c38 100644 --- a/app/Validators/ImGroup.php +++ b/app/Validators/ImGroup.php @@ -5,6 +5,7 @@ namespace App\Validators; use App\Caches\ImGroup as ImGroupCache; use App\Caches\MaxImGroupId as MaxImGroupIdCache; use App\Exceptions\BadRequest as BadRequestException; +use App\Library\Validators\Common as CommonValidator; use App\Models\ImGroup as ImGroupModel; use App\Repos\ImGroup as ImGroupRepo; @@ -28,7 +29,7 @@ class ImGroup extends Validator * 防止缓存穿透 */ if ($id < 1 || $id > $maxGroupId) { - throw new BadRequestException('im_chat_group.not_found'); + throw new BadRequestException('im_group.not_found'); } $groupCache = new ImGroupCache(); @@ -36,7 +37,7 @@ class ImGroup extends Validator $group = $groupCache->get($id); if (!$group) { - throw new BadRequestException('im_chat_group.not_found'); + throw new BadRequestException('im_group.not_found'); } return $group; @@ -49,7 +50,7 @@ class ImGroup extends Validator $group = $groupRepo->findById($id); if (!$group) { - throw new BadRequestException('im_chat_group.not_found'); + throw new BadRequestException('im_group.not_found'); } return $group; @@ -62,11 +63,11 @@ class ImGroup extends Validator $length = kg_strlen($value); if ($length < 2) { - throw new BadRequestException('im_chat_group.name_too_short'); + throw new BadRequestException('im_group.name_too_short'); } if ($length > 30) { - throw new BadRequestException('im_chat_group.name_too_long'); + throw new BadRequestException('im_group.name_too_long'); } return $value; @@ -79,10 +80,48 @@ class ImGroup extends Validator $length = kg_strlen($value); if ($length > 255) { - throw new BadRequestException('im_chat_group.about_too_long'); + throw new BadRequestException('im_group.about_too_long'); } return $value; } + public function checkAvatar($avatar) + { + $value = $this->filter->sanitize($avatar, ['trim', 'string']); + + if (!CommonValidator::url($value)) { + throw new BadRequestException('im_group.invalid_avatar'); + } + + return $value; + } + + public function checkType($type) + { + $list = ImGroupModel::types(); + + if (!isset($list[$type])) { + throw new BadRequestException('im_group.invalid_type'); + } + + return $type; + } + + public function checkPublishStatus($status) + { + if (!in_array($status, [0, 1])) { + throw new BadRequestException('im_group.invalid_publish_status'); + } + + return $status; + } + + public function checkGroupOwner($userId) + { + $validator = new User(); + + return $validator->checkUser($userId); + } + } diff --git a/app/Validators/Review.php b/app/Validators/Review.php index a955cd43..8885cd00 100644 --- a/app/Validators/Review.php +++ b/app/Validators/Review.php @@ -4,6 +4,7 @@ namespace App\Validators; use App\Exceptions\BadRequest; use App\Exceptions\BadRequest as BadRequestException; +use App\Models\Review as ReviewModel; use App\Repos\Review as ReviewRepo; use App\Repos\ReviewLike as ReviewLikeRepo; @@ -65,6 +66,15 @@ class Review extends Validator return $status; } + public function checkIfAllowEdit(ReviewModel $review) + { + $case = time() - $review->create_time > 7 * 86400; + + if ($case) { + throw new BadRequestException('review.edit_not_allowed'); + } + } + public function checkIfLiked($reviewId, $userId) { $repo = new ReviewLikeRepo(); diff --git a/app/Validators/User.php b/app/Validators/User.php index 682e4e40..0434a887 100644 --- a/app/Validators/User.php +++ b/app/Validators/User.php @@ -114,10 +114,14 @@ class User extends Validator public function checkArea($area) { - if (empty($area['province'] || empty($area['city']) || empty($area['county']))) { + if (empty($area['province'] || empty($area['city']))) { throw new BadRequestException('user.invalid_area'); } + if (empty($area['county'])) { + $area['county'] = '***'; + } + return join('/', $area); } diff --git a/app/Validators/UserDailyLimit.php b/app/Validators/UserDailyLimit.php deleted file mode 100644 index c5e002dc..00000000 --- a/app/Validators/UserDailyLimit.php +++ /dev/null @@ -1,103 +0,0 @@ -counter = new CacheUserDailyCounter(); - } - - public function checkFavoriteLimit(UserModel $user) - { - $count = $this->counter->hGet($user->id, 'favorite_count'); - - $limit = $user->vip ? 100 : 50; - - if ($count > $limit) { - throw new BadRequestException('user_daily_limit.reach_favorite_limit'); - } - } - - public function checkDanmuLimit(UserModel $user) - { - $count = $this->counter->hGet($user->id, 'danmu_count'); - - $limit = $user->vip ? 100 : 50; - - if ($count > $limit) { - throw new BadRequestException('user_daily_limit.reach_danmu_limit'); - } - } - - public function checkConsultLimit(UserModel $user) - { - $count = $this->counter->hGet($user->id, 'consult_count'); - - $limit = $user->vip ? 20 : 10; - - if ($count > $limit) { - throw new BadRequestException('user_daily_limit.reach_consult_limit'); - } - } - - public function checkReviewLimit(UserModel $user) - { - $count = $this->counter->hGet($user->id, 'review_count'); - - if ($count > 10) { - throw new BadRequestException('user_daily_limit.reach_review_limit'); - } - } - - public function checkOrderLimit(UserModel $user) - { - $count = $this->counter->hGet($user->id, 'order_count'); - - if ($count > 10) { - throw new BadRequestException('user_daily_limit.reach_order_limit'); - } - } - - public function checkChapterLikeLimit(UserModel $user) - { - $count = $this->counter->hGet($user->id, 'chapter_like_count'); - - $limit = $user->vip ? 200 : 100; - - if ($count > $limit) { - throw new BadRequestException('user_daily_limit.reach_like_limit'); - } - } - - public function checkConsultLikeLimit(UserModel $user) - { - $count = $this->counter->hGet($user->id, 'consult_like_count'); - - $limit = $user->vip ? 200 : 100; - - if ($count > $limit) { - throw new BadRequestException('user_daily_limit.reach_like_limit'); - } - } - - public function checkReviewLikeLimit(UserModel $user) - { - $count = $this->counter->hGet($user->id, 'review_like_count'); - - $limit = $user->vip ? 200 : 100; - - if ($count > $limit) { - throw new BadRequestException('user_daily_limit.reach_like_limit'); - } - } - -} diff --git a/app/Validators/UserLimit.php b/app/Validators/UserLimit.php new file mode 100644 index 00000000..cd67cbde --- /dev/null +++ b/app/Validators/UserLimit.php @@ -0,0 +1,92 @@ +counter = new CacheUserDailyCounter(); + } + + public function checkFavoriteLimit(UserModel $user) + { + $limit = $user->vip ? 1000 : 500; + + if ($user->favorite_count > $limit) { + throw new BadRequestException('user_limit.reach_favorite_limit'); + } + } + + public function checkDailyDanmuLimit(UserModel $user) + { + $count = $this->counter->hGet($user->id, 'danmu_count'); + + $limit = $user->vip ? 100 : 50; + + if ($count > $limit) { + throw new BadRequestException('user_limit.reach_daily_danmu_limit'); + } + } + + public function checkDailyConsultLimit(UserModel $user) + { + $count = $this->counter->hGet($user->id, 'consult_count'); + + $limit = $user->vip ? 20 : 10; + + if ($count > $limit) { + throw new BadRequestException('user_limit.reach_daily_consult_limit'); + } + } + + public function checkDailyOrderLimit(UserModel $user) + { + $count = $this->counter->hGet($user->id, 'order_count'); + + if ($count > 10) { + throw new BadRequestException('user_limit.reach_daily_order_limit'); + } + } + + public function checkDailyChapterLikeLimit(UserModel $user) + { + $count = $this->counter->hGet($user->id, 'chapter_like_count'); + + $limit = $user->vip ? 200 : 100; + + if ($count > $limit) { + throw new BadRequestException('user_limit.reach_daily_like_limit'); + } + } + + public function checkDailyConsultLikeLimit(UserModel $user) + { + $count = $this->counter->hGet($user->id, 'consult_like_count'); + + $limit = $user->vip ? 200 : 100; + + if ($count > $limit) { + throw new BadRequestException('user_limit.reach_daily_like_limit'); + } + } + + public function checkDailyReviewLikeLimit(UserModel $user) + { + $count = $this->counter->hGet($user->id, 'review_like_count'); + + $limit = $user->vip ? 200 : 100; + + if ($count > $limit) { + throw new BadRequestException('user_limit.reach_daily_like_limit'); + } + } + +} diff --git a/bootstrap/ConsoleErrorHandler.php b/bootstrap/ConsoleErrorHandler.php index fc82f5c5..c159338a 100644 --- a/bootstrap/ConsoleErrorHandler.php +++ b/bootstrap/ConsoleErrorHandler.php @@ -30,6 +30,10 @@ class ConsoleErrorHandler extends Component $logger = $this->getLogger(); $logger->error($content); + + if ($this->config->env == ENV_DEV) { + echo $content; + } } protected function getLogger() diff --git a/config/errors.php b/config/errors.php index 62d466f4..a0bad31d 100644 --- a/config/errors.php +++ b/config/errors.php @@ -193,12 +193,14 @@ $error['review.invalid_rating'] = '无效的评分（范围：1-5）'; $error['review.invalid_publish_status'] = '无效的发布状态'; $error['review.content_too_short'] = '评价内容太短（少于10个字符）'; $error['review.content_too_long'] = '评价内容太长（多于255个字符）'; +$error['review.edit_not_allowed'] = '当前不允许修改操作'; $error['review.has_liked'] = '你已经点过赞啦'; /** * 咨询相关 */ $error['consult.not_found'] = '咨询不存在'; +$error['consult.invalid_rating'] = '无效的评分（范围：1-5）'; $error['consult.invalid_private_status'] = '无效的私密状态'; $error['consult.invalid_publish_status'] = '无效的发布状态'; $error['consult.question_duplicated'] = '你已经咨询过类似问题啦'; @@ -206,6 +208,8 @@ $error['consult.question_too_short'] = '问题内容太短（少于15个字符 $error['consult.question_too_long'] = '问题内容太长（多于1000个字符）'; $error['consult.answer_too_short'] = '回复内容太短（少于15个字符）'; $error['consult.answer_too_long'] = '回复内容太长（多于1000个字符）'; +$error['consult.edit_not_allowed'] = '当前不允许修改操作'; +$error['consult.rate_not_allowed'] = '当前不允许评价'; $error['consult.has_liked'] = '你已经点过赞啦'; /** @@ -293,12 +297,10 @@ $error['role.routes_required'] = '角色权限不能为空'; /** * 用户限额 */ -$error['user_daily_limit.reach_favorite_limit'] = '超出日收藏限额'; -$error['user_daily_limit.reach_comment_limit'] = '超出日评论限额'; -$error['user_daily_limit.reach_consult_limit'] = '超出日咨询限额'; -$error['user_daily_limit.reach_review_limit'] = '超出日评价限额'; -$error['user_daily_limit.reach_order_limit'] = '超出日订单限额'; -$error['user_daily_limit.reach_like_limit'] = '超出日点赞限额'; +$error['user_limit.reach_favorite_limit'] = '超出收藏限额'; +$error['user_limit.reach_daily_consult_limit'] = '超出日咨询限额'; +$error['user_limit.reach_daily_order_limit'] = '超出日订单限额'; +$error['user_limit.reach_daily_like_limit'] = '超出日点赞限额'; /** * 课程查询 @@ -328,6 +330,9 @@ $error['im_group.not_found'] = '群组不存在'; $error['im_group.name_too_short'] = '群组名太短（少于2字符）'; $error['im_group.name_too_long'] = '群组名太长（超过30字符）'; $error['im_group.about_too_long'] = '群组简介太长（超过255字符）'; +$error['im_group.invalid_avatar'] = '无效的头像'; +$error['im_group.invalid_type'] = '无效的类型'; +$error['im_group.invalid_publish_status'] = '无效的发布状态'; $error['im_group_user.not_found'] = '群组关系不存在'; $error['im_group_user.remark_too_long'] = '验证信息太长（超过30字符）'; diff --git a/public/static/admin/css/common.css b/public/static/admin/css/common.css index 685bd18a..f2f037b2 100644 --- a/public/static/admin/css/common.css +++ b/public/static/admin/css/common.css @@ -22,6 +22,11 @@ text-align: center; } +.kg-pager { + margin-top: 20px; + text-align: center; +} + .kg-login-form { width: 400px; margin: 100px auto; @@ -107,7 +112,7 @@ margin: 0; } -.kg-priority-input { +input.kg-priority { width: 60px; } @@ -117,6 +122,13 @@ img.kg-cover { cursor: pointer; } +img.kg-avatar { + width: 96px; + height: 96px; + border-radius: 96px; + cursor: pointer; +} + .kg-form .layui-form-label { width: 120px; } diff --git a/public/static/admin/js/common.js b/public/static/admin/js/common.js index df4b7e01..9ad972a9 100644 --- a/public/static/admin/js/common.js +++ b/public/static/admin/js/common.js @@ -59,8 +59,13 @@ layui.use(['jquery', 'form', 'element', 'layer', 'dropdown'], function () { layer.msg(res.msg, {icon: icon}); } if (res.location) { + var target = res.target || 'self'; setTimeout(function () { - window.location.href = res.location; + if (target === 'parent') { + parent.location.href = res.location; + } else { + window.location.href = res.location; + } }, 1500); } else { submit.removeAttr('disabled').removeClass('layui-btn-disabled'); @@ -101,7 +106,7 @@ layui.use(['jquery', 'form', 'element', 'layer', 'dropdown'], function () { }); }); - $('.kg-priority-input').on('change', function () { + $('.kg-priority').on('change', function () { var priority = $(this).val(); var url = $(this).data('url'); $.ajax({ diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css index 4d03fd79..efd9f33b 100644 --- a/public/static/web/css/common.css +++ b/public/static/web/css/common.css @@ -38,6 +38,10 @@ text-align: center; } +.gray { + color: #999; +} + .qrcode img { width: 160px; height: 160px; @@ -1367,13 +1371,30 @@ body { width: 95%; } -.review-table .title, .review-table .content { +.layui-table p { + line-height: 1.8em; +} + +.layui-table .layui-icon { + color: orange; + font-size: 14px; +} + +.consult-table .question { + width: 400px; +} + +.consult-table .answer { + width: 400px; +} + +.review-table .title { width: 350px; } -.review-table .rating .layui-icon { - color: orange; - font-size: 14px; +.review-table .content { + width: 350px; + color: #999; } .review-form .layui-rate { @@ -1414,10 +1435,6 @@ body { margin-right: 30px; } -.layui-table p { - line-height: 1.8em; -} - .order-table { margin: 0; } diff --git a/public/static/web/js/common.js b/public/static/web/js/common.js index e21e74ce..53a94d95 100644 --- a/public/static/web/js/common.js +++ b/public/static/web/js/common.js @@ -96,7 +96,9 @@ layui.use(['jquery', 'form', 'element', 'layer', 'helper'], function () { window.location.href = res.location; }, 1500); } else { - window.location.reload(); + setTimeout(function () { + window.location.reload(); + }, 1500); } } }); diff --git a/public/static/web/js/my.js b/public/static/web/js/my.js index 5b16eac5..6e75789e 100644 --- a/public/static/web/js/my.js +++ b/public/static/web/js/my.js @@ -12,7 +12,7 @@ layui.use(['jquery', 'layer', 'helper'], function () { layer.open({ type: 2, title: '咨询详情', - content: [url, 'no'], + content: url, area: ['720px', '480px'] }); });