From 5cc94b0c0149f4d1daee350bb44da216cdcc1cd6 Mon Sep 17 00:00:00 2001 From: koogua Date: Thu, 28 Oct 2021 16:10:16 +0800 Subject: [PATCH] v.1.4.7 release --- CHANGELOG.md | 6 ++--- README.md | 24 ++++--------------- app/Http/Admin/Controllers/UserController.php | 3 +++ app/Http/Admin/Services/User.php | 4 ++++ app/Http/Admin/Views/user/edit.volt | 19 ++++++++++++++- 5 files changed, 33 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1029575e..23e7c7ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,11 @@ -### [v1.4.6](https://gitee.com/koogua/course-tencent-cloud/releases/v1.4.6)(2021-10-18) +### [v1.4.7](https://gitee.com/koogua/course-tencent-cloud/releases/v1.4.7)(2021-10-28) - 更新README.md - 优化分页查询参数过滤 -- 优化分页查询参数过滤 - 优化后台学员添加和搜索 - 优化后台学员课程过期管理 -- 增加后台会员特权过期管理 +- 增加编辑会员特权功能 +- 增加清空用户头像功能 - 增加编辑器内站外图片自动保存到本地 - 增加CSRF放行白名单 - 完善订单|交易|退款序号 diff --git a/README.md b/README.md index 0a5626ac..dda2a478 100644 --- a/README.md +++ b/README.md @@ -2,15 +2,14 @@ ![酷瓜云网课GPL协议开源](https://portal-1255691183.file.myqcloud.com/img/content/60e7aea40966f.png) -### 项目介绍 +### 系统介绍 酷瓜云课堂，依托腾讯云基础服务架构，采用C扩展框架Phalcon开发，GPL-2.0开源协议，致力开源网课系统，开源网校系统，开源知识付费系统，开源在线教育系统。 -[![Gitee star](https://gitee.com/koogua/course-tencent-cloud/badge/star.svg?theme=gitee)](https://gitee.com/koogua/course-tencent-cloud) -[![Gitee fork](https://gitee.com/koogua/course-tencent-cloud/badge/fork.svg?theme=gitee)](https://gitee.com/koogua/course-tencent-cloud) -[![Github stars](https://img.shields.io/github/stars/xiaochong0302/course-tencent-cloud?logo=github)](https://github.com/xiaochong0302/course-tencent-cloud) -[![Github forks](https://img.shields.io/github/forks/xiaochong0302/course-tencent-cloud?logo=github)](https://github.com/xiaochong0302/course-tencent-cloud) -![GPL-2.0](https://img.shields.io/static/v1?label=license&message=GPL-2.0&color=blue) +![star](https://svg.hamm.cn/gitee.svg?user=koogua&project=course-tencent-cloud&type=star) +![fork](https://svg.hamm.cn/gitee.svg?user=koogua&project=course-tencent-cloud&type=fork) +![license](https://svg.hamm.cn/gitee.svg?user=koogua&project=course-tencent-cloud&type=license) +![release](https://svg.hamm.cn/gitee.svg?user=koogua&project=course-tencent-cloud&type=release) ### 系统功能 @@ -79,16 +78,3 @@ Tips: 请用手机注册一个新账号，用户中心 -> 关注订阅，扫码 - [码云平台](https://gitee.com/koogua/course-tencent-cloud/issues) - [官方社区](https://koogua.com/community) - QQ交流群: 787363898 - -### 有阿里云版吗？ - -阿里云版规划中，之前阿里云服务过期未续费，所以腾讯云版本先出。 - -### 代码有加密吗？ - -所有代码都公开（授权代码除外，例如layim），没有所谓的商业版和付费插件。 - -### 开源助力 - -毫无保留的真开源不容易，不要吝啬您的赞许和鼓励，请给我们 **STAR** ！！！ - diff --git a/app/Http/Admin/Controllers/UserController.php b/app/Http/Admin/Controllers/UserController.php index 7877b6bf..f14b6e4c 100644 --- a/app/Http/Admin/Controllers/UserController.php +++ b/app/Http/Admin/Controllers/UserController.php @@ -90,6 +90,8 @@ class UserController extends Controller $account = $userService->getAccount($id); $adminRoles = $userService->getAdminRoles(); + $defaultAvatar = kg_cos_user_avatar_url(null); + if ($user->admin_role == RoleModel::ROLE_ROOT) { return $this->response->redirect(['for' => 'admin.user.list']); } @@ -97,6 +99,7 @@ class UserController extends Controller $this->view->setVar('user', $user); $this->view->setVar('account', $account); $this->view->setVar('admin_roles', $adminRoles); + $this->view->setVar('default_avatar', $defaultAvatar); } /** diff --git a/app/Http/Admin/Services/User.php b/app/Http/Admin/Services/User.php index 97d7f694..fdc20f23 100644 --- a/app/Http/Admin/Services/User.php +++ b/app/Http/Admin/Services/User.php @@ -162,6 +162,10 @@ class User extends Service $data = []; + if (isset($post['avatar'])) { + $data['avatar'] = $validator->checkAvatar($post['avatar']); + } + if (isset($post['name'])) { $data['name'] = $validator->checkName($post['name']); if ($post['name'] != $user->name) { diff --git a/app/Http/Admin/Views/user/edit.volt b/app/Http/Admin/Views/user/edit.volt index aa4cbac1..16477dc9 100644 --- a/app/Http/Admin/Views/user/edit.volt +++ b/app/Http/Admin/Views/user/edit.volt @@ -10,7 +10,18 @@ 编辑用户
- + +
+ + + +
+
+ +
+
+
+
@@ -141,6 +152,12 @@ var form = layui.form; var laydate = layui.laydate; + $('#clear-avatar').on('click', function () { + var defaultAvatar = $('input[name=default_avatar]').val(); + $('input[name=avatar]').val(defaultAvatar); + $('#avatar').attr('src', defaultAvatar); + }); + laydate.render({ elem: 'input[name=vip_expiry_time]', type: 'datetime'