-
{% for lesson in item.children %}
{% set url = url({'for':'home.chapter.show','id':lesson.id}) %}
- {% set free_flag = lesson.free == 1 ? '免费' : '' %}
{% set active = (chapter.id == lesson.id) ? 'active' : 'normal' %}
-
{% if lesson.me.owned == 1 %}
- {{ lesson.title }} {{ free_flag }}
+ {{ lesson.title }}
{% else %}
{{ lesson.title }}
{% endif %}
diff --git a/app/Http/Home/Views/chapter/live/active.volt b/app/Http/Home/Views/chapter/live/active.volt
index 5e6b0f86..26a8f398 100644
--- a/app/Http/Home/Views/chapter/live/active.volt
+++ b/app/Http/Home/Views/chapter/live/active.volt
@@ -16,7 +16,6 @@
diff --git a/app/Http/Home/Views/chapter/live/forbid.volt b/app/Http/Home/Views/chapter/live/forbid.volt index ecf9f326..e41255aa 100644 --- a/app/Http/Home/Views/chapter/live/forbid.volt +++ b/app/Http/Home/Views/chapter/live/forbid.volt @@ -7,7 +7,6 @@ diff --git a/app/Http/Home/Views/chapter/live/inactive.volt b/app/Http/Home/Views/chapter/live/inactive.volt index db0e5667..5efcda9b 100644 --- a/app/Http/Home/Views/chapter/live/inactive.volt +++ b/app/Http/Home/Views/chapter/live/inactive.volt @@ -8,7 +8,6 @@ diff --git a/app/Http/Home/Views/chapter/read.volt b/app/Http/Home/Views/chapter/read.volt index 53146eeb..b40eebb8 100644 --- a/app/Http/Home/Views/chapter/read.volt +++ b/app/Http/Home/Views/chapter/read.volt @@ -13,7 +13,6 @@diff --git a/app/Http/Home/Views/chapter/vod.volt b/app/Http/Home/Views/chapter/vod.volt index 6075ab10..ae448a92 100644 --- a/app/Http/Home/Views/chapter/vod.volt +++ b/app/Http/Home/Views/chapter/vod.volt @@ -14,7 +14,6 @@diff --git a/app/Http/Home/Views/course/show_teacher.volt b/app/Http/Home/Views/course/show_teacher.volt index 9a6ed5cd..e6e7a5b3 100644 --- a/app/Http/Home/Views/course/show_teacher.volt +++ b/app/Http/Home/Views/course/show_teacher.volt @@ -8,7 +8,7 @@ {% set teacher.title = teacher.title ? teacher.title : '小小教书匠' %}-
+
diff --git a/app/Http/Home/Views/user/show.volt b/app/Http/Home/Views/user/show.volt index e10da454..80f762f0 100644 --- a/app/Http/Home/Views/user/show.volt +++ b/app/Http/Home/Views/user/show.volt @@ -25,7 +25,7 @@{{ vip_info(user.vip) }}-+
{{ user.name }}{{ gender_icon(user.gender) }}
diff --git a/app/Http/Mobile/Controllers/Controller.php b/app/Http/Mobile/Controllers/Controller.php deleted file mode 100644 index 0cdb1520..00000000 --- a/app/Http/Mobile/Controllers/Controller.php +++ /dev/null @@ -1,20 +0,0 @@ -checkRateLimit(); - } - -} diff --git a/app/Http/Mobile/Controllers/IndexController.php b/app/Http/Mobile/Controllers/IndexController.php deleted file mode 100644 index 92671115..00000000 --- a/app/Http/Mobile/Controllers/IndexController.php +++ /dev/null @@ -1,40 +0,0 @@ -router->getRoutes(); - - foreach ($routes as $route) { - if (strpos($route->getPattern(), '/api') !== false) { - $definitions[] = [ - 'pattern' => $route->getPattern(), - 'methods' => $route->getHttpMethods(), - ]; - } - } - - return $this->jsonSuccess(['routes' => $definitions]); - } - -} diff --git a/app/Http/Mobile/Controllers/PublicController.php b/app/Http/Mobile/Controllers/PublicController.php deleted file mode 100644 index f80bad67..00000000 --- a/app/Http/Mobile/Controllers/PublicController.php +++ /dev/null @@ -1,14 +0,0 @@ -setShared('view', function () { - $view = new MyView(); - $view->disable(); - return $view; - }); - - $di->setShared('auth', function () { - return new MobileAuth(); - }); - } - -} diff --git a/app/Http/Mobile/Services/Login.php b/app/Http/Mobile/Services/Login.php deleted file mode 100644 index 16efe40b..00000000 --- a/app/Http/Mobile/Services/Login.php +++ /dev/null @@ -1,29 +0,0 @@ -checkUserLogin($account, $password); - } - - public function loginByVerify($account, $code) - { - $validator = new AccountValidator(); - - $user = $validator->checkVerifyLogin($account, $code); - } - - protected function grantAuthToken() - { - - } - -} diff --git a/app/Http/Mobile/Services/Logout.php b/app/Http/Mobile/Services/Logout.php deleted file mode 100644 index 05a7ad49..00000000 --- a/app/Http/Mobile/Services/Logout.php +++ /dev/null @@ -1,18 +0,0 @@ -cover, 'http')) { - $this->cover = kg_cos_cover_url($this->cover); + $this->cover = kg_cos_slide_url($this->cover); } } diff --git a/app/Services/Logic/Consult/ConsultCreate.php b/app/Services/Logic/Consult/ConsultCreate.php index fe29e49a..7f21287d 100644 --- a/app/Services/Logic/Consult/ConsultCreate.php +++ b/app/Services/Logic/Consult/ConsultCreate.php @@ -117,6 +117,7 @@ class ConsultCreate extends Service protected function getPriority(CourseModel $course, UserModel $user) { $charge = $course->market_price > 0; + $vip = $user->vip == 1; if ($vip && $charge) { diff --git a/app/Services/Logic/Consult/ConsultDelete.php b/app/Services/Logic/Consult/ConsultDelete.php index 72e0f760..95395d60 100644 --- a/app/Services/Logic/Consult/ConsultDelete.php +++ b/app/Services/Logic/Consult/ConsultDelete.php @@ -21,10 +21,6 @@ class ConsultDelete extends Service { $consult = $this->checkConsult($id); - $course = $this->checkCourse($consult->course_id); - - $chapter = $this->checkChapter($consult->chapter_id); - $user = $this->getLoginUser(); $validator = new ConsultValidator(); @@ -33,9 +29,19 @@ class ConsultDelete extends Service $consult->update(['deleted' => 1]); - $this->decrCourseConsultCount($course); + if ($consult->course_id > 0) { - $this->decrChapterConsultCount($chapter); + $course = $this->checkCourse($consult->course_id); + + $this->decrCourseConsultCount($course); + } + + if ($consult->chapter_id > 0) { + + $chapter = $this->checkChapter($consult->chapter_id); + + $this->decrChapterConsultCount($chapter); + } } protected function decrCourseConsultCount(CourseModel $course) diff --git a/app/Services/Logic/Course/BasicInfo.php b/app/Services/Logic/Course/BasicInfo.php index ad16bb4d..8630c637 100644 --- a/app/Services/Logic/Course/BasicInfo.php +++ b/app/Services/Logic/Course/BasicInfo.php @@ -22,6 +22,8 @@ class BasicInfo extends Service public function handleBasicInfo(CourseModel $course) { + $course->details = kg_parse_markdown($course->details); + $teachers = $this->handleTeachers($course); $ratings = $this->handleRatings($course); diff --git a/app/Services/Logic/Help/HelpInfo.php b/app/Services/Logic/Help/HelpInfo.php index 3ca3bafd..75b5a8ee 100644 --- a/app/Services/Logic/Help/HelpInfo.php +++ b/app/Services/Logic/Help/HelpInfo.php @@ -20,10 +20,14 @@ class HelpInfo extends Service protected function handleHelp(HelpModel $help) { + $help->content = kg_parse_markdown($help->content); + return [ 'id' => $help->id, 'title' => $help->title, 'content' => $help->content, + 'create_time' => $help->create_time, + 'update_time' => $help->update_time, ]; } diff --git a/app/Services/Logic/Page/PageInfo.php b/app/Services/Logic/Page/PageInfo.php index 80f3b879..9b960599 100644 --- a/app/Services/Logic/Page/PageInfo.php +++ b/app/Services/Logic/Page/PageInfo.php @@ -20,6 +20,8 @@ class PageInfo extends Service protected function handlePage(PageModel $page) { + $page->content = kg_parse_markdown($page->content); + return [ 'id' => $page->id, 'title' => $page->title, diff --git a/app/Services/Logic/Review/ReviewCreate.php b/app/Services/Logic/Review/ReviewCreate.php index deb208a1..b56d38fe 100644 --- a/app/Services/Logic/Review/ReviewCreate.php +++ b/app/Services/Logic/Review/ReviewCreate.php @@ -52,7 +52,7 @@ class ReviewCreate extends Service $this->incrCourseReviewCount($course); - $this->updateCourseRating($course->id); + $this->updateCourseRating($course); return $review; } @@ -71,11 +71,11 @@ class ReviewCreate extends Service $course->update(); } - public function updateCourseRating($courseId) + public function updateCourseRating(CourseModel $course) { $service = new CourseStatService(); - $service->updateRating($courseId); + $service->updateRating($course->id); } } diff --git a/app/Services/Logic/Review/ReviewDelete.php b/app/Services/Logic/Review/ReviewDelete.php index f6086f18..16040e82 100644 --- a/app/Services/Logic/Review/ReviewDelete.php +++ b/app/Services/Logic/Review/ReviewDelete.php @@ -31,7 +31,7 @@ class ReviewDelete extends Service $this->decrCourseReviewCount($course); - $this->updateCourseRating($course->id); + $this->updateCourseRating($course); } protected function decrCourseReviewCount(CourseModel $course) @@ -42,11 +42,11 @@ class ReviewDelete extends Service } } - protected function updateCourseRating($courseId) + protected function updateCourseRating(CourseModel $course) { $service = new CourseStatService(); - $service->updateRating($courseId); + $service->updateRating($course->id); } } diff --git a/app/Services/Logic/Review/ReviewUpdate.php b/app/Services/Logic/Review/ReviewUpdate.php index dac4d046..0d942a6b 100644 --- a/app/Services/Logic/Review/ReviewUpdate.php +++ b/app/Services/Logic/Review/ReviewUpdate.php @@ -2,6 +2,7 @@ namespace App\Services\Logic\Review; +use App\Models\Course as CourseModel; use App\Services\CourseStat as CourseStatService; use App\Services\Logic\CourseTrait; use App\Services\Logic\ReviewTrait; @@ -39,14 +40,14 @@ class ReviewUpdate extends Service $review->update($data); - $this->updateCourseRating($course->id); + $this->updateCourseRating($course); } - protected function updateCourseRating($courseId) + protected function updateCourseRating(CourseModel $course) { $service = new CourseStatService(); - $service->updateRating($courseId); + $service->updateRating($course->id); } } diff --git a/app/Traits/Auth.php b/app/Traits/Auth.php index 1524fa90..6cde45db 100644 --- a/app/Traits/Auth.php +++ b/app/Traits/Auth.php @@ -46,7 +46,7 @@ trait Auth $validator = new AppValidator(); - $validator->checkAuthUser($authUser); + $validator->checkAuthUser($authUser['id']); $userRepo = new UserRepo(); diff --git a/app/Validators/Course.php b/app/Validators/Course.php index 3bafb387..65b157a7 100644 --- a/app/Validators/Course.php +++ b/app/Validators/Course.php @@ -90,7 +90,7 @@ class Course extends Validator throw new BadRequestException('course.invalid_cover'); } - return $value; + return kg_cos_img_style_trim($value); } public function checkTitle($title) diff --git a/app/Validators/ImGroup.php b/app/Validators/ImGroup.php index 80c042f5..d2118a43 100644 --- a/app/Validators/ImGroup.php +++ b/app/Validators/ImGroup.php @@ -98,7 +98,7 @@ class ImGroup extends Validator throw new BadRequestException('im_group.invalid_avatar'); } - return $value; + return kg_cos_img_style_trim($value); } public function checkType($type) diff --git a/app/Validators/Slide.php b/app/Validators/Slide.php index df354a26..86892ce3 100644 --- a/app/Validators/Slide.php +++ b/app/Validators/Slide.php @@ -64,18 +64,7 @@ class Slide extends Validator throw new BadRequestException('slide.invalid_cover'); } - return $value; - } - - public function checkBgColor($bgColor) - { - $value = $this->filter->sanitize($bgColor, ['trim', 'string']); - - if (!preg_match('/^#[0-9a-fA-F]{6}$/', $bgColor)) { - throw new BadRequestException('slide.invalid_bg_color'); - } - - return $value; + return kg_cos_img_style_trim($value); } public function checkPlatform($platform) diff --git a/app/Validators/User.php b/app/Validators/User.php index ac45c08b..36c4c1db 100644 --- a/app/Validators/User.php +++ b/app/Validators/User.php @@ -137,7 +137,7 @@ class User extends Validator throw new BadRequestException('user.invalid_avatar'); } - return $value; + return kg_cos_img_style_trim($value); } public function checkEduRole($value) diff --git a/app/Validators/Validator.php b/app/Validators/Validator.php index 2f3a8091..3d6352c9 100644 --- a/app/Validators/Validator.php +++ b/app/Validators/Validator.php @@ -9,9 +9,9 @@ use Phalcon\Mvc\User\Component; class Validator extends Component { - public function checkAuthUser($authInfo) + public function checkAuthUser($userId) { - if (empty($authInfo['id'])) { + if (empty($userId)) { throw new UnauthorizedException('sys.unauthorized'); } } diff --git a/bootstrap/HttpKernel.php b/bootstrap/HttpKernel.php index 648c905b..8e0ea783 100644 --- a/bootstrap/HttpKernel.php +++ b/bootstrap/HttpKernel.php @@ -113,10 +113,6 @@ class HttpKernel extends Kernel 'className' => 'App\Http\Home\Module', 'path' => app_path('Http/Home/Module.php'), ], - 'mobile' => [ - 'className' => 'App\Http\Mobile\Module', - 'path' => app_path('Http/Mobile/Module.php'), - ], ]; $this->app->registerModules($modules); diff --git a/config/routes.php b/config/routes.php index c8308d4c..ea91b66c 100644 --- a/config/routes.php +++ b/config/routes.php @@ -23,15 +23,6 @@ foreach ($webFiles as $file) { } } -$mobileFiles = scandir(app_path('Http/Mobile/Controllers')); - -foreach ($mobileFiles as $file) { - if (strpos($file, 'Controller.php')) { - $className = str_replace('Controller.php', '', $file); - $router->addModuleResource('mobile', 'App\Http\Mobile\Controllers\\' . $className); - } -} - $apiFiles = scandir(app_path('Http/Api/Controllers')); foreach ($apiFiles as $file) { diff --git a/public/static/admin/js/vditor.js b/public/static/admin/js/vditor.js index d04245fe..15339fcd 100644 --- a/public/static/admin/js/vditor.js +++ b/public/static/admin/js/vditor.js @@ -24,7 +24,7 @@ layui.use(['jquery'], function () { max: 30000 }, upload: { - url: '/admin/upload/img/editor', + url: '/admin/upload/content/img', max: 10 * 1024 * 1024, accept: 'image/*', headers: {