From c5a7ff11fa0770a83b967beab072e5e82e137296 Mon Sep 17 00:00:00 2001 From: wolfcode <37436228+wolf-leo@users.noreply.github.com> Date: Mon, 3 Jul 2023 23:58:29 +0800 Subject: [PATCH] update ThinkPHP --- composer.json | 118 +++++++++++++++++++++++++------------------------- composer.lock | 23 +++++----- 2 files changed, 71 insertions(+), 70 deletions(-) diff --git a/composer.json b/composer.json index 2cea2a8..52b97a4 100644 --- a/composer.json +++ b/composer.json @@ -1,62 +1,62 @@ { - "name": "wolfcode/easyadmin", - "description": "基于ThinkPHP8.0和layui的快速开发的后台管理系统。", - "type": "project", - "keywords": [ - "easyadmin", - "thinkphp", - "admin" - ], - "homepage": "http://easyadmin8.wolfcode.top/", - "license": "MIT", - "authors": [ - { - "name": "wolfcode", - "url": "https://github.com/wolf-leo/easyAdmin8" - } - ], - "require": { - "php": ">=8.0.0", - "topthink/framework": "8.0.x-dev", - "topthink/think-orm": "^3.0", - "topthink/think-multi-app": "^1.0", - "topthink/think-view": "^2.0", - "topthink/think-captcha": "^3.0", - "topthink/think-filesystem": "^2.0", - "aliyuncs/oss-sdk-php": "^2.3", - "qcloud/cos-sdk-v5": "^2.0", - "qiniu/php-sdk": "^7.2", - "alibabacloud/client": "^1.5", - "jianyan74/php-excel": "^1.0", - "doctrine/annotations": "^1.13", - "ext-json": "*" - }, - "require-dev": { - "symfony/var-dumper": "^4.2", - "eaglewu/swoole-ide-helper": "dev-master" - }, - "autoload": { - "psr-4": { - "app\\": "app" - }, - "psr-0": { - "": "extend/" - } - }, - "config": { - "preferred-install": "dist", - "secure-http": false - }, - "scripts": { - "post-autoload-dump": [ - "@php think service:discover", - "@php think vendor:publish" - ] - }, - "repositories": { - "packagist": { - "type": "composer", - "url": "https://mirrors.aliyun.com/composer/" - } + "name": "wolfcode/easyadmin8", + "url": "https://github.com/wolf-leo/easyAdmin8", + "description": "基于ThinkPHP8.0和Layui的快速开发的后台管理系统。", + "type": "project", + "keywords": [ + "easyadmin", + "thinkphp", + "admin" + ], + "homepage": "http://easyadmin8.wolfcode.top/", + "license": "MIT", + "authors": [ + { + "name": "wolfcode" } + ], + "require": { + "php": ">=8.0.0", + "topthink/framework": "8.0.x-dev", + "topthink/think-orm": "^3.0", + "topthink/think-multi-app": "^1.0", + "topthink/think-view": "^2.0", + "topthink/think-captcha": "^3.0", + "topthink/think-filesystem": "^2.0", + "aliyuncs/oss-sdk-php": "^2.3", + "qcloud/cos-sdk-v5": "^2.0", + "qiniu/php-sdk": "^7.2", + "alibabacloud/client": "^1.5", + "jianyan74/php-excel": "^1.0", + "doctrine/annotations": "^1.13", + "ext-json": "*" + }, + "require-dev": { + "symfony/var-dumper": "^4.2", + "eaglewu/swoole-ide-helper": "dev-master" + }, + "autoload": { + "psr-4": { + "app\\": "app" + }, + "psr-0": { + "": "extend/" + } + }, + "config": { + "preferred-install": "dist", + "secure-http": false + }, + "scripts": { + "post-autoload-dump": [ + "@php think service:discover", + "@php think vendor:publish" + ] + }, + "repositories": { + "packagist": { + "type": "composer", + "url": "https://mirrors.aliyun.com/composer/" + } + } } diff --git a/composer.lock b/composer.lock index 4d74b1a..08721b8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "12d74ce8c06f3a292083ec0877539efe", + "content-hash": "785d1ad4524c293ce35086a50d83d0b8", "packages": [ { "name": "adbario/php-dot-notation", @@ -2811,12 +2811,12 @@ "source": { "type": "git", "url": "https://github.com/top-think/framework.git", - "reference": "6b1372ab2795235dce1903e14004b04774113575" + "reference": "a598c38b40573f1dd68dfb2667119d99239809fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/framework/zipball/6b1372ab2795235dce1903e14004b04774113575", - "reference": "6b1372ab2795235dce1903e14004b04774113575", + "url": "https://api.github.com/repos/top-think/framework/zipball/a598c38b40573f1dd68dfb2667119d99239809fa", + "reference": "a598c38b40573f1dd68dfb2667119d99239809fa", "shasum": "", "mirrors": [ { @@ -2842,6 +2842,7 @@ "mockery/mockery": "^1.2", "phpunit/phpunit": "^9.5" }, + "default-branch": true, "type": "library", "autoload": { "files": [], @@ -2874,7 +2875,7 @@ "issues": "https://github.com/top-think/framework/issues", "source": "https://github.com/top-think/framework/tree/8.0" }, - "time": "2023-05-19T09:54:47+00:00" + "time": "2023-07-03T04:20:34+00:00" }, { "name": "topthink/think-captcha", @@ -3095,16 +3096,16 @@ }, { "name": "topthink/think-orm", - "version": "v3.0.9", + "version": "v3.0.10", "source": { "type": "git", "url": "https://github.com/top-think/think-orm.git", - "reference": "af55970ee87833cf534d04c7e05284680daffb16" + "reference": "68b011d5e8b350f8739b9e92c0503a723b47a29c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/think-orm/zipball/af55970ee87833cf534d04c7e05284680daffb16", - "reference": "af55970ee87833cf534d04c7e05284680daffb16", + "url": "https://api.github.com/repos/top-think/think-orm/zipball/68b011d5e8b350f8739b9e92c0503a723b47a29c", + "reference": "68b011d5e8b350f8739b9e92c0503a723b47a29c", "shasum": "", "mirrors": [ { @@ -3150,9 +3151,9 @@ ], "support": { "issues": "https://github.com/top-think/think-orm/issues", - "source": "https://github.com/top-think/think-orm/tree/v3.0.9" + "source": "https://github.com/top-think/think-orm/tree/v3.0.10" }, - "time": "2023-04-20T14:35:04+00:00" + "time": "2023-06-21T02:40:23+00:00" }, { "name": "topthink/think-template",