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

README.md

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

application/admin/command/Api/library/Extractor.php

@@ -297,7 +297,7 @@ class Extractor
             }
         }
         $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;
     }
 

application/admin/validate/User.php

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

composer.json

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