From 2786259135f92a2c0aba119941670f4bfa7d7f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?HID=E4=B8=A8emotion?= Date: Sat, 1 Aug 2020 14:58:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=9F=E6=88=90API?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E7=9B=B8=E5=90=8C=E5=88=86=E7=BB=84=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=90=8D=E7=9B=B8=E5=90=8C=E8=A2=AB=E8=A6=86=E7=9B=96?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8D=E5=A6=82=E4=B8=A4?= =?UTF-8?q?=E4=B8=AAController=E4=BD=BF=E7=94=A8=E5=90=8C=E4=B8=80?= =?UTF-8?q?=E4=B8=AAAPI=E5=88=86=E7=BB=84=EF=BC=8C=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95=E5=90=8D=E4=BC=9A=E4=BA=A7=E7=94=9F?= =?UTF-8?q?=E8=A6=86=E7=9B=96=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/command/Api/library/Builder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/admin/command/Api/library/Builder.php b/application/admin/command/Api/library/Builder.php index e19a5107..ff9b08e5 100755 --- a/application/admin/command/Api/library/Builder.php +++ b/application/admin/command/Api/library/Builder.php @@ -190,7 +190,7 @@ class Builder if ($subdomain) { $route = substr($route, 4); } - $docslist[$section][$name] = [ + $docslist[$section][$class . $name] = [ 'id' => $counter, 'method' => is_array($docs['ApiMethod'][0]) ? $docs['ApiMethod'][0]['data'] : $docs['ApiMethod'][0], 'method_label' => $this->generateBadgeForMethod($docs), From dbf47c182a4fab040c08440cb30872f7f188b9d1 Mon Sep 17 00:00:00 2001 From: sixXing <464401240@qq.com> Date: Mon, 10 Aug 2020 16:04:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20application/admin/library/Auth.php?= =?UTF-8?q?.=20=E8=A7=A3=E5=86=B3=E5=90=8C=E4=B8=80=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E5=9C=A8=E4=B8=80=E4=B8=AA=E5=9C=B0=E6=96=B9?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=9A=84=E6=97=B6=E5=80=99token=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=E5=AF=BC=E8=87=B4=E4=B8=A4=E8=BE=B9=E9=83=BD=E6=8C=A4?= =?UTF-8?q?=E6=8E=89=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/library/Auth.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/admin/library/Auth.php b/application/admin/library/Auth.php index 73826e45..312bd405 100644 --- a/application/admin/library/Auth.php +++ b/application/admin/library/Auth.php @@ -183,7 +183,9 @@ class Auth extends \fast\Auth if (Config::get('fastadmin.login_unique')) { $my = Admin::get($admin['id']); if (!$my || $my['token'] != $admin['token']) { - $this->logout(); + $this->logined = false; //重置登录状态 + Session::delete("admin"); + Cookie::delete("keeplogin"); return false; } }