diff --git a/README.md b/README.md index 58b0251f..1a478c4f 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,12 @@ 都有些什么功能?我也不想写一大堆,自己体验吧! +帐号:100015@163.com / 123456 (前后台通用) + PS:**系统后台已禁止提交并隐藏私人配置** - [前台演示](https://ctc.koogua.com) - [后台演示](https://ctc.koogua.com/admin) -- [系统截图](https://gitee.com/koogua/course-tencent-cloud/wikis/系统截图) - -体验帐号: 100015@163.com / 123456 #### 项目组件 @@ -33,7 +32,7 @@ PS:**系统后台已禁止提交并隐藏私人配置** #### 安装指南 - [运行环境搭建](https://gitee.com/koogua/course-tencent-cloud-docker) -- [腾讯服务配置](https://gitee.com/koogua/course-tencent-cloud-docker/wikis/腾讯服务配置) +- [系统服务配置](https://gitee.com/koogua/course-tencent-cloud/wikis/服务配置) #### 会推出商业服务吗? diff --git a/app/Builders/ConsultList.php b/app/Builders/ConsultList.php index c74407bd..2223f559 100644 --- a/app/Builders/ConsultList.php +++ b/app/Builders/ConsultList.php @@ -73,7 +73,7 @@ class ConsultList extends Builder $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']); - $baseUrl = kg_ci_base_url(); + $baseUrl = kg_ss_url(); $result = []; diff --git a/app/Builders/CourseFavoriteList.php b/app/Builders/CourseFavoriteList.php index 9d196641..a516a3a4 100644 --- a/app/Builders/CourseFavoriteList.php +++ b/app/Builders/CourseFavoriteList.php @@ -45,7 +45,7 @@ class CourseFavoriteList extends Builder $courses = $courseRepo->findByIds($ids, $columns); - $baseUrl = kg_ci_base_url(); + $baseUrl = kg_ss_url(); $result = []; @@ -69,7 +69,7 @@ class CourseFavoriteList extends Builder $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']); - $baseUrl = kg_ci_base_url(); + $baseUrl = kg_ss_url(); $result = []; diff --git a/app/Builders/CourseList.php b/app/Builders/CourseList.php index 17659789..667de997 100644 --- a/app/Builders/CourseList.php +++ b/app/Builders/CourseList.php @@ -61,7 +61,7 @@ class CourseList extends Builder $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']); - $baseUrl = kg_ci_base_url(); + $baseUrl = kg_ss_url(); $result = []; diff --git a/app/Builders/CourseTopicList.php b/app/Builders/CourseTopicList.php index 8ae453d8..0d7ebd46 100644 --- a/app/Builders/CourseTopicList.php +++ b/app/Builders/CourseTopicList.php @@ -45,7 +45,7 @@ class CourseTopicList extends Builder $courses = $courseRepo->findByIds($ids, $columns); - $baseUrl = kg_ci_base_url(); + $baseUrl = kg_ss_url(); $result = []; diff --git a/app/Builders/CourseUserList.php b/app/Builders/CourseUserList.php index 153dd22c..b1579725 100644 --- a/app/Builders/CourseUserList.php +++ b/app/Builders/CourseUserList.php @@ -45,7 +45,7 @@ class CourseUserList extends Builder $courses = $courseRepo->findByIds($ids, $columns); - $baseUrl = kg_ci_base_url(); + $baseUrl = kg_ss_url(); $result = []; @@ -66,7 +66,7 @@ class CourseUserList extends Builder $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']); - $baseUrl = kg_ci_base_url(); + $baseUrl = kg_ss_url(); $result = []; diff --git a/app/Builders/DanmuList.php b/app/Builders/DanmuList.php index 0886ed9c..59fa36cb 100644 --- a/app/Builders/DanmuList.php +++ b/app/Builders/DanmuList.php @@ -84,7 +84,7 @@ class DanmuList extends Builder $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']); - $baseUrl = kg_ci_base_url(); + $baseUrl = kg_ss_url(); $result = []; diff --git a/app/Builders/ImFriendUserList.php b/app/Builders/ImFriendUserList.php index f8a39826..50d69ce7 100644 --- a/app/Builders/ImFriendUserList.php +++ b/app/Builders/ImFriendUserList.php @@ -31,7 +31,7 @@ class ImFriendUserList extends Builder $users = $userRepo->findByIds($ids, $columns); - $baseUrl = kg_ci_base_url(); + $baseUrl = kg_ss_url(); $result = []; diff --git a/app/Builders/ImGroupList.php b/app/Builders/ImGroupList.php index 7f779425..39316477 100644 --- a/app/Builders/ImGroupList.php +++ b/app/Builders/ImGroupList.php @@ -55,7 +55,7 @@ class ImGroupList extends Builder $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']); - $baseUrl = kg_ci_base_url(); + $baseUrl = kg_ss_url(); $result = []; diff --git a/app/Builders/ImGroupUserList.php b/app/Builders/ImGroupUserList.php index 4947f967..dafe443f 100644 --- a/app/Builders/ImGroupUserList.php +++ b/app/Builders/ImGroupUserList.php @@ -40,7 +40,7 @@ class ImGroupUserList extends Builder $users = $userRepo->findByIds($ids, $columns); - $baseUrl = kg_ci_base_url(); + $baseUrl = kg_ss_url(); $result = []; @@ -64,7 +64,7 @@ class ImGroupUserList extends Builder $users = $this->getGroupOwners($groups->toArray()); - $baseUrl = kg_ci_base_url(); + $baseUrl = kg_ss_url(); $result = []; diff --git a/app/Builders/ImMessageList.php b/app/Builders/ImMessageList.php index 486feb25..0c394cc6 100644 --- a/app/Builders/ImMessageList.php +++ b/app/Builders/ImMessageList.php @@ -26,7 +26,7 @@ class ImMessageList extends Builder $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']); - $baseUrl = kg_ci_base_url(); + $baseUrl = kg_ss_url(); $result = []; diff --git a/app/Builders/OrderList.php b/app/Builders/OrderList.php index 18caf72b..5a5a2ff6 100644 --- a/app/Builders/OrderList.php +++ b/app/Builders/OrderList.php @@ -12,7 +12,7 @@ class OrderList extends Builder public function __construct() { - $this->imgBaseUrl = kg_ci_base_url(); + $this->imgBaseUrl = kg_ss_url(); } /** diff --git a/app/Builders/ReviewList.php b/app/Builders/ReviewList.php index a78a1f65..e16f430b 100644 --- a/app/Builders/ReviewList.php +++ b/app/Builders/ReviewList.php @@ -55,7 +55,7 @@ class ReviewList extends Builder $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']); - $baseUrl = kg_ci_base_url(); + $baseUrl = kg_ss_url(); $result = []; diff --git a/app/Builders/UserList.php b/app/Builders/UserList.php index b033ec1b..4731773e 100644 --- a/app/Builders/UserList.php +++ b/app/Builders/UserList.php @@ -10,7 +10,7 @@ class UserList extends Builder public function handleUsers(array $users) { - $baseUrl = kg_ci_base_url(); + $baseUrl = kg_ss_url(); foreach ($users as $key => $user) { $users[$key]['avatar'] = $baseUrl . $user['avatar']; diff --git a/app/Console/Tasks/CleanSessionTask.php b/app/Console/Tasks/CleanSessionTask.php index a7140a1b..2be57e51 100644 --- a/app/Console/Tasks/CleanSessionTask.php +++ b/app/Console/Tasks/CleanSessionTask.php @@ -4,39 +4,32 @@ namespace App\Console\Tasks; use App\Library\Cache\Backend\Redis as RedisCache; use Phalcon\Cli\Task; +use Phalcon\Config; class CleanSessionTask extends Task { - /** - * @var RedisCache - */ - protected $cache; - - /** - * @var \Redis - */ - protected $redis; - public function mainAction() { - $this->cache = $this->getDI()->get('cache'); + $config = $this->getConfig(); - $this->redis = $this->cache->getRedis(); + $cache = $this->getCache(); + + $redis = $cache->getRedis(); + + $redis->select($config->path('session.db')); $keys = $this->querySessionKeys(10000); if (count($keys) == 0) return; - $config = $this->getDI()->get('config'); - - $lifetime = $config->session->lifetime; + $lifetime = $config->path('session.lifetime'); foreach ($keys as $key) { - $ttl = $this->redis->ttl($key); - $content = $this->redis->get($key); + $ttl = $redis->ttl($key); + $content = $redis->get($key); if (empty($content) && $ttl < $lifetime * 0.5) { - $this->redis->del($key); + $redis->del($key); } } } @@ -49,7 +42,29 @@ class CleanSessionTask extends Task */ protected function querySessionKeys($limit) { - return $this->cache->queryKeys('_PHCR', $limit); + $cache = $this->getCache(); + + return $cache->queryKeys('_PHCR', $limit); + } + + protected function getConfig() + { + /** + * @var Config $config + */ + $config = $this->getDI()->get('config'); + + return $config; + } + + protected function getCache() + { + /** + * @var RedisCache $cache + */ + $cache = $this->getDI()->get('cache'); + + return $cache; } } diff --git a/app/Http/Admin/Controllers/ChapterController.php b/app/Http/Admin/Controllers/ChapterController.php index 755c9ba1..bbef2879 100644 --- a/app/Http/Admin/Controllers/ChapterController.php +++ b/app/Http/Admin/Controllers/ChapterController.php @@ -5,7 +5,6 @@ namespace App\Http\Admin\Controllers; use App\Http\Admin\Services\Chapter as ChapterService; use App\Http\Admin\Services\ChapterContent as ChapterContentService; use App\Http\Admin\Services\Course as CourseService; -use App\Http\Admin\Services\Setting as SettingService; use App\Models\Course as CourseModel; /** @@ -86,13 +85,10 @@ class ChapterController extends Controller $contentService = new ChapterContentService(); $chapterService = new ChapterService(); $courseService = new CourseService(); - $settingService = new SettingService(); $chapter = $chapterService->getChapter($id); $course = $courseService->getCourse($chapter->course_id); - $storage = $settingService->getSectionSettings('storage'); - $this->view->setVar('storage', $storage); $this->view->setVar('chapter', $chapter); $this->view->setVar('course', $course); diff --git a/app/Http/Admin/Controllers/SettingController.php b/app/Http/Admin/Controllers/SettingController.php index c06cf6d6..1531065b 100644 --- a/app/Http/Admin/Controllers/SettingController.php +++ b/app/Http/Admin/Controllers/SettingController.php @@ -31,7 +31,7 @@ class SettingController extends Controller $site = $settingService->getSectionSettings($section); - $site['base_url'] = $site['base_url'] ?: kg_site_base_url(); + $site['url'] = $site['url'] ?: kg_site_url(); $this->view->setVar('site', $site); } @@ -67,7 +67,7 @@ class SettingController extends Controller */ public function storageAction() { - $section = 'storage'; + $section = 'cos'; $settingService = new SettingService(); @@ -81,9 +81,9 @@ class SettingController extends Controller } else { - $storage = $settingService->getSectionSettings($section); + $cos = $settingService->getSectionSettings($section); - $this->view->setVar('storage', $storage); + $this->view->setVar('cos', $cos); } } diff --git a/app/Http/Admin/Controllers/UploadController.php b/app/Http/Admin/Controllers/UploadController.php index f7ab899f..eb251179 100644 --- a/app/Http/Admin/Controllers/UploadController.php +++ b/app/Http/Admin/Controllers/UploadController.php @@ -22,7 +22,7 @@ class UploadController extends Controller if ($file) { return $this->jsonSuccess([ 'data' => [ - 'src' => $service->getCiImageUrl($file->path), + 'src' => $service->getImageUrl($file->path), 'title' => $file->name, ] ]); @@ -43,7 +43,7 @@ class UploadController extends Controller if ($file) { return $this->jsonSuccess([ 'data' => [ - 'src' => $service->getCiImageUrl($file->path), + 'src' => $service->getImageUrl($file->path), 'title' => $file->name, ] ]); @@ -64,7 +64,7 @@ class UploadController extends Controller if ($file) { return $this->jsonSuccess([ 'data' => [ - 'src' => $service->getCiImageUrl($file->path), + 'src' => $service->getImageUrl($file->path), 'title' => $file->name, ] ]); diff --git a/app/Http/Admin/Services/Setting.php b/app/Http/Admin/Services/Setting.php index 90e27a9c..a3f4104b 100644 --- a/app/Http/Admin/Services/Setting.php +++ b/app/Http/Admin/Services/Setting.php @@ -87,12 +87,8 @@ class Setting extends Service { $protocol = ['http://', 'https://']; - if (isset($settings['bucket_domain'])) { - $settings['bucket_domain'] = str_replace($protocol, '', $settings['bucket_domain']); - } - - if (isset($settings['ci_domain'])) { - $settings['ci_domain'] = str_replace($protocol, '', $settings['ci_domain']); + if (isset($settings['domain'])) { + $settings['domain'] = str_replace($protocol, '', $settings['domain']); } $this->updateSectionSettings($section, $settings); @@ -107,12 +103,10 @@ class Setting extends Service { $protocol = ['http://', 'https://']; - if (isset($settings['push_domain'])) { - $settings['push_domain'] = str_replace($protocol, '', $settings['push_domain']); - } - - if (isset($settings['pull_domain'])) { - $settings['pull_domain'] = str_replace($protocol, '', $settings['pull_domain']); + if (in_array($section, ['live.push', 'live.pull'])) { + if (isset($settings['domain'])) { + $settings['domain'] = str_replace($protocol, '', $settings['domain']); + } } $this->updateSectionSettings($section, $settings); diff --git a/app/Http/Admin/Views/chapter/edit_lesson.volt b/app/Http/Admin/Views/chapter/edit_lesson.volt index 9b30eba6..802c973e 100644 --- a/app/Http/Admin/Views/chapter/edit_lesson.volt +++ b/app/Http/Admin/Views/chapter/edit_lesson.volt @@ -26,11 +26,11 @@ {{ partial('chapter/edit_lesson_basic') }}