From 5b74270d7ca548833b0259110916e1a4908a471e Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 7 May 2020 11:28:24 +0800
Subject: [PATCH] ComposerUpdate

---
 vendor/composer/installed.json                            | 8 ++++----
 vendor/services.php                                       | 2 +-
 vendor/zoujingli/think-library/src/command/Install.php    | 2 +-
 vendor/zoujingli/think-library/src/command/Version.php    | 8 +++-----
 .../zoujingli/think-library/src/service/AdminService.php  | 3 +++
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index b343bc5c0..5a32812f4 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -935,12 +935,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "e313082651d91f411caf10b77d0b786ef4784445"
+            "reference": "53001a2ea7a733136a2d8264a04a854cbc0f6205"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e313082651d91f411caf10b77d0b786ef4784445",
-            "reference": "e313082651d91f411caf10b77d0b786ef4784445",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/53001a2ea7a733136a2d8264a04a854cbc0f6205",
+            "reference": "53001a2ea7a733136a2d8264a04a854cbc0f6205",
             "shasum": "",
             "mirrors": [
                 {
@@ -956,7 +956,7 @@
             "ext-json": "*",
             "topthink/framework": "^6.0"
         },
-        "time": "2020-05-06T02:31:00+00:00",
+        "time": "2020-05-06T06:23:28+00:00",
         "type": "library",
         "extra": {
             "think": {
diff --git a/vendor/services.php b/vendor/services.php
index 89f6bccc6..e87deea76 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-05-06 10:34:23
+// This file is automatically generated at:2020-05-07 11:28:21
 declare (strict_types = 1);
 return array (
   0 => 'think\\app\\Service',
diff --git a/vendor/zoujingli/think-library/src/command/Install.php b/vendor/zoujingli/think-library/src/command/Install.php
index d0322b80b..88a61fb0d 100644
--- a/vendor/zoujingli/think-library/src/command/Install.php
+++ b/vendor/zoujingli/think-library/src/command/Install.php
@@ -15,8 +15,8 @@
 
 namespace think\admin\command;
 
+use think\admin\Command;
 use think\admin\service\InstallService;
-use think\console\Command;
 use think\console\Input;
 use think\console\input\Argument;
 use think\console\Output;
diff --git a/vendor/zoujingli/think-library/src/command/Version.php b/vendor/zoujingli/think-library/src/command/Version.php
index c61606a93..3842cf160 100644
--- a/vendor/zoujingli/think-library/src/command/Version.php
+++ b/vendor/zoujingli/think-library/src/command/Version.php
@@ -15,9 +15,7 @@
 
 namespace think\admin\command;
 
-use think\admin\service\ProcessService;
-use think\App;
-use think\console\Command;
+use think\admin\Command;
 use think\console\Input;
 use think\console\Output;
 
@@ -36,7 +34,7 @@ class Version extends Command
 
     protected function execute(Input $input, Output $output)
     {
-        $output->writeln('ThinkLib ' . ProcessService::instance()->version());
-        $output->writeln('ThinkPHP ' . App::VERSION);
+        $output->writeln('ThinkLib ' . $this->process->version());
+        $output->writeln('ThinkPHP ' . $this->app->version());
     }
 }
\ No newline at end of file
diff --git a/vendor/zoujingli/think-library/src/service/AdminService.php b/vendor/zoujingli/think-library/src/service/AdminService.php
index 3927e1e03..5b700bfff 100644
--- a/vendor/zoujingli/think-library/src/service/AdminService.php
+++ b/vendor/zoujingli/think-library/src/service/AdminService.php
@@ -74,6 +74,9 @@ class AdminService extends Service
         if ($this->isSuper()) return true;
         $service = NodeService::instance();
         list($real, $nodes) = [$service->fullnode($node), $service->getMethods()];
+        foreach ($nodes as $key => $rule) if (stripos($key, '_') !== false) {
+            $nodes[str_replace('_', '', $key)] = $rule;
+        }
         if (!empty($nodes[$real]['isauth'])) {
             return in_array($real, $this->app->session->get('user.nodes', []));
         } else {