mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-06 03:58:04 +08:00
ComposerUpdate
This commit is contained in:
Anyon
parent
4c8deafb9e
commit
7a74b79fe1
28
composer.lock
generated
28
composer.lock
generated
@ -498,16 +498,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/options-resolver",
|
||||
"version": "v3.4.36",
|
||||
"version": "v3.4.37",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/options-resolver.git",
|
||||
"reference": "b224d20be60e6f7b55cd66914379a13a0b28651a"
|
||||
"reference": "730ef56164ed6c9356c159e9f5ff2b84d753b9ed"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/b224d20be60e6f7b55cd66914379a13a0b28651a",
|
||||
"reference": "b224d20be60e6f7b55cd66914379a13a0b28651a",
|
||||
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/730ef56164ed6c9356c159e9f5ff2b84d753b9ed",
|
||||
"reference": "730ef56164ed6c9356c159e9f5ff2b84d753b9ed",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -554,7 +554,7 @@
|
||||
"configuration",
|
||||
"options"
|
||||
],
|
||||
"time": "2019-10-26T11:02:01+00:00"
|
||||
"time": "2020-01-01T11:03:25+00:00"
|
||||
},
|
||||
{
|
||||
"name": "topthink/framework",
|
||||
@ -815,16 +815,16 @@
|
||||
},
|
||||
{
|
||||
"name": "topthink/think-view",
|
||||
"version": "v1.0.13",
|
||||
"version": "v1.0.14",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/top-think/think-view.git",
|
||||
"reference": "90803b73f781db5d42619082c4597afc58b2d4c5"
|
||||
"reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/top-think/think-view/zipball/90803b73f781db5d42619082c4597afc58b2d4c5",
|
||||
"reference": "90803b73f781db5d42619082c4597afc58b2d4c5",
|
||||
"url": "https://api.github.com/repos/top-think/think-view/zipball/edce0ae2c9551ab65f9e94a222604b0dead3576d",
|
||||
"reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -854,7 +854,7 @@
|
||||
}
|
||||
],
|
||||
"description": "thinkphp template driver",
|
||||
"time": "2019-10-07T12:23:10+00:00"
|
||||
"time": "2019-11-06T11:40:13+00:00"
|
||||
},
|
||||
{
|
||||
"name": "zoujingli/ip2region",
|
||||
@ -909,12 +909,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zoujingli/ThinkLibrary.git",
|
||||
"reference": "1e0488650982272bedf647c95f02924919dce206"
|
||||
"reference": "6376bf39396292e9920b43f917d9e3dc307ef898"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1e0488650982272bedf647c95f02924919dce206",
|
||||
"reference": "1e0488650982272bedf647c95f02924919dce206",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/6376bf39396292e9920b43f917d9e3dc307ef898",
|
||||
"reference": "6376bf39396292e9920b43f917d9e3dc307ef898",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -958,7 +958,7 @@
|
||||
],
|
||||
"description": "ThinkPHP v6.0 Development Library",
|
||||
"homepage": "http://framework.thinkadmin.top",
|
||||
"time": "2020-01-14T06:06:23+00:00"
|
||||
"time": "2020-01-16T03:30:15+00:00"
|
||||
},
|
||||
{
|
||||
"name": "zoujingli/wechat-developer",
|
||||
|
||||
32
vendor/composer/installed.json
vendored
32
vendor/composer/installed.json
vendored
@ -507,17 +507,17 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/options-resolver",
|
||||
"version": "v3.4.36",
|
||||
"version_normalized": "3.4.36.0",
|
||||
"version": "v3.4.37",
|
||||
"version_normalized": "3.4.37.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/options-resolver.git",
|
||||
"reference": "b224d20be60e6f7b55cd66914379a13a0b28651a"
|
||||
"reference": "730ef56164ed6c9356c159e9f5ff2b84d753b9ed"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/b224d20be60e6f7b55cd66914379a13a0b28651a",
|
||||
"reference": "b224d20be60e6f7b55cd66914379a13a0b28651a",
|
||||
"url": "https://api.github.com/repos/symfony/options-resolver/zipball/730ef56164ed6c9356c159e9f5ff2b84d753b9ed",
|
||||
"reference": "730ef56164ed6c9356c159e9f5ff2b84d753b9ed",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -529,7 +529,7 @@
|
||||
"require": {
|
||||
"php": "^5.5.9|>=7.0.8"
|
||||
},
|
||||
"time": "2019-10-26T11:02:01+00:00",
|
||||
"time": "2020-01-01T11:03:25+00:00",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
@ -836,17 +836,17 @@
|
||||
},
|
||||
{
|
||||
"name": "topthink/think-view",
|
||||
"version": "v1.0.13",
|
||||
"version_normalized": "1.0.13.0",
|
||||
"version": "v1.0.14",
|
||||
"version_normalized": "1.0.14.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/top-think/think-view.git",
|
||||
"reference": "90803b73f781db5d42619082c4597afc58b2d4c5"
|
||||
"reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/top-think/think-view/zipball/90803b73f781db5d42619082c4597afc58b2d4c5",
|
||||
"reference": "90803b73f781db5d42619082c4597afc58b2d4c5",
|
||||
"url": "https://api.github.com/repos/top-think/think-view/zipball/edce0ae2c9551ab65f9e94a222604b0dead3576d",
|
||||
"reference": "edce0ae2c9551ab65f9e94a222604b0dead3576d",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -859,7 +859,7 @@
|
||||
"php": ">=7.1.0",
|
||||
"topthink/think-template": "^2.0"
|
||||
},
|
||||
"time": "2019-10-07T12:23:10+00:00",
|
||||
"time": "2019-11-06T11:40:13+00:00",
|
||||
"type": "library",
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
@ -935,12 +935,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zoujingli/ThinkLibrary.git",
|
||||
"reference": "1e0488650982272bedf647c95f02924919dce206"
|
||||
"reference": "6376bf39396292e9920b43f917d9e3dc307ef898"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/1e0488650982272bedf647c95f02924919dce206",
|
||||
"reference": "1e0488650982272bedf647c95f02924919dce206",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/6376bf39396292e9920b43f917d9e3dc307ef898",
|
||||
"reference": "6376bf39396292e9920b43f917d9e3dc307ef898",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -956,7 +956,7 @@
|
||||
"ext-json": "*",
|
||||
"topthink/framework": "^6.0"
|
||||
},
|
||||
"time": "2020-01-14T06:06:23+00:00",
|
||||
"time": "2020-01-16T03:30:15+00:00",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"think": {
|
||||
|
||||
2
vendor/services.php
vendored
2
vendor/services.php
vendored
@ -1,5 +1,5 @@
|
||||
<?php
|
||||
// This file is automatically generated at:2020-01-14 14:11:14
|
||||
// This file is automatically generated at:2020-02-03 11:25:14
|
||||
declare (strict_types = 1);
|
||||
return array (
|
||||
0 => 'think\\app\\Service',
|
||||
|
||||
2
vendor/symfony/options-resolver/LICENSE
vendored
2
vendor/symfony/options-resolver/LICENSE
vendored
@ -1,4 +1,4 @@
|
||||
Copyright (c) 2004-2019 Fabien Potencier
|
||||
Copyright (c) 2004-2020 Fabien Potencier
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
4
vendor/topthink/think-view/src/Think.php
vendored
4
vendor/topthink/think-view/src/Think.php
vendored
@ -146,10 +146,6 @@ class Think
|
||||
throw new TemplateNotFoundException('template not exists:' . $template, $template);
|
||||
}
|
||||
|
||||
// 记录视图信息
|
||||
$this->app['log']
|
||||
->record('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]');
|
||||
|
||||
$this->template->fetch($template, $data);
|
||||
}
|
||||
|
||||
|
||||
@ -259,8 +259,12 @@ if (!function_exists('format_bytes')) {
|
||||
*/
|
||||
function format_bytes($size)
|
||||
{
|
||||
$units = [' B', ' KB', ' MB', ' GB', ' TB'];
|
||||
if (is_numeric($size)) {
|
||||
$units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
|
||||
for ($i = 0; $size >= 1024 && $i < 4; $i++) $size /= 1024;
|
||||
return round($size, 2) . $units[$i];
|
||||
return round($size, 2) . ' ' . $units[$i];
|
||||
} else {
|
||||
return $size;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user