diff --git a/composer.json b/composer.json index 4ed32ad..8c12bfc 100644 --- a/composer.json +++ b/composer.json @@ -1,60 +1,61 @@ { - "name": "ulthon/ulthon_admin", - "description": "基于ThinkPHP6.0和layui的快速开发的后台管理系统。", - "type": "project", - "keywords": [ - "ulthon_admin", - "ulthon", - "thinkphp", - "admin" - ], - "homepage": "http://admin.demo.ulthon.com//", - "license": "MIT", - "authors": [ - { - "name": "augushong", - "email": "augushong@ulthon.com" - } - ], - "require": { - "php": ">=8.0.0", - "ext-json": "*", - "topthink/framework": "^8.0", - "topthink/think-orm": "^3.0", - "topthink/think-multi-app": "^1.0", - "topthink/think-captcha": "^3.0", - "guzzlehttp/guzzle": "^7.4", - "phpoffice/phpspreadsheet": "^1.22", - "doctrine/annotations": "^1.13", - "league/flysystem": "^3.0", - "overtrue/flysystem-qiniu": "^3.0", - "overtrue/flysystem-cos": "^5.0", - "iidestiny/flysystem-oss": "^4.0", - "czproject/git-php": "^4.2", - "psr/simple-cache": ">=1.0" - }, - "require-dev": { - "symfony/var-dumper": "*" - }, - "autoload": { - "psr-4": { - "app\\": "app", - "trait\\": "extend/trait", - "base\\": "extend/base", - "Phinx\\": "extend/phinx" - }, - "psr-0": { - "": "extend/" - } - }, - "config": { - "preferred-install": "dist", - "secure-http": false - }, - "scripts": { - "post-autoload-dump": [ - "@php think service:discover", - "@php think vendor:publish" - ] + "name": "ulthon/ulthon_admin", + "description": "基于ThinkPHP6.0和layui的快速开发的后台管理系统。", + "type": "project", + "keywords": [ + "ulthon_admin", + "ulthon", + "thinkphp", + "admin" + ], + "homepage": "http://admin.demo.ulthon.com//", + "license": "MIT", + "authors": [ + { + "name": "augushong", + "email": "augushong@ulthon.com" } + ], + "require": { + "php": ">=8.0.0", + "ext-json": "*", + "ext-fileinfo": "*", + "topthink/framework": "^8.0", + "topthink/think-orm": "^3.0", + "topthink/think-multi-app": "^1.0", + "topthink/think-captcha": "^3.0", + "guzzlehttp/guzzle": "^7.4", + "phpoffice/phpspreadsheet": "^1.22", + "doctrine/annotations": "2.*", + "league/flysystem": "^3.0", + "overtrue/flysystem-qiniu": "^3.0", + "overtrue/flysystem-cos": "^5.0", + "iidestiny/flysystem-oss": "^4.0", + "czproject/git-php": "^4.2", + "psr/simple-cache": ">=1.0" + }, + "require-dev": { + "symfony/var-dumper": "*" + }, + "autoload": { + "psr-4": { + "app\\": "app", + "trait\\": "extend/trait", + "base\\": "extend/base", + "Phinx\\": "extend/phinx" + }, + "psr-0": { + "": "extend/" + } + }, + "config": { + "preferred-install": "dist", + "secure-http": false + }, + "scripts": { + "post-autoload-dump": [ + "@php think service:discover", + "@php think vendor:publish" + ] + } } diff --git a/composer.lock b/composer.lock index 3394b86..929d98b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,28 +4,28 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f2aaff931d3892b72c0c06b7e9a023c7", + "content-hash": "f26e7db70fed6538095bde0b081d6e00", "packages": [ { "name": "aliyuncs/oss-sdk-php", - "version": "v2.6.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/aliyun/aliyun-oss-php-sdk.git", - "reference": "572d0f8e099e8630ae7139ed3fdedb926c7a760f" + "reference": "ce5d34dae9868237a32248788ea175c7e9da14b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aliyun/aliyun-oss-php-sdk/zipball/572d0f8e099e8630ae7139ed3fdedb926c7a760f", - "reference": "572d0f8e099e8630ae7139ed3fdedb926c7a760f", + "url": "https://api.github.com/repos/aliyun/aliyun-oss-php-sdk/zipball/ce5d34dae9868237a32248788ea175c7e9da14b1", + "reference": "ce5d34dae9868237a32248788ea175c7e9da14b1", "shasum": "" }, "require": { "php": ">=5.3" }, "require-dev": { - "phpunit/phpunit": "*", - "satooshi/php-coveralls": "*" + "php-coveralls/php-coveralls": "*", + "phpunit/phpunit": "*" }, "type": "library", "autoload": { @@ -47,9 +47,9 @@ "homepage": "http://www.aliyun.com/product/oss/", "support": { "issues": "https://github.com/aliyun/aliyun-oss-php-sdk/issues", - "source": "https://github.com/aliyun/aliyun-oss-php-sdk/tree/v2.6.0" + "source": "https://github.com/aliyun/aliyun-oss-php-sdk/tree/v2.7.1" }, - "time": "2022-08-03T08:06:01+00:00" + "time": "2024-02-28T11:22:18+00:00" }, { "name": "czproject/git-php", @@ -105,30 +105,30 @@ }, { "name": "doctrine/annotations", - "version": "1.14.3", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af" + "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", - "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f", + "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f", "shasum": "" }, "require": { - "doctrine/lexer": "^1 || ^2", + "doctrine/lexer": "^2 || ^3", "ext-tokenizer": "*", - "php": "^7.1 || ^8.0", + "php": "^7.2 || ^8.0", "psr/cache": "^1 || ^2 || ^3" }, "require-dev": { - "doctrine/cache": "^1.11 || ^2.0", - "doctrine/coding-standard": "^9 || ^10", - "phpstan/phpstan": "~1.4.10 || ^1.8.0", + "doctrine/cache": "^2.0", + "doctrine/coding-standard": "^10", + "phpstan/phpstan": "^1.8.0", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "symfony/cache": "^4.4 || ^5.4 || ^6", + "symfony/cache": "^5.4 || ^6", "vimeo/psalm": "^4.10" }, "suggest": { @@ -175,22 +175,22 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/1.14.3" + "source": "https://github.com/doctrine/annotations/tree/2.0.1" }, - "time": "2023-02-01T09:20:38+00:00" + "time": "2023-02-02T22:02:53+00:00" }, { "name": "doctrine/deprecations", - "version": "v1.1.1", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3" + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", "shasum": "" }, "require": { @@ -222,22 +222,22 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.1.1" + "source": "https://github.com/doctrine/deprecations/tree/1.1.3" }, - "time": "2023-06-03T09:27:29+00:00" + "time": "2024-01-30T19:34:25+00:00" }, { "name": "doctrine/lexer", - "version": "2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124" + "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", - "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6", + "reference": "861c870e8b75f7c8f69c146c7f89cc1c0f1b49b6", "shasum": "" }, "require": { @@ -245,11 +245,11 @@ "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^10", + "doctrine/coding-standard": "^9 || ^12", "phpstan/phpstan": "^1.3", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6", "psalm/plugin-phpunit": "^0.18.3", - "vimeo/psalm": "^4.11 || ^5.0" + "vimeo/psalm": "^4.11 || ^5.21" }, "type": "library", "autoload": { @@ -286,7 +286,7 @@ ], "support": { "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/2.1.0" + "source": "https://github.com/doctrine/lexer/tree/2.1.1" }, "funding": [ { @@ -302,24 +302,24 @@ "type": "tidelift" } ], - "time": "2022-12-14T08:49:07+00:00" + "time": "2024-02-05T11:35:39+00:00" }, { "name": "ezyang/htmlpurifier", - "version": "v4.16.0", + "version": "v4.17.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8" + "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8", - "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/bbc513d79acf6691fa9cf10f192c90dd2957f18c", + "reference": "bbc513d79acf6691fa9cf10f192c90dd2957f18c", "shasum": "" }, "require": { - "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0" }, "require-dev": { "cerdic/css-tidy": "^1.7 || ^2.0", @@ -361,22 +361,22 @@ ], "support": { "issues": "https://github.com/ezyang/htmlpurifier/issues", - "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0" + "source": "https://github.com/ezyang/htmlpurifier/tree/v4.17.0" }, - "time": "2022-09-18T07:06:19+00:00" + "time": "2023-11-17T15:01:25+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "7.8.0", + "version": "7.8.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9" + "reference": "41042bc7ab002487b876a0683fc8dce04ddce104" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1110f66a6530a40fe7aea0378fe608ee2b2248f9", - "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/41042bc7ab002487b876a0683fc8dce04ddce104", + "reference": "41042bc7ab002487b876a0683fc8dce04ddce104", "shasum": "" }, "require": { @@ -391,11 +391,11 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", + "bamarni/composer-bin-plugin": "^1.8.2", "ext-curl": "*", "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", "php-http/message-factory": "^1.1", - "phpunit/phpunit": "^8.5.29 || ^9.5.23", + "phpunit/phpunit": "^8.5.36 || ^9.6.15", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -473,7 +473,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.8.0" + "source": "https://github.com/guzzle/guzzle/tree/7.8.1" }, "funding": [ { @@ -489,28 +489,28 @@ "type": "tidelift" } ], - "time": "2023-08-27T10:20:53+00:00" + "time": "2023-12-03T20:35:24+00:00" }, { "name": "guzzlehttp/promises", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "111166291a0f8130081195ac4556a5587d7f1b5d" + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d", - "reference": "111166291a0f8130081195ac4556a5587d7f1b5d", + "url": "https://api.github.com/repos/guzzle/promises/zipball/bbff78d96034045e58e13dedd6ad91b5d1253223", + "reference": "bbff78d96034045e58e13dedd6ad91b5d1253223", "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", - "phpunit/phpunit": "^8.5.29 || ^9.5.23" + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.36 || ^9.6.15" }, "type": "library", "extra": { @@ -556,7 +556,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.1" + "source": "https://github.com/guzzle/promises/tree/2.0.2" }, "funding": [ { @@ -572,20 +572,20 @@ "type": "tidelift" } ], - "time": "2023-08-03T15:11:55+00:00" + "time": "2023-12-03T20:19:20+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.6.1", + "version": "2.6.2", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727" + "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/be45764272e8873c72dbe3d2edcfdfcc3bc9f727", - "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/45b30f99ac27b5ca93cb4831afe16285f57b8221", + "reference": "45b30f99ac27b5ca93cb4831afe16285f57b8221", "shasum": "" }, "require": { @@ -599,9 +599,9 @@ "psr/http-message-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.8.1", + "bamarni/composer-bin-plugin": "^1.8.2", "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.29 || ^9.5.23" + "phpunit/phpunit": "^8.5.36 || ^9.6.15" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -672,7 +672,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.6.1" + "source": "https://github.com/guzzle/psr7/tree/2.6.2" }, "funding": [ { @@ -688,7 +688,7 @@ "type": "tidelift" } ], - "time": "2023-08-27T10:13:57+00:00" + "time": "2023-12-03T20:05:35+00:00" }, { "name": "iidestiny/flysystem-oss", @@ -748,16 +748,16 @@ }, { "name": "league/flysystem", - "version": "3.16.0", + "version": "3.27.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "4fdf372ca6b63c6e281b1c01a624349ccb757729" + "reference": "4729745b1ab737908c7d055148c9a6b3e959832f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4fdf372ca6b63c6e281b1c01a624349ccb757729", - "reference": "4fdf372ca6b63c6e281b1c01a624349ccb757729", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4729745b1ab737908c7d055148c9a6b3e959832f", + "reference": "4729745b1ab737908c7d055148c9a6b3e959832f", "shasum": "" }, "require": { @@ -775,9 +775,9 @@ "symfony/http-client": "<5.2" }, "require-dev": { - "async-aws/s3": "^1.5", - "async-aws/simple-s3": "^1.1", - "aws/aws-sdk-php": "^3.220.0", + "async-aws/s3": "^1.5 || ^2.0", + "async-aws/simple-s3": "^1.1 || ^2.0", + "aws/aws-sdk-php": "^3.295.10", "composer/semver": "^3.0", "ext-fileinfo": "*", "ext-ftp": "*", @@ -785,10 +785,10 @@ "friendsofphp/php-cs-fixer": "^3.5", "google/cloud-storage": "^1.23", "microsoft/azure-storage-blob": "^1.1", - "phpseclib/phpseclib": "^3.0.14", - "phpstan/phpstan": "^0.12.26", + "phpseclib/phpseclib": "^3.0.36", + "phpstan/phpstan": "^1.10", "phpunit/phpunit": "^9.5.11|^10.0", - "sabre/dav": "^4.3.1" + "sabre/dav": "^4.6.0" }, "type": "library", "autoload": { @@ -822,7 +822,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.16.0" + "source": "https://github.com/thephpleague/flysystem/tree/3.27.0" }, "funding": [ { @@ -834,20 +834,20 @@ "type": "github" } ], - "time": "2023-09-07T19:22:17+00:00" + "time": "2024-04-07T19:17:50+00:00" }, { "name": "league/flysystem-local", - "version": "3.16.0", + "version": "3.25.1", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-local.git", - "reference": "ec7383f25642e6fd4bb0c9554fc2311245391781" + "reference": "61a6a90d6e999e4ddd9ce5adb356de0939060b92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/ec7383f25642e6fd4bb0c9554fc2311245391781", - "reference": "ec7383f25642e6fd4bb0c9554fc2311245391781", + "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/61a6a90d6e999e4ddd9ce5adb356de0939060b92", + "reference": "61a6a90d6e999e4ddd9ce5adb356de0939060b92", "shasum": "" }, "require": { @@ -881,8 +881,7 @@ "local" ], "support": { - "issues": "https://github.com/thephpleague/flysystem-local/issues", - "source": "https://github.com/thephpleague/flysystem-local/tree/3.16.0" + "source": "https://github.com/thephpleague/flysystem-local/tree/3.25.1" }, "funding": [ { @@ -894,20 +893,20 @@ "type": "github" } ], - "time": "2023-08-30T10:23:59+00:00" + "time": "2024-03-15T19:58:44+00:00" }, { "name": "league/mime-type-detection", - "version": "1.13.0", + "version": "1.15.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96" + "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/a6dfb1194a2946fcdc1f38219445234f65b35c96", - "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301", + "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301", "shasum": "" }, "require": { @@ -938,7 +937,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.13.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.15.0" }, "funding": [ { @@ -950,7 +949,7 @@ "type": "tidelift" } ], - "time": "2023-08-05T12:09:49+00:00" + "time": "2024-01-28T23:22:08+00:00" }, { "name": "maennchen/zipstream-php", @@ -1202,21 +1201,21 @@ }, { "name": "overtrue/flysystem-cos", - "version": "5.1.4", + "version": "5.1.8", "source": { "type": "git", "url": "https://github.com/overtrue/flysystem-cos.git", - "reference": "bbcfe9195e96a9d5262c79fdb1e57820d45dd664" + "reference": "9a8f2eba21d7c869b7f53798a5329f55e0a7e42f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/overtrue/flysystem-cos/zipball/bbcfe9195e96a9d5262c79fdb1e57820d45dd664", - "reference": "bbcfe9195e96a9d5262c79fdb1e57820d45dd664", + "url": "https://api.github.com/repos/overtrue/flysystem-cos/zipball/9a8f2eba21d7c869b7f53798a5329f55e0a7e42f", + "reference": "9a8f2eba21d7c869b7f53798a5329f55e0a7e42f", "shasum": "" }, "require": { "league/flysystem": "^3.0", - "overtrue/qcloud-cos-client": "^2.0", + "overtrue/qcloud-cos-client": "^2.1.4", "php": ">=8.0.2" }, "require-dev": { @@ -1257,7 +1256,7 @@ "description": "Flysystem adapter for the QCloud COS storage.", "support": { "issues": "https://github.com/overtrue/flysystem-cos/issues", - "source": "https://github.com/overtrue/flysystem-cos/tree/5.1.4" + "source": "https://github.com/overtrue/flysystem-cos/tree/5.1.8" }, "funding": [ { @@ -1265,20 +1264,20 @@ "type": "github" } ], - "time": "2023-05-26T09:00:43+00:00" + "time": "2023-12-18T06:08:54+00:00" }, { "name": "overtrue/flysystem-qiniu", - "version": "3.2.2", + "version": "3.2.3", "source": { "type": "git", "url": "https://github.com/overtrue/flysystem-qiniu.git", - "reference": "cf87e0fd74ba80736c7e0e9d19e1422eee6617d2" + "reference": "5e04ac38be53b57345c56e02973fc4224db776e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/overtrue/flysystem-qiniu/zipball/cf87e0fd74ba80736c7e0e9d19e1422eee6617d2", - "reference": "cf87e0fd74ba80736c7e0e9d19e1422eee6617d2", + "url": "https://api.github.com/repos/overtrue/flysystem-qiniu/zipball/5e04ac38be53b57345c56e02973fc4224db776e6", + "reference": "5e04ac38be53b57345c56e02973fc4224db776e6", "shasum": "" }, "require": { @@ -1320,7 +1319,7 @@ "description": "Flysystem adapter for the Qiniu storage.", "support": { "issues": "https://github.com/overtrue/flysystem-qiniu/issues", - "source": "https://github.com/overtrue/flysystem-qiniu/tree/3.2.2" + "source": "https://github.com/overtrue/flysystem-qiniu/tree/3.2.3" }, "funding": [ { @@ -1328,20 +1327,20 @@ "type": "github" } ], - "time": "2023-05-02T13:14:45+00:00" + "time": "2023-12-21T14:40:53+00:00" }, { "name": "overtrue/qcloud-cos-client", - "version": "2.0.2", + "version": "2.1.5", "source": { "type": "git", "url": "https://github.com/overtrue/qcloud-cos-client.git", - "reference": "238ef94beb0f856336e3cedd93b21c1c42228540" + "reference": "637e0367e8f8504452c257ef3d6c73c84ae2dfb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/overtrue/qcloud-cos-client/zipball/238ef94beb0f856336e3cedd93b21c1c42228540", - "reference": "238ef94beb0f856336e3cedd93b21c1c42228540", + "url": "https://api.github.com/repos/overtrue/qcloud-cos-client/zipball/637e0367e8f8504452c257ef3d6c73c84ae2dfb5", + "reference": "637e0367e8f8504452c257ef3d6c73c84ae2dfb5", "shasum": "" }, "require": { @@ -1393,7 +1392,7 @@ "description": "Client of QCloud.com COS", "support": { "issues": "https://github.com/overtrue/qcloud-cos-client/issues", - "source": "https://github.com/overtrue/qcloud-cos-client/tree/2.0.2" + "source": "https://github.com/overtrue/qcloud-cos-client/tree/2.1.5" }, "funding": [ { @@ -1401,7 +1400,7 @@ "type": "github" } ], - "time": "2023-08-16T08:56:32+00:00" + "time": "2024-04-10T07:16:55+00:00" }, { "name": "phpoffice/phpspreadsheet", @@ -1612,16 +1611,16 @@ }, { "name": "psr/http-client", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31" + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31", - "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", "shasum": "" }, "require": { @@ -1658,9 +1657,9 @@ "psr-18" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/1.0.2" + "source": "https://github.com/php-fig/http-client" }, - "time": "2023-04-10T20:12:12+00:00" + "time": "2023-09-23T14:17:50+00:00" }, { "name": "psr/http-factory", @@ -1873,16 +1872,16 @@ }, { "name": "qiniu/php-sdk", - "version": "v7.11.0", + "version": "v7.12.1", "source": { "type": "git", "url": "https://github.com/qiniu/php-sdk.git", - "reference": "9ee81f0acd57fa7bb435ffe9e515d7a9fdd0489b" + "reference": "88952a65e97b4c2fae3f954bc4419ba14e42f154" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/9ee81f0acd57fa7bb435ffe9e515d7a9fdd0489b", - "reference": "9ee81f0acd57fa7bb435ffe9e515d7a9fdd0489b", + "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/88952a65e97b4c2fae3f954bc4419ba14e42f154", + "reference": "88952a65e97b4c2fae3f954bc4419ba14e42f154", "shasum": "" }, "require": { @@ -1925,9 +1924,9 @@ ], "support": { "issues": "https://github.com/qiniu/php-sdk/issues", - "source": "https://github.com/qiniu/php-sdk/tree/v7.11.0" + "source": "https://github.com/qiniu/php-sdk/tree/v7.12.1" }, - "time": "2023-09-05T12:33:39+00:00" + "time": "2024-03-12T07:03:12+00:00" }, { "name": "ralouphie/getallheaders", @@ -2093,16 +2092,16 @@ }, { "name": "topthink/framework", - "version": "v8.0.2", + "version": "v8.0.3", "source": { "type": "git", "url": "https://github.com/top-think/framework.git", - "reference": "6477942f80090a7f3d194197765ca1217a7aab87" + "reference": "5e59fb1e2bcb400c6f82e99d1a40dd058afc8563" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/framework/zipball/6477942f80090a7f3d194197765ca1217a7aab87", - "reference": "6477942f80090a7f3d194197765ca1217a7aab87", + "url": "https://api.github.com/repos/top-think/framework/zipball/5e59fb1e2bcb400c6f82e99d1a40dd058afc8563", + "reference": "5e59fb1e2bcb400c6f82e99d1a40dd058afc8563", "shasum": "" }, "require": { @@ -2111,8 +2110,8 @@ "php": ">=8.0.0", "psr/container": "^2.0", "psr/http-message": "^1.0", - "psr/log": "^3.0", - "psr/simple-cache": "^3.0", + "psr/log": "^1.0|^2.0|^3.0", + "psr/simple-cache": "^1.0|^2.0|^3.0", "topthink/think-helper": "^3.1", "topthink/think-orm": "^3.0" }, @@ -2152,9 +2151,9 @@ ], "support": { "issues": "https://github.com/top-think/framework/issues", - "source": "https://github.com/top-think/framework/tree/v8.0.2" + "source": "https://github.com/top-think/framework/tree/v8.0.3" }, - "time": "2023-08-15T03:05:55+00:00" + "time": "2023-10-17T08:31:52+00:00" }, { "name": "topthink/think-captcha", @@ -2305,16 +2304,16 @@ }, { "name": "topthink/think-orm", - "version": "v3.0.13", + "version": "v3.0.14", "source": { "type": "git", "url": "https://github.com/top-think/think-orm.git", - "reference": "e676e172d54055266005986d05685bdac5ac66b7" + "reference": "7b0b8ea6ca5e020217f6ba7ae34d547e148a675b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/think-orm/zipball/e676e172d54055266005986d05685bdac5ac66b7", - "reference": "e676e172d54055266005986d05685bdac5ac66b7", + "url": "https://api.github.com/repos/top-think/think-orm/zipball/7b0b8ea6ca5e020217f6ba7ae34d547e148a675b", + "reference": "7b0b8ea6ca5e020217f6ba7ae34d547e148a675b", "shasum": "" }, "require": { @@ -2354,24 +2353,24 @@ ], "support": { "issues": "https://github.com/top-think/think-orm/issues", - "source": "https://github.com/top-think/think-orm/tree/v3.0.13" + "source": "https://github.com/top-think/think-orm/tree/v3.0.14" }, - "time": "2023-09-01T09:08:49+00:00" + "time": "2023-09-24T13:15:07+00:00" } ], "packages-dev": [ { "name": "symfony/polyfill-mbstring", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "42292d99c55abe617799667f454222c54c60e229" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", - "reference": "42292d99c55abe617799667f454222c54c60e229", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { @@ -2385,9 +2384,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -2425,7 +2421,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -2441,196 +2437,36 @@ "type": "tidelift" } ], - "time": "2023-07-28T09:04:16+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.28.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179", - "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-01-26T09:26:14+00:00" - }, - { - "name": "symfony/polyfill-php80", - "version": "v1.28.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.4.47", + "version": "v6.0.19", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "1069c7a3fca74578022fab6f81643248d02f8e63" + "reference": "eb980457fa6899840fe1687e8627a03a7d8a3d52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1069c7a3fca74578022fab6f81643248d02f8e63", - "reference": "1069c7a3fca74578022fab6f81643248d02f8e63", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/eb980457fa6899840fe1687e8627a03a7d8a3d52", + "reference": "eb980457fa6899840fe1687e8627a03a7d8a3d52", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php72": "~1.5", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.0.2", + "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", - "symfony/console": "<3.4" + "phpunit/phpunit": "<5.4.3", + "symfony/console": "<5.4" }, "require-dev": { "ext-iconv": "*", - "symfony/console": "^3.4|^4.0|^5.0", - "symfony/process": "^4.4|^5.0", - "twig/twig": "^1.43|^2.13|^3.0.4" + "symfony/console": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0", + "symfony/uid": "^5.4|^6.0", + "twig/twig": "^2.13|^3.0.4" }, "suggest": { "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", @@ -2673,7 +2509,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v4.4.47" + "source": "https://github.com/symfony/var-dumper/tree/v6.0.19" }, "funding": [ { @@ -2689,7 +2525,7 @@ "type": "tidelift" } ], - "time": "2022-10-03T15:15:11+00:00" + "time": "2023-01-20T17:44:14+00:00" } ], "aliases": [], @@ -2699,7 +2535,8 @@ "prefer-lowest": false, "platform": { "php": ">=8.0.0", - "ext-json": "*" + "ext-json": "*", + "ext-fileinfo": "*" }, "platform-dev": [], "plugin-api-version": "2.3.0" diff --git a/extend/base/admin/service/adminUpdateData/tips.php b/extend/base/admin/service/adminUpdateData/tips.php index 340e0af..fdfb2b4 100644 --- a/extend/base/admin/service/adminUpdateData/tips.php +++ b/extend/base/admin/service/adminUpdateData/tips.php @@ -30,4 +30,11 @@ return [ '可以运行 php think admin:update:code --update-version v2.0.74 命令自动替换', ], ], + [ + 'version' => 'v2.0.100', + 'desc' => [ + '本次更新了注解的版本,修复了节点更新的bug,请手动更新注解库,可执行以下命令:', + 'composer require "doctrine/annotations:2.*"', + ], + ], ]; diff --git a/extend/base/admin/service/node/NodeBase.php b/extend/base/admin/service/node/NodeBase.php index af6f263..9392af7 100644 --- a/extend/base/admin/service/node/NodeBase.php +++ b/extend/base/admin/service/node/NodeBase.php @@ -60,7 +60,6 @@ class NodeBase list($nodeList, $controllerList) = [[], $this->getControllerList()]; if (!empty($controllerList)) { - AnnotationRegistry::registerLoader('class_exists'); $parser = new DocParser(); $parser->setIgnoreNotImportedAnnotations(true); $reader = new AnnotationReader($parser); diff --git a/extend/base/admin/traits/CurdTraitBase.php b/extend/base/admin/traits/CurdTraitBase.php index 38a85af..67562c0 100644 --- a/extend/base/admin/traits/CurdTraitBase.php +++ b/extend/base/admin/traits/CurdTraitBase.php @@ -11,7 +11,7 @@ use app\admin\service\annotation\NodeAnotation; trait CurdTraitBase { /** - * @NodeAnotation(title="列表") + * @\app\admin\service\annotation\NodeAnotation(title="列表") */ public function index() { @@ -44,7 +44,7 @@ trait CurdTraitBase } /** - * @NodeAnotation(title="添加") + * @\app\admin\service\annotation\NodeAnotation(title="添加") */ public function add() { @@ -64,7 +64,7 @@ trait CurdTraitBase } /** - * @NodeAnotation(title="编辑") + * @\app\admin\service\annotation\NodeAnotation(title="编辑") */ public function edit($id) { @@ -87,7 +87,7 @@ trait CurdTraitBase } /** - * @NodeAnotation(title="删除") + * @\app\admin\service\annotation\NodeAnotation(title="删除") */ public function delete($id) { @@ -103,7 +103,7 @@ trait CurdTraitBase } /** - * @NodeAnotation(title="导出") + * @\app\admin\service\annotation\NodeAnotation(title="导出") */ public function export() { @@ -131,7 +131,7 @@ trait CurdTraitBase } /** - * @NodeAnotation(title="属性修改") + * @\app\admin\service\annotation\NodeAnotation(title="属性修改") */ public function modify() { diff --git a/extend/base/common/command/admin/VersionBase.php b/extend/base/common/command/admin/VersionBase.php index 4d07d04..ddf772f 100644 --- a/extend/base/common/command/admin/VersionBase.php +++ b/extend/base/common/command/admin/VersionBase.php @@ -12,12 +12,12 @@ use think\console\Output; class VersionBase extends Command { - public const VERSION = 'v2.0.99'; + public const VERSION = 'v2.0.100'; public const LAYUI_VERSION = '2.8.17'; public const COMMENT = [ - '优化tableData;新增dataGet;', + '更新注解版本;', '发布新版本', ];