diff --git a/app/Builders/CommentList.php b/app/Builders/CommentList.php index a3e3bcbb..84a953c7 100644 --- a/app/Builders/CommentList.php +++ b/app/Builders/CommentList.php @@ -84,12 +84,12 @@ class CommentList extends Builder $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']); - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); $result = []; foreach ($users->toArray() as $user) { - $user['avatar'] = $imgBaseUrl . $user['avatar']; + $user['avatar'] = $baseUrl . $user['avatar']; $result[$user['id']] = $user; } diff --git a/app/Builders/ConsultList.php b/app/Builders/ConsultList.php index 0ec526a1..8649c6f1 100644 --- a/app/Builders/ConsultList.php +++ b/app/Builders/ConsultList.php @@ -55,12 +55,12 @@ class ConsultList extends Builder $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']); - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); $result = []; foreach ($users->toArray() as $user) { - $user['avatar'] = $imgBaseUrl . $user['avatar']; + $user['avatar'] = $baseUrl . $user['avatar']; $result[$user['id']] = $user; } diff --git a/app/Builders/Course.php b/app/Builders/Course.php index 39285f1a..a85731e7 100644 --- a/app/Builders/Course.php +++ b/app/Builders/Course.php @@ -13,7 +13,7 @@ class Course extends Builder */ public function handleCourse(CourseModel $course) { - $course->cover = kg_img_url($course->cover); + $course->cover = kg_ci_img_url($course->cover); return $course; } diff --git a/app/Builders/CourseFavoriteList.php b/app/Builders/CourseFavoriteList.php index 57eb88b8..91ecd68f 100644 --- a/app/Builders/CourseFavoriteList.php +++ b/app/Builders/CourseFavoriteList.php @@ -44,12 +44,12 @@ class CourseFavoriteList extends Builder $courses = $courseRepo->findByIds($ids, $columns); - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); $result = []; foreach ($courses->toArray() as $course) { - $course['cover'] = $imgBaseUrl . $course['cover']; + $course['cover'] = $baseUrl . $course['cover']; $course['attrs'] = json_decode($course['attrs'], true); $result[$course['id']] = $course; } @@ -65,12 +65,12 @@ class CourseFavoriteList extends Builder $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']); - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); $result = []; foreach ($users->toArray() as $user) { - $user['avatar'] = $imgBaseUrl . $user['avatar']; + $user['avatar'] = $baseUrl . $user['avatar']; $result[$user['id']] = $user; } diff --git a/app/Builders/CourseList.php b/app/Builders/CourseList.php index cdbbf9f2..b729bcc3 100644 --- a/app/Builders/CourseList.php +++ b/app/Builders/CourseList.php @@ -11,14 +11,14 @@ class CourseList extends Builder public function handleCourses($courses) { - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); $list = []; foreach ($courses as $course) { $course['categories'] = []; - $course['cover'] = $imgBaseUrl . $course['cover']; + $course['cover'] = $baseUrl . $course['cover']; $course['attrs'] = json_decode($course['attrs'], true); $result[] = [ @@ -111,12 +111,12 @@ class CourseList extends Builder $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']); - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); $result = []; foreach ($users->toArray() as $user) { - $user['avatar'] = $imgBaseUrl . $user['avatar']; + $user['avatar'] = $baseUrl . $user['avatar']; $result[$user['id']] = $user; } diff --git a/app/Builders/CourseUserList.php b/app/Builders/CourseUserList.php index a333d3ad..bcc5e59b 100644 --- a/app/Builders/CourseUserList.php +++ b/app/Builders/CourseUserList.php @@ -44,12 +44,12 @@ class CourseUserList extends Builder $courses = $courseRepo->findByIds($ids, $columns); - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); $result = []; foreach ($courses->toArray() as $course) { - $course['cover'] = $imgBaseUrl . $course['cover']; + $course['cover'] = $baseUrl . $course['cover']; $course['attrs'] = json_decode($course['attrs'], true); $result[$course['id']] = $course; } @@ -65,12 +65,12 @@ class CourseUserList extends Builder $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']); - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); $result = []; foreach ($users->toArray() as $user) { - $user['avatar'] = $imgBaseUrl . $user['avatar']; + $user['avatar'] = $baseUrl . $user['avatar']; $result[$user['id']] = $user; } diff --git a/app/Builders/OrderList.php b/app/Builders/OrderList.php index 14e95e73..5d45fad8 100644 --- a/app/Builders/OrderList.php +++ b/app/Builders/OrderList.php @@ -8,11 +8,11 @@ use App\Repos\User as UserRepo; class OrderList extends Builder { - protected $imgBaseUrl; + protected $baseUrl; public function __construct() { - $this->imgBaseUrl = kg_img_base_url(); + $this->imgBaseUrl = kg_ci_base_url(); } /** diff --git a/app/Builders/ReviewList.php b/app/Builders/ReviewList.php index 8714fc21..d8d609dd 100644 --- a/app/Builders/ReviewList.php +++ b/app/Builders/ReviewList.php @@ -55,12 +55,12 @@ class ReviewList extends Builder $users = $userRepo->findByIds($ids, ['id', 'name', 'avatar']); - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); $result = []; foreach ($users->toArray() as $user) { - $user['avatar'] = $imgBaseUrl . $user['avatar']; + $user['avatar'] = $baseUrl . $user['avatar']; $result[$user['id']] = $user; } diff --git a/app/Builders/SlideList.php b/app/Builders/SlideList.php index 0174c281..b371bf7f 100644 --- a/app/Builders/SlideList.php +++ b/app/Builders/SlideList.php @@ -7,10 +7,10 @@ class SlideList extends Builder public function handleSlides($slides) { - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); foreach ($slides as $key => $slide) { - $slides[$key]['cover'] = $imgBaseUrl . $slide['cover']; + $slides[$key]['cover'] = $baseUrl . $slide['cover']; } return $slides; diff --git a/app/Builders/User.php b/app/Builders/User.php index 93a6885f..80589fae 100644 --- a/app/Builders/User.php +++ b/app/Builders/User.php @@ -13,7 +13,7 @@ class User extends Builder */ public function handleUser(UserModel $user) { - $user->avatar = kg_img_url($user->avatar); + $user->avatar = kg_ci_img_url($user->avatar); return $user; } diff --git a/app/Builders/UserList.php b/app/Builders/UserList.php index 14ff13bf..58515b27 100644 --- a/app/Builders/UserList.php +++ b/app/Builders/UserList.php @@ -10,10 +10,10 @@ class UserList extends Builder public function handleUsers($users) { - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); foreach ($users as $key => $user) { - $users[$key]['avatar'] = $imgBaseUrl . $user['avatar']; + $users[$key]['avatar'] = $baseUrl . $user['avatar']; } return $users; diff --git a/app/Caches/Cache.php b/app/Caches/Cache.php index f0e43e8b..5e8481ad 100644 --- a/app/Caches/Cache.php +++ b/app/Caches/Cache.php @@ -4,6 +4,7 @@ namespace App\Caches; use Phalcon\Cache\Backend\Redis as RedisCache; use Phalcon\Mvc\User\Component; +use Yansongda\Supports\Collection; abstract class Cache extends Component { @@ -28,8 +29,6 @@ abstract class Cache extends Component { $key = $this->getKey($id); - $content = $this->cache->get($key); - if (!$this->cache->exists($key)) { $content = $this->getContent($id); @@ -41,9 +40,14 @@ abstract class Cache extends Component $this->cache->save($key, $content, $lifetime); + } else { $content = $this->cache->get($key); } + if (is_array($content)) { + $content = new Collection($content); + } + return $content; } diff --git a/app/Caches/Course.php b/app/Caches/Course.php index dd81374e..f353b063 100644 --- a/app/Caches/Course.php +++ b/app/Caches/Course.php @@ -25,7 +25,7 @@ class Course extends Cache $course = $courseRepo->findById($id); - $course->cover = kg_img_url($course->cover); + $course->cover = kg_ci_img_url($course->cover); if (!$course) { return new \stdClass(); diff --git a/app/Caches/CoursePackageList.php b/app/Caches/CoursePackageList.php index 36033b11..5fbe83ce 100644 --- a/app/Caches/CoursePackageList.php +++ b/app/Caches/CoursePackageList.php @@ -66,11 +66,11 @@ class CoursePackageList extends Cache $result = []; - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); foreach ($courses as $course) { - $course->cover = $imgBaseUrl . $course->cover; + $course->cover = $baseUrl . $course->cover; $result[] = [ 'id' => $course->id, diff --git a/app/Caches/CourseRelatedList.php b/app/Caches/CourseRelatedList.php index ff658bfd..572dd61f 100644 --- a/app/Caches/CourseRelatedList.php +++ b/app/Caches/CourseRelatedList.php @@ -41,11 +41,11 @@ class CourseRelatedList extends Cache { $result = []; - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); foreach ($courses as $course) { - $course->cover = $imgBaseUrl . $course->cover; + $course->cover = $baseUrl . $course->cover; $result[] = [ 'id' => $course->id, diff --git a/app/Caches/CourseTeacherList.php b/app/Caches/CourseTeacherList.php index eb143150..3302a866 100644 --- a/app/Caches/CourseTeacherList.php +++ b/app/Caches/CourseTeacherList.php @@ -41,11 +41,11 @@ class CourseTeacherList extends Cache { $result = []; - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); foreach ($users as $user) { - $user->avatar = $imgBaseUrl . $user->avatar; + $user->avatar = $baseUrl . $user->avatar; $result[] = [ 'id' => $user->id, diff --git a/app/Caches/LatestCourseList.php b/app/Caches/LatestCourseList.php index 53782bc7..a110ec3a 100644 --- a/app/Caches/LatestCourseList.php +++ b/app/Caches/LatestCourseList.php @@ -40,11 +40,11 @@ class LatestCourseList extends Cache { $result = []; - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); foreach ($courses as $course) { - $course->cover = $imgBaseUrl . $course->cover; + $course->cover = $baseUrl . $course->cover; $result[] = [ 'id' => $course->id, diff --git a/app/Http/Admin/Views/course/edit_basic.volt b/app/Http/Admin/Views/course/edit_basic.volt index 6cbd7fd0..3556b3d9 100644 --- a/app/Http/Admin/Views/course/edit_basic.volt +++ b/app/Http/Admin/Views/course/edit_basic.volt @@ -11,11 +11,11 @@
{% if course.cover %} - + {% else %} {% endif %} - +
编辑 diff --git a/app/Http/Admin/Views/help/list.volt b/app/Http/Admin/Views/help/list.volt index 3f36455a..48502b30 100644 --- a/app/Http/Admin/Views/help/list.volt +++ b/app/Http/Admin/Views/help/list.volt @@ -18,12 +18,14 @@ + 编号 标题 + 创建时间 更新时间 排序 发布 @@ -35,6 +37,7 @@ {{ item.id }} {{ item.title }} + {{ date('Y-m-d H:i',item.create_time) }} {{ date('Y-m-d H:i',item.update_time) }} diff --git a/app/Http/Admin/Views/index.volt b/app/Http/Admin/Views/index.volt index 94ba44b0..f73a11c5 100644 --- a/app/Http/Admin/Views/index.volt +++ b/app/Http/Admin/Views/index.volt @@ -6,6 +6,7 @@ 管理后台 + {{ icon_link("favicon.ico") }} {{ css_link('lib/layui/css/layui.css') }} {{ css_link('lib/layui/extends/dropdown.css') }} {{ css_link('admin/css/style.css') }} diff --git a/app/Http/Admin/Views/slide/edit.volt b/app/Http/Admin/Views/slide/edit.volt index 8c54bad9..3483821e 100644 --- a/app/Http/Admin/Views/slide/edit.volt +++ b/app/Http/Admin/Views/slide/edit.volt @@ -18,11 +18,11 @@
{% if slide.cover %} - + {% else %} {% endif %} - +
编辑 diff --git a/app/Http/Admin/Views/student/list.volt b/app/Http/Admin/Views/student/list.volt index 2ebe9a89..2381e204 100644 --- a/app/Http/Admin/Views/student/list.volt +++ b/app/Http/Admin/Views/student/list.volt @@ -63,7 +63,10 @@

时长：{{ item.duration|total_duration }}

{{ source_type_info(item.source_type) }} - {{ date('Y-m-d H:i',item.expiry_time) }} + +

开始：{{ date('Y-m-d H:i',item.create_time) }}

+

结束：{{ date('Y-m-d H:i',item.expiry_time) }}

+
diff --git a/app/Http/Admin/Views/topic/list.volt b/app/Http/Admin/Views/topic/list.volt index ab2a0a97..4bdbe644 100644 --- a/app/Http/Admin/Views/topic/list.volt +++ b/app/Http/Admin/Views/topic/list.volt @@ -17,6 +17,8 @@ + + @@ -24,6 +26,8 @@ 编号 标题 课程数 + 创建时间 + 更新时间 发布 操作 @@ -34,6 +38,8 @@ {{ item.id }} {{ item.title }} {{ item.course_count }} + {{ date('Y-m-d H:i',item.create_time) }} + {{ date('Y-m-d H:i',item.update_time) }}
diff --git a/app/Http/Web/Controllers/Controller.php b/app/Http/Web/Controllers/Controller.php index bc60757a..891b449d 100644 --- a/app/Http/Web/Controllers/Controller.php +++ b/app/Http/Web/Controllers/Controller.php @@ -38,8 +38,8 @@ class Controller extends \Phalcon\Mvc\Controller { $this->view->setVar('auth_user', $this->authUser); $this->view->setVar('site_settings', $this->siteSettings); - $this->view->setVar('top_nav_list', $this->navList['top']); - $this->view->setVar('btm_nav_list', $this->navList['bottom']); + $this->view->setVar('top_nav_list', $this->navList->top); + $this->view->setVar('btm_nav_list', $this->navList->bottom); } protected function getAuthUser() @@ -54,16 +54,16 @@ class Controller extends \Phalcon\Mvc\Controller protected function getNavList() { - $treeListCache = new NavTreeListCache(); + $cache = new NavTreeListCache(); - return $treeListCache->get(); + return $cache->get(); } protected function getSiteSettings() { - $settingCache = new SettingCache(); + $cache = new SettingCache(); - return $settingCache->get('site'); + return $cache->get('site'); } } diff --git a/app/Http/Web/Controllers/ErrorController.php b/app/Http/Web/Controllers/ErrorController.php index 57597cdd..8d63eb3f 100644 --- a/app/Http/Web/Controllers/ErrorController.php +++ b/app/Http/Web/Controllers/ErrorController.php @@ -15,7 +15,7 @@ class ErrorController extends \Phalcon\Mvc\Controller public function initialize() { - $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); + $this->view->setRenderLevel(View::LEVEL_LAYOUT); } /** diff --git a/app/Http/Web/Controllers/PublicController.php b/app/Http/Web/Controllers/PublicController.php index b65bb02f..94f9e13a 100644 --- a/app/Http/Web/Controllers/PublicController.php +++ b/app/Http/Web/Controllers/PublicController.php @@ -5,7 +5,7 @@ namespace App\Http\Web\Controllers; use App\Models\ContentImage as ContentImageModel; use App\Services\Storage as StorageService; use App\Traits\Response as ResponseTrait; -use PHPQRCode\QRcode; +use PHPQRCode\QRcode as PHPQRCode; class PublicController extends \Phalcon\Mvc\Controller { @@ -44,7 +44,7 @@ class PublicController extends \Phalcon\Mvc\Controller $url = urldecode($text); - QRcode::png($url, false, $level, $size); + PHPQRcode::png($url, false, $level, $size); $this->response->send(); diff --git a/app/Http/Web/Views/error/show400.volt b/app/Http/Web/Views/error/show400.volt index 70269fe2..8c8c6597 100644 --- a/app/Http/Web/Views/error/show400.volt +++ b/app/Http/Web/Views/error/show400.volt @@ -1,3 +1,14 @@ {{ flashSession.output() }} -

page 400

+
+
+ +
+

+ 4 + 0 + 0 +

+
+
+
\ No newline at end of file diff --git a/app/Http/Web/Views/error/show401.volt b/app/Http/Web/Views/error/show401.volt index fd9dfd78..29fc21d9 100644 --- a/app/Http/Web/Views/error/show401.volt +++ b/app/Http/Web/Views/error/show401.volt @@ -1,3 +1,14 @@ {{ flashSession.output() }} -

page 401

+
+
+ +
+

+ 4 + 0 + 1 +

+
+
+
diff --git a/app/Http/Web/Views/error/show403.volt b/app/Http/Web/Views/error/show403.volt index 158c5040..01d8620a 100644 --- a/app/Http/Web/Views/error/show403.volt +++ b/app/Http/Web/Views/error/show403.volt @@ -1,3 +1,14 @@ {{ flashSession.output() }} -

page 403

+
+
+ +
+

+ 4 + 0 + 3 +

+
+
+
diff --git a/app/Http/Web/Views/error/show404.volt b/app/Http/Web/Views/error/show404.volt index 694139bf..de69a356 100644 --- a/app/Http/Web/Views/error/show404.volt +++ b/app/Http/Web/Views/error/show404.volt @@ -1,3 +1,14 @@ {{ flashSession.output() }} -

page 404

+
+
+ +
+

+ 4 + 0 + 4 +

+
+
+
diff --git a/app/Http/Web/Views/error/show500.volt b/app/Http/Web/Views/error/show500.volt index e1d0962f..89df2944 100644 --- a/app/Http/Web/Views/error/show500.volt +++ b/app/Http/Web/Views/error/show500.volt @@ -1,3 +1,14 @@ {{ flashSession.output() }} -

page 500

+
+
+ +
+

+ 5 + 0 + 0 +

+
+
+
diff --git a/app/Http/Web/Views/error/show503.volt b/app/Http/Web/Views/error/show503.volt new file mode 100644 index 00000000..daf294ae --- /dev/null +++ b/app/Http/Web/Views/error/show503.volt @@ -0,0 +1,14 @@ +{{ flashSession.output() }} + +
+
+ +
+

+ 5 + 0 + 3 +

+
+
+
diff --git a/app/Http/Web/Views/index.volt b/app/Http/Web/Views/index.volt index b524ddb9..f240b92b 100644 --- a/app/Http/Web/Views/index.volt +++ b/app/Http/Web/Views/index.volt @@ -1,18 +1,14 @@ - - Phalcon + {{ site_settings.title }} + {{ icon_link("favicon.ico") }} {{ css_link("lib/layui/css/layui.css") }} {{ js_include("lib/layui/layui.js") }} - - {{ content() }} - - \ No newline at end of file diff --git a/app/Http/Web/Views/layouts/error.volt b/app/Http/Web/Views/layouts/error.volt new file mode 100644 index 00000000..368d9e33 --- /dev/null +++ b/app/Http/Web/Views/layouts/error.volt @@ -0,0 +1,15 @@ + + + + + + 出错啦 + {{ icon_link("favicon.ico") }} + {{ css_link("lib/layui/css/layui.css") }} + {{ css_link("web/css/style.css") }} + {{ js_include("lib/layui/layui.js") }} + + +{{ content() }} + + \ No newline at end of file diff --git a/app/Library/Helper.php b/app/Library/Helper.php index f3b5e0de..e3694a5c 100644 --- a/app/Library/Helper.php +++ b/app/Library/Helper.php @@ -150,11 +150,11 @@ function kg_site_base_url() } /** - * 获取图片基准URL + * 获取数据万象基准URL * * @return string */ -function kg_img_base_url() +function kg_ci_base_url() { $storage = new StorageService(); @@ -162,14 +162,14 @@ function kg_img_base_url() } /** - * 获取图片URL + * 获取数据万象图片URL * * @param string $path * @param int $width * @param int $height * @return string */ -function kg_img_url($path, $width = 0, $height = 0) +function kg_ci_img_url($path, $width = 0, $height = 0) { $storage = new StorageService(); @@ -275,6 +275,21 @@ function kg_can($route = null) return true; } +/** + * 构造icon路径 + * + * @param $path + * @param bool $local + * @param string $version + * @return string + */ +function kg_icon_link($path, $local = true, $version = null) +{ + $href = kg_static_url($path, $local, $version); + + return '' . PHP_EOL; +} + /** * 构造css路径 * @@ -285,16 +300,7 @@ function kg_can($route = null) */ function kg_css_link($path, $local = true, $version = null) { - $config = Di::getDefault()->getShared('config'); - - $baseUri = rtrim($config->static_base_uri, '/'); - $path = ltrim($path, '/'); - $href = $local ? $baseUri . '/' . $path : $path; - $version = $version ? $version : $config->static_version; - - if ($version) { - $href .= '?v=' . $version; - } + $href = kg_static_url($path, $local, $version); return '' . PHP_EOL; } @@ -308,17 +314,32 @@ function kg_css_link($path, $local = true, $version = null) * @return string */ function kg_js_include($path, $local = true, $version = null) +{ + $src = kg_static_url($path, $local, $version); + + return '' . PHP_EOL; +} + +/** + * 构造静态url + * + * @param $path + * @param bool $local + * @param string $version + * @return string + */ +function kg_static_url($path, $local = true, $version = null) { $config = Di::getDefault()->getShared('config'); $baseUri = rtrim($config->static_base_uri, '/'); $path = ltrim($path, '/'); - $src = $local ? $baseUri . '/' . $path : $path; + $url = $local ? $baseUri . '/' . $path : $path; $version = $version ? $version : $config->static_version; if ($version) { - $src .= '?v=' . $version; + $url .= '?v=' . $version; } - return '' . PHP_EOL; + return $url; } diff --git a/app/Providers/Volt.php b/app/Providers/Volt.php index 2b79cf45..6a1c5177 100644 --- a/app/Providers/Volt.php +++ b/app/Providers/Volt.php @@ -22,6 +22,10 @@ class Volt extends Provider $compiler = $volt->getCompiler(); + $compiler->addFunction('icon_link', function ($resolvedArgs) { + return 'kg_icon_link(' . $resolvedArgs . ')'; + }); + $compiler->addFunction('css_link', function ($resolvedArgs) { return 'kg_css_link(' . $resolvedArgs . ')'; }); @@ -30,6 +34,10 @@ class Volt extends Provider return 'kg_js_include(' . $resolvedArgs . ')'; }); + $compiler->addFunction('ci_img', function ($resolvedArgs) { + return 'kg_ci_img_url(' . $resolvedArgs . ')'; + }); + $compiler->addFunction('substr', function ($resolvedArgs) { return 'kg_substr(' . $resolvedArgs . ')'; }); @@ -38,10 +46,6 @@ class Volt extends Provider return 'kg_can(' . $resolvedArgs . ')'; }); - $compiler->addFunction('img_url', function ($resolvedArgs) { - return 'kg_img_url(' . $resolvedArgs . ')'; - }); - $compiler->addFilter('array_object', function ($resolvedArgs) { return 'kg_array_object(' . $resolvedArgs . ')'; }); diff --git a/app/Services/Frontend/Course/CourseInfo.php b/app/Services/Frontend/Course/CourseInfo.php index 0ae6e163..12d31914 100644 --- a/app/Services/Frontend/Course/CourseInfo.php +++ b/app/Services/Frontend/Course/CourseInfo.php @@ -74,7 +74,7 @@ class CourseInfo extends Service $result = [ 'id' => $course->id, 'title' => $course->title, - 'cover' => kg_img_url($course->cover), + 'cover' => kg_ci_img_url($course->cover), 'summary' => $course->summary, 'details' => $course->details, 'keywords' => $course->keywords, diff --git a/app/Services/Frontend/Course/CourseList.php b/app/Services/Frontend/Course/CourseList.php index 61179c5a..ff231dd5 100644 --- a/app/Services/Frontend/Course/CourseList.php +++ b/app/Services/Frontend/Course/CourseList.php @@ -49,11 +49,11 @@ class CourseList extends Service $items = []; - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); foreach ($courses as $course) { - $course['cover'] = $imgBaseUrl . $course['cover']; + $course['cover'] = $baseUrl . $course['cover']; $items[] = [ 'id' => $course['id'], diff --git a/app/Services/Frontend/Course/CourseRelated.php b/app/Services/Frontend/Course/CourseRelated.php index de19a7a3..edda6a05 100644 --- a/app/Services/Frontend/Course/CourseRelated.php +++ b/app/Services/Frontend/Course/CourseRelated.php @@ -23,10 +23,10 @@ class CourseRelated extends Service return []; } - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); foreach ($courses as &$course) { - $course['cover'] = $imgBaseUrl . $course['cover']; + $course['cover'] = $baseUrl . $course['cover']; } return $courses; diff --git a/app/Services/Frontend/Course/PackageList.php b/app/Services/Frontend/Course/PackageList.php index 609b74e9..9837e74a 100644 --- a/app/Services/Frontend/Course/PackageList.php +++ b/app/Services/Frontend/Course/PackageList.php @@ -60,11 +60,11 @@ class PackageList extends Service $result = []; - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); foreach ($courses as $course) { - $course->cover = $imgBaseUrl . $course->cover; + $course->cover = $baseUrl . $course->cover; $result[] = [ 'id' => $course->id, diff --git a/app/Services/Frontend/Course/TeacherList.php b/app/Services/Frontend/Course/TeacherList.php index 0426b15e..45c8f702 100644 --- a/app/Services/Frontend/Course/TeacherList.php +++ b/app/Services/Frontend/Course/TeacherList.php @@ -21,10 +21,10 @@ class TeacherList extends Service if (!$teachers) return []; - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); foreach ($teachers as &$teacher) { - $teacher['avatar'] = $imgBaseUrl . $teacher['avatar']; + $teacher['avatar'] = $baseUrl . $teacher['avatar']; } return $teachers; diff --git a/app/Services/Frontend/Order/OrderConfirm.php b/app/Services/Frontend/Order/OrderConfirm.php index 3368b216..699a80b2 100644 --- a/app/Services/Frontend/Order/OrderConfirm.php +++ b/app/Services/Frontend/Order/OrderConfirm.php @@ -60,7 +60,7 @@ class OrderConfirm extends Service $course = $courseRepo->findById($id); - $course->cover = kg_img_url($course->cover); + $course->cover = kg_ci_img_url($course->cover); $result = [ 'id' => $course->id, @@ -97,11 +97,11 @@ class OrderConfirm extends Service */ $courses = $packageRepo->findCourses($id); - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); foreach ($courses as $course) { - $course->cover = $imgBaseUrl . $course->cover; + $course->cover = $baseUrl . $course->cover; $result['courses'][] = [ 'id' => $course->id, diff --git a/app/Services/Frontend/Order/OrderInfo.php b/app/Services/Frontend/Order/OrderInfo.php index 1ddb6b39..8f6b3977 100644 --- a/app/Services/Frontend/Order/OrderInfo.php +++ b/app/Services/Frontend/Order/OrderInfo.php @@ -75,7 +75,7 @@ class OrderInfo extends Service */ protected function handleCourseInfo($itemInfo) { - $itemInfo['course']['cover'] = kg_img_url($itemInfo['course']['cover']); + $itemInfo['course']['cover'] = kg_ci_img_url($itemInfo['course']['cover']); return $itemInfo; } @@ -86,10 +86,10 @@ class OrderInfo extends Service */ protected function handlePackageInfo($itemInfo) { - $imgBaseUrl = kg_img_base_url(); + $baseUrl = kg_ci_base_url(); foreach ($itemInfo['package']['courses'] as &$course) { - $course['cover'] = $imgBaseUrl . $course['cover']; + $course['cover'] = $baseUrl . $course['cover']; } return $itemInfo; diff --git a/app/Services/Frontend/Teacher/TeacherInfo.php b/app/Services/Frontend/Teacher/TeacherInfo.php index 17427bbb..dc4098b3 100644 --- a/app/Services/Frontend/Teacher/TeacherInfo.php +++ b/app/Services/Frontend/Teacher/TeacherInfo.php @@ -24,7 +24,7 @@ class TeacherInfo extends Service */ protected function handleUser($user) { - $user->avatar = kg_img_url($user->avatar); + $user->avatar = kg_ci_img_url($user->avatar); $user->vip = $user->vip == 1; $user->locked = $user->locked == 1; diff --git a/app/Services/Frontend/User/UserInfo.php b/app/Services/Frontend/User/UserInfo.php index d472b2ec..882da54d 100644 --- a/app/Services/Frontend/User/UserInfo.php +++ b/app/Services/Frontend/User/UserInfo.php @@ -24,7 +24,7 @@ class UserInfo extends Service */ protected function handleUser($user) { - $user->avatar = kg_img_url($user->avatar); + $user->avatar = kg_ci_img_url($user->avatar); $user->vip = $user->vip == 1; $user->locked = $user->locked == 1; diff --git a/public/favicon.ico b/public/static/favicon.ico similarity index 100% rename from public/favicon.ico rename to public/static/favicon.ico diff --git a/public/static/web/css/style.css b/public/static/web/css/style.css new file mode 100644 index 00000000..a696277c --- /dev/null +++ b/public/static/web/css/style.css @@ -0,0 +1,27 @@ +.kg-tips { + margin-top: 30px; + text-align: center; +} + +.kg-tips .layui-icon-face-surprised { + display: inline-block; + font-size: 200px; + color: #393D49; +} + +.kg-tips .layui-text { + width: 500px; + margin: 30px auto; + padding-top: 20px; + border-top: 5px solid #009688; +} + +.kg-tips h1 { + font-size: 100px; + line-height: 100px; + color: #009688; +} + +.kg-tips .layui-text span { + display: inline-block; +} \ No newline at end of file