gitee/course-tencent-cloud
1
0
Fork 0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-07-15 21:02:20 +08:00
Code Issues Releases Wiki Activity

当deleted=1,published=0

Browse Source
This commit is contained in:
xiaochong0302 2020-07-14 21:13:37 +08:00
parent fe968a394a
commit 5cbb11141b
39 changed files with 156 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Builders/CategoryTreeList.php
View File

@ -58,7 +58,8 @@ class CategoryTreeList extends Builder
{
return CategoryModel::query()
->where('parent_id = :parent_id:', ['parent_id' => $categoryId])
->andWhere('deleted = 0')
->andWhere('published = 1')
->orderBy('priority ASC')
->execute();
}

2
app/Caches/CategoryList.php
View File

@ -31,7 +31,7 @@ class CategoryList extends Cache
*/
$categories = CategoryModel::query()
->columns(['id', 'parent_id', 'name', 'priority', 'level', 'path'])
->where('published = 1 AND deleted = 0')
->where('published = 1')
->execute();
if ($categories->count() == 0) {

2
app/Caches/ImChatGroup.php
View File

@ -16,7 +16,7 @@ class ImGroup extends Cache
public function getKey($id = null)
{
return "im_chat_group:{$id}";
return "im_group:{$id}";
}
public function getContent($id = null)

9
app/Console/Tasks/CleanLogTask.php
View File

@ -18,6 +18,7 @@ class CleanLogTask extends Task
$this->cleanMailerLog();
$this->cleanSmserLog();
$this->cleanVodLog();
$this->cleanLiveLog();
$this->cleanStorageLog();
$this->cleanAlipayLog();
$this->cleanWxpayLog();
@ -81,6 +82,14 @@ class CleanLogTask extends Task
$this->cleanLog('vod', 7);
}
/**
* 清理直播服务日志
*/
protected function cleanLiveLog()
{
$this->cleanLog('live', 7);
}
/**
* 清理存储服务日志
*/

12
app/Console/Tasks/SyncChapterCounterTask.php
View File

@ -50,13 +50,11 @@ class SyncChapterCounterTask extends Task
$chapterCache = new ChapterCache();
$hour = date('H');
$recount = $this->checkEnableRecount();
$allowRecount = $this->allowRecount();
foreach ($chapters as $chapter) {
if ($recount && $hour % 3 == 0) {
if ($allowRecount) {
$chapter->user_count = $chapterRepo->countUsers($chapter->id);
$chapter->lesson_count = $chapterRepo->countLessons($chapter->id);
@ -94,11 +92,9 @@ class SyncChapterCounterTask extends Task
return $syncer->getSyncKey();
}
protected function checkEnableRecount()
protected function allowRecount()
{
$config = $this->getDI()->get('config');
return $config->syncer->recount_chapter ?? false;
return date('H') % 2 == 0;
}
}

12
app/Console/Tasks/SyncCommentCounterTask.php
View File

@ -47,13 +47,11 @@ class SyncCommentCounterTask extends Task
$counterCache = new CommentCounterCache();
$hour = date('H');
$recount = $this->checkEnableRecount();
$allowRecount = $this->allowRecount();
foreach ($comments as $comment) {
if ($recount && $hour % 3 == 0) {
if ($allowRecount) {
$comment->reply_count = $commentRepo->countReplies($comment->id);
$comment->like_count = $commentRepo->countLikes($comment->id);
@ -83,11 +81,9 @@ class SyncCommentCounterTask extends Task
return $syncer->getSyncKey();
}
protected function checkEnableRecount()
protected function allowRecount()
{
$config = $this->getDI()->get('config');
return $config->syncer->recount_comment ?? false;
return date('H') == 5;
}
}

12
app/Console/Tasks/SyncConsultCounterTask.php
View File

@ -47,13 +47,11 @@ class SyncConsultCounterTask extends Task
$counterCache = new ConsultCounterCache();
$hour = date('H');
$recount = $this->checkEnableRecount();
$allowRecount = $this->allowRecount();
foreach ($consults as $consult) {
if ($recount && $hour % 3 == 0) {
if ($allowRecount) {
$consult->like_count = $consultRepo->countLikes($consult->id);
$consult->update();
@ -81,11 +79,9 @@ class SyncConsultCounterTask extends Task
return $syncer->getSyncKey();
}
protected function checkEnableRecount()
protected function allowRecount()
{
$config = $this->getDI()->get('config');
return $config->syncer->recount_consult ?? false;
return date('H') == 1;
}
}

14
app/Console/Tasks/SyncCourseCounterTask.php
View File

@ -50,16 +50,13 @@ class SyncCourseCounterTask extends Task
$courseCache = new CourseCache();
$hour = date('H');
$recount = $this->checkEnableRecount();
$allowRecount = $this->allowRecount();
foreach ($courses as $course) {
if ($recount && $hour % 3 == 0) {
if ($allowRecount) {
$course->user_count = $courseRepo->countUsers($course->id);
$course->lesson_count = $courseRepo->countLessons($course->id);
$course->comment_count = $courseRepo->countComments($course->id);
$course->consult_count = $courseRepo->countConsults($course->id);
$course->review_count = $courseRepo->countReviews($course->id);
@ -75,7 +72,6 @@ class SyncCourseCounterTask extends Task
if ($counter) {
$course->user_count = $counter['user_count'];
$course->lesson_count = $counter['lesson_count'];
$course->comment_count = $counter['comment_count'];
$course->consult_count = $counter['consult_count'];
$course->review_count = $counter['review_count'];
@ -95,11 +91,9 @@ class SyncCourseCounterTask extends Task
return $syncer->getSyncKey();
}
protected function checkEnableRecount()
protected function allowRecount()
{
$config = $this->getDI()->get('config');
return $config->syncer->recount_course ?? false;
return date('H') % 2 == 0;
}
}

12
app/Console/Tasks/SyncReviewCounterTask.php
View File

@ -47,13 +47,11 @@ class SyncReviewCounterTask extends Task
$counterCache = new ReviewCounterCache();
$hour = date('H');
$recount = $this->checkEnableRecount();
$allowRecount = $this->allowRecount();
foreach ($reviews as $review) {
if ($recount && $hour % 3 == 0) {
if ($allowRecount) {
$review->like_count = $reviewRepo->countLikes($review->id);
$review->update();
@ -81,11 +79,9 @@ class SyncReviewCounterTask extends Task
return $syncer->getSyncKey();
}
protected function checkEnableRecount()
protected function allowRecount()
{
$config = $this->getDI()->get('config');
return $config->syncer->recount_review ?? false;
return date('H') == 2;
}
}

2
app/Http/Web/Services/ImGroupTrait.php
View File

@ -72,6 +72,8 @@ Trait ImGroupTrait
'group_id' => $group->id,
'user_id' => $applicant->id,
]);
$group->user_count += 1;
$group->update();
}
$itemInfo = $message->item_info;

4
app/Models/Category.php
View File

@ -117,6 +117,10 @@ class Category extends Model
public function beforeUpdate()
{
$this->update_time = time();
if ($this->deleted == 1) {
$this->published = 0;
}
}
public function afterCreate()

4
app/Models/Chapter.php
View File

@ -216,6 +216,10 @@ class Chapter extends Model
{
$this->update_time = time();
if ($this->deleted == 1) {
$this->published = 0;
}
if (is_array($this->attrs)) {
$this->attrs = kg_json_encode($this->attrs);
}

4
app/Models/Comment.php
View File

@ -123,6 +123,10 @@ class Comment extends Model
public function beforeUpdate()
{
$this->update_time = time();
if ($this->deleted == 1) {
$this->published = 0;
}
}
}

4
app/Models/Consult.php
View File

@ -109,6 +109,10 @@ class Consult extends Model
public function beforeUpdate()
{
$this->update_time = time();
if ($this->deleted == 1) {
$this->published = 0;
}
}
}

4
app/Models/Course.php
View File

@ -284,6 +284,10 @@ class Course extends Model
{
$this->update_time = time();
if ($this->deleted == 1) {
$this->published = 0;
}
if (Text::startsWith($this->cover, 'http')) {
$this->cover = self::getCoverPath($this->cover);
}

4
app/Models/Danmu.php
View File

@ -145,6 +145,10 @@ class Danmu extends Model
public function beforeUpdate()
{
$this->update_time = time();
if ($this->deleted == 1) {
$this->published = 0;
}
}
public static function sizeTypes()

4
app/Models/Help.php
View File

@ -89,6 +89,10 @@ class Help extends Model
public function beforeUpdate()
{
$this->update_time = time();
if ($this->deleted == 1) {
$this->published = 0;
}
}
public function afterCreate()

4
app/Models/Nav.php
View File

@ -142,6 +142,10 @@ class Nav extends Model
public function beforeUpdate()
{
$this->update_time = time();
if ($this->deleted == 1) {
$this->published = 0;
}
}
public static function positionTypes()

4
app/Models/Package.php
View File

@ -103,6 +103,10 @@ class Package extends Model
public function beforeUpdate()
{
$this->update_time = time();
if ($this->deleted == 1) {
$this->published = 0;
}
}
public function afterCreate()

11
app/Models/Page.php
View File

@ -29,6 +29,13 @@ class Page extends Model
*/
public $content;
/**
* 发布标识
*
* @var int
*/
public $published;
/**
* 删除标识
*
@ -75,6 +82,10 @@ class Page extends Model
public function beforeUpdate()
{
$this->update_time = time();
if ($this->deleted == 1) {
$this->published = 0;
}
}
public function afterCreate()

4
app/Models/Review.php
View File

@ -134,6 +134,10 @@ class Review extends Model
$this->update_time = time();
$this->rating = $this->getAvgRating();
if ($this->deleted == 1) {
$this->published = 0;
}
}
protected function getAvgRating()

4
app/Models/Slide.php
View File

@ -135,6 +135,10 @@ class Slide extends Model
{
$this->update_time = time();
if ($this->deleted == 1) {
$this->published = 0;
}
if (Text::startsWith($this->cover, 'http')) {
$this->cover = self::getCoverPath($this->cover);
}

4
app/Models/Topic.php
View File

@ -89,6 +89,10 @@ class Topic extends Model
public function beforeUpdate()
{
$this->update_time = time();
if ($this->deleted == 1) {
$this->published = 0;
}
}
public function afterCreate()

6
app/Repos/Category.php
View File

@ -72,7 +72,6 @@ class Category extends Repository
{
return CategoryModel::query()
->where('parent_id = 0')
->andWhere('deleted = 0')
->andWhere('published = 1')
->execute();
}
@ -85,7 +84,6 @@ class Category extends Repository
{
return CategoryModel::query()
->where('parent_id = :parent_id:', ['parent_id' => $categoryId])
->andWhere('deleted = 0')
->andWhere('published = 1')
->execute();
}
@ -93,7 +91,7 @@ class Category extends Repository
public function countChildCategories($categoryId)
{
return CategoryModel::count([
'conditions' => 'parent_id = :parent_id: AND deleted = 0 AND published = 1',
'conditions' => 'parent_id = :parent_id: AND published = 1',
'bind' => ['parent_id' => $categoryId],
]);
}
@ -101,7 +99,7 @@ class Category extends Repository
public function countCourses($categoryId)
{
$phql = 'SELECT COUNT(*) AS total FROM %s cc JOIN %s c ON cc.course_id = c.id
WHERE cc.category_id = :category_id: AND c.published = 1 AND c.deleted = 0';
WHERE cc.category_id = :category_id: AND c.published = 1 AND c.published = 1';
$phql = sprintf($phql, CourseCategoryModel::class, CourseModel::class);

7
app/Repos/Course.php
View File

@ -146,7 +146,6 @@ class Course extends Repository
->join(CourseUserModel::class, 'u.id = cu.user_id', 'cu')
->where('cu.course_id = :course_id:', ['course_id' => $courseId])
->andWhere('cu.role_type = :role_type:', ['role_type' => $roleType])
->andWhere('u.deleted = 0')
->getQuery()->execute();
}
@ -161,7 +160,7 @@ class Course extends Repository
->addFrom(CategoryModel::class, 'c')
->join(CourseCategoryModel::class, 'c.id = cc.category_id', 'cc')
->where('cc.course_id = :course_id:', ['course_id' => $courseId])
->andWhere('c.deleted = 0')
->andWhere('c.published = 1')
->getQuery()->execute();
}
@ -176,7 +175,7 @@ class Course extends Repository
->addFrom(PackageModel::class, 'p')
->join(CoursePackageModel::class, 'p.id = cp.package_id', 'cp')
->where('cp.course_id = :course_id:', ['course_id' => $courseId])
->andWhere('p.deleted = 0')
->andWhere('p.published = 1')
->getQuery()->execute();
}
@ -191,7 +190,7 @@ class Course extends Repository
->addFrom(CourseModel::class, 'c')
->join(CourseRelatedModel::class, 'c.id = cr.related_id', 'cr')
->where('cr.course_id = :course_id:', ['course_id' => $courseId])
->andWhere('c.deleted = 0')
->andWhere('c.published = 1')
->getQuery()->execute();
}

2
app/Repos/Package.php
View File

@ -87,7 +87,7 @@ class Package extends Repository
->addFrom(CourseModel::class, 'c')
->join(CoursePackageModel::class, 'c.id = cp.course_id', 'cp')
->where('cp.package_id = :package_id:', ['package_id' => $packageId])
->andWhere('c.deleted = 0')
->andWhere('c.published = 1')
->getQuery()
->execute();
}

2
app/Repos/Topic.php
View File

@ -83,7 +83,7 @@ class Topic extends Repository
->addFrom(CourseModel::class, 'c')
->join(CourseTopicModel::class, 'c.id = ct.course_id', 'ct')
->where('ct.topic_id = :topic_id:', ['topic_id' => $topicId])
->andWhere('c.deleted = 0')
->andWhere('c.published = 1')
->getQuery()->execute();
}

2
app/Services/Captcha.php
View File

@ -59,7 +59,7 @@ class Captcha extends Service
$request = new DescribeCaptchaResultRequest();
/**
* 注意：CaptchaType 和 CaptchaAppId 强类型要求
* 注意：CaptchaType和CaptchaAppId强类型要求
*/
$params = json_encode([
'Ticket' => $ticket,

10
app/Services/Frontend/Chapter/ChapterBasic.php
View File

@ -48,11 +48,6 @@ class ChapterBasic extends FrontendService
$playUrls = $chapterVodService->getPlayUrls($chapter->id);
/**
* @var array $attrs
*/
$attrs = $chapter->attrs;
return [
'id' => $chapter->id,
'title' => $chapter->title,
@ -83,11 +78,6 @@ class ChapterBasic extends FrontendService
$live = $chapterRepo->findChapterLive($chapter->id);
/**
* @var array $attrs
*/
$attrs = $chapter->attrs;
return [
'id' => $chapter->id,
'title' => $chapter->title,

1
app/Services/Frontend/Chapter/Learning.php
View File

@ -28,6 +28,7 @@ class Learning extends FrontendService
'course_id' => $chapter->course_id,
'chapter_id' => $chapter->id,
'user_id' => $user->id,
'position' => 0,
];
$data['request_id'] = $validator->checkRequestId($post['request_id']);

20
app/Services/Frontend/Course/Favorite.php
View File

@ -5,9 +5,9 @@ namespace App\Services\Frontend\Course;
use App\Models\Course as CourseModel;
use App\Models\CourseFavorite as CourseFavoriteModel;
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\Course as CourseValidator;
use App\Validators\UserDailyLimit as UserDailyLimitValidator;
class Favorite extends FrontendService
@ -25,18 +25,18 @@ class Favorite extends FrontendService
$validator->checkFavoriteLimit($user);
$favoriteRepo = new CourseFavoriteRepo();
$validator = new CourseValidator();
$favorite = $favoriteRepo->findCourseFavorite($course->id, $user->id);
$favorite = $validator->checkIfFavorited($course->id, $user->id);
if (!$favorite) {
$favorite = new CourseFavoriteModel();
$favorite->course_id = $course->id;
$favorite->user_id = $user->id;
$favorite->create();
$favorite->create([
'course_id' => $course->id,
'user_id' => $user->id,
]);
$this->incrCourseFavoriteCount($course);
@ -44,18 +44,16 @@ class Favorite extends FrontendService
if ($favorite->deleted == 0) {
$favorite->deleted = 1;
$favorite->update(['deleted' => 1]);
$this->decrCourseFavoriteCount($course);
} else {
$favorite->deleted = 0;
$favorite->update(['deleted' => 0]);
$this->incrCourseFavoriteCount($course);
}
$favorite->update();
}
$this->incrUserDailyFavoriteCount($user);

19
app/Services/Frontend/Messenger/ContactList.php
View File

@ -1,19 +0,0 @@
<?php
namespace App\Services\Frontend\Messenger;
use App\Services\Frontend\Service as FrontendService;
class ContactList extends FrontendService
{
public function handle()
{
$user = $this->getLoginUser();
$mine = [
];
}
}

10
app/Validators/Chapter.php
View File

@ -137,7 +137,7 @@ class Chapter extends Validator
return $status;
}
public function checkPublishAbility($chapter)
public function checkPublishAbility(ChapterModel $chapter)
{
$courseRepo = new CourseRepo();
@ -160,7 +160,7 @@ class Chapter extends Validator
}
}
public function checkDeleteAbility($chapter)
public function checkDeleteAbility(ChapterModel $chapter)
{
$chapterRepo = new ChapterRepo();
@ -178,13 +178,13 @@ class Chapter extends Validator
{
$repo = new ChapterLikeRepo();
$chapterLike = $repo->findChapterLike($chapterId, $userId);
$like = $repo->findChapterLike($chapterId, $userId);
if ($chapterLike && time() - $chapterLike->create_time > 5 * 60) {
if ($like && time() - $like->create_time > 5 * 60) {
throw new BadRequestException('chapter.has_liked');
}
return $chapterLike;
return $like;
}
}

6
app/Validators/Comment.php
View File

@ -80,13 +80,13 @@ class Comment extends Validator
{
$repo = new CommentLikeRepo();
$commentLike = $repo->findCommentLike($chapterId, $userId);
$like = $repo->findCommentLike($chapterId, $userId);
if ($commentLike && time() - $commentLike->create_time > 5 * 60) {
if ($like && time() - $like->create_time > 5 * 60) {
throw new BadRequestException('comment.has_liked');
}
return $commentLike;
return $like;
}
}

6
app/Validators/Consult.php
View File

@ -85,13 +85,13 @@ class Consult extends Validator
{
$repo = new ConsultLikeRepo();
$consultLike = $repo->findConsultLike($chapterId, $userId);
$like = $repo->findConsultLike($chapterId, $userId);
if ($consultLike && time() - $consultLike->create_time > 5 * 60) {
if ($like && time() - $like->create_time > 5 * 60) {
throw new BadRequestException('consult.has_liked');
}
return $consultLike;
return $like;
}
}

16
app/Validators/Course.php
View File

@ -8,6 +8,7 @@ use App\Exceptions\BadRequest as BadRequestException;
use App\Library\Validators\Common as CommonValidator;
use App\Models\Course as CourseModel;
use App\Repos\Course as CourseRepo;
use App\Repos\CourseFavorite as CourseFavoriteRepo;
class Course extends Validator
{
@ -217,7 +218,7 @@ class Course extends Validator
return $status;
}
public function checkPublishAbility($course)
public function checkPublishAbility(CourseModel $course)
{
$courseRepo = new CourseRepo();
@ -242,4 +243,17 @@ class Course extends Validator
}
}
public function checkIfFavorited($courseId, $userId)
{
$repo = new CourseFavoriteRepo();
$favorite = $repo->findCourseFavorite($courseId, $userId);
if ($favorite && time() - $favorite->create_time > 5 * 60) {
throw new BadRequestException('course.has_favorited');
}
return $favorite;
}
}

6
app/Validators/Review.php
View File

@ -69,13 +69,13 @@ class Review extends Validator
{
$repo = new ReviewLikeRepo();
$reviewLike = $repo->findReviewLike($reviewId, $userId);
$like = $repo->findReviewLike($reviewId, $userId);
if ($reviewLike && time() - $reviewLike->create_time > 5 * 60) {
if ($like && time() - $like->create_time > 5 * 60) {
throw new BadRequestException('review.has_liked');
}
return $reviewLike;
return $like;
}
}

1
config/errors.php
View File

@ -112,6 +112,7 @@ $error['course.invalid_refund_expiry'] = '无效的退款期限';
$error['course.invalid_publish_status'] = '无效的发布状态';
$error['course.pub_chapter_not_found'] = '尚未发现已发布的课时';
$error['course.pub_chapter_not_enough'] = '已发布的课时太少（小于30%）';
$error['course.has_favorited'] = '你已收藏过该课程啦';
/**
* 话题相关

17
public/static/web/css/common.css
View File

@ -84,6 +84,12 @@
bottom: 60px;
}
body {
display: flex;
flex-flow: column;
min-height: 100vh;
}
#header {
left: 0;
top: 0;
@ -96,14 +102,15 @@
#main {
margin-top: 80px;
margin-bottom: 30px;
min-height: 550px;
flex: 1;
}
#footer {
width: 100%;
padding: 30px 0;
background: #474443;
text-align: center;
font-size: 12px;
background: #474443;
}
.logo {
@ -137,11 +144,15 @@
color: #fff;
}
.bottom-nav, .copyright {
.bottom-nav {
margin-bottom: 10px;
line-height: 18px;
}
.copyright {
line-height: 18px;
}
.bottom-nav a, .copyright span, .copyright a {
margin-right: 10px;
}