From 3a6d295aa1a9bd25e56e583da81759f33cc2a881 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Tue, 24 Dec 2024 10:56:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- app/Http/Admin/Services/Course.php | 4 ++-- app/Http/Admin/Services/Package.php | 24 ++++++------------------ app/Models/Article.php | 2 +- app/Models/Chapter.php | 4 ++-- app/Models/ChapterVod.php | 8 ++++---- app/Models/Course.php | 10 +++------- app/Models/Notification.php | 2 +- app/Models/Order.php | 2 +- app/Models/PointGift.php | 4 ++-- app/Models/PointHistory.php | 2 +- app/Models/Question.php | 5 ++++- app/Models/Role.php | 2 +- app/Models/Slide.php | 2 +- app/Models/Tag.php | 2 +- app/Models/Task.php | 2 +- app/Models/Vip.php | 17 ++++++++--------- app/Services/Search/ArticleDocument.php | 2 +- app/Services/Search/CourseDocument.php | 4 ++-- app/Services/Search/QuestionDocument.php | 2 +- 20 files changed, 45 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index 9172c884..ce9d88a9 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,8 @@ Tips: 请用手机注册一个新账号，用户中心 -> 关注订阅，扫码 ### 项目组件 -- 后台框架：[phalcon 3.4.5](https://phalcon.io) -- 前端框架：[layui 2.9.10](https://layui.dev) +- 后台框架：[phalcon 3.4](https://phalcon.io) +- 前端框架：[layui 2.9.20](https://layui.dev) - 全文检索：[xunsearch 1.4.17](http://www.xunsearch.com) - 基础依赖：[php7.3](https://php.net)， [mysql5.7](https://mysql.com)， [redis5.0](https://redis.io) diff --git a/app/Http/Admin/Services/Course.php b/app/Http/Admin/Services/Course.php index 24fb1d61..7f62cb15 100644 --- a/app/Http/Admin/Services/Course.php +++ b/app/Http/Admin/Services/Course.php @@ -168,12 +168,12 @@ class Course extends Service } } - if (isset($post['category_id']) && !empty($post['category_id'])) { + if (!empty($post['category_id'])) { $category = $validator->checkCategory($post['category_id']); $data['category_id'] = $category->id; } - if (isset($post['teacher_id']) && !empty($post['teacher_id'])) { + if (!empty($post['teacher_id'])) { $teacher = $validator->checkTeacher($post['teacher_id']); $data['teacher_id'] = $teacher->id; } diff --git a/app/Http/Admin/Services/Package.php b/app/Http/Admin/Services/Package.php index ce8552b0..f4119294 100644 --- a/app/Http/Admin/Services/Package.php +++ b/app/Http/Admin/Services/Package.php @@ -59,9 +59,8 @@ class Package extends Service $result = []; foreach ($items as $item) { - $price = $item->market_price > 0 ? sprintf("￥%0.2f", $item->market_price) : '免费'; $result[] = [ - 'name' => sprintf('%s - %s（¥%0.2f）', $item->id, $item->title, $price), + 'name' => sprintf('%s - %s（¥%0.2f）', $item->id, $item->title, $item->market_price), 'value' => $item->id, 'selected' => in_array($item->id, $courseIds), ]; @@ -152,7 +151,7 @@ class Package extends Service $package->update($data); $this->handlePackagedCourses($package->id); - $this->updatePackageCourseCount($package->id); + $this->recountPackageCourses($package->id); $this->rebuildPackageCache($package->id); return $package; @@ -217,7 +216,7 @@ class Package extends Service 'course_id' => $courseId, 'package_id' => $package->id, ]); - $this->updateCoursePackageCount($courseId); + $this->recountCoursePackages($courseId); $this->rebuildCoursePackageCache($courseId); } } @@ -229,7 +228,7 @@ class Package extends Service foreach ($deletedCourseIds as $courseId) { $coursePackage = $coursePackageRepo->findCoursePackage($courseId, $package->id); $coursePackage->delete(); - $this->updateCoursePackageCount($courseId); + $this->recountCoursePackages($courseId); $this->rebuildCoursePackageCache($courseId); } } @@ -249,7 +248,7 @@ class Package extends Service } } - protected function updatePackageCourseCount($packageId) + protected function recountPackageCourses($packageId) { $packageRepo = new PackageRepo(); @@ -262,7 +261,7 @@ class Package extends Service $package->update(); } - protected function updateCoursePackageCount($courseId) + protected function recountCoursePackages($courseId) { $courseRepo = new CourseRepo(); @@ -293,15 +292,4 @@ class Package extends Service $cache->rebuild($courseId); } - protected function recountCoursePackages($courseId) - { - $courseRepo = new CourseRepo(); - - $course = $courseRepo->findById($courseId); - - $course->package_count = $courseRepo->countPackages($courseId); - - $course->update(); - } - } diff --git a/app/Models/Article.php b/app/Models/Article.php index 4fac85c1..78a1dbd5 100644 --- a/app/Models/Article.php +++ b/app/Models/Article.php @@ -253,7 +253,7 @@ class Article extends Model $this->cover = self::getCoverPath($this->cover); } - if (is_array($this->tags) || is_object($this->tags)) { + if (is_array($this->tags)) { $this->tags = kg_json_encode($this->tags); } } diff --git a/app/Models/Chapter.php b/app/Models/Chapter.php index a136081f..30c52862 100644 --- a/app/Models/Chapter.php +++ b/app/Models/Chapter.php @@ -232,7 +232,7 @@ class Chapter extends Model } } - if (is_array($this->attrs) || is_object($this->attrs)) { + if (is_array($this->attrs)) { $this->attrs = kg_json_encode($this->attrs); } @@ -241,7 +241,7 @@ class Chapter extends Model public function beforeUpdate() { - if (is_array($this->attrs) || is_object($this->attrs)) { + if (is_array($this->attrs)) { $this->attrs = kg_json_encode($this->attrs); } diff --git a/app/Models/ChapterVod.php b/app/Models/ChapterVod.php index 32913975..148fb891 100644 --- a/app/Models/ChapterVod.php +++ b/app/Models/ChapterVod.php @@ -75,11 +75,11 @@ class ChapterVod extends Model public function beforeCreate() { - if (is_array($this->file_transcode) || is_object($this->file_transcode)) { + if (is_array($this->file_transcode)) { $this->file_transcode = kg_json_encode($this->file_transcode); } - if (is_array($this->file_remote) || is_object($this->file_remote)) { + if (is_array($this->file_remote)) { $this->file_remote = kg_json_encode($this->file_remote); } @@ -88,11 +88,11 @@ class ChapterVod extends Model public function beforeUpdate() { - if (is_array($this->file_transcode) || is_object($this->file_transcode)) { + if (is_array($this->file_transcode)) { $this->file_transcode = kg_json_encode($this->file_transcode); } - if (is_array($this->file_remote) || is_object($this->file_remote)) { + if (is_array($this->file_remote)) { $this->file_remote = kg_json_encode($this->file_remote); } diff --git a/app/Models/Course.php b/app/Models/Course.php index 56bb3219..38531f77 100644 --- a/app/Models/Course.php +++ b/app/Models/Course.php @@ -321,7 +321,7 @@ class Course extends Model } } - if (is_array($this->attrs) || is_object($this->attrs)) { + if (is_array($this->attrs)) { $this->attrs = kg_json_encode($this->attrs); } @@ -338,7 +338,7 @@ class Course extends Model $sync->addItem($this->id); } - if (is_array($this->attrs) || is_object($this->attrs)) { + if (is_array($this->attrs)) { $this->attrs = kg_json_encode($this->attrs); } @@ -355,17 +355,13 @@ class Course extends Model $this->cover = self::getCoverPath($this->cover); } - if (is_array($this->tags) || is_object($this->tags)) { + if (is_array($this->tags)) { $this->tags = kg_json_encode($this->tags); } if (empty($this->summary)) { $this->summary = kg_parse_summary($this->details); } - - if (empty($this->origin_price)) { - $this->origin_price = 1.5 * $this->market_price; - } } public function afterCreate() diff --git a/app/Models/Notification.php b/app/Models/Notification.php index 8f589960..d67aab75 100644 --- a/app/Models/Notification.php +++ b/app/Models/Notification.php @@ -186,7 +186,7 @@ class Notification extends Model public function beforeSave() { - if (is_array($this->event_info) || is_object($this->event_info)) { + if (is_array($this->event_info)) { $this->event_info = kg_json_encode($this->event_info); } } diff --git a/app/Models/Order.php b/app/Models/Order.php index dcc8668c..84d1ede2 100644 --- a/app/Models/Order.php +++ b/app/Models/Order.php @@ -161,7 +161,7 @@ class Order extends Model public function beforeSave() { - if (is_array($this->item_info) || is_object($this->item_info)) { + if (is_array($this->item_info)) { $this->item_info = kg_json_encode($this->item_info); } } diff --git a/app/Models/PointGift.php b/app/Models/PointGift.php index ae424730..a93077cd 100644 --- a/app/Models/PointGift.php +++ b/app/Models/PointGift.php @@ -181,7 +181,7 @@ class PointGift extends Model } } - if (is_array($this->attrs) || is_object($this->attrs)) { + if (is_array($this->attrs)) { $this->attrs = kg_json_encode($this->attrs); } @@ -190,7 +190,7 @@ class PointGift extends Model public function beforeUpdate() { - if (is_array($this->attrs) || is_object($this->attrs)) { + if (is_array($this->attrs)) { $this->attrs = kg_json_encode($this->attrs); } diff --git a/app/Models/PointHistory.php b/app/Models/PointHistory.php index 24b6d122..abaaad3e 100644 --- a/app/Models/PointHistory.php +++ b/app/Models/PointHistory.php @@ -110,7 +110,7 @@ class PointHistory extends Model public function beforeSave() { - if (is_array($this->event_info) || is_object($this->event_info)) { + if (is_array($this->event_info)) { $this->event_info = kg_json_encode($this->event_info); } } diff --git a/app/Models/Question.php b/app/Models/Question.php index 47a6be3d..3039a851 100644 --- a/app/Models/Question.php +++ b/app/Models/Question.php @@ -281,7 +281,7 @@ class Question extends Model $this->cover = self::getCoverPath($this->cover); } - if (is_array($this->tags) || is_object($this->tags)) { + if (is_array($this->tags)) { $this->tags = kg_json_encode($this->tags); } } @@ -295,6 +295,9 @@ class Question extends Model public function afterFetch() { + /** + * 问题封面非必要，有则处理，无则略过 + */ if (!empty($this->cover) && !Text::startsWith($this->cover, 'http')) { $this->cover = kg_cos_article_cover_url($this->cover); } diff --git a/app/Models/Role.php b/app/Models/Role.php index 262e6145..6e152b6b 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -118,7 +118,7 @@ class Role extends Model public function beforeSave() { - if (is_array($this->routes) || is_object($this->routes)) { + if (is_array($this->routes)) { $this->routes = kg_json_encode($this->routes); } } diff --git a/app/Models/Slide.php b/app/Models/Slide.php index b7dffd17..b95f9b31 100644 --- a/app/Models/Slide.php +++ b/app/Models/Slide.php @@ -146,7 +146,7 @@ class Slide extends Model $this->cover = self::getCoverPath($this->cover); } - if (is_array($this->target_attrs) || is_object($this->target_attrs)) { + if (is_array($this->target_attrs)) { $this->target_attrs = kg_json_encode($this->target_attrs); } } diff --git a/app/Models/Tag.php b/app/Models/Tag.php index a294e00c..6a63f929 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -154,7 +154,7 @@ class Tag extends Model $this->icon = self::getIconPath($this->icon); } - if (is_array($this->scopes) || is_object($this->scopes)) { + if (is_array($this->scopes)) { $this->scopes = kg_json_encode($this->scopes); } } diff --git a/app/Models/Task.php b/app/Models/Task.php index 2a0851dd..fcd819a2 100644 --- a/app/Models/Task.php +++ b/app/Models/Task.php @@ -141,7 +141,7 @@ class Task extends Model public function beforeSave() { - if (is_array($this->item_info) || is_object($this->item_info)) { + if (is_array($this->item_info)) { $this->item_info = kg_json_encode($this->item_info); } } diff --git a/app/Models/Vip.php b/app/Models/Vip.php index 5aa4bfbd..d709ce6d 100644 --- a/app/Models/Vip.php +++ b/app/Models/Vip.php @@ -95,22 +95,21 @@ class Vip extends Model public function beforeCreate() { - if (empty($this->cover)) { - $this->cover = kg_default_vip_cover_path(); - } elseif (Text::startsWith($this->cover, 'http')) { - $this->cover = self::getCoverPath($this->cover); - } - $this->create_time = time(); } public function beforeUpdate() { - if (Text::startsWith($this->cover, 'http')) { + $this->update_time = time(); + } + + public function beforeSave() + { + if (empty($this->cover)) { + $this->cover = kg_default_vip_cover_path(); + } elseif (Text::startsWith($this->cover, 'http')) { $this->cover = self::getCoverPath($this->cover); } - - $this->update_time = time(); } public function afterFetch() diff --git a/app/Services/Search/ArticleDocument.php b/app/Services/Search/ArticleDocument.php index d9615ec0..9e5a8ae2 100644 --- a/app/Services/Search/ArticleDocument.php +++ b/app/Services/Search/ArticleDocument.php @@ -41,7 +41,7 @@ class ArticleDocument extends Injectable */ public function formatDocument(ArticleModel $article) { - if (is_array($article->tags) || is_object($article->tags)) { + if (is_array($article->tags)) { $article->tags = kg_json_encode($article->tags); } diff --git a/app/Services/Search/CourseDocument.php b/app/Services/Search/CourseDocument.php index a1b6f774..23cd55f4 100644 --- a/app/Services/Search/CourseDocument.php +++ b/app/Services/Search/CourseDocument.php @@ -41,11 +41,11 @@ class CourseDocument extends Injectable */ public function formatDocument(CourseModel $course) { - if (is_array($course->attrs) || is_object($course->attrs)) { + if (is_array($course->attrs)) { $course->attrs = kg_json_encode($course->attrs); } - if (is_array($course->tags) || is_object($course->tags)) { + if (is_array($course->tags)) { $course->tags = kg_json_encode($course->tags); } diff --git a/app/Services/Search/QuestionDocument.php b/app/Services/Search/QuestionDocument.php index 4f1d70e7..7920f542 100644 --- a/app/Services/Search/QuestionDocument.php +++ b/app/Services/Search/QuestionDocument.php @@ -42,7 +42,7 @@ class QuestionDocument extends Injectable */ public function formatDocument(QuestionModel $question) { - if (is_array($question->tags) || is_object($question->tags)) { + if (is_array($question->tags)) { $question->tags = kg_json_encode($question->tags); }