diff --git a/composer.json b/composer.json index eaa958b04..400046468 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,7 @@ { "type": "project", "name": "zoujingli/thinkadmin", + "license": "MIT", "authors": [ { "name": "Anyon", diff --git a/vendor/autoload.php b/vendor/autoload.php index cbe08efa3..1c7d28307 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit8221d9d28aec2b292a3f5c4c16a2acdf::getLoader(); +return ComposerAutoloaderInitbe3e9ba0155bdb933f2ae90b5ee37778::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 281dbe5ab..703c6bafc 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit8221d9d28aec2b292a3f5c4c16a2acdf +class ComposerAutoloaderInitbe3e9ba0155bdb933f2ae90b5ee37778 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit8221d9d28aec2b292a3f5c4c16a2acdf return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit8221d9d28aec2b292a3f5c4c16a2acdf', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitbe3e9ba0155bdb933f2ae90b5ee37778', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit8221d9d28aec2b292a3f5c4c16a2acdf', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitbe3e9ba0155bdb933f2ae90b5ee37778', '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\ComposerStaticInit8221d9d28aec2b292a3f5c4c16a2acdf::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitbe3e9ba0155bdb933f2ae90b5ee37778::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit8221d9d28aec2b292a3f5c4c16a2acdf $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit8221d9d28aec2b292a3f5c4c16a2acdf::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitbe3e9ba0155bdb933f2ae90b5ee37778::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire8221d9d28aec2b292a3f5c4c16a2acdf($fileIdentifier, $file); + composerRequirebe3e9ba0155bdb933f2ae90b5ee37778($fileIdentifier, $file); } return $loader; } } -function composerRequire8221d9d28aec2b292a3f5c4c16a2acdf($fileIdentifier, $file) +function composerRequirebe3e9ba0155bdb933f2ae90b5ee37778($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 5f8ce1333..ade0f4f5e 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit8221d9d28aec2b292a3f5c4c16a2acdf +class ComposerStaticInitbe3e9ba0155bdb933f2ae90b5ee37778 { public static $files = array ( '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php', @@ -346,9 +346,9 @@ class ComposerStaticInit8221d9d28aec2b292a3f5c4c16a2acdf public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit8221d9d28aec2b292a3f5c4c16a2acdf::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit8221d9d28aec2b292a3f5c4c16a2acdf::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit8221d9d28aec2b292a3f5c4c16a2acdf::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitbe3e9ba0155bdb933f2ae90b5ee37778::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitbe3e9ba0155bdb933f2ae90b5ee37778::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitbe3e9ba0155bdb933f2ae90b5ee37778::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index ffc411b14..62b56a876 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -499,12 +499,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "e0532657e7408ffb76806b421d34e9833e414ea1" + "reference": "d4366fa9d4f48400391f9983c9771494c75aba95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e0532657e7408ffb76806b421d34e9833e414ea1", - "reference": "e0532657e7408ffb76806b421d34e9833e414ea1", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/d4366fa9d4f48400391f9983c9771494c75aba95", + "reference": "d4366fa9d4f48400391f9983c9771494c75aba95", "shasum": "", "mirrors": [ { @@ -523,7 +523,7 @@ "qiniu/php-sdk": "^7.2", "topthink/framework": "5.1.*" }, - "time": "2019-06-13T02:34:10+00:00", + "time": "2019-06-15T04:07:28+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/zoujingli/think-library/readme.md b/vendor/zoujingli/think-library/readme.md index 03ebb0ed9..93c9957de 100644 --- a/vendor/zoujingli/think-library/readme.md +++ b/vendor/zoujingli/think-library/readme.md @@ -1,7 +1,4 @@ -[![Latest Stable Version](https://poser.pugx.org/zoujingli/think-library/v/stable)](https://packagist.org/packages/zoujingli/think-library) -[![Latest Unstable Version](https://poser.pugx.org/zoujingli/think-library/v/unstable)](https://packagist.org/packages/zoujingli/think-library) -[![Total Downloads](https://poser.pugx.org/zoujingli/think-library/downloads)](https://packagist.org/packages/zoujingli/think-library) -[![License](https://poser.pugx.org/zoujingli/think-library/license)](https://packagist.org/packages/zoujingli/think-library) +[![Latest Stable Version](https://poser.pugx.org/zoujingli/think-library/v/stable)](https://packagist.org/packages/zoujingli/think-library) [![Total Downloads](https://poser.pugx.org/zoujingli/think-library/downloads)](https://packagist.org/packages/zoujingli/think-library) [![Latest Unstable Version](https://poser.pugx.org/zoujingli/think-library/v/unstable)](https://packagist.org/packages/zoujingli/think-library) [![License](https://poser.pugx.org/zoujingli/think-library/license)](https://packagist.org/packages/zoujingli/think-library) # ThinkLibrary for ThinkPHP5.1 ThinkLibrary 是针对 ThinkPHP5.1 版本封装的一套工具类库,方便快速构建 WEB 应用。 diff --git a/vendor/zoujingli/think-library/src/tools/Data.php b/vendor/zoujingli/think-library/src/tools/Data.php index 8b849a958..2d2aee8e0 100644 --- a/vendor/zoujingli/think-library/src/tools/Data.php +++ b/vendor/zoujingli/think-library/src/tools/Data.php @@ -154,22 +154,22 @@ class Data /** * 获取随机字符串编码 - * @param integer $length - * @param integer $type + * @param integer $length 字符串长度 + * @param integer $type 字符串类型(1纯数字,2纯字母,3数字字母) * @return string */ public static function randomCode($length = 10, $type = 1) { - list($nchars, $schars) = [join('', range(0, 9)), join('', range('a', 'z'))]; - if (intval($type) === 1) list($strs, $chars) = [range(1, 9), $nchars]; - if (intval($type) === 2) list($strs, $chars) = ['', $schars]; - if (intval($type) === 3) list($strs, $chars) = ['', $nchars . $schars]; - if (isset($strs) && isset($chars)) { - while (strlen($strs) < $length) $strs .= $chars[rand(0, strlen($chars) - 1)]; - return $strs; - } else { - return self::uniqidNumberCode(); + $numbs = '0123456789'; + $chars = 'abcdefghijklmnopqrstuvwxyz'; + if (intval($type) === 1) $chars = $numbs; + if (intval($type) === 2) $chars = "a{$chars}"; + if (intval($type) === 3) $chars = "{$numbs}{$chars}"; + $string = $chars[rand(1, strlen($chars) - 1)]; + if (isset($chars)) while (strlen($string) < $length) { + $string .= $chars[rand(0, strlen($chars) - 1)]; } + return $string; } /**