1
0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-07-17 21:56:13 +08:00

web->desktop

This commit is contained in:
xiaochong0302 2020-08-22 19:47:57 +08:00
parent 1ec9c6f612
commit 56c1c851fe
236 changed files with 701 additions and 658 deletions

View File

@ -11,7 +11,7 @@ use App\Repos\Review as ReviewRepo;
use App\Repos\Topic as TopicRepo; use App\Repos\Topic as TopicRepo;
use App\Repos\User as UserRepo; use App\Repos\User as UserRepo;
class SiteStat extends Cache class SiteGlobalStat extends Cache
{ {
protected $lifetime = 2 * 3600; protected $lifetime = 2 * 3600;
@ -23,7 +23,7 @@ class SiteStat extends Cache
public function getKey($id = null) public function getKey($id = null)
{ {
return 'site_stat'; return 'site_global_stat';
} }
public function getContent($id = null) public function getContent($id = null)

View File

@ -0,0 +1,63 @@
<?php
namespace App\Caches;
use App\Models\Order as OrderModel;
use App\Models\User as UserModel;
class SiteTodayStat extends Cache
{
protected $lifetime = 1 * 3600;
public function getLifetime()
{
return $this->lifetime;
}
public function getKey($id = null)
{
return 'site_today_stat';
}
public function getContent($id = null)
{
return [
'user_count' => $this->countUsers(),
'order_count' => $this->countOrders(),
'sale_amount' => $this->sumSales(),
];
}
protected function countUsers()
{
return (int)UserModel::count([
'conditions' => 'create_time > :time:',
'bind' => ['time' => strtotime('today')],
]);
}
protected function countOrders()
{
return (int)OrderModel::count([
'conditions' => 'create_time > :time: AND status = :status:',
'bind' => [
'time' => strtotime('today'),
'status' => OrderModel::STATUS_FINISHED,
],
]);
}
protected function sumSales()
{
return (float)OrderModel::sum([
'column' => 'amount',
'conditions' => 'create_time > :time: AND status = :status:',
'bind' => [
'time' => strtotime('today'),
'status' => OrderModel::STATUS_FINISHED,
],
]);
}
}

View File

@ -35,13 +35,25 @@ class IndexController extends Controller
{ {
$indexService = new IndexService(); $indexService = new IndexService();
$statInfo = $indexService->getStatInfo(); $globalStat = $indexService->getGlobalStat();
$todayStat = $indexService->getTodayStat();
$appInfo = $indexService->getAppInfo(); $appInfo = $indexService->getAppInfo();
$serverInfo = $indexService->getServerInfo(); $serverInfo = $indexService->getServerInfo();
$this->view->setVar('stat_info', $statInfo); $this->view->setVar('global_stat', $globalStat);
$this->view->setVar('today_stat', $todayStat);
$this->view->setVar('app_info', $appInfo); $this->view->setVar('app_info', $appInfo);
$this->view->setVar('server_info', $serverInfo); $this->view->setVar('server_info', $serverInfo);
} }
/**
* @Get("/phpinfo", name="admin.phpinfo")
*/
public function phpinfoAction()
{
echo phpinfo();
exit;
}
} }

View File

@ -161,11 +161,11 @@ class SettingController extends Controller
$alipay = $settingService->getSectionSettings('pay.alipay'); $alipay = $settingService->getSectionSettings('pay.alipay');
$alipay->notify_url = $alipay->notify_url ?: kg_full_url(['for' => 'web.alipay_notify']); $alipay->notify_url = $alipay->notify_url ?: kg_full_url(['for' => 'desktop.alipay_notify']);
$wxpay = $settingService->getSectionSettings('pay.wxpay'); $wxpay = $settingService->getSectionSettings('pay.wxpay');
$wxpay->notify_url = $wxpay->notify_url ?: kg_full_url(['for' => 'web.wxpay_notify']); $wxpay->notify_url = $wxpay->notify_url ?: kg_full_url(['for' => 'desktop.wxpay_notify']);
$this->view->setVar('alipay', $alipay); $this->view->setVar('alipay', $alipay);
$this->view->setVar('wxpay', $wxpay); $this->view->setVar('wxpay', $wxpay);

View File

@ -67,7 +67,7 @@ class TestController extends Controller
$pushUrl = $liveService->getPushUrl($streamName); $pushUrl = $liveService->getPushUrl($streamName);
$qrcode = $this->url->get( $qrcode = $this->url->get(
['for' => 'web.qrcode'], ['for' => 'desktop.qrcode'],
['text' => urlencode($pushUrl)] ['text' => urlencode($pushUrl)]
); );

View File

@ -23,7 +23,7 @@ class AlipayTest extends PayTest
if ($code) { if ($code) {
$codeUrl = $this->url->get( $codeUrl = $this->url->get(
['for' => 'web.qrcode'], ['for' => 'desktop.qrcode'],
['text' => urlencode($code)] ['text' => urlencode($code)]
); );
} }

View File

@ -2,7 +2,8 @@
namespace App\Http\Admin\Services; namespace App\Http\Admin\Services;
use App\Caches\SiteStat; use App\Caches\SiteGlobalStat;
use App\Caches\SiteTodayStat;
use App\Library\AppInfo; use App\Library\AppInfo;
use App\Library\Utils\ServerInfo; use App\Library\Utils\ServerInfo;
@ -37,9 +38,16 @@ class Index extends Service
]; ];
} }
public function getStatInfo() public function getGlobalStat()
{ {
$cache = new SiteStat(); $cache = new SiteGlobalStat();
return $cache->get();
}
public function getTodayStat()
{
$cache = new SiteTodayStat();
return $cache->get(); return $cache->get();
} }

View File

@ -24,7 +24,7 @@ class Session extends Service
$currentUser = $this->getCurrentUser(); $currentUser = $this->getCurrentUser();
if ($currentUser->id > 0) { if ($currentUser->id > 0) {
$this->response->redirect(['for' => 'web.index']); $this->response->redirect(['for' => 'desktop.index']);
} }
$post = $this->request->getPost(); $post = $this->request->getPost();

View File

@ -28,13 +28,13 @@
<li class="layui-nav-item"> <li class="layui-nav-item">
<a href="javascript:">{{ auth_user.name }}</a> <a href="javascript:">{{ auth_user.name }}</a>
<dl class="layui-nav-child"> <dl class="layui-nav-child">
<dd><a href="{{ url({'for':'web.my.profile'}) }}" target="_blank">基本资料</a></dd> <dd><a href="{{ url({'for':'desktop.my.profile'}) }}" target="_blank">基本资料</a></dd>
<dd><a href="{{ url({'for':'web.my.account'}) }}" target="_blank">安全设置</a></dd> <dd><a href="{{ url({'for':'desktop.my.account'}) }}" target="_blank">安全设置</a></dd>
<dd><a href="{{ url({'for':'admin.logout'}) }}">退出登录</a></dd> <dd><a href="{{ url({'for':'admin.logout'}) }}">退出登录</a></dd>
</dl> </dl>
</li> </li>
<li class="layui-nav-item"> <li class="layui-nav-item">
<a href="{{ url({'for':'web.index'}) }}" target="_blank">前台</a> <a href="{{ url({'for':'desktop.index'}) }}" target="_blank">前台</a>
</li> </li>
</ul> </ul>
</div> </div>

View File

@ -5,7 +5,9 @@
<div class="layui-fluid"> <div class="layui-fluid">
<div class="layui-row layui-col-space15"> <div class="layui-row layui-col-space15">
<div class="layui-col-md8"> <div class="layui-col-md8">
{{ partial('index/main_stat_info') }} {{ partial('index/main_global_stat') }}
{{ partial('index/main_today_stat') }}
{{ partial('index/main_app_trend') }}
</div> </div>
<div class="layui-col-md4"> <div class="layui-col-md4">
{{ partial('index/main_app_info') }} {{ partial('index/main_app_info') }}

View File

@ -0,0 +1,6 @@
<div class="layui-card layui-text">
<div class="layui-card-header">产品动态</div>
<div class="layui-card-body">
</div>
</div>

View File

@ -1,53 +1,53 @@
<div class="layui-card kg-stats"> <div class="layui-card kg-stats">
<div class="layui-card-header">数据统计</div> <div class="layui-card-header">全局统计</div>
<div class="layui-card-body"> <div class="layui-card-body">
<div class="layui-row layui-col-space10"> <div class="layui-row layui-col-space10">
<div class="layui-col-md3"> <div class="layui-col-md3">
<div class="kg-stat-card"> <div class="kg-stat-card">
<div class="name">课程数</div> <div class="name">课程数</div>
<div class="count">{{ stat_info.course_count }}</div> <div class="count">{{ global_stat.course_count }}</div>
</div> </div>
</div> </div>
<div class="layui-col-md3"> <div class="layui-col-md3">
<div class="kg-stat-card"> <div class="kg-stat-card">
<div class="name">用户数</div> <div class="name">用户数</div>
<div class="count">{{ stat_info.user_count }}</div> <div class="count">{{ global_stat.user_count }}</div>
</div> </div>
</div> </div>
<div class="layui-col-md3"> <div class="layui-col-md3">
<div class="kg-stat-card"> <div class="kg-stat-card">
<div class="name">群组数</div> <div class="name">群组数</div>
<div class="count">{{ stat_info.group_count }}</div> <div class="count">{{ global_stat.group_count }}</div>
</div> </div>
</div> </div>
<div class="layui-col-md3"> <div class="layui-col-md3">
<div class="kg-stat-card"> <div class="kg-stat-card">
<div class="name">订单数</div> <div class="name">订单数</div>
<div class="count">{{ stat_info.order_count }}</div> <div class="count">{{ global_stat.order_count }}</div>
</div> </div>
</div> </div>
<div class="layui-col-md3"> <div class="layui-col-md3">
<div class="kg-stat-card"> <div class="kg-stat-card">
<div class="name">评价数</div> <div class="name">评价数</div>
<div class="count">{{ stat_info.review_count }}</div> <div class="count">{{ global_stat.review_count }}</div>
</div> </div>
</div> </div>
<div class="layui-col-md3"> <div class="layui-col-md3">
<div class="kg-stat-card"> <div class="kg-stat-card">
<div class="name">咨询数</div> <div class="name">咨询数</div>
<div class="count">{{ stat_info.consult_count }}</div> <div class="count">{{ global_stat.consult_count }}</div>
</div> </div>
</div> </div>
<div class="layui-col-md3"> <div class="layui-col-md3">
<div class="kg-stat-card"> <div class="kg-stat-card">
<div class="name">套餐数</div> <div class="name">套餐数</div>
<div class="count">{{ stat_info.package_count }}</div> <div class="count">{{ global_stat.package_count }}</div>
</div> </div>
</div> </div>
<div class="layui-col-md3"> <div class="layui-col-md3">
<div class="kg-stat-card"> <div class="kg-stat-card">
<div class="name">专题数</div> <div class="name">专题数</div>
<div class="count">{{ stat_info.topic_count }}</div> <div class="count">{{ global_stat.topic_count }}</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -11,13 +11,17 @@
<td>版权所有</td> <td>版权所有</td>
<td><a href="http://koogua.com">深圳市酷瓜软件有限公司</a></td> <td><a href="http://koogua.com">深圳市酷瓜软件有限公司</a></td>
</tr> </tr>
<tr>
<td>产品经理</td>
<td>鸠摩智首席音效师</td>
</tr>
<tr> <tr>
<td>项目经理</td> <td>项目经理</td>
<td>小虫哥哥</td> <td>小李飞刀</td>
</tr> </tr>
<tr> <tr>
<td>开发人员</td> <td>开发人员</td>
<td>小虫哥哥</td> <td>长河落日,孤雾齐飞,大王来巡山</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

View File

@ -0,0 +1,25 @@
<div class="layui-card kg-stats">
<div class="layui-card-header">今日统计</div>
<div class="layui-card-body">
<div class="layui-row layui-col-space10">
<div class="layui-col-md4">
<div class="kg-stat-card">
<div class="name">用户注册</div>
<div class="count">{{ today_stat.user_count }}</div>
</div>
</div>
<div class="layui-col-md4">
<div class="kg-stat-card">
<div class="name">成交订单</div>
<div class="count">{{ today_stat.order_count }}</div>
</div>
</div>
<div class="layui-col-md4">
<div class="kg-stat-card">
<div class="name">销售金额</div>
<div class="count">{{ today_stat.sale_amount }}</div>
</div>
</div>
</div>
</div>
</div>

View File

@ -31,7 +31,7 @@
</thead> </thead>
<tbody> <tbody>
{% for item in pager.items %} {% for item in pager.items %}
{% set show_url = url({'for':'web.page.show','id':item.id}) %} {% set show_url = url({'for':'desktop.page.show','id':item.id}) %}
{% set edit_url = url({'for':'admin.page.edit','id':item.id}) %} {% set edit_url = url({'for':'admin.page.edit','id':item.id}) %}
{% set update_url = url({'for':'admin.page.update','id':item.id}) %} {% set update_url = url({'for':'admin.page.update','id':item.id}) %}
{% set delete_url = url({'for':'admin.page.delete','id':item.id}) %} {% set delete_url = url({'for':'admin.page.delete','id':item.id}) %}

View File

@ -19,6 +19,6 @@
{% block link_css %} {% block link_css %}
{{ css_link("web/css/error.css") }} {{ css_link("desktop/css/error.css") }}
{% endblock %} {% endblock %}

View File

@ -1,8 +1,8 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Http\Web\Services\Account as AccountService; use App\Http\Desktop\Services\Account as AccountService;
use App\Services\Frontend\Account\EmailUpdate as EmailUpdateService; use App\Services\Frontend\Account\EmailUpdate as EmailUpdateService;
use App\Services\Frontend\Account\PasswordReset as PasswordResetService; use App\Services\Frontend\Account\PasswordReset as PasswordResetService;
use App\Services\Frontend\Account\PasswordUpdate as PasswordUpdateService; use App\Services\Frontend\Account\PasswordUpdate as PasswordUpdateService;
@ -16,7 +16,7 @@ class AccountController extends Controller
{ {
/** /**
* @Get("/register", name="web.account.register") * @Get("/register", name="desktop.account.register")
*/ */
public function registerAction() public function registerAction()
{ {
@ -35,7 +35,7 @@ class AccountController extends Controller
} }
/** /**
* @Post("/register", name="web.account.do_register") * @Post("/register", name="desktop.account.do_register")
*/ */
public function doRegisterAction() public function doRegisterAction()
{ {
@ -54,7 +54,7 @@ class AccountController extends Controller
} }
/** /**
* @Get("/login", name="web.account.login") * @Get("/login", name="desktop.account.login")
*/ */
public function loginAction() public function loginAction()
{ {
@ -73,7 +73,7 @@ class AccountController extends Controller
} }
/** /**
* @Post("/password/login", name="web.account.pwd_login") * @Post("/password/login", name="desktop.account.pwd_login")
*/ */
public function loginByPasswordAction() public function loginByPasswordAction()
{ {
@ -83,7 +83,7 @@ class AccountController extends Controller
$returnUrl = $this->request->getPost('return_url'); $returnUrl = $this->request->getPost('return_url');
$location = $returnUrl ?: $this->url->get(['for' => 'web.index']); $location = $returnUrl ?: $this->url->get(['for' => 'desktop.index']);
$content = ['location' => $location]; $content = ['location' => $location];
@ -91,7 +91,7 @@ class AccountController extends Controller
} }
/** /**
* @Post("/verify/login", name="web.account.verify_login") * @Post("/verify/login", name="desktop.account.verify_login")
*/ */
public function loginByVerifyAction() public function loginByVerifyAction()
{ {
@ -101,7 +101,7 @@ class AccountController extends Controller
$returnUrl = $this->request->getPost('return_url'); $returnUrl = $this->request->getPost('return_url');
$location = $returnUrl ?: $this->url->get(['for' => 'web.index']); $location = $returnUrl ?: $this->url->get(['for' => 'desktop.index']);
$content = ['location' => $location]; $content = ['location' => $location];
@ -109,7 +109,7 @@ class AccountController extends Controller
} }
/** /**
* @Get("/logout", name="web.account.logout") * @Get("/logout", name="desktop.account.logout")
*/ */
public function logoutAction() public function logoutAction()
{ {
@ -117,16 +117,16 @@ class AccountController extends Controller
$service->logout(); $service->logout();
$this->response->redirect(['for' => 'web.index']); $this->response->redirect(['for' => 'desktop.index']);
} }
/** /**
* @Get("/password/forget", name="web.account.forget_pwd") * @Get("/password/forget", name="desktop.account.forget_pwd")
*/ */
public function forgetPasswordAction() public function forgetPasswordAction()
{ {
if ($this->authUser->id > 0) { if ($this->authUser->id > 0) {
$this->response->redirect(['for' => 'web.index']); $this->response->redirect(['for' => 'desktop.index']);
} }
$service = new AccountService(); $service = new AccountService();
@ -138,12 +138,12 @@ class AccountController extends Controller
} }
/** /**
* @Get("/password/edit", name="web.account.edit_pwd") * @Get("/password/edit", name="desktop.account.edit_pwd")
*/ */
public function editPasswordAction() public function editPasswordAction()
{ {
if ($this->authUser->id == 0) { if ($this->authUser->id == 0) {
$this->response->redirect(['for' => 'web.account.login']); $this->response->redirect(['for' => 'desktop.account.login']);
} }
$service = new AccountService(); $service = new AccountService();
@ -156,12 +156,12 @@ class AccountController extends Controller
} }
/** /**
* @Get("/phone/edit", name="web.account.edit_phone") * @Get("/phone/edit", name="desktop.account.edit_phone")
*/ */
public function editPhoneAction() public function editPhoneAction()
{ {
if ($this->authUser->id == 0) { if ($this->authUser->id == 0) {
$this->response->redirect(['for' => 'web.account.login']); $this->response->redirect(['for' => 'desktop.account.login']);
} }
$service = new AccountService(); $service = new AccountService();
@ -174,12 +174,12 @@ class AccountController extends Controller
} }
/** /**
* @Get("/email/edit", name="web.account.edit_email") * @Get("/email/edit", name="desktop.account.edit_email")
*/ */
public function editEmailAction() public function editEmailAction()
{ {
if ($this->authUser->id == 0) { if ($this->authUser->id == 0) {
$this->response->redirect(['for' => 'web.account.login']); $this->response->redirect(['for' => 'desktop.account.login']);
} }
$service = new AccountService(); $service = new AccountService();
@ -192,7 +192,7 @@ class AccountController extends Controller
} }
/** /**
* @Post("/password/reset", name="web.account.reset_pwd") * @Post("/password/reset", name="desktop.account.reset_pwd")
*/ */
public function resetPasswordAction() public function resetPasswordAction()
{ {
@ -200,7 +200,7 @@ class AccountController extends Controller
$service->handle(); $service->handle();
$loginUrl = $this->url->get(['for' => 'web.account.login']); $loginUrl = $this->url->get(['for' => 'desktop.account.login']);
$content = [ $content = [
'location' => $loginUrl, 'location' => $loginUrl,
@ -211,7 +211,7 @@ class AccountController extends Controller
} }
/** /**
* @Post("/phone/update", name="web.account.update_phone") * @Post("/phone/update", name="desktop.account.update_phone")
*/ */
public function updatePhoneAction() public function updatePhoneAction()
{ {
@ -225,7 +225,7 @@ class AccountController extends Controller
} }
/** /**
* @Post("/email/update", name="web.account.update_email") * @Post("/email/update", name="desktop.account.update_email")
*/ */
public function updateEmailAction() public function updateEmailAction()
{ {
@ -239,7 +239,7 @@ class AccountController extends Controller
} }
/** /**
* @Post("/password/update", name="web.account.update_pwd") * @Post("/password/update", name="desktop.account.update_pwd")
*/ */
public function updatePasswordAction() public function updatePasswordAction()
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\Frontend\Chapter\ChapterInfo as ChapterInfoService; use App\Services\Frontend\Chapter\ChapterInfo as ChapterInfoService;
use App\Services\Frontend\Chapter\ChapterLike as ChapterLikeService; use App\Services\Frontend\Chapter\ChapterLike as ChapterLikeService;
@ -15,7 +15,7 @@ class ChapterController extends Controller
{ {
/** /**
* @Get("/{id:[0-9]+}", name="web.chapter.show") * @Get("/{id:[0-9]+}", name="desktop.chapter.show")
*/ */
public function showAction($id) public function showAction($id)
{ {
@ -27,7 +27,7 @@ class ChapterController extends Controller
if (!$owned) { if (!$owned) {
$this->response->redirect([ $this->response->redirect([
'for' => 'web.course.show', 'for' => 'desktop.course.show',
'id' => $chapter['course']['id'], 'id' => $chapter['course']['id'],
]); ]);
} }
@ -52,7 +52,7 @@ class ChapterController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/danmu", name="web.chapter.danmu") * @Get("/{id:[0-9]+}/danmu", name="desktop.chapter.danmu")
*/ */
public function danmuAction($id) public function danmuAction($id)
{ {
@ -64,7 +64,7 @@ class ChapterController extends Controller
} }
/** /**
* @Post("/{id:[0-9]+}/like", name="web.chapter.like") * @Post("/{id:[0-9]+}/like", name="desktop.chapter.like")
*/ */
public function likeAction($id) public function likeAction($id)
{ {
@ -80,7 +80,7 @@ class ChapterController extends Controller
} }
/** /**
* @Post("/{id:[0-9]+}/learning", name="web.chapter.learning") * @Post("/{id:[0-9]+}/learning", name="desktop.chapter.learning")
*/ */
public function learningAction($id) public function learningAction($id)
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\Frontend\Consult\ConsultCreate as ConsultCreateService; use App\Services\Frontend\Consult\ConsultCreate as ConsultCreateService;
use App\Services\Frontend\Consult\ConsultDelete as ConsultDeleteService; use App\Services\Frontend\Consult\ConsultDelete as ConsultDeleteService;
@ -16,7 +16,7 @@ class ConsultController extends Controller
{ {
/** /**
* @Get("/add", name="web.consult.add") * @Get("/add", name="desktop.consult.add")
*/ */
public function addAction() public function addAction()
{ {
@ -24,7 +24,7 @@ class ConsultController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/show", name="web.consult.show") * @Get("/{id:[0-9]+}/show", name="desktop.consult.show")
*/ */
public function showAction($id) public function showAction($id)
{ {
@ -36,7 +36,7 @@ class ConsultController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/edit", name="web.consult.edit") * @Get("/{id:[0-9]+}/edit", name="desktop.consult.edit")
*/ */
public function editAction($id) public function editAction($id)
{ {
@ -48,7 +48,7 @@ class ConsultController extends Controller
} }
/** /**
* @Post("/create", name="web.consult.create") * @Post("/create", name="desktop.consult.create")
*/ */
public function createAction() public function createAction()
{ {
@ -66,7 +66,7 @@ class ConsultController extends Controller
} }
/** /**
* @Post("/{id:[0-9]+}/update", name="web.consult.update") * @Post("/{id:[0-9]+}/update", name="desktop.consult.update")
*/ */
public function updateAction($id) public function updateAction($id)
{ {
@ -80,7 +80,7 @@ class ConsultController extends Controller
} }
/** /**
* @Post("/{id:[0-9]+}/delete", name="web.consult.delete") * @Post("/{id:[0-9]+}/delete", name="desktop.consult.delete")
*/ */
public function deleteAction($id) public function deleteAction($id)
{ {
@ -94,7 +94,7 @@ class ConsultController extends Controller
} }
/** /**
* @Route("/{id:[0-9]+}/reply", name="web.consult.reply") * @Route("/{id:[0-9]+}/reply", name="desktop.consult.reply")
*/ */
public function replyAction($id) public function replyAction($id)
{ {
@ -119,7 +119,7 @@ class ConsultController extends Controller
} }
/** /**
* @Post("/{id:[0-9]+}/like", name="web.consult.like") * @Post("/{id:[0-9]+}/like", name="desktop.consult.like")
*/ */
public function likeAction($id) public function likeAction($id)
{ {

View File

@ -1,13 +1,13 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Caches\NavTreeList as NavCache; use App\Caches\NavTreeList as NavCache;
use App\Caches\Setting as SettingCache; use App\Caches\Setting as SettingCache;
use App\Library\AppInfo; use App\Library\AppInfo;
use App\Library\Seo; use App\Library\Seo;
use App\Models\User as UserModel; use App\Models\User as UserModel;
use App\Services\Auth\Web as WebAuth; use App\Services\Auth\Desktop as DesktopAuth;
use App\Traits\Response as ResponseTrait; use App\Traits\Response as ResponseTrait;
use App\Traits\Security as SecurityTrait; use App\Traits\Security as SecurityTrait;
use Phalcon\Mvc\Dispatcher; use Phalcon\Mvc\Dispatcher;
@ -85,7 +85,7 @@ class Controller extends \Phalcon\Mvc\Controller
protected function getAuthUser() protected function getAuthUser()
{ {
/** /**
* @var WebAuth $auth * @var DesktopAuth $auth
*/ */
$auth = $this->getDI()->get('auth'); $auth = $this->getDI()->get('auth');

View File

@ -1,8 +1,8 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Http\Web\Services\CourseQuery as CourseQueryService; use App\Http\Desktop\Services\CourseQuery as CourseQueryService;
use App\Services\Frontend\Course\ChapterList as CourseCatalogService; use App\Services\Frontend\Course\ChapterList as CourseCatalogService;
use App\Services\Frontend\Course\ConsultList as CourseConsultListService; use App\Services\Frontend\Course\ConsultList as CourseConsultListService;
use App\Services\Frontend\Course\CourseInfo as CourseInfoService; use App\Services\Frontend\Course\CourseInfo as CourseInfoService;
@ -23,7 +23,7 @@ class CourseController extends Controller
{ {
/** /**
* @Get("/list", name="web.course.list") * @Get("/list", name="desktop.course.list")
*/ */
public function listAction() public function listAction()
{ {
@ -48,7 +48,7 @@ class CourseController extends Controller
} }
/** /**
* @Get("/pager", name="web.course.pager") * @Get("/pager", name="desktop.course.pager")
*/ */
public function pagerAction() public function pagerAction()
{ {
@ -64,7 +64,7 @@ class CourseController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}", name="web.course.show") * @Get("/{id:[0-9]+}", name="desktop.course.show")
*/ */
public function showAction($id) public function showAction($id)
{ {
@ -90,7 +90,7 @@ class CourseController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/packages", name="web.course.packages") * @Get("/{id:[0-9]+}/packages", name="desktop.course.packages")
*/ */
public function packagesAction($id) public function packagesAction($id)
{ {
@ -104,7 +104,7 @@ class CourseController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/consults", name="web.course.consults") * @Get("/{id:[0-9]+}/consults", name="desktop.course.consults")
*/ */
public function consultsAction($id) public function consultsAction($id)
{ {
@ -120,7 +120,7 @@ class CourseController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/reviews", name="web.course.reviews") * @Get("/{id:[0-9]+}/reviews", name="desktop.course.reviews")
*/ */
public function reviewsAction($id) public function reviewsAction($id)
{ {
@ -136,7 +136,7 @@ class CourseController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/recommended", name="web.course.recommended") * @Get("/{id:[0-9]+}/recommended", name="desktop.course.recommended")
*/ */
public function recommendedAction($id) public function recommendedAction($id)
{ {
@ -150,7 +150,7 @@ class CourseController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/related", name="web.course.related") * @Get("/{id:[0-9]+}/related", name="desktop.course.related")
*/ */
public function relatedAction($id) public function relatedAction($id)
{ {
@ -164,7 +164,7 @@ class CourseController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/topics", name="web.course.topics") * @Get("/{id:[0-9]+}/topics", name="desktop.course.topics")
*/ */
public function topicsAction($id) public function topicsAction($id)
{ {
@ -178,7 +178,7 @@ class CourseController extends Controller
} }
/** /**
* @Post("/{id:[0-9]+}/favorite", name="web.course.favorite") * @Post("/{id:[0-9]+}/favorite", name="desktop.course.favorite")
*/ */
public function favoriteAction($id) public function favoriteAction($id)
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\Frontend\Danmu\DanmuCreate as DanmuCreateService; use App\Services\Frontend\Danmu\DanmuCreate as DanmuCreateService;
use App\Services\Frontend\Danmu\DanmuInfo as DanmuInfoService; use App\Services\Frontend\Danmu\DanmuInfo as DanmuInfoService;
@ -12,7 +12,7 @@ class DanmuController extends Controller
{ {
/** /**
* @Post("/create", name="web.danmu.create") * @Post("/create", name="desktop.danmu.create")
*/ */
public function createAction() public function createAction()
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Traits\Response as ResponseTrait; use App\Traits\Response as ResponseTrait;
@ -13,7 +13,7 @@ class ErrorController extends \Phalcon\Mvc\Controller
use ResponseTrait; use ResponseTrait;
/** /**
* @Get("/400", name="web.error.400") * @Get("/400", name="desktop.error.400")
*/ */
public function show400Action() public function show400Action()
{ {
@ -21,7 +21,7 @@ class ErrorController extends \Phalcon\Mvc\Controller
} }
/** /**
* @Get("/401", name="web.error.401") * @Get("/401", name="desktop.error.401")
*/ */
public function show401Action() public function show401Action()
{ {
@ -29,7 +29,7 @@ class ErrorController extends \Phalcon\Mvc\Controller
} }
/** /**
* @Get("/403", name="web.error.403") * @Get("/403", name="desktop.error.403")
*/ */
public function show403Action() public function show403Action()
{ {
@ -37,7 +37,7 @@ class ErrorController extends \Phalcon\Mvc\Controller
} }
/** /**
* @Get("/404", name="web.error.404") * @Get("/404", name="desktop.error.404")
*/ */
public function show404Action() public function show404Action()
{ {
@ -52,7 +52,7 @@ class ErrorController extends \Phalcon\Mvc\Controller
} }
/** /**
* @Get("/500", name="web.error.500") * @Get("/500", name="desktop.error.500")
*/ */
public function show500Action() public function show500Action()
{ {
@ -60,7 +60,7 @@ class ErrorController extends \Phalcon\Mvc\Controller
} }
/** /**
* @Get("/503", name="web.error.503") * @Get("/503", name="desktop.error.503")
*/ */
public function show503Action() public function show503Action()
{ {
@ -68,7 +68,7 @@ class ErrorController extends \Phalcon\Mvc\Controller
} }
/** /**
* @Get("/shutdown", name="web.error.shutdown") * @Get("/shutdown", name="desktop.error.shutdown")
*/ */
public function shutdownAction() public function shutdownAction()
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\Frontend\Help\HelpInfo as HelpInfoService; use App\Services\Frontend\Help\HelpInfo as HelpInfoService;
use App\Services\Frontend\Help\HelpList as HelpListService; use App\Services\Frontend\Help\HelpList as HelpListService;
@ -12,7 +12,7 @@ class HelpController extends Controller
{ {
/** /**
* @Get("/", name="web.help.index") * @Get("/", name="desktop.help.index")
*/ */
public function indexAction() public function indexAction()
{ {
@ -26,7 +26,7 @@ class HelpController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}", name="web.help.show") * @Get("/{id:[0-9]+}", name="desktop.help.show")
*/ */
public function showAction($id) public function showAction($id)
{ {

View File

@ -1,8 +1,8 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Http\Web\Services\Im as ImService; use App\Http\Desktop\Services\Im as ImService;
use App\Traits\Response as ResponseTrait; use App\Traits\Response as ResponseTrait;
use Phalcon\Mvc\View; use Phalcon\Mvc\View;
@ -19,12 +19,12 @@ class ImController extends Controller
parent::initialize(); parent::initialize();
if ($this->authUser->id == 0) { if ($this->authUser->id == 0) {
return $this->response->redirect(['for' => 'web.account.login']); return $this->response->redirect(['for' => 'desktop.account.login']);
} }
} }
/** /**
* @Get("/", name="web.im.index") * @Get("/", name="desktop.im.index")
*/ */
public function indexAction() public function indexAction()
{ {
@ -44,7 +44,7 @@ class ImController extends Controller
} }
/** /**
* @Get("/cs", name="web.im.cs") * @Get("/cs", name="desktop.im.cs")
*/ */
public function csAction() public function csAction()
{ {
@ -56,7 +56,7 @@ class ImController extends Controller
} }
/** /**
* @Get("/init", name="web.im.init") * @Get("/init", name="desktop.im.init")
*/ */
public function initAction() public function initAction()
{ {
@ -68,7 +68,7 @@ class ImController extends Controller
} }
/** /**
* @Get("/group/users", name="web.im.group_users") * @Get("/group/users", name="desktop.im.group_users")
*/ */
public function groupUsersAction() public function groupUsersAction()
{ {
@ -80,7 +80,7 @@ class ImController extends Controller
} }
/** /**
* @Get("/msgbox", name="web.im.msgbox") * @Get("/msgbox", name="desktop.im.msgbox")
*/ */
public function msgboxAction() public function msgboxAction()
{ {
@ -93,7 +93,7 @@ class ImController extends Controller
} }
/** /**
* @Get("/chatlog", name="web.im.chatlog") * @Get("/chatlog", name="desktop.im.chatlog")
*/ */
public function chatlogAction() public function chatlogAction()
{ {
@ -107,7 +107,7 @@ class ImController extends Controller
} }
/** /**
* @Get("/friend/msg/unread", name="web.im.unread_friend_msg") * @Get("/friend/msg/unread", name="desktop.im.unread_friend_msg")
*/ */
public function unreadFriendMessageAction() public function unreadFriendMessageAction()
{ {
@ -121,7 +121,7 @@ class ImController extends Controller
} }
/** /**
* @Get("/notice/unread", name="web.im.unread_notice") * @Get("/notice/unread", name="desktop.im.unread_notice")
*/ */
public function unreadNoticeAction() public function unreadNoticeAction()
{ {
@ -133,7 +133,7 @@ class ImController extends Controller
} }
/** /**
* @Get("/notice", name="web.im.notice") * @Get("/notice", name="desktop.im.notice")
*/ */
public function noticeAction() public function noticeAction()
{ {
@ -145,7 +145,7 @@ class ImController extends Controller
} }
/** /**
* @Post("/notice/read", name="web.im.read_notice") * @Post("/notice/read", name="desktop.im.read_notice")
*/ */
public function readNoticeAction() public function readNoticeAction()
{ {
@ -157,7 +157,7 @@ class ImController extends Controller
} }
/** /**
* @Get("/friend/status", name="web.im.friend_status") * @Get("/friend/status", name="desktop.im.friend_status")
*/ */
public function friendStatusAction() public function friendStatusAction()
{ {
@ -169,7 +169,7 @@ class ImController extends Controller
} }
/** /**
* @Get("/chat/history", name="web.im.chat_history") * @Get("/chat/history", name="desktop.im.chat_history")
*/ */
public function chatHistoryAction() public function chatHistoryAction()
{ {
@ -181,7 +181,7 @@ class ImController extends Controller
} }
/** /**
* @Post("/user/bind", name="web.im.bind_user") * @Post("/user/bind", name="desktop.im.bind_user")
*/ */
public function bindUserAction() public function bindUserAction()
{ {
@ -193,7 +193,7 @@ class ImController extends Controller
} }
/** /**
* @Post("/msg/chat/send", name="web.im.send_chat_msg") * @Post("/msg/chat/send", name="desktop.im.send_chat_msg")
*/ */
public function sendChatMessageAction() public function sendChatMessageAction()
{ {
@ -208,7 +208,7 @@ class ImController extends Controller
} }
/** /**
* @Post("/msg/cs/send", name="web.im.send_cs_msg") * @Post("/msg/cs/send", name="desktop.im.send_cs_msg")
*/ */
public function sendCsMessageAction() public function sendCsMessageAction()
{ {
@ -223,7 +223,7 @@ class ImController extends Controller
} }
/** /**
* @Post("/status/update", name="web.im.update_status") * @Post("/status/update", name="desktop.im.update_status")
*/ */
public function updateStatusAction() public function updateStatusAction()
{ {
@ -235,7 +235,7 @@ class ImController extends Controller
} }
/** /**
* @Post("/sign/update", name="web.web.im.update_sign") * @Post("/sign/update", name="desktop.desktop.im.update_sign")
*/ */
public function updateSignatureAction() public function updateSignatureAction()
{ {
@ -247,7 +247,7 @@ class ImController extends Controller
} }
/** /**
* @Post("/skin/update", name="web.web.im.update_skin") * @Post("/skin/update", name="desktop.desktop.im.update_skin")
*/ */
public function updateSKinAction() public function updateSKinAction()
{ {
@ -259,7 +259,7 @@ class ImController extends Controller
} }
/** /**
* @Post("/friend/apply", name="web.im.apply_friend") * @Post("/friend/apply", name="desktop.im.apply_friend")
*/ */
public function applyFriendAction() public function applyFriendAction()
{ {
@ -273,7 +273,7 @@ class ImController extends Controller
} }
/** /**
* @Post("/friend/accept", name="web.im.accept_friend") * @Post("/friend/accept", name="desktop.im.accept_friend")
*/ */
public function acceptFriendAction() public function acceptFriendAction()
{ {
@ -285,7 +285,7 @@ class ImController extends Controller
} }
/** /**
* @Post("/friend/refuse", name="web.im.refuse_friend") * @Post("/friend/refuse", name="desktop.im.refuse_friend")
*/ */
public function refuseFriendAction() public function refuseFriendAction()
{ {
@ -297,7 +297,7 @@ class ImController extends Controller
} }
/** /**
* @Post("/group/apply", name="web.im.apply_group") * @Post("/group/apply", name="desktop.im.apply_group")
*/ */
public function applyGroupAction() public function applyGroupAction()
{ {
@ -311,7 +311,7 @@ class ImController extends Controller
} }
/** /**
* @Post("/group/accept", name="web.web.im.accept_group") * @Post("/group/accept", name="desktop.desktop.im.accept_group")
*/ */
public function acceptGroupAction() public function acceptGroupAction()
{ {
@ -323,7 +323,7 @@ class ImController extends Controller
} }
/** /**
* @Post("/group/refuse", name="web.web.im.refuse_group") * @Post("/group/refuse", name="desktop.desktop.im.refuse_group")
*/ */
public function refuseGroupAction() public function refuseGroupAction()
{ {
@ -335,7 +335,7 @@ class ImController extends Controller
} }
/** /**
* @Post("/friend/{id:[0-9]+}/quit", name="web.im.quit_friend") * @Post("/friend/{id:[0-9]+}/quit", name="desktop.im.quit_friend")
*/ */
public function quitFriendAction($id) public function quitFriendAction($id)
{ {
@ -349,7 +349,7 @@ class ImController extends Controller
} }
/** /**
* @Post("/group/{id:[0-9]+}/quit", name="web.im.quit_group") * @Post("/group/{id:[0-9]+}/quit", name="desktop.im.quit_group")
*/ */
public function quitGroupAction($id) public function quitGroupAction($id)
{ {

View File

@ -1,8 +1,8 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Http\Web\Services\ImGroup as ImGroupService; use App\Http\Desktop\Services\ImGroup as ImGroupService;
use Phalcon\Mvc\View; use Phalcon\Mvc\View;
/** /**
@ -12,7 +12,7 @@ class ImGroupController extends Controller
{ {
/** /**
* @Get("/list", name="web.group.list") * @Get("/list", name="desktop.group.list")
*/ */
public function listAction() public function listAction()
{ {
@ -22,7 +22,7 @@ class ImGroupController extends Controller
} }
/** /**
* @Get("/pager", name="web.group.pager") * @Get("/pager", name="desktop.group.pager")
*/ */
public function pagerAction() public function pagerAction()
{ {
@ -38,7 +38,7 @@ class ImGroupController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}", name="web.group.show") * @Get("/{id:[0-9]+}", name="desktop.group.show")
*/ */
public function showAction($id) public function showAction($id)
{ {
@ -53,7 +53,7 @@ class ImGroupController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/users", name="web.group.users") * @Get("/{id:[0-9]+}/users", name="desktop.group.users")
*/ */
public function usersAction($id) public function usersAction($id)
{ {
@ -69,7 +69,7 @@ class ImGroupController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/users/active", name="web.group.active_users") * @Get("/{id:[0-9]+}/users/active", name="desktop.group.active_users")
*/ */
public function activeUsersAction($id) public function activeUsersAction($id)
{ {

View File

@ -1,8 +1,8 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Http\Web\Services\ImGroup as ImGroupService; use App\Http\Desktop\Services\ImGroup as ImGroupService;
/** /**
* @RoutePrefix("/igm") * @RoutePrefix("/igm")
@ -11,7 +11,7 @@ class ImGroupManageController extends Controller
{ {
/** /**
* @Get("/{id:[0-9]+}/users", name="web.igm.users") * @Get("/{id:[0-9]+}/users", name="desktop.igm.users")
*/ */
public function usersAction($id) public function usersAction($id)
{ {
@ -27,7 +27,7 @@ class ImGroupManageController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/edit", name="web.igm.edit") * @Get("/{id:[0-9]+}/edit", name="desktop.igm.edit")
*/ */
public function editAction($id) public function editAction($id)
{ {
@ -40,7 +40,7 @@ class ImGroupManageController extends Controller
} }
/** /**
* @Post("/{id:[0-9]+}/update", name="web.igm.update") * @Post("/{id:[0-9]+}/update", name="desktop.igm.update")
*/ */
public function updateAction($id) public function updateAction($id)
{ {
@ -54,7 +54,7 @@ class ImGroupManageController extends Controller
} }
/** /**
* @Post("/{gid:[0-9]+}/user/{uid:[0-9]+}/delete", name="web.igm.delete_user") * @Post("/{gid:[0-9]+}/user/{uid:[0-9]+}/delete", name="desktop.igm.delete_user")
*/ */
public function deleteGroupUserAction($gid, $uid) public function deleteGroupUserAction($gid, $uid)
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
/** /**
* @RoutePrefix("/im") * @RoutePrefix("/im")
@ -9,7 +9,7 @@ class ImSummaryController extends Controller
{ {
/** /**
* @Get("/active/groups", name="web.im.active_groups") * @Get("/active/groups", name="desktop.im.active_groups")
*/ */
public function activeGroupsAction() public function activeGroupsAction()
{ {
@ -17,7 +17,7 @@ class ImSummaryController extends Controller
} }
/** /**
* @Get("/active/users", name="web.im.active_users") * @Get("/active/users", name="desktop.im.active_users")
*/ */
public function activeUsersAction() public function activeUsersAction()
{ {
@ -25,7 +25,7 @@ class ImSummaryController extends Controller
} }
/** /**
* @Get("/online/users", name="web.im.online_users") * @Get("/online/users", name="desktop.im.online_users")
*/ */
public function onlineUsersAction() public function onlineUsersAction()
{ {

View File

@ -1,14 +1,14 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Http\Web\Services\Index as IndexService; use App\Http\Desktop\Services\Index as IndexService;
class IndexController extends Controller class IndexController extends Controller
{ {
/** /**
* @Get("/", name="web.index") * @Get("/", name="desktop.index")
*/ */
public function indexAction() public function indexAction()
{ {

View File

@ -1,9 +1,9 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Models\User as UserModel; use App\Models\User as UserModel;
use App\Services\Auth\Web as WebAuth; use App\Services\Auth\Desktop as DesktopAuth;
use App\Traits\Response as ResponseTrait; use App\Traits\Response as ResponseTrait;
use App\Traits\Security as SecurityTrait; use App\Traits\Security as SecurityTrait;
use Phalcon\Mvc\Dispatcher; use Phalcon\Mvc\Dispatcher;
@ -41,7 +41,7 @@ class LayerController extends \Phalcon\Mvc\Controller
protected function getAuthUser() protected function getAuthUser()
{ {
/** /**
* @var WebAuth $auth * @var DesktopAuth $auth
*/ */
$auth = $this->getDI()->get('auth'); $auth = $this->getDI()->get('auth');

View File

@ -1,8 +1,8 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Http\Web\Services\Live as LiveService; use App\Http\Desktop\Services\Live as LiveService;
use App\Traits\Response as ResponseTrait; use App\Traits\Response as ResponseTrait;
use Phalcon\Mvc\View; use Phalcon\Mvc\View;
@ -15,7 +15,7 @@ class LiveController extends Controller
use ResponseTrait; use ResponseTrait;
/** /**
* @Get("/{id:[0-9]+}/preview", name="web.live.preview") * @Get("/{id:[0-9]+}/preview", name="desktop.live.preview")
*/ */
public function previewAction($id) public function previewAction($id)
{ {
@ -29,7 +29,7 @@ class LiveController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/chats", name="web.live.chats") * @Get("/{id:[0-9]+}/chats", name="desktop.live.chats")
*/ */
public function chatsAction($id) public function chatsAction($id)
{ {
@ -43,7 +43,7 @@ class LiveController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/stats", name="web.live.stats") * @Get("/{id:[0-9]+}/stats", name="desktop.live.stats")
*/ */
public function statsAction($id) public function statsAction($id)
{ {
@ -57,7 +57,7 @@ class LiveController extends Controller
} }
/** /**
* @Post("/{id:[0-9]+}/user/bind", name="web.live.bind_user") * @Post("/{id:[0-9]+}/user/bind", name="desktop.live.bind_user")
*/ */
public function bindUserAction($id) public function bindUserAction($id)
{ {
@ -69,7 +69,7 @@ class LiveController extends Controller
} }
/** /**
* @Post("/{id:[0-9]+}/msg/send", name="web.live.send_msg") * @Post("/{id:[0-9]+}/msg/send", name="desktop.live.send_msg")
*/ */
public function sendMessageAction($id) public function sendMessageAction($id)
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\Frontend\My\AccountInfo as AccountInfoService; use App\Services\Frontend\My\AccountInfo as AccountInfoService;
use App\Services\Frontend\My\ConsultList as MyConsultListService; use App\Services\Frontend\My\ConsultList as MyConsultListService;
@ -25,12 +25,12 @@ class MyController extends Controller
parent::initialize(); parent::initialize();
if ($this->authUser->id == 0) { if ($this->authUser->id == 0) {
$this->response->redirect(['for' => 'web.account.login']); $this->response->redirect(['for' => 'desktop.account.login']);
} }
} }
/** /**
* @Get("/", name="web.my.index") * @Get("/", name="desktop.my.index")
*/ */
public function indexAction() public function indexAction()
{ {
@ -38,7 +38,7 @@ class MyController extends Controller
} }
/** /**
* @Get("/profile", name="web.my.profile") * @Get("/profile", name="desktop.my.profile")
*/ */
public function profileAction() public function profileAction()
{ {
@ -50,7 +50,7 @@ class MyController extends Controller
} }
/** /**
* @Get("/account", name="web.my.account") * @Get("/account", name="desktop.my.account")
*/ */
public function accountAction() public function accountAction()
{ {
@ -62,7 +62,7 @@ class MyController extends Controller
} }
/** /**
* @Get("/courses", name="web.my.courses") * @Get("/courses", name="desktop.my.courses")
*/ */
public function coursesAction() public function coursesAction()
{ {
@ -76,7 +76,7 @@ class MyController extends Controller
} }
/** /**
* @Get("/favorites", name="web.my.favorites") * @Get("/favorites", name="desktop.my.favorites")
*/ */
public function favoritesAction() public function favoritesAction()
{ {
@ -90,7 +90,7 @@ class MyController extends Controller
} }
/** /**
* @Get("/consults", name="web.my.consults") * @Get("/consults", name="desktop.my.consults")
*/ */
public function consultsAction() public function consultsAction()
{ {
@ -104,7 +104,7 @@ class MyController extends Controller
} }
/** /**
* @Get("/reviews", name="web.my.reviews") * @Get("/reviews", name="desktop.my.reviews")
*/ */
public function reviewsAction() public function reviewsAction()
{ {
@ -118,7 +118,7 @@ class MyController extends Controller
} }
/** /**
* @Get("/orders", name="web.my.orders") * @Get("/orders", name="desktop.my.orders")
*/ */
public function ordersAction() public function ordersAction()
{ {
@ -132,7 +132,7 @@ class MyController extends Controller
} }
/** /**
* @Get("/refunds", name="web.my.refunds") * @Get("/refunds", name="desktop.my.refunds")
*/ */
public function refundsAction() public function refundsAction()
{ {
@ -146,7 +146,7 @@ class MyController extends Controller
} }
/** /**
* @Get("/friends", name="web.my.friends") * @Get("/friends", name="desktop.my.friends")
*/ */
public function friendsAction() public function friendsAction()
{ {
@ -159,7 +159,7 @@ class MyController extends Controller
} }
/** /**
* @Get("/groups", name="web.my.groups") * @Get("/groups", name="desktop.my.groups")
*/ */
public function groupsAction() public function groupsAction()
{ {
@ -175,7 +175,7 @@ class MyController extends Controller
} }
/** /**
* @Post("/profile/update", name="web.my.update_profile") * @Post("/profile/update", name="desktop.my.update_profile")
*/ */
public function updateProfileAction() public function updateProfileAction()
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Models\Order as OrderModel; use App\Models\Order as OrderModel;
use App\Services\Frontend\Order\OrderCancel as OrderCancelService; use App\Services\Frontend\Order\OrderCancel as OrderCancelService;
@ -16,7 +16,7 @@ class OrderController extends Controller
{ {
/** /**
* @Get("/info", name="web.order.info") * @Get("/info", name="desktop.order.info")
*/ */
public function infoAction() public function infoAction()
{ {
@ -31,7 +31,7 @@ class OrderController extends Controller
} }
/** /**
* @Get("/confirm", name="web.order.confirm") * @Get("/confirm", name="desktop.order.confirm")
*/ */
public function confirmAction() public function confirmAction()
{ {
@ -46,7 +46,7 @@ class OrderController extends Controller
} }
/** /**
* @Post("/create", name="web.order.create") * @Post("/create", name="desktop.order.create")
*/ */
public function createAction() public function createAction()
{ {
@ -54,13 +54,13 @@ class OrderController extends Controller
$order = $service->handle(); $order = $service->handle();
$location = $this->url->get(['for' => 'web.order.pay'], ['sn' => $order->sn]); $location = $this->url->get(['for' => 'desktop.order.pay'], ['sn' => $order->sn]);
return $this->jsonSuccess(['location' => $location]); return $this->jsonSuccess(['location' => $location]);
} }
/** /**
* @Get("/pay", name="web.order.pay") * @Get("/pay", name="desktop.order.pay")
*/ */
public function payAction() public function payAction()
{ {
@ -71,14 +71,14 @@ class OrderController extends Controller
$order = $service->handle($sn); $order = $service->handle($sn);
if ($order['status'] != OrderModel::STATUS_PENDING) { if ($order['status'] != OrderModel::STATUS_PENDING) {
$this->response->redirect(['for' => 'web.my.orders']); $this->response->redirect(['for' => 'desktop.my.orders']);
} }
$this->view->setVar('order', $order); $this->view->setVar('order', $order);
} }
/** /**
* @Post("/cancel", name="web.order.cancel") * @Post("/cancel", name="desktop.order.cancel")
*/ */
public function cancelAction() public function cancelAction()
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\Frontend\Package\CourseList as PackageCourseListService; use App\Services\Frontend\Package\CourseList as PackageCourseListService;
use App\Services\Frontend\Package\PackageInfo as PackageInfoService; use App\Services\Frontend\Package\PackageInfo as PackageInfoService;
@ -12,7 +12,7 @@ class PackageController extends Controller
{ {
/** /**
* @Get("/{id:[0-9]+}/info", name="web.package.info") * @Get("/{id:[0-9]+}/info", name="desktop.package.info")
*/ */
public function infoAction($id) public function infoAction($id)
{ {
@ -24,7 +24,7 @@ class PackageController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/courses", name="web.package.courses") * @Get("/{id:[0-9]+}/courses", name="desktop.package.courses")
*/ */
public function coursesAction($id) public function coursesAction($id)
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\Frontend\Page\PageInfo as PageInfoService; use App\Services\Frontend\Page\PageInfo as PageInfoService;
@ -11,7 +11,7 @@ class PageController extends Controller
{ {
/** /**
* @Get("/{id:[0-9]+}", name="web.page.show") * @Get("/{id:[0-9]+}", name="desktop.page.show")
*/ */
public function showAction($id) public function showAction($id)
{ {

View File

@ -1,9 +1,9 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Library\CsrfToken as CsrfTokenService; use App\Library\CsrfToken as CsrfTokenService;
use App\Repos\UploadFile as UploadFileRepo; use App\Repos\Upload as UploadRepo;
use App\Services\Pay\Alipay as AlipayService; use App\Services\Pay\Alipay as AlipayService;
use App\Services\Pay\Wxpay as WxpayService; use App\Services\Pay\Wxpay as WxpayService;
use App\Services\Storage as StorageService; use App\Services\Storage as StorageService;
@ -19,11 +19,11 @@ class PublicController extends \Phalcon\Mvc\Controller
use SecurityTrait; use SecurityTrait;
/** /**
* @Get("/img/{id:[0-9]+}", name="web.img") * @Get("/img/{id:[0-9]+}", name="desktop.img")
*/ */
public function imageAction($id) public function imageAction($id)
{ {
$repo = new UploadFileRepo(); $repo = new UploadRepo();
$file = $repo->findById($id); $file = $repo->findById($id);
@ -44,7 +44,7 @@ class PublicController extends \Phalcon\Mvc\Controller
} }
/** /**
* @Get("/qrcode", name="web.qrcode") * @Get("/qrcode", name="desktop.qrcode")
*/ */
public function qrcodeAction() public function qrcodeAction()
{ {
@ -62,7 +62,7 @@ class PublicController extends \Phalcon\Mvc\Controller
} }
/** /**
* @Post("/token/refresh", name="web.refresh_token") * @Post("/token/refresh", name="desktop.refresh_token")
*/ */
public function refreshTokenAction() public function refreshTokenAction()
{ {
@ -76,7 +76,7 @@ class PublicController extends \Phalcon\Mvc\Controller
} }
/** /**
* @Post("/alipay/notify", name="web.alipay_notify") * @Post("/alipay/notify", name="desktop.alipay_notify")
*/ */
public function alipayNotifyAction() public function alipayNotifyAction()
{ {
@ -92,7 +92,7 @@ class PublicController extends \Phalcon\Mvc\Controller
} }
/** /**
* @Post("/wxpay/notify", name="web.wxpay_notify") * @Post("/wxpay/notify", name="desktop.wxpay_notify")
*/ */
public function wxpayNotifyAction() public function wxpayNotifyAction()
{ {
@ -108,7 +108,7 @@ class PublicController extends \Phalcon\Mvc\Controller
} }
/** /**
* @Post("/live/notify", name="web.live_notify") * @Post("/live/notify", name="desktop.live_notify")
*/ */
public function liveNotifyAction() public function liveNotifyAction()
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\Frontend\Order\OrderInfo as OrderInfoService; use App\Services\Frontend\Order\OrderInfo as OrderInfoService;
use App\Services\Frontend\Refund\RefundCancel as RefundCancelService; use App\Services\Frontend\Refund\RefundCancel as RefundCancelService;
@ -16,7 +16,7 @@ class RefundController extends Controller
{ {
/** /**
* @Get("/confirm", name="web.refund.confirm") * @Get("/confirm", name="desktop.refund.confirm")
*/ */
public function confirmAction() public function confirmAction()
{ {
@ -36,7 +36,7 @@ class RefundController extends Controller
} }
/** /**
* @Post("/create", name="web.refund.create") * @Post("/create", name="desktop.refund.create")
*/ */
public function createAction() public function createAction()
{ {
@ -45,7 +45,7 @@ class RefundController extends Controller
$service->handle(); $service->handle();
$content = [ $content = [
'location' => $this->url->get(['for' => 'web.my.refunds']), 'location' => $this->url->get(['for' => 'desktop.my.refunds']),
'msg' => '申请退款成功', 'msg' => '申请退款成功',
]; ];
@ -53,7 +53,7 @@ class RefundController extends Controller
} }
/** /**
* @Get("/info", name="web.refund.info") * @Get("/info", name="desktop.refund.info")
*/ */
public function infoAction() public function infoAction()
{ {
@ -68,7 +68,7 @@ class RefundController extends Controller
} }
/** /**
* @Post("/cancel", name="web.refund.cancel") * @Post("/cancel", name="desktop.refund.cancel")
*/ */
public function cancelAction() public function cancelAction()
{ {
@ -79,7 +79,7 @@ class RefundController extends Controller
$service->handle($sn); $service->handle($sn);
$content = [ $content = [
'location' => $this->url->get(['for' => 'web.my.refunds']), 'location' => $this->url->get(['for' => 'desktop.my.refunds']),
'msg' => '取消退款成功', 'msg' => '取消退款成功',
]; ];

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\Frontend\Review\ReviewCreate as ReviewCreateService; use App\Services\Frontend\Review\ReviewCreate as ReviewCreateService;
use App\Services\Frontend\Review\ReviewDelete as ReviewDeleteService; use App\Services\Frontend\Review\ReviewDelete as ReviewDeleteService;
@ -16,7 +16,7 @@ class ReviewController extends Controller
{ {
/** /**
* @Get("/add", name="web.review.add") * @Get("/add", name="desktop.review.add")
*/ */
public function addAction() public function addAction()
{ {
@ -24,7 +24,7 @@ class ReviewController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/edit", name="web.review.edit") * @Get("/{id:[0-9]+}/edit", name="desktop.review.edit")
*/ */
public function editAction($id) public function editAction($id)
{ {
@ -37,7 +37,7 @@ class ReviewController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/info", name="web.review.info") * @Get("/{id:[0-9]+}/info", name="desktop.review.info")
*/ */
public function infoAction($id) public function infoAction($id)
{ {
@ -49,7 +49,7 @@ class ReviewController extends Controller
} }
/** /**
* @Post("/create", name="web.review.create") * @Post("/create", name="desktop.review.create")
*/ */
public function createAction() public function createAction()
{ {
@ -70,7 +70,7 @@ class ReviewController extends Controller
} }
/** /**
* @Post("/{id:[0-9]+}/update", name="web.review.update") * @Post("/{id:[0-9]+}/update", name="desktop.review.update")
*/ */
public function updateAction($id) public function updateAction($id)
{ {
@ -91,7 +91,7 @@ class ReviewController extends Controller
} }
/** /**
* @Post("/{id:[0-9]+}/delete", name="web.review.delete") * @Post("/{id:[0-9]+}/delete", name="desktop.review.delete")
*/ */
public function deleteAction($id) public function deleteAction($id)
{ {
@ -105,7 +105,7 @@ class ReviewController extends Controller
} }
/** /**
* @Post("/{id:[0-9]+}/like", name="web.review.like") * @Post("/{id:[0-9]+}/like", name="desktop.review.like")
*/ */
public function likeAction($id) public function likeAction($id)
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\Frontend\Search\Course as CourseSearchService; use App\Services\Frontend\Search\Course as CourseSearchService;
use App\Services\Frontend\Search\Group as GroupSearchService; use App\Services\Frontend\Search\Group as GroupSearchService;
@ -16,7 +16,7 @@ class SearchController extends Controller
use ResponseTrait; use ResponseTrait;
/** /**
* @Get("/", name="web.search.index") * @Get("/", name="desktop.search.index")
*/ */
public function indexAction() public function indexAction()
{ {
@ -24,7 +24,7 @@ class SearchController extends Controller
$type = $this->request->get('type', ['trim'], 'course'); $type = $this->request->get('type', ['trim'], 'course');
if (empty($query)) { if (empty($query)) {
return $this->response->redirect(['for' => 'web.course.list']); return $this->response->redirect(['for' => 'desktop.course.list']);
} }
$this->seo->prependTitle(['搜索', $query]); $this->seo->prependTitle(['搜索', $query]);
@ -43,7 +43,7 @@ class SearchController extends Controller
} }
/** /**
* @Get("/form", name="web.search.form") * @Get("/form", name="desktop.search.form")
*/ */
public function formAction() public function formAction()
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\Frontend\Teacher\TeacherList as TeacherListService; use App\Services\Frontend\Teacher\TeacherList as TeacherListService;
use Phalcon\Mvc\View; use Phalcon\Mvc\View;
@ -12,7 +12,7 @@ class TeacherController extends Controller
{ {
/** /**
* @Get("/list", name="web.teacher.list") * @Get("/list", name="desktop.teacher.list")
*/ */
public function listAction() public function listAction()
{ {
@ -20,7 +20,7 @@ class TeacherController extends Controller
} }
/** /**
* @Get("/pager", name="web.teacher.pager") * @Get("/pager", name="desktop.teacher.pager")
*/ */
public function pagerAction() public function pagerAction()
{ {
@ -36,7 +36,7 @@ class TeacherController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}", name="web.teacher.show") * @Get("/{id:[0-9]+}", name="desktop.teacher.show")
*/ */
public function showAction($id) public function showAction($id)
{ {

View File

@ -1,7 +1,7 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\Frontend\Teaching\ConsultList as ConsultListService; use App\Services\Frontend\Teaching\ConsultList as ConsultListService;
use App\Services\Frontend\Teaching\CourseList as CourseListService; use App\Services\Frontend\Teaching\CourseList as CourseListService;
@ -16,7 +16,7 @@ class TeachingController extends Controller
{ {
/** /**
* @Get("/", name="web.teaching.index") * @Get("/", name="desktop.teaching.index")
*/ */
public function indexAction() public function indexAction()
{ {
@ -24,7 +24,7 @@ class TeachingController extends Controller
} }
/** /**
* @Get("/courses", name="web.teaching.courses") * @Get("/courses", name="desktop.teaching.courses")
*/ */
public function coursesAction() public function coursesAction()
{ {
@ -38,7 +38,7 @@ class TeachingController extends Controller
} }
/** /**
* @Get("/lives", name="web.teaching.lives") * @Get("/lives", name="desktop.teaching.lives")
*/ */
public function livesAction() public function livesAction()
{ {
@ -52,7 +52,7 @@ class TeachingController extends Controller
} }
/** /**
* @Get("/consults", name="web.teaching.consults") * @Get("/consults", name="desktop.teaching.consults")
*/ */
public function consultsAction() public function consultsAction()
{ {
@ -66,7 +66,7 @@ class TeachingController extends Controller
} }
/** /**
* @Get("/live/push", name="web.teaching.live_push") * @Get("/live/push", name="desktop.teaching.live_push")
*/ */
public function livePushAction() public function livePushAction()
{ {
@ -75,7 +75,7 @@ class TeachingController extends Controller
$pushUrl = $service->handle(); $pushUrl = $service->handle();
$qrcode = $this->url->get( $qrcode = $this->url->get(
['for' => 'web.qrcode'], ['for' => 'desktop.qrcode'],
['text' => urlencode($pushUrl)] ['text' => urlencode($pushUrl)]
); );

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\Frontend\Topic\CourseList as TopicCourseListService; use App\Services\Frontend\Topic\CourseList as TopicCourseListService;
use App\Services\Frontend\Topic\TopicInfo as TopicInfoService; use App\Services\Frontend\Topic\TopicInfo as TopicInfoService;
@ -13,7 +13,7 @@ class TopicController extends Controller
{ {
/** /**
* @Get("/{id:[0-9]+}", name="web.topic.show") * @Get("/{id:[0-9]+}", name="desktop.topic.show")
*/ */
public function showAction($id) public function showAction($id)
{ {
@ -28,7 +28,7 @@ class TopicController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/courses", name="web.topic.courses") * @Get("/{id:[0-9]+}/courses", name="desktop.topic.courses")
*/ */
public function coursesAction($id) public function coursesAction($id)
{ {

View File

@ -1,8 +1,8 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Http\Web\Services\Trade as TradeService; use App\Http\Desktop\Services\Trade as TradeService;
use App\Services\Frontend\Trade\TradeInfo as TradeInfoService; use App\Services\Frontend\Trade\TradeInfo as TradeInfoService;
/** /**
@ -12,7 +12,7 @@ class TradeController extends Controller
{ {
/** /**
* @Post("/create", name="web.trade.create") * @Post("/create", name="desktop.trade.create")
*/ */
public function createAction() public function createAction()
{ {
@ -24,7 +24,7 @@ class TradeController extends Controller
} }
/** /**
* @Get("/status", name="web.trade.status") * @Get("/status", name="desktop.trade.status")
*/ */
public function statusAction() public function statusAction()
{ {

View File

@ -1,7 +1,7 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\MyStorage as StorageService; use App\Services\MyStorage as StorageService;
@ -12,7 +12,7 @@ class UploadController extends Controller
{ {
/** /**
* @Post("/avatar/img", name="web.upload.avatar_img") * @Post("/avatar/img", name="desktop.upload.avatar_img")
*/ */
public function uploadAvatarImageAction() public function uploadAvatarImageAction()
{ {
@ -30,14 +30,14 @@ class UploadController extends Controller
} }
/** /**
* @Post("/im/img", name="web.upload.im_img") * @Post("/im/img", name="desktop.upload.im_img")
*/ */
public function uploadImImageAction() public function uploadImImageAction()
{ {
} }
/** /**
* @Post("/im/file", name="web.upload.im_file") * @Post("/im/file", name="desktop.upload.im_file")
*/ */
public function uploadImFileAction() public function uploadImFileAction()
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\Frontend\User\CourseList as UserCourseListService; use App\Services\Frontend\User\CourseList as UserCourseListService;
use App\Services\Frontend\User\FavoriteList as UserFavoriteListService; use App\Services\Frontend\User\FavoriteList as UserFavoriteListService;
@ -16,7 +16,7 @@ class UserController extends Controller
{ {
/** /**
* @Get("/{id:[0-9]+}", name="web.user.show") * @Get("/{id:[0-9]+}", name="desktop.user.show")
*/ */
public function showAction($id) public function showAction($id)
{ {
@ -30,7 +30,7 @@ class UserController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/courses", name="web.user.courses") * @Get("/{id:[0-9]+}/courses", name="desktop.user.courses")
*/ */
public function coursesAction($id) public function coursesAction($id)
{ {
@ -46,7 +46,7 @@ class UserController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/favorites", name="web.user.favorites") * @Get("/{id:[0-9]+}/favorites", name="desktop.user.favorites")
*/ */
public function favoritesAction($id) public function favoritesAction($id)
{ {
@ -62,7 +62,7 @@ class UserController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/friends", name="web.user.friends") * @Get("/{id:[0-9]+}/friends", name="desktop.user.friends")
*/ */
public function friendsAction($id) public function friendsAction($id)
{ {
@ -78,7 +78,7 @@ class UserController extends Controller
} }
/** /**
* @Get("/{id:[0-9]+}/groups", name="web.user.groups") * @Get("/{id:[0-9]+}/groups", name="desktop.user.groups")
*/ */
public function groupsAction($id) public function groupsAction($id)
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\Frontend\Verify\EmailCode as EmailCodeService; use App\Services\Frontend\Verify\EmailCode as EmailCodeService;
use App\Services\Frontend\Verify\SmsCode as SmsCodeService; use App\Services\Frontend\Verify\SmsCode as SmsCodeService;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Controllers; namespace App\Http\Desktop\Controllers;
use App\Services\Frontend\Vip\CourseList as VipCourseListService; use App\Services\Frontend\Vip\CourseList as VipCourseListService;
use App\Services\Frontend\Vip\OptionList as VipOptionListService; use App\Services\Frontend\Vip\OptionList as VipOptionListService;
@ -14,7 +14,7 @@ class VipController extends Controller
{ {
/** /**
* @Get("/", name="web.vip.index") * @Get("/", name="desktop.vip.index")
*/ */
public function indexAction() public function indexAction()
{ {
@ -28,7 +28,7 @@ class VipController extends Controller
} }
/** /**
* @Get("/courses", name="web.vip.courses") * @Get("/courses", name="desktop.vip.courses")
*/ */
public function coursesAction() public function coursesAction()
{ {
@ -45,7 +45,7 @@ class VipController extends Controller
} }
/** /**
* @Get("/users", name="web.vip.users") * @Get("/users", name="desktop.vip.users")
*/ */
public function usersAction() public function usersAction()
{ {

View File

@ -1,9 +1,9 @@
<?php <?php
namespace App\Http\Web; namespace App\Http\Desktop;
use App\Library\Mvc\View as MyView; use App\Library\Mvc\View as MyView;
use App\Services\Auth\Web as WebAuth; use App\Services\Auth\Desktop as DesktopAuth;
use Phalcon\DiInterface; use Phalcon\DiInterface;
use Phalcon\Mvc\ModuleDefinitionInterface; use Phalcon\Mvc\ModuleDefinitionInterface;
@ -27,7 +27,7 @@ class Module implements ModuleDefinitionInterface
}); });
$di->setShared('auth', function () { $di->setShared('auth', function () {
return new WebAuth(); return new DesktopAuth();
}); });
} }

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Services; namespace App\Http\Desktop\Services;
use App\Repos\User as UserRepo; use App\Repos\User as UserRepo;
use App\Services\Auth as AuthService; use App\Services\Auth as AuthService;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Services; namespace App\Http\Desktop\Services;
use App\Caches\Category as CategoryCache; use App\Caches\Category as CategoryCache;
use App\Models\Category as CategoryModel; use App\Models\Category as CategoryModel;
@ -15,7 +15,7 @@ class CourseQuery extends Service
public function __construct() public function __construct()
{ {
$this->baseUrl = $this->url->get(['for' => 'web.course.list']); $this->baseUrl = $this->url->get(['for' => 'desktop.course.list']);
} }
public function handleTopCategories() public function handleTopCategories()
@ -30,7 +30,7 @@ class CourseQuery extends Service
unset($params['sc']); unset($params['sc']);
} }
$baseUrl = $this->url->get(['for' => 'web.course.list']); $baseUrl = $this->url->get(['for' => 'desktop.course.list']);
$defaultItem = [ $defaultItem = [
'id' => 'all', 'id' => 'all',
@ -78,7 +78,7 @@ class CourseQuery extends Service
unset($params['sc']); unset($params['sc']);
} }
$baseUrl = $this->url->get(['for' => 'web.course.list']); $baseUrl = $this->url->get(['for' => 'desktop.course.list']);
$defaultItem = [ $defaultItem = [
'id' => 'all', 'id' => 'all',

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Services; namespace App\Http\Desktop\Services;
use App\Models\ImUser as ImUserModel; use App\Models\ImUser as ImUserModel;
use App\Repos\ImGroup as ImGroupRepo; use App\Repos\ImGroup as ImGroupRepo;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Services; namespace App\Http\Desktop\Services;
use App\Caches\Setting as SettingCache; use App\Caches\Setting as SettingCache;
use GatewayClient\Gateway; use GatewayClient\Gateway;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Services; namespace App\Http\Desktop\Services;
use App\Models\ImFriendGroup as ImFriendGroupModel; use App\Models\ImFriendGroup as ImFriendGroupModel;
use App\Models\ImFriendUser as ImFriendUserModel; use App\Models\ImFriendUser as ImFriendUserModel;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Services; namespace App\Http\Desktop\Services;
use App\Builders\ImGroupList as ImGroupListBuilder; use App\Builders\ImGroupList as ImGroupListBuilder;
use App\Builders\ImGroupUserList as ImGroupUserListBuilder; use App\Builders\ImGroupUserList as ImGroupUserListBuilder;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Services; namespace App\Http\Desktop\Services;
use App\Models\ImGroup as ImGroupModel; use App\Models\ImGroup as ImGroupModel;
use App\Models\ImGroupUser as ImGroupUserModel; use App\Models\ImGroupUser as ImGroupUserModel;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Services; namespace App\Http\Desktop\Services;
use App\Builders\ImMessageList as ImMessageListBuilder; use App\Builders\ImMessageList as ImMessageListBuilder;
use App\Library\Paginator\Query as PagerQuery; use App\Library\Paginator\Query as PagerQuery;
@ -164,7 +164,7 @@ Trait ImMessageTrait
} }
} }
protected function sendCsMessage($from, $to) public function sendCsMessage($from, $to)
{ {
$validator = new ImMessageValidator(); $validator = new ImMessageValidator();

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Services; namespace App\Http\Desktop\Services;
use App\Library\Paginator\Query as PagerQuery; use App\Library\Paginator\Query as PagerQuery;
use App\Repos\ImNotice as ImNoticeRepo; use App\Repos\ImNotice as ImNoticeRepo;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Services; namespace App\Http\Desktop\Services;
use App\Caches\ImActiveGroupList; use App\Caches\ImActiveGroupList;
use App\Caches\ImActiveUserList; use App\Caches\ImActiveUserList;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Services; namespace App\Http\Desktop\Services;
use App\Caches\IndexCarouselList as IndexCarouselListCache; use App\Caches\IndexCarouselList as IndexCarouselListCache;
use App\Caches\IndexFreeCourseList as IndexFreeCourseListCache; use App\Caches\IndexFreeCourseList as IndexFreeCourseListCache;
@ -30,13 +30,13 @@ class Index extends Service
switch ($carousel['target']) { switch ($carousel['target']) {
case CarouselModel::TARGET_COURSE: case CarouselModel::TARGET_COURSE:
$carousels[$key]['url'] = $this->url->get([ $carousels[$key]['url'] = $this->url->get([
'for' => 'web.course.show', 'for' => 'desktop.course.show',
'id' => $carousel['content'], 'id' => $carousel['content'],
]); ]);
break; break;
case CarouselModel::TARGET_PAGE: case CarouselModel::TARGET_PAGE:
$carousels[$key]['url'] = $this->url->get([ $carousels[$key]['url'] = $this->url->get([
'for' => 'web.page.show', 'for' => 'desktop.page.show',
'id' => $carousel['content'], 'id' => $carousel['content'],
]); ]);
break; break;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Services; namespace App\Http\Desktop\Services;
use App\Library\Cache\Backend\Redis as RedisCache; use App\Library\Cache\Backend\Redis as RedisCache;
use App\Services\Frontend\ChapterTrait; use App\Services\Frontend\ChapterTrait;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Services; namespace App\Http\Desktop\Services;
class Service extends \App\Services\Service class Service extends \App\Services\Service
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace App\Http\Web\Services; namespace App\Http\Desktop\Services;
use App\Exceptions\BadRequest as BadRequestException; use App\Exceptions\BadRequest as BadRequestException;
use App\Models\Trade as TradeModel; use App\Models\Trade as TradeModel;
@ -62,7 +62,7 @@ class Trade extends Service
if ($text) { if ($text) {
$qrCode = $this->url->get( $qrCode = $this->url->get(
['for' => 'web.qrcode'], ['for' => 'desktop.qrcode'],
['text' => urlencode($text)] ['text' => urlencode($text)]
); );
} }

View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<form class="layui-form account-form" method="POST" action="{{ url({'for':'web.account.update_email'}) }}"> <form class="layui-form account-form" method="POST" action="{{ url({'for':'desktop.account.update_email'}) }}">
<br><br> <br><br>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-input-block"> <div class="layui-input-block">
@ -37,6 +37,6 @@
{% block include_js %} {% block include_js %}
{{ js_include('https://ssl.captcha.qq.com/TCaptcha.js',false) }} {{ js_include('https://ssl.captcha.qq.com/TCaptcha.js',false) }}
{{ js_include('web/js/captcha.verify.js') }} {{ js_include('desktop/js/captcha.verify.js') }}
{% endblock %} {% endblock %}

View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<form class="layui-form account-form" method="POST" action="{{ url({'for':'web.account.update_pwd'}) }}"> <form class="layui-form account-form" method="POST" action="{{ url({'for':'desktop.account.update_pwd'}) }}">
<br> <br>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-input-block"> <div class="layui-input-block">

View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<form class="layui-form account-form" method="POST" action="{{ url({'for':'web.account.update_phone'}) }}"> <form class="layui-form account-form" method="POST" action="{{ url({'for':'desktop.account.update_phone'}) }}">
<br><br> <br><br>
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-input-block"> <div class="layui-input-block">
@ -37,6 +37,6 @@
{% block include_js %} {% block include_js %}
{{ js_include('https://ssl.captcha.qq.com/TCaptcha.js',false) }} {{ js_include('https://ssl.captcha.qq.com/TCaptcha.js',false) }}
{{ js_include('web/js/captcha.verify.js') }} {{ js_include('desktop/js/captcha.verify.js') }}
{% endblock %} {% endblock %}

View File

@ -8,7 +8,7 @@
</div> </div>
<div class="account-wrap wrap"> <div class="account-wrap wrap">
<form class="layui-form account-form" method="POST" action="{{ url({'for':'web.account.reset_pwd'}) }}"> <form class="layui-form account-form" method="POST" action="{{ url({'for':'desktop.account.reset_pwd'}) }}">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-input-block"> <div class="layui-input-block">
<input id="cv-account" class="layui-input" type="text" name="account" autocomplete="off" placeholder="手机 / 邮箱" lay-verify="required"> <input id="cv-account" class="layui-input" type="text" name="account" autocomplete="off" placeholder="手机 / 邮箱" lay-verify="required">
@ -43,6 +43,6 @@
{% block include_js %} {% block include_js %}
{{ js_include('https://ssl.captcha.qq.com/TCaptcha.js',false) }} {{ js_include('https://ssl.captcha.qq.com/TCaptcha.js',false) }}
{{ js_include('web/js/captcha.verify.js') }} {{ js_include('desktop/js/captcha.verify.js') }}
{% endblock %} {% endblock %}

View File

@ -23,9 +23,9 @@
</div> </div>
</div> </div>
<div class="link"> <div class="link">
<a class="login-link" href="{{ url({'for':'web.account.register'}) }}">免费注册</a> <a class="login-link" href="{{ url({'for':'desktop.account.register'}) }}">免费注册</a>
<span class="separator">·</span> <span class="separator">·</span>
<a class="forget-link" href="{{ url({'for':'web.account.forget_pwd'}) }}">忘记密码</a> <a class="forget-link" href="{{ url({'for':'desktop.account.forget_pwd'}) }}">忘记密码</a>
</div> </div>
</div> </div>
@ -34,8 +34,8 @@
{% block include_js %} {% block include_js %}
{{ js_include('https://ssl.captcha.qq.com/TCaptcha.js',false) }} {{ js_include('https://ssl.captcha.qq.com/TCaptcha.js',false) }}
{{ js_include('web/js/captcha.login.js') }} {{ js_include('desktop/js/captcha.login.js') }}
{{ js_include('web/js/captcha.verify.js') }} {{ js_include('desktop/js/captcha.verify.js') }}
{% endblock %} {% endblock %}

View File

@ -1,4 +1,4 @@
<form class="layui-form account-form" method="POST" action="{{ url({'for':'web.account.pwd_login'}) }}"> <form class="layui-form account-form" method="POST" action="{{ url({'for':'desktop.account.pwd_login'}) }}">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-input-block"> <div class="layui-input-block">
<input class="layui-input" type="text" name="account" autocomplete="off" placeholder="手机 / 邮箱" lay-verify="required"> <input class="layui-input" type="text" name="account" autocomplete="off" placeholder="手机 / 邮箱" lay-verify="required">

View File

@ -1,4 +1,4 @@
<form class="layui-form account-form" method="POST" action="{{ url({'for':'web.account.verify_login'}) }}"> <form class="layui-form account-form" method="POST" action="{{ url({'for':'desktop.account.verify_login'}) }}">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-input-block"> <div class="layui-input-block">
<input id="cv-account" class="layui-input" type="text" name="account" autocomplete="off" placeholder="手机 / 邮箱" lay-verify="required"> <input id="cv-account" class="layui-input" type="text" name="account" autocomplete="off" placeholder="手机 / 邮箱" lay-verify="required">

View File

@ -8,7 +8,7 @@
</div> </div>
<div class="account-wrap wrap"> <div class="account-wrap wrap">
<form class="layui-form account-form" method="POST" action="{{ url({'for':'web.account.do_register'}) }}"> <form class="layui-form account-form" method="POST" action="{{ url({'for':'desktop.account.do_register'}) }}">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-input-block"> <div class="layui-input-block">
<input id="cv-account" class="layui-input" type="text" name="account" autocomplete="off" placeholder="手机 / 邮箱" lay-verify="required"> <input id="cv-account" class="layui-input" type="text" name="account" autocomplete="off" placeholder="手机 / 邮箱" lay-verify="required">
@ -44,6 +44,6 @@
{% block include_js %} {% block include_js %}
{{ js_include('https://ssl.captcha.qq.com/TCaptcha.js',false) }} {{ js_include('https://ssl.captcha.qq.com/TCaptcha.js',false) }}
{{ js_include('web/js/captcha.verify.js') }} {{ js_include('desktop/js/captcha.verify.js') }}
{% endblock %} {% endblock %}

View File

@ -6,7 +6,7 @@
<div class="chapter-title layui-elip">{{ item.title }}</div> <div class="chapter-title layui-elip">{{ item.title }}</div>
<ul class="sidebar-lesson-list"> <ul class="sidebar-lesson-list">
{% for lesson in item.children %} {% for lesson in item.children %}
{% set url = url({'for':'web.chapter.show','id':lesson.id}) %} {% set url = url({'for':'desktop.chapter.show','id':lesson.id}) %}
{% set free_flag = lesson.free == 1 ? '<span class="layui-badge">免费</span>' : '' %} {% set free_flag = lesson.free == 1 ? '<span class="layui-badge">免费</span>' : '' %}
{% set active = (chapter.id == lesson.id) ? 'active' : 'normal' %} {% set active = (chapter.id == lesson.id) ? 'active' : 'normal' %}
<li class="lesson-title layui-elip"> <li class="lesson-title layui-elip">

View File

@ -2,15 +2,15 @@
{% block content %} {% block content %}
{% set chapter_full_url = full_url({'for':'web.chapter.show','id':chapter.id}) %} {% set chapter_full_url = full_url({'for':'desktop.chapter.show','id':chapter.id}) %}
{% set course_url = url({'for':'web.course.show','id':chapter.course.id}) %} {% set course_url = url({'for':'desktop.course.show','id':chapter.course.id}) %}
{% set learning_url = url({'for':'web.chapter.learning','id':chapter.id}) %} {% set learning_url = url({'for':'desktop.chapter.learning','id':chapter.id}) %}
{% set live_chats_url = url({'for':'web.live.chats','id':chapter.id}) %} {% set live_chats_url = url({'for':'desktop.live.chats','id':chapter.id}) %}
{% set live_stats_url = url({'for':'web.live.stats','id':chapter.id}) %} {% set live_stats_url = url({'for':'desktop.live.stats','id':chapter.id}) %}
{% set send_msg_url = url({'for':'web.live.send_msg','id':chapter.id}) %} {% set send_msg_url = url({'for':'desktop.live.send_msg','id':chapter.id}) %}
{% set bind_user_url = url({'for':'web.live.bind_user','id':chapter.id}) %} {% set bind_user_url = url({'for':'desktop.live.bind_user','id':chapter.id}) %}
{% set like_url = url({'for':'web.chapter.like','id':chapter.id}) %} {% set like_url = url({'for':'desktop.chapter.like','id':chapter.id}) %}
{% set qrcode_url = url({'for':'web.qrcode'},{'text':chapter_full_url}) %} {% set qrcode_url = url({'for':'desktop.qrcode'},{'text':chapter_full_url}) %}
<div class="breadcrumb"> <div class="breadcrumb">
<span class="layui-breadcrumb"> <span class="layui-breadcrumb">
@ -72,9 +72,9 @@
<script src="//imgcache.qq.com/open/qcloud/video/vcplayer/TcPlayer-2.3.2.js"></script> <script src="//imgcache.qq.com/open/qcloud/video/vcplayer/TcPlayer-2.3.2.js"></script>
{{ js_include('web/js/chapter.live.player.js') }} {{ js_include('desktop/js/chapter.live.player.js') }}
{{ js_include('web/js/chapter.live.im.js') }} {{ js_include('desktop/js/chapter.live.im.js') }}
{{ js_include('web/js/chapter.action.js') }} {{ js_include('desktop/js/chapter.action.js') }}
{{ js_include('web/js/course.share.js') }} {{ js_include('desktop/js/course.share.js') }}
{% endblock %} {% endblock %}

View File

@ -2,12 +2,12 @@
{% block content %} {% block content %}
{% set chapter_full_url = full_url({'for':'web.chapter.show','id':chapter.id}) %} {% set chapter_full_url = full_url({'for':'desktop.chapter.show','id':chapter.id}) %}
{% set course_url = url({'for':'web.course.show','id':chapter.course.id}) %} {% set course_url = url({'for':'desktop.course.show','id':chapter.course.id}) %}
{% set learning_url = url({'for':'web.chapter.learning','id':chapter.id}) %} {% set learning_url = url({'for':'desktop.chapter.learning','id':chapter.id}) %}
{% set like_url = url({'for':'web.chapter.like','id':chapter.id}) %} {% set like_url = url({'for':'desktop.chapter.like','id':chapter.id}) %}
{% set consult_url = url({'for':'web.consult.add'},{'chapter_id':chapter.id}) %} {% set consult_url = url({'for':'desktop.consult.add'},{'chapter_id':chapter.id}) %}
{% set qrcode_url = url({'for':'web.qrcode'},{'text':chapter_full_url}) %} {% set qrcode_url = url({'for':'desktop.qrcode'},{'text':chapter_full_url}) %}
<div class="breadcrumb"> <div class="breadcrumb">
<span class="layui-breadcrumb"> <span class="layui-breadcrumb">
@ -58,9 +58,9 @@
{% block include_js %} {% block include_js %}
{{ js_include('https://cdn.jsdelivr.net/npm/vditor/dist/method.min.js', false) }} {{ js_include('https://cdn.jsdelivr.net/npm/vditor/dist/method.min.js', false) }}
{{ js_include('web/js/markdown.preview.js') }} {{ js_include('desktop/js/markdown.preview.js') }}
{{ js_include('web/js/course.share.js') }} {{ js_include('desktop/js/course.share.js') }}
{{ js_include('web/js/chapter.read.js') }} {{ js_include('desktop/js/chapter.read.js') }}
{{ js_include('web/js/chapter.action.js') }} {{ js_include('desktop/js/chapter.action.js') }}
{% endblock %} {% endblock %}

View File

@ -2,12 +2,12 @@
{% block content %} {% block content %}
{% set chapter_full_url = full_url({'for':'web.chapter.show','id':chapter.id}) %} {% set chapter_full_url = full_url({'for':'desktop.chapter.show','id':chapter.id}) %}
{% set course_url = url({'for':'web.course.show','id':chapter.course.id}) %} {% set course_url = url({'for':'desktop.course.show','id':chapter.course.id}) %}
{% set learning_url = url({'for':'web.chapter.learning','id':chapter.id}) %} {% set learning_url = url({'for':'desktop.chapter.learning','id':chapter.id}) %}
{% set like_url = url({'for':'web.chapter.like','id':chapter.id}) %} {% set like_url = url({'for':'desktop.chapter.like','id':chapter.id}) %}
{% set qrcode_url = url({'for':'web.qrcode'},{'text':chapter_full_url}) %} {% set qrcode_url = url({'for':'desktop.qrcode'},{'text':chapter_full_url}) %}
{% set consult_url = url({'for':'web.consult.add'},{'chapter_id':chapter.id}) %} {% set consult_url = url({'for':'desktop.consult.add'},{'chapter_id':chapter.id}) %}
{% set liked_class = chapter.me.liked ? 'active' : '' %} {% set liked_class = chapter.me.liked ? 'active' : '' %}
<div class="breadcrumb"> <div class="breadcrumb">
@ -58,8 +58,8 @@
<script src="//imgcache.qq.com/open/qcloud/video/vcplayer/TcPlayer-2.3.3.js"></script> <script src="//imgcache.qq.com/open/qcloud/video/vcplayer/TcPlayer-2.3.3.js"></script>
{{ js_include('web/js/course.share.js') }} {{ js_include('desktop/js/course.share.js') }}
{{ js_include('web/js/chapter.action.js') }} {{ js_include('desktop/js/chapter.action.js') }}
{{ js_include('web/js/chapter.vod.player.js') }} {{ js_include('desktop/js/chapter.vod.player.js') }}
{% endblock %} {% endblock %}

View File

@ -1,7 +1,7 @@
{% extends 'templates/layer.volt' %} {% extends 'templates/layer.volt' %}
{% block content %} {% block content %}
<form class="layui-form consult-form" method="post" action="{{ url({'for':'web.consult.create'}) }}"> <form class="layui-form consult-form" method="post" action="{{ url({'for':'desktop.consult.create'}) }}">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label" for="question">问题</label> <label class="layui-form-label" for="question">问题</label>
<div class="layui-input-block"> <div class="layui-input-block">

View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
{% set update_url = url({'for':'web.consult.update','id':consult.id}) %} {% set update_url = url({'for':'desktop.consult.update','id':consult.id}) %}
<form class="layui-form consult-form" method="post" action="{{ update_url }}"> <form class="layui-form consult-form" method="post" action="{{ update_url }}">
<div class="layui-form-item mb0"> <div class="layui-form-item mb0">

View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
{% set update_url = url({'for':'web.consult.reply','id':consult.id}) %} {% set update_url = url({'for':'desktop.consult.reply','id':consult.id}) %}
<form class="layui-form consult-form" method="post" action="{{ update_url }}"> <form class="layui-form consult-form" method="post" action="{{ update_url }}">
<div class="layui-form-item mb0"> <div class="layui-form-item mb0">

View File

@ -2,9 +2,9 @@
<div class="review-list"> <div class="review-list">
{% for item in pager.items %} {% for item in pager.items %}
{% set item.answer = item.answer ? item.answer : '请耐心等待回复吧' %} {% set item.answer = item.answer ? item.answer : '请耐心等待回复吧' %}
{% set owner_url = url({'for':'web.user.show','id':item.owner.id}) %} {% set owner_url = url({'for':'desktop.user.show','id':item.owner.id}) %}
{% set consult_url = url({'for':'web.consult.show','id':item.id}) %} {% set consult_url = url({'for':'desktop.consult.show','id':item.id}) %}
{% set like_url = url({'for':'web.consult.like','id':item.id}) %} {% set like_url = url({'for':'desktop.consult.like','id':item.id}) %}
<div class="review-card clearfix"> <div class="review-card clearfix">
<div class="avatar"> <div class="avatar">
<a href="{{ owner_url }}" title="{{ item.owner.name }}"> <a href="{{ owner_url }}" title="{{ item.owner.name }}">

View File

@ -4,7 +4,7 @@
{{ partial('course/list_filter') }} {{ partial('course/list_filter') }}
{% set pager_url = url({'for':'web.course.pager'}, params) %} {% set pager_url = url({'for':'desktop.course.pager'}, params) %}
<div id="course-list" data-url="{{ pager_url }}"></div> <div id="course-list" data-url="{{ pager_url }}"></div>
@ -12,6 +12,6 @@
{% block include_js %} {% block include_js %}
{{ js_include('web/js/course.list.js') }} {{ js_include('desktop/js/course.list.js') }}
{% endblock %} {% endblock %}

View File

@ -1,6 +1,6 @@
<div class="package-list"> <div class="package-list">
{% for package in packages %} {% for package in packages %}
{% set order_url = url({'for':'web.order.confirm'},{'item_id':package.id,'item_type':'package'}) %} {% set order_url = url({'for':'desktop.order.confirm'},{'item_id':package.id,'item_type':'package'}) %}
<div class="package-item clearfix"> <div class="package-item clearfix">
<div class="package-info"> <div class="package-info">
<div class="title">{{ package.title }}</div> <div class="title">{{ package.title }}</div>
@ -20,7 +20,7 @@
</div> </div>
<div class="package-course-list"> <div class="package-course-list">
{% for course in package.courses %} {% for course in package.courses %}
{% set course_url = url({'for':'web.course.show','id':course.id}) %} {% set course_url = url({'for':'desktop.course.show','id':course.id}) %}
<div class="package-course-card"> <div class="package-course-card">
<div class="cover"><img src="{{ course.cover }}!cover_270" alt="{{ course.title }}"></div> <div class="cover"><img src="{{ course.cover }}!cover_270" alt="{{ course.title }}"></div>
<div class="title"><a href="{{ course_url }}">{{ course.title }}</a></div> <div class="title"><a href="{{ course_url }}">{{ course.title }}</a></div>

View File

@ -3,8 +3,8 @@
{% if pager.total_pages > 0 %} {% if pager.total_pages > 0 %}
<div class="review-list"> <div class="review-list">
{% for item in pager.items %} {% for item in pager.items %}
{% set owner_url = url({'for':'web.user.show','id':item.owner.id}) %} {% set owner_url = url({'for':'desktop.user.show','id':item.owner.id}) %}
{% set like_url = url({'for':'web.review.like','id':item.id}) %} {% set like_url = url({'for':'desktop.review.like','id':item.id}) %}
<div class="review-card clearfix"> <div class="review-card clearfix">
<div class="avatar"> <div class="avatar">
<a href="{{ owner_url }}" title="{{ item.owner.name }}"> <a href="{{ owner_url }}" title="{{ item.owner.name }}">

View File

@ -6,13 +6,13 @@
{% set favorite_title = course.me.favorited ? '取消收藏' : '收藏' %} {% set favorite_title = course.me.favorited ? '取消收藏' : '收藏' %}
{% set favorite_star = course.me.favorited ? 'layui-icon-star-fill' : 'layui-icon-star' %} {% set favorite_star = course.me.favorited ? 'layui-icon-star-fill' : 'layui-icon-star' %}
{% set full_course_url = full_url({'for':'web.course.show','id':course.id}) %} {% set full_course_url = full_url({'for':'desktop.course.show','id':course.id}) %}
{% set favorite_url = url({'for':'web.course.favorite','id':course.id}) %} {% set favorite_url = url({'for':'desktop.course.favorite','id':course.id}) %}
{% set qrcode_url = url({'for':'web.qrcode'},{'text':full_course_url}) %} {% set qrcode_url = url({'for':'desktop.qrcode'},{'text':full_course_url}) %}
<div class="breadcrumb"> <div class="breadcrumb">
<span class="layui-breadcrumb"> <span class="layui-breadcrumb">
<a href="{{ url({'for':'web.course.list'}) }}">全部课程</a> <a href="{{ url({'for':'desktop.course.list'}) }}">全部课程</a>
{% for path in course.category_paths %} {% for path in course.category_paths %}
<a href="{{ path.url }}">{{ path.name }}</a> <a href="{{ path.url }}">{{ path.name }}</a>
{% endfor %} {% endfor %}
@ -59,15 +59,15 @@
<div class="course-details" id="preview">{{ course.details }}</div> <div class="course-details" id="preview">{{ course.details }}</div>
</div> </div>
{% if show_tab_packages %} {% if show_tab_packages %}
{% set packages_url = url({'for':'web.course.packages','id':course.id}) %} {% set packages_url = url({'for':'desktop.course.packages','id':course.id}) %}
<div class="layui-tab-item" id="tab-packages" data-url="{{ packages_url }}"></div> <div class="layui-tab-item" id="tab-packages" data-url="{{ packages_url }}"></div>
{% endif %} {% endif %}
{% if show_tab_consults %} {% if show_tab_consults %}
{% set consults_url = url({'for':'web.course.consults','id':course.id}) %} {% set consults_url = url({'for':'desktop.course.consults','id':course.id}) %}
<div class="layui-tab-item" id="tab-consults" data-url="{{ consults_url }}"></div> <div class="layui-tab-item" id="tab-consults" data-url="{{ consults_url }}"></div>
{% endif %} {% endif %}
{% if show_tab_reviews %} {% if show_tab_reviews %}
{% set reviews_url = url({'for':'web.course.reviews','id':course.id}) %} {% set reviews_url = url({'for':'desktop.course.reviews','id':course.id}) %}
<div class="layui-tab-item" id="tab-reviews" data-url="{{ reviews_url }}"></div> <div class="layui-tab-item" id="tab-reviews" data-url="{{ reviews_url }}"></div>
{% endif %} {% endif %}
</div> </div>
@ -84,15 +84,15 @@
{{ partial('course/show_order') }} {{ partial('course/show_order') }}
{{ partial('course/show_teacher') }} {{ partial('course/show_teacher') }}
{% if show_sidebar_topics %} {% if show_sidebar_topics %}
{% set topics_url = url({'for':'web.course.topics','id':course.id}) %} {% set topics_url = url({'for':'desktop.course.topics','id':course.id}) %}
<div class="sidebar" id="sidebar-topics" data-url="{{ topics_url }}"></div> <div class="sidebar" id="sidebar-topics" data-url="{{ topics_url }}"></div>
{% endif %} {% endif %}
{% if show_sidebar_recommended %} {% if show_sidebar_recommended %}
{% set recommended_url = url({'for':'web.course.recommended','id':course.id}) %} {% set recommended_url = url({'for':'desktop.course.recommended','id':course.id}) %}
<div class="sidebar" id="sidebar-recommended" data-url="{{ recommended_url }}"></div> <div class="sidebar" id="sidebar-recommended" data-url="{{ recommended_url }}"></div>
{% endif %} {% endif %}
{% if show_sidebar_related %} {% if show_sidebar_related %}
{% set related_url = url({'for':'web.course.related','id':course.id}) %} {% set related_url = url({'for':'desktop.course.related','id':course.id}) %}
<div class="sidebar" id="sidebar-related" data-url="{{ related_url }}"></div> <div class="sidebar" id="sidebar-related" data-url="{{ related_url }}"></div>
{% endif %} {% endif %}
</div> </div>
@ -117,8 +117,8 @@
{% block include_js %} {% block include_js %}
{{ js_include('https://cdn.jsdelivr.net/npm/vditor/dist/method.min.js', false) }} {{ js_include('https://cdn.jsdelivr.net/npm/vditor/dist/method.min.js', false) }}
{{ js_include('web/js/markdown.preview.js') }} {{ js_include('desktop/js/markdown.preview.js') }}
{{ js_include('web/js/course.show.js') }} {{ js_include('desktop/js/course.show.js') }}
{{ js_include('web/js/course.share.js') }} {{ js_include('desktop/js/course.share.js') }}
{% endblock %} {% endblock %}

View File

@ -1,5 +1,5 @@
{%- macro vod_lesson_info(lesson) %} {%- macro vod_lesson_info(lesson) %}
{% set url = lesson.me.owned ? url({'for':'web.chapter.show','id':lesson.id}) : '' %} {% set url = lesson.me.owned ? url({'for':'desktop.chapter.show','id':lesson.id}) : '' %}
{% set priv = lesson.me.owned ? 'allow' : 'deny' %} {% set priv = lesson.me.owned ? 'allow' : 'deny' %}
<a class="{{ priv }} view-lesson" href="javascript:" data-url="{{ url }}"> <a class="{{ priv }} view-lesson" href="javascript:" data-url="{{ url }}">
<i class="layui-icon layui-icon-play"></i> <i class="layui-icon layui-icon-play"></i>
@ -15,7 +15,7 @@
{%- endmacro %} {%- endmacro %}
{%- macro live_lesson_info(lesson) %} {%- macro live_lesson_info(lesson) %}
{% set url = lesson.me.owned ? url({'for':'web.chapter.show','id':lesson.id}) : '' %} {% set url = lesson.me.owned ? url({'for':'desktop.chapter.show','id':lesson.id}) : '' %}
{% set priv = lesson.me.owned ? 'allow' : 'deny' %} {% set priv = lesson.me.owned ? 'allow' : 'deny' %}
{% set over_flag = lesson.attrs.end_time < time() ? '已结束' : '' %} {% set over_flag = lesson.attrs.end_time < time() ? '已结束' : '' %}
<a class="{{ priv }} view-lesson" href="javascript:" data-url="{{ url }}"> <a class="{{ priv }} view-lesson" href="javascript:" data-url="{{ url }}">
@ -32,7 +32,7 @@
{%- endmacro %} {%- endmacro %}
{%- macro read_lesson_info(lesson) %} {%- macro read_lesson_info(lesson) %}
{% set url = lesson.me.owned ? url({'for':'web.chapter.show','id':lesson.id}) : '' %} {% set url = lesson.me.owned ? url({'for':'desktop.chapter.show','id':lesson.id}) : '' %}
{% set priv = lesson.me.owned ? 'allow' : 'deny' %} {% set priv = lesson.me.owned ? 'allow' : 'deny' %}
<a class="{{ priv }} view-lesson" href="javascript:" data-url="{{ url }}"> <a class="{{ priv }} view-lesson" href="javascript:" data-url="{{ url }}">
<i class="layui-icon layui-icon-read"></i> <i class="layui-icon layui-icon-read"></i>

View File

@ -1,5 +1,5 @@
{% if course.me.owned == 0 and course.market_price > 0 %} {% if course.me.owned == 0 and course.market_price > 0 %}
{% set order_url = url({'for':'web.order.confirm'},{'item_id':course.id,'item_type':'course'}) %} {% set order_url = url({'for':'desktop.order.confirm'},{'item_id':course.id,'item_type':'course'}) %}
<div class="sidebar wrap"> <div class="sidebar wrap">
<button class="layui-btn layui-btn-fluid layui-bg-red btn-buy" data-url="{{ order_url }}">立即购买</button> <button class="layui-btn layui-btn-fluid layui-bg-red btn-buy" data-url="{{ order_url }}">立即购买</button>
</div> </div>
@ -12,10 +12,10 @@
<div class="layui-card-body"> <div class="layui-card-body">
<div class="sidebar-order"> <div class="sidebar-order">
{% for reward in rewards %} {% for reward in rewards %}
{% set item_id = [course.id,reward.id]|join('-') %} {% set item_id = [course.id,reward.id]|join('-') %}
{% set order_url = url({'for':'web.order.confirm'},{'item_id':item_id,'item_type':'reward'}) %} {% set order_url = url({'for':'desktop.order.confirm'},{'item_id':item_id,'item_type':'reward'}) %}
<button class="layui-btn layui-btn-xs btn-reward" data-url="{{ order_url }}">{{ reward.title }}</button> <button class="layui-btn layui-btn-xs btn-reward" data-url="{{ order_url }}">{{ reward.title }}</button>
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
</div> </div>

View File

@ -4,7 +4,7 @@
<div class="layui-card-header">授课教师</div> <div class="layui-card-header">授课教师</div>
<div class="layui-card-body"> <div class="layui-card-body">
{% for teacher in course.teachers %} {% for teacher in course.teachers %}
{% set teacher_url = url({'for':'web.user.show','id':teacher.id}) %} {% set teacher_url = url({'for':'desktop.user.show','id':teacher.id}) %}
{% set teacher.title = teacher.title ? teacher.title : '小小教书匠' %} {% set teacher.title = teacher.title ? teacher.title : '小小教书匠' %}
<div class="sidebar-teacher-card clearfix"> <div class="sidebar-teacher-card clearfix">
<div class="avatar"> <div class="avatar">

View File

@ -3,7 +3,7 @@
<div class="layui-card-header">热门专题</div> <div class="layui-card-header">热门专题</div>
<div class="layui-card-body"> <div class="layui-card-body">
{% for topic in topics %} {% for topic in topics %}
{% set topic_url = url({'for':'web.topic.show','id':topic.id}) %} {% set topic_url = url({'for':'desktop.topic.show','id':topic.id}) %}
<a class="layui-badge-rim topic-badge" href="{{ topic_url }}">{{ topic.title }}</a> <a class="layui-badge-rim topic-badge" href="{{ topic_url }}">{{ topic.title }}</a>
{% endfor %} {% endfor %}
</div> </div>

Some files were not shown because too many files have changed in this diff Show More