升级至tp8

This commit is contained in:
2023-09-04 11:50:04 +08:00
parent 3e2e401308
commit a12812d858
5 changed files with 169 additions and 170 deletions

View File

@@ -1,6 +1,5 @@
<?php <?php
namespace app\admin\middleware; namespace app\admin\middleware;
use app\Request; use app\Request;
@@ -9,21 +8,19 @@ use think\facade\Request as FacadeRequest;
/** /**
* 系统操作日志中间件 * 系统操作日志中间件
* Class SystemLog * Class SystemLog.
* @package app\admin\middleware
*/ */
class SystemLog class SystemLog
{ {
/** /**
* 敏感信息字段,日志记录时需要加密 * 敏感信息字段,日志记录时需要加密.
* @var array * @var array
*/ */
protected $sensitiveParams = [ protected $sensitiveParams = [
'password', 'password',
'password_again', 'password_again',
'phone', 'phone',
'mobile' 'mobile',
]; ];
public function handle(Request $request, \Closure $next) public function handle(Request $request, \Closure $next)
@@ -33,7 +30,7 @@ class SystemLog
unset($params['s']); unset($params['s']);
} }
foreach ($params as $key => $val) { foreach ($params as $key => $val) {
in_array($key, $this->sensitiveParams) && $params[$key] = "***********"; in_array($key, $this->sensitiveParams) && $params[$key] = '***********';
} }
$method = strtolower($request->method()); $method = strtolower($request->method());
$url = $request->url(); $url = $request->url();
@@ -42,17 +39,18 @@ class SystemLog
if (in_array($method, ['post', 'put', 'delete'])) { if (in_array($method, ['post', 'put', 'delete'])) {
$ip = FacadeRequest::ip(); $ip = FacadeRequest::ip();
$data = [ $data = [
'admin_id' => session('admin.id'), 'admin_id' => session('admin.id'),
'url' => $url, 'url' => $url,
'method' => $method, 'method' => $method,
'ip' => $ip, 'ip' => $ip,
'content' => json_encode($params, JSON_UNESCAPED_UNICODE), 'content' => json_encode($params, JSON_UNESCAPED_UNICODE),
'useragent' => $_SERVER['HTTP_USER_AGENT'], 'useragent' => $_SERVER['HTTP_USER_AGENT'],
'create_time' => time(), 'create_time' => time(),
]; ];
Log::debug($data); Log::debug(print_r($data, true));
} }
} }
return $next($request); return $next($request);
} }
} }

View File

@@ -212,14 +212,14 @@ class AdminController extends BaseController
*/ */
protected function buildTableParames($excludeFields = []) protected function buildTableParames($excludeFields = [])
{ {
$get = $this->request->get('', null, null); $get = $this->request->get('', null);
$page = isset($get['page']) && !empty($get['page']) ? $get['page'] : 1; $page = isset($get['page']) && !empty($get['page']) ? $get['page'] : 1;
$limit = isset($get['limit']) && !empty($get['limit']) ? $get['limit'] : 15; $limit = isset($get['limit']) && !empty($get['limit']) ? $get['limit'] : 15;
$group = isset($get['group']) && !empty($get['group']) ? $get['group'] : null; $group = isset($get['group']) && !empty($get['group']) ? $get['group'] : null;
$filters = isset($get['filter']) && !empty($get['filter']) ? $get['filter'] : '{}'; $filters = isset($get['filter']) && !empty($get['filter']) ? $get['filter'] : '{}';
$ops = isset($get['op']) && !empty($get['op']) ? $get['op'] : '{}'; $ops = isset($get['op']) && !empty($get['op']) ? $get['op'] : '{}';
// json转数组 // json转数组
$filters = json_decode($filters, true); $filters = json_decode($filters, true) ?? [];
$ops = json_decode($ops, true); $ops = json_decode($ops, true);
$where = []; $where = [];
$excludes = []; $excludes = [];

View File

@@ -17,18 +17,18 @@
} }
], ],
"require": { "require": {
"php": ">=7.1.0", "php": ">=8.0.0",
"topthink/framework": "^6.0.0",
"topthink/think-orm": "^2.0",
"topthink/think-multi-app": "^1.0",
"topthink/think-view": "^1.0",
"topthink/think-captcha": "^3.0",
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^8.0",
"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",
"topthink/think-migration": "^3.0",
"guzzlehttp/guzzle": "^7.4", "guzzlehttp/guzzle": "^7.4",
"phpoffice/phpspreadsheet": "^1.22", "phpoffice/phpspreadsheet": "^1.22",
"topthink/think-migration": "^3.0",
"doctrine/annotations": "^1.13", "doctrine/annotations": "^1.13",
"topthink/think-filesystem": "^2.0",
"overtrue/flysystem-qiniu": "^2.0", "overtrue/flysystem-qiniu": "^2.0",
"overtrue/flysystem-cos": "^4.0", "overtrue/flysystem-cos": "^4.0",
"iidestiny/flysystem-oss": "^3.0" "iidestiny/flysystem-oss": "^3.0"
@@ -54,5 +54,4 @@
"@php think vendor:publish" "@php think vendor:publish"
] ]
} }
}
}

286
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "2f70d3d45abefcd76fcd580ff470fe80", "content-hash": "ca3fcd696a06edb2905bbd88a2d905d0",
"packages": [ "packages": [
{ {
"name": "aliyuncs/oss-sdk-php", "name": "aliyuncs/oss-sdk-php",
@@ -315,22 +315,22 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "7.7.0", "version": "7.8.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "fb7566caccf22d74d1ab270de3551f72a58399f5" "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1110f66a6530a40fe7aea0378fe608ee2b2248f9",
"reference": "fb7566caccf22d74d1ab270de3551f72a58399f5", "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"guzzlehttp/promises": "^1.5.3 || ^2.0", "guzzlehttp/promises": "^1.5.3 || ^2.0.1",
"guzzlehttp/psr7": "^1.9.1 || ^2.4.5", "guzzlehttp/psr7": "^1.9.1 || ^2.5.1",
"php": "^7.2.5 || ^8.0", "php": "^7.2.5 || ^8.0",
"psr/http-client": "^1.0", "psr/http-client": "^1.0",
"symfony/deprecation-contracts": "^2.2 || ^3.0" "symfony/deprecation-contracts": "^2.2 || ^3.0"
@@ -421,7 +421,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/guzzle/issues", "issues": "https://github.com/guzzle/guzzle/issues",
"source": "https://github.com/guzzle/guzzle/tree/7.7.0" "source": "https://github.com/guzzle/guzzle/tree/7.8.0"
}, },
"funding": [ "funding": [
{ {
@@ -437,20 +437,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-05-21T14:04:53+00:00" "time": "2023-08-27T10:20:53+00:00"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
"version": "2.0.0", "version": "2.0.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/promises.git", "url": "https://github.com/guzzle/promises.git",
"reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6" "reference": "111166291a0f8130081195ac4556a5587d7f1b5d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/promises/zipball/3a494dc7dc1d7d12e511890177ae2d0e6c107da6", "url": "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d",
"reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6", "reference": "111166291a0f8130081195ac4556a5587d7f1b5d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -504,7 +504,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/promises/issues", "issues": "https://github.com/guzzle/promises/issues",
"source": "https://github.com/guzzle/promises/tree/2.0.0" "source": "https://github.com/guzzle/promises/tree/2.0.1"
}, },
"funding": [ "funding": [
{ {
@@ -520,20 +520,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-05-21T13:50:22+00:00" "time": "2023-08-03T15:11:55+00:00"
}, },
{ {
"name": "guzzlehttp/psr7", "name": "guzzlehttp/psr7",
"version": "2.5.0", "version": "2.6.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/psr7.git", "url": "https://github.com/guzzle/psr7.git",
"reference": "b635f279edd83fc275f822a1188157ffea568ff6" "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/psr7/zipball/b635f279edd83fc275f822a1188157ffea568ff6", "url": "https://api.github.com/repos/guzzle/psr7/zipball/be45764272e8873c72dbe3d2edcfdfcc3bc9f727",
"reference": "b635f279edd83fc275f822a1188157ffea568ff6", "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -620,7 +620,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/guzzle/psr7/issues", "issues": "https://github.com/guzzle/psr7/issues",
"source": "https://github.com/guzzle/psr7/tree/2.5.0" "source": "https://github.com/guzzle/psr7/tree/2.6.1"
}, },
"funding": [ "funding": [
{ {
@@ -636,7 +636,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2023-04-17T16:11:26+00:00" "time": "2023-08-27T10:13:57+00:00"
}, },
{ {
"name": "iidestiny/flysystem-oss", "name": "iidestiny/flysystem-oss",
@@ -782,26 +782,26 @@
}, },
{ {
"name": "league/mime-type-detection", "name": "league/mime-type-detection",
"version": "1.11.0", "version": "1.13.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/mime-type-detection.git", "url": "https://github.com/thephpleague/mime-type-detection.git",
"reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd" "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd", "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/a6dfb1194a2946fcdc1f38219445234f65b35c96",
"reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd", "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-fileinfo": "*", "ext-fileinfo": "*",
"php": "^7.2 || ^8.0" "php": "^7.4 || ^8.0"
}, },
"require-dev": { "require-dev": {
"friendsofphp/php-cs-fixer": "^3.2", "friendsofphp/php-cs-fixer": "^3.2",
"phpstan/phpstan": "^0.12.68", "phpstan/phpstan": "^0.12.68",
"phpunit/phpunit": "^8.5.8 || ^9.3" "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@@ -822,7 +822,7 @@
"description": "Mime-type detection for Flysystem", "description": "Mime-type detection for Flysystem",
"support": { "support": {
"issues": "https://github.com/thephpleague/mime-type-detection/issues", "issues": "https://github.com/thephpleague/mime-type-detection/issues",
"source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0" "source": "https://github.com/thephpleague/mime-type-detection/tree/1.13.0"
}, },
"funding": [ "funding": [
{ {
@@ -834,11 +834,11 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-04-17T13:12:02+00:00" "time": "2023-08-05T12:09:49+00:00"
}, },
{ {
"name": "maennchen/zipstream-php", "name": "maennchen/zipstream-php",
"version": "v2.4.0", "version": "2.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/maennchen/ZipStream-PHP.git", "url": "https://github.com/maennchen/ZipStream-PHP.git",
@@ -900,7 +900,7 @@
], ],
"support": { "support": {
"issues": "https://github.com/maennchen/ZipStream-PHP/issues", "issues": "https://github.com/maennchen/ZipStream-PHP/issues",
"source": "https://github.com/maennchen/ZipStream-PHP/tree/v2.4.0" "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.4.0"
}, },
"funding": [ "funding": [
{ {
@@ -1275,16 +1275,16 @@
}, },
{ {
"name": "phpoffice/phpspreadsheet", "name": "phpoffice/phpspreadsheet",
"version": "1.28.0", "version": "1.29.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git", "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
"reference": "6e81cf39bbd93ebc3a4e8150444c41e8aa9b769a" "reference": "fde2ccf55eaef7e86021ff1acce26479160a0fa0"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/6e81cf39bbd93ebc3a4e8150444c41e8aa9b769a", "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/fde2ccf55eaef7e86021ff1acce26479160a0fa0",
"reference": "6e81cf39bbd93ebc3a4e8150444c41e8aa9b769a", "reference": "fde2ccf55eaef7e86021ff1acce26479160a0fa0",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1302,7 +1302,7 @@
"ext-zip": "*", "ext-zip": "*",
"ext-zlib": "*", "ext-zlib": "*",
"ezyang/htmlpurifier": "^4.15", "ezyang/htmlpurifier": "^4.15",
"maennchen/zipstream-php": "^2.1", "maennchen/zipstream-php": "^2.1 || ^3.0",
"markbaker/complex": "^3.0", "markbaker/complex": "^3.0",
"markbaker/matrix": "^3.0", "markbaker/matrix": "^3.0",
"php": "^7.4 || ^8.0", "php": "^7.4 || ^8.0",
@@ -1314,12 +1314,12 @@
"dealerdirect/phpcodesniffer-composer-installer": "dev-main", "dealerdirect/phpcodesniffer-composer-installer": "dev-main",
"dompdf/dompdf": "^1.0 || ^2.0", "dompdf/dompdf": "^1.0 || ^2.0",
"friendsofphp/php-cs-fixer": "^3.2", "friendsofphp/php-cs-fixer": "^3.2",
"mitoteam/jpgraph": "^10.2.4", "mitoteam/jpgraph": "^10.3",
"mpdf/mpdf": "^8.1.1", "mpdf/mpdf": "^8.1.1",
"phpcompatibility/php-compatibility": "^9.3", "phpcompatibility/php-compatibility": "^9.3",
"phpstan/phpstan": "^1.1", "phpstan/phpstan": "^1.1",
"phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-phpunit": "^1.0",
"phpunit/phpunit": "^8.5 || ^9.0", "phpunit/phpunit": "^8.5 || ^9.0 || ^10.0",
"squizlabs/php_codesniffer": "^3.7", "squizlabs/php_codesniffer": "^3.7",
"tecnickcom/tcpdf": "^6.5" "tecnickcom/tcpdf": "^6.5"
}, },
@@ -1374,9 +1374,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
"source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.28.0" "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.29.0"
}, },
"time": "2023-02-25T12:24:49+00:00" "time": "2023-06-14T22:48:31+00:00"
}, },
{ {
"name": "psr/cache", "name": "psr/cache",
@@ -1429,22 +1429,27 @@
}, },
{ {
"name": "psr/container", "name": "psr/container",
"version": "1.1.2", "version": "2.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-fig/container.git", "url": "https://github.com/php-fig/container.git",
"reference": "513e0666f7216c7459170d56df27dfcefe1689ea" "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
"reference": "513e0666f7216c7459170d56df27dfcefe1689ea", "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=7.4.0" "php": ">=7.4.0"
}, },
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Psr\\Container\\": "src/" "Psr\\Container\\": "src/"
@@ -1471,9 +1476,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/php-fig/container/issues", "issues": "https://github.com/php-fig/container/issues",
"source": "https://github.com/php-fig/container/tree/1.1.2" "source": "https://github.com/php-fig/container/tree/2.0.2"
}, },
"time": "2021-11-05T16:50:12+00:00" "time": "2021-11-05T16:47:00+00:00"
}, },
{ {
"name": "psr/http-client", "name": "psr/http-client",
@@ -1637,30 +1642,30 @@
}, },
{ {
"name": "psr/log", "name": "psr/log",
"version": "1.1.4", "version": "3.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-fig/log.git", "url": "https://github.com/php-fig/log.git",
"reference": "d49695b909c3b7628b6289db5479a1c204601f11" "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001",
"reference": "d49695b909c3b7628b6289db5479a1c204601f11", "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.0" "php": ">=8.0.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.1.x-dev" "dev-master": "3.x-dev"
} }
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Psr\\Log\\": "Psr/Log/" "Psr\\Log\\": "src"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
@@ -1681,31 +1686,31 @@
"psr-3" "psr-3"
], ],
"support": { "support": {
"source": "https://github.com/php-fig/log/tree/1.1.4" "source": "https://github.com/php-fig/log/tree/3.0.0"
}, },
"time": "2021-05-03T11:20:27+00:00" "time": "2021-07-14T16:46:02+00:00"
}, },
{ {
"name": "psr/simple-cache", "name": "psr/simple-cache",
"version": "1.0.1", "version": "3.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-fig/simple-cache.git", "url": "https://github.com/php-fig/simple-cache.git",
"reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/764e0b3939f5ca87cb904f570ef9be2d78a07865",
"reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", "reference": "764e0b3939f5ca87cb904f570ef9be2d78a07865",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.0" "php": ">=8.0.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0.x-dev" "dev-master": "3.0.x-dev"
} }
}, },
"autoload": { "autoload": {
@@ -1720,7 +1725,7 @@
"authors": [ "authors": [
{ {
"name": "PHP-FIG", "name": "PHP-FIG",
"homepage": "http://www.php-fig.org/" "homepage": "https://www.php-fig.org/"
} }
], ],
"description": "Common interfaces for simple caching", "description": "Common interfaces for simple caching",
@@ -1732,22 +1737,22 @@
"simple-cache" "simple-cache"
], ],
"support": { "support": {
"source": "https://github.com/php-fig/simple-cache/tree/master" "source": "https://github.com/php-fig/simple-cache/tree/3.0.0"
}, },
"time": "2017-10-23T01:57:42+00:00" "time": "2021-10-29T13:26:27+00:00"
}, },
{ {
"name": "qiniu/php-sdk", "name": "qiniu/php-sdk",
"version": "v7.9.0", "version": "v7.10.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/qiniu/php-sdk.git", "url": "https://github.com/qiniu/php-sdk.git",
"reference": "3c0ebeee6a7439a0d2874f24b56dfe43545a1d2e" "reference": "dfa6893417c126735d9fbeffdb54fe14671dc4d3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/qiniu/php-sdk/zipball/3c0ebeee6a7439a0d2874f24b56dfe43545a1d2e", "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/dfa6893417c126735d9fbeffdb54fe14671dc4d3",
"reference": "3c0ebeee6a7439a0d2874f24b56dfe43545a1d2e", "reference": "dfa6893417c126735d9fbeffdb54fe14671dc4d3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1762,7 +1767,8 @@
"type": "library", "type": "library",
"autoload": { "autoload": {
"files": [ "files": [
"src/Qiniu/functions.php" "src/Qiniu/functions.php",
"src/Qiniu/Http/Middleware/Middleware.php"
], ],
"psr-4": { "psr-4": {
"Qiniu\\": "src/Qiniu" "Qiniu\\": "src/Qiniu"
@@ -1789,9 +1795,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/qiniu/php-sdk/issues", "issues": "https://github.com/qiniu/php-sdk/issues",
"source": "https://github.com/qiniu/php-sdk/tree/v7.9.0" "source": "https://github.com/qiniu/php-sdk/tree/v7.10.1"
}, },
"time": "2023-05-06T04:36:16+00:00" "time": "2023-08-04T13:33:41+00:00"
}, },
{ {
"name": "ralouphie/getallheaders", "name": "ralouphie/getallheaders",
@@ -1906,34 +1912,34 @@
}, },
{ {
"name": "topthink/framework", "name": "topthink/framework",
"version": "v6.1.3", "version": "v8.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/top-think/framework.git", "url": "https://github.com/top-think/framework.git",
"reference": "7c324e7011246f0064b055b62ab9c3921cf0a041" "reference": "6477942f80090a7f3d194197765ca1217a7aab87"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/top-think/framework/zipball/7c324e7011246f0064b055b62ab9c3921cf0a041", "url": "https://api.github.com/repos/top-think/framework/zipball/6477942f80090a7f3d194197765ca1217a7aab87",
"reference": "7c324e7011246f0064b055b62ab9c3921cf0a041", "reference": "6477942f80090a7f3d194197765ca1217a7aab87",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"ext-mbstring": "*", "ext-mbstring": "*",
"php": ">=7.2.5", "php": ">=8.0.0",
"psr/container": "~1.0", "psr/container": "^2.0",
"psr/http-message": "^1.0", "psr/http-message": "^1.0",
"psr/log": "~1.0", "psr/log": "^3.0",
"psr/simple-cache": "^1.0", "psr/simple-cache": "^3.0",
"topthink/think-helper": "^3.1.1", "topthink/think-helper": "^3.1",
"topthink/think-orm": "^2.0|^3.0" "topthink/think-orm": "^3.0"
}, },
"require-dev": { "require-dev": {
"guzzlehttp/psr7": "^2.1.0", "guzzlehttp/psr7": "^2.1.0",
"mikey179/vfsstream": "^1.6", "mikey179/vfsstream": "^1.6",
"mockery/mockery": "^1.2", "mockery/mockery": "^1.2",
"phpunit/phpunit": "^7.0" "phpunit/phpunit": "^9.5"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@@ -1965,9 +1971,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/top-think/framework/issues", "issues": "https://github.com/top-think/framework/issues",
"source": "https://github.com/top-think/framework/tree/v6.1.3" "source": "https://github.com/top-think/framework/tree/v8.0.2"
}, },
"time": "2023-05-22T03:02:08+00:00" "time": "2023-08-15T03:05:55+00:00"
}, },
{ {
"name": "topthink/think-captcha", "name": "topthink/think-captcha",
@@ -2116,20 +2122,20 @@
}, },
{ {
"name": "topthink/think-migration", "name": "topthink/think-migration",
"version": "v3.0.5", "version": "v3.0.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/top-think/think-migration.git", "url": "https://github.com/top-think/think-migration.git",
"reference": "7a5ec3952ea97bf1a5d8872e1bd10f2abf6294ca" "reference": "82c4226cb14f973b9377c7fc6e89c525cbb8b030"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/top-think/think-migration/zipball/7a5ec3952ea97bf1a5d8872e1bd10f2abf6294ca", "url": "https://api.github.com/repos/top-think/think-migration/zipball/82c4226cb14f973b9377c7fc6e89c525cbb8b030",
"reference": "7a5ec3952ea97bf1a5d8872e1bd10f2abf6294ca", "reference": "82c4226cb14f973b9377c7fc6e89c525cbb8b030",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"topthink/framework": "^6.0", "topthink/framework": "^6.0 || ^8.0",
"topthink/think-helper": "^3.0.3" "topthink/think-helper": "^3.0.3"
}, },
"require-dev": { "require-dev": {
@@ -2164,9 +2170,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/top-think/think-migration/issues", "issues": "https://github.com/top-think/think-migration/issues",
"source": "https://github.com/top-think/think-migration/tree/v3.0.5" "source": "https://github.com/top-think/think-migration/tree/v3.0.6"
}, },
"time": "2023-02-26T13:16:22+00:00" "time": "2023-07-01T11:01:52+00:00"
}, },
{ {
"name": "topthink/think-multi-app", "name": "topthink/think-multi-app",
@@ -2218,28 +2224,28 @@
}, },
{ {
"name": "topthink/think-orm", "name": "topthink/think-orm",
"version": "v2.0.61", "version": "v3.0.13",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/top-think/think-orm.git", "url": "https://github.com/top-think/think-orm.git",
"reference": "10528ebf4a5106b19c3bac9c6deae7a67ff49de6" "reference": "e676e172d54055266005986d05685bdac5ac66b7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/top-think/think-orm/zipball/10528ebf4a5106b19c3bac9c6deae7a67ff49de6", "url": "https://api.github.com/repos/top-think/think-orm/zipball/e676e172d54055266005986d05685bdac5ac66b7",
"reference": "10528ebf4a5106b19c3bac9c6deae7a67ff49de6", "reference": "e676e172d54055266005986d05685bdac5ac66b7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-json": "*", "ext-json": "*",
"ext-pdo": "*", "ext-pdo": "*",
"php": ">=7.1.0", "php": ">=8.0.0",
"psr/log": "^1.0|^2.0", "psr/log": ">=1.0",
"psr/simple-cache": "^1.0|^2.0", "psr/simple-cache": ">=1.0",
"topthink/think-helper": "^3.1" "topthink/think-helper": "^3.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^7|^8|^9.5" "phpunit/phpunit": "^8|^9.5|^10"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@@ -2260,34 +2266,34 @@
"email": "liu21st@gmail.com" "email": "liu21st@gmail.com"
} }
], ],
"description": "think orm", "description": "the PHP Database&ORM Framework",
"keywords": [ "keywords": [
"database", "database",
"orm" "orm"
], ],
"support": { "support": {
"issues": "https://github.com/top-think/think-orm/issues", "issues": "https://github.com/top-think/think-orm/issues",
"source": "https://github.com/top-think/think-orm/tree/v2.0.61" "source": "https://github.com/top-think/think-orm/tree/v3.0.13"
}, },
"time": "2023-04-20T14:27:51+00:00" "time": "2023-09-01T09:08:49+00:00"
}, },
{ {
"name": "topthink/think-template", "name": "topthink/think-template",
"version": "v2.0.9", "version": "v3.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/top-think/think-template.git", "url": "https://github.com/top-think/think-template.git",
"reference": "6d25642ae0e306166742fd7073dc7a159e18073c" "reference": "4352d2cf627abfb8b49f830686c25c02f59c23f2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/top-think/think-template/zipball/6d25642ae0e306166742fd7073dc7a159e18073c", "url": "https://api.github.com/repos/top-think/think-template/zipball/4352d2cf627abfb8b49f830686c25c02f59c23f2",
"reference": "6d25642ae0e306166742fd7073dc7a159e18073c", "reference": "4352d2cf627abfb8b49f830686c25c02f59c23f2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=7.1.0", "php": ">=8.0.0",
"psr/simple-cache": "^1.0" "psr/simple-cache": ">=1.0"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@@ -2308,27 +2314,27 @@
"description": "the php template engine", "description": "the php template engine",
"support": { "support": {
"issues": "https://github.com/top-think/think-template/issues", "issues": "https://github.com/top-think/think-template/issues",
"source": "https://github.com/top-think/think-template/tree/v2.0.9" "source": "https://github.com/top-think/think-template/tree/v3.0.0"
}, },
"time": "2023-02-14T10:50:39+00:00" "time": "2023-02-25T12:11:14+00:00"
}, },
{ {
"name": "topthink/think-view", "name": "topthink/think-view",
"version": "v1.0.14", "version": "v2.0.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/top-think/think-view.git", "url": "https://github.com/top-think/think-view.git",
"reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d" "reference": "d2a076011c96d2edd8016703a827fb54b2683c62"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/top-think/think-view/zipball/edce0ae2c9551ab65f9e94a222604b0dead3576d", "url": "https://api.github.com/repos/top-think/think-view/zipball/d2a076011c96d2edd8016703a827fb54b2683c62",
"reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d", "reference": "d2a076011c96d2edd8016703a827fb54b2683c62",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=7.1.0", "php": ">=8.0.0",
"topthink/think-template": "^2.0" "topthink/think-template": "^3.0"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@@ -2349,24 +2355,24 @@
"description": "thinkphp template driver", "description": "thinkphp template driver",
"support": { "support": {
"issues": "https://github.com/top-think/think-view/issues", "issues": "https://github.com/top-think/think-view/issues",
"source": "https://github.com/top-think/think-view/tree/v1.0.14" "source": "https://github.com/top-think/think-view/tree/v2.0.0"
}, },
"time": "2019-11-06T11:40:13+00:00" "time": "2023-02-25T12:18:09+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.27.0", "version": "v1.28.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" "reference": "42292d99c55abe617799667f454222c54c60e229"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
"reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", "reference": "42292d99c55abe617799667f454222c54c60e229",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2381,7 +2387,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-main": "1.27-dev" "dev-main": "1.28-dev"
}, },
"thanks": { "thanks": {
"name": "symfony/polyfill", "name": "symfony/polyfill",
@@ -2420,7 +2426,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
}, },
"funding": [ "funding": [
{ {
@@ -2436,20 +2442,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-11-03T14:55:06+00:00" "time": "2023-07-28T09:04:16+00:00"
}, },
{ {
"name": "symfony/polyfill-php72", "name": "symfony/polyfill-php72",
"version": "v1.27.0", "version": "v1.28.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php72.git", "url": "https://github.com/symfony/polyfill-php72.git",
"reference": "869329b1e9894268a8a61dabb69153029b7a8c97" "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179",
"reference": "869329b1e9894268a8a61dabb69153029b7a8c97", "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2458,7 +2464,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-main": "1.27-dev" "dev-main": "1.28-dev"
}, },
"thanks": { "thanks": {
"name": "symfony/polyfill", "name": "symfony/polyfill",
@@ -2496,7 +2502,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0"
}, },
"funding": [ "funding": [
{ {
@@ -2512,20 +2518,20 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-11-03T14:55:06+00:00" "time": "2023-01-26T09:26:14+00:00"
}, },
{ {
"name": "symfony/polyfill-php80", "name": "symfony/polyfill-php80",
"version": "v1.27.0", "version": "v1.28.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php80.git", "url": "https://github.com/symfony/polyfill-php80.git",
"reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
"reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2534,7 +2540,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-main": "1.27-dev" "dev-main": "1.28-dev"
}, },
"thanks": { "thanks": {
"name": "symfony/polyfill", "name": "symfony/polyfill",
@@ -2579,7 +2585,7 @@
"shim" "shim"
], ],
"support": { "support": {
"source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0"
}, },
"funding": [ "funding": [
{ {
@@ -2595,7 +2601,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2022-11-03T14:55:06+00:00" "time": "2023-01-26T09:26:14+00:00"
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
@@ -2693,7 +2699,7 @@
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": ">=7.1.0", "php": ">=8.0.0",
"ext-json": "*" "ext-json": "*"
}, },
"platform-dev": [], "platform-dev": [],

View File

@@ -100,10 +100,6 @@ class DebugMysql implements LogHandlerInterface
foreach ($log as $log_level => $log_list) { foreach ($log as $log_level => $log_list) {
foreach ($log_list as $key => $log_item) { foreach ($log_list as $key => $log_item) {
if (!is_string($log_item)) {
$log_item = print_r($log_item, true);
}
$log_data = [ $log_data = [
'level' => $log_level, 'level' => $log_level,