From fbcc72182802db52b7f3e5b7d339eb95c151261e Mon Sep 17 00:00:00 2001 From: koogua Date: Tue, 6 Sep 2022 10:58:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4group=E6=AE=8B=E7=95=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 16 +++++------ app/Console/Tasks/CleanDemoDataTask.php | 3 -- app/Http/Admin/Services/Index.php | 2 +- app/Http/Admin/Views/macros/group.volt | 11 ------- app/Http/Home/Views/macros/group.volt | 9 ------ app/Library/AppInfo.php | 4 +-- app/Library/Helper.php | 26 +---------------- app/Models/Notification.php | 9 ------ app/Services/Sync/GroupIndex.php | 38 ------------------------- 9 files changed, 12 insertions(+), 106 deletions(-) delete mode 100644 app/Http/Admin/Views/macros/group.volt delete mode 100644 app/Http/Home/Views/macros/group.volt delete mode 100644 app/Services/Sync/GroupIndex.php diff --git a/README.md b/README.md index 5fada448..f5664db8 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,10 @@ 酷瓜云课堂，依托腾讯云基础服务架构，采用C扩展框架Phalcon开发，GPL-2.0开源协议，致力开源网课系统，开源网校系统，开源知识付费系统，开源在线教育系统。 -![star](https://koogua.com/gitee/badge?user=koogua&project=course-tencent-cloud&type=star) -![fork](https://koogua.com/gitee/badge?user=koogua&project=course-tencent-cloud&type=fork) -![license](https://koogua.com/gitee/badge?user=koogua&project=course-tencent-cloud&type=license) -![release](https://koogua.com/gitee/badge?user=koogua&project=course-tencent-cloud&type=release) +![star](https://www.koogua.com/gitee/badge?user=koogua&project=course-tencent-cloud&type=star) +![fork](https://www.koogua.com/gitee/badge?user=koogua&project=course-tencent-cloud&type=fork) +![license](https://www.koogua.com/gitee/badge?user=koogua&project=course-tencent-cloud&type=license) +![release](https://www.koogua.com/gitee/badge?user=koogua&project=course-tencent-cloud&type=release) ### 系统功能 @@ -69,12 +69,12 @@ Tips: 请用手机注册一个新账号，用户中心 -> 关注订阅，扫码 ### 项目文档 -- [运行环境搭建](https://koogua.com/page/wiki) -- [系统服务配置](https://koogua.com/page/wiki) -- [客户终端配置](https://koogua.com/page/wiki) +- [运行环境搭建](https://www.koogua.com/page/wiki) +- [系统服务配置](https://www.koogua.com/page/wiki) +- [客户终端配置](https://www.koogua.com/page/wiki) ### 意见反馈 - [码云平台](https://gitee.com/koogua/course-tencent-cloud/issues) -- [官方社区](https://koogua.com/community) +- [官方社区](https://www.koogua.com/community) - QQ交流群: 787363898 diff --git a/app/Console/Tasks/CleanDemoDataTask.php b/app/Console/Tasks/CleanDemoDataTask.php index b53f97a1..1fb99e63 100644 --- a/app/Console/Tasks/CleanDemoDataTask.php +++ b/app/Console/Tasks/CleanDemoDataTask.php @@ -104,9 +104,6 @@ class CleanDemoDataTask extends Task $courseIndexTask = new CourseIndexTask(); $courseIndexTask->cleanAction(); - $groupIndexTask = new GroupIndexTask(); - $groupIndexTask->cleanAction(); - $questionIndexTask = new QuestionIndexTask(); $questionIndexTask->cleanAction(); diff --git a/app/Http/Admin/Services/Index.php b/app/Http/Admin/Services/Index.php index 42f06887..b363b6bb 100644 --- a/app/Http/Admin/Services/Index.php +++ b/app/Http/Admin/Services/Index.php @@ -115,7 +115,7 @@ class Index extends Service public function getReleases() { - $url = 'https://koogua.com/api/releases'; + $url = 'https://www.koogua.com/api/releases'; $client = new Client(); diff --git a/app/Http/Admin/Views/macros/group.volt b/app/Http/Admin/Views/macros/group.volt deleted file mode 100644 index 98f9ea44..00000000 --- a/app/Http/Admin/Views/macros/group.volt +++ /dev/null @@ -1,11 +0,0 @@ -{%- macro type_info(value) %} - {% if value == 1 %} - 课程 - {% elseif value == 2 %} - 水吧 - {% elseif value == 3 %} - 职工 - {% else %} - 未知 - {% endif %} -{%- endmacro %} \ No newline at end of file diff --git a/app/Http/Home/Views/macros/group.volt b/app/Http/Home/Views/macros/group.volt deleted file mode 100644 index 4a63a95a..00000000 --- a/app/Http/Home/Views/macros/group.volt +++ /dev/null @@ -1,9 +0,0 @@ -{%- macro type_info(value) %} - {% if value == 1 %} - 课程 - {% elseif value == 2 %} - 水吧 - {% elseif value == 3 %} - 职工 - {% endif %} -{%- endmacro %} \ No newline at end of file diff --git a/app/Library/AppInfo.php b/app/Library/AppInfo.php index d2a54f3c..8c0bdaa1 100644 --- a/app/Library/AppInfo.php +++ b/app/Library/AppInfo.php @@ -14,9 +14,9 @@ class AppInfo protected $alias = 'CTC'; - protected $link = 'https://koogua.com'; + protected $link = 'https://www.koogua.com'; - protected $version = '1.5.8'; + protected $version = '1.5.9'; public function __get($name) { diff --git a/app/Library/Helper.php b/app/Library/Helper.php index f3fe0731..29142a3c 100644 --- a/app/Library/Helper.php +++ b/app/Library/Helper.php @@ -199,16 +199,6 @@ function kg_default_user_avatar_path() return '/img/default/user_avatar.png'; } -/** - * 获取默认群组头像路径 - * - * @return string - */ -function kg_default_group_avatar_path() -{ - return '/img/default/group_avatar.png'; -} - /** * 获取默认课程封面路径 * @@ -315,20 +305,6 @@ function kg_cos_user_avatar_url($path, $style = null) return kg_cos_img_url($path, $style); } -/** - * 获取群组头像URL - * - * @param string $path - * @param string $style - * @return string - */ -function kg_cos_group_avatar_url($path, $style = null) -{ - $path = $path ?: kg_default_group_avatar_path(); - - return kg_cos_img_url($path, $style); -} - /** * 获取课程封面URL * @@ -442,7 +418,7 @@ function kg_clean_html($content) * @param int $length * @return string */ -function kg_parse_summary($content, $length = 100) +function kg_parse_summary($content, $length = 150) { $content = trim(strip_tags($content)); diff --git a/app/Models/Notification.php b/app/Models/Notification.php index 31ac0cc5..675472a8 100644 --- a/app/Models/Notification.php +++ b/app/Models/Notification.php @@ -95,15 +95,6 @@ class Notification extends Model const TYPE_ANSWER_COMMENTED = 227; const TYPE_ANSWER_LIKED = 228; - /* -------------- 微聊相关 -------------- */ - - const TYPE_FRIEND_REQUEST = 0; // 好友请求 - const TYPE_FRIEND_ACCEPTED = 0; // 好友被接受 - const TYPE_FRIEND_REFUSED = 0; // 好友被拒绝 - const TYPE_GROUP_REQUEST = 0; // 入群请求 - const TYPE_GROUP_ACCEPTED = 0; // 入群被接受 - const TYPE_GROUP_REFUSED = 0; // 入群被拒绝 - /* -------------- 评论相关 -------------- */ const TYPE_COMMENT_CREATED = 500; diff --git a/app/Services/Sync/GroupIndex.php b/app/Services/Sync/GroupIndex.php deleted file mode 100644 index 077ff5ed..00000000 --- a/app/Services/Sync/GroupIndex.php +++ /dev/null @@ -1,38 +0,0 @@ -getRedis(); - - $key = $this->getSyncKey(); - - $redis->sAdd($key, $groupId); - - if ($redis->sCard($key) == 1) { - $redis->expire($key, $this->lifetime); - } - } - - public function getSyncKey() - { - return 'sync_group_index'; - } - -}