From 38917697d07913546577b0afc236c1d9c2caedad Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Wed, 18 Dec 2019 16:01:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E8=A1=8C=E5=88=86=E9=9A=94?= =?UTF-8?q?=E7=AC=A6=E4=B8=BAlinux=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=AD=97?= =?UTF-8?q?=E7=AC=A6=E4=B8=BAUTF-8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Caches/Category.php | 2 +- app/Caches/Course.php | 2 +- app/Caches/User.php | 2 +- app/Http/Admin/Services/Slide.php | 1 - app/Http/Admin/Views/audit/list.volt | 2 +- app/Http/Admin/Views/category/list.volt | 4 +- .../Admin/Views/chapter/lessons_article.volt | 2 +- .../Admin/Views/chapter/lessons_live.volt | 2 +- app/Http/Admin/Views/chapter/lessons_vod.volt | 2 +- app/Http/Admin/Views/config/vod.volt | 4 +- app/Http/Admin/Views/course/chapters.volt | 2 +- app/Http/Admin/Views/course/edit_basic.volt | 2 +- app/Http/Admin/Views/course/list.volt | 4 +- app/Http/Admin/Views/index/index.volt | 8 +-- app/Http/Admin/Views/nav/list.volt | 4 +- app/Http/Admin/Views/package/edit.volt | 4 +- app/Http/Admin/Views/package/list.volt | 2 +- app/Http/Admin/Views/page/list.volt | 2 +- app/Http/Admin/Views/review/list.volt | 4 +- app/Http/Admin/Views/role/list.volt | 4 +- app/Http/Admin/Views/slide/edit.volt | 2 +- app/Http/Admin/Views/slide/list.volt | 2 +- app/Http/Admin/Views/student/learning.volt | 2 +- app/Http/Admin/Views/student/list.volt | 2 +- app/Http/Admin/Views/user/list.volt | 2 +- app/Http/Api/Services/Service.php | 2 +- app/Http/Home/Controllers/OrderController.php | 2 +- app/Http/Home/Services/Account.php | 2 +- app/Http/Home/Services/Category.php | 6 +- app/Http/Home/Services/Chapter.php | 10 +-- app/Http/Home/Services/ChapterAdmin.php | 2 +- .../Home/Services/ChapterContentAdmin.php | 8 +-- app/Http/Home/Services/Comment.php | 8 +-- app/Http/Home/Services/Consult.php | 4 +- app/Http/Home/Services/Course.php | 10 +-- app/Http/Home/Services/CourseAdmin.php | 6 +- app/Http/Home/Services/My.php | 16 ++--- app/Http/Home/Services/Order.php | 4 +- app/Http/Home/Services/Review.php | 4 +- app/Http/Home/Views/index/player.volt | 12 ++-- app/Transformers/CommentList.php | 2 +- app/Transformers/LearningList.php | 2 +- composer.json | 2 +- docker/docker-compose.yml | 67 ------------------- docker/mysql/Dockerfile | 10 --- docker/mysql/data/.gitignore | 2 - docker/mysql/log/.gitignore | 2 - docker/nginx/Dockerfile | 10 --- docker/nginx/conf.d/default.conf | 29 -------- docker/nginx/log/.gitignore | 2 - docker/php/Dockerfile | 27 -------- docker/php/log/.gitignore | 2 - docker/redis/Dockerfile | 10 --- docker/redis/data/.gitignore | 2 - docker/sources.list | 8 --- docker/xunsearch/Dockerfile | 28 -------- docker/xunsearch/data/.gitignore | 2 - docker/xunsearch/xs-docker.sh | 17 ----- public/static/admin/js/xm-course.js | 2 +- public/static/lib/layui/extends/dropdown.js | 2 +- websocket/start_business_worker.php | 4 +- websocket/start_gateway.php | 4 +- websocket/start_register.php | 4 +- 63 files changed, 93 insertions(+), 312 deletions(-) delete mode 100644 docker/docker-compose.yml delete mode 100644 docker/mysql/Dockerfile delete mode 100644 docker/mysql/data/.gitignore delete mode 100644 docker/mysql/log/.gitignore delete mode 100644 docker/nginx/Dockerfile delete mode 100644 docker/nginx/conf.d/default.conf delete mode 100644 docker/nginx/log/.gitignore delete mode 100644 docker/php/Dockerfile delete mode 100644 docker/php/log/.gitignore delete mode 100644 docker/redis/Dockerfile delete mode 100644 docker/redis/data/.gitignore delete mode 100644 docker/sources.list delete mode 100644 docker/xunsearch/Dockerfile delete mode 100644 docker/xunsearch/data/.gitignore delete mode 100644 docker/xunsearch/xs-docker.sh diff --git a/app/Caches/Category.php b/app/Caches/Category.php index 440b38d0..f3027f75 100644 --- a/app/Caches/Category.php +++ b/app/Caches/Category.php @@ -2,8 +2,8 @@ namespace App\Library\Cache; -use App\Models\Category as CategoryModel; use App\Exceptions\NotFound as ModelNotFoundException; +use App\Models\Category as CategoryModel; class Category extends \Phalcon\Di\Injectable { diff --git a/app/Caches/Course.php b/app/Caches/Course.php index d02bfa98..34eb7853 100644 --- a/app/Caches/Course.php +++ b/app/Caches/Course.php @@ -2,8 +2,8 @@ namespace App\Library\Cache; -use App\Models\Course as CourseModel; use App\Exceptions\NotFound as ModelNotFoundException; +use App\Models\Course as CourseModel; class Course extends \Phalcon\Di\Injectable { diff --git a/app/Caches/User.php b/app/Caches/User.php index 5878f544..86392d44 100644 --- a/app/Caches/User.php +++ b/app/Caches/User.php @@ -2,8 +2,8 @@ namespace App\Library\Cache; -use App\Models\User as UserModel; use App\Exceptions\NotFound as ModelNotFoundException; +use App\Models\User as UserModel; class User extends \Phalcon\Di\Injectable { diff --git a/app/Http/Admin/Services/Slide.php b/app/Http/Admin/Services/Slide.php index f7dd7840..5922209d 100644 --- a/app/Http/Admin/Services/Slide.php +++ b/app/Http/Admin/Services/Slide.php @@ -5,7 +5,6 @@ namespace App\Http\Admin\Services; use App\Library\Paginator\Query as PagerQuery; use App\Models\Slide as SlideModel; use App\Repos\Slide as SlideRepo; -use App\Services\Storage as StorageService; use App\Validators\Slide as SlideValidator; class Slide extends Service diff --git a/app/Http/Admin/Views/audit/list.volt b/app/Http/Admin/Views/audit/list.volt index f4e8277b..ba2ae912 100644 --- a/app/Http/Admin/Views/audit/list.volt +++ b/app/Http/Admin/Views/audit/list.volt @@ -37,7 +37,7 @@ {{ item.user_id }} {{ item.user_name }} - {{ item.user_ip }} + {{ item.user_ip }} {{ item.req_route }} {{ item.req_path }} {{ date('Y-m-d H:i:s',item.created_at) }} diff --git a/app/Http/Admin/Views/category/list.volt b/app/Http/Admin/Views/category/list.volt index 05e3948f..7685a3ad 100644 --- a/app/Http/Admin/Views/category/list.volt +++ b/app/Http/Admin/Views/category/list.volt @@ -57,9 +57,9 @@ diff --git a/app/Http/Admin/Views/chapter/lessons_article.volt b/app/Http/Admin/Views/chapter/lessons_article.volt index 0d19419f..3828f725 100644 --- a/app/Http/Admin/Views/chapter/lessons_article.volt +++ b/app/Http/Admin/Views/chapter/lessons_article.volt @@ -36,7 +36,7 @@ diff --git a/app/Http/Admin/Views/chapter/lessons_live.volt b/app/Http/Admin/Views/chapter/lessons_live.volt index 6a70f9e5..df4f078b 100644 --- a/app/Http/Admin/Views/chapter/lessons_live.volt +++ b/app/Http/Admin/Views/chapter/lessons_live.volt @@ -44,7 +44,7 @@ diff --git a/app/Http/Admin/Views/chapter/lessons_vod.volt b/app/Http/Admin/Views/chapter/lessons_vod.volt index 4f6a68d8..595839dc 100644 --- a/app/Http/Admin/Views/chapter/lessons_vod.volt +++ b/app/Http/Admin/Views/chapter/lessons_vod.volt @@ -53,7 +53,7 @@ diff --git a/app/Http/Admin/Views/config/vod.volt b/app/Http/Admin/Views/config/vod.volt index 10a3d9f8..46ad41b5 100644 --- a/app/Http/Admin/Views/config/vod.volt +++ b/app/Http/Admin/Views/config/vod.volt @@ -162,7 +162,7 @@ } else { template.val('210,220,230'); } - } + }; var changeAudioTemplate = function (format) { var template = $('input[name=audio_template]'); @@ -171,7 +171,7 @@ } else { template.val('1110'); } - } + }; form.on('radio(storage-type)', function (data) { var block = $('#storage-region-block'); diff --git a/app/Http/Admin/Views/course/chapters.volt b/app/Http/Admin/Views/course/chapters.volt index bcccbf98..85e2825d 100644 --- a/app/Http/Admin/Views/course/chapters.volt +++ b/app/Http/Admin/Views/course/chapters.volt @@ -48,7 +48,7 @@ diff --git a/app/Http/Admin/Views/course/edit_basic.volt b/app/Http/Admin/Views/course/edit_basic.volt index b4f8c06a..30b7da5e 100644 --- a/app/Http/Admin/Views/course/edit_basic.volt +++ b/app/Http/Admin/Views/course/edit_basic.volt @@ -18,7 +18,7 @@
- 编辑 + 编辑
diff --git a/app/Http/Admin/Views/course/list.volt b/app/Http/Admin/Views/course/list.volt index 9d14d803..d5c49514 100644 --- a/app/Http/Admin/Views/course/list.volt +++ b/app/Http/Admin/Views/course/list.volt @@ -83,9 +83,9 @@