diff --git a/composer.lock b/composer.lock index 5ac0d6294..b71d0af2c 100644 --- a/composer.lock +++ b/composer.lock @@ -699,12 +699,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "3a4ae06f7b5d19becad14ab8d640dbfde25e146d" + "reference": "18979c6d4fc36b65036b35a11180f30752659768" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/3a4ae06f7b5d19becad14ab8d640dbfde25e146d", - "reference": "3a4ae06f7b5d19becad14ab8d640dbfde25e146d", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/18979c6d4fc36b65036b35a11180f30752659768", + "reference": "18979c6d4fc36b65036b35a11180f30752659768", "shasum": "" }, "require": { @@ -742,7 +742,7 @@ ], "description": "ThinkPHP v6.0 Development Library", "homepage": "http://framework.thinkadmin.top", - "time": "2019-11-21T02:02:52+00:00" + "time": "2019-11-21T02:42:19+00:00" } ], "packages-dev": [], diff --git a/public/cache/4c/d9aaff68a897261d9d4e25ac10435f.php b/public/cache/4c/d9aaff68a897261d9d4e25ac10435f.php deleted file mode 100644 index 4822fd4a1..000000000 --- a/public/cache/4c/d9aaff68a897261d9d4e25ac10435f.php +++ /dev/null @@ -1,4 +0,0 @@ - -a:42:{s:16:"admin/auth/index";a:3:{s:5:"title";s:18:"系统权限管理";s:6:"isauth";i:1;s:6:"ismenu";i:1;}s:14:"admin/auth/add";a:3:{s:5:"title";s:18:"添加系统权限";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:15:"admin/auth/edit";a:3:{s:5:"title";s:18:"编辑系统权限";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:16:"admin/auth/state";a:3:{s:5:"title";s:24:"修改系统权限状态";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:17:"admin/auth/remove";a:3:{s:5:"title";s:18:"删除系统权限";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:18:"admin/config/index";a:3:{s:5:"title";s:15:"绑定数据表";s:6:"isauth";i:1;s:6:"ismenu";i:1;}s:19:"admin/config/config";a:3:{s:5:"title";s:24:"修改系统能数配置";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:20:"admin/config/storage";a:3:{s:5:"title";s:18:"文件存储引擎";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:17:"admin/index/index";a:3:{s:5:"title";s:18:"显示后台首页";s:6:"isauth";i:0;s:6:"ismenu";i:0;}s:16:"admin/index/main";a:3:{s:5:"title";s:18:"后台环境信息";s:6:"isauth";i:0;s:6:"ismenu";i:0;}s:16:"admin/index/info";a:3:{s:5:"title";s:18:"修改用户资料";s:6:"isauth";i:0;s:6:"ismenu";i:0;}s:16:"admin/index/pass";a:3:{s:5:"title";s:24:"修改当前用户密码";s:6:"isauth";i:0;s:6:"ismenu";i:0;}s:17:"admin/login/index";a:3:{s:5:"title";s:18:"后台登录入口";s:6:"isauth";i:0;s:6:"ismenu";i:0;}s:19:"admin/login/captcha";a:3:{s:5:"title";s:15:"生成验证码";s:6:"isauth";i:0;s:6:"ismenu";i:0;}s:15:"admin/login/out";a:3:{s:5:"title";s:12:"退出登录";s:6:"isauth";i:0;s:6:"ismenu";i:0;}s:16:"admin/menu/index";a:3:{s:5:"title";s:18:"系统菜单管理";s:6:"isauth";i:1;s:6:"ismenu";i:1;}s:14:"admin/menu/add";a:3:{s:5:"title";s:18:"添加系统菜单";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:15:"admin/menu/edit";a:3:{s:5:"title";s:18:"编辑系统菜单";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:17:"admin/menu/resume";a:3:{s:5:"title";s:18:"启用系统菜单";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:17:"admin/menu/forbid";a:3:{s:5:"title";s:18:"禁用系统菜单";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:17:"admin/menu/remove";a:3:{s:5:"title";s:18:"删除系统菜单";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:17:"admin/oplog/index";a:3:{s:5:"title";s:18:"系统日志管理";s:6:"isauth";i:1;s:6:"ismenu";i:1;}s:17:"admin/oplog/clear";a:3:{s:5:"title";s:18:"清理系统日志";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:18:"admin/oplog/remove";a:3:{s:5:"title";s:18:"删除系统日志";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:17:"admin/queue/index";a:3:{s:5:"title";s:18:"系统任务管理";s:6:"isauth";i:1;s:6:"ismenu";i:1;}s:16:"admin/queue/redo";a:3:{s:5:"title";s:18:"重启系统任务";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:17:"admin/queue/start";a:3:{s:5:"title";s:29:"(WIN)创建任务监听进程";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:16:"admin/queue/stop";a:3:{s:5:"title";s:29:"(WIN)停止任务监听进程";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:18:"admin/queue/remove";a:3:{s:5:"title";s:18:"删除系统任务";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:16:"admin/user/index";a:3:{s:5:"title";s:18:"系统用户管理";s:6:"isauth";i:1;s:6:"ismenu";i:1;}s:14:"admin/user/add";a:3:{s:5:"title";s:18:"添加系统用户";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:15:"admin/user/edit";a:3:{s:5:"title";s:18:"编辑系统用户";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:15:"admin/user/pass";a:3:{s:5:"title";s:18:"修改用户密码";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:23:"admin/user/_form_filter";a:3:{s:5:"title";s:18:"表单数据处理";s:6:"isauth";i:0;s:6:"ismenu";i:0;}s:17:"admin/user/forbid";a:3:{s:5:"title";s:18:"禁用系统用户";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:17:"admin/user/resume";a:3:{s:5:"title";s:18:"启用系统用户";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:17:"admin/user/remove";a:3:{s:5:"title";s:18:"删除系统用户";s:6:"isauth";i:1;s:6:"ismenu";i:0;}s:21:"admin/api/_plugs/icon";a:3:{s:5:"title";s:21:"系统图标选择器";s:6:"isauth";i:0;s:6:"ismenu";i:0;}s:22:"admin/api/_plugs/check";a:3:{s:5:"title";s:24:"获取文件上传参数";s:6:"isauth";i:0;s:6:"ismenu";i:0;}s:23:"admin/api/_plugs/upload";a:3:{s:5:"title";s:24:"后台通用文件上传";s:6:"isauth";i:0;s:6:"ismenu";i:0;}s:22:"admin/api/_update/tree";a:3:{s:5:"title";s:18:"获取文件列表";s:6:"isauth";i:0;s:6:"ismenu";i:0;}s:22:"admin/api/_update/read";a:3:{s:5:"title";s:24:"读取线上文件数据";s:6:"isauth";i:0;s:6:"ismenu";i:0;}} \ No newline at end of file diff --git a/public/favicon.ico b/public/favicon.ico index e71815a66..9d54ed911 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/vendor/autoload.php b/vendor/autoload.php index 9ed841492..a13d47ca9 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitde704791b19bdb4a7631ea3b6593cd21::getLoader(); +return ComposerAutoloaderInitc95e9bc2afd6956f8345526ebec125c0::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 810b7a68a..257ab1687 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitde704791b19bdb4a7631ea3b6593cd21 +class ComposerAutoloaderInitc95e9bc2afd6956f8345526ebec125c0 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInitde704791b19bdb4a7631ea3b6593cd21 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitde704791b19bdb4a7631ea3b6593cd21', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitc95e9bc2afd6956f8345526ebec125c0', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitde704791b19bdb4a7631ea3b6593cd21', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitc95e9bc2afd6956f8345526ebec125c0', '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\ComposerStaticInitde704791b19bdb4a7631ea3b6593cd21::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitc95e9bc2afd6956f8345526ebec125c0::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInitde704791b19bdb4a7631ea3b6593cd21 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitde704791b19bdb4a7631ea3b6593cd21::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitc95e9bc2afd6956f8345526ebec125c0::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequirede704791b19bdb4a7631ea3b6593cd21($fileIdentifier, $file); + composerRequirec95e9bc2afd6956f8345526ebec125c0($fileIdentifier, $file); } return $loader; } } -function composerRequirede704791b19bdb4a7631ea3b6593cd21($fileIdentifier, $file) +function composerRequirec95e9bc2afd6956f8345526ebec125c0($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 8971c290e..a35f77d97 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitde704791b19bdb4a7631ea3b6593cd21 +class ComposerStaticInitc95e9bc2afd6956f8345526ebec125c0 { public static $files = array ( '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', @@ -471,9 +471,9 @@ class ComposerStaticInitde704791b19bdb4a7631ea3b6593cd21 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitde704791b19bdb4a7631ea3b6593cd21::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitde704791b19bdb4a7631ea3b6593cd21::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitde704791b19bdb4a7631ea3b6593cd21::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitc95e9bc2afd6956f8345526ebec125c0::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitc95e9bc2afd6956f8345526ebec125c0::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitc95e9bc2afd6956f8345526ebec125c0::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 3b39308c1..d5f1c7516 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -721,12 +721,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "3a4ae06f7b5d19becad14ab8d640dbfde25e146d" + "reference": "18979c6d4fc36b65036b35a11180f30752659768" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/3a4ae06f7b5d19becad14ab8d640dbfde25e146d", - "reference": "3a4ae06f7b5d19becad14ab8d640dbfde25e146d", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/18979c6d4fc36b65036b35a11180f30752659768", + "reference": "18979c6d4fc36b65036b35a11180f30752659768", "shasum": "" }, "require": { @@ -736,7 +736,7 @@ "ext-json": "*", "topthink/framework": "^6.0" }, - "time": "2019-11-21T02:02:52+00:00", + "time": "2019-11-21T02:42:19+00:00", "type": "library", "extra": { "think": { diff --git a/vendor/services.php b/vendor/services.php index 3a04bf219..3be102f05 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service', diff --git a/vendor/zoujingli/think-library/src/service/SystemService.php b/vendor/zoujingli/think-library/src/service/SystemService.php index 4d23ec191..9d18326c1 100644 --- a/vendor/zoujingli/think-library/src/service/SystemService.php +++ b/vendor/zoujingli/think-library/src/service/SystemService.php @@ -115,7 +115,7 @@ class SystemService extends Service private function parse($rule, $type = 'base') { if (stripos($rule, '.') !== false) { - list($rule, $type) = explode('.', $rule); + list($type, $rule) = explode('.', $rule); } list($field, $outer) = explode('|', "{$rule}|"); return [$type, $field, strtolower($outer)];