gitee/course-tencent-cloud
1
0
Fork 0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-23 11:58:41 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://gitee.com/koogua/course-tencent-cloud

Browse Source
This commit is contained in:
xiaochong0302 2022-10-30 23:38:24 +08:00
commit 3c5310b5bd
36 changed files with 1498 additions and 997 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CHANGELOG.md
View File

@ -1,3 +1,18 @@
### [v1.6.0](https://gitee.com/koogua/course-tencent-cloud/releases/v1.6.0)(2022-10-26)
- 播放器中间增加大号播放按钮
- 单页和帮助增加浏览计数属性
- logo上增加首页链接
- 修正分类默认图标问题
- 修正layui-main样式更新带来的问题
- 更新composer包
- 调整退款手续费范围
- 导航部分，教师->师资
- 优化分页组件参数
- 优化内容表格样式
- 优化热门问题和热门答主
- 优化通知计数方式
### [v1.5.9](https://gitee.com/koogua/course-tencent-cloud/releases/v1.5.9)(2022-09-20)
- 修正内容图片上传问题

7
README.md
View File

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

17
app/Caches/HotQuestionList.php
View File

@ -48,6 +48,12 @@ class HotQuestionList extends Cache
return $this->handleQuestions($questions);
}
$questions = $this->findFullyHotQuestions();
if ($questions->count() > 0) {
return $this->handleQuestions($questions);
}
return [];
}
@ -102,6 +108,17 @@ class HotQuestionList extends Cache
return $this->findHotQuestions($createTime, $limit);
}
/**
* @param int $limit
* @return ResultsetInterface|Resultset|QuestionModel[]
*/
protected function findFullyHotQuestions($limit = 10)
{
$createTime = 0;
return $this->findHotQuestions($createTime, $limit);
}
/**
* @param int $createTime
* @param int $limit

74
app/Caches/TopAnswererList.php
View File

@ -7,8 +7,8 @@
namespace App\Caches;
use App\Models\Article as ArticleModel;
use App\Models\ArticleLike as ArticleLikeModel;
use App\Models\Answer as AnswerModel;
use App\Models\AnswerLike as AnswerLikeModel;
use App\Repos\User as UserRepo;
use Phalcon\Mvc\Model\Resultset;
use Phalcon\Mvc\Model\ResultsetInterface;
@ -37,10 +37,24 @@ class TopAnswererList extends Cache
return $this->handleUsers($userIds);
}
$randOwners = $this->findRandArticleOwners();
$rankings = $this->findMonthlyAuthorRankings();
if ($randOwners->count() > 0) {
$userIds = kg_array_column($randOwners->toArray(), 'owner_id');
if ($rankings->count() > 0) {
$userIds = kg_array_column($rankings->toArray(), 'author_id');
return $this->handleUsers($userIds);
}
$rankings = $this->findYearlyAuthorRankings();
if ($rankings->count() > 0) {
$userIds = kg_array_column($rankings->toArray(), 'author_id');
return $this->handleUsers($userIds);
}
$rankings = $this->findFullyAuthorRankings();
if ($rankings->count() > 0) {
$userIds = kg_array_column($rankings->toArray(), 'author_id');
return $this->handleUsers($userIds);
}
@ -73,23 +87,53 @@ class TopAnswererList extends Cache
* @param int $limit
* @return ResultsetInterface|Resultset
*/
protected function findRandArticleOwners($limit = 10)
protected function findWeeklyAuthorRankings($limit = 10)
{
return ArticleModel::query()
->columns(['owner_id'])
->orderBy('RAND()')
->limit($limit)
->execute();
$createTime = strtotime('monday this week');
return $this->findAuthorRankings($createTime, $limit);
}
/**
* @param int $limit
* @return ResultsetInterface|Resultset
*/
protected function findWeeklyAuthorRankings($limit = 10)
protected function findMonthlyAuthorRankings($limit = 10)
{
$createTime = strtotime('monday this week');
$createTime = strtotime(date('Y-m-01'));
return $this->findAuthorRankings($createTime, $limit);
}
/**
* @param int $limit
* @return ResultsetInterface|Resultset
*/
protected function findYearlyAuthorRankings($limit = 10)
{
$createTime = strtotime(date('Y-01-01'));
return $this->findAuthorRankings($createTime, $limit);
}
/**
* @param int $limit
* @return ResultsetInterface|Resultset
*/
protected function findFullyAuthorRankings($limit = 10)
{
$createTime = 0;
return $this->findAuthorRankings($createTime, $limit);
}
/**
* @param int $createTime
* @param int $limit
* @return ResultsetInterface|Resultset
*/
protected function findAuthorRankings($createTime, $limit = 10)
{
$columns = [
'author_id' => 'a.owner_id',
'like_count' => 'count(al.user_id)',
@ -97,8 +141,8 @@ class TopAnswererList extends Cache
return $this->modelsManager->createBuilder()
->columns($columns)
->addFrom(ArticleLikeModel::class, 'al')
->join(ArticleModel::class, 'al.article_id = a.id', 'a')
->addFrom(AnswerLikeModel::class, 'al')
->join(AnswerModel::class, 'al.answer_id = a.id', 'a')
->where('al.create_time > :create_time:', ['create_time' => $createTime])
->groupBy('author_id')
->orderBy('like_count DESC')

2
app/Console/Tasks/SyncAppInfoTask.php
View File

@ -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');

3
app/Http/Admin/Views/help/list.volt
View File

@ -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">

2
app/Http/Admin/Views/index/main_team_info.volt
View File

@ -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>

4
app/Http/Admin/Views/page/list.volt
View File

@ -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">

2
app/Http/Admin/Views/setting/pay_alipay.volt
View File

@ -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 %}

2
app/Http/Admin/Views/setting/pay_wxpay.volt
View File

@ -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 %}

2
app/Http/Home/Controllers/TeacherController.php
View File

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

3
app/Http/Home/Views/chapter/vod.volt
View File

@ -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>

9
app/Http/Home/Views/partials/header.volt
View File

@ -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 %}
{{ image(site_info.logo,false) }}
{% else %}
{{ image('logo.png') }}
{% endif %}
<a href="{{ logo_link }}">{{ logo_img }}</a>
</div>
<div class="top-nav">

2
app/Http/Home/Views/teacher/list.volt
View File

@ -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>

33
app/Http/Home/Views/widget/top_answerers.volt
View File

@ -1,27 +1,24 @@
{% if questions|length > 0 %}
{% if answerers|length > 0 %}
<div class="layui-card">
<div class="layui-card-header">热门问题</div>
<div class="layui-card-header">热门答主</div>
<div class="layui-card-body">
{% for item in questions %}
{% set url = url({'for':'home.question.show','id':item.id}) %}
{% set rank = loop.index %}
<div class="sidebar-rank-card">
<div class="rank">
{% if rank == 1 %}
<span class="layui-badge layui-bg-red">{{ rank }}</span>
{% elseif rank == 2 %}
<span class="layui-badge layui-bg-blue">{{ rank }}</span>
{% elseif rank == 3 %}
<span class="layui-badge layui-bg-green">{{ rank }}</span>
{% else %}
<span class="layui-badge layui-bg-gray">{{ rank }}</span>
{% endif %}
<div class="sidebar-user-list">
{% for author in answerers %}
{% set author.title = author.title ? author.title : '暂露头角' %}
{% set author_url = url({'for':'home.user.show','id':author.id}) %}
<div class="sidebar-user-card">
<div class="avatar">
<img src="{{ author.avatar }}!avatar_160" alt="{{ author.name }}">
</div>
<div class="title">
<a href="{{ url }}">{{ item.title }}</a>
<div class="info">
<div class="name layui-elip">
<a href="{{ author_url }}" title="{{ author.about }}" target="_blank">{{ author.name }}</a>
</div>
<div class="title layui-elip">{{ author.title }}</div>
</div>
</div>
{% endfor %}
</div>
</div>
</div>
{% endif %}

2
app/Library/AppInfo.php
View File

@ -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)
{

2
app/Library/Paginator/Query.php
View File

@ -64,7 +64,7 @@ class Query
$value = $this->filter->sanitize($value, ['trim', 'string']);
if ($whitelist && !in_array($value, $whitelist)) {
unset($params[$key]);
} elseif (strlen($value) == 0) {
} elseif (!is_array($value) && strlen($value) == 0) {
unset($params[$key]);
}
}

41
app/Listeners/Help.php Normal file
View File

@ -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)
{
}
}

41
app/Listeners/Page.php Normal file
View File

@ -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)
{
}
}

7
app/Models/Help.php
View File

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

12
app/Models/Notification.php
View File

@ -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();
}
}

7
app/Models/Page.php
View File

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

7
app/Models/User.php
View File

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

1
app/Services/Logic/Help/HelpInfo.php
View File

@ -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,
];

12
app/Services/Logic/Page/PageInfo.php
View File

@ -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();
}
}

12
app/Services/Logic/User/Console/NotifyStats.php
View File

@ -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' => $noticeCount];
}
protected function getNoticeCount($userId)
{
$userRepo = new UserRepo();
return $userRepo->countUnreadNotifications($userId);
return ['notice_count' => $user->notice_count];
}
}

1471
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

8
config/events.php
View File

@ -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,
];

2
db/migrations/20210403184518.php
View File

@ -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',

75
db/migrations/20221021035953.php Normal file
View File

@ -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();
}
}

22
public/static/home/css/common.css
View File

@ -1328,6 +1328,8 @@
width: 760px;
height: 428px;
margin-bottom: 20px;
background: black;
position: relative;
}
.dplayer {
@ -1335,6 +1337,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;
}

4
public/static/home/css/content.css
View File

@ -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;

8
public/static/home/js/chapter.live.player.js
View File

@ -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);

8
public/static/home/js/chapter.vod.player.js
View File

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

4
public/static/home/js/common.js
View File

@ -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);

2
public/static/home/js/question.list.js
View File

@ -6,7 +6,7 @@ layui.use(['jquery', 'helper'], function () {
var $questionList = $('#question-list');
var $sidebarMyTags = $('#sidebar-my-tags');
var $sidebarHotQuestions = $('#sidebar-hot-questions');
var $sidebarTopAnswerers = $('#sidebar-top-answerer');
var $sidebarTopAnswerers = $('#sidebar-top-answerers');
if ($questionList.length > 0) {
helper.ajaxLoadHtml($questionList.data('url'), $questionList.attr('id'));