- 
+ 
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/Library/Helper.php b/app/Library/Helper.php index 9377e4b1..e7af42e4 100644 --- a/app/Library/Helper.php +++ b/app/Library/Helper.php @@ -246,6 +246,42 @@ function kg_cos_cover_url($path, $style = null) return kg_cos_img_url($path, $style); } +/** + * 获取幻灯片URL + * + * @param string $path + * @param string $style + * @return string + */ +function kg_cos_slide_url($path, $style = null) +{ + return kg_cos_img_url($path, $style); +} + +/** + * 清除存储图片处理样式 + * + * @param $path + * @return string + */ +function kg_cos_img_style_trim($path) +{ + return preg_replace('/!\w+/', '', $path); +} + +/** + * 解析markdown内容 + * + * @param $content + * @return string + */ +function kg_parse_markdown($content) +{ + return preg_replace_callback('/\/img\/content\/(.*?)\)/', function ($matches) { + return '/img/content/' . trim($matches[1]) . '!content_800'; + }, $content); +} + /** * 隐藏部分字符 * diff --git a/app/Models/Slide.php b/app/Models/Slide.php index f99200fe..d5675fff 100644 --- a/app/Models/Slide.php +++ b/app/Models/Slide.php @@ -143,7 +143,7 @@ class Slide extends Model public function afterFetch() { if (!Text::startsWith($this->cover, 'http')) { - $this->cover = kg_cos_cover_url($this->cover); + $this->cover = kg_cos_slide_url($this->cover); } } 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/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/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: {