blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2020-01-08 14:09:23 +08:00
parent 3a94654076
commit 5d9e704820
5 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.lock generated
View File

@ -909,12 +909,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "da9b19733aa956650b201c1351886ac045119453" "reference": "8c49f31c04ed4bf34710e43d4115aeba37bbcfaa"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/da9b19733aa956650b201c1351886ac045119453", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8c49f31c04ed4bf34710e43d4115aeba37bbcfaa",
"reference": "da9b19733aa956650b201c1351886ac045119453", "reference": "8c49f31c04ed4bf34710e43d4115aeba37bbcfaa",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -958,7 +958,7 @@
], ],
"description": "ThinkPHP v6.0 Development Library", "description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top", "homepage": "http://framework.thinkadmin.top",
"time": "2020-01-06T07:42:55+00:00" "time": "2020-01-08T02:36:41+00:00"
}, },
{ {
"name": "zoujingli/wechat-developer", "name": "zoujingli/wechat-developer",

8
vendor/composer/installed.json vendored
View File

@ -935,12 +935,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "da9b19733aa956650b201c1351886ac045119453" "reference": "8c49f31c04ed4bf34710e43d4115aeba37bbcfaa"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/da9b19733aa956650b201c1351886ac045119453", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8c49f31c04ed4bf34710e43d4115aeba37bbcfaa",
"reference": "da9b19733aa956650b201c1351886ac045119453", "reference": "8c49f31c04ed4bf34710e43d4115aeba37bbcfaa",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -956,7 +956,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-01-06T07:42:55+00:00", "time": "2020-01-08T02:36:41+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"think": { "think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2020-01-07 10:41:54 // This file is automatically generated at:2020-01-08 14:08:41
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',

21
vendor/zoujingli/think-library/src/helper/ValidateHelper.php vendored
View File

@ -16,6 +16,7 @@
namespace think\admin\helper; namespace think\admin\helper;
use think\admin\Helper; use think\admin\Helper;
use think\Validate;
/** /**
* 快捷输入验证器 * 快捷输入验证器
@ -38,20 +39,30 @@ class ValidateHelper extends Helper
list($name, $alias) = explode('#', $name); list($name, $alias) = explode('#', $name);
} }
if (stripos($name, '.') === false) { if (stripos($name, '.') === false) {
$data[$name] = empty($alias) ? $name : $alias; if (is_numeric($name)) {
$keys = $message;
if (is_string($message) && stripos($message, '#') !== false) {
list($name, $alias) = explode('#', $message);
$keys = empty($alias) ? $name : $alias;
}
$data[$name] = input("{$type}{$keys}");
} else {
$data[$name] = $message;
}
} else { } else {
list($_rgx) = explode(':', $name); list($_rgx) = explode(':', $name);
list($_key, $_rule) = explode('.', $name); list($_key, $_rule) = explode('.', $name);
$keys = empty($alias) ? $_key : $alias;
$info[$_rgx] = $message; $info[$_rgx] = $message;
$data[$_key] = empty($alias) ? $_key : $alias; $data[$_key] = input("{$type}{$keys}");
$rule[$_key] = empty($rule[$_key]) ? $_rule : "{$rule[$_key]}|{$_rule}"; $rule[$_key] = empty($rule[$_key]) ? $_rule : "{$rule[$_key]}|{$_rule}";
} }
} }
foreach ($data as $key => $name) $data[$key] = input("{$type}{$name}"); $validate = new Validate();
if ($this->app->validate->rule($rule)->message($info)->check($data)) { if ($validate->rule($rule)->message($info)->check($data)) {
return $data; return $data;
} else { } else {
$this->controller->error($this->app->validate->getError()); $this->controller->error($validate->getError());
} }
} }

2
vendor/zoujingli/think-library/src/queue/WorkQueue.php vendored
View File

@ -48,7 +48,7 @@ class WorkQueue extends Command
*/ */
protected function configure() protected function configure()
{ {
$this->setName('xtask:_work')->setDescription('Create a process to execute a task'); $this->setName('xtask:_work')->setDescription('Create a process to execute task');
$this->addArgument('code', Argument::OPTIONAL, 'TaskNumber'); $this->addArgument('code', Argument::OPTIONAL, 'TaskNumber');
$this->addArgument('spts', Argument::OPTIONAL, 'Separator'); $this->addArgument('spts', Argument::OPTIONAL, 'Separator');
} }