diff --git a/app/Caches/SiteStat.php b/app/Caches/SiteGlobalStat.php similarity index 95% rename from app/Caches/SiteStat.php rename to app/Caches/SiteGlobalStat.php index 7ef29b22..a1a66d98 100644 --- a/app/Caches/SiteStat.php +++ b/app/Caches/SiteGlobalStat.php @@ -11,7 +11,7 @@ use App\Repos\Review as ReviewRepo; use App\Repos\Topic as TopicRepo; use App\Repos\User as UserRepo; -class SiteStat extends Cache +class SiteGlobalStat extends Cache { protected $lifetime = 2 * 3600; @@ -23,7 +23,7 @@ class SiteStat extends Cache public function getKey($id = null) { - return 'site_stat'; + return 'site_global_stat'; } public function getContent($id = null) diff --git a/app/Caches/SiteTodayStat.php b/app/Caches/SiteTodayStat.php new file mode 100644 index 00000000..dde4824b --- /dev/null +++ b/app/Caches/SiteTodayStat.php @@ -0,0 +1,63 @@ +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, + ], + ]); + } + +} diff --git a/app/Http/Admin/Controllers/IndexController.php b/app/Http/Admin/Controllers/IndexController.php index 4bf52fc2..4684800a 100644 --- a/app/Http/Admin/Controllers/IndexController.php +++ b/app/Http/Admin/Controllers/IndexController.php @@ -35,13 +35,25 @@ class IndexController extends Controller { $indexService = new IndexService(); - $statInfo = $indexService->getStatInfo(); + $globalStat = $indexService->getGlobalStat(); + $todayStat = $indexService->getTodayStat(); $appInfo = $indexService->getAppInfo(); $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('server_info', $serverInfo); } + /** + * @Get("/phpinfo", name="admin.phpinfo") + */ + public function phpinfoAction() + { + echo phpinfo(); + + exit; + } + } diff --git a/app/Http/Admin/Controllers/SettingController.php b/app/Http/Admin/Controllers/SettingController.php index a465d086..215afb96 100644 --- a/app/Http/Admin/Controllers/SettingController.php +++ b/app/Http/Admin/Controllers/SettingController.php @@ -161,11 +161,11 @@ class SettingController extends Controller $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->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('wxpay', $wxpay); diff --git a/app/Http/Admin/Controllers/TestController.php b/app/Http/Admin/Controllers/TestController.php index 5a8ede2e..0e6c0aec 100644 --- a/app/Http/Admin/Controllers/TestController.php +++ b/app/Http/Admin/Controllers/TestController.php @@ -67,7 +67,7 @@ class TestController extends Controller $pushUrl = $liveService->getPushUrl($streamName); $qrcode = $this->url->get( - ['for' => 'web.qrcode'], + ['for' => 'desktop.qrcode'], ['text' => urlencode($pushUrl)] ); diff --git a/app/Http/Admin/Services/AlipayTest.php b/app/Http/Admin/Services/AlipayTest.php index cd7bf6d1..24574378 100644 --- a/app/Http/Admin/Services/AlipayTest.php +++ b/app/Http/Admin/Services/AlipayTest.php @@ -23,7 +23,7 @@ class AlipayTest extends PayTest if ($code) { $codeUrl = $this->url->get( - ['for' => 'web.qrcode'], + ['for' => 'desktop.qrcode'], ['text' => urlencode($code)] ); } diff --git a/app/Http/Admin/Services/Index.php b/app/Http/Admin/Services/Index.php index d8fe6dd6..cf89b904 100644 --- a/app/Http/Admin/Services/Index.php +++ b/app/Http/Admin/Services/Index.php @@ -2,7 +2,8 @@ namespace App\Http\Admin\Services; -use App\Caches\SiteStat; +use App\Caches\SiteGlobalStat; +use App\Caches\SiteTodayStat; use App\Library\AppInfo; 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(); } diff --git a/app/Http/Admin/Services/Session.php b/app/Http/Admin/Services/Session.php index 2394908f..41064122 100644 --- a/app/Http/Admin/Services/Session.php +++ b/app/Http/Admin/Services/Session.php @@ -24,7 +24,7 @@ class Session extends Service $currentUser = $this->getCurrentUser(); if ($currentUser->id > 0) { - $this->response->redirect(['for' => 'web.index']); + $this->response->redirect(['for' => 'desktop.index']); } $post = $this->request->getPost(); diff --git a/app/Http/Admin/Views/index/index.volt b/app/Http/Admin/Views/index/index.volt index 831c7a1d..c14f300f 100644 --- a/app/Http/Admin/Views/index/index.volt +++ b/app/Http/Admin/Views/index/index.volt @@ -28,13 +28,13 @@
  • {{ auth_user.name }}
    -
    基本资料
    -
    安全设置
    +
    基本资料
    +
    安全设置
    退出登录
  • - 前台 + 前台
    • diff --git a/app/Http/Admin/Views/index/main.volt b/app/Http/Admin/Views/index/main.volt index 09ea7f0d..fe01baff 100644 --- a/app/Http/Admin/Views/index/main.volt +++ b/app/Http/Admin/Views/index/main.volt @@ -5,7 +5,9 @@
    - {{ partial('index/main_stat_info') }} + {{ partial('index/main_global_stat') }} + {{ partial('index/main_today_stat') }} + {{ partial('index/main_app_trend') }}
    {{ partial('index/main_app_info') }} diff --git a/app/Http/Admin/Views/index/main_app_trend.volt b/app/Http/Admin/Views/index/main_app_trend.volt new file mode 100644 index 00000000..44cef704 --- /dev/null +++ b/app/Http/Admin/Views/index/main_app_trend.volt @@ -0,0 +1,6 @@ +
    +
    产品动态
    +
    + +
    +
    \ No newline at end of file diff --git a/app/Http/Admin/Views/index/main_stat_info.volt b/app/Http/Admin/Views/index/main_global_stat.volt similarity index 71% rename from app/Http/Admin/Views/index/main_stat_info.volt rename to app/Http/Admin/Views/index/main_global_stat.volt index f9bd577d..a3864c8f 100644 --- a/app/Http/Admin/Views/index/main_stat_info.volt +++ b/app/Http/Admin/Views/index/main_global_stat.volt @@ -1,53 +1,53 @@
    -
    数据统计
    +
    全局统计
    课程数
    -
    {{ stat_info.course_count }}
    +
    {{ global_stat.course_count }}
    用户数
    -
    {{ stat_info.user_count }}
    +
    {{ global_stat.user_count }}
    群组数
    -
    {{ stat_info.group_count }}
    +
    {{ global_stat.group_count }}
    订单数
    -
    {{ stat_info.order_count }}
    +
    {{ global_stat.order_count }}
    评价数
    -
    {{ stat_info.review_count }}
    +
    {{ global_stat.review_count }}
    咨询数
    -
    {{ stat_info.consult_count }}
    +
    {{ global_stat.consult_count }}
    套餐数
    -
    {{ stat_info.package_count }}
    +
    {{ global_stat.package_count }}
    专题数
    -
    {{ stat_info.topic_count }}
    +
    {{ global_stat.topic_count }}
    diff --git a/app/Http/Admin/Views/index/main_team_info.volt b/app/Http/Admin/Views/index/main_team_info.volt index c912d4fe..c09a7637 100644 --- a/app/Http/Admin/Views/index/main_team_info.volt +++ b/app/Http/Admin/Views/index/main_team_info.volt @@ -11,13 +11,17 @@ 版权所有 深圳市酷瓜软件有限公司 + + 产品经理 + 鸠摩智首席音效师 + 项目经理 - 小虫哥哥 + 小李飞刀 开发人员 - 小虫哥哥 + 长河落日，孤雾齐飞，大王来巡山 diff --git a/app/Http/Admin/Views/index/main_today_stat.volt b/app/Http/Admin/Views/index/main_today_stat.volt new file mode 100644 index 00000000..14de64c0 --- /dev/null +++ b/app/Http/Admin/Views/index/main_today_stat.volt @@ -0,0 +1,25 @@ +
    +
    今日统计
    +
    +
    +
    +
    +
    用户注册
    +
    {{ today_stat.user_count }}
    +
    +
    +
    +
    +
    成交订单
    +
    {{ today_stat.order_count }}
    +
    +
    +
    +
    +
    销售金额
    +
    {{ today_stat.sale_amount }}
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/app/Http/Admin/Views/page/list.volt b/app/Http/Admin/Views/page/list.volt index 10c342f4..68648dd1 100644 --- a/app/Http/Admin/Views/page/list.volt +++ b/app/Http/Admin/Views/page/list.volt @@ -31,7 +31,7 @@ {% 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 update_url = url({'for':'admin.page.update','id':item.id}) %} {% set delete_url = url({'for':'admin.page.delete','id':item.id}) %} diff --git a/app/Http/Admin/Views/public/forbidden.volt b/app/Http/Admin/Views/public/forbidden.volt index d65c361d..35cf5cd1 100644 --- a/app/Http/Admin/Views/public/forbidden.volt +++ b/app/Http/Admin/Views/public/forbidden.volt @@ -19,6 +19,6 @@ {% block link_css %} - {{ css_link("web/css/error.css") }} + {{ css_link("desktop/css/error.css") }} {% endblock %} \ No newline at end of file diff --git a/app/Http/Web/Controllers/AccountController.php b/app/Http/Desktop/Controllers/AccountController.php similarity index 75% rename from app/Http/Web/Controllers/AccountController.php rename to app/Http/Desktop/Controllers/AccountController.php index a5d850f4..65790af7 100644 --- a/app/Http/Web/Controllers/AccountController.php +++ b/app/Http/Desktop/Controllers/AccountController.php @@ -1,8 +1,8 @@ request->getPost('return_url'); - $location = $returnUrl ?: $this->url->get(['for' => 'web.index']); + $location = $returnUrl ?: $this->url->get(['for' => 'desktop.index']); $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() { @@ -101,7 +101,7 @@ class AccountController extends Controller $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]; @@ -109,7 +109,7 @@ class AccountController extends Controller } /** - * @Get("/logout", name="web.account.logout") + * @Get("/logout", name="desktop.account.logout") */ public function logoutAction() { @@ -117,16 +117,16 @@ class AccountController extends Controller $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() { if ($this->authUser->id > 0) { - $this->response->redirect(['for' => 'web.index']); + $this->response->redirect(['for' => 'desktop.index']); } $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() { if ($this->authUser->id == 0) { - $this->response->redirect(['for' => 'web.account.login']); + $this->response->redirect(['for' => 'desktop.account.login']); } $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() { if ($this->authUser->id == 0) { - $this->response->redirect(['for' => 'web.account.login']); + $this->response->redirect(['for' => 'desktop.account.login']); } $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() { if ($this->authUser->id == 0) { - $this->response->redirect(['for' => 'web.account.login']); + $this->response->redirect(['for' => 'desktop.account.login']); } $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() { @@ -200,7 +200,7 @@ class AccountController extends Controller $service->handle(); - $loginUrl = $this->url->get(['for' => 'web.account.login']); + $loginUrl = $this->url->get(['for' => 'desktop.account.login']); $content = [ '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() { @@ -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() { @@ -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() { diff --git a/app/Http/Web/Controllers/ChapterController.php b/app/Http/Desktop/Controllers/ChapterController.php similarity index 86% rename from app/Http/Web/Controllers/ChapterController.php rename to app/Http/Desktop/Controllers/ChapterController.php index 3851e38d..da06c2d1 100644 --- a/app/Http/Web/Controllers/ChapterController.php +++ b/app/Http/Desktop/Controllers/ChapterController.php @@ -1,6 +1,6 @@ response->redirect([ - 'for' => 'web.course.show', + 'for' => 'desktop.course.show', '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) { @@ -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) { @@ -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) { diff --git a/app/Http/Web/Controllers/ConsultController.php b/app/Http/Desktop/Controllers/ConsultController.php similarity index 83% rename from app/Http/Web/Controllers/ConsultController.php rename to app/Http/Desktop/Controllers/ConsultController.php index e156f21c..e1d2078f 100644 --- a/app/Http/Web/Controllers/ConsultController.php +++ b/app/Http/Desktop/Controllers/ConsultController.php @@ -1,6 +1,6 @@ getDI()->get('auth'); diff --git a/app/Http/Web/Controllers/CourseController.php b/app/Http/Desktop/Controllers/CourseController.php similarity index 86% rename from app/Http/Web/Controllers/CourseController.php rename to app/Http/Desktop/Controllers/CourseController.php index 30b3ee99..06019814 100644 --- a/app/Http/Web/Controllers/CourseController.php +++ b/app/Http/Desktop/Controllers/CourseController.php @@ -1,8 +1,8 @@ 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() { @@ -44,7 +44,7 @@ class ImController extends Controller } /** - * @Get("/cs", name="web.im.cs") + * @Get("/cs", name="desktop.im.cs") */ 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() { @@ -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() { @@ -80,7 +80,7 @@ class ImController extends Controller } /** - * @Get("/msgbox", name="web.im.msgbox") + * @Get("/msgbox", name="desktop.im.msgbox") */ 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() { @@ -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() { @@ -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() { @@ -133,7 +133,7 @@ class ImController extends Controller } /** - * @Get("/notice", name="web.im.notice") + * @Get("/notice", name="desktop.im.notice") */ 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() { @@ -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() { @@ -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() { @@ -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() { @@ -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() { @@ -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() { @@ -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() { @@ -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() { @@ -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() { @@ -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() { @@ -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() { @@ -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() { @@ -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() { @@ -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() { @@ -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() { @@ -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) { @@ -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) { diff --git a/app/Http/Web/Controllers/ImGroupController.php b/app/Http/Desktop/Controllers/ImGroupController.php similarity index 80% rename from app/Http/Web/Controllers/ImGroupController.php rename to app/Http/Desktop/Controllers/ImGroupController.php index 5dddebf7..12329885 100644 --- a/app/Http/Web/Controllers/ImGroupController.php +++ b/app/Http/Desktop/Controllers/ImGroupController.php @@ -1,8 +1,8 @@ getDI()->get('auth'); diff --git a/app/Http/Web/Controllers/LiveController.php b/app/Http/Desktop/Controllers/LiveController.php similarity index 78% rename from app/Http/Web/Controllers/LiveController.php rename to app/Http/Desktop/Controllers/LiveController.php index d20f09b7..835591ae 100644 --- a/app/Http/Web/Controllers/LiveController.php +++ b/app/Http/Desktop/Controllers/LiveController.php @@ -1,8 +1,8 @@ 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() { @@ -38,7 +38,7 @@ class MyController extends Controller } /** - * @Get("/profile", name="web.my.profile") + * @Get("/profile", name="desktop.my.profile") */ 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() { @@ -62,7 +62,7 @@ class MyController extends Controller } /** - * @Get("/courses", name="web.my.courses") + * @Get("/courses", name="desktop.my.courses") */ 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() { @@ -90,7 +90,7 @@ class MyController extends Controller } /** - * @Get("/consults", name="web.my.consults") + * @Get("/consults", name="desktop.my.consults") */ 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() { @@ -118,7 +118,7 @@ class MyController extends Controller } /** - * @Get("/orders", name="web.my.orders") + * @Get("/orders", name="desktop.my.orders") */ 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() { @@ -146,7 +146,7 @@ class MyController extends Controller } /** - * @Get("/friends", name="web.my.friends") + * @Get("/friends", name="desktop.my.friends") */ 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() { @@ -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() { diff --git a/app/Http/Web/Controllers/OrderController.php b/app/Http/Desktop/Controllers/OrderController.php similarity index 80% rename from app/Http/Web/Controllers/OrderController.php rename to app/Http/Desktop/Controllers/OrderController.php index 90cd295b..8e2c066d 100644 --- a/app/Http/Web/Controllers/OrderController.php +++ b/app/Http/Desktop/Controllers/OrderController.php @@ -1,6 +1,6 @@ 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]); } /** - * @Get("/pay", name="web.order.pay") + * @Get("/pay", name="desktop.order.pay") */ public function payAction() { @@ -71,14 +71,14 @@ class OrderController extends Controller $order = $service->handle($sn); 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); } /** - * @Post("/cancel", name="web.order.cancel") + * @Post("/cancel", name="desktop.order.cancel") */ public function cancelAction() { diff --git a/app/Http/Web/Controllers/PackageController.php b/app/Http/Desktop/Controllers/PackageController.php similarity index 79% rename from app/Http/Web/Controllers/PackageController.php rename to app/Http/Desktop/Controllers/PackageController.php index d819138e..a57f684f 100644 --- a/app/Http/Web/Controllers/PackageController.php +++ b/app/Http/Desktop/Controllers/PackageController.php @@ -1,6 +1,6 @@ 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() { @@ -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() { @@ -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() { @@ -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() { @@ -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() { diff --git a/app/Http/Web/Controllers/RefundController.php b/app/Http/Desktop/Controllers/RefundController.php similarity index 81% rename from app/Http/Web/Controllers/RefundController.php rename to app/Http/Desktop/Controllers/RefundController.php index 02887c3b..cec1661e 100644 --- a/app/Http/Web/Controllers/RefundController.php +++ b/app/Http/Desktop/Controllers/RefundController.php @@ -1,6 +1,6 @@ handle(); $content = [ - 'location' => $this->url->get(['for' => 'web.my.refunds']), + 'location' => $this->url->get(['for' => 'desktop.my.refunds']), 'msg' => '申请退款成功', ]; @@ -53,7 +53,7 @@ class RefundController extends Controller } /** - * @Get("/info", name="web.refund.info") + * @Get("/info", name="desktop.refund.info") */ 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() { @@ -79,7 +79,7 @@ class RefundController extends Controller $service->handle($sn); $content = [ - 'location' => $this->url->get(['for' => 'web.my.refunds']), + 'location' => $this->url->get(['for' => 'desktop.my.refunds']), 'msg' => '取消退款成功', ]; diff --git a/app/Http/Web/Controllers/ReviewController.php b/app/Http/Desktop/Controllers/ReviewController.php similarity index 83% rename from app/Http/Web/Controllers/ReviewController.php rename to app/Http/Desktop/Controllers/ReviewController.php index 6135ae1b..d49a2a58 100644 --- a/app/Http/Web/Controllers/ReviewController.php +++ b/app/Http/Desktop/Controllers/ReviewController.php @@ -1,6 +1,6 @@ request->get('type', ['trim'], 'course'); if (empty($query)) { - return $this->response->redirect(['for' => 'web.course.list']); + return $this->response->redirect(['for' => 'desktop.course.list']); } $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() { diff --git a/app/Http/Web/Controllers/TeacherController.php b/app/Http/Desktop/Controllers/TeacherController.php similarity index 81% rename from app/Http/Web/Controllers/TeacherController.php rename to app/Http/Desktop/Controllers/TeacherController.php index 92d7777e..ea6275e4 100644 --- a/app/Http/Web/Controllers/TeacherController.php +++ b/app/Http/Desktop/Controllers/TeacherController.php @@ -1,6 +1,6 @@ handle(); $qrcode = $this->url->get( - ['for' => 'web.qrcode'], + ['for' => 'desktop.qrcode'], ['text' => urlencode($pushUrl)] ); diff --git a/app/Http/Web/Controllers/TopicController.php b/app/Http/Desktop/Controllers/TopicController.php similarity index 84% rename from app/Http/Web/Controllers/TopicController.php rename to app/Http/Desktop/Controllers/TopicController.php index daa724c5..349cd128 100644 --- a/app/Http/Web/Controllers/TopicController.php +++ b/app/Http/Desktop/Controllers/TopicController.php @@ -1,6 +1,6 @@ setShared('auth', function () { - return new WebAuth(); + return new DesktopAuth(); }); } diff --git a/app/Http/Web/Services/Account.php b/app/Http/Desktop/Services/Account.php similarity index 97% rename from app/Http/Web/Services/Account.php rename to app/Http/Desktop/Services/Account.php index 046ffd84..1005fe93 100644 --- a/app/Http/Web/Services/Account.php +++ b/app/Http/Desktop/Services/Account.php @@ -1,6 +1,6 @@ baseUrl = $this->url->get(['for' => 'web.course.list']); + $this->baseUrl = $this->url->get(['for' => 'desktop.course.list']); } public function handleTopCategories() @@ -30,7 +30,7 @@ class CourseQuery extends Service unset($params['sc']); } - $baseUrl = $this->url->get(['for' => 'web.course.list']); + $baseUrl = $this->url->get(['for' => 'desktop.course.list']); $defaultItem = [ 'id' => 'all', @@ -78,7 +78,7 @@ class CourseQuery extends Service unset($params['sc']); } - $baseUrl = $this->url->get(['for' => 'web.course.list']); + $baseUrl = $this->url->get(['for' => 'desktop.course.list']); $defaultItem = [ 'id' => 'all', diff --git a/app/Http/Web/Services/Im.php b/app/Http/Desktop/Services/Im.php similarity index 99% rename from app/Http/Web/Services/Im.php rename to app/Http/Desktop/Services/Im.php index bd9e9320..240a16d7 100644 --- a/app/Http/Web/Services/Im.php +++ b/app/Http/Desktop/Services/Im.php @@ -1,6 +1,6 @@ url->get([ - 'for' => 'web.course.show', + 'for' => 'desktop.course.show', 'id' => $carousel['content'], ]); break; case CarouselModel::TARGET_PAGE: $carousels[$key]['url'] = $this->url->get([ - 'for' => 'web.page.show', + 'for' => 'desktop.page.show', 'id' => $carousel['content'], ]); break; diff --git a/app/Http/Web/Services/Live.php b/app/Http/Desktop/Services/Live.php similarity index 98% rename from app/Http/Web/Services/Live.php rename to app/Http/Desktop/Services/Live.php index 810252d6..c5ba0c10 100644 --- a/app/Http/Web/Services/Live.php +++ b/app/Http/Desktop/Services/Live.php @@ -1,6 +1,6 @@ url->get( - ['for' => 'web.qrcode'], + ['for' => 'desktop.qrcode'], ['text' => urlencode($text)] ); } diff --git a/app/Http/Web/Views/account/edit_email.volt b/app/Http/Desktop/Views/account/edit_email.volt similarity index 93% rename from app/Http/Web/Views/account/edit_email.volt rename to app/Http/Desktop/Views/account/edit_email.volt index b624bdd3..3c09146b 100644 --- a/app/Http/Web/Views/account/edit_email.volt +++ b/app/Http/Desktop/Views/account/edit_email.volt @@ -2,7 +2,7 @@ {% block content %} -