hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'develop' of gitee.com:karson/fastadmin into develop

pull/312/head
Karson 2021-05-19 17:54:04 +08:00
parent cdebb284c3 9f725a062a
commit 7045f0d02b
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,4 +1,4 @@
FastAdmin是一款基于ThinkPHP5+Bootstrap的极速后台开发框架。 FastAdmin是一款基于ThinkPHP+Bootstrap的极速后台开发框架。
## 主要特性 ## 主要特性

2
application/admin/command/Api/library/Extractor.php
View File

@ -297,7 +297,7 @@ class Extractor
} }
} }
$methodAnnotations['ApiPermissionLogin'] = [!in_array('*', $noNeedLogin) && !in_array($methodName, $noNeedLogin)]; $methodAnnotations['ApiPermissionLogin'] = [!in_array('*', $noNeedLogin) && !in_array($methodName, $noNeedLogin)];
$methodAnnotations['ApiPermissionRight'] = !$methodAnnotations['ApiPermissionLogin'][0] ? false : [!in_array('*', $noNeedRight) && !in_array($methodName, $noNeedRight)]; $methodAnnotations['ApiPermissionRight'] = !$methodAnnotations['ApiPermissionLogin'][0] ? [false] : [!in_array('*', $noNeedRight) && !in_array($methodName, $noNeedRight)];
return $methodAnnotations; return $methodAnnotations;
} }

2
application/admin/validate/User.php
View File

@ -32,7 +32,7 @@ class User extends Validate
*/ */
protected $scene = [ protected $scene = [
'add' => [], 'add' => [],
'edit' => ['username', 'email', 'nickname', 'password', 'email', 'mobile'], 'edit' => ['username', 'nickname', 'password', 'email', 'mobile'],
]; ];
public function __construct(array $rules = [], $message = [], $field = []) public function __construct(array $rules = [], $message = [], $field = [])

2
composer.json
View File

@ -36,7 +36,7 @@
}, },
"repositories": [ "repositories": [
{ {
"type": "vcs", "type": "git",
"url": "https://gitee.com/karson/framework" "url": "https://gitee.com/karson/framework"
} }
] ]