ComposerUpdate

This commit is contained in:
Anyon 2020-07-31 18:25:21 +08:00
parent 49b9255dcc
commit a57c3a9373
6 changed files with 14 additions and 14 deletions

8
composer.lock generated
View File

@ -879,12 +879,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "568ab719724c389c6b2a41d3fe4a2c5a82286d21"
"reference": "2ce8935d423feccfd59bba2963e9127f3fca8c90"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/568ab719724c389c6b2a41d3fe4a2c5a82286d21",
"reference": "568ab719724c389c6b2a41d3fe4a2c5a82286d21",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/2ce8935d423feccfd59bba2963e9127f3fca8c90",
"reference": "2ce8935d423feccfd59bba2963e9127f3fca8c90",
"shasum": "",
"mirrors": [
{
@ -928,7 +928,7 @@
],
"description": "ThinkPHP v6.0 Development Library",
"homepage": "http://thinkadmin.top",
"time": "2020-07-31T09:06:14+00:00"
"time": "2020-07-31T10:16:54+00:00"
},
{
"name": "zoujingli/wechat-developer",

View File

@ -903,12 +903,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "568ab719724c389c6b2a41d3fe4a2c5a82286d21"
"reference": "2ce8935d423feccfd59bba2963e9127f3fca8c90"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/568ab719724c389c6b2a41d3fe4a2c5a82286d21",
"reference": "568ab719724c389c6b2a41d3fe4a2c5a82286d21",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/2ce8935d423feccfd59bba2963e9127f3fca8c90",
"reference": "2ce8935d423feccfd59bba2963e9127f3fca8c90",
"shasum": "",
"mirrors": [
{
@ -924,7 +924,7 @@
"ext-json": "*",
"topthink/framework": "^6.0"
},
"time": "2020-07-31T09:06:14+00:00",
"time": "2020-07-31T10:16:54+00:00",
"type": "library",
"extra": {
"think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php
// This file is automatically generated at:2020-07-31 17:13:29
// This file is automatically generated at:2020-07-31 18:24:53
declare (strict_types = 1);
return array (
0 => 'think\\admin\\Library',

View File

@ -73,7 +73,7 @@ class AdminService extends Service
{
if ($this->isSuper()) return true;
$service = NodeService::instance();
list($real, $nodes) = [$service->fullnode($node), $service->getMethods()];
[$real, $nodes] = [$service->fullnode($node), $service->getMethods()];
foreach ($nodes as $key => $rule) if (stripos($key, '_') !== false) {
$nodes[str_replace('_', '', $key)] = $rule;
}
@ -92,9 +92,9 @@ class AdminService extends Service
*/
public function getTree($checkeds = [])
{
list($nodes, $pnodes, $methods) = [[], [], array_reverse(NodeService::instance()->getMethods())];
[$nodes, $pnodes, $methods] = [[], [], array_reverse(NodeService::instance()->getMethods())];
foreach ($methods as $node => $method) {
list($count, $pnode) = [substr_count($node, '/'), substr($node, 0, strripos($node, '/'))];
[$count, $pnode] = [substr_count($node, '/'), substr($node, 0, strripos($node, '/'))];
if ($count === 2 && !empty($method['isauth'])) {
in_array($pnode, $pnodes) or array_push($pnodes, $pnode);
$nodes[$node] = ['node' => $node, 'title' => $method['title'], 'pnode' => $pnode, 'checked' => in_array($node, $checkeds)];

View File

@ -45,12 +45,12 @@ class CaptchaService extends Service
// 生成验证码序号
$this->uniqid = uniqid('captcha') . mt_rand(1000, 9999);
// 生成验证码字符串
list($this->code, $length) = ['', strlen($this->charset) - 1];
[$this->code, $length] = ['', strlen($this->charset) - 1];
for ($i = 0; $i < $this->length; $i++) {
$this->code .= $this->charset[mt_rand(0, $length)];
}
// 设置字体文件路径
$this->fontfile = __DIR__ . '/bin/font.ttf';
$this->fontfile = __DIR__ . '/bin/captcha.ttf';
// 缓存验证码字符串
$this->app->cache->set($this->uniqid, $this->code, 360);
// 返回当前对象