!43 v1.2.0阶段性合并

* Merge branches 'develop' and 'master' of https://gitee.com/koogua/cour…
* 优化开发登录，计划任务执行路径，周期
* !41 修复课程分类未过滤2
* !40 修复课程分类未过滤2
* !39 修复课程分类未过滤
* !38 修复课程分类未过滤
* Merge branch 'master' of https://gitee.com/koogua/course-tencent-cloud…
* !36 修复添加课程后进入列表500错误
* !35 修复腾讯云回调数据结构改变导致的错误
* !34 修复创建课时相关属性表数据未生成的问题 
* !23 修复添加课时后进入编辑页面500错误

CHANGELOG.md

@@ -1,3 +1,7 @@
+### [v1.2.1](https://gitee.com/koogua/course-tencent-cloud/releases/v1.2.1)(2020-12-10)
+- 增加QQ，微信，微博第三方登录
+- 代码优化以及问题修复
+
 ### [v1.2.0](https://gitee.com/koogua/course-tencent-cloud/releases/v1.2.0)(2020-11-25)
 - 增加客户端api
 - 代码优化以及问题修复

README.md

@@ -6,9 +6,9 @@
 
 酷瓜云课堂，依托腾讯云基础服务架构，采用C扩展框架Phalcon开发，GPL-2.0开源协议，致力开源网课系统，开源网校系统，开源在线教育系统。
 
-![](https://img.shields.io/static/v1?label=release&message=1.2.0&color=blue)
+![](https://img.shields.io/static/v1?label=release&message=1.2.1&color=blue)
-![](https://img.shields.io/static/v1?label=stars&message=101&color=blue)
+![](https://img.shields.io/static/v1?label=stars&message=112&color=blue)
-![](https://img.shields.io/static/v1?label=forks&message=40&color=blue)
+![](https://img.shields.io/static/v1?label=forks&message=41&color=blue)
 ![](https://img.shields.io/static/v1?label=license&message=GPL-2.0&color=blue)
 
 #### 系统功能

app/Http/Admin/Services/Course.php

@@ -8,6 +8,7 @@ use App\Caches\CourseCategoryList as CourseCategoryListCache;
 use App\Caches\CourseRelatedList as CourseRelatedListCache;
 use App\Caches\CourseTeacherList as CourseTeacherListCache;
 use App\Library\Paginator\Query as PagerQuery;
+use App\Models\Category as CategoryModel;
 use App\Models\Course as CourseModel;
 use App\Models\CourseCategory as CourseCategoryModel;
 use App\Models\CourseRating as CourseRatingModel;
@@ -224,7 +225,10 @@ class Course extends Service
     {
         $categoryRepo = new CategoryRepo();
 
-        $allCategories = $categoryRepo->findAll(['deleted' => 0]);
+        $allCategories = $categoryRepo->findAll([
+            'type' => CategoryModel::TYPE_COURSE,
+            'deleted' => 0,
+        ]);
 
         if ($allCategories->count() == 0) {
             return [];
@@ -247,8 +251,11 @@ class Course extends Service
 
         $list = [];
 
+        /**
+         * 没有二级分类的不显示
+         */
         foreach ($allCategories as $category) {
-            if ($category->level == 1) {
+            if ($category->level == 1 && $category->child_count > 0) {
                 $list[$category->id] = [
                     'name' => $category->name,
                     'value' => $category->id,

app/Http/Admin/Services/Setting.php

@@ -32,6 +32,7 @@ class Setting extends Service
         $oauth = $this->getSettings('oauth.weibo');
 
         $oauth['redirect_uri'] = $oauth['redirect_uri'] ?: kg_full_url(['for' => 'home.oauth.weibo_callback']);
+        $oauth['refuse_uri'] = $oauth['refuse_uri'] ?: kg_full_url(['for' => 'home.oauth.weibo_refuse']);
 
         return $oauth;
     }

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

@@ -19,7 +19,7 @@
         </div>
     </div>
     <div class="layui-form-item">
-        <label class="layui-form-label">Redirect Url</label>
+        <label class="layui-form-label">Callback Url</label>
         <div class="layui-input-block">
             <input class="layui-input" type="text" name="redirect_uri" value="{{ qq_auth.redirect_uri }}" lay-verify="required">
         </div>

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

@@ -19,11 +19,17 @@
         </div>
     </div>
     <div class="layui-form-item">
-        <label class="layui-form-label">Redirect Uri</label>
+        <label class="layui-form-label">Callback Url</label>
         <div class="layui-input-block">
             <input class="layui-input" type="text" name="redirect_uri" value="{{ weibo_auth.redirect_uri }}" lay-verify="required">
         </div>
     </div>
+    <div class="layui-form-item">
+        <label class="layui-form-label">Refuse Url</label>
+        <div class="layui-input-block">
+            <input class="layui-input" type="text" name="refuse_uri" value="{{ weibo_auth.refuse_uri }}" lay-verify="required">
+        </div>
+    </div>
     <div class="layui-form-item">
         <label class="layui-form-label"></label>
         <div class="layui-input-block">

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

@@ -19,7 +19,7 @@
         </div>
     </div>
     <div class="layui-form-item">
-        <label class="layui-form-label">Redirect Url</label>
+        <label class="layui-form-label">Callback Url</label>
         <div class="layui-input-block">
             <input class="layui-input" type="text" name="redirect_uri" value="{{ weixin_auth.redirect_uri }}" lay-verify="required">
         </div>

app/Library/AppInfo.php

@@ -11,7 +11,7 @@ class AppInfo
 
     protected $link = 'https://gitee.com/koogua';
 
-    protected $version = '1.2.0';
+    protected $version = '1.2.1';
 
     public function __get($name)
     {

db/migrations/20201205112717_insert_oauth_setting_data.php

@@ -70,6 +70,11 @@ final class InsertOauthSettingData extends AbstractMigration
                 'item_key' => 'redirect_uri',
                 'item_value' => '',
             ],
+            [
+                'section' => 'oauth.weibo',
+                'item_key' => 'refuse_uri',
+                'item_value' => '',
+            ],
         ];
 
         $this->table('kg_setting')->insert($rows)->save();

scheduler.php

@@ -8,7 +8,7 @@ $scheduler = new Scheduler();
 
 $script = __DIR__ . '/console.php';
 
-$bin = '/usr/bin/php';
+$bin = '/usr/local/bin/php';
 
 $scheduler->php($script, $bin, ['--task' => 'deliver', '--action' => 'main'])
     ->at('*/3 * * * *');