diff --git a/app/Builders/Builder.php b/app/Builders/Builder.php index 5e8401e6..0872c74c 100644 --- a/app/Builders/Builder.php +++ b/app/Builders/Builder.php @@ -7,9 +7,9 @@ use Phalcon\Mvc\User\Component; class Builder extends Component { - public function arrayToObject($array) + public function objects(array $items) { - return kg_array_object($array); + return kg_array_object($items); } } diff --git a/app/Caches/Cache.php b/app/Caches/Cache.php index 5e8481ad..757e5c0e 100644 --- a/app/Caches/Cache.php +++ b/app/Caches/Cache.php @@ -4,7 +4,6 @@ namespace App\Caches; use Phalcon\Cache\Backend\Redis as RedisCache; use Phalcon\Mvc\User\Component; -use Yansongda\Supports\Collection; abstract class Cache extends Component { @@ -44,10 +43,6 @@ abstract class Cache extends Component $content = $this->cache->get($key); } - if (is_array($content)) { - $content = new Collection($content); - } - return $content; } diff --git a/app/Http/Admin/Controllers/Controller.php b/app/Http/Admin/Controllers/Controller.php index 2bbd7ef0..a1343a6b 100644 --- a/app/Http/Admin/Controllers/Controller.php +++ b/app/Http/Admin/Controllers/Controller.php @@ -7,13 +7,12 @@ use App\Services\Auth\Admin as AdminAuth; use App\Traits\Response as ResponseTrait; use App\Traits\Security as SecurityTrait; use Phalcon\Mvc\Dispatcher; -use Yansongda\Supports\Collection; class Controller extends \Phalcon\Mvc\Controller { /** - * @var Collection + * @var array */ protected $authUser; @@ -45,7 +44,7 @@ class Controller extends \Phalcon\Mvc\Controller /** * 管理员忽略权限检查 */ - if ($this->authUser->root) { + if ($this->authUser['root'] == 1) { return true; } @@ -74,7 +73,7 @@ class Controller extends \Phalcon\Mvc\Controller /** * 执行路由权限检查 */ - if (!in_array($route->getName(), $this->authUser->routes)) { + if (!in_array($route->getName(), $this->authUser['routes'])) { $dispatcher->forward([ 'controller' => 'public', 'action' => 'forbidden', @@ -96,8 +95,8 @@ class Controller extends \Phalcon\Mvc\Controller $audit = new AuditModel(); - $audit->user_id = $this->authUser->id; - $audit->user_name = $this->authUser->name; + $audit->user_id = $this->authUser['id']; + $audit->user_name = $this->authUser['name']; $audit->user_ip = $this->request->getClientAddress(); $audit->req_route = $this->router->getMatchedRoute()->getName(); $audit->req_path = $this->request->getServer('REQUEST_URI'); diff --git a/app/Http/Admin/Module.php b/app/Http/Admin/Module.php index f07f31d3..8167ea89 100644 --- a/app/Http/Admin/Module.php +++ b/app/Http/Admin/Module.php @@ -2,10 +2,10 @@ namespace App\Http\Admin; +use App\Library\Mvc\View as MyView; use App\Services\Auth\Admin as AdminAuth; use Phalcon\DiInterface; use Phalcon\Mvc\ModuleDefinitionInterface; -use Phalcon\Mvc\View; class Module implements ModuleDefinitionInterface { @@ -18,7 +18,7 @@ class Module implements ModuleDefinitionInterface public function registerServices(DiInterface $di) { $di->setShared('view', function () { - $view = new View(); + $view = new MyView(); $view->setViewsDir(__DIR__ . '/Views'); $view->registerEngines([ '.volt' => 'volt', diff --git a/app/Http/Admin/Services/AuthMenu.php b/app/Http/Admin/Services/AuthMenu.php index 68f7194d..e6d4dc72 100644 --- a/app/Http/Admin/Services/AuthMenu.php +++ b/app/Http/Admin/Services/AuthMenu.php @@ -27,7 +27,7 @@ class AuthMenu extends Component $menus = []; foreach ($this->authNodes as $node) { - if ($this->authUser->id || in_array($node['id'], $this->owned1stLevelIds)) { + if (($this->authUser['root'] == 1) || in_array($node['id'], $this->owned1stLevelIds)) { $menus[] = [ 'id' => $node['id'], 'title' => $node['title'], @@ -45,8 +45,8 @@ class AuthMenu extends Component foreach ($this->authNodes as $key => $level) { foreach ($level['children'] as $key2 => $level2) { foreach ($level2['children'] as $key3 => $level3) { - $hasRight = $this->authUser->root || in_array($level3['id'], $this->owned3rdLevelIds); - if ($level3['type'] == 'menu' && $hasRight) { + $allowed = ($this->authUser['root'] == 1) || in_array($level3['id'], $this->owned3rdLevelIds); + if ($level3['type'] == 'menu' && $allowed) { $menus[$key]['id'] = $level['id']; $menus[$key]['title'] = $level['title']; $menus[$key]['children'][$key2]['id'] = $level2['id']; @@ -76,7 +76,7 @@ class AuthMenu extends Component foreach ($routeIdMapping as $key => $value) { $ids = explode('-', $value); - if (in_array($key, $this->authUser->routes)) { + if (in_array($key, $this->authUser['routes'])) { $owned1stLevelIds[] = $ids[0]; $owned2ndLevelIds[] = $ids[0] . '-' . $ids[1]; $owned3rdLevelIds[] = $value; diff --git a/app/Http/Admin/Services/ChapterContent.php b/app/Http/Admin/Services/ChapterContent.php index 3e86dddb..5c23820c 100644 --- a/app/Http/Admin/Services/ChapterContent.php +++ b/app/Http/Admin/Services/ChapterContent.php @@ -39,11 +39,9 @@ class ChapterContent extends Service public function getPlayUrls($chapterId) { - $chapterVodService = new ChapterVodService(); + $service = new ChapterVodService(); - $playUrls = $chapterVodService->getPlayUrls($chapterId); - - return kg_array_object($playUrls); + return $service->getPlayUrls($chapterId); } public function updateChapterContent($chapterId) diff --git a/app/Http/Admin/Services/Comment.php b/app/Http/Admin/Services/Comment.php index 8b7b328a..24106c36 100644 --- a/app/Http/Admin/Services/Comment.php +++ b/app/Http/Admin/Services/Comment.php @@ -140,7 +140,7 @@ class Comment extends Service $pipeB = $builder->handleCourses($pipeA); $pipeC = $builder->handleChapters($pipeB); $pipeD = $builder->handleUsers($pipeC); - $pipeE = $builder->arrayToObject($pipeD); + $pipeE = $builder->objects($pipeD); $pager->items = $pipeE; } diff --git a/app/Http/Admin/Services/Consult.php b/app/Http/Admin/Services/Consult.php index 24f6e418..509ae61d 100644 --- a/app/Http/Admin/Services/Consult.php +++ b/app/Http/Admin/Services/Consult.php @@ -119,7 +119,7 @@ class Consult extends Service $pipeA = $pager->items->toArray(); $pipeB = $builder->handleCourses($pipeA); $pipeC = $builder->handleUsers($pipeB); - $pipeD = $builder->arrayToObject($pipeC); + $pipeD = $builder->objects($pipeC); $pager->items = $pipeD; } diff --git a/app/Http/Admin/Services/Course.php b/app/Http/Admin/Services/Course.php index 39b96dce..85f39c6f 100644 --- a/app/Http/Admin/Services/Course.php +++ b/app/Http/Admin/Services/Course.php @@ -516,7 +516,7 @@ class Course extends Service $pipeA = $pager->items->toArray(); $pipeB = $builder->handleCategories($pipeA); - $pipeC = $builder->arrayToObject($pipeB); + $pipeC = $builder->objects($pipeB); $pager->items = $pipeC; } diff --git a/app/Http/Admin/Services/Order.php b/app/Http/Admin/Services/Order.php index 7f6d25e7..1ce06e5f 100644 --- a/app/Http/Admin/Services/Order.php +++ b/app/Http/Admin/Services/Order.php @@ -90,7 +90,7 @@ class Order extends Service $pipeA = $pager->items->toArray(); $pipeB = $builder->handleItems($pipeA); $pipeC = $builder->handleUsers($pipeB); - $pipeD = $builder->arrayToObject($pipeC); + $pipeD = $builder->objects($pipeC); $pager->items = $pipeD; } diff --git a/app/Http/Admin/Services/Package.php b/app/Http/Admin/Services/Package.php index e510fc7c..318fd89d 100644 --- a/app/Http/Admin/Services/Package.php +++ b/app/Http/Admin/Services/Package.php @@ -11,7 +11,6 @@ use App\Repos\Course as CourseRepo; use App\Repos\CoursePackage as CoursePackageRepo; use App\Repos\Package as PackageRepo; use App\Validators\Package as PackageValidator; -use Yansongda\Supports\Collection; class Package extends Service { @@ -140,7 +139,8 @@ class Package extends Service public function getGuidingPrice($courses) { - $totalMarketPrice = $totalVipPrice = 0; + $totalMarketPrice = 0; + $totalVipPrice = 0; if ($courses) { foreach ($courses as $course) { @@ -152,10 +152,10 @@ class Package extends Service $sgtMarketPrice = sprintf('%0.2f', intval($totalMarketPrice * 0.9)); $sgtVipPrice = sprintf('%0.2f', intval($totalVipPrice * 0.8)); - return new Collection([ + return [ 'market_price' => $sgtMarketPrice, 'vip_price' => $sgtVipPrice, - ]); + ]; } public function getXmCourses($id) diff --git a/app/Http/Admin/Services/Refund.php b/app/Http/Admin/Services/Refund.php index b84d26e2..4efb9972 100644 --- a/app/Http/Admin/Services/Refund.php +++ b/app/Http/Admin/Services/Refund.php @@ -120,7 +120,7 @@ class Refund extends Service $pipeA = $pager->items->toArray(); $pipeB = $builder->handleUsers($pipeA); $pipeC = $builder->handleOrders($pipeB); - $pipeD = $builder->arrayToObject($pipeC); + $pipeD = $builder->objects($pipeC); $pager->items = $pipeD; } diff --git a/app/Http/Admin/Services/Review.php b/app/Http/Admin/Services/Review.php index 39883857..987ea739 100644 --- a/app/Http/Admin/Services/Review.php +++ b/app/Http/Admin/Services/Review.php @@ -119,7 +119,7 @@ class Review extends Service $pipeA = $pager->items->toArray(); $pipeB = $builder->handleCourses($pipeA); $pipeC = $builder->handleUsers($pipeB); - $pipeD = $builder->arrayToObject($pipeC); + $pipeD = $builder->objects($pipeC); $pager->items = $pipeD; } diff --git a/app/Http/Admin/Services/Role.php b/app/Http/Admin/Services/Role.php index 6668cdc0..c33bfbc7 100644 --- a/app/Http/Admin/Services/Role.php +++ b/app/Http/Admin/Services/Role.php @@ -13,9 +13,7 @@ class Role extends Service { $authNode = new AuthNode(); - $nodes = $authNode->getNodes(); - - return kg_array_object($nodes); + return $authNode->getNodes(); } public function getRoles() diff --git a/app/Http/Admin/Services/Student.php b/app/Http/Admin/Services/Student.php index cb940d0b..fade2193 100644 --- a/app/Http/Admin/Services/Student.php +++ b/app/Http/Admin/Services/Student.php @@ -144,7 +144,7 @@ class Student extends Service $pipeA = $pager->items->toArray(); $pipeB = $builder->handleCourses($pipeA); $pipeC = $builder->handleUsers($pipeB); - $pipeD = $builder->arrayToObject($pipeC); + $pipeD = $builder->objects($pipeC); $pager->items = $pipeD; } @@ -162,7 +162,7 @@ class Student extends Service $pipeB = $builder->handleCourses($pipeA); $pipeC = $builder->handleChapters($pipeB); $pipeD = $builder->handleUsers($pipeC); - $pipeE = $builder->arrayToObject($pipeD); + $pipeE = $builder->objects($pipeD); $pager->items = $pipeE; } diff --git a/app/Http/Admin/Services/Trade.php b/app/Http/Admin/Services/Trade.php index 81d9401b..5fec01b3 100644 --- a/app/Http/Admin/Services/Trade.php +++ b/app/Http/Admin/Services/Trade.php @@ -129,7 +129,7 @@ class Trade extends Service $pipeA = $pager->items->toArray(); $pipeB = $builder->handleUsers($pipeA); $pipeC = $builder->handleOrders($pipeB); - $pipeD = $builder->arrayToObject($pipeC); + $pipeD = $builder->objects($pipeC); $pager->items = $pipeD; } diff --git a/app/Http/Admin/Services/User.php b/app/Http/Admin/Services/User.php index 3215d3bf..5595d59b 100644 --- a/app/Http/Admin/Services/User.php +++ b/app/Http/Admin/Services/User.php @@ -237,7 +237,7 @@ class User extends Service $pipeA = $pager->items->toArray(); $pipeB = $builder->handleAdminRoles($pipeA); $pipeC = $builder->handleEduRoles($pipeB); - $pipeD = $builder->arrayToObject($pipeC); + $pipeD = $builder->objects($pipeC); $pager->items = $pipeD; } diff --git a/app/Http/Admin/Views/chapter/lessons_live.volt b/app/Http/Admin/Views/chapter/lessons_live.volt index 8cb9a35b..9db97dff 100644 --- a/app/Http/Admin/Views/chapter/lessons_live.volt +++ b/app/Http/Admin/Views/chapter/lessons_live.volt @@ -1,7 +1,7 @@ {%- macro live_time_info(attrs) %} {% if attrs['start_time'] > 0 %} -
开始:{{ date('Y-m-d H:i', attrs['start_time']) }}
-结束:{{ date('Y-m-d H:i', attrs['end_time']) }}
+开始:{{ date('Y-m-d H:i',attrs['start_time']) }}
+结束:{{ date('Y-m-d H:i',attrs['end_time']) }}
{% else %} N/A {% endif %} diff --git a/app/Http/Admin/Views/index/index.volt b/app/Http/Admin/Views/index/index.volt index 905d317b..398cea62 100644 --- a/app/Http/Admin/Views/index/index.volt +++ b/app/Http/Admin/Views/index/index.volt @@ -22,8 +22,8 @@