diff --git a/application/admin/view/config/info.html b/application/admin/view/config/info.html index 242d47d30..62d463211 100644 --- a/application/admin/view/config/info.html +++ b/application/admin/view/config/info.html @@ -14,7 +14,7 @@ {if auth('config')}
系统参数配置： - 修改系统配置 + 修改系统配置
{/if} diff --git a/vendor/autoload.php b/vendor/autoload.php index 3ec6b265b..2cbb030eb 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit2078d92f7b7bb325fe9f8c9a5d00e122::getLoader(); +return ComposerAutoloaderInit09fb67115c1225dd8c791a62882d72d6::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index f3fad0efe..057480fc4 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit2078d92f7b7bb325fe9f8c9a5d00e122 +class ComposerAutoloaderInit09fb67115c1225dd8c791a62882d72d6 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit2078d92f7b7bb325fe9f8c9a5d00e122 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit2078d92f7b7bb325fe9f8c9a5d00e122', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit09fb67115c1225dd8c791a62882d72d6', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit2078d92f7b7bb325fe9f8c9a5d00e122', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit09fb67115c1225dd8c791a62882d72d6', '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\ComposerStaticInit2078d92f7b7bb325fe9f8c9a5d00e122::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit09fb67115c1225dd8c791a62882d72d6::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit2078d92f7b7bb325fe9f8c9a5d00e122 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit2078d92f7b7bb325fe9f8c9a5d00e122::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit09fb67115c1225dd8c791a62882d72d6::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire2078d92f7b7bb325fe9f8c9a5d00e122($fileIdentifier, $file); + composerRequire09fb67115c1225dd8c791a62882d72d6($fileIdentifier, $file); } return $loader; } } -function composerRequire2078d92f7b7bb325fe9f8c9a5d00e122($fileIdentifier, $file) +function composerRequire09fb67115c1225dd8c791a62882d72d6($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 9577ce21b..18861d743 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit2078d92f7b7bb325fe9f8c9a5d00e122 +class ComposerStaticInit09fb67115c1225dd8c791a62882d72d6 { public static $files = array ( '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php', @@ -321,9 +321,9 @@ class ComposerStaticInit2078d92f7b7bb325fe9f8c9a5d00e122 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit2078d92f7b7bb325fe9f8c9a5d00e122::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit2078d92f7b7bb325fe9f8c9a5d00e122::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit2078d92f7b7bb325fe9f8c9a5d00e122::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit09fb67115c1225dd8c791a62882d72d6::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit09fb67115c1225dd8c791a62882d72d6::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit09fb67115c1225dd8c791a62882d72d6::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 2ed831983..cdde1ad1c 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -177,8 +177,8 @@ }, { "name": "symfony/options-resolver", - "version": "v3.4.31", - "version_normalized": "3.4.31.0", + "version": "v3.4.32", + "version_normalized": "3.4.32.0", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -401,12 +401,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "a485ab5d1a04a87959e9d4402c1fa98290dcb3aa" + "reference": "770c7466638da1910ccdd99aaf1b8747f7bf53ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a485ab5d1a04a87959e9d4402c1fa98290dcb3aa", - "reference": "a485ab5d1a04a87959e9d4402c1fa98290dcb3aa", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/770c7466638da1910ccdd99aaf1b8747f7bf53ad", + "reference": "770c7466638da1910ccdd99aaf1b8747f7bf53ad", "shasum": "", "mirrors": [ { @@ -425,7 +425,7 @@ "qiniu/php-sdk": "^7.2", "topthink/framework": "5.1.*" }, - "time": "2019-09-10T09:46:52+00:00", + "time": "2019-10-08T03:10:52+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/zoujingli/think-library/src/tools/Csv.php b/vendor/zoujingli/think-library/src/tools/Csv.php index 9bfb5e403..09eed725f 100644 --- a/vendor/zoujingli/think-library/src/tools/Csv.php +++ b/vendor/zoujingli/think-library/src/tools/Csv.php @@ -30,9 +30,9 @@ class Csv public static function header($filename, array $headers) { header('Content-Type: application/octet-stream'); - header("Content-Disposition: attachment; filename=" . iconv('utf-8', 'gbk//TRANSLIT', $filename)); + header("Content-Disposition: attachment; filename=" . iconv('UTF-8', 'GB2312//IGNORE', $filename)); $handle = fopen('php://output', 'w'); - foreach ($headers as $key => $value) $headers[$key] = iconv("utf-8", "gbk//TRANSLIT", $value); + foreach ($headers as $key => $value) $headers[$key] = iconv("UTF-8", "GB2312//IGNORE", $value); fputcsv($handle, $headers); if (is_resource($handle)) fclose($handle); } @@ -63,6 +63,6 @@ class Csv { list($temp, $attr) = [$data, explode('.', trim($rule, '.'))]; while ($key = array_shift($attr)) $temp = isset($temp[$key]) ? $temp[$key] : $temp; - return (is_string($temp) || is_numeric($temp)) ? @iconv('utf-8', 'gbk//TRANSLIT', "{$temp}") : ''; + return (is_string($temp) || is_numeric($temp)) ? @iconv('UTF-8', 'GB2312//IGNORE', "{$temp}") : ''; } } diff --git a/vendor/zoujingli/think-library/src/tools/Data.php b/vendor/zoujingli/think-library/src/tools/Data.php index 85397aa2b..55673616c 100644 --- a/vendor/zoujingli/think-library/src/tools/Data.php +++ b/vendor/zoujingli/think-library/src/tools/Data.php @@ -183,13 +183,13 @@ class Data /** * 文件大小显示转换 * @param integer $size 文件大小 - * @param integer $dec + * @param integer $deci 小数位数 * @return string */ - public static function toFileSize($size, $dec = 2) + public static function toFileSize($size, $deci = 2) { list($pos, $map) = [0, ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB']]; while ($size >= 1024 && $pos < 6) if (++$pos) $size /= 1024; - return round($size, $dec) . ' ' . $map[$pos]; + return round($size, $deci) . ' ' . $map[$pos]; } } diff --git a/vendor/zoujingli/think-library/src/tools/Node.php b/vendor/zoujingli/think-library/src/tools/Node.php index 20ba15b4e..e7028017c 100644 --- a/vendor/zoujingli/think-library/src/tools/Node.php +++ b/vendor/zoujingli/think-library/src/tools/Node.php @@ -29,18 +29,13 @@ class Node * 忽略控制名的前缀 * @var array */ - private static $ignoreController = [ - 'api.', 'wap.', 'web.', - ]; + private static $ignoreController = ['api.', 'wap.', 'web.']; /** * 忽略控制的方法名 * @var array */ - private static $ignoreAction = [ - '_', 'redirect', 'assign', 'callback', - 'initialize', 'success', 'error', 'fetch', - ]; + private static $ignoreAction = ['_', 'redirect', 'assign', 'callback', 'initialize', 'success', 'error', 'fetch']; /** * 获取标准访问节点