From c3c94e032fe6e9a9a4134d0426b0e7e4e87b51bb Mon Sep 17 00:00:00 2001 From: wisp-x <1591788658@qq.com> Date: Thu, 31 Oct 2019 13:06:11 +0800 Subject: [PATCH] :twisted_rightwards_arrows: Merging branches. --- install.sql | 9 ++++++++- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/install.sql b/install.sql index eab0d43c..0c2666ab 100644 --- a/install.sql +++ b/install.sql @@ -153,11 +153,18 @@ INSERT INTO `lsky_config` (`id`, `key`, `type`, `input_type`, `name`, `title`, ` (NULL, 'uss', 'text', 'text', 'uss_operator_name', 'OperatorName', '操作员账号', '', ''), (NULL, 'uss', 'text', 'password', 'uss_operator_pwd', 'OperatorPwd', '操作员密码', '', ''), (NULL, 'uss', 'text', 'text', 'uss_service_name', 'ServiceName', '云储存服务名称', '', ''), +(NULL, 'basics', 'textarea', 'textarea', 'notice', '系统公告', '支持html', '', ''), +(NULL, 'remote', 'text', 'text', 'remote_cdn_domain', '域名', NULL, '', ''), +(NULL, 'remote', 'select', 'text', 'remote_type', '远程储存类型', NULL, 'ftp', '{\"ftp\":\"ftp\"}'), +(NULL, 'remote', 'text', 'text', 'remote_host', '连接地址', NULL, '', ''), +(NULL, 'remote', 'text', 'text', 'remote_name', '登录账号', NULL, '', ''), +(NULL, 'remote', 'text', 'password', 'remote_password', '登录密码', NULL, '', ''), +(NULL, 'remote', 'text', 'number', 'remote_port', '连接端口', NULL, '21', ''), (NULL, 'audit', 'bool', 'checkbox', 'open_audit', '开启图片鉴黄', '接口申请地址：https://www.moderatecontent.com', '0', ''), (NULL, 'audit', 'text', 'text', 'audit_key', 'Key', NULL, '', ''), (NULL, 'audit', 'select', 'text', 'audit_index', '内容评级', '1=所有人，2=少年，3=成人', '3', '{\"1\": \"所有人\", \"2\": \"少年\", \"3\": \"成人\"}'), -(NULL, '', 'text', 'text', 'system_version', '系统版本', NULL, '1.5.4', ''); +(NULL, '', 'text', 'text', 'system_version', '系统版本', NULL, '1.5.5', ''); INSERT INTO `lsky_group` (`id`, `strategy`, `name`, `default`, `update_time`, `create_time`) VALUES (NULL, 'local', '默认组', '1', '0', '0'); diff --git a/vendor/autoload.php b/vendor/autoload.php index 23c30adf..68e745be 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit13f660843321b76d914d974707eb3ce2::getLoader(); +return ComposerAutoloaderInitf1a511e38c2f284964a16f1eeccf1745::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index b6af5c37..acafc389 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit13f660843321b76d914d974707eb3ce2 +class ComposerAutoloaderInitf1a511e38c2f284964a16f1eeccf1745 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit13f660843321b76d914d974707eb3ce2 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit13f660843321b76d914d974707eb3ce2', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitf1a511e38c2f284964a16f1eeccf1745', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit13f660843321b76d914d974707eb3ce2', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitf1a511e38c2f284964a16f1eeccf1745', '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\ComposerStaticInit13f660843321b76d914d974707eb3ce2::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitf1a511e38c2f284964a16f1eeccf1745::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit13f660843321b76d914d974707eb3ce2 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit13f660843321b76d914d974707eb3ce2::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitf1a511e38c2f284964a16f1eeccf1745::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire13f660843321b76d914d974707eb3ce2($fileIdentifier, $file); + composerRequiref1a511e38c2f284964a16f1eeccf1745($fileIdentifier, $file); } return $loader; } } -function composerRequire13f660843321b76d914d974707eb3ce2($fileIdentifier, $file) +function composerRequiref1a511e38c2f284964a16f1eeccf1745($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 fae1b0ef..43701fe0 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit13f660843321b76d914d974707eb3ce2 +class ComposerStaticInitf1a511e38c2f284964a16f1eeccf1745 { public static $files = array ( '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php', @@ -141,9 +141,9 @@ class ComposerStaticInit13f660843321b76d914d974707eb3ce2 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit13f660843321b76d914d974707eb3ce2::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit13f660843321b76d914d974707eb3ce2::$prefixDirsPsr4; - $loader->prefixesPsr0 = ComposerStaticInit13f660843321b76d914d974707eb3ce2::$prefixesPsr0; + $loader->prefixLengthsPsr4 = ComposerStaticInitf1a511e38c2f284964a16f1eeccf1745::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitf1a511e38c2f284964a16f1eeccf1745::$prefixDirsPsr4; + $loader->prefixesPsr0 = ComposerStaticInitf1a511e38c2f284964a16f1eeccf1745::$prefixesPsr0; }, null, ClassLoader::class); }