diff --git a/niucloud/composer.json b/niucloud/composer.json index 612d026c0..e2346afbc 100644 --- a/niucloud/composer.json +++ b/niucloud/composer.json @@ -52,7 +52,8 @@ "yunwuxin/think-cron": "v3.0.5", "nesbot/carbon": "2.66.0", "ext-zip": "*", - "tencentcloud/sms": "^3.0" + "tencentcloud/sms": "^3.0", + "mjaschen/phpgeo": "^4.2" }, "require-dev": { "symfony/var-dumper": "v4.4.47", @@ -84,4 +85,4 @@ "url": "https://mirrors.aliyun.com/composer" } } -} \ No newline at end of file +} diff --git a/niucloud/composer.lock b/niucloud/composer.lock index fa8cc66cf..3b551601d 100644 --- a/niucloud/composer.lock +++ b/niucloud/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2ee084ef2daa13336424f0595853c95c", + "content-hash": "6f05ad840fb186f8d31c7d591afee257", "packages": [ { "name": "adbario/php-dot-notation", @@ -1617,6 +1617,85 @@ }, "time": "2022-12-02T22:17:43+00:00" }, + { + "name": "mjaschen/phpgeo", + "version": "4.2.0", + "source": { + "type": "git", + "url": "https://github.com/mjaschen/phpgeo.git", + "reference": "b2e593cf1e9aceea36510158ddb80c7395a80d5a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mjaschen/phpgeo/zipball/b2e593cf1e9aceea36510158ddb80c7395a80d5a", + "reference": "b2e593cf1e9aceea36510158ddb80c7395a80d5a", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "php": "^7.3 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.5", + "squizlabs/php_codesniffer": "^3.6", + "vimeo/psalm": "^4.13" + }, + "type": "library", + "autoload": { + "psr-4": { + "Location\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marcus Jaschen", + "email": "mjaschen@gmail.com", + "homepage": "https://www.marcusjaschen.de/" + } + ], + "description": "Simple Yet Powerful Geo Library", + "homepage": "https://phpgeo.marcusjaschen.de/", + "keywords": [ + "Polygon", + "area", + "bearing", + "bounds", + "calculation", + "coordinate", + "distance", + "earth", + "ellipsoid", + "geo", + "geofence", + "gis", + "gps", + "haversine", + "length", + "perpendicular", + "point", + "polyline", + "projection", + "simplify", + "track", + "vincenty" + ], + "support": { + "docs": "https://phpgeo.marcusjaschen.de/Installation.html", + "email": "mjaschen@gmail.com", + "issues": "https://github.com/mjaschen/phpgeo/issues", + "source": "https://github.com/mjaschen/phpgeo/tree/4.2.0" + }, + "time": "2022-07-25T08:36:36+00:00" + }, { "name": "monolog/monolog", "version": "2.9.1", @@ -2045,105 +2124,6 @@ ], "time": "2023-07-17T08:56:49+00:00" }, - { - "name": "overtrue/wechat", - "version": "5.30.0", - "source": { - "type": "git", - "url": "https://github.com/w7corp/easywechat.git", - "reference": "245d1e821bc5a4609625c3244b111f570692cfc2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/w7corp/easywechat/zipball/245d1e821bc5a4609625c3244b111f570692cfc2", - "reference": "245d1e821bc5a4609625c3244b111f570692cfc2", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "easywechat-composer/easywechat-composer": "^1.1", - "ext-fileinfo": "*", - "ext-libxml": "*", - "ext-openssl": "*", - "ext-simplexml": "*", - "guzzlehttp/guzzle": "^6.2 || ^7.0", - "monolog/monolog": "^1.22 || ^2.0", - "overtrue/socialite": "^3.2 || ^4.0", - "php": ">=7.4", - "pimple/pimple": "^3.0", - "psr/simple-cache": "^1.0||^2.0||^3.0", - "symfony/cache": "^3.3 || ^4.3 || ^5.0 || ^6.0", - "symfony/event-dispatcher": "^4.3 || ^5.0 || ^6.0", - "symfony/http-foundation": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0", - "symfony/psr-http-message-bridge": "^0.3 || ^1.0 || ^2.0" - }, - "require-dev": { - "brainmaestro/composer-git-hooks": "^2.7", - "dms/phpunit-arraysubset-asserts": "^0.2.0", - "friendsofphp/php-cs-fixer": "^3.5.0", - "mikey179/vfsstream": "^1.6", - "mockery/mockery": "^1.2.3", - "phpstan/phpstan": "^0.12.0", - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "hooks": { - "pre-commit": [ - "composer test", - "composer fix-style" - ], - "pre-push": [ - "composer test", - "composer fix-style" - ] - } - }, - "autoload": { - "files": [ - "src/Kernel/Support/Helpers.php", - "src/Kernel/Helpers.php" - ], - "psr-4": { - "EasyWeChat\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "overtrue", - "email": "anzhengchao@gmail.com" - } - ], - "description": "微信SDK", - "keywords": [ - "easywechat", - "sdk", - "wechat", - "weixin", - "weixin-sdk" - ], - "support": { - "issues": "https://github.com/w7corp/easywechat/issues", - "source": "https://github.com/w7corp/easywechat/tree/5.30.0" - }, - "funding": [ - { - "url": "https://github.com/overtrue", - "type": "github" - } - ], - "abandoned": "w7corp/easywechat", - "time": "2022-09-05T08:22:34+00:00" - }, { "name": "php-di/invoker", "version": "2.3.3", @@ -5138,6 +5118,104 @@ }, "time": "2019-11-06T11:40:13+00:00" }, + { + "name": "w7corp/easywechat", + "version": "5.30.0", + "source": { + "type": "git", + "url": "https://github.com/w7corp/easywechat.git", + "reference": "245d1e821bc5a4609625c3244b111f570692cfc2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/w7corp/easywechat/zipball/245d1e821bc5a4609625c3244b111f570692cfc2", + "reference": "245d1e821bc5a4609625c3244b111f570692cfc2", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "easywechat-composer/easywechat-composer": "^1.1", + "ext-fileinfo": "*", + "ext-libxml": "*", + "ext-openssl": "*", + "ext-simplexml": "*", + "guzzlehttp/guzzle": "^6.2 || ^7.0", + "monolog/monolog": "^1.22 || ^2.0", + "overtrue/socialite": "^3.2 || ^4.0", + "php": ">=7.4", + "pimple/pimple": "^3.0", + "psr/simple-cache": "^1.0||^2.0||^3.0", + "symfony/cache": "^3.3 || ^4.3 || ^5.0 || ^6.0", + "symfony/event-dispatcher": "^4.3 || ^5.0 || ^6.0", + "symfony/http-foundation": "^2.7 || ^3.0 || ^4.0 || ^5.0 || ^6.0", + "symfony/psr-http-message-bridge": "^0.3 || ^1.0 || ^2.0" + }, + "require-dev": { + "brainmaestro/composer-git-hooks": "^2.7", + "dms/phpunit-arraysubset-asserts": "^0.2.0", + "friendsofphp/php-cs-fixer": "^3.5.0", + "mikey179/vfsstream": "^1.6", + "mockery/mockery": "^1.2.3", + "phpstan/phpstan": "^0.12.0", + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "hooks": { + "pre-commit": [ + "composer test", + "composer fix-style" + ], + "pre-push": [ + "composer test", + "composer fix-style" + ] + } + }, + "autoload": { + "files": [ + "src/Kernel/Support/Helpers.php", + "src/Kernel/Helpers.php" + ], + "psr-4": { + "EasyWeChat\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "overtrue", + "email": "anzhengchao@gmail.com" + } + ], + "description": "微信SDK", + "keywords": [ + "easywechat", + "sdk", + "wechat", + "weixin", + "weixin-sdk" + ], + "support": { + "issues": "https://github.com/w7corp/easywechat/issues", + "source": "https://github.com/w7corp/easywechat/tree/5.30.0" + }, + "funding": [ + { + "url": "https://github.com/overtrue", + "type": "github" + } + ], + "time": "2022-09-05T08:22:34+00:00" + }, { "name": "webmozart/assert", "version": "1.11.0",