版本依赖更新

hyperf-plus · Jan 8, 2021 · fa74e7b · fa74e7b
1 parent 63dc38b
commit fa74e7b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -18,8 +18,7 @@
   "require": {
     "php": ">=7.3",
     "ext-swoole": ">=4.5",
-    "96qbhy/hyperf-auth": "^2.3",
-    "hyperf-plus/helper": "^2.0.0"
+    "96qbhy/hyperf-auth": "^2.3"
   },
   "require-dev": {
   },

diff --git a/src/Permission.php b/src/Permission.php
@@ -20,6 +20,7 @@
 use Hyperf\Di\Annotation\AnnotationCollector;
 use Hyperf\HttpServer\Annotation\Mapping;
 use Hyperf\HttpServer\Router\DispatcherFactory;
+use Hyperf\Utils\ApplicationContext;
 use Psr\SimpleCache\CacheInterface;
 use Qbhy\HyperfAuth\AuthManager;
 
@@ -202,7 +203,7 @@ public function loadRoles($reload = false)
      */
     public function scanPermission()
     {
-        $DispatcherFactory = get_container(DispatcherFactory::class);
+        $DispatcherFactory = ApplicationContext::getContainer()->get(DispatcherFactory::class);
         $list = $DispatcherFactory->getRouter('http');
         $this->ignore = [];
         $this->loadRoles(true);

diff --git a/src/helpers.php b/src/helpers.php
@@ -1,6 +1,7 @@
 <?php
 
 declare(strict_types=1);
+
 /**
  * This file is part of Hyperf.plus
  *
@@ -9,12 +10,15 @@
  * @contact  4213509@qq.com
  * @license  https://github.com/hyperf/hyperf-plus/blob/master/LICENSE
  */
-if (! function_exists('permission')) {
+
+use Hyperf\Utils\ApplicationContext;
+
+if (!function_exists('permission')) {
     /**
      * @return \HPlus\Permission\Contracts\PermissionInterface
      */
     function permission()
     {
-        return get_container(\HPlus\Permission\Contracts\PermissionInterface::class);
+        return ApplicationContext::getContainer()->get(\HPlus\Permission\Contracts\PermissionInterface::class);
     }
 }