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 @@
编辑
{% if item.deleted == 0 %}
- 删除
+ 删除
{% else %}
- 还原
+ 还原
{% endif %}
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 @@
编辑课程
{% if item.deleted == 0 %}
- 删除课程
+ 删除课程
{% else %}
- 还原课程
+ 还原课程
{% endif %}
章节管理
diff --git a/app/Http/Admin/Views/index/index.volt b/app/Http/Admin/Views/index/index.volt
index 84faf615..b42e183d 100644
--- a/app/Http/Admin/Views/index/index.volt
+++ b/app/Http/Admin/Views/index/index.volt
@@ -18,18 +18,18 @@
diff --git a/app/Http/Admin/Views/package/edit.volt b/app/Http/Admin/Views/package/edit.volt
index 79717bcf..ef61db7a 100644
--- a/app/Http/Admin/Views/package/edit.volt
+++ b/app/Http/Admin/Views/package/edit.volt
@@ -33,7 +33,7 @@
元
@@ -46,7 +46,7 @@
元
diff --git a/app/Http/Admin/Views/package/list.volt b/app/Http/Admin/Views/package/list.volt
index b282acc1..67bde57d 100644
--- a/app/Http/Admin/Views/package/list.volt
+++ b/app/Http/Admin/Views/package/list.volt
@@ -46,7 +46,7 @@
操作
diff --git a/app/Http/Admin/Views/page/list.volt b/app/Http/Admin/Views/page/list.volt
index 69ac93b2..4e966867 100644
--- a/app/Http/Admin/Views/page/list.volt
+++ b/app/Http/Admin/Views/page/list.volt
@@ -44,7 +44,7 @@
操作
diff --git a/app/Http/Admin/Views/review/list.volt b/app/Http/Admin/Views/review/list.volt
index cf883b29..d9be9845 100644
--- a/app/Http/Admin/Views/review/list.volt
+++ b/app/Http/Admin/Views/review/list.volt
@@ -50,9 +50,9 @@
编辑
{% if item.deleted == 0 %}
- 删除
+ 删除
{% else %}
- 还原
+ 还原
{% endif %}
diff --git a/app/Http/Admin/Views/role/list.volt b/app/Http/Admin/Views/role/list.volt
index 85466d5e..340c4ea2 100644
--- a/app/Http/Admin/Views/role/list.volt
+++ b/app/Http/Admin/Views/role/list.volt
@@ -40,7 +40,7 @@
{% for item in roles %}
{{ item.id }}
- {{ item.name }}
+ {{ item.name }}
{{ type_info(item.type) }}
@@ -52,7 +52,7 @@
操作
diff --git a/app/Http/Admin/Views/slide/edit.volt b/app/Http/Admin/Views/slide/edit.volt
index 7445fccc..596fe425 100644
--- a/app/Http/Admin/Views/slide/edit.volt
+++ b/app/Http/Admin/Views/slide/edit.volt
@@ -25,7 +25,7 @@
diff --git a/app/Http/Admin/Views/slide/list.volt b/app/Http/Admin/Views/slide/list.volt
index c98a7b56..ecbd2e09 100644
--- a/app/Http/Admin/Views/slide/list.volt
+++ b/app/Http/Admin/Views/slide/list.volt
@@ -60,7 +60,7 @@
操作
diff --git a/app/Http/Admin/Views/student/learning.volt b/app/Http/Admin/Views/student/learning.volt
index 284ea502..c49eadab 100644
--- a/app/Http/Admin/Views/student/learning.volt
+++ b/app/Http/Admin/Views/student/learning.volt
@@ -32,7 +32,7 @@
{{ item.duration|play_duration }}
{{ client_type(item.client_type) }}
- {{ item.client_ip }}
+ {{ item.client_ip }}
{{ date('Y-m-d H:i',item.created_at) }}
{% endfor %}
diff --git a/app/Http/Admin/Views/student/list.volt b/app/Http/Admin/Views/student/list.volt
index 8880e9d4..4b8d496a 100644
--- a/app/Http/Admin/Views/student/list.volt
+++ b/app/Http/Admin/Views/student/list.volt
@@ -56,7 +56,7 @@
操作
diff --git a/app/Http/Admin/Views/user/list.volt b/app/Http/Admin/Views/user/list.volt
index 53c6eff7..741debaf 100644
--- a/app/Http/Admin/Views/user/list.volt
+++ b/app/Http/Admin/Views/user/list.volt
@@ -61,7 +61,7 @@
{% for item in pager.items %}
{{ item.id }}
- {{ item.name }} {{ vip_info(item) }}
+ {{ item.name }} {{ vip_info(item) }}
{{ role_info(item) }}
{{ date('Y-m-d',item.created_at) }}
{{ status_info(item) }}
diff --git a/app/Http/Api/Services/Service.php b/app/Http/Api/Services/Service.php
index 06751348..801b2fbf 100644
--- a/app/Http/Api/Services/Service.php
+++ b/app/Http/Api/Services/Service.php
@@ -3,8 +3,8 @@
namespace App\Http\Api\Services;
use App\Models\User as UserModel;
-use App\Validators\Filter as BaseFilter;
use App\Repos\User as UserRepo;
+use App\Validators\Filter as BaseFilter;
use Phalcon\Mvc\User\Component as UserComponent;
diff --git a/app/Http/Home/Controllers/OrderController.php b/app/Http/Home/Controllers/OrderController.php
index 40f52730..a974488b 100644
--- a/app/Http/Home/Controllers/OrderController.php
+++ b/app/Http/Home/Controllers/OrderController.php
@@ -3,7 +3,7 @@
namespace App\Http\Home\Controllers;
use App\Models\Order as OrderModel;
-use \Home\Services\Order as OrderService;
+use Home\Services\Order as OrderService;
/**
* @RoutePrefix("/order")
diff --git a/app/Http/Home/Services/Account.php b/app/Http/Home/Services/Account.php
index 7df4b081..6f4e31a2 100644
--- a/app/Http/Home/Services/Account.php
+++ b/app/Http/Home/Services/Account.php
@@ -4,10 +4,10 @@ namespace App\Http\Home\Services;
use App\Exceptions\BadRequest as BadRequestException;
use App\Exceptions\Unauthorized as UnauthorizedException;
-use App\Validators\Account as AccountFilter;
use App\Repos\Account as AccountRepo;
use App\Repos\Captcha as CaptchaRepo;
use App\Repos\User as UserRepo;
+use App\Validators\Account as AccountFilter;
class Account extends Service
{
diff --git a/app/Http/Home/Services/Category.php b/app/Http/Home/Services/Category.php
index c9374365..ba65a4fb 100644
--- a/app/Http/Home/Services/Category.php
+++ b/app/Http/Home/Services/Category.php
@@ -2,13 +2,13 @@
namespace App\Http\Home\Services;
-use App\Transformers\CourseList as CourseListTransformer;
+use App\Library\Paginator\Query as PagerQuery;
use App\Models\Category as CategoryModel;
use App\Models\Course as CourseModel;
-use App\Validators\Course as CourseFilter;
use App\Repos\Category as CategoryRepo;
use App\Repos\Course as CourseRepo;
-use App\Library\Paginator\Query as PagerQuery;
+use App\Transformers\CourseList as CourseListTransformer;
+use App\Validators\Course as CourseFilter;
class Category extends Service
{
diff --git a/app/Http/Home/Services/Chapter.php b/app/Http/Home/Services/Chapter.php
index d2712dc0..c071f5f8 100644
--- a/app/Http/Home/Services/Chapter.php
+++ b/app/Http/Home/Services/Chapter.php
@@ -2,17 +2,17 @@
namespace App\Http\Home\Services;
-use App\Transformers\CommentList as CommentListTransformer;
-use App\Models\Comment as CommentModel;
use App\Exceptions\BadRequest as BadRequestException;
-use App\Validators\Chapter as ChapterFilter;
+use App\Library\Paginator\Query as PagerQuery;
+use App\Models\Comment as CommentModel;
use App\Repos\Chapter as ChapterRepo;
-use App\Repos\ChapterVote as ChapterVoteRepo;
use App\Repos\ChapterUser as ChapterUserRepo;
+use App\Repos\ChapterVote as ChapterVoteRepo;
use App\Repos\Comment as CommentRepo;
use App\Repos\Course as CourseRepo;
use App\Repos\Video as VideoRepo;
-use App\Library\Paginator\Query as PagerQuery;
+use App\Transformers\CommentList as CommentListTransformer;
+use App\Validators\Chapter as ChapterFilter;
class Chapter extends Service
{
diff --git a/app/Http/Home/Services/ChapterAdmin.php b/app/Http/Home/Services/ChapterAdmin.php
index de57d068..fe69b6c1 100644
--- a/app/Http/Home/Services/ChapterAdmin.php
+++ b/app/Http/Home/Services/ChapterAdmin.php
@@ -2,10 +2,10 @@
namespace App\Http\Home\Services;
-use App\Validators\Chapter as ChapterFilter;
use App\Models\Chapter as ChapterModel;
use App\Repos\Chapter as ChapterRepo;
use App\Repos\Course as CourseRepo;
+use App\Validators\Chapter as ChapterFilter;
class ChapterAdmin extends Service
{
diff --git a/app/Http/Home/Services/ChapterContentAdmin.php b/app/Http/Home/Services/ChapterContentAdmin.php
index 22b0babc..462e9930 100644
--- a/app/Http/Home/Services/ChapterContentAdmin.php
+++ b/app/Http/Home/Services/ChapterContentAdmin.php
@@ -2,17 +2,17 @@
namespace App\Http\Admin\Services;
-use App\Models\Course as CourseModel;
use App\Models\ChapterArticle as ChapterArticleModel;
use App\Models\ChapterLive as ChapterLiveModel;
use App\Models\ChapterVideo as ChapterVideoModel;
-use App\Validators\ChapterArticle as ChapterArticleFilter;
-use App\Validators\ChapterLive as ChapterLiveFilter;
-use App\Validators\ChapterVod as ChapterVideoFilter;
+use App\Models\Course as CourseModel;
use App\Repos\ChapterArticle as ChapterArticleRepo;
use App\Repos\ChapterLive as ChapterLiveRepo;
use App\Repos\ChapterVideo as ChapterVideoRepo;
use App\Repos\Course as CourseRepo;
+use App\Validators\ChapterArticle as ChapterArticleFilter;
+use App\Validators\ChapterLive as ChapterLiveFilter;
+use App\Validators\ChapterVod as ChapterVideoFilter;
class ChapterContentAdmin extends Service
{
diff --git a/app/Http/Home/Services/Comment.php b/app/Http/Home/Services/Comment.php
index e70c61d4..48e17097 100644
--- a/app/Http/Home/Services/Comment.php
+++ b/app/Http/Home/Services/Comment.php
@@ -2,16 +2,16 @@
namespace App\Http\Home\Services;
-use App\Transformers\CommentList as CommentListTransformer;
-use App\Models\Comment as CommentModel;
use App\Exceptions\BadRequest as BadRequestException;
-use App\Validators\Comment as CommentFilter;
+use App\Library\Paginator\Query as PagerQuery;
+use App\Models\Comment as CommentModel;
use App\Repos\Chapter as ChapterRepo;
use App\Repos\Comment as CommentRepo;
use App\Repos\CommentVote as CommentVoteRepo;
use App\Repos\Course as CourseRepo;
use App\Repos\User as UserRepo;
-use App\Library\Paginator\Query as PagerQuery;
+use App\Transformers\CommentList as CommentListTransformer;
+use App\Validators\Comment as CommentFilter;
class Comment extends Service
{
diff --git a/app/Http/Home/Services/Consult.php b/app/Http/Home/Services/Consult.php
index 0dd0ccf8..73c6adb5 100644
--- a/app/Http/Home/Services/Consult.php
+++ b/app/Http/Home/Services/Consult.php
@@ -2,13 +2,13 @@
namespace App\Http\Home\Services;
-use App\Models\Consult as ConsultModel;
use App\Exceptions\BadRequest as BadRequestException;
-use App\Validators\Consult as ConsultFilter;
+use App\Models\Consult as ConsultModel;
use App\Repos\Consult as ConsultRepo;
use App\Repos\ConsultVote as ConsultVoteRepo;
use App\Repos\Course as CourseRepo;
use App\Repos\User as UserRepo;
+use App\Validators\Consult as ConsultFilter;
class Consult extends Service
{
diff --git a/app/Http/Home/Services/Course.php b/app/Http/Home/Services/Course.php
index 8e783ace..818a108c 100644
--- a/app/Http/Home/Services/Course.php
+++ b/app/Http/Home/Services/Course.php
@@ -3,11 +3,6 @@
namespace App\Http\Home\Services;
use App\Exceptions\BadRequest as BadRequestException;
-use App\Transformers\ChapterList as ChapterListTransformer;
-use App\Transformers\CommentList as CommentListTransformer;
-use App\Transformers\ConsultList as ConsultListTransformer;
-use App\Transformers\CourseUserList as CourseUserListTransformer;
-use App\Transformers\ReviewList as ReviewListTransformer;
use App\Library\Paginator\Query as PagerQuery;
use App\Models\Comment as CommentModel;
use App\Models\Consult as ConsultModel;
@@ -19,6 +14,11 @@ use App\Repos\CourseFavorite as CourseFavoriteRepo;
use App\Repos\CourseStudent as CourseUserRepo;
use App\Repos\Review as ReviewRepo;
use App\Repos\User as UserRepo;
+use App\Transformers\ChapterList as ChapterListTransformer;
+use App\Transformers\CommentList as CommentListTransformer;
+use App\Transformers\ConsultList as ConsultListTransformer;
+use App\Transformers\CourseUserList as CourseUserListTransformer;
+use App\Transformers\ReviewList as ReviewListTransformer;
class Course extends Service
{
diff --git a/app/Http/Home/Services/CourseAdmin.php b/app/Http/Home/Services/CourseAdmin.php
index e0823b1f..950cb575 100644
--- a/app/Http/Home/Services/CourseAdmin.php
+++ b/app/Http/Home/Services/CourseAdmin.php
@@ -2,12 +2,12 @@
namespace App\Http\Home\Services;
-use App\Transformers\ChapterList as ChapterListTransformer;
-use App\Models\Course as CourseModel;
use App\Models\Category as CategoryModel;
-use App\Validators\Course as CourseFilter;
+use App\Models\Course as CourseModel;
use App\Repos\Category as CategoryRepo;
use App\Repos\Course as CourseRepo;
+use App\Transformers\ChapterList as ChapterListTransformer;
+use App\Validators\Course as CourseFilter;
class CourseAdmin extends Service
{
diff --git a/app/Http/Home/Services/My.php b/app/Http/Home/Services/My.php
index bcb22db6..b559a530 100644
--- a/app/Http/Home/Services/My.php
+++ b/app/Http/Home/Services/My.php
@@ -2,20 +2,20 @@
namespace App\Http\Home\Services;
+use App\Library\Paginator\Query as PagerQuery;
+use App\Models\Consult as ConsultModel;
+use App\Models\Review as ReviewModel;
+use App\Repos\Consult as ConsultRepo;
+use App\Repos\CourseFavorite as CourseFavoriteRepo;
+use App\Repos\CourseStudent as CourseUserRepo;
+use App\Repos\Order as OrderRepo;
+use App\Repos\Review as ReviewRepo;
use App\Transformers\ConsultList as ConsultListTransformer;
use App\Transformers\CourseFavoriteList as CourseFavoriteListTransformer;
use App\Transformers\CourseUserList as CourseUserListTransformer;
use App\Transformers\OrderList as OrderListTransformer;
use App\Transformers\ReviewList as ReviewListTransformer;
-use App\Models\Consult as ConsultModel;
-use App\Models\Review as ReviewModel;
use App\Validators\Order as OrderFilter;
-use App\Repos\Consult as ConsultRepo;
-use App\Repos\CourseStudent as CourseUserRepo;
-use App\Repos\CourseFavorite as CourseFavoriteRepo;
-use App\Repos\Order as OrderRepo;
-use App\Repos\Review as ReviewRepo;
-use App\Library\Paginator\Query as PagerQuery;
class My extends Service
{
diff --git a/app/Http/Home/Services/Order.php b/app/Http/Home/Services/Order.php
index 22880317..cc6c08bf 100644
--- a/app/Http/Home/Services/Order.php
+++ b/app/Http/Home/Services/Order.php
@@ -3,12 +3,12 @@
namespace App\Http\Home\Services;
use App\Models\Order as OrderModel;
-use App\Validators\Order as OrderFilter;
-use App\Repos\Package as PackageRepo;
use App\Repos\Course as CourseRepo;
use App\Repos\CourseStudent as CourseUserRepo;
use App\Repos\Order as OrderRepo;
use App\Repos\OrderItem as OrderItemRepo;
+use App\Repos\Package as PackageRepo;
+use App\Validators\Order as OrderFilter;
use Yansongda\Pay\Pay;
class Order extends Service
diff --git a/app/Http/Home/Services/Review.php b/app/Http/Home/Services/Review.php
index 9dede942..21ff8e52 100644
--- a/app/Http/Home/Services/Review.php
+++ b/app/Http/Home/Services/Review.php
@@ -2,15 +2,15 @@
namespace App\Http\Home\Services;
-use App\Models\Review as ReviewModel;
use App\Exceptions\BadRequest as BadRequestException;
use App\Exceptions\Forbidden as ForbiddenException;
-use App\Validators\Review as ReviewFilter;
+use App\Models\Review as ReviewModel;
use App\Repos\Course as CourseRepo;
use App\Repos\Review as ReviewRepo;
use App\Repos\ReviewStats as ReviewStatsRepo;
use App\Repos\ReviewVote as ReviewVoteRepo;
use App\Repos\User as UserRepo;
+use App\Validators\Review as ReviewFilter;
class Review extends Service
{
diff --git a/app/Http/Home/Views/index/player.volt b/app/Http/Home/Views/index/player.volt
index 98cff815..96499f99 100644
--- a/app/Http/Home/Views/index/player.volt
+++ b/app/Http/Home/Views/index/player.volt
@@ -14,7 +14,7 @@
loaded: 'loadedHandler', //当播放器加载后执行的函数
video: 'http://vod-cdn.koogua.com/20171012_fixed.m3u8'
//video: 'http://www.flashls.org/playlists/test_001/stream_1000k_48k_640x360.m3u8'
- }
+ };
var player = new chplayer(videoObject);
@@ -39,7 +39,7 @@
function loadedMetaDataHandler() {
var metaData = player.getMetaDate();
- var html = ''
+ var html = '';
if(parseInt(metaData['videoWidth']) > 0) {
changeText('.playerstate', '状态:获取到元数据信息,如果数据错误,可以使用延迟获取');
html += '总时间:' + metaData['duration'] + '秒,';
@@ -124,7 +124,7 @@
function changeVolume() {
var volume = player.getByElement('.changevolume').value;
- volume = Math.floor(volume * 100) / 100
+ volume = Math.floor(volume * 100) / 100;
if(volume < 0) {
alert('请填写大于0的数字');
return;
@@ -169,7 +169,7 @@
autoplay: true, //是否自动播放
loaded: 'loadedHandler', //当播放器加载后执行的函数
video: videoUrl
- }
+ };
//判断是需要重新加载播放器还是直接换新地址
if(player.playerType == 'html5video') {
@@ -235,7 +235,7 @@
backgroundColor: '#000000',
backAlpha: 0.5,
backRadius: 60 //背景圆角弧度
- }
+ };
var el = player.addElement(attribute);
}
@@ -283,7 +283,7 @@
//backgroundColor:'#FFFFFF',
backAlpha: 0.8,
backRadius: 30 //背景圆角弧度
- }
+ };
var danmu = player.addElement(danmuObj);
var danmuS = player.getElement(danmu);
var obj = {
diff --git a/app/Transformers/CommentList.php b/app/Transformers/CommentList.php
index 8ba10f4f..ba37ed0a 100644
--- a/app/Transformers/CommentList.php
+++ b/app/Transformers/CommentList.php
@@ -2,8 +2,8 @@
namespace App\Transformers;
-use App\Repos\Course as CourseRepo;
use App\Repos\Chapter as ChapterRepo;
+use App\Repos\Course as CourseRepo;
use App\Repos\User as UserRepo;
class CommentList extends Transformer
diff --git a/app/Transformers/LearningList.php b/app/Transformers/LearningList.php
index 74caa99a..afa6ccc5 100644
--- a/app/Transformers/LearningList.php
+++ b/app/Transformers/LearningList.php
@@ -2,8 +2,8 @@
namespace App\Transformers;
-use App\Repos\Course as CourseRepo;
use App\Repos\Chapter as ChapterRepo;
+use App\Repos\Course as CourseRepo;
use App\Repos\User as UserRepo;
class LearningList extends Transformer
diff --git a/composer.json b/composer.json
index 33da8f8b..418484fd 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"repositories": {
"packagist": {
"type": "composer",
- "url": "https://mirrors.aliyun.com/composer"
+ "url": "https://mirrors.cloud.tencent.com/composer"
}
}
}
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
deleted file mode 100644
index 313b9b70..00000000
--- a/docker/docker-compose.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-version: '3'
-services:
- nginx:
- build: ./nginx
- ports:
- - 80:80
- - 443:443
- volumes:
- - ..:/var/www/html
- - ./docker/nginx/conf.d:/etc/nginx/conf.d
- - ./docker/nginx/log:/var/log/nginx
- depends_on:
- - php
- networks:
- - koogua
- restart: always
- php:
- build:
- context: ..
- dockerfile: ./docker/php/Dockerfile
- ports:
- - 9000:9000
- volumes:
- - ..:/var/www/html
- - ./docker/php/log:/var/log/php-fpm
- networks:
- - koogua
- restart: always
- mysql:
- build: ./mysql
- ports:
- - 3306:3306
- volumes:
- - ./mysql/data:/usr/lib/mysql
- - ./mysql/log:/var/log/mysql
- environment:
- MYSQL_ROOT_PASSWORD: @#1qaz2wsx3edc#@
- MYSQL_DATABASE: ctc
- MYSQL_USER: ctc
- MYSQL_PASSWORD: @#ctc#@
- networks:
- - koogua
- restart: always
- redis:
- build: ./redis
- ports:
- - 6379:6379
- volumes:
- - ./redis/data:/data
- networks:
- - koogua
- restart: always
- xunearch:
- build: ./xunsearch
- context: ..
- dockerfile: ./docker/xunsearch/Dockerfile
- ports:
- - 8383:8383
- - 8384:8384
- volume:
- - ./xunsearch/data:/usr/local/xunsearch/data
- networks:
- - koogua
- restart: always
- networks:
- koogua:
- driver: bridge
\ No newline at end of file
diff --git a/docker/mysql/Dockerfile b/docker/mysql/Dockerfile
deleted file mode 100644
index 2b1014fe..00000000
--- a/docker/mysql/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM mysql:5.6
-
-ENV TZ=Asia/Shanghai
-
-RUN ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime \
- && echo ${TZ} > /etc/timezone
-
-VOLUME ["/usr/lib/mysql", "/var/log/mysql"]
-
-EXPOSE 3306
\ No newline at end of file
diff --git a/docker/mysql/data/.gitignore b/docker/mysql/data/.gitignore
deleted file mode 100644
index c96a04f0..00000000
--- a/docker/mysql/data/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/docker/mysql/log/.gitignore b/docker/mysql/log/.gitignore
deleted file mode 100644
index c96a04f0..00000000
--- a/docker/mysql/log/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile
deleted file mode 100644
index 15af50df..00000000
--- a/docker/nginx/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM nginx:1.14
-
-ENV TZ=Asia/Shanghai
-
-RUN ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime \
- && echo ${TZ} > /etc/timezone
-
-VOLUME ["/etc/nginx/conf.d", "/var/www/html", "/var/log/nginx"]
-
-EXPOSE 6379
\ No newline at end of file
diff --git a/docker/nginx/conf.d/default.conf b/docker/nginx/conf.d/default.conf
deleted file mode 100644
index 2a100b2e..00000000
--- a/docker/nginx/conf.d/default.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-server {
-
- listen 80 default_server;
- server_name test.ctc.local;
-
- root /var/www/html/web/public;
- index index.html index.htm index.php;
- charset utf-8;
-
- location / {
- try_files $uri $uri/ /index.php?_url=$uri&$args;
- }
-
- location ~ \.php$ {
-
- include fastcgi_params;
-
- fastcgi_pass php:9000;
- fastcgi_index /index.php;
- fastcgi_split_path_info ^(.+\.php)(/.+)$;
- fastcgi_param PATH_INFO $fastcgi_path_info;
- fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
- fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
- }
-
- location ~ /\.ht {
- deny all;
- }
-}
diff --git a/docker/nginx/log/.gitignore b/docker/nginx/log/.gitignore
deleted file mode 100644
index c96a04f0..00000000
--- a/docker/nginx/log/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
deleted file mode 100644
index e2cf4acc..00000000
--- a/docker/php/Dockerfile
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM mileschou/phalcon:7.2-fpm
-
-ENV TZ=Asia/Shanghai
-
-COPY ./docker/sources.list /opt
-
-RUN ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime \
- && echo ${TZ} > /etc/timezone \
- && cat /opt/sources.list > /etc/apt/sources.list \
- && apt-get update \
- && apt-get install -y git wget \
- && rm -r /var/lib/apt/lists/*
-
-RUN docker-php-ext-install pdo_mysql mbstring zip \
- && pecl install redis-4.1.1 \
- && docker-php-ext-enable redis
-
-RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
- && composer config -g repo.packagist composer https://packagist.phpcomposer.com
-
-COPY . /var/www/html
-
-RUN chown -R www-data:www-data /var/www/html
-
-VOLUME ["/var/log/php-fpm", "/var/www/html"]
-
-EXPOSE 9000
\ No newline at end of file
diff --git a/docker/php/log/.gitignore b/docker/php/log/.gitignore
deleted file mode 100644
index c96a04f0..00000000
--- a/docker/php/log/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/docker/redis/Dockerfile b/docker/redis/Dockerfile
deleted file mode 100644
index f04a7d2e..00000000
--- a/docker/redis/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM redis:4.0
-
-ENV TZ=Asia/Shanghai
-
-RUN ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime \
- && echo ${TZ} > /etc/timezone
-
-VOLUME ["/data"]
-
-EXPOSE 6379
\ No newline at end of file
diff --git a/docker/redis/data/.gitignore b/docker/redis/data/.gitignore
deleted file mode 100644
index c96a04f0..00000000
--- a/docker/redis/data/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/docker/sources.list b/docker/sources.list
deleted file mode 100644
index cfa5418c..00000000
--- a/docker/sources.list
+++ /dev/null
@@ -1,8 +0,0 @@
-deb http://mirrors.163.com/debian/ stretch main non-free contrib
-deb http://mirrors.163.com/debian/ stretch-updates main non-free contrib
-deb http://mirrors.163.com/debian/ stretch-backports main non-free contrib
-deb-src http://mirrors.163.com/debian/ stretch main non-free contrib
-deb-src http://mirrors.163.com/debian/ stretch-updates main non-free contrib
-deb-src http://mirrors.163.com/debian/ stretch-backports main non-free contrib
-deb http://mirrors.163.com/debian-security/ stretch/updates main non-free contrib
-deb-src http://mirrors.163.com/debian-security/ stretch/updates main non-free contrib
\ No newline at end of file
diff --git a/docker/xunsearch/Dockerfile b/docker/xunsearch/Dockerfile
deleted file mode 100644
index 975f8f77..00000000
--- a/docker/xunsearch/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM debian:stretch
-
-ENV TZ=Asia/Shanghai
-
-COPY ./docker/sources.list /opt
-COPY ./docker/xunsearch/xs-docker.sh /opt
-
-RUN ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime \
- && echo ${TZ} > /etc/timezone \
- && cat /opt/sources.list > /etc/apt/sources.list \
- && apt-get update \
- && apt-get -y --no-install-recommends install wget make gcc g++ bzip2 zlib1g-dev \
- && rm -rf /var/lib/apt/lists/*
-
-RUN cd /tmp \
- && wget http://www.xunsearch.com/download/xunsearch-full-latest.tar.bz2 \
- && tar -xjf xunsearch-full-latest.tar.bz2 \
- && cd /tmp/xunsearch-full-* \
- && sh setup.sh --prefix=/usr/local/xunsearch \
- && cat /opt/xs-docker.sh > /usr/local/xunsearch/bin/xs-docker.sh \
- && rm -r /tmp/xunsearch-full-*
-
-VOLUME ["/usr/local/xunsearch/data"]
-
-EXPOSE 8383
-EXPOSE 8384
-
-ENTRYPOINT ["sh", "/usr/local/xunsearch/bin/xs-docker.sh"]
\ No newline at end of file
diff --git a/docker/xunsearch/data/.gitignore b/docker/xunsearch/data/.gitignore
deleted file mode 100644
index c96a04f0..00000000
--- a/docker/xunsearch/data/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/docker/xunsearch/xs-docker.sh b/docker/xunsearch/xs-docker.sh
deleted file mode 100644
index 11a4b354..00000000
--- a/docker/xunsearch/xs-docker.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-xs_path="/usr/local/xunsearch"
-
-rm -f ${xs_path}/tmp/pid.*
-
-echo -n > ${xs_path}/tmp/docker.log
-
-${xs_path}/bin/xs-indexd -l ${xs_path}/tmp/docker.log -k start
-
-sleep 1
-
-${xs_path}/bin/xs-searchd -l ${xs_path}/tmp/docker.log -k start
-
-sleep 1
-
-tail -f ${xs_path}/tmp/docker.log
\ No newline at end of file
diff --git a/public/static/admin/js/xm-course.js b/public/static/admin/js/xm-course.js
index 7fa9e887..239d833b 100644
--- a/public/static/admin/js/xm-course.js
+++ b/public/static/admin/js/xm-course.js
@@ -104,4 +104,4 @@ function xmCourse(data, url) {
});
});
-};
+}
diff --git a/public/static/lib/layui/extends/dropdown.js b/public/static/lib/layui/extends/dropdown.js
index cd42d89b..090ec5f1 100644
--- a/public/static/lib/layui/extends/dropdown.js
+++ b/public/static/lib/layui/extends/dropdown.js
@@ -51,7 +51,7 @@ layui.define(['jquery'], function (exports) {
});
}
})
- }
+ };
//自动完成渲染
dropdown.render();
diff --git a/websocket/start_business_worker.php b/websocket/start_business_worker.php
index a952c164..bd79311b 100644
--- a/websocket/start_business_worker.php
+++ b/websocket/start_business_worker.php
@@ -13,8 +13,8 @@
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
-use \GatewayWorker\BusinessWorker;
-use \Workerman\Worker;
+use GatewayWorker\BusinessWorker;
+use Workerman\Worker;
// 自动加载类
require_once dirname(__DIR__) . '/vendor/autoload.php';
diff --git a/websocket/start_gateway.php b/websocket/start_gateway.php
index aaa59b75..9c9abe88 100644
--- a/websocket/start_gateway.php
+++ b/websocket/start_gateway.php
@@ -13,8 +13,8 @@
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
-use \GatewayWorker\Gateway;
-use \Workerman\Worker;
+use GatewayWorker\Gateway;
+use Workerman\Worker;
// 自动加载类
require_once dirname(__DIR__) . '/vendor/autoload.php';
diff --git a/websocket/start_register.php b/websocket/start_register.php
index c477d4d1..2ffc0d07 100644
--- a/websocket/start_register.php
+++ b/websocket/start_register.php
@@ -13,8 +13,8 @@
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
-use \GatewayWorker\Register;
-use \Workerman\Worker;
+use GatewayWorker\Register;
+use Workerman\Worker;
// 自动加载类
require_once dirname(__DIR__) . '/vendor/autoload.php';