Merge branch 'koogua/v1.7.8'

# Conflicts:
#	public/static/admin/js/avatar.upload.js

CHANGELOG.md

@@ -1,3 +1,53 @@
+### [v1.7.8](https://gitee.com/koogua/course-tencent-cloud/releases/v1.7.8)(2025-06-20)
+
+- 移除ThrottleLimit
+- 增加CloseLiveTask
+- 增加搜索页图片alt属性striptags过滤
+- 后台增加返回顶部快捷方式
+- 前台fixbar增加联系电话
+- 优化安装脚本
+- 优化课时列表直播提示
+- 优化后台返回链接
+- 优化统计分析代码位置
+- 直播回调后更新课时缓存
+- 后台清空头像->上传头像
+- sitemap.xml直接写入网站根目录
+
+### [v1.7.7](https://gitee.com/koogua/course-tencent-cloud/releases/v1.7.7)(2025-04-20)
+
+- 优化索引管理工具
+- 优化章节等页面UI
+- 修正workerman中onMessage问题
+- 修正非免费课程试听问题
+- 优化layer窗口中的表单跳转
+- 文件清理以及命名优化
+- 优化倒计时
+
+### [v1.7.6](https://gitee.com/koogua/course-tencent-cloud/releases/v1.7.6)(2025-03-22)
+
+- 升级layui-v2.9.25
+- 去除发货中不必要的异常抛出
+- 去除文章和问题缓存重建
+- 去除多余的文件引用
+- 修正每日访问站点积分问题
+- 限制全文搜索关键字长度
+- 统一规划二维码样式
+
+### [v1.7.5](https://gitee.com/koogua/course-tencent-cloud/releases/v1.7.5)(2025-02-22)
+
+- 优化后台统计图表
+- 优化图片放大查看
+- 优化错误处理机制
+- 优化前台编辑器页面
+- 去除一些过度的设计
+- 精简属性空判断
+- 规整redirect
+- 优化bootstrap
+- 优化logger
+- 优化contact
+- 优化logo
+- 优化nav
+
 ### [v1.7.4](https://gitee.com/koogua/course-tencent-cloud/releases/v1.7.4)(2024-12-10)
 
 - 更新layui-v2.9.20

README.md

@@ -1,6 +1,6 @@
 ## 酷瓜云课堂
 
-![酷瓜云课堂](https://portal-1255691183.file.myqcloud.com/img/content/61dd395c053e5.png)
+[![酷瓜云课堂-开源知识付费解决方案](https://portal-1255691183.file.myqcloud.com/img/content/63ec392618bd5.png)](https://www.koogua.com)
 
 ### 系统介绍
 
@@ -48,9 +48,9 @@ Tips: 请用手机注册一个新账号，用户中心 -> 关注订阅，扫码
  
 ### 项目组件
 
-- 后台框架：[phalcon 3.4.5](https://phalcon.io)
+- 后台框架：[phalcon 3.4](https://phalcon.io)
-- 前端框架：[layui 2.9.10](https://layui.dev)
+- 前端框架：[layui 2.9](https://layui.dev)
-- 全文检索：[xunsearch 1.4.17](http://www.xunsearch.com)
+- 全文检索：[xunsearch 1.4](http://www.xunsearch.com)
 - 基础依赖：[php7.3](https://php.net)， [mysql5.7](https://mysql.com)， [redis5.0](https://redis.io)
 
 ### 项目文档

app/Builders/AnswerList.php

@@ -8,7 +8,6 @@
 namespace App\Builders;
 
 use App\Repos\Question as QuestionRepo;
-use App\Repos\User as UserRepo;
 
 class AnswerList extends Builder
 {
@@ -18,7 +17,7 @@ class AnswerList extends Builder
         $questions = $this->getQuestions($answers);
 
         foreach ($answers as $key => $answer) {
-            $answers[$key]['question'] = $questions[$answer['question_id']] ?? new \stdClass();
+            $answers[$key]['question'] = $questions[$answer['question_id']] ?? null;
         }
 
         return $answers;
@@ -29,7 +28,7 @@ class AnswerList extends Builder
         $users = $this->getUsers($answers);
 
         foreach ($answers as $key => $answer) {
-            $answers[$key]['owner'] = $users[$answer['owner_id']] ?? new \stdClass();
+            $answers[$key]['owner'] = $users[$answer['owner_id']] ?? null;
         }
 
         return $answers;
@@ -56,20 +55,7 @@ class AnswerList extends Builder
     {
         $ids = kg_array_column($answers, 'owner_id');
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findShallowUserByIds($ids);
-
-        $baseUrl = kg_cos_url();
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $user['avatar'] = $baseUrl . $user['avatar'];
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/ArticleFavoriteList.php

@@ -8,7 +8,6 @@
 namespace App\Builders;
 
 use App\Repos\Article as ArticleRepo;
-use App\Repos\User as UserRepo;
 use Phalcon\Text;
 
 class ArticleFavoriteList extends Builder
@@ -19,7 +18,7 @@ class ArticleFavoriteList extends Builder
         $articles = $this->getArticles($relations);
 
         foreach ($relations as $key => $value) {
-            $relations[$key]['article'] = $articles[$value['article_id']] ?? new \stdClass();
+            $relations[$key]['article'] = $articles[$value['article_id']] ?? null;
         }
 
         return $relations;
@@ -30,7 +29,7 @@ class ArticleFavoriteList extends Builder
         $users = $this->getUsers($relations);
 
         foreach ($relations as $key => $value) {
-            $relations[$key]['user'] = $users[$value['user_id']] ?? new \stdClass();
+            $relations[$key]['user'] = $users[$value['user_id']] ?? null;
         }
 
         return $relations;
@@ -70,20 +69,7 @@ class ArticleFavoriteList extends Builder
     {
         $ids = kg_array_column($relations, 'user_id');
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']);
-
-        $baseUrl = kg_cos_url();
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $user['avatar'] = $baseUrl . $user['avatar'];
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/ArticleList.php

@@ -9,7 +9,6 @@ namespace App\Builders;
 
 use App\Caches\CategoryAllList as CategoryAllListCache;
 use App\Models\Category as CategoryModel;
-use App\Repos\User as UserRepo;
 
 class ArticleList extends Builder
 {
@@ -28,7 +27,7 @@ class ArticleList extends Builder
         $categories = $this->getCategories();
 
         foreach ($articles as $key => $article) {
-            $articles[$key]['category'] = $categories[$article['category_id']] ?? new \stdClass();
+            $articles[$key]['category'] = $categories[$article['category_id']] ?? null;
         }
 
         return $articles;
@@ -39,7 +38,7 @@ class ArticleList extends Builder
         $users = $this->getUsers($articles);
 
         foreach ($articles as $key => $article) {
-            $articles[$key]['owner'] = $users[$article['owner_id']] ?? new \stdClass();
+            $articles[$key]['owner'] = $users[$article['owner_id']] ?? null;
         }
 
         return $articles;
@@ -69,20 +68,7 @@ class ArticleList extends Builder
     {
         $ids = kg_array_column($articles, 'owner_id');
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findShallowUserByIds($ids);
-
-        $baseUrl = kg_cos_url();
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $user['avatar'] = $baseUrl . $user['avatar'];
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/Builder.php

@@ -7,6 +7,7 @@
 
 namespace App\Builders;
 
+use App\Repos\User as UserRepo;
 use Phalcon\Di\Injectable;
 
 class Builder extends Injectable
@@ -17,4 +18,22 @@ class Builder extends Injectable
         return kg_array_object($items);
     }
 
+    protected function getShallowUserByIds(array $ids)
+    {
+        $userRepo = new UserRepo();
+
+        $users = $userRepo->findShallowUserByIds($ids);
+
+        $baseUrl = kg_cos_url();
+
+        $result = [];
+
+        foreach ($users->toArray() as $user) {
+            $user['avatar'] = $baseUrl . $user['avatar'];
+            $result[$user['id']] = $user;
+        }
+
+        return $result;
+    }
+
 }

app/Builders/CommentList.php

@@ -7,8 +7,6 @@
 
 namespace App\Builders;
 
-use App\Repos\User as UserRepo;
-
 class CommentList extends Builder
 {
 
@@ -17,8 +15,8 @@ class CommentList extends Builder
         $users = $this->getUsers($comments);
 
         foreach ($comments as $key => $comment) {
-            $comments[$key]['owner'] = $users[$comment['owner_id']] ?? new \stdClass();
+            $comments[$key]['owner'] = $users[$comment['owner_id']] ?? null;
-            $comments[$key]['to_user'] = $users[$comment['to_user_id']] ?? new \stdClass();
+            $comments[$key]['to_user'] = $users[$comment['to_user_id']] ?? null;
         }
 
         return $comments;
@@ -30,20 +28,7 @@ class CommentList extends Builder
         $toUserIds = kg_array_column($comments, 'to_user_id');
         $ids = array_merge($ownerIds, $toUserIds);
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findShallowUserByIds($ids);
-
-        $baseUrl = kg_cos_url();
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $user['avatar'] = $baseUrl . $user['avatar'];
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/ConsultList.php

@@ -8,7 +8,6 @@
 namespace App\Builders;
 
 use App\Repos\Course as CourseRepo;
-use App\Repos\User as UserRepo;
 
 class ConsultList extends Builder
 {
@@ -18,7 +17,7 @@ class ConsultList extends Builder
         $courses = $this->getCourses($consults);
 
         foreach ($consults as $key => $consult) {
-            $consults[$key]['course'] = $courses[$consult['course_id']] ?? new \stdClass();
+            $consults[$key]['course'] = $courses[$consult['course_id']] ?? null;
         }
 
         return $consults;
@@ -29,8 +28,8 @@ class ConsultList extends Builder
         $users = $this->getUsers($consults);
 
         foreach ($consults as $key => $consult) {
-            $consults[$key]['owner'] = $users[$consult['owner_id']] ?? new \stdClass();
+            $consults[$key]['owner'] = $users[$consult['owner_id']] ?? null;
-            $consults[$key]['replier'] = $users[$consult['replier_id']] ?? new \stdClass();
+            $consults[$key]['replier'] = $users[$consult['replier_id']] ?? null;
         }
 
         return $consults;
@@ -59,20 +58,7 @@ class ConsultList extends Builder
         $replierIds = kg_array_column($consults, 'replier_id');
         $ids = array_merge($ownerIds, $replierIds);
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findShallowUserByIds($ids);
-
-        $baseUrl = kg_cos_url();
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $user['avatar'] = $baseUrl . $user['avatar'];
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/CourseFavoriteList.php

@@ -8,7 +8,6 @@
 namespace App\Builders;
 
 use App\Repos\Course as CourseRepo;
-use App\Repos\User as UserRepo;
 
 class CourseFavoriteList extends Builder
 {
@@ -18,7 +17,7 @@ class CourseFavoriteList extends Builder
         $courses = $this->getCourses($relations);
 
         foreach ($relations as $key => $value) {
-            $relations[$key]['course'] = $courses[$value['course_id']] ?? new \stdClass();
+            $relations[$key]['course'] = $courses[$value['course_id']] ?? null;
         }
 
         return $relations;
@@ -29,7 +28,7 @@ class CourseFavoriteList extends Builder
         $users = $this->getUsers($relations);
 
         foreach ($relations as $key => $value) {
-            $relations[$key]['user'] = $users[$value['user_id']] ?? new \stdClass();
+            $relations[$key]['user'] = $users[$value['user_id']] ?? null;
         }
 
         return $relations;
@@ -70,20 +69,7 @@ class CourseFavoriteList extends Builder
     {
         $ids = kg_array_column($relations, 'user_id');
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']);
-
-        $baseUrl = kg_cos_url();
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $user['avatar'] = $baseUrl . $user['avatar'];
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/CourseList.php

@@ -9,7 +9,6 @@ namespace App\Builders;
 
 use App\Caches\CategoryAllList as CategoryAllListCache;
 use App\Models\Category as CategoryModel;
-use App\Repos\User as UserRepo;
 
 class CourseList extends Builder
 {
@@ -19,7 +18,7 @@ class CourseList extends Builder
         $categories = $this->getCategories();
 
         foreach ($courses as $key => $course) {
-            $courses[$key]['category'] = $categories[$course['category_id']] ?? new \stdClass();
+            $courses[$key]['category'] = $categories[$course['category_id']] ?? null;
         }
 
         return $courses;
@@ -30,7 +29,7 @@ class CourseList extends Builder
         $teachers = $this->getTeachers($courses);
 
         foreach ($courses as $key => $course) {
-            $courses[$key]['teacher'] = $teachers[$course['teacher_id']] ?? new \stdClass();
+            $courses[$key]['teacher'] = $teachers[$course['teacher_id']] ?? null;
         }
 
         return $courses;
@@ -60,20 +59,7 @@ class CourseList extends Builder
     {
         $ids = kg_array_column($courses, 'teacher_id');
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findShallowUserByIds($ids);
-
-        $baseUrl = kg_cos_url();
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $user['avatar'] = $baseUrl . $user['avatar'];
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/CourseTopicList.php

@@ -18,7 +18,7 @@ class CourseTopicList extends Builder
         $courses = $this->getCourses($relations);
 
         foreach ($relations as $key => $value) {
-            $relations[$key]['course'] = $courses[$value['course_id']] ?? new \stdClass();
+            $relations[$key]['course'] = $courses[$value['course_id']] ?? null;
         }
 
         return $relations;
@@ -29,7 +29,7 @@ class CourseTopicList extends Builder
         $topics = $this->getTopics($relations);
 
         foreach ($relations as $key => $value) {
-            $relations[$key]['topic'] = $topics[$value['topic_id']] ?? new \stdClass();
+            $relations[$key]['topic'] = $topics[$value['topic_id']] ?? null;
         }
 
         return $relations;

app/Builders/CourseUserList.php

@@ -8,7 +8,6 @@
 namespace App\Builders;
 
 use App\Repos\Course as CourseRepo;
-use App\Repos\User as UserRepo;
 
 class CourseUserList extends Builder
 {
@@ -18,7 +17,7 @@ class CourseUserList extends Builder
         $courses = $this->getCourses($relations);
 
         foreach ($relations as $key => $value) {
-            $relations[$key]['course'] = $courses[$value['course_id']] ?? new \stdClass();
+            $relations[$key]['course'] = $courses[$value['course_id']] ?? null;
         }
 
         return $relations;
@@ -29,7 +28,7 @@ class CourseUserList extends Builder
         $users = $this->getUsers($relations);
 
         foreach ($relations as $key => $value) {
-            $relations[$key]['user'] = $users[$value['user_id']] ?? new \stdClass();
+            $relations[$key]['user'] = $users[$value['user_id']] ?? null;
         }
 
         return $relations;
@@ -74,20 +73,7 @@ class CourseUserList extends Builder
     {
         $ids = kg_array_column($relations, 'user_id');
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']);
-
-        $baseUrl = kg_cos_url();
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $user['avatar'] = $baseUrl . $user['avatar'];
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/HelpList.php

@@ -18,7 +18,7 @@ class HelpList extends Builder
         $categories = $this->getCategories();
 
         foreach ($helps as $key => $help) {
-            $helps[$key]['category'] = $categories[$help['category_id']] ?? new \stdClass();
+            $helps[$key]['category'] = $categories[$help['category_id']] ?? null;
         }
 
         return $helps;

app/Builders/LearningList.php

@@ -9,7 +9,6 @@ namespace App\Builders;
 
 use App\Repos\Chapter as ChapterRepo;
 use App\Repos\Course as CourseRepo;
-use App\Repos\User as UserRepo;
 
 class LearningList extends Builder
 {
@@ -19,7 +18,7 @@ class LearningList extends Builder
         $courses = $this->getCourses($relations);
 
         foreach ($relations as $key => $value) {
-            $relations[$key]['course'] = $courses[$value['course_id']] ?? new \stdClass();
+            $relations[$key]['course'] = $courses[$value['course_id']] ?? null;
         }
 
         return $relations;
@@ -30,7 +29,7 @@ class LearningList extends Builder
         $chapters = $this->getChapters($relations);
 
         foreach ($relations as $key => $value) {
-            $relations[$key]['chapter'] = $chapters[$value['chapter_id']] ?? new \stdClass();
+            $relations[$key]['chapter'] = $chapters[$value['chapter_id']] ?? null;
         }
 
         return $relations;
@@ -41,7 +40,7 @@ class LearningList extends Builder
         $users = $this->getUsers($relations);
 
         foreach ($relations as $key => $value) {
-            $relations[$key]['user'] = $users[$value['user_id']] ?? new \stdClass();
+            $relations[$key]['user'] = $users[$value['user_id']] ?? null;
         }
 
         return $relations;
@@ -85,17 +84,7 @@ class LearningList extends Builder
     {
         $ids = kg_array_column($relations, 'user_id');
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findByIds($ids, ['id', 'name']);
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/LiveList.php

@@ -19,7 +19,7 @@ class LiveList extends Builder
         $courses = $this->getCourses($lives);
 
         foreach ($lives as $key => $live) {
-            $lives[$key]['course'] = $courses[$live['course_id']] ?? new \stdClass();
+            $lives[$key]['course'] = $courses[$live['course_id']] ?? null;
         }
 
         return $lives;
@@ -30,7 +30,7 @@ class LiveList extends Builder
         $chapters = $this->getChapters($lives);
 
         foreach ($lives as $key => $live) {
-            $lives[$key]['chapter'] = $chapters[$live['chapter_id']] ?? new \stdClass();
+            $lives[$key]['chapter'] = $chapters[$live['chapter_id']] ?? null;
         }
 
         return $lives;
@@ -63,7 +63,7 @@ class LiveList extends Builder
 
         foreach ($courses->toArray() as $course) {
             $course['cover'] = $baseUrl . $course['cover'];
-            $course['teacher'] = $teachers[$course['teacher_id']] ?? new \stdClass();
+            $course['teacher'] = $teachers[$course['teacher_id']] ?? null;
             $result[$course['id']] = [
                 'id' => $course['id'],
                 'title' => $course['title'],

app/Builders/NotificationList.php

@@ -7,8 +7,6 @@
 
 namespace App\Builders;
 
-use App\Repos\User as UserRepo;
-
 class NotificationList extends Builder
 {
 
@@ -17,8 +15,8 @@ class NotificationList extends Builder
         $users = $this->getUsers($notifications);
 
         foreach ($notifications as $key => $notification) {
-            $notifications[$key]['sender'] = $users[$notification['sender_id']] ?? new \stdClass();
+            $notifications[$key]['sender'] = $users[$notification['sender_id']] ?? null;
-            $notifications[$key]['receiver'] = $users[$notification['receiver_id']] ?? new \stdClass();
+            $notifications[$key]['receiver'] = $users[$notification['receiver_id']] ?? null;
         }
 
         return $notifications;
@@ -30,20 +28,7 @@ class NotificationList extends Builder
         $receiverIds = kg_array_column($notifications, 'receiver_id');
         $ids = array_merge($senderIds, $receiverIds);
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findShallowUserByIds($ids);
-
-        $baseUrl = kg_cos_url();
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $user['avatar'] = $baseUrl . $user['avatar'];
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/OrderList.php

@@ -9,7 +9,6 @@ namespace App\Builders;
 
 use App\Models\Course as CourseModel;
 use App\Models\Order as OrderModel;
-use App\Repos\User as UserRepo;
 
 class OrderList extends Builder
 {
@@ -30,7 +29,7 @@ class OrderList extends Builder
         $users = $this->getUsers($orders);
 
         foreach ($orders as $key => $order) {
-            $orders[$key]['owner'] = $users[$order['owner_id']] ?? new \stdClass();
+            $orders[$key]['owner'] = $users[$order['owner_id']] ?? null;
         }
 
         return $orders;
@@ -175,17 +174,7 @@ class OrderList extends Builder
     {
         $ids = kg_array_column($orders, 'owner_id');
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findShallowUserByIds($ids);
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/QuestionFavoriteList.php

@@ -8,7 +8,6 @@
 namespace App\Builders;
 
 use App\Repos\Question as QuestionRepo;
-use App\Repos\User as UserRepo;
 use Phalcon\Text;
 
 class QuestionFavoriteList extends Builder
@@ -19,7 +18,7 @@ class QuestionFavoriteList extends Builder
         $questions = $this->getQuestions($relations);
 
         foreach ($relations as $key => $value) {
-            $relations[$key]['question'] = $questions[$value['question_id']] ?? new \stdClass();
+            $relations[$key]['question'] = $questions[$value['question_id']] ?? null;
         }
 
         return $relations;
@@ -30,7 +29,7 @@ class QuestionFavoriteList extends Builder
         $users = $this->getUsers($relations);
 
         foreach ($relations as $key => $value) {
-            $relations[$key]['user'] = $users[$value['user_id']] ?? new \stdClass();
+            $relations[$key]['user'] = $users[$value['user_id']] ?? null;
         }
 
         return $relations;
@@ -70,20 +69,7 @@ class QuestionFavoriteList extends Builder
     {
         $ids = kg_array_column($relations, 'user_id');
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findShallowUserByIds($ids);
-
-        $baseUrl = kg_cos_url();
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $user['avatar'] = $baseUrl . $user['avatar'];
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/QuestionList.php

@@ -9,7 +9,6 @@ namespace App\Builders;
 
 use App\Caches\CategoryAllList as CategoryAllListCache;
 use App\Models\Category as CategoryModel;
-use App\Repos\User as UserRepo;
 
 class QuestionList extends Builder
 {
@@ -28,7 +27,7 @@ class QuestionList extends Builder
         $categories = $this->getCategories();
 
         foreach ($questions as $key => $question) {
-            $questions[$key]['category'] = $categories[$question['category_id']] ?? new \stdClass();
+            $questions[$key]['category'] = $categories[$question['category_id']] ?? null;
         }
 
         return $questions;
@@ -39,8 +38,8 @@ class QuestionList extends Builder
         $users = $this->getUsers($questions);
 
         foreach ($questions as $key => $question) {
-            $questions[$key]['owner'] = $users[$question['owner_id']] ?? new \stdClass();
+            $questions[$key]['owner'] = $users[$question['owner_id']] ?? null;
-            $questions[$key]['last_replier'] = $users[$question['last_replier_id']] ?? new \stdClass();
+            $questions[$key]['last_replier'] = $users[$question['last_replier_id']] ?? null;
         }
 
         return $questions;
@@ -72,20 +71,7 @@ class QuestionList extends Builder
         $lastReplierIds = kg_array_column($questions, 'last_replier_id');
         $ids = array_merge($ownerIds, $lastReplierIds);
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findShallowUserByIds($ids);
-
-        $baseUrl = kg_cos_url();
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $user['avatar'] = $baseUrl . $user['avatar'];
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/RefundList.php

@@ -9,7 +9,6 @@ namespace App\Builders;
 
 use App\Models\Refund as RefundModel;
 use App\Repos\Order as OrderRepo;
-use App\Repos\User as UserRepo;
 
 class RefundList extends Builder
 {
@@ -19,7 +18,7 @@ class RefundList extends Builder
         $orders = $this->getOrders($trades);
 
         foreach ($trades as $key => $trade) {
-            $trades[$key]['order'] = $orders[$trade['order_id']] ?? new \stdClass();
+            $trades[$key]['order'] = $orders[$trade['order_id']] ?? null;
         }
 
         return $trades;
@@ -30,7 +29,7 @@ class RefundList extends Builder
         $users = $this->getUsers($refunds);
 
         foreach ($refunds as $key => $refund) {
-            $refunds[$key]['owner'] = $users[$refund['owner_id']] ?? new \stdClass();
+            $refunds[$key]['owner'] = $users[$refund['owner_id']] ?? null;
         }
 
         return $refunds;
@@ -75,20 +74,7 @@ class RefundList extends Builder
     {
         $ids = kg_array_column($refunds, 'owner_id');
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findShallowUserByIds($ids);
-
-        $baseUrl = kg_cos_url();
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $user['avatar'] = $baseUrl . $user['avatar'];
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/ReportList.php

@@ -7,8 +7,6 @@
 
 namespace App\Builders;
 
-use App\Repos\User as UserRepo;
-
 class ReportList extends Builder
 {
 
@@ -17,7 +15,7 @@ class ReportList extends Builder
         $users = $this->getUsers($reports);
 
         foreach ($reports as $key => $report) {
-            $reports[$key]['owner'] = $users[$report['owner_id']] ?? new \stdClass();
+            $reports[$key]['owner'] = $users[$report['owner_id']] ?? null;
         }
 
         return $reports;
@@ -27,20 +25,7 @@ class ReportList extends Builder
     {
         $ids = kg_array_column($reports, 'owner_id');
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findShallowUserByIds($ids);
-
-        $baseUrl = kg_cos_url();
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $user['avatar'] = $baseUrl . $user['avatar'];
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/ResourceList.php

@@ -17,7 +17,7 @@ class ResourceList extends Builder
         $uploads = $this->getUploads($relations);
 
         foreach ($relations as $key => $value) {
-            $relations[$key]['upload'] = $uploads[$value['upload_id']] ?? new \stdClass();
+            $relations[$key]['upload'] = $uploads[$value['upload_id']] ?? null;
         }
 
         return $relations;

app/Builders/ReviewList.php

@@ -8,7 +8,6 @@
 namespace App\Builders;
 
 use App\Repos\Course as CourseRepo;
-use App\Repos\User as UserRepo;
 
 class ReviewList extends Builder
 {
@@ -18,7 +17,7 @@ class ReviewList extends Builder
         $courses = $this->getCourses($reviews);
 
         foreach ($reviews as $key => $review) {
-            $reviews[$key]['course'] = $courses[$review['course_id']] ?? new \stdClass();
+            $reviews[$key]['course'] = $courses[$review['course_id']] ?? null;
         }
 
         return $reviews;
@@ -29,7 +28,7 @@ class ReviewList extends Builder
         $users = $this->getUsers($reviews);
 
         foreach ($reviews as $key => $review) {
-            $reviews[$key]['owner'] = $users[$review['owner_id']] ?? new \stdClass();
+            $reviews[$key]['owner'] = $users[$review['owner_id']] ?? null;
         }
 
         return $reviews;
@@ -56,20 +55,7 @@ class ReviewList extends Builder
     {
         $ids = kg_array_column($reviews, 'owner_id');
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findShallowUserByIds($ids);
-
-        $baseUrl = kg_cos_url();
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $user['avatar'] = $baseUrl . $user['avatar'];
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/TagFollowList.php

@@ -8,7 +8,6 @@
 namespace App\Builders;
 
 use App\Repos\Tag as TagRepo;
-use App\Repos\User as UserRepo;
 
 class TagFollowList extends Builder
 {
@@ -18,7 +17,7 @@ class TagFollowList extends Builder
         $tags = $this->getTags($relations);
 
         foreach ($relations as $key => $value) {
-            $relations[$key]['tag'] = $tags[$value['tag_id']] ?? new \stdClass();
+            $relations[$key]['tag'] = $tags[$value['tag_id']] ?? null;
         }
 
         return $relations;
@@ -29,7 +28,7 @@ class TagFollowList extends Builder
         $users = $this->getUsers($relations);
 
         foreach ($relations as $key => $value) {
-            $relations[$key]['user'] = $users[$value['user_id']] ?? new \stdClass();
+            $relations[$key]['user'] = $users[$value['user_id']] ?? null;
         }
 
         return $relations;
@@ -61,20 +60,7 @@ class TagFollowList extends Builder
     {
         $ids = kg_array_column($relations, 'user_id');
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']);
-
-        $baseUrl = kg_cos_url();
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $user['avatar'] = $baseUrl . $user['avatar'];
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/TradeList.php

@@ -8,7 +8,6 @@
 namespace App\Builders;
 
 use App\Repos\Order as OrderRepo;
-use App\Repos\User as UserRepo;
 
 class TradeList extends Builder
 {
@@ -18,7 +17,7 @@ class TradeList extends Builder
         $orders = $this->getOrders($trades);
 
         foreach ($trades as $key => $trade) {
-            $trades[$key]['order'] = $orders[$trade['order_id']] ?? new \stdClass();
+            $trades[$key]['order'] = $orders[$trade['order_id']] ?? null;
         }
 
         return $trades;
@@ -29,7 +28,7 @@ class TradeList extends Builder
         $users = $this->getUsers($trades);
 
         foreach ($trades as $key => $trade) {
-            $trades[$key]['owner'] = $users[$trade['owner_id']] ?? new \stdClass();
+            $trades[$key]['owner'] = $users[$trade['owner_id']] ?? null;
         }
 
         return $trades;
@@ -56,20 +55,7 @@ class TradeList extends Builder
     {
         $ids = kg_array_column($trades, 'owner_id');
 
-        $userRepo = new UserRepo();
+        return $this->getShallowUserByIds($ids);
-
-        $users = $userRepo->findShallowUserByIds($ids);
-
-        $baseUrl = kg_cos_url();
-
-        $result = [];
-
-        foreach ($users->toArray() as $user) {
-            $user['avatar'] = $baseUrl . $user['avatar'];
-            $result[$user['id']] = $user;
-        }
-
-        return $result;
     }
 
 }

app/Builders/UserList.php

@@ -30,7 +30,7 @@ class UserList extends Builder
         $accounts = $this->getAccounts($users);
 
         foreach ($users as $key => $user) {
-            $users[$key]['account'] = $accounts[$user['id']] ?? new \stdClass();
+            $users[$key]['account'] = $accounts[$user['id']] ?? null;
         }
 
         return $users;

app/Caches/Article.php

@@ -1,36 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Caches;
-
-use App\Repos\Article as ArticleRepo;
-
-class Article extends Cache
-{
-
-    protected $lifetime = 86400;
-
-    public function getLifetime()
-    {
-        return $this->lifetime;
-    }
-
-    public function getKey($id = null)
-    {
-        return "article:{$id}";
-    }
-
-    public function getContent($id = null)
-    {
-        $articleRepo = new ArticleRepo();
-
-        $article = $articleRepo->findById($id);
-
-        return $article ?: null;
-    }
-
-}

app/Caches/Help.php

@@ -1,36 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Caches;
-
-use App\Repos\Help as HelpRepo;
-
-class Help extends Cache
-{
-
-    protected $lifetime = 7 * 86400;
-
-    public function getLifetime()
-    {
-        return $this->lifetime;
-    }
-
-    public function getKey($id = null)
-    {
-        return "help:{$id}";
-    }
-
-    public function getContent($id = null)
-    {
-        $helpRepo = new HelpRepo();
-
-        $help = $helpRepo->findById($id);
-
-        return $help ?: null;
-    }
-
-}

app/Caches/HelpList.php

@@ -1,97 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Caches;
-
-use App\Models\Category as CategoryModel;
-use App\Models\Help as HelpModel;
-use Phalcon\Mvc\Model\Resultset;
-use Phalcon\Mvc\Model\ResultsetInterface;
-
-class HelpList extends Cache
-{
-
-    protected $lifetime = 7 * 86400;
-
-    public function getLifetime()
-    {
-        return $this->lifetime;
-    }
-
-    public function getKey($id = null)
-    {
-        return 'help_list';
-    }
-
-    public function getContent($id = null)
-    {
-
-        $categories = $this->findCategories();
-
-        if ($categories->count() == 0) {
-            return [];
-        }
-
-        $result = [];
-
-        foreach ($categories as $category) {
-
-            $item = [];
-
-            $item['category'] = [
-                'id' => $category->id,
-                'name' => $category->name,
-            ];
-
-            $item['helps'] = [];
-
-            $helps = $this->findHelps($category->id);
-
-            if ($helps->count() > 0) {
-                foreach ($helps as $help) {
-                    $item['helps'][] = [
-                        'id' => $help->id,
-                        'title' => $help->title,
-                    ];
-                }
-            }
-
-            $result[] = $item;
-        }
-
-        return $result;
-    }
-
-    /**
-     * @return ResultsetInterface|Resultset|CategoryModel[]
-     */
-    protected function findCategories()
-    {
-        return CategoryModel::query()
-            ->where('type = :type:', ['type' => CategoryModel::TYPE_HELP])
-            ->andWhere('level = 1')
-            ->andWhere('published = 1')
-            ->andWhere('deleted = 0')
-            ->orderBy('priority ASC')
-            ->execute();
-    }
-
-    /**
-     * @param int $categoryId
-     * @return ResultsetInterface|Resultset|CategoryModel[]
-     */
-    protected function findHelps($categoryId)
-    {
-        return HelpModel::query()
-            ->where('category_id = :category_id:', ['category_id' => $categoryId])
-            ->andWhere('published = 1')
-            ->andWhere('deleted = 0')
-            ->orderBy('priority ASC')
-            ->execute();
-    }
-
-}

app/Caches/MaxAnswerId.php

@@ -1,34 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Caches;
-
-use App\Models\Answer as AnswerModel;
-
-class MaxAnswerId extends Cache
-{
-
-    protected $lifetime = 365 * 86400;
-
-    public function getLifetime()
-    {
-        return $this->lifetime;
-    }
-
-    public function getKey($id = null)
-    {
-        return 'max_answer_id';
-    }
-
-    public function getContent($id = null)
-    {
-        $answer = AnswerModel::findFirst(['order' => 'id DESC']);
-
-        return $answer->id ?? 0;
-    }
-
-}

app/Caches/MaxArticleId.php

@@ -1,34 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Caches;
-
-use App\Models\Article as ArticleModel;
-
-class MaxArticleId extends Cache
-{
-
-    protected $lifetime = 365 * 86400;
-
-    public function getLifetime()
-    {
-        return $this->lifetime;
-    }
-
-    public function getKey($id = null)
-    {
-        return 'max_article_id';
-    }
-
-    public function getContent($id = null)
-    {
-        $article = ArticleModel::findFirst(['order' => 'id DESC']);
-
-        return $article->id ?? 0;
-    }
-
-}

app/Caches/MaxCommentId.php

@@ -1,34 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Caches;
-
-use App\Models\Comment as CommentModel;
-
-class MaxCommentId extends Cache
-{
-
-    protected $lifetime = 365 * 86400;
-
-    public function getLifetime()
-    {
-        return $this->lifetime;
-    }
-
-    public function getKey($id = null)
-    {
-        return 'max_comment_id';
-    }
-
-    public function getContent($id = null)
-    {
-        $comment = CommentModel::findFirst(['order' => 'id DESC']);
-
-        return $comment->id ?? 0;
-    }
-
-}

app/Caches/MaxHelpId.php

@@ -1,34 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Caches;
-
-use App\Models\Help as HelpModel;
-
-class MaxHelpId extends Cache
-{
-
-    protected $lifetime = 365 * 86400;
-
-    public function getLifetime()
-    {
-        return $this->lifetime;
-    }
-
-    public function getKey($id = null)
-    {
-        return 'max_help_id';
-    }
-
-    public function getContent($id = null)
-    {
-        $help = HelpModel::findFirst(['order' => 'id DESC']);
-
-        return $help->id ?? 0;
-    }
-
-}

app/Caches/MaxPageId.php

@@ -1,34 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Caches;
-
-use App\Models\Page as PageModel;
-
-class MaxPageId extends Cache
-{
-
-    protected $lifetime = 365 * 86400;
-
-    public function getLifetime()
-    {
-        return $this->lifetime;
-    }
-
-    public function getKey($id = null)
-    {
-        return 'max_page_id';
-    }
-
-    public function getContent($id = null)
-    {
-        $page = PageModel::findFirst(['order' => 'id DESC']);
-
-        return $page->id ?? 0;
-    }
-
-}

app/Caches/MaxPointGiftId.php

@@ -1,34 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Caches;
-
-use App\Models\PointGift as PointGiftModel;
-
-class MaxPointGiftId extends Cache
-{
-
-    protected $lifetime = 365 * 86400;
-
-    public function getLifetime()
-    {
-        return $this->lifetime;
-    }
-
-    public function getKey($id = null)
-    {
-        return 'max_point_gift_id';
-    }
-
-    public function getContent($id = null)
-    {
-        $gift = PointGiftModel::findFirst(['order' => 'id DESC']);
-
-        return $gift->id ?? 0;
-    }
-
-}

app/Caches/MaxQuestionId.php

@@ -1,34 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Caches;
-
-use App\Models\Question as QuestionModel;
-
-class MaxQuestionId extends Cache
-{
-
-    protected $lifetime = 365 * 86400;
-
-    public function getLifetime()
-    {
-        return $this->lifetime;
-    }
-
-    public function getKey($id = null)
-    {
-        return 'max_question_id';
-    }
-
-    public function getContent($id = null)
-    {
-        $question = QuestionModel::findFirst(['order' => 'id DESC']);
-
-        return $question->id ?? 0;
-    }
-
-}

app/Caches/MaxUploadId.php

@@ -1,34 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Caches;
-
-use App\Models\Upload as UploadModel;
-
-class MaxUploadId extends Cache
-{
-
-    protected $lifetime = 365 * 86400;
-
-    public function getLifetime()
-    {
-        return $this->lifetime;
-    }
-
-    public function getKey($id = null)
-    {
-        return 'max_upload_id';
-    }
-
-    public function getContent($id = null)
-    {
-        $upload = UploadModel::findFirst(['order' => 'id DESC']);
-
-        return $upload->id ?? 0;
-    }
-
-}

app/Caches/Page.php

@@ -1,36 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Caches;
-
-use App\Repos\Page as PageRepo;
-
-class Page extends Cache
-{
-
-    protected $lifetime = 7 * 86400;
-
-    public function getLifetime()
-    {
-        return $this->lifetime;
-    }
-
-    public function getKey($id = null)
-    {
-        return "page:{$id}";
-    }
-
-    public function getContent($id = null)
-    {
-        $pageRepo = new PageRepo();
-
-        $page = $pageRepo->findById($id);
-
-        return $page ?: null;
-    }
-
-}

app/Caches/PointGift.php

@@ -1,36 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Caches;
-
-use App\Repos\PointGift as PointGiftRepo;
-
-class PointGift extends Cache
-{
-
-    protected $lifetime = 86400;
-
-    public function getLifetime()
-    {
-        return $this->lifetime;
-    }
-
-    public function getKey($id = null)
-    {
-        return "point_gift:{$id}";
-    }
-
-    public function getContent($id = null)
-    {
-        $giftRepo = new PointGiftRepo();
-
-        $gift = $giftRepo->findById($id);
-
-        return $gift ?: null;
-    }
-
-}

app/Caches/Question.php

@@ -1,36 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
- * @license https://opensource.org/licenses/GPL-2.0
- * @link https://www.koogua.com
- */
-
-namespace App\Caches;
-
-use App\Repos\Question as QuestionRepo;
-
-class Question extends Cache
-{
-
-    protected $lifetime = 86400;
-
-    public function getLifetime()
-    {
-        return $this->lifetime;
-    }
-
-    public function getKey($id = null)
-    {
-        return "question:{$id}";
-    }
-
-    public function getContent($id = null)
-    {
-        $questionRepo = new QuestionRepo();
-
-        $question = $questionRepo->findById($id);
-
-        return $question ?: null;
-    }
-
-}

app/Console/Migrations/Migration.php

@@ -18,6 +18,13 @@ abstract class Migration
 
     abstract public function run();
 
+    protected function saveSettings(array $settings)
+    {
+        foreach ($settings as $setting) {
+            $this->saveSetting($setting);
+        }
+    }
+
     protected function saveSetting(array $setting)
     {
         $settingRepo = new SettingRepo();
@@ -32,4 +39,4 @@ abstract class Migration
         }
     }
 
-}
+}

app/Console/Migrations/V20250110191618.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * @copyright Copyright (c) 2025 深圳市酷瓜软件有限公司
+ * @license https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * @link https://www.koogua.com
+ */
+
+namespace App\Console\Migrations;
+
+use App\Models\UserBalance;
+use App\Repos\User as UserRepo;
+
+class V20250110191618 extends Migration
+{
+
+    public function run()
+    {
+        $this->handleRootUserBalance();
+    }
+
+    /**
+     * 之前migration初始化root账号缺少user_balance数据
+     */
+    protected function handleRootUserBalance()
+    {
+        $userId = 10000;
+
+        $userRepo = new UserRepo();
+
+        $userBalance = $userRepo->findUserBalance($userId);
+
+        if ($userBalance) return;
+
+        $userBalance = new UserBalance();
+
+        $userBalance->user_id = $userId;
+
+        $userBalance->create();
+    }
+
+}

app/Console/Tasks/ArticleIndexTask.php

@@ -20,8 +20,6 @@ class ArticleIndexTask extends Task
      * 搜索测试
      *
      * @command: php console.php article_index search {query}
-     * @param array $params
-     * @throws \XSException
      */
     public function searchAction($params)
     {
@@ -31,7 +29,9 @@ class ArticleIndexTask extends Task
             exit('please special a query word' . PHP_EOL);
         }
 
-        $result = $this->searchArticles($query);
+        $handler = new ArticleSearcher();
+
+        $result = $handler->search($query);
 
         var_export($result);
     }
@@ -42,24 +42,6 @@ class ArticleIndexTask extends Task
      * @command: php console.php article_index clean
      */
     public function cleanAction()
-    {
-        $this->cleanArticleIndex();
-    }
-
-    /**
-     * 重建索引
-     *
-     * @command: php console.php article_index rebuild
-     */
-    public function rebuildAction()
-    {
-        $this->rebuildArticleIndex();
-    }
-
-    /**
-     * 清空索引
-     */
-    protected function cleanArticleIndex()
     {
         $handler = new ArticleSearcher();
 
@@ -74,8 +56,10 @@ class ArticleIndexTask extends Task
 
     /**
      * 重建索引
+     *
+     * @command: php console.php article_index rebuild
      */
-    protected function rebuildArticleIndex()
+    public function rebuildAction()
     {
         $articles = $this->findArticles();
 
@@ -83,7 +67,7 @@ class ArticleIndexTask extends Task
 
         $handler = new ArticleSearcher();
 
-        $documenter = new ArticleDocument();
+        $doc = new ArticleDocument();
 
         $index = $handler->getXS()->getIndex();
 
@@ -92,7 +76,7 @@ class ArticleIndexTask extends Task
         $index->beginRebuild();
 
         foreach ($articles as $article) {
-            $document = $documenter->setDocument($article);
+            $document = $doc->setDocument($article);
             $index->add($document);
         }
 
@@ -102,17 +86,39 @@ class ArticleIndexTask extends Task
     }
 
     /**
-     * 搜索文章
+     * 刷新索引缓存
      *
-     * @param string $query
+     * @command: php console.php article_index flush_index
-     * @return array
-     * @throws \XSException
      */
-    protected function searchArticles($query)
+    public function flushIndexAction()
     {
         $handler = new ArticleSearcher();
 
-        return $handler->search($query);
+        $index = $handler->getXS()->getIndex();
+
+        echo '------ start flush article index ------' . PHP_EOL;
+
+        $index->flushIndex();
+
+        echo '------ end flush article index ------' . PHP_EOL;
+    }
+
+    /**
+     * 刷新搜索日志
+     *
+     * @command: php console.php article_index flush_logging
+     */
+    public function flushLoggingAction()
+    {
+        $handler = new ArticleSearcher();
+
+        $index = $handler->getXS()->getIndex();
+
+        echo '------ start flush article logging ------' . PHP_EOL;
+
+        $index->flushLogging();
+
+        echo '------ end flush article logging ------' . PHP_EOL;
     }
 
     /**

app/Console/Tasks/CloseLiveTask.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * @copyright Copyright (c) 2024 深圳市酷瓜软件有限公司
+ * @license https://opensource.org/licenses/GPL-2.0
+ * @link https://www.koogua.com
+ */
+
+namespace App\Console\Tasks;
+
+use App\Caches\CourseChapterList as CourseChapterListCache;
+use App\Models\Chapter as ChapterModel;
+use App\Models\ChapterLive as ChapterLiveModel;
+use App\Repos\Chapter as ChapterRepo;
+use Phalcon\Mvc\Model\Resultset;
+use Phalcon\Mvc\Model\ResultsetInterface;
+
+class CloseLiveTask extends Task
+{
+
+    public function mainAction()
+    {
+        $chapterLives = $this->findChapterLives();
+
+        echo sprintf('pending lives: %s', $chapterLives->count()) . PHP_EOL;
+
+        if ($chapterLives->count() == 0) return;
+
+        echo '------ start close live task ------' . PHP_EOL;
+
+        foreach ($chapterLives as $chapterLive) {
+
+            $chapterLive->status = ChapterLiveModel::STATUS_INACTIVE;
+
+            $chapterLive->update();
+
+            $chapterRepo = new ChapterRepo();
+
+            $chapter = $chapterRepo->findById($chapterLive->chapter_id);
+
+            $attrs = $chapter->attrs;
+            $attrs['stream']['status'] = ChapterModel::SS_INACTIVE;
+            $chapter->attrs = $attrs;
+
+            $chapter->update();
+
+            $cache = new CourseChapterListCache();
+
+            $cache->rebuild($chapterLive->course_id);
+        }
+
+        echo '------ end close live task ------' . PHP_EOL;
+    }
+
+    /**
+     * 查找待关闭直播
+     *
+     * @param int $limit
+     * @return ResultsetInterface|Resultset|ChapterLiveModel[]
+     */
+    protected function findChapterLives(int $limit = 100)
+    {
+        $status = ChapterLiveModel::STATUS_ACTIVE;
+        $endTime = time() - 3600;
+
+        return ChapterLiveModel::query()
+            ->where('status = :status:', ['status' => $status])
+            ->andWhere('end_time < :end_time:', ['end_time' => $endTime])
+            ->limit($limit)
+            ->execute();
+    }
+
+}

app/Console/Tasks/CourseIndexTask.php

@@ -20,8 +20,6 @@ class CourseIndexTask extends Task
      * 搜索测试
      *
      * @command: php console.php course_index search {query}
-     * @param array $params
-     * @throws \XSException
      */
     public function searchAction($params)
     {
@@ -31,7 +29,9 @@ class CourseIndexTask extends Task
             exit('please special a query word' . PHP_EOL);
         }
 
-        $result = $this->searchCourses($query);
+        $handler = new CourseSearcher();
+
+        $result = $handler->search($query);
 
         var_export($result);
     }
@@ -42,24 +42,6 @@ class CourseIndexTask extends Task
      * @command: php console.php course_index clean
      */
     public function cleanAction()
-    {
-        $this->cleanCourseIndex();
-    }
-
-    /**
-     * 重建索引
-     *
-     * @command: php console.php course_index rebuild
-     */
-    public function rebuildAction()
-    {
-        $this->rebuildCourseIndex();
-    }
-
-    /**
-     * 清空索引
-     */
-    protected function cleanCourseIndex()
     {
         $handler = new CourseSearcher();
 
@@ -74,8 +56,10 @@ class CourseIndexTask extends Task
 
     /**
      * 重建索引
+     *
+     * @command: php console.php course_index rebuild
      */
-    protected function rebuildCourseIndex()
+    public function rebuildAction()
     {
         $courses = $this->findCourses();
 
@@ -83,7 +67,7 @@ class CourseIndexTask extends Task
 
         $handler = new CourseSearcher();
 
-        $documenter = new CourseDocument();
+        $doc = new CourseDocument();
 
         $index = $handler->getXS()->getIndex();
 
@@ -92,7 +76,7 @@ class CourseIndexTask extends Task
         $index->beginRebuild();
 
         foreach ($courses as $course) {
-            $document = $documenter->setDocument($course);
+            $document = $doc->setDocument($course);
             $index->add($document);
         }
 
@@ -102,17 +86,39 @@ class CourseIndexTask extends Task
     }
 
     /**
-     * 搜索课程
+     * 刷新索引缓存
      *
-     * @param string $query
+     * @command: php console.php course_index flush_index
-     * @return array
-     * @throws \XSException
      */
-    protected function searchCourses($query)
+    public function flushIndexAction()
     {
         $handler = new CourseSearcher();
 
-        return $handler->search($query);
+        $index = $handler->getXS()->getIndex();
+
+        echo '------ start flush course index ------' . PHP_EOL;
+
+        $index->flushIndex();
+
+        echo '------ end flush course index ------' . PHP_EOL;
+    }
+
+    /**
+     * 刷新搜索日志
+     *
+     * @command: php console.php course_index flush_logging
+     */
+    public function flushLoggingAction()
+    {
+        $handler = new CourseSearcher();
+
+        $index = $handler->getXS()->getIndex();
+
+        echo '------ start flush course logging ------' . PHP_EOL;
+
+        $index->flushLogging();
+
+        echo '------ end flush course logging ------' . PHP_EOL;
     }
 
     /**
@@ -124,7 +130,7 @@ class CourseIndexTask extends Task
     {
         return CourseModel::query()
             ->where('published = 1')
-            ->where('deleted = 0')
+            ->andWhere('deleted = 0')
             ->execute();
     }
 

app/Console/Tasks/DeliverTask.php

@@ -58,8 +58,6 @@ class DeliverTask extends Task
                     case OrderModel::ITEM_VIP:
                         $this->handleVipOrder($order);
                         break;
-                    default:
-                        $this->noMatchedHandler($order);
                 }
 
                 $order->status = OrderModel::STATUS_FINISHED;
@@ -155,11 +153,6 @@ class DeliverTask extends Task
         $this->closePendingOrders($user->id);
     }
 
-    protected function noMatchedHandler(OrderModel $order)
-    {
-        throw new \RuntimeException("No Matched Handler For Order: {$order->id}");
-    }
-
     protected function closePendingOrders($userId)
     {
         $orders = $this->findUserPendingOrders($userId);

app/Console/Tasks/QuestionIndexTask.php

@@ -20,8 +20,6 @@ class QuestionIndexTask extends Task
      * 搜索测试
      *
      * @command: php console.php question_index search {query}
-     * @param array $params
-     * @throws \XSException
      */
     public function searchAction($params)
     {
@@ -31,7 +29,9 @@ class QuestionIndexTask extends Task
             exit('please special a query word' . PHP_EOL);
         }
 
-        $result = $this->searchQuestions($query);
+        $handler = new QuestionSearcher();
+
+        $result = $handler->search($query);
 
         var_export($result);
     }
@@ -42,24 +42,6 @@ class QuestionIndexTask extends Task
      * @command: php console.php question_index clean
      */
     public function cleanAction()
-    {
-        $this->cleanQuestionIndex();
-    }
-
-    /**
-     * 重建索引
-     *
-     * @command: php console.php question_index rebuild
-     */
-    public function rebuildAction()
-    {
-        $this->rebuildQuestionIndex();
-    }
-
-    /**
-     * 清空索引
-     */
-    protected function cleanQuestionIndex()
     {
         $handler = new QuestionSearcher();
 
@@ -74,8 +56,10 @@ class QuestionIndexTask extends Task
 
     /**
      * 重建索引
+     *
+     * @command: php console.php question_index rebuild
      */
-    protected function rebuildQuestionIndex()
+    public function rebuildAction()
     {
         $questions = $this->findQuestions();
 
@@ -83,7 +67,7 @@ class QuestionIndexTask extends Task
 
         $handler = new QuestionSearcher();
 
-        $documenter = new QuestionDocument();
+        $doc = new QuestionDocument();
 
         $index = $handler->getXS()->getIndex();
 
@@ -92,7 +76,7 @@ class QuestionIndexTask extends Task
         $index->beginRebuild();
 
         foreach ($questions as $question) {
-            $document = $documenter->setDocument($question);
+            $document = $doc->setDocument($question);
             $index->add($document);
         }
 
@@ -102,17 +86,39 @@ class QuestionIndexTask extends Task
     }
 
     /**
-     * 搜索文章
+     * 刷新索引缓存
      *
-     * @param string $query
+     * @command: php console.php question_index flush_index
-     * @return array
-     * @throws \XSException
      */
-    protected function searchQuestions($query)
+    public function flushIndexAction()
     {
         $handler = new QuestionSearcher();
 
-        return $handler->search($query);
+        $index = $handler->getXS()->getIndex();
+
+        echo '------ start flush question index ------' . PHP_EOL;
+
+        $index->flushIndex();
+
+        echo '------ end flush question index ------' . PHP_EOL;
+    }
+
+    /**
+     * 刷新搜索日志
+     *
+     * @command: php console.php question_index flush_logging
+     */
+    public function flushLoggingAction()
+    {
+        $handler = new QuestionSearcher();
+
+        $index = $handler->getXS()->getIndex();
+
+        echo '------ start flush question logging ------' . PHP_EOL;
+
+        $index->flushLogging();
+
+        echo '------ end flush question logging ------' . PHP_EOL;
     }
 
     /**

app/Console/Tasks/ServerMonitorTask.php

@@ -177,13 +177,13 @@ class ServerMonitorTask extends Task
 
             $searcher = new CourseSearcher();
 
-            $user = $searcher->search('id:1');
+            $course = $searcher->search('id:1');
 
             $benchmark->stop();
 
             $elapsedTime = $benchmark->getElapsedTime();
 
-            if (empty($user)) {
+            if (empty($course)) {
                 return "xunsearch搜索失败";
             }
 
@@ -242,4 +242,4 @@ class ServerMonitorTask extends Task
         return $coreCount * $processorCount;
     }
 
-}
+}

app/Console/Tasks/SitemapTask.php

@@ -37,7 +37,7 @@ class SitemapTask extends Task
 
         $this->sitemap = new Sitemap();
 
-        $filename = tmp_path('sitemap.xml');
+        $filename = public_path('sitemap.xml');
 
         echo '------ start sitemap task ------' . PHP_EOL;
 

app/Console/Tasks/SyncAppInfoTask.php

@@ -13,12 +13,12 @@ use GuzzleHttp\Client;
 class SyncAppInfoTask extends Task
 {
 
+    const API_BASE_URL = 'https://www.koogua.com/api';
+
     public function mainAction()
     {
         echo '------ start sync app info ------' . PHP_EOL;
 
-        $url = 'https://www.koogua.com/api/instance/collect';
-
         $site = $this->getSettings('site');
 
         $serverHost = parse_url($site['url'], PHP_URL_HOST);
@@ -38,6 +38,8 @@ class SyncAppInfoTask extends Task
 
         $client = new Client();
 
+        $url = sprintf('%s/instance/collect', self::API_BASE_URL);
+
         $client->request('POST', $url, ['form_params' => $params]);
 
         echo '------ end sync app info ------' . PHP_EOL;

app/Http/Admin/Controllers/UploadController.php

@@ -71,28 +71,6 @@ class UploadController extends Controller
         return $this->jsonSuccess(['data' => $data]);
     }
 
-    /**
-     * @Post("/avatar/img", name="admin.upload.avatar_img")
-     */
-    public function uploadAvatarImageAction()
-    {
-        $service = new StorageService();
-
-        $file = $service->uploadAvatarImage();
-
-        if (!$file) {
-            return $this->jsonError(['msg' => '上传文件失败']);
-        }
-
-        $data = [
-            'id' => $file->id,
-            'name' => $file->name,
-            'url' => $service->getImageUrl($file->path),
-        ];
-
-        return $this->jsonSuccess(['data' => $data]);
-    }
-
     /**
      * @Post("/content/img", name="admin.upload.content_img")
      */

app/Http/Admin/Services/Article.php

@@ -9,10 +9,8 @@ namespace App\Http\Admin\Services;
 
 use App\Builders\ArticleList as ArticleListBuilder;
 use App\Builders\ReportList as ReportListBuilder;
-use App\Caches\Article as ArticleCache;
 use App\Http\Admin\Services\Traits\AccountSearchTrait;
 use App\Library\Paginator\Query as PagerQuery;
-use App\Library\Utils\Word as WordUtil;
 use App\Models\Article as ArticleModel;
 use App\Models\Category as CategoryModel;
 use App\Models\Reason as ReasonModel;
@@ -74,10 +72,6 @@ class Article extends Service
 
         $params = $this->handleAccountSearchParams($params);
 
-        if (!empty($params['xm_tag_ids'])) {
-            $params['tag_id'] = explode(',', $params['xm_tag_ids']);
-        }
-
         $params['deleted'] = $params['deleted'] ?? 0;
 
         $sort = $pagerQuery->getSort();
@@ -141,7 +135,6 @@ class Article extends Service
         $article->create();
 
         $this->saveDynamicAttrs($article);
-        $this->rebuildArticleCache($article);
         $this->rebuildArticleIndex($article);
         $this->recountUserArticles($user);
 
@@ -199,9 +192,8 @@ class Article extends Service
             $data['published'] = $validator->checkPublishStatus($post['published']);
         }
 
-        if (isset($post['category_id']) && !empty($post['category_id'])) {
+        if (isset($post['category_id'])) {
-            $category = $validator->checkCategory($post['category_id']);
+            $data['category_id'] = $validator->checkCategoryId($post['category_id']);
-            $data['category_id'] = $category->id;
         }
 
         if (isset($post['xm_tag_ids'])) {
@@ -213,7 +205,6 @@ class Article extends Service
         $owner = $this->findUser($article->owner_id);
 
         $this->saveDynamicAttrs($article);
-        $this->rebuildArticleCache($article);
         $this->rebuildArticleIndex($article);
         $this->recountUserArticles($owner);
 
@@ -233,7 +224,6 @@ class Article extends Service
         $owner = $this->findUser($article->owner_id);
 
         $this->saveDynamicAttrs($article);
-        $this->rebuildArticleCache($article);
         $this->rebuildArticleIndex($article);
         $this->recountUserArticles($owner);
 
@@ -253,7 +243,6 @@ class Article extends Service
         $owner = $this->findUser($article->owner_id);
 
         $this->saveDynamicAttrs($article);
-        $this->rebuildArticleCache($article);
         $this->rebuildArticleIndex($article);
         $this->recountUserArticles($owner);
 
@@ -292,7 +281,6 @@ class Article extends Service
 
         $owner = $this->findUser($article->owner_id);
 
-        $this->rebuildArticleCache($article);
         $this->rebuildArticleIndex($article);
         $this->recountUserArticles($owner);
 
@@ -328,7 +316,6 @@ class Article extends Service
 
         $owner = $this->findUser($article->owner_id);
 
-        $this->rebuildArticleCache($article);
         $this->rebuildArticleIndex($article);
         $this->recountUserArticles($owner);
     }
@@ -367,7 +354,6 @@ class Article extends Service
             $owner = $this->findUser($article->owner_id);
 
             $this->recountUserArticles($owner);
-            $this->rebuildArticleCache($article);
             $this->rebuildArticleIndex($article);
         }
     }
@@ -394,7 +380,6 @@ class Article extends Service
             $owner = $this->findUser($article->owner_id);
 
             $this->recountUserArticles($owner);
-            $this->rebuildArticleCache($article);
             $this->rebuildArticleIndex($article);
         }
     }
@@ -413,13 +398,6 @@ class Article extends Service
         return $userRepo->findById($id);
     }
 
-    protected function rebuildArticleCache(ArticleModel $article)
-    {
-        $cache = new ArticleCache();
-
-        $cache->rebuild($article->id);
-    }
-
     protected function rebuildArticleIndex(ArticleModel $article)
     {
         $sync = new ArticleIndexSync();

app/Http/Admin/Services/Course.php

@@ -37,10 +37,6 @@ class Course extends Service
 
         $params = $pagerQuery->getParams();
 
-        if (!empty($params['xm_tag_ids'])) {
-            $params['tag_id'] = explode(',', $params['xm_tag_ids']);
-        }
-
         $params['deleted'] = $params['deleted'] ?? 0;
 
         $sort = $pagerQuery->getSort();
@@ -168,14 +164,12 @@ class Course extends Service
             }
         }
 
-        if (isset($post['category_id']) && !empty($post['category_id'])) {
+        if (isset($post['category_id'])) {
-            $category = $validator->checkCategory($post['category_id']);
+            $data['category_id'] = $validator->checkCategoryId($post['category_id']);
-            $data['category_id'] = $category->id;
         }
 
-        if (isset($post['teacher_id']) && !empty($post['teacher_id'])) {
+        if (isset($post['teacher_id'])) {
-            $teacher = $validator->checkTeacher($post['teacher_id']);
+            $data['teacher_id'] = $validator->checkTeacherId($post['teacher_id']);
-            $data['teacher_id'] = $teacher->id;
         }
 
         if (isset($post['xm_tag_ids'])) {

app/Http/Admin/Services/Help.php

@@ -8,8 +8,6 @@
 namespace App\Http\Admin\Services;
 
 use App\Builders\HelpList as HelpListBuilder;
-use App\Caches\Help as HelpCache;
-use App\Caches\HelpList as HelpListCache;
 use App\Models\Category as CategoryModel;
 use App\Models\Help as HelpModel;
 use App\Repos\Category as CategoryRepo;
@@ -65,20 +63,15 @@ class Help extends Service
 
         $data = [];
 
-        $category = $validator->checkCategory($post['category_id']);
-
         $data['title'] = $validator->checkTitle($post['title']);
         $data['content'] = $validator->checkContent($post['content']);
         $data['priority'] = $validator->checkPriority($post['priority']);
-        $data['category_id'] = $category->id;
+        $data['category_id'] = $validator->checkCategoryId($post['category_id']);
 
         $help = new HelpModel();
 
         $help->create($data);
 
-        $this->rebuildHelpCache($help);
-        $this->rebuildHelpListCache();
-
         return $help;
     }
 
@@ -93,8 +86,7 @@ class Help extends Service
         $data = [];
 
         if (isset($post['category_id'])) {
-            $category = $validator->checkCategory($post['category_id']);
+            $data['category_id'] = $validator->checkCategoryId($post['category_id']);
-            $data['category_id'] = $category->id;
         }
 
         if (isset($post['title'])) {
@@ -119,9 +111,6 @@ class Help extends Service
 
         $help->update($data);
 
-        $this->rebuildHelpCache($help);
-        $this->rebuildHelpListCache();
-
         return $help;
     }
 
@@ -133,9 +122,6 @@ class Help extends Service
 
         $help->update();
 
-        $this->rebuildHelpCache($help);
-        $this->rebuildHelpListCache();
-
         return $help;
     }
 
@@ -147,9 +133,6 @@ class Help extends Service
 
         $help->update();
 
-        $this->rebuildHelpCache($help);
-        $this->rebuildHelpListCache();
-
         return $help;
     }
 
@@ -160,20 +143,6 @@ class Help extends Service
         return $validator->checkHelp($id);
     }
 
-    protected function rebuildHelpCache(HelpModel $help)
-    {
-        $cache = new HelpCache();
-
-        $cache->rebuild($help->id);
-    }
-
-    protected function rebuildHelpListCache()
-    {
-        $cache = new HelpListCache();
-
-        $cache->rebuild();
-    }
-
     /**
      * @param Resultset $helps
      * @return array|object

app/Http/Admin/Services/Nav.php

@@ -85,6 +85,7 @@ class Nav extends Service
         if ($parent) {
             $nav->path = $parent->path . $nav->id . ',';
             $nav->level = $parent->level + 1;
+            $nav->position = $parent->position;
         } else {
             $nav->path = ',' . $nav->id . ',';
             $nav->level = 1;
@@ -140,6 +141,11 @@ class Nav extends Service
             }
         }
 
+        if ($nav->parent_id > 0) {
+            $parent = $this->findOrFail($nav->parent_id);
+            $data['position'] = $parent->position;
+        }
+
         $nav->update($data);
 
         $this->updateNavStats($nav);

app/Http/Admin/Services/Package.php

@@ -59,9 +59,8 @@ class Package extends Service
         $result = [];
 
         foreach ($items as $item) {
-            $price = $item->market_price > 0 ? sprintf("￥%0.2f", $item->market_price) : '免费';
             $result[] = [
-                'name' => sprintf('%s - %s（¥%0.2f）', $item->id, $item->title, $price),
+                'name' => sprintf('%s - %s（¥%0.2f）', $item->id, $item->title, $item->market_price),
                 'value' => $item->id,
                 'selected' => in_array($item->id, $courseIds),
             ];
@@ -152,7 +151,7 @@ class Package extends Service
         $package->update($data);
 
         $this->handlePackagedCourses($package->id);
-        $this->updatePackageCourseCount($package->id);
+        $this->recountPackageCourses($package->id);
         $this->rebuildPackageCache($package->id);
 
         return $package;
@@ -217,7 +216,7 @@ class Package extends Service
                     'course_id' => $courseId,
                     'package_id' => $package->id,
                 ]);
-                $this->updateCoursePackageCount($courseId);
+                $this->recountCoursePackages($courseId);
                 $this->rebuildCoursePackageCache($courseId);
             }
         }
@@ -229,7 +228,7 @@ class Package extends Service
             foreach ($deletedCourseIds as $courseId) {
                 $coursePackage = $coursePackageRepo->findCoursePackage($courseId, $package->id);
                 $coursePackage->delete();
-                $this->updateCoursePackageCount($courseId);
+                $this->recountCoursePackages($courseId);
                 $this->rebuildCoursePackageCache($courseId);
             }
         }
@@ -249,7 +248,7 @@ class Package extends Service
         }
     }
 
-    protected function updatePackageCourseCount($packageId)
+    protected function recountPackageCourses($packageId)
     {
         $packageRepo = new PackageRepo();
 
@@ -262,7 +261,7 @@ class Package extends Service
         $package->update();
     }
 
-    protected function updateCoursePackageCount($courseId)
+    protected function recountCoursePackages($courseId)
     {
         $courseRepo = new CourseRepo();
 
@@ -293,15 +292,4 @@ class Package extends Service
         $cache->rebuild($courseId);
     }
 
-    protected function recountCoursePackages($courseId)
-    {
-        $courseRepo = new CourseRepo();
-
-        $course = $courseRepo->findById($courseId);
-
-        $course->package_count = $courseRepo->countPackages($courseId);
-
-        $course->update();
-    }
-
 }

app/Http/Admin/Services/Page.php

@@ -7,7 +7,6 @@
 
 namespace App\Http\Admin\Services;
 
-use App\Caches\Page as PageCache;
 use App\Library\Paginator\Query as PagerQuery;
 use App\Models\Page as PageModel;
 use App\Repos\Page as PageRepo;
@@ -53,8 +52,6 @@ class Page extends Service
 
         $page->create($data);
 
-        $this->rebuildPageCache($page);
-
         return $page;
     }
 
@@ -96,8 +93,6 @@ class Page extends Service
 
         $page->update($data);
 
-        $this->rebuildPageCache($page);
-
         return $page;
     }
 
@@ -109,8 +104,6 @@ class Page extends Service
 
         $page->update();
 
-        $this->rebuildPageCache($page);
-
         return $page;
     }
 
@@ -122,8 +115,6 @@ class Page extends Service
 
         $page->update();
 
-        $this->rebuildPageCache($page);
-
         return $page;
     }
 
@@ -134,11 +125,4 @@ class Page extends Service
         return $validator->checkPage($id);
     }
 
-    protected function rebuildPageCache(PageModel $page)
-    {
-        $cache = new PageCache();
-
-        $cache->rebuild($page->id);
-    }
-
 }

app/Http/Admin/Services/PointGift.php

@@ -7,7 +7,6 @@
 
 namespace App\Http\Admin\Services;
 
-use App\Caches\PointGift as PointGiftCache;
 use App\Library\Paginator\Query as PagerQuery;
 use App\Models\PointGift as PointGiftModel;
 use App\Repos\Course as CourseRepo;
@@ -116,8 +115,6 @@ class PointGift extends Service
                 break;
         }
 
-        $this->rebuildPointGiftCache($gift);
-
         return $gift;
     }
 
@@ -165,8 +162,6 @@ class PointGift extends Service
 
         $gift->update($data);
 
-        $this->rebuildPointGiftCache($gift);
-
         return $gift;
     }
 
@@ -178,8 +173,6 @@ class PointGift extends Service
 
         $gift->update();
 
-        $this->rebuildPointGiftCache($gift);
-
         return $gift;
     }
 
@@ -191,8 +184,6 @@ class PointGift extends Service
 
         $gift->update();
 
-        $this->rebuildPointGiftCache($gift);
-
         return $gift;
     }
 
@@ -203,13 +194,6 @@ class PointGift extends Service
         return $validator->checkPointGift($id);
     }
 
-    protected function rebuildPointGiftCache(PointGiftModel $gift)
-    {
-        $cache = new PointGiftCache();
-
-        $cache->rebuild($gift->id);
-    }
-
     protected function createCoursePointGift($post)
     {
         $validator = new PointGiftValidator();

app/Http/Admin/Services/Question.php

@@ -9,7 +9,6 @@ namespace App\Http\Admin\Services;
 
 use App\Builders\QuestionList as QuestionListBuilder;
 use App\Builders\ReportList as ReportListBuilder;
-use App\Caches\Question as QuestionCache;
 use App\Http\Admin\Services\Traits\AccountSearchTrait;
 use App\Library\Paginator\Query as PagerQuery;
 use App\Models\Category as CategoryModel;
@@ -68,10 +67,6 @@ class Question extends Service
 
         $params = $this->handleAccountSearchParams($params);
 
-        if (!empty($params['xm_tag_ids'])) {
-            $params['tag_id'] = explode(',', $params['xm_tag_ids']);
-        }
-
         $params['deleted'] = $params['deleted'] ?? 0;
 
         $sort = $pagerQuery->getSort();
@@ -135,7 +130,6 @@ class Question extends Service
         $question->create();
 
         $this->saveDynamicAttrs($question);
-        $this->rebuildQuestionCache($question);
         $this->rebuildQuestionIndex($question);
         $this->recountUserQuestions($user);
 
@@ -186,9 +180,8 @@ class Question extends Service
             $data['published'] = $validator->checkPublishStatus($post['published']);
         }
 
-        if (isset($post['category_id']) && !empty($post['category_id'])) {
+        if (isset($post['category_id'])) {
-            $category = $validator->checkCategory($post['category_id']);
+            $data['category_id'] = $validator->checkCategoryId($post['category_id']);
-            $data['category_id'] = $category->id;
         }
 
         if (isset($post['xm_tag_ids'])) {
@@ -200,7 +193,6 @@ class Question extends Service
         $owner = $this->findUser($question->owner_id);
 
         $this->saveDynamicAttrs($question);
-        $this->rebuildQuestionCache($question);
         $this->rebuildQuestionIndex($question);
         $this->recountUserQuestions($owner);
 
@@ -224,7 +216,6 @@ class Question extends Service
         $owner = $this->findUser($question->owner_id);
 
         $this->saveDynamicAttrs($question);
-        $this->rebuildQuestionCache($question);
         $this->rebuildQuestionIndex($question);
         $this->recountUserQuestions($owner);
 
@@ -243,7 +234,6 @@ class Question extends Service
 
         $owner = $this->findUser($question->owner_id);
 
-        $this->rebuildQuestionCache($question);
         $this->rebuildQuestionIndex($question);
         $this->recountUserQuestions($owner);
 
@@ -283,7 +273,6 @@ class Question extends Service
         $owner = $this->findUser($question->owner_id);
 
         $this->recountUserQuestions($owner);
-        $this->rebuildQuestionCache($question);
         $this->rebuildQuestionIndex($question);
 
         return $question;
@@ -318,7 +307,6 @@ class Question extends Service
 
         $owner = $this->findUser($question->owner_id);
 
-        $this->rebuildQuestionCache($question);
         $this->rebuildQuestionIndex($question);
         $this->recountUserQuestions($owner);
     }
@@ -357,7 +345,6 @@ class Question extends Service
             $owner = $this->findUser($question->owner_id);
 
             $this->recountUserQuestions($owner);
-            $this->rebuildQuestionCache($question);
             $this->rebuildQuestionIndex($question);
         }
     }
@@ -384,7 +371,6 @@ class Question extends Service
             $owner = $this->findUser($question->owner_id);
 
             $this->recountUserQuestions($owner);
-            $this->rebuildQuestionCache($question);
             $this->rebuildQuestionIndex($question);
         }
     }
@@ -403,13 +389,6 @@ class Question extends Service
         return $userRepo->findById($id);
     }
 
-    protected function rebuildQuestionCache(QuestionModel $question)
-    {
-        $cache = new QuestionCache();
-
-        $cache->rebuild($question->id);
-    }
-
     protected function rebuildQuestionIndex(QuestionModel $question)
     {
         $sync = new QuestionIndexSync();

app/Http/Admin/Services/Setting.php

@@ -52,8 +52,8 @@ class Setting extends Service
     {
         $alipay = $this->getSettings('pay.alipay');
 
-        $alipay['return_url'] = $alipay['return_url'] ?: kg_full_url(['for' => 'home.alipay_callback']);
+        $alipay['return_url'] = $alipay['return_url'] ?: kg_full_url(['for' => 'home.alipay.callback']);
-        $alipay['notify_url'] = $alipay['notify_url'] ?: kg_full_url(['for' => 'home.alipay_notify']);
+        $alipay['notify_url'] = $alipay['notify_url'] ?: kg_full_url(['for' => 'home.alipay.notify']);
 
         return $alipay;
     }
@@ -62,8 +62,8 @@ class Setting extends Service
     {
         $wxpay = $this->getSettings('pay.wxpay');
 
-        $wxpay['return_url'] = $wxpay['return_url'] ?: kg_full_url(['for' => 'home.wxpay_callback']);
+        $wxpay['return_url'] = $wxpay['return_url'] ?: kg_full_url(['for' => 'home.wxpay.callback']);
-        $wxpay['notify_url'] = $wxpay['notify_url'] ?: kg_full_url(['for' => 'home.wxpay_notify']);
+        $wxpay['notify_url'] = $wxpay['notify_url'] ?: kg_full_url(['for' => 'home.wxpay.notify']);
 
         return $wxpay;
     }
@@ -109,11 +109,11 @@ class Setting extends Service
         $result = $this->getSettings($section);
 
         if ($section == 'live.notify') {
-            $result['stream_begin_url'] = $result['stream_begin_url'] ?: kg_full_url(['for' => 'home.live_notify'], ['action' => 'streamBegin']);
+            $result['stream_begin_url'] = $result['stream_begin_url'] ?: kg_full_url(['for' => 'home.live.notify'], ['action' => 'streamBegin']);
-            $result['stream_end_url'] = $result['stream_end_url'] ?: kg_full_url(['for' => 'home.live_notify'], ['action' => 'streamEnd']);
+            $result['stream_end_url'] = $result['stream_end_url'] ?: kg_full_url(['for' => 'home.live.notify'], ['action' => 'streamEnd']);
-            $result['record_url'] = $result['record_url'] ?: kg_full_url(['for' => 'home.live_notify'], ['action' => 'record']);
+            $result['record_url'] = $result['record_url'] ?: kg_full_url(['for' => 'home.live.notify'], ['action' => 'record']);
-            $result['snapshot_url'] = $result['snapshot_url'] ?: kg_full_url(['for' => 'home.live_notify'], ['action' => 'snapshot']);
+            $result['snapshot_url'] = $result['snapshot_url'] ?: kg_full_url(['for' => 'home.live.notify'], ['action' => 'snapshot']);
-            $result['porn_url'] = $result['porn_url'] ?: kg_full_url(['for' => 'home.live_notify'], ['action' => 'porn']);
+            $result['porn_url'] = $result['porn_url'] ?: kg_full_url(['for' => 'home.live.notify'], ['action' => 'porn']);
         }
 
         return $result;

app/Http/Admin/Services/Stat.php

@@ -23,11 +23,11 @@ class Stat extends Service
 
         return [
             [
-                'title' => "{$year}-{$month}",
+                'title' => sprintf('%02d-%02d', $year, $month),
                 'sales' => $this->handleHotSales($type, $year, $month),
             ],
             [
-                'title' => "{$prev['year']}-{$prev['month']}",
+                'title' => sprintf('%02d-%02d', $prev['year'], $prev['month']),
                 'sales' => $this->handleHotSales($type, $prev['year'], $prev['month']),
             ],
         ];
@@ -42,12 +42,13 @@ class Stat extends Service
         $currSales = $this->handleSales($year, $month);
         $prevSales = $this->handleSales($prev['year'], $prev['month']);
 
+        $currMonth = sprintf('%02d-%02d', $year, $month);
+        $prevMonth = sprintf('%02d-%02d', $prev['year'], $prev['month']);
+
         $items = [];
 
         foreach (range(1, 31) as $day) {
             $date = sprintf('%02d', $day);
-            $prevMonth = "{$prev['year']}-{$prev['month']}";
-            $currMonth = "{$year}-{$month}";
             $items[] = [
                 'date' => $date,
                 $currMonth => $currSales[$date] ?? 0,
@@ -67,12 +68,13 @@ class Stat extends Service
         $currRefunds = $this->handleRefunds($year, $month);
         $prevRefunds = $this->handleRefunds($prev['year'], $prev['month']);
 
+        $currMonth = sprintf('%02d-%02d', $year, $month);
+        $prevMonth = sprintf('%02d-%02d', $prev['year'], $prev['month']);
+
         $items = [];
 
         foreach (range(1, 31) as $day) {
             $date = sprintf('%02d', $day);
-            $prevMonth = "{$prev['year']}-{$prev['month']}";
-            $currMonth = "{$year}-{$month}";
             $items[] = [
                 'date' => $date,
                 $currMonth => $currRefunds[$date] ?? 0,
@@ -92,12 +94,13 @@ class Stat extends Service
         $currUsers = $this->handleRegisteredUsers($year, $month);
         $prevUsers = $this->handleRegisteredUsers($prev['year'], $prev['month']);
 
+        $currMonth = sprintf('%02d-%02d', $year, $month);
+        $prevMonth = sprintf('%02d-%02d', $prev['year'], $prev['month']);
+
         $items = [];
 
         foreach (range(1, 31) as $day) {
             $date = sprintf('%02d', $day);
-            $prevMonth = "{$prev['year']}-{$prev['month']}";
-            $currMonth = "{$year}-{$month}";
             $items[] = [
                 'date' => $date,
                 $currMonth => $currUsers[$date] ?? 0,
@@ -117,12 +120,13 @@ class Stat extends Service
         $currUsers = $this->handleOnlineUsers($year, $month);
         $prevUsers = $this->handleOnlineUsers($prev['year'], $prev['month']);
 
+        $currMonth = sprintf('%02d-%02d', $year, $month);
+        $prevMonth = sprintf('%02d-%02d', $prev['year'], $prev['month']);
+
         $items = [];
 
         foreach (range(1, 31) as $day) {
             $date = sprintf('%02d', $day);
-            $prevMonth = "{$prev['year']}-{$prev['month']}";
-            $currMonth = "{$year}-{$month}";
             $items[] = [
                 'date' => $date,
                 $currMonth => $currUsers[$date] ?? 0,
@@ -154,7 +158,10 @@ class Stat extends Service
 
     protected function isCurrMonth($year, $month)
     {
-        return date('Y-m') == "{$year}-{$month}";
+        $yearOk = date('Y') == $year;
+        $monthOk = date('m') == $month;
+
+        return $yearOk && $monthOk;
     }
 
     protected function getLifetime()

app/Http/Admin/Services/User.php

@@ -204,16 +204,22 @@ class User extends Service
             $data['vip'] = $validator->checkVipStatus($post['vip']);
         }
 
-        if (!empty($post['vip_expiry_time'])) {
-            $data['vip_expiry_time'] = $validator->checkVipExpiryTime($post['vip_expiry_time']);
-        }
-
         if (isset($post['locked'])) {
             $data['locked'] = $validator->checkLockStatus($post['locked']);
         }
 
+        if (!empty($post['vip_expiry_time'])) {
+            $data['vip_expiry_time'] = $validator->checkVipExpiryTime($post['vip_expiry_time']);
+            if ($data['vip_expiry_time'] < time()) {
+                $data['vip'] = 0;
+            }
+        }
+
         if (!empty($post['lock_expiry_time'])) {
             $data['lock_expiry_time'] = $validator->checkLockExpiryTime($post['lock_expiry_time']);
+            if ($data['lock_expiry_time'] < time()) {
+                $data['locked'] = 0;
+            }
         }
 
         $oldAdminRole = $user->admin_role;

app/Http/Admin/Views/article/edit.volt

@@ -49,7 +49,7 @@
                 name: 'xm_tag_ids',
                 max: 5,
                 filterable: true,
-                filterMethod: function (val, item, index, prop) {
+                filterMethod: function (val, item) {
                     return item.name.toLowerCase().indexOf(val.toLowerCase()) !== -1;
                 },
                 data: {{ xm_tags|json_encode }}
@@ -71,4 +71,4 @@
 
     </script>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/audit/list.volt

@@ -34,8 +34,8 @@
             <th>用户IP</th>
             <th>请求路由</th>
             <th>请求路径</th>
-            <th>请求时间</th>
+            <th>创建时间</th>
-            <th>请求内容</th>
+            <th>操作</th>
         </tr>
         </thead>
         <tbody>
@@ -91,4 +91,4 @@
 
     </script>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/audit/search.volt

@@ -13,9 +13,9 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">用户名称</label>
+            <label class="layui-form-label">用户IP</label>
             <div class="layui-input-block">
-                <input class="layui-input" type="text" name="user_name" placeholder="用户名称精确匹配">
+                <input class="layui-input" type="text" name="user_ip" placeholder="用户IP精确匹配">
             </div>
         </div>
         <div class="layui-form-item">
@@ -31,7 +31,7 @@
             </div>
         </div>
         <div class="layui-form-item">
-            <label class="layui-form-label">请求时间</label>
+            <label class="layui-form-label">创建时间</label>
             <div class="layui-input-inline">
                 <input class="layui-input time-range" type="text" name="start_time" autocomplete="off">
             </div>
@@ -70,4 +70,4 @@
 
     </script>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/category/list.volt

@@ -9,7 +9,7 @@
         <div class="kg-nav-left">
             <span class="layui-breadcrumb">
                 {% if parent.id > 0 %}
-                    <a class="kg-back" href="{{ back_url }}"><i class="layui-icon layui-icon-return"></i>返回</a>
+                    <a href="{{ back_url }}"><i class="layui-icon layui-icon-return"></i>返回</a>
                     <a><cite>{{ parent.name }}</cite></a>
                 {% endif %}
                 <a><cite>分类管理</cite></a>
@@ -87,4 +87,4 @@
         </tbody>
     </table>
 
-{% endblock %}
+{% endblock %}

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

@@ -88,7 +88,7 @@
                 layer.open({
                     type: 2,
                     title: '推流测试',
-                    area: ['720px', '500px'],
+                    area: ['720px', '540px'],
                     content: [url, 'no']
                 });
             });
@@ -97,4 +97,4 @@
 
     </script>
 
-{% endblock %}
+{% endblock %}

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

@@ -43,7 +43,7 @@
     <div class="kg-nav">
         <div class="kg-nav-left">
             <span class="layui-breadcrumb">
-                <a class="kg-back" href="{{ back_url }}"><i class="layui-icon layui-icon-return"></i>返回</a>
+                <a href="{{ back_url }}"><i class="layui-icon layui-icon-return"></i>返回</a>
                 <a><cite>{{ course.title }}</cite></a>
                 <a><cite>{{ chapter.title }}</cite></a>
                 <a><cite>课时管理</cite></a>
@@ -126,4 +126,4 @@
         </tbody>
     </table>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/consult/search.volt

@@ -84,7 +84,7 @@
                 name: 'course_id',
                 filterable: true,
                 radio: true,
-                filterMethod: function (val, item, index, prop) {
+                filterMethod: function (val, item) {
                     return item.name.toLowerCase().indexOf(val.toLowerCase()) !== -1;
                 },
                 data: {{ xm_courses|json_encode }}
@@ -102,4 +102,4 @@
 
     </script>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/course/chapters.volt

@@ -9,7 +9,7 @@
     <div class="kg-nav">
         <div class="kg-nav-left">
             <span class="layui-breadcrumb">
-                <a class="kg-back" href="{{ back_url }}"><i class="layui-icon layui-icon-return"></i>返回</a>
+                <a href="{{ back_url }}"><i class="layui-icon layui-icon-return"></i>返回</a>
                 <a><cite>{{ course.title }}</cite></a>
                 <a><cite>章节管理</cite></a>
             </span>
@@ -79,4 +79,4 @@
         </tbody>
     </table>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/course/edit.volt

@@ -65,7 +65,7 @@
             name: 'xm_tag_ids',
             max: 5,
             filterable: true,
-            filterMethod: function (val, item, index, prop) {
+            filterMethod: function (val, item) {
                 return item.name.toLowerCase().indexOf(val.toLowerCase()) !== -1;
             },
             data: {{ xm_tags|json_encode }}
@@ -77,7 +77,7 @@
             max: 10,
             autoRow: true,
             filterable: true,
-            filterMethod: function (val, item, index, prop) {
+            filterMethod: function (val, item) {
                 return item.name.toLowerCase().indexOf(val.toLowerCase()) !== -1;
             },
             data: {{ xm_courses|json_encode }}
@@ -107,4 +107,4 @@
 
     </script>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/course/list.volt

@@ -16,7 +16,7 @@
         </div>
         <div class="kg-nav-right">
             <a class="layui-btn layui-btn-sm" href="{{ category_url }}">
-                <i class="layui-icon layui-icon-add-1"></i>分类管理
+                <i class="layui-icon layui-icon-add-1"></i>课程分类
             </a>
             <a class="layui-btn layui-btn-sm" href="{{ add_url }}">
                 <i class="layui-icon layui-icon-add-1"></i>添加课程
@@ -124,4 +124,4 @@
 
     {{ partial('partials/pager') }}
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/course/resources.volt

@@ -3,7 +3,6 @@
     <table class="kg-table layui-table">
         <tr>
             <th>名称</th>
-            <th>类型</th>
             <th>大小</th>
             <th>日期</th>
             <th width="15%">操作</th>
@@ -13,7 +12,6 @@
             {% set delete_url = url({'for':'admin.resource.delete','id':item.id}) %}
             <tr>
                 <td><input class="layui-input res-name" type="text" value="{{ item.upload.name }}" data-url="{{ update_url }}"></td>
-                <td>{{ item.upload.mime }}</td>
                 <td>{{ item.upload.size|human_size }}</td>
                 <td>{{ date('Y-m-d H:i:s',item.create_time) }}</td>
                 <td>
@@ -27,4 +25,4 @@
 {% else %}
     <div class="kg-center">没有相关资料</div>
     <br>
-{% endif %}
+{% endif %}

app/Http/Admin/Views/index/main_app_info.volt

@@ -6,7 +6,7 @@
     <div class="layui-card-body">
         <table class="layui-table">
             <colgroup>
-                <col width="100">
+                <col width="25%">
                 <col>
             </colgroup>
             <tbody>
@@ -24,4 +24,4 @@
             </tbody>
         </table>
     </div>
-</div>
+</div>

app/Http/Admin/Views/index/main_server_info.volt

@@ -1,9 +1,9 @@
-<div class="layui-card layui-text" xmlns="http://www.w3.org/1999/html">
+<div class="layui-card layui-text">
     <div class="layui-card-header">服务器信息</div>
     <div class="layui-card-body">
         <table class="layui-table">
             <colgroup>
-                <col width="100">
+                <col width="25%">
                 <col>
             </colgroup>
             <tbody>
@@ -22,4 +22,4 @@
             </tbody>
         </table>
     </div>
-</div>
+</div>

app/Http/Admin/Views/index/main_team_info.volt

@@ -3,7 +3,7 @@
     <div class="layui-card-body">
         <table class="layui-table">
             <colgroup>
-                <col width="100">
+                <col width="25%">
                 <col>
             </colgroup>
             <tbody>
@@ -26,4 +26,4 @@
             </tbody>
         </table>
     </div>
-</div>
+</div>

app/Http/Admin/Views/macros/flash_sale.volt

@@ -1,31 +0,0 @@
-{%- macro item_type_info(value) %}
-    {% if value == 1 %}
-        课程
-    {% elseif value == 2 %}
-        套餐
-    {% elseif value == 3 %}
-        会员
-    {% endif %}
-{%- endmacro %}
-
-{%- macro item_full_info(item_type,item_info) %}
-    {% if item_type == 1 %}
-        {% set course = item_info.course %}
-        <p>名称：{{ course.title }}（{{ course.id }}）</p>
-        <p>类型：{{ item_type_info(item_type) }}　价格：{{ '￥%0.2f'|format(course.market_price) }}</p>
-    {% elseif item_type == 2 %}
-        {% set package = item_info.package %}
-        <p>名称：{{ package.title }}（{{ package.id }}）</p>
-        <p>类型：{{ item_type_info(item_type) }}　价格：{{ '￥%0.2f'|format(package.market_price) }}</p>
-    {% elseif item_type == 3 %}
-        {% set vip = item_info.vip %}
-        <p>期限：{{ '%d个月'|format(vip.expiry) }}（{{ vip.id }}）</p>
-        <p>类型：{{ item_type_info(item_type) }}　价格：{{ '￥%0.2f'|format(vip.price) }}</p>
-    {% endif %}
-{%- endmacro %}
-
-{%- macro schedules_info(schedules) %}
-    {% for value in schedules %}
-        <span class="layui-badge layui-bg-gray">{{ value }}点</span>
-    {% endfor %}
-{%- endmacro %}

app/Http/Admin/Views/nav/add.volt

@@ -37,13 +37,15 @@
                 <input class="layui-input" type="text" name="priority" value="10" lay-verify="number">
             </div>
         </div>
-        <div class="layui-form-item">
+        {% if parent_id == 0 %}
-            <label class="layui-form-label">位置</label>
+            <div class="layui-form-item">
-            <div class="layui-input-block">
+                <label class="layui-form-label">位置</label>
-                <input type="radio" name="position" value="1" title="顶部" checked="checked">
+                <div class="layui-input-block">
-                <input type="radio" name="position" value="2" title="底部">
+                    <input type="radio" name="position" value="1" title="顶部" checked="checked">
+                    <input type="radio" name="position" value="2" title="底部">
+                </div>
             </div>
-        </div>
+        {% endif %}
         <div class="layui-form-item">
             <label class="layui-form-label">目标</label>
             <div class="layui-input-block">
@@ -61,4 +63,4 @@
         </div>
     </form>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/nav/edit.volt

@@ -24,13 +24,15 @@
                 <input class="layui-input" type="text" name="priority" value="{{ nav.priority }}" lay-verify="number">
             </div>
         </div>
-        <div class="layui-form-item">
+        {% if nav.parent_id == 0 %}
-            <label class="layui-form-label">位置</label>
+            <div class="layui-form-item">
-            <div class="layui-input-block">
+                <label class="layui-form-label">位置</label>
-                <input type="radio" name="position" value="1" title="顶部" {% if nav.position == 1 %}checked="checked"{% endif %}>
+                <div class="layui-input-block">
-                <input type="radio" name="position" value="2" title="底部" {% if nav.position == 2 %}checked="checked"{% endif %}>
+                    <input type="radio" name="position" value="1" title="顶部" {% if nav.position == 1 %}checked="checked"{% endif %}>
+                    <input type="radio" name="position" value="2" title="底部" {% if nav.position == 2 %}checked="checked"{% endif %}>
+                </div>
             </div>
-        </div>
+        {% endif %}
         <div class="layui-form-item">
             <label class="layui-form-label">目标</label>
             <div class="layui-input-block">
@@ -54,4 +56,4 @@
         </div>
     </form>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/nav/list.volt

@@ -25,9 +25,7 @@
         <div class="kg-nav-left">
             <span class="layui-breadcrumb">
                 {% if parent.id > 0 %}
-                    <a class="kg-back" href="{{ back_url }}">
+                    <a href="{{ back_url }}"><i class="layui-icon layui-icon-return"></i>返回</a>
-                        <i class="layui-icon layui-icon-return"></i> 返回
-                    </a>
                     <a><cite>{{ parent.name }}</cite></a>
                 {% endif %}
                 <a><cite>导航管理</cite></a>
@@ -72,8 +70,8 @@
             {% set restore_url = url({'for':'admin.nav.restore','id':item.id}) %}
             <tr>
                 <td>{{ item.id }}</td>
-                {% if item.position == 1 and item.level < 2 %}
+                {% if item.position == 1 and item.level == 1 %}
-                    <td><a href="{{ child_url }}">{{ item.name }}</a></td>
+                    <td><a href="{{ child_url }}"><i class="layui-icon layui-icon-add-circle"></i> {{ item.name }}</a></td>
                 {% else %}
                     <td><a href="{{ edit_url }}">{{ item.name }}</a></td>
                 {% endif %}
@@ -102,4 +100,4 @@
         </tbody>
     </table>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/package/edit.volt

@@ -82,7 +82,7 @@
                 max: 15,
                 autoRow: true,
                 filterable: true,
-                filterMethod: function (val, item, index, prop) {
+                filterMethod: function (val, item) {
                     return item.name.toLowerCase().indexOf(val.toLowerCase()) !== -1;
                 },
                 data: {{ xm_courses|json_encode }}
@@ -92,4 +92,4 @@
 
     </script>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/point_gift/add.volt

@@ -69,7 +69,7 @@
                 name: 'xm_course_id',
                 radio: true,
                 filterable: true,
-                filterMethod: function (val, item, index, prop) {
+                filterMethod: function (val, item) {
                     return item.name.toLowerCase().indexOf(val.toLowerCase()) !== -1;
                 },
                 data: {{ xm_courses|json_encode }}
@@ -91,4 +91,4 @@
 
     </script>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/question/edit.volt

@@ -48,7 +48,7 @@
                 name: 'xm_tag_ids',
                 max: 5,
                 filterable: true,
-                filterMethod: function (val, item, index, prop) {
+                filterMethod: function (val, item) {
                     return item.name.toLowerCase().indexOf(val.toLowerCase()) !== -1;
                 },
                 data: {{ xm_tags|json_encode }}
@@ -58,4 +58,4 @@
 
     </script>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/review/search.volt

@@ -84,7 +84,7 @@
                 name: 'course_id',
                 filterable: true,
                 radio: true,
-                filterMethod: function (val, item, index, prop) {
+                filterMethod: function (val, item) {
                     return item.name.toLowerCase().indexOf(val.toLowerCase()) !== -1;
                 },
                 data: {{ xm_courses|json_encode }}
@@ -102,4 +102,4 @@
 
     </script>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/setting/live.volt

@@ -65,7 +65,7 @@
                 layer.open({
                     type: 2,
                     title: '推流测试',
-                    area: ['720px', '500px'],
+                    area: ['720px', '540px'],
                     content: [url, 'no']
                 });
             });
@@ -85,4 +85,4 @@
 
     </script>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/setting/pay.volt

@@ -34,7 +34,7 @@
                     type: 2,
                     title: '支付宝 - 支付测试',
                     resize: false,
-                    area: ['640px', '300px'],
+                    area: ['640px', '320px'],
                     content: [url, 'no']
                 });
             });
@@ -45,7 +45,7 @@
                     type: 2,
                     title: '微信 - 支付测试',
                     resize: false,
-                    area: ['640px', '300px'],
+                    area: ['640px', '320px'],
                     content: [url, 'no']
                 });
             });
@@ -54,4 +54,4 @@
 
     </script>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/slide/add.volt

@@ -75,7 +75,7 @@
                 name: 'xm_course_id',
                 radio: true,
                 filterable: true,
-                filterMethod: function (val, item, index, prop) {
+                filterMethod: function (val, item) {
                     return item.name.toLowerCase().indexOf(val.toLowerCase()) !== -1;
                 },
                 data: {{ xm_courses|json_encode }}
@@ -86,7 +86,7 @@
                 name: 'xm_page_id',
                 radio: true,
                 filterable: true,
-                filterMethod: function (val, item, index, prop) {
+                filterMethod: function (val, item) {
                     return item.name.toLowerCase().indexOf(val.toLowerCase()) !== -1;
                 },
                 data: {{ xm_pages|json_encode }}
@@ -101,4 +101,4 @@
 
     </script>
 
-{% endblock %}
+{% endblock %}

app/Http/Admin/Views/templates/main.volt

@@ -20,9 +20,10 @@
 
 {{ js_include('lib/layui/layui.js') }}
 {{ js_include('admin/js/common.js') }}
+{{ js_include('admin/js/fixbar.js') }}
 
 {% block include_js %}{% endblock %}
 {% block inline_js %}{% endblock %}
 
 </body>
-</html>
+</html>

app/Http/Admin/Views/topic/edit.volt

@@ -44,7 +44,7 @@
                 max: 15,
                 autoRow: true,
                 filterable: true,
-                filterMethod: function (val, item, index, prop) {
+                filterMethod: function (val, item) {
                     return item.name.toLowerCase().indexOf(val.toLowerCase()) !== -1;
                 },
                 data: {{ xm_courses|json_encode }}
@@ -55,4 +55,3 @@
     </script>
 
 {% endblock %}
-

app/Http/Admin/Views/user/edit.volt

@@ -21,12 +21,11 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label" style="padding-top:30px;">头像</label>
                         <div class="layui-input-inline" style="width:80px;">
-                            <img id="avatar" class="kg-avatar" src="{{ user.avatar }}">
+                            <img id="img-avatar" class="kg-avatar" src="{{ user.avatar }}">
                             <input type="hidden" name="avatar" value="{{ user.avatar }}">
-                            <input type="hidden" name="default_avatar" value="{{ default_avatar }}">
                         </div>
                         <div class="layui-input-inline" style="padding-top:25px;">
-                            <button id="clear-avatar" class="layui-btn layui-btn-sm" type="button">清空</button>
+                            <button id="change-avatar" class="layui-btn layui-btn-sm" type="button">更换</button>
                         </div>
                     </div>
                     <div class="layui-form-item">
@@ -153,6 +152,12 @@
 
 {% endblock %}
 
+{% block include_js %}
+
+    {{ js_include('admin/js/avatar.upload.js') }}
+
+{% endblock %}
+
 {% block inline_js %}
 
     <script>
@@ -163,12 +168,6 @@
             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'
@@ -201,4 +200,4 @@
 
     </script>
 
-{% endblock %}
+{% endblock %}

app/Http/Api/Controllers/Controller.php

@@ -30,8 +30,6 @@ class Controller extends \Phalcon\Mvc\Controller
             $this->setCors();
         }
 
-        $this->checkRateLimit();
-
         return true;
     }
 

app/Http/Api/Controllers/LiveController.php

@@ -7,7 +7,7 @@
 
 namespace App\Http\Api\Controllers;
 
-use App\Services\Logic\Live\LiveChapter as LiveChapterService;
+use App\Services\Logic\Live\LiveChat as LiveChatService;
 use App\Services\Logic\Live\LiveList as LiveListService;
 
 /**
@@ -33,7 +33,7 @@ class LiveController extends Controller
      */
     public function chatsAction($id)
     {
-        $service = new LiveChapterService();
+        $service = new LiveChatService();
 
         $chats = $service->getRecentChats($id);
 
@@ -45,7 +45,7 @@ class LiveController extends Controller
      */
     public function statsAction($id)
     {
-        $service = new LiveChapterService();
+        $service = new LiveChatService();
 
         $stats = $service->getStats($id);
 
@@ -57,7 +57,7 @@ class LiveController extends Controller
      */
     public function statusAction($id)
     {
-        $service = new LiveChapterService();
+        $service = new LiveChatService();
 
         $status = $service->getStatus($id);
 
@@ -69,7 +69,7 @@ class LiveController extends Controller
      */
     public function bindUserAction($id)
     {
-        $service = new LiveChapterService();
+        $service = new LiveChatService();
 
         $service->bindUser($id);
 
@@ -81,7 +81,7 @@ class LiveController extends Controller
      */
     public function sendMessageAction($id)
     {
-        $service = new LiveChapterService();
+        $service = new LiveChatService();
 
         $message = $service->sendMessage($id);
 

app/Http/Home/Controllers/AccountController.php

@@ -34,7 +34,7 @@ class AccountController extends Controller
         }
 
         if ($this->authUser->id > 0) {
-            return $this->response->redirect('/');
+            return $this->response->redirect(['for' => 'home.index']);
         }
 
         $returnUrl = $this->request->getHTTPReferer();
@@ -62,7 +62,7 @@ class AccountController extends Controller
         }
 
         if ($this->authUser->id > 0) {
-            return $this->response->redirect('/');
+            return $this->response->redirect(['for' => 'home.index']);
         }
 
         $service = new OAuthProviderService();
@@ -105,7 +105,7 @@ class AccountController extends Controller
             return $this->response->redirect(['for' => 'home.index']);
         }
 
-        $this->seo->prependTitle('重置密码');
+        $this->seo->prependTitle('忘记密码');
     }
 
     /**
@@ -119,9 +119,11 @@ class AccountController extends Controller
 
         $returnUrl = $this->request->getPost('return_url', 'string');
 
+        $location = $returnUrl ?: $this->url->get(['for' => 'home.index']);
+
         $content = [
-            'location' => $returnUrl ?: '/',
+            'location' => $location,
-            'msg' => '注册成功',
+            'msg' => '注册账号成功',
         ];
 
         return $this->jsonSuccess($content);
@@ -140,7 +142,12 @@ class AccountController extends Controller
 
         $location = $returnUrl ?: $this->url->get(['for' => 'home.index']);
 
-        return $this->jsonSuccess(['location' => $location]);
+        $content = [
+            'location' => $location,
+            'msg' => '登录账号成功',
+        ];
+
+        return $this->jsonSuccess($content);
     }
 
     /**
@@ -156,7 +163,12 @@ class AccountController extends Controller
 
         $location = $returnUrl ?: $this->url->get(['for' => 'home.index']);
 
-        return $this->jsonSuccess(['location' => $location]);
+        $content = [
+            'location' => $location,
+            'msg' => '登录账号成功',
+        ];
+
+        return $this->jsonSuccess($content);
     }
 
     /**

app/Http/Home/Controllers/ConnectController.php

@@ -120,27 +120,21 @@ class ConnectController extends Controller
         $service = new ConnectService();
 
         $openUser = $service->getOpenUserInfo($code, $state, $provider);
-
         $connect = $service->getConnectRelation($openUser['id'], $openUser['provider']);
 
-        if ($this->authUser->id > 0) {
+        if ($this->authUser->id > 0 && $openUser) {
-            if ($openUser) {
+            $service->bindUser($openUser);
-                $service->bindUser($openUser);
+            return $this->response->redirect(['for' => 'home.uc.account']);
-                return $this->response->redirect(['for' => 'home.uc.account']);
-            }
-        } else {
-            if ($connect) {
-                $service->authConnectLogin($connect);
-                return $this->response->redirect(['for' => 'home.index']);
-            }
         }
 
-        $captcha = $service->getSettings('captcha');
+        if ($this->authUser->id == 0 && $connect) {
+            $service->authConnectLogin($connect);
+            return $this->response->redirect(['for' => 'home.index']);
+        }
 
         $this->seo->prependTitle('绑定帐号');
 
         $this->view->pick('connect/bind');
-        $this->view->setVar('captcha', $captcha);
         $this->view->setVar('provider', $provider);
         $this->view->setVar('open_user', $openUser);
     }

app/Http/Home/Controllers/ConsultController.php

@@ -77,8 +77,14 @@ class ConsultController extends Controller
 
         $consult = $service->handle($consult->id);
 
+        $location = $this->url->get([
+            'for' => 'home.course.show',
+            'id' => $consult['course']['id'],
+        ]);
+
         $content = [
-            'consult' => $consult,
+            'location' => $location,
+            'target' => 'parent',
             'msg' => '提交咨询成功',
         ];
 
@@ -92,14 +98,13 @@ class ConsultController extends Controller
     {
         $service = new ConsultUpdateService();
 
-        $consult = $service->handle($id);
+        $service->handle($id);
 
-        $service = new ConsultInfoService();
+        $location = $this->url->get(['for' => 'home.uc.consults']);
-
-        $consult = $service->handle($consult->id);
 
         $content = [
-            'consult' => $consult,
+            'location' => $location,
+            'target' => 'parent',
             'msg' => '更新咨询成功',
         ];
 
@@ -127,14 +132,13 @@ class ConsultController extends Controller
 
             $service = new ConsultReplyService();
 
-            $consult = $service->handle($id);
+            $service->handle($id);
 
-            $service = new ConsultInfoService();
+            $location = $this->url->get(['for' => 'home.tc.consults']);
-
-            $consult = $service->handle($consult->id);
 
             $content = [
-                'consult' => $consult,
+                'location' => $location,
+                'target' => 'parent',
                 'msg' => '回复咨询成功',
             ];
 

app/Http/Home/Controllers/Controller.php

@@ -77,8 +77,6 @@ class Controller extends \Phalcon\Mvc\Controller
             $this->checkCsrfToken();
         }
 
-        $this->checkRateLimit();
-
         return true;
     }
 

app/Http/Home/Controllers/LayerController.php

@@ -37,8 +37,6 @@ class LayerController extends \Phalcon\Mvc\Controller
             $this->checkCsrfToken();
         }
 
-        $this->checkRateLimit();
-
         return true;
     }
 

app/Http/Home/Controllers/LiveController.php

@@ -7,7 +7,7 @@
 
 namespace App\Http\Home\Controllers;
 
-use App\Services\Logic\Live\LiveChapter as LiveChapterService;
+use App\Services\Logic\Live\LiveChat as LiveChatService;
 use Phalcon\Mvc\View;
 
 /**
@@ -21,7 +21,7 @@ class LiveController extends Controller
      */
     public function chatsAction($id)
     {
-        $service = new LiveChapterService();
+        $service = new LiveChatService();
 
         $chats = $service->getRecentChats($id);
 
@@ -35,7 +35,7 @@ class LiveController extends Controller
      */
     public function statsAction($id)
     {
-        $service = new LiveChapterService();
+        $service = new LiveChatService();
 
         $stats = $service->getStats($id);
 
@@ -47,7 +47,7 @@ class LiveController extends Controller
      */
     public function statusAction($id)
     {
-        $service = new LiveChapterService();
+        $service = new LiveChatService();
 
         $status = $service->getStatus($id);
 
@@ -59,7 +59,7 @@ class LiveController extends Controller
      */
     public function bindUserAction($id)
     {
-        $service = new LiveChapterService();
+        $service = new LiveChatService();
 
         $service->bindUser($id);
 
@@ -71,7 +71,7 @@ class LiveController extends Controller
      */
     public function sendMessageAction($id)
     {
-        $service = new LiveChapterService();
+        $service = new LiveChatService();
 
         $response = $service->sendMessage($id);
 

app/Http/Home/Controllers/OrderController.php

@@ -27,7 +27,10 @@ class OrderController extends Controller
         parent::beforeExecuteRoute($dispatcher);
 
         if ($this->authUser->id == 0) {
-            $this->response->redirect(['for' => 'home.account.login']);
+            $dispatcher->forward([
+                'controller' => 'account',
+                'action' => 'login',
+            ]);
             return false;
         }
 

app/Http/Home/Controllers/PointGiftController.php

@@ -27,7 +27,10 @@ class PointGiftController extends Controller
         parent::beforeExecuteRoute($dispatcher);
 
         if ($this->authUser->id == 0) {
-            $this->response->redirect(['for' => 'home.account.login']);
+            $dispatcher->forward([
+                'controller' => 'account',
+                'action' => 'login',
+            ]);
             return false;
         }
 
@@ -87,7 +90,7 @@ class PointGiftController extends Controller
         $hotGifts = $this->getHotGifts();
         $userBalance = $this->getUserBalance();
 
-        $this->seo->prependTitle(['积分兑换', $gift['name']]);
+        $this->seo->prependTitle(['积分商城', $gift['name']]);
 
         $this->view->pick('point/gift/show');
         $this->view->setVar('gift', $gift);