Merge branch 'koogua/v1.6.0' into demo

README.md

@@ -48,13 +48,6 @@ H5手机端演示：
 
 Tips: 测试支付请用手机号注册一个新账户，以便接收订单通知，以及避免课程无法购买
 
-即时通讯演示：
-
-请使用以下两个账号在不同终端或者浏览器登录，打开微聊界面
-
-- 帐号A：100015@163.com / 123456
-- 帐号B：100065@163.com / 123456
-
 微信推送演示：
 
 Tips: 请用手机注册一个新账号，用户中心 -> 关注订阅，扫码关注公众号。之后的登录、购买、退款、直播、咨询等会有消息推送。

app/Console/Tasks/SyncAppInfoTask.php

@@ -15,7 +15,7 @@ class SyncAppInfoTask extends Task
 
     public function mainAction()
     {
-        $url = 'https://koogua.com/api/instance/collect';
+        $url = 'https://www.koogua.com/api/instance/collect';
 
         $site = $this->getSettings('site');
 

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

@@ -22,6 +22,7 @@
             <col>
             <col>
             <col>
+            <col>
             <col width="10%">
             <col width="10%">
             <col width="12%">
@@ -31,6 +32,7 @@
             <th>编号</th>
             <th>标题</th>
             <th>分类</th>
+            <th>浏览</th>
             <th>排序</th>
             <th>发布</th>
             <th>操作</th>
@@ -48,6 +50,7 @@
                 <td>{{ item.id }}</td>
                 <td><a href="{{ edit_url }}">{{ item.title }}</a></td>
                 <td><a href="{{ list_url }}">{{ item.category.name }}</a></td>
+                <td>{{ item.view_count }}</td>
                 <td class="center"><input class="layui-input kg-priority" type="text" name="priority" title="数值越小排序越靠前" value="{{ item.priority }}" data-url="{{ update_url }}"></td>
                 <td class="center"><input type="checkbox" name="published" value="1" lay-skin="switch" lay-text="是|否" lay-filter="published" data-url="{{ update_url }}" {% if item.published == 1 %}checked="checked"{% endif %}></td>
                 <td class="center">

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

@@ -9,7 +9,7 @@
             <tbody>
             <tr>
                 <td>版权所有</td>
-                <td><a href="https://koogua.com" target="_blank">深圳市酷瓜软件有限公司</a></td>
+                <td><a href="https://www.koogua.com" target="_blank">深圳市酷瓜软件有限公司</a></td>
             </tr>
             <tr>
                 <td>产品经理</td>

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

@@ -40,8 +40,8 @@
             <th>编号</th>
             <th>标题</th>
             <th>别名</th>
+            <th>浏览</th>
             <th>创建时间</th>
-            <th>更新时间</th>
             <th>发布</th>
             <th>操作</th>
         </tr>
@@ -57,8 +57,8 @@
                 <td>{{ item.id }}</td>
                 <td><a href="{{ edit_url }}">{{ item.title }}</a></td>
                 <td>{{ alias_tips(item.alias) }}</td>
+                <td>{{ item.view_count }}</td>
                 <td>{{ date('Y-m-d H:i:s',item.create_time) }}</td>
-                <td>{{ date('Y-m-d H:i:s',item.update_time) }}</td>
                 <td><input type="checkbox" name="published" value="1" lay-skin="switch" lay-text="是|否" lay-filter="published" data-url="{{ update_url }}" {% if item.published == 1 %}checked="checked"{% endif %}>
                 </td>
                 <td class="center">

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

@@ -10,7 +10,7 @@
         <label class="layui-form-label">手续费率</label>
         <div class="layui-input-block">
             <select name="service_rate" lay-verify="number">
-                {% for value in 1..30 %}
+                {% for value in 0..30 %}
                     {% set selected = (value == alipay.service_rate) ? 'selected="selected"' : '' %}
                     <option value="{{ value }}" {{ selected }}>{{ value }}%</option>
                 {% endfor %}

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

@@ -10,7 +10,7 @@
         <label class="layui-form-label">手续费率</label>
         <div class="layui-input-block">
             <select name="service_rate" lay-verify="number">
-                {% for value in 1..30 %}
+                {% for value in 0..30 %}
                     {% set selected = (value == wxpay.service_rate) ? 'selected="selected"' : '' %}
                     <option value="{{ value }}" {{ selected }}>{{ value }}%</option>
                 {% endfor %}

app/Http/Home/Controllers/TeacherController.php

@@ -29,7 +29,7 @@ class TeacherController extends Controller
             return $this->response->redirect($location);
         }
 
-        $this->seo->prependTitle('教师');
+        $this->seo->prependTitle('师资');
     }
 
     /**

app/Http/Home/Views/chapter/vod.volt

@@ -20,6 +20,9 @@
     <div class="layout-main">
         <div class="layout-content">
             <div class="player-wrap wrap">
+                <div id="play-mask" class="play-mask">
+                    <span class="layui-icon layui-icon-play"></span>
+                </div>
                 <div id="player"></div>
             </div>
             <div id="comment-anchor"></div>

app/Http/Home/Views/partials/header.volt

@@ -1,9 +1,8 @@
+{% set logo_img = site_info.logo ? image(site_info.logo,false) : image('logo.png') %}
+{% set logo_link = site_info.url ? site_info.url : '/' %}
+
 <div class="logo">
-    {% if site_info.logo %}
+    <a href="{{ logo_link }}">{{ logo_img }}</a>
-        {{ image(site_info.logo,false) }}
-    {% else %}
-        {{ image('logo.png') }}
-    {% endif %}
 </div>
 
 <div class="top-nav">

app/Http/Home/Views/teacher/list.volt

@@ -6,7 +6,7 @@
 
     <div class="layui-breadcrumb breadcrumb">
         <a href="/">首页</a>
-        <a><cite>教师</cite></a>
+        <a><cite>师资</cite></a>
     </div>
 
     <div id="teacher-list" data-url="{{ pager_url }}"></div>

app/Library/AppInfo.php

@@ -16,7 +16,7 @@ class AppInfo
 
     protected $link = 'https://www.koogua.com';
 
-    protected $version = '1.5.9';
+    protected $version = '1.6.0';
 
     public function __get($name)
     {

app/Listeners/Help.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
+ * @license https://opensource.org/licenses/GPL-2.0
+ * @link https://www.koogua.com
+ */
+
+namespace App\Listeners;
+
+use App\Models\Help as HelpModel;
+use Phalcon\Events\Event as PhEvent;
+
+class Help extends Listener
+{
+
+    public function afterCreate(PhEvent $event, $source, HelpModel $help)
+    {
+
+    }
+
+    public function afterUpdate(PhEvent $event, $source, HelpModel $help)
+    {
+
+    }
+
+    public function afterDelete(PhEvent $event, $source, HelpModel $help)
+    {
+
+    }
+
+    public function afterRestore(PhEvent $event, $source, HelpModel $help)
+    {
+
+    }
+
+    public function afterView(PhEvent $event, $source, HelpModel $help)
+    {
+
+    }
+
+}

app/Listeners/Page.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * @copyright Copyright (c) 2021 深圳市酷瓜软件有限公司
+ * @license https://opensource.org/licenses/GPL-2.0
+ * @link https://www.koogua.com
+ */
+
+namespace App\Listeners;
+
+use App\Models\Page as PageModel;
+use Phalcon\Events\Event as PhEvent;
+
+class Page extends Listener
+{
+
+    public function afterCreate(PhEvent $event, $source, PageModel $page)
+    {
+
+    }
+
+    public function afterUpdate(PhEvent $event, $source, PageModel $page)
+    {
+
+    }
+
+    public function afterDelete(PhEvent $event, $source, PageModel $page)
+    {
+
+    }
+
+    public function afterRestore(PhEvent $event, $source, PageModel $page)
+    {
+
+    }
+
+    public function afterView(PhEvent $event, $source, PageModel $page)
+    {
+
+    }
+
+}

app/Models/Help.php

@@ -69,6 +69,13 @@ class Help extends Model
      */
     public $deleted = 0;
 
+    /**
+     * 浏览量
+     *
+     * @var int
+     */
+    public $view_count = 0;
+
     /**
      * 创建时间
      *

app/Models/Notification.php

@@ -198,4 +198,16 @@ class Notification extends Model
         }
     }
 
+    public function afterCreate()
+    {
+        /**
+         * @var $user User
+         */
+        $user = User::findFirst($this->receiver_id);
+
+        $user->notice_count += 1;
+
+        $user->update();
+    }
+
 }

app/Models/Page.php

@@ -62,6 +62,13 @@ class Page extends Model
      */
     public $deleted = 0;
 
+    /**
+     * 浏览量
+     *
+     * @var int
+     */
+    public $view_count = 0;
+
     /**
      * 创建时间
      *

app/Models/User.php

@@ -154,6 +154,13 @@ class User extends Model
      */
     public $favorite_count = 0;
 
+    /**
+     * 通知数
+     *
+     * @var int
+     */
+    public $notice_count = 0;
+
     /**
      * 会员期限
      *

app/Services/Logic/Help/HelpInfo.php

@@ -32,6 +32,7 @@ class HelpInfo extends LogicService
             'content' => $help->content,
             'published' => $help->published,
             'deleted' => $help->deleted,
+            'view_count' => $help->view_count,
             'create_time' => $help->create_time,
             'update_time' => $help->update_time,
         ];

app/Services/Logic/Page/PageInfo.php

@@ -20,6 +20,10 @@ class PageInfo extends LogicService
     {
         $page = $this->checkPage($id);
 
+        $this->incrPageViewCount($page);
+
+        $this->eventsManager->fire('Page:afterView', $this, $page);
+
         return $this->handlePage($page);
     }
 
@@ -32,9 +36,17 @@ class PageInfo extends LogicService
             'content' => $page->content,
             'published' => $page->published,
             'deleted' => $page->deleted,
+            'view_count' => $page->view_count,
             'create_time' => $page->create_time,
             'update_time' => $page->update_time,
         ];
     }
 
+    protected function incrPageViewCount(PageModel $page)
+    {
+        $page->view_count += 1;
+
+        $page->update();
+    }
+
 }

app/Services/Logic/User/Console/NotifyStats.php

@@ -7,7 +7,6 @@
 
 namespace App\Services\Logic\User\Console;
 
-use App\Repos\User as UserRepo;
 use App\Services\Logic\Service as LogicService;
 
 class NotifyStats extends LogicService
@@ -17,16 +16,7 @@ class NotifyStats extends LogicService
     {
         $user = $this->getLoginUser();
 
-        $noticeCount = $this->getNoticeCount($user->id);
+        return ['notice_count' => $user->notice_count];
-
-        return ['notice_count' => $noticeCount];
-    }
-
-    protected function getNoticeCount($userId)
-    {
-        $userRepo = new UserRepo();
-
-        return $userRepo->countUnreadNotifications($userId);
     }
 
 }

config/events.php

@@ -10,6 +10,8 @@ use App\Listeners\Answer;
 use App\Listeners\Article;
 use App\Listeners\Comment;
 use App\Listeners\Consult;
+use App\Listeners\Help;
+use App\Listeners\Page;
 use App\Listeners\Question;
 use App\Listeners\Report;
 use App\Listeners\Review;
@@ -18,15 +20,17 @@ use App\Listeners\Trade;
 use App\Listeners\UserDailyCounter;
 
 return [
-    'UserDailyCounter' => UserDailyCounter::class,
     'Account' => Account::class,
     'Answer' => Answer::class,
     'Article' => Article::class,
     'Comment' => Comment::class,
     'Consult' => Consult::class,
+    'Help' => Help::class,
+    'Page' => Page::class,
     'Question' => Question::class,
     'Report' => Report::class,
     'Review' => Review::class,
-    'Trade' => Trade::class,
     'Site' => Site::class,
+    'Trade' => Trade::class,
+    'UserDailyCounter' => UserDailyCounter::class,
 ];

db/migrations/20210403184518.php

@@ -155,7 +155,7 @@ final class V20210403184518 extends AbstractMigration
                 'id' => 5,
                 'parent_id' => 0,
                 'level' => 1,
-                'name' => '教师',
+                'name' => '师资',
                 'path' => ',5,',
                 'target' => '_self',
                 'url' => '/teacher/list',

db/migrations/20221021035953.php

@@ -0,0 +1,75 @@
+<?php
+/**
+ * @copyright Copyright (c) 2022 深圳市酷瓜软件有限公司
+ * @license https://opensource.org/licenses/GPL-2.0
+ * @link https://www.koogua.com
+ */
+
+use Phinx\Db\Adapter\MysqlAdapter;
+use Phinx\Migration\AbstractMigration;
+
+final class V20221021035953 extends AbstractMigration
+{
+
+    public function up()
+    {
+        $this->alterPageTable();
+        $this->alterHelpTable();
+        $this->alterUserTable();
+    }
+
+    protected function alterPageTable()
+    {
+        $table = $this->table('kg_page');
+
+        if ($table->hasColumn('view_count') == false) {
+            $table->addColumn('view_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '浏览数',
+                'after' => 'deleted',
+            ]);
+        }
+
+        $table->save();
+    }
+
+    protected function alterHelpTable()
+    {
+        $table = $this->table('kg_help');
+
+        if ($table->hasColumn('view_count') == false) {
+            $table->addColumn('view_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '浏览数',
+                'after' => 'deleted',
+            ]);
+        }
+
+        $table->save();
+    }
+
+    protected function alterUserTable()
+    {
+        $table = $this->table('kg_user');
+
+        if ($table->hasColumn('notice_count') == false) {
+            $table->addColumn('notice_count', 'integer', [
+                'null' => false,
+                'default' => '0',
+                'limit' => MysqlAdapter::INT_REGULAR,
+                'signed' => false,
+                'comment' => '通知数',
+                'after' => 'favorite_count',
+            ]);
+        }
+
+        $table->save();
+    }
+
+}

public/static/home/css/common.css

@@ -1335,6 +1335,26 @@
     height: 428px;
 }
 
+
+.play-mask {
+    top: 50%;
+    left: 50%;
+    z-index: 8;
+    position: absolute;
+    margin-top: -32px;
+    margin-left: -32px;
+}
+
+.play-mask .layui-icon-play {
+    color: white;
+    cursor: pointer;
+    font-size: 64px;
+}
+
+.play-mask .layui-icon-play:hover {
+    color: #00a4ff;
+}
+
 .chat-wrap .layui-card-header {
     text-align: center;
 }

public/static/home/css/content.css

@@ -158,6 +158,10 @@
     border-left: none;
 }
 
+.ke-content table tr:first-child td {
+    border-top: none;
+}
+
 .ke-content code,
 .ke-content pre {
     font-family: Consolas, Monaco, Andale Mono, monospace;

public/static/home/js/chapter.live.player.js

@@ -55,6 +55,14 @@ layui.use(['jquery', 'helper'], function () {
         stop();
     });
 
+    /**
+     * 播放器中央播放按钮点击事件
+     */
+    $('#play-mask').on('click', function () {
+        $(this).hide();
+        player.toggle();
+    });
+
     function start() {
         if (interval != null) {
             clearInterval(interval);

public/static/home/js/chapter.vod.player.js

@@ -51,6 +51,14 @@ layui.use(['jquery', 'helper'], function () {
         ended();
     });
 
+    /**
+     * 播放器中央播放按钮点击事件
+     */
+    $('#play-mask').on('click', function () {
+        $(this).hide();
+        player.toggle();
+    });
+
     var position = parseInt(lastPosition);
 
     /**

public/static/home/js/common.js

@@ -48,7 +48,7 @@ layui.use(['jquery', 'form', 'element', 'layer', 'helper'], function () {
                 $token.attr('content', res.token);
             }
         });
-    }, 300000);
+    }, 600000);
 
     if (window.user.id > 0) {
         setInterval(function () {
@@ -60,7 +60,7 @@ layui.use(['jquery', 'form', 'element', 'layer', 'helper'], function () {
                     $notifyDot.removeClass('layui-badge-dot');
                 }
             });
-        }, 30000);
+        }, 60000);
         setInterval(function () {
             $.post('/uc/online');
         }, 60000);