Merge branch 'koogua/v1.6.9' into demo

# Conflicts:
#	app/Validators/Security.php

CHANGELOG.md

@@ -1,3 +1,21 @@
+### [v1.6.9](https://gitee.com/koogua/course-tencent-cloud/releases/v1.6.9)(2024-04-15)
+
+- 增加用户删除和还原功能
+- 增加unauthorized响应
+- 增加post方式传递csrf_token
+- 删除chapter中resource_count,consult_count属性
+- 精简csrf_token白名单
+- 拆解优化migrations创建表脚本
+- 修正chapter_user时长重复计数问题
+- 修正后台刷新首页缓存问题
+- 修正home模块中编辑器图片上传
+- 优化文章和提问搜索条件
+- 优化课程详情页排版
+- 优化storage上传
+- 优化CategoryTreeList
+- 优化CourseUserTrait
+- 更新layui-v2.9.7
+
 ### [v1.6.8](https://gitee.com/koogua/course-tencent-cloud/releases/v1.6.8)(2024-01-30)
 
 - 修正course_user中active_time未更新问题

app/Http/Admin/Controllers/UploadController.php

@@ -40,7 +40,7 @@ class UploadController extends Controller
         }
 
         $data = [
-            'src' => $service->getImageUrl($file->path),
+            'url' => $service->getImageUrl($file->path),
             'title' => $file->name,
         ];
 
@@ -61,7 +61,7 @@ class UploadController extends Controller
         }
 
         $data = [
-            'src' => $service->getImageUrl($file->path),
+            'url' => $service->getImageUrl($file->path),
             'title' => $file->name,
         ];
 
@@ -82,7 +82,7 @@ class UploadController extends Controller
         }
 
         $data = [
-            'src' => $service->getImageUrl($file->path),
+            'url' => $service->getImageUrl($file->path),
             'title' => $file->name,
         ];
 

app/Http/Admin/Services/Article.php

@@ -178,7 +178,6 @@ class Article extends Service
 
         if (isset($post['content'])) {
             $data['content'] = $validator->checkContent($post['content']);
-            $data['word_count'] = WordUtil::getWordCount($data['content']);
         }
 
         if (isset($post['source_type'])) {

app/Http/Admin/Services/Chapter.php

@@ -48,14 +48,12 @@ class Chapter extends Service
 
         $data['course_id'] = $course->id;
         $data['title'] = $validator->checkTitle($post['title']);
-        $data['summary'] = $validator->checkSummary($post['summary']);
 
         $chapterRepo = new ChapterRepo();
 
         if (isset($post['parent_id'])) {
             $parent = $validator->checkParent($post['parent_id']);
             $data['parent_id'] = $parent->id;
-            $data['free'] = $validator->checkFreeStatus($post['free']);
             $data['priority'] = $chapterRepo->maxLessonPriority($post['parent_id']);
         } else {
             $data['priority'] = $chapterRepo->maxChapterPriority($post['course_id']);

app/Http/Admin/Views/chapter/add_lesson.volt

@@ -23,19 +23,6 @@
                 <input class="layui-input" type="text" name="title" lay-verify="required">
             </div>
         </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">简介</label>
-            <div class="layui-input-block">
-                <textarea class="layui-textarea" name="summary"></textarea>
-            </div>
-        </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label">免费</label>
-            <div class="layui-input-block">
-                <input type="radio" name="free" value="1" title="是">
-                <input type="radio" name="free" value="0" title="否" checked="checked">
-            </div>
-        </div>
         <div class="layui-form-item">
             <label class="layui-form-label"></label>
             <div class="layui-input-block">

app/Http/Api/Controllers/IndexController.php

@@ -8,7 +8,6 @@
 namespace App\Http\Api\Controllers;
 
 use App\Caches\IndexArticleList;
-use App\Caches\IndexFlashSaleList;
 use App\Caches\IndexLiveList;
 use App\Caches\IndexQuestionList;
 use App\Caches\IndexSimpleFeaturedCourseList;

app/Http/Api/Controllers/UploadController.php

@@ -30,7 +30,7 @@ class UploadController extends Controller
         }
 
         $data = [
-            'src' => $service->getImageUrl($file->path),
+            'url' => $service->getImageUrl($file->path),
             'title' => $file->name,
         ];
 

app/Http/Home/Controllers/UploadController.php

@@ -39,7 +39,7 @@ class UploadController extends Controller
         }
 
         $data = [
-            'src' => $service->getImageUrl($file->path),
+            'url' => $service->getImageUrl($file->path),
             'title' => $file->name,
         ];
 
@@ -47,9 +47,9 @@ class UploadController extends Controller
     }
 
     /**
-     * @Post("/content/img", name="home.upload.content_img")
+     * @Post("/editor/img", name="home.upload.editor_img")
      */
-    public function uploadContentImageAction()
+    public function uploadEditorImageAction()
     {
         $service = new StorageService();
 

app/Http/Home/Views/user/console/profile.volt

@@ -79,7 +79,7 @@
 
 {% block include_js %}
 
-    {{ js_include('home/js/upload.avatar.js') }}
+    {{ js_include('home/js/user.avatar.upload.js') }}
     {{ js_include('home/js/user.console.profile.js') }}
 
 {% endblock %}

app/Models/Question.php

@@ -38,7 +38,7 @@ class Question extends Model
     public $category_id = 0;
 
     /**
-     * 提问者
+     * 提问者编号
      *
      * @var integer
      */

app/Repos/Article.php

@@ -57,6 +57,14 @@ class Article extends Repository
             }
         }
 
+        if (!empty($where['owner_id'])) {
+            if (is_array($where['owner_id'])) {
+                $builder->inWhere('owner_id', $where['owner_id']);
+            } else {
+                $builder->andWhere('owner_id = :owner_id:', ['owner_id' => $where['owner_id']]);
+            }
+        }
+
         if (!empty($where['source_type'])) {
             if (is_array($where['source_type'])) {
                 $builder->inWhere('source_type', $where['source_type']);
@@ -73,10 +81,6 @@ class Article extends Repository
             }
         }
 
-        if (!empty($where['owner_id'])) {
-            $builder->andWhere('owner_id = :owner_id:', ['owner_id' => $where['owner_id']]);
-        }
-
         if (!empty($where['title'])) {
             $builder->andWhere('title LIKE :title:', ['title' => "%{$where['title']}%"]);
         }

app/Repos/Question.php

@@ -58,6 +58,14 @@ class Question extends Repository
             }
         }
 
+        if (!empty($where['owner_id'])) {
+            if (is_array($where['owner_id'])) {
+                $builder->inWhere('owner_id', $where['owner_id']);
+            } else {
+                $builder->andWhere('owner_id = :owner_id:', ['owner_id' => $where['owner_id']]);
+            }
+        }
+
         if (!empty($where['published'])) {
             if (is_array($where['published'])) {
                 $builder->inWhere('published', $where['published']);
@@ -72,10 +80,6 @@ class Question extends Repository
             $builder->betweenWhere('create_time', $startTime, $endTime);
         }
 
-        if (!empty($where['owner_id'])) {
-            $builder->andWhere('owner_id = :owner_id:', ['owner_id' => $where['owner_id']]);
-        }
-
         if (!empty($where['title'])) {
             $builder->andWhere('title LIKE :title:', ['title' => "%{$where['title']}%"]);
         }

app/Repos/TeacherLive.php

@@ -11,7 +11,6 @@ use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder;
 use App\Models\Chapter as ChapterModel;
 use App\Models\ChapterLive as ChapterLiveModel;
 use App\Models\Course as CourseModel;
-use App\Models\CourseUser as CourseUserModel;
 
 class TeacherLive extends Repository
 {
@@ -33,7 +32,6 @@ class TeacherLive extends Repository
             ->join(ChapterLiveModel::class, 'chapter.id = cl.chapter_id', 'cl')
             ->join(CourseModel::class, 'chapter.course_id = course.id', 'course')
             ->where('course.teacher_id = :teacher_id:', ['teacher_id' => $userId])
-            ->andWhere('course.model = :model:', ['model' => CourseModel::MODEL_LIVE])
             ->andWhere('cl.start_time > :start_time:', ['start_time' => strtotime('today')])
             ->orderBy('cl.start_time ASC');
 

app/Services/Logic/DanmuTrait.php

@@ -1,22 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Services\Logic;
-
-use App\Validators\Danmu as DanmuValidator;
-
-trait DanmuTrait
-{
-
-    public function checkDanmu($id)
-    {
-        $validator = new DanmuValidator();
-
-        return $validator->checkDanmu($id);
-    }
-
-}

app/Services/MyStorage.php

@@ -140,7 +140,7 @@ class MyStorage extends Storage
      */
     public function uploadCoverImage()
     {
-        return $this->upload('/img/cover/', self::MIME_IMAGE, UploadModel::TYPE_COVER_IMG);
+        return $this->upload('/img/cover', self::MIME_IMAGE, UploadModel::TYPE_COVER_IMG);
     }
 
     /**
@@ -150,7 +150,7 @@ class MyStorage extends Storage
      */
     public function uploadContentImage()
     {
-        return $this->upload('/img/content/', self::MIME_IMAGE, UploadModel::TYPE_CONTENT_IMG);
+        return $this->upload('/img/content', self::MIME_IMAGE, UploadModel::TYPE_CONTENT_IMG);
     }
 
     /**
@@ -160,7 +160,7 @@ class MyStorage extends Storage
      */
     public function uploadAvatarImage()
     {
-        return $this->upload('/img/avatar/', self::MIME_IMAGE, UploadModel::TYPE_AVATAR_IMG);
+        return $this->upload('/img/avatar', self::MIME_IMAGE, UploadModel::TYPE_AVATAR_IMG);
     }
 
     /**
@@ -170,7 +170,7 @@ class MyStorage extends Storage
      */
     public function uploadIconImage()
     {
-        return $this->upload('/img/icon/', self::MIME_IMAGE, UploadModel::TYPE_ICON_IMG);
+        return $this->upload('/img/icon', self::MIME_IMAGE, UploadModel::TYPE_ICON_IMG);
     }
 
     /**
@@ -180,7 +180,7 @@ class MyStorage extends Storage
      */
     public function uploadResource()
     {
-        return $this->upload('/resource/', self::MIME_FILE, UploadModel::TYPE_RESOURCE);
+        return $this->upload('/resource', self::MIME_FILE, UploadModel::TYPE_RESOURCE);
     }
 
     /**
@@ -221,7 +221,7 @@ class MyStorage extends Storage
                     if (empty($fileName)) {
                         $keyName = $this->generateFileName($extension, $prefix);
                     } else {
-                        $keyName = $prefix . $fileName;
+                        $keyName = $prefix .'/'. $fileName;
                     }
 
                     $path = $this->putFile($keyName, $file->getTempName());

app/Services/Storage.php

@@ -259,7 +259,7 @@ class Storage extends Service
 
         $dot = $extension ? '.' : '';
 
-        return sprintf('%s%s%s%s', $prefix, $name, $dot, $extension);
+        return sprintf('%s/%s%s%s', $prefix, $name, $dot, $extension);
     }
 
     /**

app/Validators/Security.php

@@ -18,16 +18,22 @@ class Security extends Validator
     public function checkCsrfToken()
     {
         $route = $this->router->getMatchedRoute();
+        $headerToken = $this->request->getHeader('X-Csrf-Token');
+        $postToken = $this->request->getPost('csrf_token');
 
         if (in_array($route->getName(), $this->getCsrfWhitelist())) {
             return;
         }
 
-        $token = $this->request->getHeader('X-Csrf-Token');
-
         $service = new CsrfTokenService();
 
-        $result = $service->checkToken($token);
+        $result = false;
+
+        if ($headerToken) {
+            $result = $service->checkToken($headerToken);
+        } elseif ($postToken) {
+            $result = $service->checkToken($postToken);
+        }
 
         if (!$result) {
             throw new BadRequestException('security.invalid_csrf_token');
@@ -58,10 +64,7 @@ class Security extends Validator
 
     protected function getCsrfWhitelist()
     {
-        return [
+        return [];
-            'admin.upload.content_img',
-            'home.upload.content_img',
-        ];
     }
 
 }

public/static/admin/js/avatar.upload.js

@@ -32,8 +32,8 @@ layui.use(['jquery', 'layer', 'upload'], function () {
             });
         },
         done: function (res, index, upload) {
-            $('#img-avatar').attr('src', res.data.src);
+            $('#img-avatar').attr('src', res.data.url);
-            $('input[name=avatar]').val(res.data.src);
+            $('input[name=avatar]').val(res.data.url);
             layer.closeAll('loading');
         },
         error: function (index, upload) {

public/static/admin/js/content.editor.js

@@ -18,6 +18,9 @@ layui.use(['jquery'], function () {
             'superscript', 'subscript', '|', 'image', 'link', 'unlink', '|',
             'source', 'about'
         ],
+        extraFileUploadParams: {
+            csrf_token: $('meta[name="csrf-token"]').attr('content')
+        }
     };
 
     KindEditor.ready(function (K) {

public/static/admin/js/cover.upload.js

@@ -13,8 +13,8 @@ layui.use(['jquery', 'layer', 'upload'], function () {
             layer.load();
         },
         done: function (res, index, upload) {
-            $('#img-cover').attr('src', res.data.src);
+            $('#img-cover').attr('src', res.data.url);
-            $('input[name=cover]').val(res.data.src);
+            $('input[name=cover]').val(res.data.url);
             layer.closeAll('loading');
         },
         error: function (index, upload) {

public/static/admin/js/icon.upload.js

@@ -13,8 +13,8 @@ layui.use(['jquery', 'layer', 'upload'], function () {
             layer.load();
         },
         done: function (res, index, upload) {
-            $('#img-icon').attr('src', res.data.src);
+            $('#img-icon').attr('src', res.data.url);
-            $('input[name=icon]').val(res.data.src);
+            $('input[name=icon]').val(res.data.url);
             layer.closeAll('loading');
         },
         error: function (index, upload) {

public/static/home/js/content.editor.js

@@ -18,6 +18,9 @@ layui.use(['jquery'], function () {
             'superscript', 'subscript', '|', 'image', 'link', 'unlink', '|',
             'source', 'about'
         ],
+        extraFileUploadParams: {
+            csrf_token: $('meta[name="csrf-token"]').attr('content')
+        }
     };
 
     KindEditor.ready(function (K) {

public/static/home/js/user.avatar.upload.js

@@ -17,7 +17,6 @@ layui.use(['jquery', 'layer', 'upload'], function () {
         choose: function (obj) {
             var flag = true;
             obj.preview(function (index, file, result) {
-                console.log(file);
                 var img = new Image();
                 img.src = result;
                 img.onload = function () {
@@ -33,8 +32,8 @@ layui.use(['jquery', 'layer', 'upload'], function () {
             });
         },
         done: function (res, index, upload) {
-            $('#img-avatar').attr('src', res.data.src);
+            $('#img-avatar').attr('src', res.data.url);
-            $('input[name=avatar]').val(res.data.src);
+            $('input[name=avatar]').val(res.data.url);
             layer.closeAll('loading');
         },
         error: function (index, upload) {

public/static/lib/layui/extends/helper.js

@@ -16,7 +16,7 @@ layui.define(['jquery', 'layer'], function (exports) {
 
     helper.getRequestId = function () {
         var id = Date.now().toString(36);
-        id += Math.random().toString(36).substr(3);
+        id += Math.random().toString(36).substring(3);
         return id;
     };