Browse Source

Merge branch 'master' of https://gitee.com/karson/fastadmin

Karson 5 years ago
parent
commit
d101bcd3e6

+ 1 - 1
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),

+ 3 - 1
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;
             }
         }