diff --git a/composer.json b/composer.json index 307c3304a..c5ebefdda 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ "pclzip/pclzip": "^2.8", "qiniu/php-sdk": "^7.0", "zoujingli/wechat-php-sdk": "dev-master", + "zoujingli/ip2region": "^1.0", "topthink/framework": "^5.0", "topthink/think-captcha": "^1.0", "topthink/think-mongo": "^1.1", diff --git a/composer.lock b/composer.lock index 93a0a277d..d22d9a7c9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "7c9685d29208f32193dc293722b2f2e7", - "content-hash": "80db93fe5e6971dc5fd7643c71527810", + "hash": "22456adca8b8612f6dd35e7bac091d31", + "content-hash": "37d78544d8fdef59fac0a30784e660a4", "packages": [ { "name": "pclzip/pclzip", @@ -338,6 +338,40 @@ "description": "The ThinkPHP5 Queue Package", "time": "2017-02-28 08:07:37" }, + { + "name": "zoujingli/ip2region", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/zoujingli/ip2region.git", + "reference": "2efe42321acb83d01d1de5bfde69142ad81bff9b" + }, + "dist": { + "type": "zip", + "url": "https://files.phpcomposer.com/files/zoujingli/ip2region/2efe42321acb83d01d1de5bfde69142ad81bff9b.zip", + "reference": "2efe42321acb83d01d1de5bfde69142ad81bff9b", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "Ip2Region.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache 2.0" + ], + "description": "Ip2Region", + "homepage": "https://github.com/zoujingli/Ip2Region", + "keywords": [ + "Ip2Region" + ], + "time": "2017-03-22 10:03:27" + }, { "name": "zoujingli/wechat-php-sdk", "version": "dev-master", diff --git a/vendor/autoload.php b/vendor/autoload.php index f13ee49fa..fc64b6b8a 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit92a5fe0bb87f97baabea0fdabbc00865::getLoader(); +return ComposerAutoloaderInitf1ad271c62d17afe200e83a25aa54de5::getLoader(); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 7b914e575..eb5e6df9b 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -6,6 +6,7 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( + 'Ip2Region' => $vendorDir . '/zoujingli/ip2region/Ip2Region.php', 'PclZip' => $vendorDir . '/pclzip/pclzip/pclzip.lib.php', 'Qiniu\\Auth' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Auth.php', 'Qiniu\\Config' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/Config.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index e2df802e2..dbb566a12 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit92a5fe0bb87f97baabea0fdabbc00865 +class ComposerAutoloaderInitf1ad271c62d17afe200e83a25aa54de5 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit92a5fe0bb87f97baabea0fdabbc00865 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit92a5fe0bb87f97baabea0fdabbc00865', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitf1ad271c62d17afe200e83a25aa54de5', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit92a5fe0bb87f97baabea0fdabbc00865', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitf1ad271c62d17afe200e83a25aa54de5', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION'); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit92a5fe0bb87f97baabea0fdabbc00865::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitf1ad271c62d17afe200e83a25aa54de5::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit92a5fe0bb87f97baabea0fdabbc00865 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit92a5fe0bb87f97baabea0fdabbc00865::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitf1ad271c62d17afe200e83a25aa54de5::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire92a5fe0bb87f97baabea0fdabbc00865($fileIdentifier, $file); + composerRequiref1ad271c62d17afe200e83a25aa54de5($fileIdentifier, $file); } return $loader; } } -function composerRequire92a5fe0bb87f97baabea0fdabbc00865($fileIdentifier, $file) +function composerRequiref1ad271c62d17afe200e83a25aa54de5($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 738c68cb0..b2f58c0df 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit92a5fe0bb87f97baabea0fdabbc00865 +class ComposerStaticInitf1ad271c62d17afe200e83a25aa54de5 { public static $files = array ( '9b552a3cc426e3287cc811caefa3cf53' => __DIR__ . '/..' . '/topthink/think-helper/src/helper.php', @@ -65,6 +65,7 @@ class ComposerStaticInit92a5fe0bb87f97baabea0fdabbc00865 ); public static $classMap = array ( + 'Ip2Region' => __DIR__ . '/..' . '/zoujingli/ip2region/Ip2Region.php', 'PclZip' => __DIR__ . '/..' . '/pclzip/pclzip/pclzip.lib.php', 'Qiniu\\Auth' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Auth.php', 'Qiniu\\Config' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/Config.php', @@ -273,9 +274,9 @@ class ComposerStaticInit92a5fe0bb87f97baabea0fdabbc00865 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit92a5fe0bb87f97baabea0fdabbc00865::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit92a5fe0bb87f97baabea0fdabbc00865::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit92a5fe0bb87f97baabea0fdabbc00865::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitf1ad271c62d17afe200e83a25aa54de5::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitf1ad271c62d17afe200e83a25aa54de5::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitf1ad271c62d17afe200e83a25aa54de5::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index c7d96784f..0c0b13c02 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -170,6 +170,42 @@ "storage" ] }, + { + "name": "zoujingli/ip2region", + "version": "v1.0.1", + "version_normalized": "1.0.1.0", + "source": { + "type": "git", + "url": "https://github.com/zoujingli/ip2region.git", + "reference": "2efe42321acb83d01d1de5bfde69142ad81bff9b" + }, + "dist": { + "type": "zip", + "url": "https://files.phpcomposer.com/files/zoujingli/ip2region/2efe42321acb83d01d1de5bfde69142ad81bff9b.zip", + "reference": "2efe42321acb83d01d1de5bfde69142ad81bff9b", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "time": "2017-03-22 10:03:27", + "type": "library", + "installation-source": "dist", + "autoload": { + "classmap": [ + "Ip2Region.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache 2.0" + ], + "description": "Ip2Region", + "homepage": "https://github.com/zoujingli/Ip2Region", + "keywords": [ + "Ip2Region" + ] + }, { "name": "topthink/framework", "version": "v5.0.7",