From cddd0d08c9bf4c7cc587cd4920ad5ed602242834 Mon Sep 17 00:00:00 2001 From: augushong Date: Wed, 14 Dec 2022 10:40:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7TP6.1;=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E4=B8=8A=E4=BC=A0=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 +- .../service/initAdminData/SystemConfig.php | 7 + app/admin/view/system/config/upload.html | 7 + composer.json | 9 +- composer.lock | 2318 +++++++++-------- config/filesystem.php | 9 +- extend/think/filesystem/driver/Alioss.php | 19 +- extend/think/filesystem/driver/Qiniu.php | 14 +- extend/think/filesystem/driver/Txcos.php | 35 +- 9 files changed, 1319 insertions(+), 1103 deletions(-) diff --git a/.gitignore b/.gitignore index 90fa80c..66db195 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,6 @@ runtime ul.db /app/tools/controller/Install.php /app/common/command/curd/migrate_output.php -/dist \ No newline at end of file +/dist +/composer.lock +/public/storage \ No newline at end of file diff --git a/app/admin/service/initAdminData/SystemConfig.php b/app/admin/service/initAdminData/SystemConfig.php index 1c7e1d8..0aec58e 100644 --- a/app/admin/service/initAdminData/SystemConfig.php +++ b/app/admin/service/initAdminData/SystemConfig.php @@ -231,6 +231,13 @@ $ul_system_config = array( "remark" => "访问域名", "sort" => 0, ), + array( + "name" => "txcos_appid", + "group" => "upload", + "value" => "填你的", + "remark" => "APPID", + "sort" => 0, + ), array( "name" => "file", "group" => "site", diff --git a/app/admin/view/system/config/upload.html b/app/admin/view/system/config/upload.html index e9e807b..7f23569 100644 --- a/app/admin/view/system/config/upload.html +++ b/app/admin/view/system/config/upload.html @@ -71,6 +71,13 @@ +
+ +
+ + 开发者访问 COS 服务时拥有的用户维度唯一资源标识，用以标识资源，可在 API 密钥管理 页面获取 +
+
diff --git a/composer.json b/composer.json index 6cfb792..d27055d 100644 --- a/composer.json +++ b/composer.json @@ -27,10 +27,11 @@ "guzzlehttp/guzzle": "^7.4", "phpoffice/phpspreadsheet": "^1.22", "topthink/think-migration": "^3.0", - "overtrue/flysystem-qiniu": "*", - "xxtime/flysystem-aliyun-oss": "^1.5", - "chunpat/flysystem-tencent-cos": "^0.0.1", - "doctrine/annotations": "^1.13" + "doctrine/annotations": "^1.13", + "topthink/think-filesystem": "^2.0", + "overtrue/flysystem-qiniu": "^2.0", + "overtrue/flysystem-cos": "^4.0", + "iidestiny/flysystem-oss": "^3.0" }, "require-dev": { "symfony/var-dumper": "^4.2" diff --git a/composer.lock b/composer.lock index 91eef6c..f648b09 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,27 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b891b8bf24dd134097273cb805ddae06", + "content-hash": "2f70d3d45abefcd76fcd580ff470fe80", "packages": [ { "name": "aliyuncs/oss-sdk-php", - "version": "v2.5.0", + "version": "v2.6.0", "source": { "type": "git", "url": "https://github.com/aliyun/aliyun-oss-php-sdk.git", - "reference": "f0413667d765855eb0aaa728b596801464ffdb06" + "reference": "572d0f8e099e8630ae7139ed3fdedb926c7a760f" }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/aliyuncs/oss-sdk-php/v2.5.0/aliyuncs-oss-sdk-php-v2.5.0.zip", - "reference": "f0413667d765855eb0aaa728b596801464ffdb06", - "shasum": "" + "url": "https://api.github.com/repos/aliyun/aliyun-oss-php-sdk/zipball/572d0f8e099e8630ae7139ed3fdedb926c7a760f", + "reference": "572d0f8e099e8630ae7139ed3fdedb926c7a760f", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3" @@ -33,6 +39,7 @@ "OSS\\": "src/OSS" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -44,79 +51,56 @@ ], "description": "Aliyun OSS SDK for PHP", "homepage": "http://www.aliyun.com/product/oss/", - "time": "2022-05-13T07:41:28+00:00" - }, - { - "name": "chunpat/flysystem-tencent-cos", - "version": "0.0.1", - "source": { - "type": "git", - "url": "https://github.com/chunpat/flysystem-tencent-cos.git", - "reference": "ef53f4aea50614055b4ea785e742a09a011b9c0c" + "support": { + "issues": "https://github.com/aliyun/aliyun-oss-php-sdk/issues", + "source": "https://github.com/aliyun/aliyun-oss-php-sdk/tree/v2.6.0" }, - "dist": { - "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/chunpat/flysystem-tencent-cos/0.0.1/chunpat-flysystem-tencent-cos-0.0.1.zip", - "reference": "ef53f4aea50614055b4ea785e742a09a011b9c0c", - "shasum": "" - }, - "require": { - "league/flysystem": "^1.0", - "php": ">=7.1.0", - "qcloud/cos-sdk-v5": "^2.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Chunpat\\FlysystemTencentCos\\": "src" - } - }, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "chunpat", - "email": "chunpat@163.com" - } - ], - "description": "Package description here.", - "time": "2020-06-22T17:18:34+00:00" + "time": "2022-08-03T08:06:01+00:00" }, { "name": "doctrine/annotations", - "version": "1.13.3", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "648b0343343565c4a056bfc8392201385e8d89f0" + "reference": "3587ab58646bc515b2e03bbd3cfcd3682e8df5bf" }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/doctrine/annotations/1.13.3/doctrine-annotations-1.13.3.zip", - "reference": "648b0343343565c4a056bfc8392201385e8d89f0", - "shasum": "" + "url": "https://api.github.com/repos/doctrine/annotations/zipball/3587ab58646bc515b2e03bbd3cfcd3682e8df5bf", + "reference": "3587ab58646bc515b2e03bbd3cfcd3682e8df5bf", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { - "doctrine/lexer": "1.*", + "doctrine/lexer": "^1 || ^2", "ext-tokenizer": "*", "php": "^7.1 || ^8.0", "psr/cache": "^1 || ^2 || ^3" }, "require-dev": { "doctrine/cache": "^1.11 || ^2.0", - "doctrine/coding-standard": "^6.0 || ^8.1", - "phpstan/phpstan": "^1.4.10 || ^1.8.0", - "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", - "symfony/cache": "^4.4 || ^5.2", + "doctrine/coding-standard": "^9 || ^10", + "phpstan/phpstan": "~1.4.10 || ^1.8.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "symfony/cache": "^4.4 || ^5.4 || ^6", "vimeo/psalm": "^4.10" }, + "suggest": { + "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations" + }, "type": "library", "autoload": { "psr-4": { "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -149,37 +133,99 @@ "docblock", "parser" ], - "time": "2022-07-02T10:48:51+00:00" + "support": { + "issues": "https://github.com/doctrine/annotations/issues", + "source": "https://github.com/doctrine/annotations/tree/1.14.0" + }, + "time": "2022-12-11T18:25:48+00:00" }, { - "name": "doctrine/lexer", - "version": "1.2.3", + "name": "doctrine/deprecations", + "version": "v1.0.0", "source": { "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229" + "url": "https://github.com/doctrine/deprecations.git", + "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/doctrine/lexer/1.2.3/doctrine-lexer-1.2.3.zip", - "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229", - "shasum": "" + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { - "php": "^7.1 || ^8.0" + "php": "^7.1|^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9.0", - "phpstan/phpstan": "^1.3", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.11" + "doctrine/coding-standard": "^9", + "phpunit/phpunit": "^7.5|^8.5|^9.5", + "psr/log": "^1|^2|^3" + }, + "suggest": { + "psr/log": "Allows logging deprecations via PSR-3 logger implementation" }, "type": "library", "autoload": { "psr-4": { - "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" + "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" } }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.", + "homepage": "https://www.doctrine-project.org/", + "support": { + "issues": "https://github.com/doctrine/deprecations/issues", + "source": "https://github.com/doctrine/deprecations/tree/v1.0.0" + }, + "time": "2022-05-02T15:47:09+00:00" + }, + { + "name": "doctrine/lexer", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/lexer.git", + "reference": "3cf140b81e55d5d640f73367d829db7e3023ef69" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/3cf140b81e55d5d640f73367d829db7e3023ef69", + "reference": "3cf140b81e55d5d640f73367d829db7e3023ef69", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "doctrine/deprecations": "^1.0", + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9 || ^10", + "phpstan/phpstan": "^1.3", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "^0.18.3", + "vimeo/psalm": "^4.11 || ^5.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\Lexer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -206,6 +252,10 @@ "parser", "php" ], + "support": { + "issues": "https://github.com/doctrine/lexer/issues", + "source": "https://github.com/doctrine/lexer/tree/2.0.0" + }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -220,24 +270,40 @@ "type": "tidelift" } ], - "time": "2022-02-28T11:07:21+00:00" + "time": "2022-12-11T10:51:23+00:00" }, { "name": "ezyang/htmlpurifier", - "version": "v4.14.0", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75" + "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8" }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/ezyang/htmlpurifier/v4.14.0/ezyang-htmlpurifier-v4.14.0.zip", - "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75", - "shasum": "" + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8", + "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { - "php": ">=5.2" + "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" + }, + "require-dev": { + "cerdic/css-tidy": "^1.7 || ^2.0", + "simpletest/simpletest": "dev-master" + }, + "suggest": { + "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.", + "ext-bcmath": "Used for unit conversion and imagecrash protection", + "ext-iconv": "Converts text to and from non-UTF-8 encodings", + "ext-tidy": "Used for pretty-printing HTML" }, "type": "library", "autoload": { @@ -251,6 +317,7 @@ "/library/HTMLPurifier/Language/" ] }, + "notification-url": "https://packagist.org/downloads/", "license": [ "LGPL-2.1-or-later" ], @@ -266,20 +333,24 @@ "keywords": [ "html" ], - "time": "2021-12-25T01:21:49+00:00" + "support": { + "issues": "https://github.com/ezyang/htmlpurifier/issues", + "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0" + }, + "time": "2022-09-18T07:06:19+00:00" }, { - "name": "guzzlehttp/command", - "version": "1.2.2", + "name": "guzzlehttp/guzzle", + "version": "7.5.0", "source": { "type": "git", - "url": "https://github.com/guzzle/command.git", - "reference": "7883359e0ecab8a8f7c43aad2fc36360a35d21e8" + "url": "https://github.com/guzzle/guzzle.git", + "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/command/zipball/7883359e0ecab8a8f7c43aad2fc36360a35d21e8", - "reference": "7883359e0ecab8a8f7c43aad2fc36360a35d21e8", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba", + "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba", "shasum": "", "mirrors": [ { @@ -288,87 +359,6 @@ } ] }, - "require": { - "guzzlehttp/guzzle": "^7.4.1", - "guzzlehttp/promises": "^1.5.1", - "guzzlehttp/psr7": "^1.8.3 || ^2.1", - "php": "^7.2.5 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^8.5.19" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2-dev" - } - }, - "autoload": { - "psr-4": { - "GuzzleHttp\\Command\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Jeremy Lindblom", - "email": "jeremeamia@gmail.com", - "homepage": "https://github.com/jeremeamia" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" - } - ], - "description": "Provides the foundation for building command-based web service clients", - "support": { - "issues": "https://github.com/guzzle/command/issues", - "source": "https://github.com/guzzle/command/tree/1.2.2" - }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/command", - "type": "tidelift" - } - ], - "time": "2022-02-08T10:21:14+00:00" - }, - { - "name": "guzzlehttp/guzzle", - "version": "7.4.5", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82" - }, - "dist": { - "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/guzzlehttp/guzzle/7.4.5/guzzlehttp-guzzle-7.4.5.zip", - "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", - "shasum": "" - }, "require": { "ext-json": "*", "guzzlehttp/promises": "^1.5", @@ -381,10 +371,10 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", + "bamarni/composer-bin-plugin": "^1.8.1", "ext-curl": "*", "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^8.5.5 || ^9.3.5", + "phpunit/phpunit": "^8.5.29 || ^9.5.23", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -394,8 +384,12 @@ }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + }, "branch-alias": { - "dev-master": "7.4-dev" + "dev-master": "7.5-dev" } }, "autoload": { @@ -406,6 +400,7 @@ "GuzzleHttp\\": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -458,6 +453,10 @@ "rest", "web service" ], + "support": { + "issues": "https://github.com/guzzle/guzzle/issues", + "source": "https://github.com/guzzle/guzzle/tree/7.5.0" + }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -472,111 +471,20 @@ "type": "tidelift" } ], - "time": "2022-06-20T22:16:13+00:00" - }, - { - "name": "guzzlehttp/guzzle-services", - "version": "1.3.2", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle-services.git", - "reference": "4989d902dd4e0411b320e851c46f3c94d652d891" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle-services/zipball/4989d902dd4e0411b320e851c46f3c94d652d891", - "reference": "4989d902dd4e0411b320e851c46f3c94d652d891", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "guzzlehttp/command": "^1.2.2", - "guzzlehttp/guzzle": "^7.4.1", - "guzzlehttp/psr7": "^1.8.3 || ^2.1", - "guzzlehttp/uri-template": "^1.0.1", - "php": "^7.2.5 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^8.5.19 || ^9.5.8" - }, - "suggest": { - "gimler/guzzle-description-loader": "^0.0.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, - "autoload": { - "psr-4": { - "GuzzleHttp\\Command\\Guzzle\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "Stefano Kowalke", - "email": "blueduck@mail.org", - "homepage": "https://github.com/Konafets" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" - } - ], - "description": "Provides an implementation of the Guzzle Command library that uses Guzzle service descriptions to describe web services, serialize requests, and parse responses into easy to use model structures.", - "support": { - "issues": "https://github.com/guzzle/guzzle-services/issues", - "source": "https://github.com/guzzle/guzzle-services/tree/1.3.2" - }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle-services", - "type": "tidelift" - } - ], - "time": "2022-03-03T11:21:34+00:00" + "time": "2022-08-28T15:39:27+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.1", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" + "reference": "b94b2807d85443f9719887892882d0329d1e2598" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", + "reference": "b94b2807d85443f9719887892882d0329d1e2598", "shasum": "", "mirrors": [ { @@ -637,7 +545,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.1" + "source": "https://github.com/guzzle/promises/tree/1.5.2" }, "funding": [ { @@ -653,20 +561,20 @@ "type": "tidelift" } ], - "time": "2021-10-22T20:56:57+00:00" + "time": "2022-08-28T14:55:35+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.4.0", + "version": "2.4.3", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "13388f00956b1503577598873fffb5ae994b5737" + "reference": "67c26b443f348a51926030c83481b85718457d3d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737", - "reference": "13388f00956b1503577598873fffb5ae994b5737", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d", + "reference": "67c26b443f348a51926030c83481b85718457d3d", "shasum": "", "mirrors": [ { @@ -686,15 +594,19 @@ "psr/http-message-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", + "bamarni/composer-bin-plugin": "^1.8.1", "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.8 || ^9.3.10" + "phpunit/phpunit": "^8.5.29 || ^9.5.23" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + }, "branch-alias": { "dev-master": "2.4-dev" } @@ -758,7 +670,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.4.0" + "source": "https://github.com/guzzle/psr7/tree/2.4.3" }, "funding": [ { @@ -774,20 +686,20 @@ "type": "tidelift" } ], - "time": "2022-06-20T21:43:11+00:00" + "time": "2022-10-26T14:07:24+00:00" }, { - "name": "guzzlehttp/uri-template", - "version": "v1.0.1", + "name": "iidestiny/flysystem-oss", + "version": "3.1", "source": { "type": "git", - "url": "https://github.com/guzzle/uri-template.git", - "reference": "b945d74a55a25a949158444f09ec0d3c120d69e2" + "url": "https://github.com/iiDestiny/flysystem-oss.git", + "reference": "9fff308b9bcb47f7d5021c0741a8fbcf463cef9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/uri-template/zipball/b945d74a55a25a949158444f09ec0d3c120d69e2", - "reference": "b945d74a55a25a949158444f09ec0d3c120d69e2", + "url": "https://api.github.com/repos/iiDestiny/flysystem-oss/zipball/9fff308b9bcb47f7d5021c0741a8fbcf463cef9e", + "reference": "9fff308b9bcb47f7d5021c0741a8fbcf463cef9e", "shasum": "", "mirrors": [ { @@ -797,22 +709,22 @@ ] }, "require": { - "php": "^7.2.5 || ^8.0", - "symfony/polyfill-php80": "^1.17" + "aliyuncs/oss-sdk-php": "^2.4", + "ext-curl": "*", + "ext-json": "*", + "ext-openssl": "*", + "league/flysystem": "^2.0", + "php": ">=7.2" }, "require-dev": { - "phpunit/phpunit": "^8.5.19 || ^9.5.8", - "uri-template/tests": "1.0.0" + "mockery/mockery": "^1.2", + "phpunit/phpunit": "^6.5", + "symfony/var-dumper": "^3.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, "autoload": { "psr-4": { - "GuzzleHttp\\UriTemplate\\": "src" + "Iidestiny\\Flysystem\\Oss\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -821,185 +733,114 @@ ], "authors": [ { - "name": "Graham Campbell", - "email": "hello@gjcampbell.co.uk", - "homepage": "https://github.com/GrahamCampbell" - }, - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, - { - "name": "George Mponos", - "email": "gmponos@gmail.com", - "homepage": "https://github.com/gmponos" - }, - { - "name": "Tobias Nyholm", - "email": "tobias.nyholm@gmail.com", - "homepage": "https://github.com/Nyholm" + "name": "iidestiny", + "email": "iidestiny@vip.qq.com" } ], - "description": "A polyfill class for uri_template of PHP", + "description": "Flysystem adapter for the Oss storage.", "keywords": [ - "guzzlehttp", - "uri-template" + "alioss", + "laravel", + "oss", + "阿里oss" ], "support": { - "issues": "https://github.com/guzzle/uri-template/issues", - "source": "https://github.com/guzzle/uri-template/tree/v1.0.1" + "issues": "https://github.com/iiDestiny/flysystem-oss/issues", + "source": "https://github.com/iiDestiny/flysystem-oss/tree/3.1" }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/uri-template", - "type": "tidelift" - } - ], - "time": "2021-10-07T12:57:01+00:00" + "time": "2022-04-19T05:39:46+00:00" }, { "name": "league/flysystem", - "version": "1.1.9", + "version": "2.5.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "094defdb4a7001845300334e7c1ee2335925ef99" + "reference": "8aaffb653c5777781b0f7f69a5d937baf7ab6cdb" }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/league/flysystem/1.1.9/league-flysystem-1.1.9.zip", - "reference": "094defdb4a7001845300334e7c1ee2335925ef99", - "shasum": "" + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/8aaffb653c5777781b0f7f69a5d937baf7ab6cdb", + "reference": "8aaffb653c5777781b0f7f69a5d937baf7ab6cdb", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { - "ext-fileinfo": "*", - "league/mime-type-detection": "^1.3", - "php": "^7.2.5 || ^8.0" + "ext-json": "*", + "league/mime-type-detection": "^1.0.0", + "php": "^7.2 || ^8.0" }, "conflict": { - "league/flysystem-sftp": "<1.0.6" + "guzzlehttp/ringphp": "<1.1.1" }, "require-dev": { - "phpspec/prophecy": "^1.11.1", - "phpunit/phpunit": "^8.5.8" - }, - "suggest": { - "ext-ftp": "Allows you to use FTP server storage", - "ext-openssl": "Allows you to use FTPS server storage", - "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2", - "league/flysystem-aws-s3-v3": "Allows you to use S3 storage with AWS SDK v3", - "league/flysystem-azure": "Allows you to use Windows Azure Blob storage", - "league/flysystem-cached-adapter": "Flysystem adapter decorator for metadata caching", - "league/flysystem-eventable-filesystem": "Allows you to use EventableFilesystem", - "league/flysystem-rackspace": "Allows you to use Rackspace Cloud Files", - "league/flysystem-sftp": "Allows you to use SFTP server storage via phpseclib", - "league/flysystem-webdav": "Allows you to use WebDAV storage", - "league/flysystem-ziparchive": "Allows you to use ZipArchive adapter", - "spatie/flysystem-dropbox": "Allows you to use Dropbox storage", - "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications" + "async-aws/s3": "^1.5", + "async-aws/simple-s3": "^1.0", + "aws/aws-sdk-php": "^3.132.4", + "composer/semver": "^3.0", + "ext-fileinfo": "*", + "ext-ftp": "*", + "friendsofphp/php-cs-fixer": "^3.2", + "google/cloud-storage": "^1.23", + "phpseclib/phpseclib": "^2.0", + "phpstan/phpstan": "^0.12.26", + "phpunit/phpunit": "^8.5 || ^9.4", + "sabre/dav": "^4.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, "autoload": { "psr-4": { - "League\\Flysystem\\": "src/" + "League\\Flysystem\\": "src" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { "name": "Frank de Jonge", - "email": "info@frenky.net" + "email": "info@frankdejonge.nl" } ], - "description": "Filesystem abstraction: Many filesystems, one API.", + "description": "File storage abstraction for PHP", "keywords": [ - "Cloud Files", "WebDAV", - "abstraction", "aws", "cloud", - "copy.com", - "dropbox", - "file systems", + "file", "files", "filesystem", "filesystems", "ftp", - "rackspace", - "remote", "s3", "sftp", "storage" ], + "support": { + "issues": "https://github.com/thephpleague/flysystem/issues", + "source": "https://github.com/thephpleague/flysystem/tree/2.5.0" + }, "funding": [ { - "url": "https://offset.earth/frankdejonge", - "type": "other" - } - ], - "time": "2021-12-09T09:40:50+00:00" - }, - { - "name": "league/flysystem-cached-adapter", - "version": "1.1.0", - "source": { - "type": "git", - "url": "https://github.com/thephpleague/flysystem-cached-adapter.git", - "reference": "d1925efb2207ac4be3ad0c40b8277175f99ffaff" - }, - "dist": { - "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/league/flysystem-cached-adapter/1.1.0/league-flysystem-cached-adapter-1.1.0.zip", - "reference": "d1925efb2207ac4be3ad0c40b8277175f99ffaff", - "shasum": "" - }, - "require": { - "league/flysystem": "~1.0", - "psr/cache": "^1.0.0" - }, - "require-dev": { - "mockery/mockery": "~0.9", - "phpspec/phpspec": "^3.4", - "phpunit/phpunit": "^5.7", - "predis/predis": "~1.0", - "tedivm/stash": "~0.12" - }, - "suggest": { - "ext-phpredis": "Pure C implemented extension for PHP" - }, - "type": "library", - "autoload": { - "psr-4": { - "League\\Flysystem\\Cached\\": "src/" - } - }, - "license": [ - "MIT" - ], - "authors": [ + "url": "https://ecologi.com/frankdejonge", + "type": "custom" + }, { - "name": "frankdejonge", - "email": "info@frenky.net" + "url": "https://github.com/frankdejonge", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/league/flysystem", + "type": "tidelift" } ], - "description": "An adapter decorator to enable meta-data caching.", - "time": "2020-07-25T15:56:04+00:00" + "time": "2022-09-17T21:02:32+00:00" }, { "name": "league/mime-type-detection", @@ -1011,9 +852,15 @@ }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/league/mime-type-detection/1.11.0/league-mime-type-detection-1.11.0.zip", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd", "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "ext-fileinfo": "*", @@ -1030,6 +877,7 @@ "League\\MimeTypeDetection\\": "src" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1040,6 +888,10 @@ } ], "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.11.0" + }, "funding": [ { "url": "https://github.com/frankdejonge", @@ -1054,17 +906,23 @@ }, { "name": "maennchen/zipstream-php", - "version": "2.2.1", + "version": "2.2.6", "source": { "type": "git", "url": "https://github.com/maennchen/ZipStream-PHP.git", - "reference": "211e9ba1530ea5260b45d90c9ea252f56ec52729" + "reference": "30ad6f93cf3efe4192bc7a4c9cad11ff8f4f237f" }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/maennchen/zipstream-php/2.2.1/maennchen-zipstream-php-2.2.1.zip", - "reference": "211e9ba1530ea5260b45d90c9ea252f56ec52729", - "shasum": "" + "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/30ad6f93cf3efe4192bc7a4c9cad11ff8f4f237f", + "reference": "30ad6f93cf3efe4192bc7a4c9cad11ff8f4f237f", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "myclabs/php-enum": "^1.5", @@ -1074,6 +932,7 @@ }, "require-dev": { "ext-zip": "*", + "friendsofphp/php-cs-fixer": "^3.9", "guzzlehttp/guzzle": "^6.5.3 || ^7.2.0", "mikey179/vfsstream": "^1.6", "php-coveralls/php-coveralls": "^2.4", @@ -1086,6 +945,7 @@ "ZipStream\\": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1112,36 +972,50 @@ "stream", "zip" ], + "support": { + "issues": "https://github.com/maennchen/ZipStream-PHP/issues", + "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.2.6" + }, "funding": [ + { + "url": "https://github.com/maennchen", + "type": "github" + }, { "url": "https://opencollective.com/zipstream", "type": "open_collective" } ], - "time": "2022-05-18T15:52:06+00:00" + "time": "2022-11-25T18:57:19+00:00" }, { "name": "markbaker/complex", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/MarkBaker/PHPComplex.git", - "reference": "ab8bc271e404909db09ff2d5ffa1e538085c0f22" + "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9" }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/markbaker/complex/3.0.1/markbaker-complex-3.0.1.zip", - "reference": "ab8bc271e404909db09ff2d5ffa1e538085c0f22", - "shasum": "" + "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/95c56caa1cf5c766ad6d65b6344b807c1e8405b9", + "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "phpcompatibility/php-compatibility": "^9.0", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.3", - "squizlabs/php_codesniffer": "^3.4" + "dealerdirect/phpcodesniffer-composer-installer": "dev-master", + "phpcompatibility/php-compatibility": "^9.3", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "squizlabs/php_codesniffer": "^3.7" }, "type": "library", "autoload": { @@ -1149,6 +1023,7 @@ "Complex\\": "classes/src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1164,34 +1039,44 @@ "complex", "mathematics" ], - "time": "2021-06-29T15:32:53+00:00" + "support": { + "issues": "https://github.com/MarkBaker/PHPComplex/issues", + "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.2" + }, + "time": "2022-12-06T16:21:08+00:00" }, { "name": "markbaker/matrix", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/MarkBaker/PHPMatrix.git", - "reference": "c66aefcafb4f6c269510e9ac46b82619a904c576" + "reference": "728434227fe21be27ff6d86621a1b13107a2562c" }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/markbaker/matrix/3.0.0/markbaker-matrix-3.0.0.zip", - "reference": "c66aefcafb4f6c269510e9ac46b82619a904c576", - "shasum": "" + "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/728434227fe21be27ff6d86621a1b13107a2562c", + "reference": "728434227fe21be27ff6d86621a1b13107a2562c", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", - "phpcompatibility/php-compatibility": "^9.0", + "dealerdirect/phpcodesniffer-composer-installer": "dev-master", + "phpcompatibility/php-compatibility": "^9.3", "phpdocumentor/phpdocumentor": "2.*", "phploc/phploc": "^4.0", "phpmd/phpmd": "2.*", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.3", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", "sebastian/phpcpd": "^4.0", - "squizlabs/php_codesniffer": "^3.4" + "squizlabs/php_codesniffer": "^3.7" }, "type": "library", "autoload": { @@ -1199,6 +1084,7 @@ "Matrix\\": "classes/src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1215,7 +1101,11 @@ "matrix", "vector" ], - "time": "2021-07-01T19:01:15+00:00" + "support": { + "issues": "https://github.com/MarkBaker/PHPMatrix/issues", + "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.1" + }, + "time": "2022-12-02T22:17:43+00:00" }, { "name": "myclabs/php-enum", @@ -1227,9 +1117,15 @@ }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/myclabs/php-enum/1.8.3/myclabs-php-enum-1.8.3.zip", + "url": "https://api.github.com/repos/myclabs/php-enum/zipball/b942d263c641ddb5190929ff840c68f78713e937", "reference": "b942d263c641ddb5190929ff840c68f78713e937", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "ext-json": "*", @@ -1246,6 +1142,7 @@ "MyCLabs\\Enum\\": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1260,6 +1157,10 @@ "keywords": [ "enum" ], + "support": { + "issues": "https://github.com/myclabs/php-enum/issues", + "source": "https://github.com/myclabs/php-enum/tree/1.8.3" + }, "funding": [ { "url": "https://github.com/mnapoli", @@ -1273,27 +1174,104 @@ "time": "2021-07-05T08:18:36+00:00" }, { - "name": "overtrue/flysystem-qiniu", - "version": "1.0.6", + "name": "overtrue/flysystem-cos", + "version": "4.0.1", "source": { "type": "git", - "url": "https://github.com/overtrue/flysystem-qiniu.git", - "reference": "4aad39d76cad4d3a0fd2afa32eb132201f1bf7e7" + "url": "https://github.com/overtrue/flysystem-cos.git", + "reference": "d86e1d5f3f7a881c672a698fbdfa08a767b3ea38" }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/overtrue/flysystem-qiniu/1.0.6/overtrue-flysystem-qiniu-1.0.6.zip", - "reference": "4aad39d76cad4d3a0fd2afa32eb132201f1bf7e7", - "shasum": "" + "url": "https://api.github.com/repos/overtrue/flysystem-cos/zipball/d86e1d5f3f7a881c672a698fbdfa08a767b3ea38", + "reference": "d86e1d5f3f7a881c672a698fbdfa08a767b3ea38", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { - "league/flysystem": "^1.0", - "php": ">=5.5.9", + "league/flysystem": "^2.0", + "overtrue/qcloud-cos-client": "^1.0.0", + "php": ">=7.4" + }, + "require-dev": { + "brainmaestro/composer-git-hooks": "^2.7", + "friendsofphp/php-cs-fixer": "^2.15", + "mockery/mockery": "~1.0", + "phpunit/phpunit": "~9" + }, + "type": "library", + "extra": { + "hooks": { + "pre-commit": [ + "composer test", + "composer check-style" + ], + "pre-push": [ + "composer test", + "composer check-style" + ] + } + }, + "autoload": { + "psr-4": { + "Overtrue\\Flysystem\\Cos\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "overtrue", + "email": "i@overtrue.me" + } + ], + "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/4.0.1" + }, + "funding": [ + { + "url": "https://github.com/overtrue", + "type": "github" + } + ], + "time": "2021-11-10T09:20:45+00:00" + }, + { + "name": "overtrue/flysystem-qiniu", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/overtrue/flysystem-qiniu.git", + "reference": "8d997760cff8967d9d6861d359c404f8ec6aa316" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/overtrue/flysystem-qiniu/zipball/8d997760cff8967d9d6861d359c404f8ec6aa316", + "reference": "8d997760cff8967d9d6861d359c404f8ec6aa316", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "league/flysystem": "^2.0", + "php": ">=7.2", "qiniu/php-sdk": "^7.2" }, "require-dev": { "mockery/mockery": "1.3.1", - "php": ">=5.6.0", "phpunit/phpunit": "~8.0" }, "type": "library", @@ -1302,6 +1280,7 @@ "Overtrue\\Flysystem\\Qiniu\\": "src" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1312,27 +1291,114 @@ } ], "description": "Flysystem adapter for the Qiniu storage.", + "support": { + "issues": "https://github.com/overtrue/flysystem-qiniu/issues", + "source": "https://github.com/overtrue/flysystem-qiniu/tree/2.0.1" + }, "funding": [ { "url": "https://github.com/overtrue", "type": "github" } ], - "time": "2022-06-22T03:11:40+00:00" + "time": "2022-08-12T03:23:12+00:00" }, { - "name": "phpoffice/phpspreadsheet", - "version": "1.24.0", + "name": "overtrue/qcloud-cos-client", + "version": "1.0.4", "source": { "type": "git", - "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "ebe8745c92a7cac4514d040758393b5399633b83" + "url": "https://github.com/overtrue/qcloud-cos-client.git", + "reference": "64ca47881afe4fd0961958f85674dcae71421913" }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/phpoffice/phpspreadsheet/1.24.0/phpoffice-phpspreadsheet-1.24.0.zip", - "reference": "ebe8745c92a7cac4514d040758393b5399633b83", - "shasum": "" + "url": "https://api.github.com/repos/overtrue/qcloud-cos-client/zipball/64ca47881afe4fd0961958f85674dcae71421913", + "reference": "64ca47881afe4fd0961958f85674dcae71421913", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-simplexml": "*", + "guzzlehttp/guzzle": "^7.2", + "php": ">=7.4", + "psr/http-message": "^1.0" + }, + "require-dev": { + "brainmaestro/composer-git-hooks": "^2.7", + "friendsofphp/php-cs-fixer": "^3.4.0", + "mockery/mockery": "^1.0", + "monolog/monolog": "^2.1", + "phpunit/phpunit": "^9.0" + }, + "type": "library", + "extra": { + "hooks": { + "pre-commit": [ + "composer test", + "composer check-style" + ], + "pre-push": [ + "composer test", + "composer check-style" + ] + } + }, + "autoload": { + "psr-4": { + "Overtrue\\CosClient\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "overtrue", + "email": "anzhengchao@gmail.com" + } + ], + "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/1.0.4" + }, + "funding": [ + { + "url": "https://github.com/overtrue", + "type": "github" + } + ], + "time": "2022-11-07T00:18:25+00:00" + }, + { + "name": "phpoffice/phpspreadsheet", + "version": "1.25.2", + "source": { + "type": "git", + "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", + "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a317a09e7def49852400a4b3eca4a4b0790ceeb5", + "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "ext-ctype": "*", @@ -1348,33 +1414,34 @@ "ext-xmlwriter": "*", "ext-zip": "*", "ext-zlib": "*", - "ezyang/htmlpurifier": "^4.13", + "ezyang/htmlpurifier": "^4.15", "maennchen/zipstream-php": "^2.1", "markbaker/complex": "^3.0", "markbaker/matrix": "^3.0", "php": "^7.3 || ^8.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/simple-cache": "^1.0 || ^2.0" + "psr/simple-cache": "^1.0 || ^2.0 || ^3.0" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "dev-master", "dompdf/dompdf": "^1.0 || ^2.0", "friendsofphp/php-cs-fixer": "^3.2", - "jpgraph/jpgraph": "^4.0", + "mitoteam/jpgraph": "10.2.4", "mpdf/mpdf": "8.1.1", "phpcompatibility/php-compatibility": "^9.3", "phpstan/phpstan": "^1.1", "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^8.5 || ^9.0", "squizlabs/php_codesniffer": "^3.7", - "tecnickcom/tcpdf": "^6.4" + "tecnickcom/tcpdf": "6.5" }, "suggest": { - "dompdf/dompdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)", - "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", + "dompdf/dompdf": "Option for rendering PDF with PDF Writer", + "ext-intl": "PHP Internationalization Functions", + "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", "mpdf/mpdf": "Option for rendering PDF with PDF Writer", - "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)" + "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer" }, "type": "library", "autoload": { @@ -1382,6 +1449,7 @@ "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1417,7 +1485,11 @@ "xls", "xlsx" ], - "time": "2022-07-09T13:49:09+00:00" + "support": { + "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", + "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.25.2" + }, + "time": "2022-09-25T17:21:01+00:00" }, { "name": "psr/cache", @@ -1429,9 +1501,15 @@ }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/psr/cache/1.0.1/psr-cache-1.0.1.zip", + "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3.0" @@ -1447,6 +1525,7 @@ "Psr\\Cache\\": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1462,6 +1541,9 @@ "psr", "psr-6" ], + "support": { + "source": "https://github.com/php-fig/cache/tree/master" + }, "time": "2016-08-06T20:24:11+00:00" }, { @@ -1474,9 +1556,15 @@ }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/psr/container/1.1.2/psr-container-1.1.2.zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=7.4.0" @@ -1487,6 +1575,7 @@ "Psr\\Container\\": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1505,6 +1594,10 @@ "container-interop", "psr" ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/1.1.2" + }, "time": "2021-11-05T16:50:12+00:00" }, { @@ -1517,9 +1610,15 @@ }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/psr/http-client/1.0.1/psr-http-client-1.0.1.zip", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": "^7.0 || ^8.0", @@ -1536,6 +1635,7 @@ "Psr\\Http\\Client\\": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1553,6 +1653,9 @@ "psr", "psr-18" ], + "support": { + "source": "https://github.com/php-fig/http-client/tree/master" + }, "time": "2020-06-29T06:28:15+00:00" }, { @@ -1685,9 +1788,15 @@ }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/psr/log/1.1.4/psr-log-1.1.4.zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", "reference": "d49695b909c3b7628b6289db5479a1c204601f11", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3.0" @@ -1703,6 +1812,7 @@ "Psr\\Log\\": "Psr/Log/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1719,6 +1829,9 @@ "psr", "psr-3" ], + "support": { + "source": "https://github.com/php-fig/log/tree/1.1.4" + }, "time": "2021-05-03T11:20:27+00:00" }, { @@ -1731,9 +1844,15 @@ }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/psr/simple-cache/1.0.1/psr-simple-cache-1.0.1.zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3.0" @@ -1749,6 +1868,7 @@ "Psr\\SimpleCache\\": "src/" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1766,80 +1886,10 @@ "psr-16", "simple-cache" ], - "time": "2017-10-23T01:57:42+00:00" - }, - { - "name": "qcloud/cos-sdk-v5", - "version": "v2.5.6", - "source": { - "type": "git", - "url": "https://github.com/tencentyun/cos-php-sdk-v5.git", - "reference": "607ee49d372a799964206b6ae0a9eb2816201c42" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tencentyun/cos-php-sdk-v5/zipball/607ee49d372a799964206b6ae0a9eb2816201c42", - "reference": "607ee49d372a799964206b6ae0a9eb2816201c42", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "ext-curl": "*", - "ext-json": "*", - "ext-simplexml": "*", - "guzzlehttp/guzzle": "^6.2.1 || ^7.0", - "guzzlehttp/guzzle-services": "^1.1", - "guzzlehttp/psr7": "^1.3.1 || ^2.0", - "php": ">=5.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.4-dev" - } - }, - "autoload": { - "files": [ - "src/Common.php" - ], - "psr-4": { - "Qcloud\\Cos\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "yaozongyou", - "email": "yaozongyou@vip.qq.com" - }, - { - "name": "lewzylu", - "email": "327874225@qq.com" - }, - { - "name": "tuunalai", - "email": "550566181@qq.com" - } - ], - "description": "PHP SDK for QCloud COS", - "keywords": [ - "cos", - "php", - "qcloud" - ], "support": { - "issues": "https://github.com/tencentyun/cos-php-sdk-v5/issues", - "source": "https://github.com/tencentyun/cos-php-sdk-v5/tree/v2.5.6" + "source": "https://github.com/php-fig/simple-cache/tree/master" }, - "time": "2022-06-07T14:49:19+00:00" + "time": "2017-10-23T01:57:42+00:00" }, { "name": "qiniu/php-sdk", @@ -1851,9 +1901,15 @@ }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/qiniu/php-sdk/v7.4.1/qiniu-php-sdk-v7.4.1.zip", + "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/10c7ead8357743b4b987a335c14964fb07700d57", "reference": "10c7ead8357743b4b987a335c14964fb07700d57", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=5.3.3" @@ -1872,6 +1928,7 @@ "Qiniu\\": "src/Qiniu" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1890,6 +1947,10 @@ "sdk", "storage" ], + "support": { + "issues": "https://github.com/qiniu/php-sdk/issues", + "source": "https://github.com/qiniu/php-sdk/tree/v7.4.1" + }, "time": "2021-09-24T09:39:16+00:00" }, { @@ -1952,9 +2013,15 @@ }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/symfony/deprecation-contracts/v2.5.2/symfony-deprecation-contracts-v2.5.2.zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "shasum": "" + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=7.1" @@ -1974,6 +2041,7 @@ "function.php" ] }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1989,6 +2057,9 @@ ], "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -2007,17 +2078,23 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/symfony/polyfill-mbstring/v1.26.0/symfony-polyfill-mbstring-v1.26.0.zip", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", - "shasum": "" + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=7.1" @@ -2031,7 +2108,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2046,6 +2123,7 @@ "Symfony\\Polyfill\\Mbstring\\": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2068,6 +2146,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -2082,20 +2163,525 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { - "name": "symfony/polyfill-php80", - "version": "v1.26.0", + "name": "topthink/framework", + "version": "v6.1.1", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" + "url": "https://github.com/top-think/framework.git", + "reference": "2cb56f3e6f3c479fe90ea5f28d38d3b5ef6c4210" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "url": "https://api.github.com/repos/top-think/framework/zipball/2cb56f3e6f3c479fe90ea5f28d38d3b5ef6c4210", + "reference": "2cb56f3e6f3c479fe90ea5f28d38d3b5ef6c4210", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "ext-json": "*", + "ext-mbstring": "*", + "php": ">=7.2.5", + "psr/container": "~1.0", + "psr/http-message": "^1.0", + "psr/log": "~1.0", + "psr/simple-cache": "^1.0", + "topthink/think-helper": "^3.1.1", + "topthink/think-orm": "^2.0" + }, + "require-dev": { + "guzzlehttp/psr7": "^2.1.0", + "mikey179/vfsstream": "^1.6", + "mockery/mockery": "^1.2", + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "autoload": { + "files": [], + "psr-4": { + "think\\": "src/think/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "liu21st", + "email": "liu21st@gmail.com" + }, + { + "name": "yunwuxin", + "email": "448901948@qq.com" + } + ], + "description": "The ThinkPHP Framework.", + "homepage": "http://thinkphp.cn/", + "keywords": [ + "framework", + "orm", + "thinkphp" + ], + "support": { + "issues": "https://github.com/top-think/framework/issues", + "source": "https://github.com/top-think/framework/tree/v6.1.1" + }, + "time": "2022-10-26T03:48:53+00:00" + }, + { + "name": "topthink/think-captcha", + "version": "v3.0.8", + "source": { + "type": "git", + "url": "https://github.com/top-think/think-captcha.git", + "reference": "52fba122c953995bec3013c635025172491ae299" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/top-think/think-captcha/zipball/52fba122c953995bec3013c635025172491ae299", + "reference": "52fba122c953995bec3013c635025172491ae299", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "topthink/framework": "^6.0" + }, + "type": "library", + "extra": { + "think": { + "services": [ + "think\\captcha\\CaptchaService" + ], + "config": { + "captcha": "src/config.php" + } + } + }, + "autoload": { + "files": [ + "src/helper.php" + ], + "psr-4": { + "think\\captcha\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "yunwuxin", + "email": "448901948@qq.com" + } + ], + "description": "captcha package for thinkphp", + "support": { + "issues": "https://github.com/top-think/think-captcha/issues", + "source": "https://github.com/top-think/think-captcha/tree/v3.0.8" + }, + "time": "2022-10-26T07:59:42+00:00" + }, + { + "name": "topthink/think-filesystem", + "version": "v2.0.0", + "source": { + "type": "git", + "url": "https://github.com/top-think/think-filesystem.git", + "reference": "63e525fd74f451b2df1df060c3194e9b6e724730" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/top-think/think-filesystem/zipball/63e525fd74f451b2df1df060c3194e9b6e724730", + "reference": "63e525fd74f451b2df1df060c3194e9b6e724730", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "league/flysystem": "^2.0", + "topthink/framework": "^6.1" + }, + "require-dev": { + "mikey179/vfsstream": "^1.6", + "mockery/mockery": "^1.2", + "phpunit/phpunit": "^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "think\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "yunwuxin", + "email": "448901948@qq.com" + } + ], + "description": "The ThinkPHP6.1 Filesystem Package", + "support": { + "issues": "https://github.com/top-think/think-filesystem/issues", + "source": "https://github.com/top-think/think-filesystem/tree/v2.0.0" + }, + "time": "2022-10-26T04:51:41+00:00" + }, + { + "name": "topthink/think-helper", + "version": "v3.1.6", + "source": { + "type": "git", + "url": "https://github.com/top-think/think-helper.git", + "reference": "769acbe50a4274327162f9c68ec2e89a38eb2aff" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/top-think/think-helper/zipball/769acbe50a4274327162f9c68ec2e89a38eb2aff", + "reference": "769acbe50a4274327162f9c68ec2e89a38eb2aff", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "php": ">=7.1.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.5" + }, + "type": "library", + "autoload": { + "files": [ + "src/helper.php" + ], + "psr-4": { + "think\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "yunwuxin", + "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/v3.1.6" + }, + "time": "2021-12-15T04:27:55+00:00" + }, + { + "name": "topthink/think-migration", + "version": "v3.0.3", + "source": { + "type": "git", + "url": "https://github.com/top-think/think-migration.git", + "reference": "5717d9e5f3ea745f6dbfd1e30b4402aaadff9a79" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/top-think/think-migration/zipball/5717d9e5f3ea745f6dbfd1e30b4402aaadff9a79", + "reference": "5717d9e5f3ea745f6dbfd1e30b4402aaadff9a79", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "topthink/framework": "^6.0.0", + "topthink/think-helper": "^3.0.3" + }, + "require-dev": { + "fzaninotto/faker": "^1.8" + }, + "suggest": { + "fzaninotto/faker": "Required to use the factory builder (^1.8)." + }, + "type": "library", + "extra": { + "think": { + "services": [ + "think\\migration\\Service" + ] + } + }, + "autoload": { + "psr-4": { + "Phinx\\": "phinx/src/Phinx", + "think\\migration\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "yunwuxin", + "email": "448901948@qq.com" + } + ], + "support": { + "issues": "https://github.com/top-think/think-migration/issues", + "source": "https://github.com/top-think/think-migration/tree/v3.0.3" + }, + "time": "2020-12-07T05:54:22+00:00" + }, + { + "name": "topthink/think-multi-app", + "version": "v1.0.15", + "source": { + "type": "git", + "url": "https://github.com/top-think/think-multi-app.git", + "reference": "387e0dac059c20f92cac5da41a871e10829c1c97" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/top-think/think-multi-app/zipball/387e0dac059c20f92cac5da41a871e10829c1c97", + "reference": "387e0dac059c20f92cac5da41a871e10829c1c97", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "php": ">=7.1.0", + "topthink/framework": "^6.0" + }, + "type": "library", + "extra": { + "think": { + "services": [ + "think\\app\\Service" + ] + } + }, + "autoload": { + "psr-4": { + "think\\app\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "liu21st", + "email": "liu21st@gmail.com" + } + ], + "description": "thinkphp6 multi app support", + "support": { + "issues": "https://github.com/top-think/think-multi-app/issues", + "source": "https://github.com/top-think/think-multi-app/tree/v1.0.15" + }, + "time": "2022-10-26T08:03:06+00:00" + }, + { + "name": "topthink/think-orm", + "version": "v2.0.54", + "source": { + "type": "git", + "url": "https://github.com/top-think/think-orm.git", + "reference": "97b061b47616301ff29fbd4c35ed9184e1162e4e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/top-think/think-orm/zipball/97b061b47616301ff29fbd4c35ed9184e1162e4e", + "reference": "97b061b47616301ff29fbd4c35ed9184e1162e4e", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "ext-json": "*", + "ext-pdo": "*", + "php": ">=7.1.0", + "psr/log": "^1.0|^2.0", + "psr/simple-cache": "^1.0|^2.0", + "topthink/think-helper": "^3.1" + }, + "require-dev": { + "phpunit/phpunit": "^7|^8|^9.5" + }, + "type": "library", + "autoload": { + "files": [ + "stubs/load_stubs.php" + ], + "psr-4": { + "think\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "liu21st", + "email": "liu21st@gmail.com" + } + ], + "description": "think orm", + "keywords": [ + "database", + "orm" + ], + "support": { + "issues": "https://github.com/top-think/think-orm/issues", + "source": "https://github.com/top-think/think-orm/tree/v2.0.54" + }, + "time": "2022-07-05T05:25:51+00:00" + }, + { + "name": "topthink/think-template", + "version": "v2.0.8", + "source": { + "type": "git", + "url": "https://github.com/top-think/think-template.git", + "reference": "abfc293f74f9ef5127b5c416310a01fe42e59368" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/top-think/think-template/zipball/abfc293f74f9ef5127b5c416310a01fe42e59368", + "reference": "abfc293f74f9ef5127b5c416310a01fe42e59368", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "php": ">=7.1.0", + "psr/simple-cache": "^1.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "think\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "liu21st", + "email": "liu21st@gmail.com" + } + ], + "description": "the php template engine", + "support": { + "issues": "https://github.com/top-think/think-template/issues", + "source": "https://github.com/top-think/think-template/tree/v2.0.8" + }, + "time": "2020-12-10T07:52:03+00:00" + }, + { + "name": "topthink/think-view", + "version": "v1.0.14", + "source": { + "type": "git", + "url": "https://github.com/top-think/think-view.git", + "reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/top-think/think-view/zipball/edce0ae2c9551ab65f9e94a222604b0dead3576d", + "reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "php": ">=7.1.0", + "topthink/think-template": "^2.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "think\\view\\driver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "liu21st", + "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" + }, + "time": "2019-11-06T11:40:13+00:00" + } + ], + "packages-dev": [ + { + "name": "symfony/polyfill-php72", + "version": "v1.27.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", "shasum": "", "mirrors": [ { @@ -2110,7 +2696,89 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-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.27.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": "2022-11-03T14:55:06+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.27.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2155,7 +2823,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" }, "funding": [ { @@ -2171,505 +2839,27 @@ "type": "tidelift" } ], - "time": "2022-05-10T07:21:04+00:00" - }, - { - "name": "topthink/framework", - "version": "v6.0.12", - "source": { - "type": "git", - "url": "https://github.com/top-think/framework.git", - "reference": "e478316ac843c1a884a3b3a7a94db17c4001ff5c" - }, - "dist": { - "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/topthink/framework/v6.0.12/topthink-framework-v6.0.12.zip", - "reference": "e478316ac843c1a884a3b3a7a94db17c4001ff5c", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-mbstring": "*", - "league/flysystem": "^1.1.4", - "league/flysystem-cached-adapter": "^1.0", - "php": ">=7.2.5", - "psr/container": "~1.0", - "psr/http-message": "^1.0", - "psr/log": "~1.0", - "psr/simple-cache": "^1.0", - "topthink/think-helper": "^3.1.1", - "topthink/think-orm": "^2.0" - }, - "require-dev": { - "guzzlehttp/psr7": "^2.1.0", - "mikey179/vfsstream": "^1.6", - "mockery/mockery": "^1.2", - "phpunit/phpunit": "^7.0" - }, - "type": "library", - "autoload": { - "files": [], - "psr-4": { - "think\\": "src/think/" - } - }, - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "liu21st", - "email": "liu21st@gmail.com" - }, - { - "name": "yunwuxin", - "email": "448901948@qq.com" - } - ], - "description": "The ThinkPHP Framework.", - "homepage": "http://thinkphp.cn/", - "keywords": [ - "framework", - "orm", - "thinkphp" - ], - "time": "2022-01-21T06:31:07+00:00" - }, - { - "name": "topthink/think-captcha", - "version": "v3.0.7", - "source": { - "type": "git", - "url": "https://github.com/top-think/think-captcha.git", - "reference": "a450602932a5d9ba183e288b79921ba3b9a92331" - }, - "dist": { - "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/topthink/think-captcha/v3.0.7/topthink-think-captcha-v3.0.7.zip", - "reference": "a450602932a5d9ba183e288b79921ba3b9a92331", - "shasum": "" - }, - "require": { - "topthink/framework": "^6.0.0" - }, - "type": "library", - "extra": { - "think": { - "services": [ - "think\\captcha\\CaptchaService" - ], - "config": { - "captcha": "src/config.php" - } - } - }, - "autoload": { - "files": [ - "src/helper.php" - ], - "psr-4": { - "think\\captcha\\": "src/" - } - }, - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "yunwuxin", - "email": "448901948@qq.com" - } - ], - "description": "captcha package for thinkphp", - "time": "2022-04-23T02:38:14+00:00" - }, - { - "name": "topthink/think-helper", - "version": "v3.1.6", - "source": { - "type": "git", - "url": "https://github.com/top-think/think-helper.git", - "reference": "769acbe50a4274327162f9c68ec2e89a38eb2aff" - }, - "dist": { - "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/topthink/think-helper/v3.1.6/topthink-think-helper-v3.1.6.zip", - "reference": "769acbe50a4274327162f9c68ec2e89a38eb2aff", - "shasum": "" - }, - "require": { - "php": ">=7.1.0" - }, - "require-dev": { - "phpunit/phpunit": "^9.5" - }, - "type": "library", - "autoload": { - "files": [ - "src/helper.php" - ], - "psr-4": { - "think\\": "src" - } - }, - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "yunwuxin", - "email": "448901948@qq.com" - } - ], - "description": "The ThinkPHP6 Helper Package", - "time": "2021-12-15T04:27:55+00:00" - }, - { - "name": "topthink/think-migration", - "version": "v3.0.3", - "source": { - "type": "git", - "url": "https://github.com/top-think/think-migration.git", - "reference": "5717d9e5f3ea745f6dbfd1e30b4402aaadff9a79" - }, - "dist": { - "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/topthink/think-migration/v3.0.3/topthink-think-migration-v3.0.3.zip", - "reference": "5717d9e5f3ea745f6dbfd1e30b4402aaadff9a79", - "shasum": "" - }, - "require": { - "topthink/framework": "^6.0.0", - "topthink/think-helper": "^3.0.3" - }, - "require-dev": { - "fzaninotto/faker": "^1.8" - }, - "suggest": { - "fzaninotto/faker": "Required to use the factory builder (^1.8)." - }, - "type": "library", - "extra": { - "think": { - "services": [ - "think\\migration\\Service" - ] - } - }, - "autoload": { - "psr-4": { - "Phinx\\": "phinx/src/Phinx", - "think\\migration\\": "src" - } - }, - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "yunwuxin", - "email": "448901948@qq.com" - } - ], - "time": "2020-12-07T05:54:22+00:00" - }, - { - "name": "topthink/think-multi-app", - "version": "v1.0.14", - "source": { - "type": "git", - "url": "https://github.com/top-think/think-multi-app.git", - "reference": "ccaad7c2d33f42cb1cc2a78d6610aaec02cea4c3" - }, - "dist": { - "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/topthink/think-multi-app/v1.0.14/topthink-think-multi-app-v1.0.14.zip", - "reference": "ccaad7c2d33f42cb1cc2a78d6610aaec02cea4c3", - "shasum": "" - }, - "require": { - "php": ">=7.1.0", - "topthink/framework": "^6.0.0" - }, - "type": "library", - "extra": { - "think": { - "services": [ - "think\\app\\Service" - ] - } - }, - "autoload": { - "psr-4": { - "think\\app\\": "src" - } - }, - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "liu21st", - "email": "liu21st@gmail.com" - } - ], - "description": "thinkphp6 multi app support", - "time": "2020-07-12T13:50:37+00:00" - }, - { - "name": "topthink/think-orm", - "version": "v2.0.53", - "source": { - "type": "git", - "url": "https://github.com/top-think/think-orm.git", - "reference": "06783eda65547a70ea686360a897759e1f873fff" - }, - "dist": { - "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/topthink/think-orm/v2.0.53/topthink-think-orm-v2.0.53.zip", - "reference": "06783eda65547a70ea686360a897759e1f873fff", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-pdo": "*", - "php": ">=7.1.0", - "psr/log": "~1.0", - "psr/simple-cache": "^1.0", - "topthink/think-helper": "^3.1" - }, - "require-dev": { - "phpunit/phpunit": "^7|^8|^9.5" - }, - "type": "library", - "autoload": { - "files": [ - "stubs/load_stubs.php" - ], - "psr-4": { - "think\\": "src" - } - }, - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "liu21st", - "email": "liu21st@gmail.com" - } - ], - "description": "think orm", - "keywords": [ - "database", - "orm" - ], - "time": "2022-02-28T14:54:22+00:00" - }, - { - "name": "topthink/think-template", - "version": "v2.0.8", - "source": { - "type": "git", - "url": "https://github.com/top-think/think-template.git", - "reference": "abfc293f74f9ef5127b5c416310a01fe42e59368" - }, - "dist": { - "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/topthink/think-template/v2.0.8/topthink-think-template-v2.0.8.zip", - "reference": "abfc293f74f9ef5127b5c416310a01fe42e59368", - "shasum": "" - }, - "require": { - "php": ">=7.1.0", - "psr/simple-cache": "^1.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "think\\": "src" - } - }, - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "liu21st", - "email": "liu21st@gmail.com" - } - ], - "description": "the php template engine", - "time": "2020-12-10T07:52:03+00:00" - }, - { - "name": "topthink/think-view", - "version": "v1.0.14", - "source": { - "type": "git", - "url": "https://github.com/top-think/think-view.git", - "reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d" - }, - "dist": { - "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/topthink/think-view/v1.0.14/topthink-think-view-v1.0.14.zip", - "reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d", - "shasum": "" - }, - "require": { - "php": ">=7.1.0", - "topthink/think-template": "^2.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "think\\view\\driver\\": "src" - } - }, - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "liu21st", - "email": "liu21st@gmail.com" - } - ], - "description": "thinkphp template driver", - "time": "2019-11-06T11:40:13+00:00" - }, - { - "name": "xxtime/flysystem-aliyun-oss", - "version": "1.5.0", - "source": { - "type": "git", - "url": "https://github.com/xxtime/flysystem-aliyun-oss.git", - "reference": "ae873b5919076157b9cfeaf39d2f56d2dbb39ee9" - }, - "dist": { - "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/xxtime/flysystem-aliyun-oss/1.5.0/xxtime-flysystem-aliyun-oss-1.5.0.zip", - "reference": "ae873b5919076157b9cfeaf39d2f56d2dbb39ee9", - "shasum": "" - }, - "require": { - "aliyuncs/oss-sdk-php": "~2.3", - "league/flysystem": "^1.0.49", - "php": ">=5.5.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Xxtime\\Flysystem\\Aliyun\\": "src/" - } - }, - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Joe", - "email": "joe@xxtime.com", - "homepage": "https://github.com/xxtime", - "role": "Developer" - } - ], - "description": "AliYun OSS adapter for flysystem. aliyuncs/oss-sdk-php ~2.3", - "homepage": "https://github.com/xxtime/flysystem-aliyun-oss", - "keywords": [ - "Flysystem", - "aliyun-oss", - "flysystem-aliyun-oss" - ], - "time": "2019-11-12T07:57:34+00:00" - } - ], - "packages-dev": [ - { - "name": "symfony/polyfill-php72", - "version": "v1.26.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" - }, - "dist": { - "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/symfony/polyfill-php72/v1.26.0/symfony-polyfill-php72-v1.26.0.zip", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.26-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - } - }, - "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" - ], - "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": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.4.42", + "version": "v4.4.47", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "742aab50ad097bcb62d91fccb613f66b8047d2ca" + "reference": "1069c7a3fca74578022fab6f81643248d02f8e63" }, "dist": { "type": "zip", - "url": "https://repo.huaweicloud.com/repository/php/symfony/var-dumper/v4.4.42/symfony-var-dumper-v4.4.42.zip", - "reference": "742aab50ad097bcb62d91fccb613f66b8047d2ca", - "shasum": "" + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1069c7a3fca74578022fab6f81643248d02f8e63", + "reference": "1069c7a3fca74578022fab6f81643248d02f8e63", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] }, "require": { "php": ">=7.1.3", @@ -2707,6 +2897,7 @@ "/Tests/" ] }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2726,6 +2917,9 @@ "debug", "dump" ], + "support": { + "source": "https://github.com/symfony/var-dumper/tree/v4.4.47" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -2740,7 +2934,7 @@ "type": "tidelift" } ], - "time": "2022-05-21T10:00:54+00:00" + "time": "2022-10-03T15:15:11+00:00" } ], "aliases": [], diff --git a/config/filesystem.php b/config/filesystem.php index 32d2b79..7b8b722 100644 --- a/config/filesystem.php +++ b/config/filesystem.php @@ -33,13 +33,16 @@ return [ 'visibility' => 'public', ], 'qnoss' => [ - 'type' => 'Qiniu' + 'type' => 'Qiniu', + 'visibility' => 'public', ], 'alioss' => [ - 'type' => 'Alioss' + 'type' => 'Alioss', + 'visibility' => 'public', ], 'txcos' => [ - 'type' => 'Txcos' + 'type' => 'Txcos', + 'visibility' => 'public', ], // 更多的磁盘配置信息 ], diff --git a/extend/think/filesystem/driver/Alioss.php b/extend/think/filesystem/driver/Alioss.php index 3b59e68..8986d50 100644 --- a/extend/think/filesystem/driver/Alioss.php +++ b/extend/think/filesystem/driver/Alioss.php @@ -2,24 +2,21 @@ namespace think\filesystem\driver; -use League\Flysystem\AdapterInterface; + +use Iidestiny\Flysystem\Oss\OssAdapter; +use League\Flysystem\FilesystemAdapter; use think\filesystem\Driver; -use Xxtime\Flysystem\Aliyun\OssAdapter; class Alioss extends Driver { - protected function createAdapter(): AdapterInterface + protected function createAdapter(): FilesystemAdapter { - $config = [ - 'accessId' => sysconfig('upload', 'alioss_access_key_id'), - 'accessSecret' => sysconfig('upload', 'alioss_access_key_secret'), - 'endpoint' => sysconfig('upload', 'alioss_endpoint'), - 'bucket' => sysconfig('upload', 'alioss_bucket'), - ]; - return new OssAdapter( - $config + sysconfig('upload', 'alioss_access_key_id'), + sysconfig('upload', 'alioss_access_key_secret'), + sysconfig('upload', 'alioss_endpoint'), + sysconfig('upload', 'alioss_bucket') ); } diff --git a/extend/think/filesystem/driver/Qiniu.php b/extend/think/filesystem/driver/Qiniu.php index 8b4b936..f715d83 100644 --- a/extend/think/filesystem/driver/Qiniu.php +++ b/extend/think/filesystem/driver/Qiniu.php @@ -1,19 +1,20 @@ concatPathToUrl(sysconfig('upload', 'qnoss_domain'), $path); } } - diff --git a/extend/think/filesystem/driver/Txcos.php b/extend/think/filesystem/driver/Txcos.php index 9116a84..f75ba64 100644 --- a/extend/think/filesystem/driver/Txcos.php +++ b/extend/think/filesystem/driver/Txcos.php @@ -2,33 +2,38 @@ namespace think\filesystem\driver;; -use League\Flysystem\AdapterInterface; -use Qcloud\Cos\Client; +use League\Flysystem\FilesystemAdapter; use think\filesystem\Driver; +use Overtrue\Flysystem\Cos\CosAdapter; class Txcos extends Driver { - protected function createAdapter(): AdapterInterface + protected function createAdapter(): FilesystemAdapter { + $appid = sysconfig('upload', 'txcos_appid'); $secretId = sysconfig('upload', 'txcos_secret_id'); $secretKey = sysconfig('upload', 'txcos_secret_key'); $region = sysconfig('upload', 'txcos_region'); //set a default bucket region 设置一个默认的存储桶地域 - $cosClient = new Client( - array( - 'region' => $region, - 'schema' => 'https', //协议头部，默认为http - 'credentials' => array( - 'secretId' => $secretId, - 'secretKey' => $secretKey - ), - 'signHost' => false - ) - ); $bucket = sysconfig('upload', 'txcos_bucket'); //存储桶名称 格式：BucketName-APPID + $config = [ + // 必填，app_id、secret_id、secret_key + // 可在个人秘钥管理页查看：https://console.cloud.tencent.com/capi + 'app_id' => $appid, + 'secret_id' => $secretId, + 'secret_key' => $secretKey, + 'region' => $region, + 'bucket' => $bucket, + // 可选，如果 bucket 为私有访问请打开此项 + 'signed_url' => false, + + // 可选，是否使用 https，默认 false + 'use_https' => true, + ]; + + $adapter = new CosAdapter($config); - $adapter = new \Chunpat\FlysystemTencentCos\Adapter($cosClient, $bucket); return $adapter; }