浏览代码

ComposerUpdate

Anyon 4 年之前
父节点
当前提交
03757ba1c3
共有 4 个文件被更改,包括 17 次插入15 次删除
  1. 4 4
      composer.lock
  2. 4 4
      vendor/composer/installed.json
  3. 1 1
      vendor/services.php
  4. 8 6
      vendor/zoujingli/think-library/src/service/NodeService.php

+ 4 - 4
composer.lock

@@ -937,12 +937,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/zoujingli/ThinkLibrary.git",
-                "reference": "656726c8c8e1175ec8d0f284e9fd00eb40d77d7f"
+                "reference": "c2a6046bfaa13a9d42a2c82a18425c9d5841c5f2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/656726c8c8e1175ec8d0f284e9fd00eb40d77d7f",
-                "reference": "656726c8c8e1175ec8d0f284e9fd00eb40d77d7f",
+                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c2a6046bfaa13a9d42a2c82a18425c9d5841c5f2",
+                "reference": "c2a6046bfaa13a9d42a2c82a18425c9d5841c5f2",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -987,7 +987,7 @@
             ],
             "description": "ThinkPHP v6.0 Development Library",
             "homepage": "http://thinkadmin.top",
-            "time": "2020-08-24T05:44:28+00:00"
+            "time": "2020-08-24T05:58:10+00:00"
         },
         {
             "name": "zoujingli/wechat-developer",

+ 4 - 4
vendor/composer/installed.json

@@ -963,12 +963,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "656726c8c8e1175ec8d0f284e9fd00eb40d77d7f"
+            "reference": "c2a6046bfaa13a9d42a2c82a18425c9d5841c5f2"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/656726c8c8e1175ec8d0f284e9fd00eb40d77d7f",
-            "reference": "656726c8c8e1175ec8d0f284e9fd00eb40d77d7f",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c2a6046bfaa13a9d42a2c82a18425c9d5841c5f2",
+            "reference": "c2a6046bfaa13a9d42a2c82a18425c9d5841c5f2",
             "shasum": "",
             "mirrors": [
                 {
@@ -985,7 +985,7 @@
             "ext-mbstring": "*",
             "topthink/framework": "^6.0"
         },
-        "time": "2020-08-24T05:44:28+00:00",
+        "time": "2020-08-24T05:58:10+00:00",
         "type": "library",
         "extra": {
             "think": {

+ 1 - 1
vendor/services.php

@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-08-24 13:48:29
+// This file is automatically generated at:2020-08-24 14:03:20
 declare (strict_types = 1);
 return array (
   0 => 'think\\admin\\Library',

+ 8 - 6
vendor/zoujingli/think-library/src/service/NodeService.php

@@ -143,12 +143,14 @@ class NodeService extends Service
      */
     public function scanDirectory($path, $data = [], $ext = 'php')
     {
-        if (file_exists($path) && is_dir($path)) foreach (scandir($path) as $item) if ($item[0] !== '.') {
-            $realpath = rtrim($path, '\\/') . DIRECTORY_SEPARATOR . $item;
-            if (is_readable($realpath)) if (is_dir($realpath)) {
-                $data = $this->scanDirectory($realpath, $data, $ext);
-            } elseif (is_file($realpath) && (is_null($ext) || pathinfo($realpath, 4) === $ext)) {
-                $data[] = strtr($realpath, '\\', '/');
+        if (file_exists($path) && is_dir($path)) {
+            foreach (scandir($path) as $item) if ($item[0] !== '.') {
+                $realpath = rtrim($path, '\\/') . DIRECTORY_SEPARATOR . $item;
+                if (is_readable($realpath)) if (is_dir($realpath)) {
+                    $data = $this->scanDirectory($realpath, $data, $ext);
+                } elseif (is_file($realpath) && (is_null($ext) || pathinfo($realpath, 4) === $ext)) {
+                    $data[] = strtr($realpath, '\\', '/');
+                }
             }
         }
         return $data;