diff --git a/app/data/view/user_upgrade/index.html b/app/data/view/user_upgrade/index.html index de9ddbc92..9399e73fb 100644 --- a/app/data/view/user_upgrade/index.html +++ b/app/data/view/user_upgrade/index.html @@ -1,7 +1,7 @@ {extend name="../../admin/view/main"} {block name="button"} - + diff --git a/vendor/autoload.php b/vendor/autoload.php index 27c4b4ee1..6a0f64995 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit4f89fd0e0503ccf740f2fa5757825d7b::getLoader(); +return ComposerAutoloaderInitebdef296d7d83da818fc7b45caf0540d::getLoader(); diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php deleted file mode 100644 index 808b5cb20..000000000 --- a/vendor/composer/InstalledVersions.php +++ /dev/null @@ -1,363 +0,0 @@ - - array ( - 'pretty_version' => '6.x-dev', - 'version' => '6.9999999.9999999.9999999-dev', - 'aliases' => - array ( - ), - 'reference' => '2ec3ac9e203d49e1e55a027e90002117cf84ea0a', - 'name' => 'zoujingli/thinkadmin', - ), - 'versions' => - array ( - 'endroid/qr-code' => - array ( - 'pretty_version' => '1.9.3', - 'version' => '1.9.3.0', - 'aliases' => - array ( - ), - 'reference' => 'c9644bec2a9cc9318e98d1437de3c628dcd1ef93', - ), - 'league/flysystem' => - array ( - 'pretty_version' => '1.1.3', - 'version' => '1.1.3.0', - 'aliases' => - array ( - ), - 'reference' => '9be3b16c877d477357c015cec057548cf9b2a14a', - ), - 'league/flysystem-cached-adapter' => - array ( - 'pretty_version' => '1.1.0', - 'version' => '1.1.0.0', - 'aliases' => - array ( - ), - 'reference' => 'd1925efb2207ac4be3ad0c40b8277175f99ffaff', - ), - 'league/mime-type-detection' => - array ( - 'pretty_version' => '1.5.1', - 'version' => '1.5.1.0', - 'aliases' => - array ( - ), - 'reference' => '353f66d7555d8a90781f6f5e7091932f9a4250aa', - ), - 'psr/cache' => - array ( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'aliases' => - array ( - ), - 'reference' => 'd11b50ad223250cf17b86e38383413f5a6764bf8', - ), - 'psr/container' => - array ( - 'pretty_version' => '1.0.0', - 'version' => '1.0.0.0', - 'aliases' => - array ( - ), - 'reference' => 'b7ce3b176482dbbc1245ebf52b181af44c2cf55f', - ), - 'psr/log' => - array ( - 'pretty_version' => '1.1.3', - 'version' => '1.1.3.0', - 'aliases' => - array ( - ), - 'reference' => '0f73288fd15629204f9d42b7055f72dacbe811fc', - ), - 'psr/simple-cache' => - array ( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'aliases' => - array ( - ), - 'reference' => '408d5eafb83c57f6365a3ca330ff23aa4a5fa39b', - ), - 'symfony/options-resolver' => - array ( - 'pretty_version' => 'v3.4.45', - 'version' => '3.4.45.0', - 'aliases' => - array ( - ), - 'reference' => '0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5', - ), - 'topthink/framework' => - array ( - 'pretty_version' => 'v6.0.5', - 'version' => '6.0.5.0', - 'aliases' => - array ( - ), - 'reference' => '85625d984f5c96699dc27d384869f206c3aec1cc', - ), - 'topthink/think-helper' => - array ( - 'pretty_version' => 'v3.1.4', - 'version' => '3.1.4.0', - 'aliases' => - array ( - ), - 'reference' => 'c28d37743bda4a0455286ca85b17b5791d626e10', - ), - 'topthink/think-orm' => - array ( - 'pretty_version' => 'v2.0.34', - 'version' => '2.0.34.0', - 'aliases' => - array ( - ), - 'reference' => '57f9b98895b0ff4ae7b7b75e51456fd8cb8fb629', - ), - 'topthink/think-template' => - array ( - 'pretty_version' => 'v2.0.7', - 'version' => '2.0.7.0', - 'aliases' => - array ( - ), - 'reference' => 'e98bdbb4a4c94b442f17dfceba81e0134d4fbd19', - ), - 'topthink/think-view' => - array ( - 'pretty_version' => 'v1.0.14', - 'version' => '1.0.14.0', - 'aliases' => - array ( - ), - 'reference' => 'edce0ae2c9551ab65f9e94a222604b0dead3576d', - ), - 'zoujingli/ip2region' => - array ( - 'pretty_version' => 'v1.0.8', - 'version' => '1.0.8.0', - 'aliases' => - array ( - ), - 'reference' => 'd6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6', - ), - 'zoujingli/think-library' => - array ( - 'pretty_version' => 'v6.0.x-dev', - 'version' => '6.0.9999999.9999999-dev', - 'aliases' => - array ( - 0 => '9999999-dev', - ), - 'reference' => '51051855309a5752c0adb8f8d63129a43fd139ce', - ), - 'zoujingli/thinkadmin' => - array ( - 'pretty_version' => '6.x-dev', - 'version' => '6.9999999.9999999.9999999-dev', - 'aliases' => - array ( - ), - 'reference' => '2ec3ac9e203d49e1e55a027e90002117cf84ea0a', - ), - 'zoujingli/wechat-developer' => - array ( - 'pretty_version' => 'v1.2.26', - 'version' => '1.2.26.0', - 'aliases' => - array ( - ), - 'reference' => '5ecafcd810627cd9217c3d7f18c7026612418278', - ), - ), -); - - - - - - - -public static function getInstalledPackages() -{ -return array_keys(self::$installed['versions']); -} - - - - - - - - - -public static function isInstalled($packageName) -{ -return isset(self::$installed['versions'][$packageName]); -} - - - - - - - - - - - - - - -public static function satisfies(VersionParser $parser, $packageName, $constraint) -{ -$constraint = $parser->parseConstraints($constraint); -$provided = $parser->parseConstraints(self::getVersionRanges($packageName)); - -return $provided->matches($constraint); -} - - - - - - - - - - -public static function getVersionRanges($packageName) -{ -if (!isset(self::$installed['versions'][$packageName])) { -throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); -} - -$ranges = array(); -if (isset(self::$installed['versions'][$packageName]['pretty_version'])) { -$ranges[] = self::$installed['versions'][$packageName]['pretty_version']; -} -if (array_key_exists('aliases', self::$installed['versions'][$packageName])) { -$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['aliases']); -} -if (array_key_exists('replaced', self::$installed['versions'][$packageName])) { -$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['replaced']); -} -if (array_key_exists('provided', self::$installed['versions'][$packageName])) { -$ranges = array_merge($ranges, self::$installed['versions'][$packageName]['provided']); -} - -return implode(' || ', $ranges); -} - - - - - -public static function getVersion($packageName) -{ -if (!isset(self::$installed['versions'][$packageName])) { -throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); -} - -if (!isset(self::$installed['versions'][$packageName]['version'])) { -return null; -} - -return self::$installed['versions'][$packageName]['version']; -} - - - - - -public static function getPrettyVersion($packageName) -{ -if (!isset(self::$installed['versions'][$packageName])) { -throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); -} - -if (!isset(self::$installed['versions'][$packageName]['pretty_version'])) { -return null; -} - -return self::$installed['versions'][$packageName]['pretty_version']; -} - - - - - -public static function getReference($packageName) -{ -if (!isset(self::$installed['versions'][$packageName])) { -throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); -} - -if (!isset(self::$installed['versions'][$packageName]['reference'])) { -return null; -} - -return self::$installed['versions'][$packageName]['reference']; -} - - - - - -public static function getRootPackage() -{ -return self::$installed['root']; -} - - - - - - - -public static function getRawData() -{ -return self::$installed; -} - - - - - - - - - - - - - - - - - - - -public static function reload($data) -{ -self::$installed = $data; -} -} diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 0c190b1e1..5fe943869 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -199,7 +199,7 @@ return array( 'app\\admin\\controller\\api\\Update' => $baseDir . '/app/admin/controller/api/Update.php', 'app\\admin\\controller\\api\\Upload' => $baseDir . '/app/admin/controller/api/Upload.php', 'app\\data\\command\\OrderClear' => $baseDir . '/app/data/command/OrderClear.php', - 'app\\data\\command\\UserBalance' => $baseDir . '/app/data/command/UserBalance.php', + 'app\\data\\command\\UserAmount' => $baseDir . '/app/data/command/UserAmount.php', 'app\\data\\command\\UserTransfer' => $baseDir . '/app/data/command/UserTransfer.php', 'app\\data\\command\\UserUpgrade' => $baseDir . '/app/data/command/UserUpgrade.php', 'app\\data\\controller\\Config' => $baseDir . '/app/data/controller/Config.php', @@ -237,6 +237,7 @@ return array( 'app\\data\\controller\\api\\auth\\News' => $baseDir . '/app/data/controller/api/auth/News.php', 'app\\data\\controller\\api\\auth\\Order' => $baseDir . '/app/data/controller/api/auth/Order.php', 'app\\data\\controller\\api\\auth\\Rebate' => $baseDir . '/app/data/controller/api/auth/Rebate.php', + 'app\\data\\controller\\api\\auth\\Transfer' => $baseDir . '/app/data/controller/api/auth/Transfer.php', 'app\\data\\service\\ExpressService' => $baseDir . '/app/data/service/ExpressService.php', 'app\\data\\service\\GoodsService' => $baseDir . '/app/data/service/GoodsService.php', 'app\\data\\service\\MessageService' => $baseDir . '/app/data/service/MessageService.php', @@ -244,9 +245,9 @@ return array( 'app\\data\\service\\OrderService' => $baseDir . '/app/data/service/OrderService.php', 'app\\data\\service\\PaymentService' => $baseDir . '/app/data/service/PaymentService.php', 'app\\data\\service\\RebateService' => $baseDir . '/app/data/service/RebateService.php', + 'app\\data\\service\\UserAdminService' => $baseDir . '/app/data/service/UserAdminService.php', 'app\\data\\service\\UserBalanceService' => $baseDir . '/app/data/service/UserBalanceService.php', 'app\\data\\service\\UserRebateService' => $baseDir . '/app/data/service/UserRebateService.php', - 'app\\data\\service\\UserService' => $baseDir . '/app/data/service/UserService.php', 'app\\data\\service\\UserTokenService' => $baseDir . '/app/data/service/UserTokenService.php', 'app\\data\\service\\UserTransferService' => $baseDir . '/app/data/service/UserTransferService.php', 'app\\data\\service\\UserUpgradeService' => $baseDir . '/app/data/service/UserUpgradeService.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index ab16cbdf8..fff4434c2 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit4f89fd0e0503ccf740f2fa5757825d7b +class ComposerAutoloaderInitebdef296d7d83da818fc7b45caf0540d { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInit4f89fd0e0503ccf740f2fa5757825d7b return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit4f89fd0e0503ccf740f2fa5757825d7b', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitebdef296d7d83da818fc7b45caf0540d', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit4f89fd0e0503ccf740f2fa5757825d7b', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitebdef296d7d83da818fc7b45caf0540d', '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\ComposerStaticInit4f89fd0e0503ccf740f2fa5757825d7b::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitebdef296d7d83da818fc7b45caf0540d::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -51,19 +51,19 @@ class ComposerAutoloaderInit4f89fd0e0503ccf740f2fa5757825d7b $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit4f89fd0e0503ccf740f2fa5757825d7b::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitebdef296d7d83da818fc7b45caf0540d::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire4f89fd0e0503ccf740f2fa5757825d7b($fileIdentifier, $file); + composerRequireebdef296d7d83da818fc7b45caf0540d($fileIdentifier, $file); } return $loader; } } -function composerRequire4f89fd0e0503ccf740f2fa5757825d7b($fileIdentifier, $file) +function composerRequireebdef296d7d83da818fc7b45caf0540d($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 a055fa21e..83193e1e5 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit4f89fd0e0503ccf740f2fa5757825d7b +class ComposerStaticInitebdef296d7d83da818fc7b45caf0540d { public static $files = array ( '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', @@ -328,7 +328,7 @@ class ComposerStaticInit4f89fd0e0503ccf740f2fa5757825d7b 'app\\admin\\controller\\api\\Update' => __DIR__ . '/../..' . '/app/admin/controller/api/Update.php', 'app\\admin\\controller\\api\\Upload' => __DIR__ . '/../..' . '/app/admin/controller/api/Upload.php', 'app\\data\\command\\OrderClear' => __DIR__ . '/../..' . '/app/data/command/OrderClear.php', - 'app\\data\\command\\UserBalance' => __DIR__ . '/../..' . '/app/data/command/UserBalance.php', + 'app\\data\\command\\UserAmount' => __DIR__ . '/../..' . '/app/data/command/UserAmount.php', 'app\\data\\command\\UserTransfer' => __DIR__ . '/../..' . '/app/data/command/UserTransfer.php', 'app\\data\\command\\UserUpgrade' => __DIR__ . '/../..' . '/app/data/command/UserUpgrade.php', 'app\\data\\controller\\Config' => __DIR__ . '/../..' . '/app/data/controller/Config.php', @@ -366,6 +366,7 @@ class ComposerStaticInit4f89fd0e0503ccf740f2fa5757825d7b 'app\\data\\controller\\api\\auth\\News' => __DIR__ . '/../..' . '/app/data/controller/api/auth/News.php', 'app\\data\\controller\\api\\auth\\Order' => __DIR__ . '/../..' . '/app/data/controller/api/auth/Order.php', 'app\\data\\controller\\api\\auth\\Rebate' => __DIR__ . '/../..' . '/app/data/controller/api/auth/Rebate.php', + 'app\\data\\controller\\api\\auth\\Transfer' => __DIR__ . '/../..' . '/app/data/controller/api/auth/Transfer.php', 'app\\data\\service\\ExpressService' => __DIR__ . '/../..' . '/app/data/service/ExpressService.php', 'app\\data\\service\\GoodsService' => __DIR__ . '/../..' . '/app/data/service/GoodsService.php', 'app\\data\\service\\MessageService' => __DIR__ . '/../..' . '/app/data/service/MessageService.php', @@ -373,9 +374,9 @@ class ComposerStaticInit4f89fd0e0503ccf740f2fa5757825d7b 'app\\data\\service\\OrderService' => __DIR__ . '/../..' . '/app/data/service/OrderService.php', 'app\\data\\service\\PaymentService' => __DIR__ . '/../..' . '/app/data/service/PaymentService.php', 'app\\data\\service\\RebateService' => __DIR__ . '/../..' . '/app/data/service/RebateService.php', + 'app\\data\\service\\UserAdminService' => __DIR__ . '/../..' . '/app/data/service/UserAdminService.php', 'app\\data\\service\\UserBalanceService' => __DIR__ . '/../..' . '/app/data/service/UserBalanceService.php', 'app\\data\\service\\UserRebateService' => __DIR__ . '/../..' . '/app/data/service/UserRebateService.php', - 'app\\data\\service\\UserService' => __DIR__ . '/../..' . '/app/data/service/UserService.php', 'app\\data\\service\\UserTokenService' => __DIR__ . '/../..' . '/app/data/service/UserTokenService.php', 'app\\data\\service\\UserTransferService' => __DIR__ . '/../..' . '/app/data/service/UserTransferService.php', 'app\\data\\service\\UserUpgradeService' => __DIR__ . '/../..' . '/app/data/service/UserUpgradeService.php', @@ -681,10 +682,10 @@ class ComposerStaticInit4f89fd0e0503ccf740f2fa5757825d7b public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit4f89fd0e0503ccf740f2fa5757825d7b::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit4f89fd0e0503ccf740f2fa5757825d7b::$prefixDirsPsr4; - $loader->fallbackDirsPsr0 = ComposerStaticInit4f89fd0e0503ccf740f2fa5757825d7b::$fallbackDirsPsr0; - $loader->classMap = ComposerStaticInit4f89fd0e0503ccf740f2fa5757825d7b::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitebdef296d7d83da818fc7b45caf0540d::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitebdef296d7d83da818fc7b45caf0540d::$prefixDirsPsr4; + $loader->fallbackDirsPsr0 = ComposerStaticInitebdef296d7d83da818fc7b45caf0540d::$fallbackDirsPsr0; + $loader->classMap = ComposerStaticInitebdef296d7d83da818fc7b45caf0540d::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 0d5854bd2..a65d84eff 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -65,11 +65,7 @@ "qr", "qrcode", "symfony" - ], - "support": { - "issues": "https://github.com/endroid/qr-code/issues", - "source": "https://github.com/endroid/qr-code/tree/1.9.3" - } + ] }, { "name": "league/flysystem", @@ -222,11 +218,7 @@ "email": "info@frenky.net" } ], - "description": "An adapter decorator to enable meta-data caching.", - "support": { - "issues": "https://github.com/thephpleague/flysystem-cached-adapter/issues", - "source": "https://github.com/thephpleague/flysystem-cached-adapter/tree/master" - } + "description": "An adapter decorator to enable meta-data caching." }, { "name": "psr/cache", @@ -280,10 +272,7 @@ "cache", "psr", "psr-6" - ], - "support": { - "source": "https://github.com/php-fig/cache/tree/master" - } + ] }, { "name": "psr/container", @@ -340,11 +329,7 @@ "container-interface", "container-interop", "psr" - ], - "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/master" - } + ] }, { "name": "psr/log", @@ -399,10 +384,7 @@ "log", "psr", "psr-3" - ], - "support": { - "source": "https://github.com/php-fig/log/tree/1.1.3" - } + ] }, { "name": "psr/simple-cache", @@ -458,10 +440,7 @@ "psr", "psr-16", "simple-cache" - ], - "support": { - "source": "https://github.com/php-fig/simple-cache/tree/master" - } + ] }, { "name": "symfony/options-resolver", @@ -648,11 +627,7 @@ "email": "448901948@qq.com" } ], - "description": "The ThinkPHP6 Helper Package", - "support": { - "issues": "https://github.com/top-think/think-helper/issues", - "source": "https://github.com/top-think/think-helper/tree/3.0" - } + "description": "The ThinkPHP6 Helper Package" }, { "name": "topthink/think-orm", @@ -801,11 +776,7 @@ "email": "liu21st@gmail.com" } ], - "description": "thinkphp template driver", - "support": { - "issues": "https://github.com/top-think/think-view/issues", - "source": "https://github.com/top-think/think-view/tree/v1.0.14" - } + "description": "thinkphp template driver" }, { "name": "zoujingli/ip2region", @@ -863,12 +834,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "c05b7fc33aeb089452e98cd70645148124ff8dff" + "reference": "6ff84d044d7fa50c24736ac10a4d93384abe21c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c05b7fc33aeb089452e98cd70645148124ff8dff", - "reference": "c05b7fc33aeb089452e98cd70645148124ff8dff", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/6ff84d044d7fa50c24736ac10a4d93384abe21c7", + "reference": "6ff84d044d7fa50c24736ac10a4d93384abe21c7", "shasum": "", "mirrors": [ { @@ -885,7 +856,7 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2021-03-01T07:21:42+00:00", + "time": "2021-03-17T06:18:21+00:00", "type": "library", "extra": { "think": { @@ -894,7 +865,7 @@ ] } }, - "installation-source": "source", + "installation-source": "dist", "autoload": { "files": [ "src/common.php" diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php deleted file mode 100644 index f9fc466fb..000000000 --- a/vendor/composer/installed.php +++ /dev/null @@ -1,178 +0,0 @@ - - array ( - 'pretty_version' => '6.x-dev', - 'version' => '6.9999999.9999999.9999999-dev', - 'aliases' => - array ( - ), - 'reference' => '2ec3ac9e203d49e1e55a027e90002117cf84ea0a', - 'name' => 'zoujingli/thinkadmin', - ), - 'versions' => - array ( - 'endroid/qr-code' => - array ( - 'pretty_version' => '1.9.3', - 'version' => '1.9.3.0', - 'aliases' => - array ( - ), - 'reference' => 'c9644bec2a9cc9318e98d1437de3c628dcd1ef93', - ), - 'league/flysystem' => - array ( - 'pretty_version' => '1.1.3', - 'version' => '1.1.3.0', - 'aliases' => - array ( - ), - 'reference' => '9be3b16c877d477357c015cec057548cf9b2a14a', - ), - 'league/flysystem-cached-adapter' => - array ( - 'pretty_version' => '1.1.0', - 'version' => '1.1.0.0', - 'aliases' => - array ( - ), - 'reference' => 'd1925efb2207ac4be3ad0c40b8277175f99ffaff', - ), - 'league/mime-type-detection' => - array ( - 'pretty_version' => '1.5.1', - 'version' => '1.5.1.0', - 'aliases' => - array ( - ), - 'reference' => '353f66d7555d8a90781f6f5e7091932f9a4250aa', - ), - 'psr/cache' => - array ( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'aliases' => - array ( - ), - 'reference' => 'd11b50ad223250cf17b86e38383413f5a6764bf8', - ), - 'psr/container' => - array ( - 'pretty_version' => '1.0.0', - 'version' => '1.0.0.0', - 'aliases' => - array ( - ), - 'reference' => 'b7ce3b176482dbbc1245ebf52b181af44c2cf55f', - ), - 'psr/log' => - array ( - 'pretty_version' => '1.1.3', - 'version' => '1.1.3.0', - 'aliases' => - array ( - ), - 'reference' => '0f73288fd15629204f9d42b7055f72dacbe811fc', - ), - 'psr/simple-cache' => - array ( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'aliases' => - array ( - ), - 'reference' => '408d5eafb83c57f6365a3ca330ff23aa4a5fa39b', - ), - 'symfony/options-resolver' => - array ( - 'pretty_version' => 'v3.4.45', - 'version' => '3.4.45.0', - 'aliases' => - array ( - ), - 'reference' => '0edf31d2e34f4adb72dd4d2e4a8aa21f84b943e5', - ), - 'topthink/framework' => - array ( - 'pretty_version' => 'v6.0.5', - 'version' => '6.0.5.0', - 'aliases' => - array ( - ), - 'reference' => '85625d984f5c96699dc27d384869f206c3aec1cc', - ), - 'topthink/think-helper' => - array ( - 'pretty_version' => 'v3.1.4', - 'version' => '3.1.4.0', - 'aliases' => - array ( - ), - 'reference' => 'c28d37743bda4a0455286ca85b17b5791d626e10', - ), - 'topthink/think-orm' => - array ( - 'pretty_version' => 'v2.0.34', - 'version' => '2.0.34.0', - 'aliases' => - array ( - ), - 'reference' => '57f9b98895b0ff4ae7b7b75e51456fd8cb8fb629', - ), - 'topthink/think-template' => - array ( - 'pretty_version' => 'v2.0.7', - 'version' => '2.0.7.0', - 'aliases' => - array ( - ), - 'reference' => 'e98bdbb4a4c94b442f17dfceba81e0134d4fbd19', - ), - 'topthink/think-view' => - array ( - 'pretty_version' => 'v1.0.14', - 'version' => '1.0.14.0', - 'aliases' => - array ( - ), - 'reference' => 'edce0ae2c9551ab65f9e94a222604b0dead3576d', - ), - 'zoujingli/ip2region' => - array ( - 'pretty_version' => 'v1.0.8', - 'version' => '1.0.8.0', - 'aliases' => - array ( - ), - 'reference' => 'd6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6', - ), - 'zoujingli/think-library' => - array ( - 'pretty_version' => 'v6.0.x-dev', - 'version' => '6.0.9999999.9999999-dev', - 'aliases' => - array ( - 0 => '9999999-dev', - ), - 'reference' => '51051855309a5752c0adb8f8d63129a43fd139ce', - ), - 'zoujingli/thinkadmin' => - array ( - 'pretty_version' => '6.x-dev', - 'version' => '6.9999999.9999999.9999999-dev', - 'aliases' => - array ( - ), - 'reference' => '2ec3ac9e203d49e1e55a027e90002117cf84ea0a', - ), - 'zoujingli/wechat-developer' => - array ( - 'pretty_version' => 'v1.2.26', - 'version' => '1.2.26.0', - 'aliases' => - array ( - ), - 'reference' => '5ecafcd810627cd9217c3d7f18c7026612418278', - ), - ), -); diff --git a/vendor/composer/platform_check.php b/vendor/composer/platform_check.php deleted file mode 100644 index 385b177c1..000000000 --- a/vendor/composer/platform_check.php +++ /dev/null @@ -1,31 +0,0 @@ -= 70205)) { - $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.5". You are running ' . PHP_VERSION . '.'; -} - -$missingExtensions = array(); -extension_loaded('bcmath') || $missingExtensions[] = 'bcmath'; -extension_loaded('curl') || $missingExtensions[] = 'curl'; -extension_loaded('fileinfo') || $missingExtensions[] = 'fileinfo'; -extension_loaded('gd') || $missingExtensions[] = 'gd'; -extension_loaded('iconv') || $missingExtensions[] = 'iconv'; -extension_loaded('json') || $missingExtensions[] = 'json'; -extension_loaded('libxml') || $missingExtensions[] = 'libxml'; -extension_loaded('mbstring') || $missingExtensions[] = 'mbstring'; -extension_loaded('openssl') || $missingExtensions[] = 'openssl'; -extension_loaded('simplexml') || $missingExtensions[] = 'simplexml'; -extension_loaded('xml') || $missingExtensions[] = 'xml'; - -if ($missingExtensions) { - $issues[] = 'Your Composer dependencies require the following PHP extensions to be installed: ' . implode(', ', $missingExtensions); -} - -if ($issues) { - echo 'Composer detected issues in your platform:' . "\n\n" . implode("\n", $issues); - exit(104); -} diff --git a/vendor/services.php b/vendor/services.php index 34a6c5a08..7c33f6ec8 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/think-library/src/common.php b/vendor/zoujingli/think-library/src/common.php index d8d92adba..c8b46f915 100644 --- a/vendor/zoujingli/think-library/src/common.php +++ b/vendor/zoujingli/think-library/src/common.php @@ -154,7 +154,7 @@ if (!function_exists('str2arr')) { $text = trim($text, $separ); $data = strlen($text) ? explode($separ, $text) : []; if (is_array($allow)) foreach ($data as $key => $item) { - if (!in_array($item, $allow)) unset($data[$key]); + if (!in_array($item, $allow) || $item === '') unset($data[$key]); } return $data; } @@ -170,7 +170,7 @@ if (!function_exists('arr2str')) { function arr2str(array $data, string $separ = ',', ?array $allow = null): string { if (is_array($allow)) foreach ($data as $key => $item) { - if (!in_array($item, $allow)) unset($data[$key]); + if (!in_array($item, $allow) || $item === '') unset($data[$key]); } return $separ . join($separ, $data) . $separ; }