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

查漏补缺

Browse Source
This commit is contained in:
koogua 2021-02-25 20:57:39 +08:00
parent 2a0a039da6
commit 156b28b79e
92 changed files with 824 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CHANGELOG.md
View File

@ -1,3 +1,24 @@
### [v1.2.7](https://gitee.com/koogua/course-tencent-cloud/releases/v1.2.7)(2021-02-26)
### 新增
- 钉钉机器人群消息通知
- demo分支重置演示帐号计划任务
- 添加学员自动加入相关课程群组
- 后台查看积分记录
### 更新
- 路由重命名 admin.group -> admin.im_group
- 路由重命名 home.group -> home.im_group
- 样式重命名 sidebar-teacher-card -> sidebar-user-card
- 去除顶部积分导航
- 用户中心部分样式调整
- 后台部分导航调整
- 不能删除课程教师问题
- 积分模块可通过后台控制是否启用
- 解除好友关系后好友数量未递减
### [v1.2.6](https://gitee.com/koogua/course-tencent-cloud/releases/v1.2.6)(2021-02-20)
### 新增

18
app/Console/Tasks/NoticeTask.php
View File

@ -91,63 +91,63 @@ class NoticeTask extends Task
{
$notice = new AccountLoginNotice();
return $notice->handleTask($task);
$notice->handleTask($task);
}
protected function handleLiveBeginNotice(TaskModel $task)
{
$notice = new LiveBeginNotice();
return $notice->handleTask($task);
$notice->handleTask($task);
}
protected function handleOrderFinishNotice(TaskModel $task)
{
$notice = new OrderFinishNotice();
return $notice->handleTask($task);
$notice->handleTask($task);
}
protected function handleRefundFinishNotice(TaskModel $task)
{
$notice = new RefundFinishNotice();
return $notice->handleTask($task);
$notice->handleTask($task);
}
protected function handleConsultReplyNotice(TaskModel $task)
{
$notice = new ConsultReplyNotice();
return $notice->handleTask($task);
$notice->handleTask($task);
}
protected function handleConsultCreateNotice(TaskModel $task)
{
$notice = new ConsultCreateNotice();
return $notice->handleTask($task);
$notice->handleTask($task);
}
protected function handleTeacherLiveNotice(TaskModel $task)
{
$notice = new TeacherLiveNotice();
return $notice->handleTask($task);
$notice->handleTask($task);
}
protected function handleServerMonitorNotice(TaskModel $task)
{
$notice = new ServerMonitorNotice();
return $notice->handleTask($task);
$notice->handleTask($task);
}
protected function handleCustomServiceNotice(TaskModel $task)
{
$notice = new CustomServiceNotice();
return $notice->handleTask($task);
$notice->handleTask($task);
}
/**

58
app/Console/Tasks/ServerMonitorTask.php
View File

@ -3,7 +3,6 @@
namespace App\Console\Tasks;
use App\Library\Benchmark;
use App\Library\Utils\ServerInfo;
use App\Models\User as UserModel;
use App\Services\DingTalk\Notice\ServerMonitor as ServerMonitorNotice;
use App\Services\Search\UserSearcher;
@ -19,12 +18,13 @@ class ServerMonitorTask extends Task
if ($robot['enabled'] == 0) return;
$items = [
'cpu' => $this->checkCPU(),
'cpu' => $this->checkCpu(),
'memory' => $this->checkMemory(),
'disk' => $this->checkDisk(),
'mysql' => $this->checkMysql(),
'redis' => $this->checkRedis(),
'xunsearch' => $this->checkXunSearch(),
'websocket' => $this->checkWebSocket(),
'xunsearch' => $this->checkXunsearch(),
'websocket' => $this->checkWebsocket(),
];
foreach ($items as $key => $value) {
@ -42,23 +42,53 @@ class ServerMonitorTask extends Task
$notice->createTask($content);
}
protected function checkCPU()
protected function checkCpu()
{
$coreCount = $this->getCpuCount();
$cpuCount = $this->getCpuCount();
$cpu = ServerInfo::cpu();
$load = sys_getloadavg();
if ($cpu[1] > $coreCount * 0.8) {
return sprintf("cpu负载超过%s", $cpu[1]);
if ($load[1] > $cpuCount * 0.8) {
return sprintf("cpu负载超过%s", $load[1]);
}
}
protected function checkMemory()
{
$memInfo = file_get_contents('/proc/meminfo');
$total = null;
if (preg_match('/MemTotal\:\s+(\d+) kB/', $memInfo, $totalMatches)) {
$total = $totalMatches[1];
}
if ($total === null) return;
$available = null;
if (preg_match('/MemAvailable\:\s+(\d+) kB/', $memInfo, $avaMatches)) {
$available = $avaMatches[1];
}
if ($available === null) return;
$left = 100 * ($available / $total);
if ($left < 20) {
return sprintf("memory剩余不足%s%%", round($left));
}
}
protected function checkDisk()
{
$disk = ServerInfo::disk();
$free = disk_free_space('/');
$total = disk_total_space('/');
if ($disk['percent'] > 80) {
return sprintf("disk空间超过%s%%", $disk['percent']);
$left = 100 * $free / $total;
if ($left < 20) {
return sprintf("disk剩余不足%s%%", round($left));
}
}
@ -116,7 +146,7 @@ class ServerMonitorTask extends Task
}
}
protected function checkXunSearch()
protected function checkXunsearch()
{
try {
@ -145,7 +175,7 @@ class ServerMonitorTask extends Task
}
}
protected function checkWebSocket()
protected function checkWebsocket()
{
try {

4
app/Http/Admin/Controllers/CourseController.php
View File

@ -33,9 +33,13 @@ class CourseController extends Controller
$xmCategories = $courseService->getXmCategories(0);
$xmTeachers = $courseService->getXmTeachers(0);
$modelTypes = $courseService->getModelTypes();
$levelTypes = $courseService->getLevelTypes();
$this->view->setVar('xm_categories', $xmCategories);
$this->view->setVar('xm_teachers', $xmTeachers);
$this->view->setVar('model_types', $modelTypes);
$this->view->setVar('level_types', $levelTypes);
}
/**

25
app/Http/Admin/Controllers/ImGroupController.php
View File

@ -11,7 +11,7 @@ class ImGroupController extends Controller
{
/**
* @Get("/list", name="admin.group.list")
* @Get("/list", name="admin.im_group.list")
*/
public function listAction()
{
@ -25,15 +25,20 @@ class ImGroupController extends Controller
}
/**
* @Get("/search", name="admin.group.search")
* @Get("/search", name="admin.im_group.search")
*/
public function searchAction()
{
$groupService = new ImGroupService();
$types = $groupService->getGroupTypes();
$this->view->pick('im/group/search');
$this->view->setVar('types', $types);
}
/**
* @Get("/add", name="admin.group.add")
* @Get("/add", name="admin.im_group.add")
*/
public function addAction()
{
@ -41,7 +46,7 @@ class ImGroupController extends Controller
}
/**
* @Get("/{id:[0-9]+}/edit", name="admin.group.edit")
* @Get("/{id:[0-9]+}/edit", name="admin.im_group.edit")
*/
public function editAction($id)
{
@ -55,7 +60,7 @@ class ImGroupController extends Controller
}
/**
* @Post("/create", name="admin.group.create")
* @Post("/create", name="admin.im_group.create")
*/
public function createAction()
{
@ -64,7 +69,7 @@ class ImGroupController extends Controller
$group = $groupService->createGroup();
$location = $this->url->get([
'for' => 'admin.group.edit',
'for' => 'admin.im_group.edit',
'id' => $group->id,
]);
@ -77,7 +82,7 @@ class ImGroupController extends Controller
}
/**
* @Post("/{id:[0-9]+}/update", name="admin.group.update")
* @Post("/{id:[0-9]+}/update", name="admin.im_group.update")
*/
public function updateAction($id)
{
@ -85,7 +90,7 @@ class ImGroupController extends Controller
$groupService->updateGroup($id);
$location = $this->url->get(['for' => 'admin.group.list']);
$location = $this->url->get(['for' => 'admin.im_group.list']);
$content = [
'location' => $location,
@ -96,7 +101,7 @@ class ImGroupController extends Controller
}
/**
* @Post("/{id:[0-9]+}/delete", name="admin.group.delete")
* @Post("/{id:[0-9]+}/delete", name="admin.im_group.delete")
*/
public function deleteAction($id)
{
@ -115,7 +120,7 @@ class ImGroupController extends Controller
}
/**
* @Post("/{id:[0-9]+}/restore", name="admin.group.restore")
* @Post("/{id:[0-9]+}/restore", name="admin.im_group.restore")
*/
public function restoreAction($id)
{

6
app/Http/Admin/Controllers/OrderController.php
View File

@ -15,7 +15,13 @@ class OrderController extends Controller
*/
public function searchAction()
{
$orderService = new OrderService();
$itemTypes = $orderService->getItemTypes();
$statusTypes = $orderService->getStatusTypes();
$this->view->setVar('item_types', $itemTypes);
$this->view->setVar('status_types', $statusTypes);
}
/**

40
app/Http/Admin/Controllers/PointHistoryController.php Normal file
View File

@ -0,0 +1,40 @@
<?php
namespace App\Http\Admin\Controllers;
use App\Http\Admin\Services\PointHistory as PointHistoryService;
/**
* @RoutePrefix("/admin/point/history")
*/
class PointHistoryController extends Controller
{
/**
* @Get("/search", name="admin.point_history.search")
*/
public function searchAction()
{
$historyService = new PointHistoryService();
$eventTypes = $historyService->getEventTypes();
$this->view->pick('point/history/search');
$this->view->setVar('event_types', $eventTypes);
}
/**
* @Get("/list", name="admin.point_history.list")
*/
public function listAction()
{
$historyService = new PointHistoryService();
$pager = $historyService->getHistories();
$this->view->pick('point/history/list');
$this->view->setVar('pager', $pager);
}
}

4
app/Http/Admin/Controllers/RefundController.php
View File

@ -15,7 +15,11 @@ class RefundController extends Controller
*/
public function searchAction()
{
$refundService = new RefundService();
$statusTypes = $refundService->getStatusTypes();
$this->view->setVar('status_types', $statusTypes);
}
/**

4
app/Http/Admin/Controllers/StudentController.php
View File

@ -15,7 +15,11 @@ class StudentController extends Controller
*/
public function searchAction()
{
$studentService = new StudentService();
$sourceTypes = $studentService->getSourceTypes();
$this->view->setVar('source_types', $sourceTypes);
}
/**

8
app/Http/Admin/Controllers/TopicController.php
View File

@ -22,6 +22,14 @@ class TopicController extends Controller
$this->view->setVar('pager', $pager);
}
/**
* @Get("/search", name="admin.topic.search")
*/
public function searchAction()
{
}
/**
* @Get("/add", name="admin.topic.add")
*/

6
app/Http/Admin/Controllers/TradeController.php
View File

@ -15,7 +15,13 @@ class TradeController extends Controller
*/
public function searchAction()
{
$tradeService = new TradeService();
$channelTypes = $tradeService->getChannelTypes();
$statusTypes = $tradeService->getStatusTypes();
$this->view->setVar('channel_types', $channelTypes);
$this->view->setVar('status_types', $statusTypes);
}
/**

14
app/Http/Admin/Controllers/UserController.php
View File

@ -18,9 +18,11 @@ class UserController extends Controller
{
$userService = new UserService();
$roles = $userService->getRoles();
$eduRoleTypes = $userService->getEduRoleTypes();
$adminRoles = $userService->getAdminRoles();
$this->view->setVar('roles', $roles);
$this->view->setVar('edu_role_types', $eduRoleTypes);
$this->view->setVar('admin_roles', $adminRoles);
}
/**
@ -42,9 +44,9 @@ class UserController extends Controller
{
$userService = new UserService();
$roles = $userService->getRoles();
$adminRoles = $userService->getAdminRoles();
$this->view->setVar('roles', $roles);
$this->view->setVar('admin_roles', $adminRoles);
}
/**
@ -81,7 +83,7 @@ class UserController extends Controller
$user = $userService->getUser($id);
$account = $userService->getAccount($id);
$roles = $userService->getRoles();
$adminRoles = $userService->getAdminRoles();
if ($user->admin_role == RoleModel::ROLE_ROOT) {
$this->response->redirect(['for' => 'admin.user.list']);
@ -89,7 +91,7 @@ class UserController extends Controller
$this->view->setVar('user', $user);
$this->view->setVar('account', $account);
$this->view->setVar('roles', $roles);
$this->view->setVar('admin_roles', $adminRoles);
}
/**

22
app/Http/Admin/Services/AuthNode.php
View File

@ -149,6 +149,12 @@ class AuthNode extends Service
'type' => 'menu',
'route' => 'admin.topic.list',
],
[
'id' => '1-4-5',
'title' => '搜索话题',
'type' => 'menu',
'route' => 'admin.topic.search',
],
[
'id' => '1-4-2',
'title' => '添加话题',
@ -349,31 +355,31 @@ class AuthNode extends Service
'id' => '2-4-1',
'title' => '群组列表',
'type' => 'menu',
'route' => 'admin.group.list',
'route' => 'admin.im_group.list',
],
[
'id' => '2-4-2',
'title' => '搜索群组',
'type' => 'menu',
'route' => 'admin.group.search',
'route' => 'admin.im_group.search',
],
[
'id' => '2-4-3',
'title' => '添加群组',
'type' => 'menu',
'route' => 'admin.group.add',
'route' => 'admin.im_group.add',
],
[
'id' => '2-4-4',
'title' => '编辑群组',
'type' => 'button',
'route' => 'admin.group.edit',
'route' => 'admin.im_group.edit',
],
[
'id' => '2-4-5',
'title' => '删除群组',
'type' => 'button',
'route' => 'admin.group.delete',
'route' => 'admin.im_group.delete',
],
],
],
@ -493,6 +499,12 @@ class AuthNode extends Service
'type' => 'menu',
'route' => 'admin.point_redeem.list',
],
[
'id' => '2-8-6',
'title' => '积分记录',
'type' => 'menu',
'route' => 'admin.point_history.list',
],
[
'id' => '2-8-3',
'title' => '添加礼品',

10
app/Http/Admin/Services/Course.php
View File

@ -232,6 +232,16 @@ class Course extends Service
return $course;
}
public function getModelTypes()
{
return CourseModel::modelTypes();
}
public function getLevelTypes()
{
return CourseModel::levelTypes();
}
public function getStudyExpiryOptions()
{
return CourseModel::studyExpiryOptions();

5
app/Http/Admin/Services/ImGroup.php
View File

@ -14,6 +14,11 @@ use App\Validators\ImGroup as ImGroupValidator;
class ImGroup extends Service
{
public function getGroupTypes()
{
return ImGroupModel::types();
}
public function getGroups()
{
$pagerQuery = new PagerQuery();

11
app/Http/Admin/Services/Order.php
View File

@ -4,6 +4,7 @@ namespace App\Http\Admin\Services;
use App\Builders\OrderList as OrderListBuilder;
use App\Library\Paginator\Query as PaginateQuery;
use App\Models\Order as OrderModel;
use App\Repos\Account as AccountRepo;
use App\Repos\Order as OrderRepo;
use App\Repos\User as UserRepo;
@ -12,6 +13,16 @@ use App\Validators\Order as OrderValidator;
class Order extends Service
{
public function getItemTypes()
{
return OrderModel::itemTypes();
}
public function getStatusTypes()
{
return OrderModel::statusTypes();
}
public function getOrders()
{
$pageQuery = new PaginateQuery();

32
app/Http/Admin/Services/PointHistory.php Normal file
View File

@ -0,0 +1,32 @@
<?php
namespace App\Http\Admin\Services;
use App\Library\Paginator\Query as PagerQuery;
use App\Models\PointHistory as PointHistoryModel;
use App\Repos\PointHistory as PointHistoryRepo;
class PointHistory extends Service
{
public function getHistories()
{
$pagerQuery = new PagerQuery();
$params = $pagerQuery->getParams();
$sort = $pagerQuery->getSort();
$page = $pagerQuery->getPage();
$limit = $pagerQuery->getLimit();
$historyRepo = new PointHistoryRepo();
return $historyRepo->paginate($params, $sort, $page, $limit);
}
public function getEventTypes()
{
return PointHistoryModel::eventTypes();
}
}

5
app/Http/Admin/Services/Refund.php
View File

@ -16,6 +16,11 @@ use App\Validators\Refund as RefundValidator;
class Refund extends Service
{
public function getStatusTypes()
{
return RefundModel::statusTypes();
}
public function getRefunds()
{
$pageQuery = new PaginateQuery();

46
app/Http/Admin/Services/Student.php
View File

@ -7,9 +7,11 @@ use App\Builders\LearningList as LearningListBuilder;
use App\Library\Paginator\Query as PagerQuery;
use App\Models\Course as CourseModel;
use App\Models\CourseUser as CourseUserModel;
use App\Models\ImGroupUser as ImGroupUserModel;
use App\Models\User as UserModel;
use App\Repos\Course as CourseRepo;
use App\Repos\CourseUser as CourseUserRepo;
use App\Repos\ImGroupUser as ImGroupUserRepo;
use App\Repos\Learning as LearningRepo;
use App\Repos\User as UserRepo;
use App\Validators\CourseUser as CourseUserValidator;
@ -17,6 +19,11 @@ use App\Validators\CourseUser as CourseUserValidator;
class Student extends Service
{
public function getSourceTypes()
{
return CourseUserModel::sourceTypes();
}
public function getCourse($id)
{
$repo = new CourseRepo();
@ -100,9 +107,13 @@ class Student extends Service
$courseUser->create($data);
$this->incrCourseUserCount($course);
$course->user_count += 1;
$course->update();
$this->incrUserCourseCount($user);
$user->course_count += 1;
$user->update();
$this->handleImGroupUser($course, $user);
return $courseUser;
}
@ -126,18 +137,33 @@ class Student extends Service
return $relation;
}
protected function incrCourseUserCount(CourseModel $course)
protected function handleImGroupUser(CourseModel $course, UserModel $user)
{
$course->user_count += 1;
$courseRepo = new CourseRepo();
$course->update();
}
$imGroup = $courseRepo->findImGroup($course->id);
protected function incrUserCourseCount(UserModel $user)
{
$user->course_count += 1;
$userRepo = new UserRepo();
$user->update();
$imUser = $userRepo->findImUser($user->id);
$imGroupUserRepo = new ImGroupUserRepo();
$imGroupUser = $imGroupUserRepo->findGroupUser($imGroup->id, $user->id);
if ($imGroupUser) return;
$imGroupUser = new ImGroupUserModel();
$imGroupUser->group_id = $imGroup->id;
$imGroupUser->user_id = $imUser->id;
$imGroupUser->create();
$imUser->group_count += 1;
$imUser->update();
$imGroup->user_count += 1;
$imGroup->update();
}
protected function findOrFail($id)

11
app/Http/Admin/Services/Trade.php
View File

@ -5,6 +5,7 @@ namespace App\Http\Admin\Services;
use App\Builders\TradeList as TradeListBuilder;
use App\Library\Paginator\Query as PaginateQuery;
use App\Models\Refund as RefundModel;
use App\Models\Trade as TradeModel;
use App\Repos\Account as AccountRepo;
use App\Repos\Order as OrderRepo;
use App\Repos\Trade as TradeRepo;
@ -14,6 +15,16 @@ use App\Validators\Trade as TradeValidator;
class Trade extends Service
{
public function getChannelTypes()
{
return TradeModel::channelTypes();
}
public function getStatusTypes()
{
return TradeModel::statusTypes();
}
public function getTrades()
{
$pageQuery = new PaginateQuery();

7
app/Http/Admin/Services/User.php
View File

@ -18,7 +18,12 @@ use App\Validators\User as UserValidator;
class User extends Service
{
public function getRoles()
public function getEduRoleTypes()
{
return UserModel::eduRoleTypes();
}
public function getAdminRoles()
{
$roleRepo = new RoleRepo();

7
app/Http/Admin/Views/audit/list.volt
View File

@ -2,12 +2,19 @@
{% block content %}
{% set search_url = url({'for':'admin.audit.search'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
<a><cite>操作记录</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ search_url }}">
<i class="layui-icon layui-icon-search"></i>搜索记录
</a>
</div>
</div>
<table class="layui-table kg-table">

9
app/Http/Admin/Views/consult/list.volt
View File

@ -4,10 +4,12 @@
{%- macro private_info(value) %}
{% if value == 1 %}
<span class="layui-badge">密</span>
<span class="layui-badge">私密</span>
{% endif %}
{%- endmacro %}
{% set search_url = url({'for':'admin.consult.search'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
@ -18,6 +20,11 @@
<a><cite>咨询管理</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ search_url }}">
<i class="layui-icon layui-icon-search"></i>搜索咨询
</a>
</div>
</div>
<table class="layui-table kg-table layui-form">

11
app/Http/Admin/Views/course/list.volt
View File

@ -44,12 +44,23 @@
{% endif %}
{%- endmacro %}
{% set add_url = url({'for':'admin.course.add'}) %}
{% set search_url = url({'for':'admin.course.search'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
<a><cite>课程管理</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ add_url }}">
<i class="layui-icon layui-icon-add-1"></i>添加课程
</a>
<a class="layui-btn layui-btn-sm" href="{{ search_url }}">
<i class="layui-icon layui-icon-search"></i>搜索课程
</a>
</div>
</div>
<table class="layui-table kg-table layui-form">

13
app/Http/Admin/Views/course/search.volt
View File

@ -33,18 +33,17 @@
<div class="layui-form-item">
<label class="layui-form-label">模型</label>
<div class="layui-input-block">
<input type="radio" name="model" value="1" title="点播">
<input type="radio" name="model" value="2" title="直播">
<input type="radio" name="model" value="3" title="专栏">
{% for value,title in model_types %}
<input type="radio" name="model" value="{{ value }}" title="{{ title }}">
{% endfor %}
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">难度</label>
<div class="layui-input-block">
<input type="radio" name="level" value="1" title="入门">
<input type="radio" name="level" value="2" title="初级">
<input type="radio" name="level" value="3" title="中级">
<input type="radio" name="level" value="4" title="高级">
{% for value,title in level_types %}
<input type="radio" name="level" value="{{ value }}" title="{{ title }}">
{% endfor %}
</div>
</div>
<div class="layui-form-item">

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

@ -2,12 +2,19 @@
{% block content %}
{% set add_url = url({'for':'admin.help.add'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
<a><cite>帮助管理</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ add_url }}">
<i class="layui-icon layui-icon-add-1"></i>添加帮助
</a>
</div>
</div>
<table class="kg-table layui-table layui-form">

2
app/Http/Admin/Views/im/group/add.volt
View File

@ -2,7 +2,7 @@
{% block content %}
<form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.group.create'}) }}">
<form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.im_group.create'}) }}">
<fieldset class="layui-elem-field layui-field-title">
<legend>添加群组</legend>
</fieldset>

2
app/Http/Admin/Views/im/group/edit.volt
View File

@ -2,7 +2,7 @@
{% block content %}
<form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.group.update','id':group.id}) }}">
<form class="layui-form kg-form" method="POST" action="{{ url({'for':'admin.im_group.update','id':group.id}) }}">
<fieldset class="layui-elem-field layui-field-title">
<legend>编辑群组</legend>
</fieldset>

21
app/Http/Admin/Views/im/group/list.volt
View File

@ -22,12 +22,23 @@
{% endif %}
{%- endmacro %}
{% set add_url = url({'for':'admin.im_group.add'}) %}
{% set search_url = url({'for':'admin.im_group.search'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
<a><cite>群组管理</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ add_url }}">
<i class="layui-icon layui-icon-add-1"></i>添加群组
</a>
<a class="layui-btn layui-btn-sm" href="{{ search_url }}">
<i class="layui-icon layui-icon-search"></i>搜索群组
</a>
</div>
</div>
<table class="kg-table layui-table layui-form">
@ -51,11 +62,11 @@
</thead>
<tbody>
{% for item in pager.items %}
{% set preview_url = url({'for':'home.group.show','id':item.id}) %}
{% set edit_url = url({'for':'admin.group.edit','id':item.id}) %}
{% set update_url = url({'for':'admin.group.update','id':item.id}) %}
{% set delete_url = url({'for':'admin.group.delete','id':item.id}) %}
{% set restore_url = url({'for':'admin.group.restore','id':item.id}) %}
{% set preview_url = url({'for':'home.im_group.show','id':item.id}) %}
{% set edit_url = url({'for':'admin.im_group.edit','id':item.id}) %}
{% set update_url = url({'for':'admin.im_group.update','id':item.id}) %}
{% set delete_url = url({'for':'admin.im_group.delete','id':item.id}) %}
{% set restore_url = url({'for':'admin.im_group.restore','id':item.id}) %}
<tr>
<td>{{ item.id }}</td>
<td><a href="{{ edit_url }}">{{ item.name }}</a> {{ type_info(item.type) }}</td>

8
app/Http/Admin/Views/im/group/search.volt
View File

@ -2,7 +2,7 @@
{% block content %}
<form class="layui-form kg-form" method="GET" action="{{ url({'for':'admin.group.list'}) }}">
<form class="layui-form kg-form" method="GET" action="{{ url({'for':'admin.im_group.list'}) }}">
<fieldset class="layui-elem-field layui-field-title">
<legend>搜索群组</legend>
</fieldset>
@ -33,9 +33,9 @@
<div class="layui-form-item">
<label class="layui-form-label">类型</label>
<div class="layui-input-block">
<input type="radio" name="type" value="1" title="课程">
<input type="radio" name="type" value="2" title="聊天">
<input type="radio" name="type" value="3" title="职工">
{% for value,title in types %}
<input type="radio" name="type" value="{{ value }}" title="{{ title }}">
{% endfor %}
</div>
</div>
<div class="layui-form-item">

10
app/Http/Admin/Views/macros/point.volt
View File

@ -18,6 +18,14 @@
{% endif %}
{%- endmacro %}
{%- macro event_point_info(value) %}
{% if value > 0 %}
<span class="layui-badge layui-bg-green">+{{ value }}</span>
{% else %}
<span class="layui-badge layui-bg-red">{{ value }}</span>
{% endif %}
{%- endmacro %}
{%- macro event_type_info(value) %}
{% if value == 1 %}
<span class="type">订单消费</span>
@ -38,7 +46,7 @@
{% endif %}
{%- endmacro %}
{%- macro event_detail_info(history) %}
{%- macro event_item_info(history) %}
{% set event_info = history.event_info %}
{% if history.event_type == 1 %}
<p class="order">{{ event_info.order.subject }}</p>

7
app/Http/Admin/Views/order/list.volt
View File

@ -4,12 +4,19 @@
{{ partial('order/macro') }}
{% set search_url = url({'for':'admin.order.search'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
<a><cite>订单管理</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ search_url }}">
<i class="layui-icon layui-icon-search"></i>搜索订单
</a>
</div>
</div>
<table class="layui-table kg-table">

16
app/Http/Admin/Views/order/search.volt
View File

@ -21,21 +21,17 @@
<div class="layui-form-item">
<label class="layui-form-label">订单类型</label>
<div class="layui-input-block">
<input type="radio" name="item_type" value="1" title="课程">
<input type="radio" name="item_type" value="2" title="套餐">
<input type="radio" name="item_type" value="3" title="赞赏">
<input type="radio" name="item_type" value="4" title="会员">
<input type="radio" name="item_type" value="99" title="测试">
{% for value,title in item_types %}
<input type="radio" name="item_type" value="{{ value }}" title="{{ title }}">
{% endfor %}
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">订单状态</label>
<div class="layui-input-block">
<input type="radio" name="status" value="1" title="待支付">
<input type="radio" name="status" value="2" title="发货中">
<input type="radio" name="status" value="3" title="已完成">
<input type="radio" name="status" value="4" title="已关闭">
<input type="radio" name="status" value="5" title="已退款">
{% for value,title in status_types %}
<input type="radio" name="status" value="{{ value }}" title="{{ title }}">
{% endfor %}
</div>
</div>
<div class="layui-form-item">

11
app/Http/Admin/Views/package/list.volt
View File

@ -2,12 +2,23 @@
{% block content %}
{% set add_url = url({'for':'admin.package.add'}) %}
{% set search_url = url({'for':'admin.package.search'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
<a><cite>套餐管理</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ add_url }}">
<i class="layui-icon layui-icon-add-1"></i>添加套餐
</a>
<a class="layui-btn layui-btn-sm" href="{{ search_url }}">
<i class="layui-icon layui-icon-search"></i>搜索套餐
</a>
</div>
</div>
<table class="layui-table kg-table layui-form">

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

@ -2,12 +2,19 @@
{% block content %}
{% set add_url = url({'for':'admin.page.add'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
<a><cite>单页管理</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ add_url }}">
<i class="layui-icon layui-icon-add-1"></i>添加单页
</a>
</div>
</div>
<table class="layui-table kg-table layui-form">

55
app/Http/Admin/Views/point/history/list.volt Normal file
View File

@ -0,0 +1,55 @@
{% extends 'templates/main.volt' %}
{% block content %}
{{ partial('macros/point') }}
{% set search_url = url({'for':'admin.point_history.search'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
<a><cite>积分记录</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ search_url }}">
<i class="layui-icon layui-icon-search"></i>搜索积分
</a>
</div>
</div>
<table class="layui-table" lay-size="lg">
<colgroup>
<col>
<col>
<col>
<col>
<col>
</colgroup>
<thead>
<tr>
<th>用户</th>
<th>积分</th>
<th>来源</th>
<th>详情</th>
<th>时间</th>
</tr>
</thead>
<tbody>
{% for item in pager.items %}
{% set user_filter_url = url({'for':'admin.point_history.list'},{'user_id':item.user_id}) %}
<tr>
<td><a href="{{ user_filter_url }}">{{ item.user_name }}</a>（{{ item.user_id }}）</td>
<td>{{ event_point_info(item.event_point) }}</td>
<td>{{ event_type_info(item.event_type) }}</td>
<td>{{ event_item_info(item) }}</td>
<td>{{ date('Y-m-d H:i:s',item.create_time) }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{{ partial('partials/pager') }}
{% endblock %}

38
app/Http/Admin/Views/point/history/search.volt Normal file
View File

@ -0,0 +1,38 @@
{% extends 'templates/main.volt' %}
{% block content %}
<form class="layui-form kg-form" method="GET" action="{{ url({'for':'admin.point_history.list'}) }}">
<fieldset class="layui-elem-field layui-field-title">
<legend>搜索积分</legend>
</fieldset>
<div class="layui-form-item">
<label class="layui-form-label">用户编号</label>
<div class="layui-input-block">
<input class="layui-input" type="text" name="user_id" placeholder="用户编号精确匹配">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">事件编号</label>
<div class="layui-input-block">
<input class="layui-input" type="text" name="event_id" placeholder="事件编号精确匹配">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">事件类型</label>
<div class="layui-input-block">
{% for value,title in event_types %}
<input type="radio" name="event_type" value="{{ value }}" title="{{ title }}">
{% endfor %}
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"></label>
<div class="layui-input-block">
<button class="layui-btn" lay-submit="true">提交</button>
<button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
</div>
</div>
</form>
{% endblock %}

19
app/Http/Admin/Views/point/redeem/list.volt
View File

@ -43,9 +43,10 @@
{% set gift_url = url({'for':'home.point_gift.show','id':item.gift_id}) %}
<tr>
<td>
<p><a href="{{ gift_url }}" target="_blank">{{ item.gift_name }}（{{ item.gift_id }}）</a>{{ gift_type_info(item.gift_type) }}</p>
<p>用户名称：<a href="{{ user_filter_url }}">{{ item.user_name }}</a> （{{ item.user_id }}） 联系方式：
<button class="layui-btn layui-btn-xs kg-contact" data-name="{{ item.contact_name }}" data-phone="{{ item.contact_phone }}" data-address="{{ item.contact_address }}">查看</button>
<p><a href="{{ gift_url }}" target="_blank">{{ item.gift_name }}</a>（{{ item.gift_id }}）{{ gift_type_info(item.gift_type) }}</p>
<p>
用户名称：<a href="{{ user_filter_url }}">{{ item.user_name }}</a>（{{ item.user_id }}）
联系方式：<a href="javascript:" class="layui-badge layui-bg-green kg-contact" data-name="{{ item.contact_name }}" data-phone="{{ item.contact_phone }}" data-address="{{ item.contact_address }}">查看</a>
</p>
</td>
<td>{{ item.gift_point }}</td>
@ -67,6 +68,12 @@
{% endblock %}
{% block include_js %}
{{ js_include('admin/js/contact.js') }}
{% endblock %}
{% block inline_js %}
<script>
@ -91,10 +98,4 @@
</script>
{% endblock %}
{% block include_js %}
{{ js_include('admin/js/contact.js') }}
{% endblock %}

7
app/Http/Admin/Views/refund/list.volt
View File

@ -4,12 +4,19 @@
{{ partial('refund/macro') }}
{% set search_url = url({'for':'admin.refund.search'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
<a><cite>退款管理</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ search_url }}">
<i class="layui-icon layui-icon-search"></i>搜索退款
</a>
</div>
</div>
<table class="layui-table kg-table">

9
app/Http/Admin/Views/refund/search.volt
View File

@ -21,12 +21,9 @@
<div class="layui-form-item">
<label class="layui-form-label">退款状态</label>
<div class="layui-input-block">
<input type="radio" name="status" value="1" title="待处理">
<input type="radio" name="status" value="2" title="已取消">
<input type="radio" name="status" value="3" title="已审核">
<input type="radio" name="status" value="4" title="已拒绝">
<input type="radio" name="status" value="5" title="已完成">
<input type="radio" name="status" value="6" title="已失败">
{% for value,title in status_types %}
<input type="radio" name="status" value="{{ value }}" title="{{ title }}">
{% endfor %}
</div>
</div>
<div class="layui-form-item">

7
app/Http/Admin/Views/review/list.volt
View File

@ -2,6 +2,8 @@
{% block content %}
{% set search_url = url({'for':'admin.consult.search'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
@ -12,6 +14,11 @@
<a><cite>评价管理</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ search_url }}">
<i class="layui-icon layui-icon-search"></i>搜索评价
</a>
</div>
</div>
<table class="layui-table kg-table layui-form">

7
app/Http/Admin/Views/role/list.volt
View File

@ -10,12 +10,19 @@
{% endif %}
{%- endmacro %}
{% set add_url = url({'for':'admin.role.add'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
<a><cite>角色管理</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ add_url }}">
<i class="layui-icon layui-icon-add-1"></i>添加角色
</a>
</div>
</div>
<table class="layui-table kg-table">

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

@ -20,7 +20,7 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">App Token</label>
<label class="layui-form-label">Access Token</label>
<div class="layui-input-block">
<input class="layui-input" type="text" name="app_token" value="{{ robot.app_token }}" lay-verify="required">
</div>

7
app/Http/Admin/Views/slide/list.volt
View File

@ -12,12 +12,19 @@
{% endif %}
{%- endmacro %}
{% set add_url = url({'for':'admin.slide.add'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
<a><cite>轮播管理</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ add_url }}">
<i class="layui-icon layui-icon-add-1"></i>添加轮播
</a>
</div>
</div>
<table class="layui-table kg-table layui-form">

21
app/Http/Admin/Views/student/list.volt
View File

@ -8,9 +8,9 @@
{% elseif value == 2 %}
付费
{% elseif value == 3 %}
导入
畅学
{% elseif value == 4 %}
会员
导入
{% elseif value == 5 %}
积分
{% elseif value == 6 %}
@ -18,6 +18,9 @@
{% endif %}
{%- endmacro %}
{% set add_url = url({'for':'admin.student.add'}) %}
{% set search_url = url({'for':'admin.student.search'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
@ -28,6 +31,14 @@
<a><cite>学员管理</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ add_url }}">
<i class="layui-icon layui-icon-add-1"></i>添加学员
</a>
<a class="layui-btn layui-btn-sm" href="{{ search_url }}">
<i class="layui-icon layui-icon-search"></i>搜索学员
</a>
</div>
</div>
<table class="layui-table kg-table">
@ -42,7 +53,7 @@
<tr>
<th>基本信息</th>
<th>学习情况</th>
<th>成员来源</th>
<th>来源类型</th>
<th>有效期限</th>
<th>操作</th>
</tr>
@ -55,8 +66,8 @@
{% set edit_url = url({'for':'admin.student.edit'},{'relation_id':item.id}) %}
<tr>
<td>
<p>课程：<a href="{{ list_by_course_url }}">{{ item.course.title }}（{{ item.course.id }}）</a></p>
<p>学员：<a href="{{ list_by_user_url }}">{{ item.user.name }}（{{ item.user.id }}）</a></p>
<p>课程：<a href="{{ list_by_course_url }}">{{ item.course.title }}</a>（{{ item.course.id }}）</p>
<p>学员：<a href="{{ list_by_user_url }}">{{ item.user.name }}</a>（{{ item.user.id }}）</p>
</td>
<td>
<p>进度：<a href="javascript:" class="kg-learning" title="学习记录" data-url="{{ learning_url }}">{{ item.progress }}%</a></p>

7
app/Http/Admin/Views/student/search.volt
View File

@ -23,10 +23,9 @@
<div class="layui-form-item">
<label class="layui-form-label">加入方式</label>
<div class="layui-input-block">
<input type="radio" name="source_type" value="1" title="免费课程">
<input type="radio" name="source_type" value="2" title="付费课程">
<input type="radio" name="source_type" value="3" title="畅学课程">
<input type="radio" name="source_type" value="4" title="后台导入">
{% for value,title in source_types %}
<input type="radio" name="source_type" value="{{ value }}" title="{{ title }}">
{% endfor %}
</div>
</div>
<div class="layui-form-item">

11
app/Http/Admin/Views/topic/list.volt
View File

@ -2,12 +2,23 @@
{% block content %}
{% set add_url = url({'for':'admin.topic.add'}) %}
{% set search_url = url({'for':'admin.topic.search'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
<a><cite>话题管理</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ add_url }}">
<i class="layui-icon layui-icon-add-1"></i>添加话题
</a>
<a class="layui-btn layui-btn-sm" href="{{ search_url }}">
<i class="layui-icon layui-icon-search"></i>搜索话题
</a>
</div>
</div>
<table class="layui-table kg-table layui-form">

44
app/Http/Admin/Views/topic/search.volt Normal file
View File

@ -0,0 +1,44 @@
{% extends 'templates/main.volt' %}
{% block content %}
<form class="layui-form kg-form" method="GET" action="{{ url({'for':'admin.topic.list'}) }}">
<fieldset class="layui-elem-field layui-field-title">
<legend>搜索话题</legend>
</fieldset>
<div class="layui-form-item">
<label class="layui-form-label">编号</label>
<div class="layui-input-block">
<input class="layui-input" type="text" name="id" placeholder="编号精确匹配">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">标题</label>
<div class="layui-input-block">
<input class="layui-input" type="text" name="title" placeholder="标题模糊匹配">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">发布</label>
<div class="layui-input-block">
<input type="radio" name="published" value="1" title="是">
<input type="radio" name="published" value="0" title="否">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">删除</label>
<div class="layui-input-block">
<input type="radio" name="deleted" value="1" title="是">
<input type="radio" name="deleted" value="0" title="否">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"></label>
<div class="layui-input-block">
<button class="layui-btn" lay-submit="true">提交</button>
<button type="button" class="kg-back layui-btn layui-btn-primary">返回</button>
</div>
</div>
</form>
{% endblock %}

7
app/Http/Admin/Views/trade/list.volt
View File

@ -4,12 +4,19 @@
{{ partial('trade/macro') }}
{% set search_url = url({'for':'admin.trade.search'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
<a><cite>交易管理</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ search_url }}">
<i class="layui-icon layui-icon-search"></i>搜索交易
</a>
</div>
</div>
<table class="layui-table kg-table">

12
app/Http/Admin/Views/trade/search.volt
View File

@ -21,17 +21,17 @@
<div class="layui-form-item">
<label class="layui-form-label">交易平台</label>
<div class="layui-input-block">
<input type="radio" name="channel" value="1" title="支付宝">
<input type="radio" name="channel" value="2" title="微信">
{% for value,title in channel_types %}
<input type="radio" name="channel" value="{{ value }}" title="{{ title }}">
{% endfor %}
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">交易状态</label>
<div class="layui-input-block">
<input type="radio" name="status" value="1" title="待支付">
<input type="radio" name="status" value="2" title="已完成">
<input type="radio" name="status" value="3" title="已关闭">
<input type="radio" name="status" value="4" title="已退款">
{% for value,title in status_types %}
<input type="radio" name="status" value="{{ value }}" title="{{ title }}">
{% endfor %}
</div>
</div>
<div class="layui-form-item">

2
app/Http/Admin/Views/user/add.volt
View File

@ -30,7 +30,7 @@
<label class="layui-form-label">后台角色</label>
<div class="layui-input-block">
<input type="radio" name="admin_role" value="0" title="无" checked="checked">
{% for role in roles %}
{% for role in admin_roles %}
{% if role.id > 1 %}
<input type="radio" name="admin_role" value="{{ role.id }}" title="{{ role.name }}">
{% endif %}

2
app/Http/Admin/Views/user/edit.volt
View File

@ -38,7 +38,7 @@
<label class="layui-form-label">后台角色</label>
<div class="layui-input-block">
<input type="radio" name="admin_role" value="0" title="无" {% if user.admin_role == 0 %}checked="checked"{% endif %}>
{% for role in roles %}
{% for role in admin_roles %}
{% if role.id > 1 %}
<input type="radio" name="admin_role" value="{{ role.id }}" title="{{ role.name }}" {% if user.admin_role == role.id %}checked="checked"{% endif %}>
{% endif %}

11
app/Http/Admin/Views/user/list.volt
View File

@ -35,12 +35,23 @@
{% endif %}
{%- endmacro %}
{% set add_url = url({'for':'admin.user.add'}) %}
{% set search_url = url({'for':'admin.user.search'}) %}
<div class="kg-nav">
<div class="kg-nav-left">
<span class="layui-breadcrumb">
<a><cite>用户管理</cite></a>
</span>
</div>
<div class="kg-nav-right">
<a class="layui-btn layui-btn-sm" href="{{ add_url }}">
<i class="layui-icon layui-icon-add-1"></i>添加用户
</a>
<a class="layui-btn layui-btn-sm" href="{{ search_url }}">
<i class="layui-icon layui-icon-search"></i>搜索用户
</a>
</div>
</div>
<table class="layui-table kg-table">

7
app/Http/Admin/Views/user/search.volt
View File

@ -21,14 +21,15 @@
<div class="layui-form-item">
<label class="layui-form-label">教学角色</label>
<div class="layui-input-block">
<input type="radio" name="edu_role" value="1" title="学员">
<input type="radio" name="edu_role" value="2" title="讲师">
{% for value,title in edu_role_types %}
<input type="radio" name="edu_role" value="{{ value }}" title="{{ title }}">
{% endfor %}
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">后台角色</label>
<div class="layui-input-block">
{% for item in roles %}
{% for item in admin_roles %}
<input type="radio" name="admin_role" value="{{ item.id }}" title="{{ item.name }}">
{% endfor %}
</div>

10
app/Http/Home/Controllers/ImGroupController.php
View File

@ -12,7 +12,7 @@ class ImGroupController extends Controller
{
/**
* @Get("/list", name="home.group.list")
* @Get("/list", name="home.im_group.list")
*/
public function listAction()
{
@ -22,7 +22,7 @@ class ImGroupController extends Controller
}
/**
* @Get("/pager", name="home.group.pager")
* @Get("/pager", name="home.im_group.pager")
*/
public function pagerAction()
{
@ -38,7 +38,7 @@ class ImGroupController extends Controller
}
/**
* @Get("/{id:[0-9]+}", name="home.group.show")
* @Get("/{id:[0-9]+}", name="home.im_group.show")
*/
public function showAction($id)
{
@ -53,7 +53,7 @@ class ImGroupController extends Controller
}
/**
* @Get("/{id:[0-9]+}/users", name="home.group.users")
* @Get("/{id:[0-9]+}/users", name="home.im_group.users")
*/
public function usersAction($id)
{
@ -69,7 +69,7 @@ class ImGroupController extends Controller
}
/**
* @Get("/{id:[0-9]+}/users/active", name="home.group.active_users")
* @Get("/{id:[0-9]+}/users/active", name="home.im_group.active_users")
*/
public function activeUsersAction($id)
{

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

@ -19,7 +19,7 @@ class PointRedeemController extends Controller
$service->handle();
return $this->jsonSuccess(['msg' => '兑换成功']);
return $this->jsonSuccess(['msg' => '兑换请求提交成功']);
}
}

4
app/Http/Home/Controllers/UserConsoleController.php
View File

@ -44,10 +44,6 @@ class UserConsoleController extends Controller
public function initialize()
{
parent::initialize();
$wechatOA = $this->getSettings('wechat.oa');
$this->view->setVar('wechat_oa', $wechatOA);
}
/**

10
app/Http/Home/Services/ImFriendTrait.php
View File

@ -58,7 +58,7 @@ Trait ImFriendTrait
$validator = new ImFriendUserValidator();
$validator->checkGroup($groupId);
$group = $validator->checkGroup($groupId);
$validator = new ImNoticeValidator();
@ -81,7 +81,7 @@ Trait ImFriendTrait
$friendUserModel->create([
'user_id' => $user->id,
'friend_id' => $sender->id,
'group_id' => $groupId,
'group_id' => $group->id,
]);
$this->incrUserFriendCount($user);
@ -147,7 +147,9 @@ Trait ImFriendTrait
public function quitFriend($id)
{
$user = $this->getLoginUser();
$loginUser = $this->getLoginUser();
$user = $this->getImUser($loginUser->id);
$validator = new ImFriendUserValidator();
@ -156,6 +158,8 @@ Trait ImFriendTrait
$friendUser = $validator->checkFriendUser($user->id, $friend->id);
$friendUser->delete();
$this->decrUserFriendCount($user);
}
protected function handleApplyFriendNotice(ImUserModel $sender, ImUserModel $receiver, ImFriendGroupModel $group, $remark)

40
app/Http/Home/Views/course/show_catalog.volt
View File

@ -55,23 +55,25 @@
{% endif %}
{%- endmacro %}
<div class="layui-collapse">
{% for chapter in chapters %}
<div class="layui-colla-item">
<h2 class="layui-colla-title">{{ chapter.title }}</h2>
<div class="layui-colla-content layui-show">
<ul class="lesson-list">
{% for lesson in chapter.children %}
{% if lesson.model == 1 %}
<li class="lesson-item clearfix">{{ vod_lesson_info(lesson) }}</li>
{% elseif lesson.model == 2 %}
<li class="lesson-item clearfix">{{ live_lesson_info(lesson) }}</li>
{% elseif lesson.model == 3 %}
<li class="lesson-item clearfix">{{ read_lesson_info(lesson) }}</li>
{% endif %}
{% endfor %}
</ul>
{% if chapters %}
<div class="layui-collapse">
{% for chapter in chapters %}
<div class="layui-colla-item">
<h2 class="layui-colla-title">{{ chapter.title }}</h2>
<div class="layui-colla-content layui-show">
<ul class="lesson-list">
{% for lesson in chapter.children %}
{% if lesson.model == 1 %}
<li class="lesson-item clearfix">{{ vod_lesson_info(lesson) }}</li>
{% elseif lesson.model == 2 %}
<li class="lesson-item clearfix">{{ live_lesson_info(lesson) }}</li>
{% elseif lesson.model == 3 %}
<li class="lesson-item clearfix">{{ read_lesson_info(lesson) }}</li>
{% endif %}
{% endfor %}
</ul>
</div>
</div>
</div>
{% endfor %}
</div>
{% endfor %}
</div>
{% endif %}

4
app/Http/Home/Views/course/show_meta.volt
View File

@ -34,7 +34,9 @@
{%- macro meta_price_info(course) %}
<p class="item">
<span class="key">原始价格</span><span class="value origin-price">{{ '￥%0.2f'|format(course.origin_price) }}</span>
{% if course.origin_price > 0 %}
<span class="key">原始价格</span><span class="value origin-price">{{ '￥%0.2f'|format(course.origin_price) }}</span>
{% endif %}
{% if course.market_price > 0 %}
<span class="key">优惠价格</span><span class="value price">{{ '￥%0.2f'|format(course.market_price) }}</span>
{% else %}

2
app/Http/Home/Views/im/group/active_users.volt
View File

@ -5,7 +5,7 @@
{% for user in users %}
{% set user_url = url({'for':'home.user.show','id':user.id}) %}
{% set user.title = user.title ? user.title : '暂露头角' %}
<div class="sidebar-teacher-card clearfix">
<div class="sidebar-user-card clearfix">
<div class="avatar">
<img src="{{ user.avatar }}" alt="{{ user.name }}">
</div>

2
app/Http/Home/Views/im/group/list.volt
View File

@ -2,7 +2,7 @@
{% block content %}
{% set pager_url = url({'for':'home.group.pager'}) %}
{% set pager_url = url({'for':'home.im_group.pager'}) %}
<div class="layui-breadcrumb breadcrumb">
<a href="/">首页</a>

2
app/Http/Home/Views/im/group/pager.volt
View File

@ -4,7 +4,7 @@
<div class="group-list clearfix">
<div class="layui-row layui-col-space20">
{% for item in pager.items %}
{% set group_url = url({'for':'home.group.show','id':item.id}) %}
{% set group_url = url({'for':'home.im_group.show','id':item.id}) %}
{% set item.about = item.about ? item.about : '这家伙真懒，什么都没留下！' %}
<div class="layui-col-md3">
<div class="user-card">

6
app/Http/Home/Views/im/group/show.volt
View File

@ -3,13 +3,13 @@
{% block content %}
{% set group.about = group.about ? group.about : '这个家伙真懒，什么都没有留下~' %}
{% set users_url = url({'for':'home.group.users','id':group.id}) %}
{% set active_users_url = url({'for':'home.group.active_users','id':group.id}) %}
{% set users_url = url({'for':'home.im_group.users','id':group.id}) %}
{% set active_users_url = url({'for':'home.im_group.active_users','id':group.id}) %}
<div class="breadcrumb">
<span class="layui-breadcrumb">
<a href="/">首页</a>
<a href="{{ url({'for':'home.group.list'}) }}">群组</a>
<a href="{{ url({'for':'home.im_group.list'}) }}">群组</a>
<a><cite>{{ group.name }}</cite></a>
</span>
</div>

2
app/Http/Home/Views/im/group/show_owner.volt
View File

@ -4,7 +4,7 @@
<div class="layui-card">
<div class="layui-card-header">小组组长</div>
<div class="layui-card-body">
<div class="sidebar-teacher-card clearfix">
<div class="sidebar-user-card clearfix">
<div class="avatar">
<img src="{{ group.owner.avatar }}" alt="{{ group.owner.name }}">
</div>

2
app/Http/Home/Views/im/index_groups.volt
View File

@ -1,7 +1,7 @@
<div class="user-list clearfix">
<div class="layui-row layui-col-space20">
{% for group in groups %}
{% set group_url = url({'for':'home.group.show','id':group.id}) %}
{% set group_url = url({'for':'home.im_group.show','id':group.id}) %}
{% set group.about = group.about ? group.about : '这家伙真懒，什么都没留下！' %}
<div class="layui-col-md3">
<div class="user-card">

15
app/Http/Home/Views/macros/course_user.volt Normal file
View File

@ -0,0 +1,15 @@
{%- macro source_type_info(value) %}
{% if value == 1 %}
免费
{% elseif value == 2 %}
付费
{% elseif value == 3 %}
畅学
{% elseif value == 4 %}
导入
{% elseif value == 5 %}
积分
{% elseif value == 6 %}
抽奖
{% endif %}
{%- endmacro %}

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

@ -32,9 +32,6 @@
<li class="layui-nav-item">
<a href="javascript:" class="nav-search" data-type="{{ s_type }}" data-query="{{ s_query }}" data-url="{{ s_url }}"><i class="layui-icon layui-icon-search"></i> 搜索</a>
</li>
<li class="layui-nav-item">
<a href="{{ url({'for':'home.point_gift.list'}) }}" class="nav-point-gift"><i class="layui-icon layui-icon-gift"></i> 积分</a>
</li>
<li class="layui-nav-item">
<a href="{{ url({'for':'home.vip.index'}) }}" class="nav-vip"><i class="layui-icon layui-icon-diamond"></i> 会员</a>
</li>

2
app/Http/Home/Views/search/group.volt
View File

@ -1,7 +1,7 @@
{% if pager.total_pages > 0 %}
<div class="search-group-list">
{% for item in pager.items %}
{% set group_url = url({'for':'home.group.show','id':item.id}) %}
{% set group_url = url({'for':'home.im_group.show','id':item.id}) %}
{% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
{% set item.about = item.about ? item.about : '这个家伙真懒，什么也没有留下！' %}
<div class="search-group-card clearfix">

3
app/Http/Home/Views/user/console/courses.volt
View File

@ -2,6 +2,7 @@
{% block content %}
{{ partial('macros/course_user') }}
{{ partial('macros/course') }}
<div class="layout-main clearfix">
@ -33,7 +34,7 @@
<tr>
<td>
<p>标题：<a href="{{ course_url }}">{{ item.course.title }}</a> {{ model_info(item.course.model) }}</p>
<p>期限：{{ date('Y-m-d',item.expiry_time) }}</p>
<p>来源：{{ source_type_info(item.source_type) }}&nbsp;&nbsp;期限：{{ date('Y-m-d',item.expiry_time) }}</p>
</td>
<td>
<p>用时：{{ item.duration|duration }}</p>

2
app/Http/Home/Views/user/console/friends.volt
View File

@ -12,7 +12,7 @@
<span class="title">我的好友</span>
</div>
{% if pager.total_pages > 0 %}
<table class="layui-table">
<table class="layui-table" lay-size="lg">
<colgroup>
<col>
<col>

2
app/Http/Home/Views/user/console/groups_joined.volt
View File

@ -16,7 +16,7 @@
</thead>
<tbody>
{% for item in pager.items %}
{% set show_url = url({'for':'home.group.show','id':item.id}) %}
{% set show_url = url({'for':'home.im_group.show','id':item.id}) %}
{% set owner_url = url({'for':'home.user.show','id':item.owner.id}) %}
{% set delete_url = url({'for':'home.im.quit_group','id':item.id}) %}
<tr>

25
app/Http/Home/Views/user/console/menu.volt
View File

@ -7,6 +7,9 @@
{% endif %}
{%- endmacro %}
{% set wechat_oa_enabled = setting('wechat.oa','enabled') %}
{% set point_enabled = setting('point','enabled') %}
<div class="my-profile-card wrap">
<div class="avatar">
<img class="my-avatar" src="{{ auth_user.avatar }}" alt="{{ auth_user.name }}">
@ -36,16 +39,18 @@
</div>
</div>
<div class="layui-card">
<div class="layui-card-header">积分中心</div>
<div class="layui-card-body">
<ul class="my-menu">
<li><a href="{{ url({'for':'home.point_gift.list'}) }}">积分商城</a></li>
<li><a href="{{ url({'for':'home.uc.point_history'}) }}">积分记录</a></li>
<li><a href="{{ url({'for':'home.uc.point_redeems'}) }}">兑换记录</a></li>
</ul>
{% if point_enabled == 1 %}
<div class="layui-card">
<div class="layui-card-header">积分中心</div>
<div class="layui-card-body">
<ul class="my-menu">
<li><a href="{{ url({'for':'home.point_gift.list'}) }}">积分商城</a></li>
<li><a href="{{ url({'for':'home.uc.point_redeems'}) }}">兑换记录</a></li>
<li><a href="{{ url({'for':'home.uc.point_history'}) }}">积分记录</a></li>
</ul>
</div>
</div>
</div>
{% endif %}
<div class="layui-card">
<div class="layui-card-header">聊天设置</div>
@ -64,7 +69,7 @@
<li><a href="{{ url({'for':'home.uc.profile'}) }}">个人信息</a></li>
<li><a href="{{ url({'for':'home.uc.contact'}) }}">收货地址</a></li>
<li><a href="{{ url({'for':'home.uc.account'}) }}">帐号安全</a></li>
{% if wechat_oa.enabled == 1 %}
{% if wechat_oa_enabled == 1 %}
<li><a href="{{ url({'for':'home.uc.subscribe'}) }}">关注订阅</a></li>
{% endif %}
</ul>

2
app/Http/Home/Views/user/console/point_history.volt
View File

@ -33,7 +33,7 @@
<td>{{ event_type_info(item.event_type) }}</td>
<td>{{ event_point_info(item.event_point) }}</td>
<td>{{ event_detail_info(item) }}</td>
<td>{{ date('Y-m-d H:i',item.create_time) }}</td>
<td>{{ date('Y-m-d',item.create_time) }}</td>
</tr>
{% endfor %}
</tbody>

2
app/Http/Home/Views/user/console/point_redeems.volt
View File

@ -34,7 +34,7 @@
<td><a href="{{ gift_url }}">{{ item.gift.name }}</a> {{ gift_type_info(item.gift.type) }}</td>
<td>{{ item.gift.point }}</td>
<td>{{ redeem_status_info(item.status) }}</td>
<td>{{ date('Y-m-d H:i',item.create_time) }}</td>
<td>{{ date('Y-m-d',item.create_time) }}</td>
</tr>
{% endfor %}
</tbody>

2
app/Http/Home/Views/user/groups.volt
View File

@ -4,7 +4,7 @@
<div class="user-list clearfix">
<div class="layui-row layui-col-space20">
{% for item in pager.items %}
{% set group_url = url({'for':'home.group.show','id':item.id}) %}
{% set group_url = url({'for':'home.im_group.show','id':item.id}) %}
{% set item.about = item.about ? item.about : '这家伙真懒，什么都没留下！' %}
<div class="layui-col-md3">
<div class="user-card">

2
app/Library/AppInfo.php
View File

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

10
app/Library/Utils/ServerInfo.php
View File

@ -26,16 +26,14 @@ class ServerInfo
$total = 0;
if (preg_match('/MemTotal\:\s+(\d+) kB/', $mem, $matches)) {
$total = $matches[1];
if (preg_match('/MemTotal\:\s+(\d+) kB/', $mem, $totalMatches)) {
$total = $totalMatches[1];
}
unset($matches);
$free = 0;
if (preg_match('/MemFree\:\s+(\d+) kB/', $mem, $matches)) {
$free = $matches[1];
if (preg_match('/MemFree\:\s+(\d+) kB/', $mem, $freeMatches)) {
$free = $freeMatches[1];
}
$usage = $total - $free;

8
app/Models/CourseRating.php
View File

@ -17,28 +17,28 @@ class CourseRating extends Model
*
* @var float
*/
public $rating = 0.00;
public $rating = 5.00;
/**
* 维度1评分
*
* @var float
*/
public $rating1 = 0.00;
public $rating1 = 5.00;
/**
* 维度2评分
*
* @var float
*/
public $rating2 = 0.00;
public $rating2 = 5.00;
/**
* 维度3评分
*
* @var float
*/
public $rating3 = 0.00;
public $rating3 = 5.00;
/**
* 创建时间

2
app/Models/CourseUser.php
View File

@ -18,7 +18,7 @@ class CourseUser extends Model
*/
const SOURCE_FREE = 1; // 免费
const SOURCE_CHARGE = 2; // 付费
const SOURCE_VIP = 3; // 会员
const SOURCE_VIP = 3; // 会员（畅学）
const SOURCE_IMPORT = 4; // 导入
const SOURCE_POINT_REDEEM = 5; // 积分兑换
const SOURCE_LUCKY_REDEEM = 6; // 抽奖兑换

1
app/Repos/Course.php
View File

@ -180,6 +180,7 @@ class Course extends Repository
->join(CourseUserModel::class, 'u.id = cu.user_id', 'cu')
->where('cu.course_id = :course_id:', ['course_id' => $courseId])
->andWhere('cu.role_type = :role_type:', ['role_type' => $roleType])
->andWhere('cu.deleted = :deleted:', ['deleted' => 0])
->getQuery()->execute();
}

2
app/Repos/ImFriendGroup.php
View File

@ -89,7 +89,7 @@ class ImFriendGroup extends Repository
public function countUsers($groupId)
{
return (int)ImFriendUserModel::count([
'conditions' => 'group_id = :group_id: AND blocked = 0',
'conditions' => 'group_id = :group_id:',
'bind' => ['group_id' => $groupId],
]);
}

4
app/Repos/Topic.php
View File

@ -21,6 +21,10 @@ class Topic extends Repository
$builder->where('1 = 1');
if (!empty($where['id'])) {
$builder->andWhere('id = :id:', ['id' => $where['id']]);
}
if (!empty($where['title'])) {
$builder->andWhere('title LIKE :title:', ['title' => "%{$where['title']}%"]);
}

6
app/Services/DingTalk/Notice/ConsultCreate.php
View File

@ -14,6 +14,8 @@ class ConsultCreate extends DingTalkNotice
public function handleTask(TaskModel $task)
{
if (!$this->enabled) return;
$consultRepo = new ConsultRepo();
$consult = $consultRepo->findById($task->item_id);
@ -32,11 +34,13 @@ class ConsultCreate extends DingTalkNotice
'consult.question' => $consult->question,
]);
return $this->atCourseTeacher($course->id, $content);
$this->atCourseTeacher($course->id, $content);
}
public function createTask(ConsultModel $consult)
{
if (!$this->enabled) return;
$keyName = "dingtalk_consult_create_notice:{$consult->owner_id}";
$cache = $this->getCache();

6
app/Services/DingTalk/Notice/CustomService.php
View File

@ -13,6 +13,8 @@ class CustomService extends DingTalkNotice
public function handleTask(TaskModel $task)
{
if (!$this->enabled) return;
$messageRepo = new ImMessageRepo();
$message = $messageRepo->findById($task->item_id);
@ -26,11 +28,13 @@ class CustomService extends DingTalkNotice
'message.content' => $message->content,
]);
return $this->atCustomService($content);
$this->atCustomService($content);
}
public function createTask(ImMessageModel $message)
{
if (!$this->enabled) return;
$keyName = "dingtalk_custom_service_notice:{$message->sender_id}";
$cache = $this->getCache();

6
app/Services/DingTalk/Notice/LiveTeacher.php
View File

@ -13,6 +13,8 @@ class TeacherLive extends DingTalkNotice
public function handleTask(TaskModel $task)
{
if (!$this->enabled) return;
$liveRepo = new ChapterLiveRepo();
$live = $liveRepo->findById($task->item_id);
@ -26,11 +28,13 @@ class TeacherLive extends DingTalkNotice
'live.start_time' => date('Y-m-d H:i', $live->start_time),
]);
return $this->atCourseTeacher($course->id, $content);
$this->atCourseTeacher($course->id, $content);
}
public function createTask(ChapterLiveModel $live)
{
if (!$this->enabled) return;
$task = new TaskModel();
$itemInfo = [

6
app/Services/DingTalk/Notice/PointRedeem.php
View File

@ -13,6 +13,8 @@ class PointRedeem extends DingTalkNotice
public function handleTask(TaskModel $task)
{
if (!$this->enabled) return;
$redeemRepo = new PointRedeemRepo();
$redeem = $redeemRepo->findById($task->item_id);
@ -22,11 +24,13 @@ class PointRedeem extends DingTalkNotice
'gift.name' => $redeem->gift_name,
]);
return $this->atCustomService($content);
$this->atCustomService($content);
}
public function createTask(PointRedeemModel $redeem)
{
if (!$this->enabled) return;
if ($redeem->gift_type != PointGiftModel::TYPE_GOODS) return;
$task = new TaskModel();

6
app/Services/DingTalk/Notice/ServerMonitor.php
View File

@ -10,15 +10,19 @@ class ServerMonitor extends DingTalkNotice
public function handleTask(TaskModel $task)
{
if (!$this->enabled) return;
$notice = new DingTalkNotice();
$content = $task->item_info['content'];
return $notice->atTechSupport($content);
$notice->atTechSupport($content);
}
public function createTask($content)
{
if (!$this->enabled) return;
$task = new TaskModel();
$itemInfo = ['content' => $content];

49
app/Services/DingTalkNotice.php
View File

@ -2,6 +2,7 @@
namespace App\Services;
use App\Library\Validators\Common as CommonValidator;
use App\Repos\Account as AccountRepo;
use App\Repos\Course as CourseRepo;
use GuzzleHttp\Client as HttpClient;
@ -20,11 +21,18 @@ class DingTalkNotice extends Service
*/
protected $logger;
/**
* @var bool
*/
protected $enabled;
public function __construct()
{
$this->settings = $this->getSettings('dingtalk.robot');
$this->logger = $this->getLogger('dingtalk');
$this->enabled = $this->settings['enabled'] == 1;
}
/**
@ -99,11 +107,9 @@ class DingTalkNotice extends Service
$account = $accountRepo->findById($course->teacher_id);
if (empty($account->phone)) {
return false;
}
if (empty($account->phone)) return false;
$atMobiles = $account->phone;
$atMobiles = [$account->phone];
$atContent = $this->buildAtContent($content, $atMobiles);
@ -124,19 +130,24 @@ class DingTalkNotice extends Service
*/
public function send($params)
{
if (isset($params['msgtype'])) {
if (!isset($params['msgtype'])) {
$params['msgtype'] = 'text';
}
$webHook = "https://oapi.dingtalk.com/robot/send?access_token=%s&timestamp=%s&sign=%s";
$appSecret = $this->settings['app_secret'];
$appToken = $this->settings['app_token'];
$timestamp = time() * 1000;
$data = sprintf("%s\n%s", $timestamp, $appSecret);
$sign = urlencode(base64_encode(hash_hmac('sha256', $data, $appSecret, true)));
$postUrl = sprintf($webHook, $appToken, $timestamp, $sign);
$baseUrl = 'https://oapi.dingtalk.com/robot/send';
$postUrl = $baseUrl . '?' . http_build_query([
'access_token' => $appToken,
'timestamp' => $timestamp,
'sign' => $sign,
]);
try {
@ -178,15 +189,21 @@ class DingTalkNotice extends Service
*/
protected function parseAtMobiles($mobiles)
{
if (empty($mobiles)) {
return [];
}
if (empty($mobiles)) return [];
$mobiles = str_replace(['，', '｜', '|'], ',', $mobiles);
$mobiles = explode(',', $mobiles);
return array_map(function ($mobile) {
return trim($mobile);
}, $mobiles);
$result = [];
foreach ($mobiles as $mobile) {
if (CommonValidator::phone($mobile)) {
$result[] = $mobile;
}
}
return $result;
}
/**
@ -196,9 +213,7 @@ class DingTalkNotice extends Service
*/
protected function buildAtContent($content, $mobiles = [])
{
if (count($mobiles) == 0) {
return $content;
}
if (empty($mobiles)) return $content;
$result = '';

1
app/Services/Logic/User/CourseList.php
View File

@ -58,6 +58,7 @@ class CourseList extends Service
'progress' => $relation['progress'],
'duration' => $relation['duration'],
'reviewed' => $relation['reviewed'],
'source_type' => $relation['source_type'],
'expiry_time' => $relation['expiry_time'],
'create_time' => $relation['create_time'],
'course' => $course,

4
app/Validators/ImFriendGroup.php
View File

@ -3,14 +3,14 @@
namespace App\Validators;
use App\Exceptions\BadRequest as BadRequestException;
use App\Repos\ImGroup as ImGroupRepo;
use App\Repos\ImFriendGroup as ImFriendGroupRepo;
class ImFriendGroup extends Validator
{
public function checkGroup($id)
{
$groupRepo = new ImGroupRepo();
$groupRepo = new ImFriendGroupRepo();
$group = $groupRepo->findById($id);

23
db/migrations/20210215024511_data_202102151130.php
View File

@ -34,6 +34,8 @@ class Data202102151130 extends Phinx\Migration\AbstractMigration
];
$this->table('kg_setting')->insert($rows)->save();
$this->updateImGroupRouter();
}
public function down()
@ -44,4 +46,25 @@ class Data202102151130 extends Phinx\Migration\AbstractMigration
->execute();
}
protected function updateImGroupRouter()
{
$roles = $this->getQueryBuilder()
->select('*')
->from('kg_role')
->execute();
if ($roles->count() == 0) return;
foreach ($roles as $role) {
if (strpos($role['routes'], 'admin.group') !== false) {
$routes = str_replace('admin.group', 'admin.im_group', $role['routes']);
$this->getQueryBuilder()
->update('kg_role')
->set(['routes' => $routes])
->where(['id' => $role['id']])
->execute();
}
}
}
}