From 4cae5ece118626c9e71498407b8d6542ce1746f6 Mon Sep 17 00:00:00 2001 From: koogua Date: Fri, 27 Nov 2020 09:38:54 +0800 Subject: [PATCH] =?UTF-8?q?!16=20v1.2.0=E9=98=B6=E6=AE=B5=E6=80=A7?= =?UTF-8?q?=E5=90=88=E5=B9=B6=20*=20=E6=9B=B4=E6=8D=A2README.md=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E7=AE=80=E4=B9=A6=E5=9B=BE=E5=BA=8A=E4=B8=BAgitee?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=20*=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=EF=BC=8Cmarkdown=E5=86=85=E5=AE=B9=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=20*=20=E7=A7=BB=E9=99=A4Mobile=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8DAPI=E8=AF=B7=E6=B1=82=E7=AB=A0?= =?UTF-8?q?=E8=8A=82=E4=BF=A1=E6=81=AF=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 5 -- README.md | 52 +++++++++++-------- app/Http/Admin/Views/setting/storage.volt | 4 ++ .../Api/Controllers/ChapterController.php | 6 +++ app/Http/Api/Services/Account.php | 4 -- .../Home/Controllers/PublicController.php | 26 ---------- .../Home/Controllers/UploadController.php | 11 +++- app/Http/Home/Views/chapter/catalog.volt | 3 +- app/Http/Home/Views/chapter/live/active.volt | 1 - app/Http/Home/Views/chapter/live/forbid.volt | 1 - .../Home/Views/chapter/live/inactive.volt | 1 - app/Http/Home/Views/chapter/read.volt | 1 - app/Http/Home/Views/chapter/vod.volt | 1 - app/Http/Home/Views/course/show_teacher.volt | 2 +- app/Http/Home/Views/user/show.volt | 2 +- app/Http/Mobile/Controllers/Controller.php | 20 ------- .../Mobile/Controllers/IndexController.php | 40 -------------- .../Mobile/Controllers/PublicController.php | 14 ----- app/Http/Mobile/Module.php | 31 ----------- app/Http/Mobile/Services/Login.php | 29 ----------- app/Http/Mobile/Services/Logout.php | 18 ------- app/Http/Mobile/Services/Service.php | 8 --- app/Library/Helper.php | 36 +++++++++++++ app/Models/Slide.php | 2 +- app/Services/Logic/Consult/ConsultCreate.php | 1 + app/Services/Logic/Consult/ConsultDelete.php | 18 ++++--- app/Services/Logic/Course/BasicInfo.php | 2 + app/Services/Logic/Help/HelpInfo.php | 4 ++ app/Services/Logic/Page/PageInfo.php | 2 + app/Services/Logic/Review/ReviewCreate.php | 6 +-- app/Services/Logic/Review/ReviewDelete.php | 6 +-- app/Services/Logic/Review/ReviewUpdate.php | 7 +-- app/Traits/Auth.php | 2 +- app/Validators/Course.php | 2 +- app/Validators/ImGroup.php | 2 +- app/Validators/Slide.php | 13 +---- app/Validators/User.php | 2 +- app/Validators/Validator.php | 4 +- bootstrap/HttpKernel.php | 4 -- config/routes.php | 9 ---- public/static/admin/js/vditor.js | 2 +- 41 files changed, 128 insertions(+), 276 deletions(-) delete mode 100644 LICENSE delete mode 100644 app/Http/Mobile/Controllers/Controller.php delete mode 100644 app/Http/Mobile/Controllers/IndexController.php delete mode 100644 app/Http/Mobile/Controllers/PublicController.php delete mode 100644 app/Http/Mobile/Module.php delete mode 100644 app/Http/Mobile/Services/Login.php delete mode 100644 app/Http/Mobile/Services/Logout.php delete mode 100644 app/Http/Mobile/Services/Service.php diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 1afa4e89..00000000 --- a/LICENSE +++ /dev/null @@ -1,5 +0,0 @@ -使用协议 - -1. 本系统属于强业务类型，非通用类库框架，不适合再次衍生发布。 -2. 在保留我们版权标识的前提下，用户可以修改以满足自己的需求，可以用于商业用途。 -3. 有限社区支持，用户对自己的行为负责。 \ No newline at end of file diff --git a/README.md b/README.md index abfadbd8..1d264fff 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,45 @@ ## 酷瓜云课堂 +![酷瓜云网课GPL协议开源](https://images.gitee.com/uploads/images/2020/1127/092621_3805cf8f_23592.png) + #### 项目介绍 -酷瓜云课堂，依托腾讯云基础服务架构，采用 C 扩展框架 Phalcon 开发，致力网络教育软件。 +酷瓜云课堂，依托腾讯云基础服务架构，采用C扩展框架Phalcon开发，GPL-2.0开源协议，致力开源网课系统，开源网校系统，开源在线教育系统。 + +![](https://img.shields.io/static/v1?label=release&message=1.2.0&color=blue) +![](https://img.shields.io/static/v1?label=stars&message=101&color=blue) +![](https://img.shields.io/static/v1?label=forks&message=40&color=blue) +![](https://img.shields.io/static/v1?label=license&message=GPL-2.0&color=blue) #### 系统功能 实现了点播、直播、专栏、会员、微聊等，是一个完整的产品，具体功能我也不想写一大堆，自己体验吧！ -- [前台演示](https://ctc.koogua.com) -- [后台演示](https://ctc.koogua.com/admin) - -帐号：100015@163.com / 123456 (前后台通用) - 友情提示： - 系统配置低（1核 1G 1M 跑多个容器），切莫压测 - 课程数据来源于网络（无实质内容），切莫购买 - 管理后台已禁止数据提交，私密配置已过滤 +演示帐号：**13507083515 / 123456** （前后台通用） + +桌面端演示： + +- [前台演示](https://ctc.koogua.com) +- [后台演示](https://ctc.koogua.com/admin) + +移动端演示： + +![移动端二维码](https://images.gitee.com/uploads/images/2020/1127/093203_265221a2_23592.png) + +支付流程演示： + +- [MySQL提升课程全面讲解MySQL架构设计（0.01元）](https://ctc.koogua.com/order/confirm?item_id=1390&item_type=1) +- [Nginx入门到实践Nginx中间件（0.01元）](https://ctc.koogua.com/order/confirm?item_id=1286&item_type=1) +- [数据库与中间件的基础必修课（0.02元）](https://ctc.koogua.com/order/confirm?item_id=80&item_type=2) + +Tips: 测试支付请用手机号注册一个新账户，以便接收订单通知，以及避免课程无法购买 + #### 项目组件 - 后台框架：[phalcon 3.4.5](https://phalcon.io) @@ -27,14 +48,6 @@ - 即时通讯：[workerman 3.5.22](https://workerman.net) - 基础依赖：[php7.3](https://php.net)， [mysql5.7](https://mysql.com)， [redis5.0](https://redis.io) -#### 使用协议 - -虽然尝试了解过开源协议，但是理解的模棱两可，干脆用自己的协议吧。 - -1. 本系统属于强业务类型，非通用类库框架，不适合再次衍生发布。 -2. 在保留我们版权标识的前提下，用户可以修改以满足自己的需求，可以用于商业用途。 -3. 有限社区支持，用户对自己的行为负责。 - #### 安装指南 - [运行环境搭建](https://gitee.com/koogua/course-tencent-cloud-docker) @@ -43,20 +56,13 @@ #### 开发计划 - 桌面端：进行中 -- 移动端：待启动 +- 移动端：进行中 - 小程序：待启动 #### 意见反馈 - [在线反馈](https://gitee.com/koogua/course-tencent-cloud/issues)（推荐） -- QQ邮箱: 76632555@qq.com -- QQ群组: 787363898 - -#### 加入我们 - -这是一个创业项目，个人能力和精力有限，要兼顾产品规划以及开发，还要处理很多琐碎事情。目前在南山科技园某个众创空间，希望有 **深圳前端同学** 加入我们。 - -联系邮箱：76632555@qq.com +- QQ交流群: 787363898 #### 通过这个项目能学到什么？ diff --git a/app/Http/Admin/Views/setting/storage.volt b/app/Http/Admin/Views/setting/storage.volt index 34ab1e62..9b1d2d6e 100644 --- a/app/Http/Admin/Views/setting/storage.volt +++ b/app/Http/Admin/Views/setting/storage.volt @@ -55,6 +55,10 @@ cover_270 mageMogr2/thumbnail/270x/interlace/0 + + content_800 + mageMogr2/thumbnail/800x/interlace/0 + slide_1100 imageMogr2/thumbnail/1100x/interlace/0 diff --git a/app/Http/Api/Controllers/ChapterController.php b/app/Http/Api/Controllers/ChapterController.php index 1897b9d1..d990ac62 100644 --- a/app/Http/Api/Controllers/ChapterController.php +++ b/app/Http/Api/Controllers/ChapterController.php @@ -47,6 +47,12 @@ class ChapterController extends Controller $chapter = $service->handle($id); + $owned = $chapter['me']['owned'] ?? false; + + if (!$owned) { + return $this->jsonError(['msg' => '没有访问章节权限']); + } + return $this->jsonSuccess(['chapter' => $chapter]); } diff --git a/app/Http/Api/Services/Account.php b/app/Http/Api/Services/Account.php index 96d09ce6..baf537f8 100644 --- a/app/Http/Api/Services/Account.php +++ b/app/Http/Api/Services/Account.php @@ -50,10 +50,6 @@ class Account extends Service $user = $validator->checkUserLogin($post['account'], $post['password']); - //$validator = new CaptchaValidator(); - - //$validator->checkCode($post['ticket'], $post['rand']); - return $this->auth->saveAuthInfo($user); } diff --git a/app/Http/Home/Controllers/PublicController.php b/app/Http/Home/Controllers/PublicController.php index 63eb1e37..21e28b1e 100644 --- a/app/Http/Home/Controllers/PublicController.php +++ b/app/Http/Home/Controllers/PublicController.php @@ -10,7 +10,6 @@ use App\Services\Pay\Wxpay as WxpayService; use App\Services\Storage as StorageService; use App\Traits\Response as ResponseTrait; use App\Traits\Security as SecurityTrait; -use Phalcon\Text; use PHPQRCode\QRcode; class PublicController extends \Phalcon\Mvc\Controller @@ -44,31 +43,6 @@ class PublicController extends \Phalcon\Mvc\Controller } } - /** - * @Get("/img/{id:[0-9]+}", name="home.img") - */ - public function imageAction($id) - { - $repo = new UploadRepo(); - - $file = $repo->findById($id); - - if ($file && Text::startsWith($file->mime, 'image')) { - - $service = new StorageService(); - - $location = $service->getImageUrl($file->path); - - $this->response->redirect($location); - - } else { - - $this->response->setStatusCode(404); - - return $this->response; - } - } - /** * @Get("/qrcode", name="home.qrcode") */ diff --git a/app/Http/Home/Controllers/UploadController.php b/app/Http/Home/Controllers/UploadController.php index e7877cf0..351f25cb 100644 --- a/app/Http/Home/Controllers/UploadController.php +++ b/app/Http/Home/Controllers/UploadController.php @@ -1,9 +1,9 @@ getAuthUser(); + + $validator = new AppValidator(); + + $validator->checkAuthUser($authUser->id); + } + /** * @Post("/avatar/img", name="home.upload.avatar_img") */ diff --git a/app/Http/Home/Views/chapter/catalog.volt b/app/Http/Home/Views/chapter/catalog.volt index 71105da9..9625d784 100644 --- a/app/Http/Home/Views/chapter/catalog.volt +++ b/app/Http/Home/Views/chapter/catalog.volt @@ -7,11 +7,10 @@