From 1c62049989f8ec5aeeb91e2eb1673513fde4f2ad Mon Sep 17 00:00:00 2001
From: YouKnow <2900928498@qq.com>
Date: Fri, 9 Apr 2021 15:56:03 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96user=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/validate/User.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/admin/validate/User.php b/application/admin/validate/User.php
index ab062205..252f4cf5 100644
--- a/application/admin/validate/User.php
+++ b/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 = [])

From 6b9e5ba379b682ea7069217e797bb69f35e3ec48 Mon Sep 17 00:00:00 2001
From: T2cc <5152438+gtguizhou@user.noreply.gitee.com>
Date: Sun, 11 Apr 2021 22:36:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=9F=E6=88=90=20api?=
 =?UTF-8?q?=20=E6=96=87=E6=A1=A3=E6=8A=A5=E9=94=99=E7=9A=84=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/command/Api/library/Extractor.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/admin/command/Api/library/Extractor.php b/application/admin/command/Api/library/Extractor.php
index 40115365..fdd52de1 100644
--- a/application/admin/command/Api/library/Extractor.php
+++ b/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;
     }
 

From d59ff78fd89ecda4db2fd41a3fbbc62d566414af Mon Sep 17 00:00:00 2001
From: F4NNIU <sparkamax@gmail.com>
Date: Thu, 13 May 2021 22:31:12 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20framework=20type=20?=
 =?UTF-8?q?=E4=B8=BA=20git?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md     | 2 +-
 composer.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e20ce746..90e0ea86 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-FastAdmin是一款基于ThinkPHP5+Bootstrap的极速后台开发框架。
+FastAdmin是一款基于ThinkPHP+Bootstrap的极速后台开发框架。
 
 
 ## 主要特性
diff --git a/composer.json b/composer.json
index b3b118b4..b059b41a 100755
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
     },
     "repositories": [
         {
-            "type": "vcs",
+            "type": "git",
             "url": "https://gitee.com/karson/framework"
         }
     ]