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

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

pull/220/head
Karson 2020-08-12 21:07:19 +08:00
parent 0d800cbbb0 541a182a7e
commit d101bcd3e6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,7 @@ class Builder
if ($subdomain) { if ($subdomain) {
$route = substr($route, 4); $route = substr($route, 4);
} }
$docslist[$section][$name] = [ $docslist[$section][$class . $name] = [
'id' => $counter, 'id' => $counter,
'method' => is_array($docs['ApiMethod'][0]) ? $docs['ApiMethod'][0]['data'] : $docs['ApiMethod'][0], 'method' => is_array($docs['ApiMethod'][0]) ? $docs['ApiMethod'][0]['data'] : $docs['ApiMethod'][0],
'method_label' => $this->generateBadgeForMethod($docs), 'method_label' => $this->generateBadgeForMethod($docs),

4
application/admin/library/Auth.php
View File

@ -183,7 +183,9 @@ class Auth extends \fast\Auth
if (Config::get('fastadmin.login_unique')) { if (Config::get('fastadmin.login_unique')) {
$my = Admin::get($admin['id']); $my = Admin::get($admin['id']);
if (!$my || $my['token'] != $admin['token']) { if (!$my || $my['token'] != $admin['token']) {
$this->logout(); $this->logined = false; //重置登录状态
Session::delete("admin");
Cookie::delete("keeplogin");
return false; return false;
} }
} }