composerUpdate

app/admin/controller/api/Update.php

@@ -40,9 +40,9 @@ class Update extends Controller
      * 读取线上文件数据
      * @param string $encode
      */
-    public function get($encode)
+    public function get()
     {
-        $this->file = $this->app->getRootPath() . decode($encode);
+        $this->file = $this->app->getRootPath() . decode(input('encode', '0'));
         file_exists($this->file) ? $this->success('读取文件成功！', [
             'format' => 'base64', 'content' => base64_encode(file_get_contents($this->file)),
         ]) : $this->error('获取文件内容失败！');

composer.lock

@@ -325,16 +325,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2"
+                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
-                "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2",
+                "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -374,7 +374,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2019-10-25T08:06:51+00:00"
+            "time": "2019-11-01T11:05:21+00:00"
         },
         {
             "name": "psr/simple-cache",
@@ -783,12 +783,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/zoujingli/ThinkLibrary.git",
-                "reference": "0a9e2ada86bf3bf3b3828a82d0f27df5f929b55f"
+                "reference": "73b09c104d9800bbf399742af44c6b5090452e26"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/0a9e2ada86bf3bf3b3828a82d0f27df5f929b55f",
+                "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/73b09c104d9800bbf399742af44c6b5090452e26",
-                "reference": "0a9e2ada86bf3bf3b3828a82d0f27df5f929b55f",
+                "reference": "73b09c104d9800bbf399742af44c6b5090452e26",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -832,7 +832,7 @@
             ],
             "description": "ThinkPHP v6.0 Development Library",
             "homepage": "http://framework.thinkadmin.top",
-            "time": "2019-11-01T10:39:55+00:00"
+            "time": "2019-11-01T11:09:48+00:00"
         }
     ],
     "packages-dev": [],

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitc7690ef5c13b95d953f61a4e48e6692c::getLoader();
+return ComposerAutoloaderInitffc2be5fa4eeca372758d66dc6beeaae::getLoader();

vendor/composer/autoload_classmap.php

@@ -162,6 +162,7 @@ return array(
     'think\\admin\\helper\\TokenHelper' => $vendorDir . '/zoujingli/think-library/src/helper/TokenHelper.php',
     'think\\admin\\plugs\\AdminPlugs' => $vendorDir . '/zoujingli/think-library/src/plugs/AdminPlugs.php',
     'think\\admin\\plugs\\Plugs' => $vendorDir . '/zoujingli/think-library/src/plugs/Plugs.php',
+    'think\\admin\\plugs\\StaticPlugs' => $vendorDir . '/zoujingli/think-library/src/plugs/StaticPlugs.php',
     'think\\admin\\queue\\ListenQueue' => $vendorDir . '/zoujingli/think-library/src/queue/ListenQueue.php',
     'think\\admin\\queue\\QueryQueue' => $vendorDir . '/zoujingli/think-library/src/queue/QueryQueue.php',
     'think\\admin\\queue\\StartQueue' => $vendorDir . '/zoujingli/think-library/src/queue/StartQueue.php',

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitc7690ef5c13b95d953f61a4e48e6692c
+class ComposerAutoloaderInitffc2be5fa4eeca372758d66dc6beeaae
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInitc7690ef5c13b95d953f61a4e48e6692c
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitc7690ef5c13b95d953f61a4e48e6692c', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitffc2be5fa4eeca372758d66dc6beeaae', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitc7690ef5c13b95d953f61a4e48e6692c', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitffc2be5fa4eeca372758d66dc6beeaae', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInitc7690ef5c13b95d953f61a4e48e6692c::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitffc2be5fa4eeca372758d66dc6beeaae::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInitc7690ef5c13b95d953f61a4e48e6692c
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInitc7690ef5c13b95d953f61a4e48e6692c::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInitffc2be5fa4eeca372758d66dc6beeaae::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequirec7690ef5c13b95d953f61a4e48e6692c($fileIdentifier, $file);
+            composerRequireffc2be5fa4eeca372758d66dc6beeaae($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequirec7690ef5c13b95d953f61a4e48e6692c($fileIdentifier, $file)
+function composerRequireffc2be5fa4eeca372758d66dc6beeaae($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitc7690ef5c13b95d953f61a4e48e6692c
+class ComposerStaticInitffc2be5fa4eeca372758d66dc6beeaae
 {
     public static $files = array (
         '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php',
@@ -253,6 +253,7 @@ class ComposerStaticInitc7690ef5c13b95d953f61a4e48e6692c
         'think\\admin\\helper\\TokenHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/TokenHelper.php',
         'think\\admin\\plugs\\AdminPlugs' => __DIR__ . '/..' . '/zoujingli/think-library/src/plugs/AdminPlugs.php',
         'think\\admin\\plugs\\Plugs' => __DIR__ . '/..' . '/zoujingli/think-library/src/plugs/Plugs.php',
+        'think\\admin\\plugs\\StaticPlugs' => __DIR__ . '/..' . '/zoujingli/think-library/src/plugs/StaticPlugs.php',
         'think\\admin\\queue\\ListenQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/ListenQueue.php',
         'think\\admin\\queue\\QueryQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/QueryQueue.php',
         'think\\admin\\queue\\StartQueue' => __DIR__ . '/..' . '/zoujingli/think-library/src/queue/StartQueue.php',
@@ -469,9 +470,9 @@ class ComposerStaticInitc7690ef5c13b95d953f61a4e48e6692c
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitc7690ef5c13b95d953f61a4e48e6692c::$prefixLengthsPsr4;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitffc2be5fa4eeca372758d66dc6beeaae::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitc7690ef5c13b95d953f61a4e48e6692c::$prefixDirsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitffc2be5fa4eeca372758d66dc6beeaae::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitc7690ef5c13b95d953f61a4e48e6692c::$classMap;
+            $loader->classMap = ComposerStaticInitffc2be5fa4eeca372758d66dc6beeaae::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/composer/installed.json

@@ -328,17 +328,17 @@
     },
     {
         "name": "psr/log",
-        "version": "1.1.1",
+        "version": "1.1.2",
-        "version_normalized": "1.1.1.0",
+        "version_normalized": "1.1.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/php-fig/log.git",
-            "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2"
+            "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/log/zipball/bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2",
+            "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
-            "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2",
+            "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
             "shasum": "",
             "mirrors": [
                 {
@@ -350,7 +350,7 @@
         "require": {
             "php": ">=5.3.0"
         },
-        "time": "2019-10-25T08:06:51+00:00",
+        "time": "2019-11-01T11:05:21+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -805,12 +805,12 @@
         "source": {
             "type": "git",
             "url": "https://github.com/zoujingli/ThinkLibrary.git",
-            "reference": "0a9e2ada86bf3bf3b3828a82d0f27df5f929b55f"
+            "reference": "73b09c104d9800bbf399742af44c6b5090452e26"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/0a9e2ada86bf3bf3b3828a82d0f27df5f929b55f",
+            "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/73b09c104d9800bbf399742af44c6b5090452e26",
-            "reference": "0a9e2ada86bf3bf3b3828a82d0f27df5f929b55f",
+            "reference": "73b09c104d9800bbf399742af44c6b5090452e26",
             "shasum": "",
             "mirrors": [
                 {
@@ -826,7 +826,7 @@
             "ext-json": "*",
             "topthink/framework": "^6.0"
         },
-        "time": "2019-11-01T10:39:55+00:00",
+        "time": "2019-11-01T11:09:48+00:00",
         "type": "library",
         "extra": {
             "think": {

vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php

@@ -141,5 +141,6 @@ class DummyTest
 {
     public function __toString()
     {
+        return 'DummyTest';
     }
 }

vendor/psr/log/README.md

@@ -38,6 +38,12 @@ class Foo
         if ($this->logger) {
             $this->logger->info('Doing work');
         }
+           
+        try {
+            $this->doSomethingElse();
+        } catch (Exception $exception) {
+            $this->logger->error('Oh no!', array('exception' => $exception));
+        }
 
         // do something useful
     }

vendor/services.php

@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2019-11-01 19:04:21
+// This file is automatically generated at:2019-11-01 19:23:34
 declare (strict_types = 1);
 return array (
   0 => 'think\\app\\Service',

vendor/zoujingli/think-library/src/ThinkLibrary.php

@@ -67,6 +67,7 @@ class ThinkLibrary extends Service
             'think\admin\queue\QueryQueue',
             'think\admin\queue\ListenQueue',
             'think\admin\plugs\AdminPlugs',
+            'think\admin\plugs\StaticPlugs',
         ]);
     }
 

vendor/zoujingli/think-library/src/extend/PlugsExtend.php

@@ -16,6 +16,7 @@
 namespace think\admin\extend;
 
 use think\App;
+use think\console\Output;
 
 /**
  * Class PlugsExtend
@@ -47,6 +48,12 @@ class PlugsExtend
      */
     protected $version;
 
+    /**
+     * 输出对象
+     * @var Output
+     */
+    protected $output;
+
     /**
      * 文件规则
      * @var array
@@ -85,6 +92,7 @@ class PlugsExtend
     public function __construct(App $app)
     {
         $this->app = $app;
+        $this->output = new Output();
         // 应用框架版本号
         $this->version = $this->app->config->get('app.thinkadmin_ver');
         if (empty($this->version)) $this->version = 'v4';

vendor/zoujingli/think-library/src/plugs/AdminPlugs.php

@@ -29,7 +29,6 @@ class AdminPlugs extends Plugs
 
     protected function configure()
     {
-        $this->rules = ['application/admin/', 'think'];
         $this->setName('xplugs:admin')->setDescription('[同步]覆盖本地Admin模块代码');
     }
 

vendor/zoujingli/think-library/src/plugs/StaticPlugs.php

@@ -0,0 +1,31 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | Library for ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
+// +----------------------------------------------------------------------
+// | 官方网站: http://demo.thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// +----------------------------------------------------------------------
+// | gitee 仓库地址 ：https://gitee.com/zoujingli/ThinkLibrary
+// | github 仓库地址 ：https://github.com/zoujingli/ThinkLibrary
+// +----------------------------------------------------------------------
+
+namespace think\admin\plugs;
+
+/**
+ * Class StaticPlugs
+ * @package think\admin\plugs
+ */
+class StaticPlugs extends Plugs
+{
+    protected $rules = ['public/static'];
+    protected $ignore = ['public/static/self'];
+
+    protected function configure()
+    {
+        $this->setName('xplugs:static')->setDescription('[同步]覆盖本地Static插件代码');
+    }
+}