0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/yanwenwu/catch-admin

Browse Source
This commit is contained in:
wuyanwen 2020-02-24 10:58:29 +08:00
commit 4c48d0c71d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/catch.php
View File

@ -65,8 +65,8 @@ return [
* *
*/ */
'upload' => [ 'upload' => [
'image' => 'filesize:' . 1024 * 5 . '|fileExt:jpg,png,gif,jpeg', 'image' => 'fileSize:' . 1024 * 1024 * 5 . '|fileExt:jpg,png,gif,jpeg',
'file' => 'filesize:' . 1024 * 10 . '|fileExt:txt,pdf,xlsx,xls,html' 'file' => 'fileSize:' . 1024 * 1024 * 10 . '|fileExt:txt,pdf,xlsx,xls,html'
], ],
/** /**
* 路由中间件 * 路由中间件
@ -76,7 +76,6 @@ return [
\catchAdmin\user\AuthTokenMiddleware::class, \catchAdmin\user\AuthTokenMiddleware::class,
\catchAdmin\permissions\PermissionsMiddleware::class, \catchAdmin\permissions\PermissionsMiddleware::class,
], ],
/** /**
* 后台事件 * 后台事件
* *

3
extend/catcher/base/CatchRequest.php
View File

@ -4,7 +4,6 @@ namespace catcher\base;
use app\Request; use app\Request;
use catcher\exceptions\FailedException; use catcher\exceptions\FailedException;
use catcher\exceptions\ValidateFailedException; use catcher\exceptions\ValidateFailedException;
use think\Validate;
class CatchRequest extends Request class CatchRequest extends Request
{ {
@ -42,7 +41,7 @@ class CatchRequest extends Request
{ {
if (method_exists($this, 'rules')) { if (method_exists($this, 'rules')) {
try { try {
$validate = new Validate(); $validate = app('validate');
// 批量验证 // 批量验证
if ($this->batch) { if ($this->batch) {
$validate->batch($this->batch); $validate->batch($this->batch);