blackteay/ApiAdmin
1
0
Fork 0
mirror of https://gitee.com/apiadmin/ApiAdmin.git synced 2025-04-25 19:06:35 +08:00
Code Issues Projects Releases Wiki Activity

modified 登录接口返回登录菜单数据

Browse Source
This commit is contained in:
zhaoxiang 2020-06-14 14:49:09 +08:00
parent 0e60408a66
commit 1e0d789424
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
application/admin/controller/Login.php
View File

@ -64,6 +64,7 @@ class Login extends Base {
return $this->buildFailed(ReturnCode::LOGIN_ERROR, '用户名密码不正确'); return $this->buildFailed(ReturnCode::LOGIN_ERROR, '用户名密码不正确');
} }
$userInfo['access'] = $this->getAccess($userInfo['id']); $userInfo['access'] = $this->getAccess($userInfo['id']);
$userInfo['menu'] = $this->getAccessMenu($userInfo['id']);
$apiAuth = md5(uniqid() . time()); $apiAuth = md5(uniqid() . time());
cache('Login:' . $apiAuth, json_encode($userInfo), config('apiadmin.ONLINE_TIME')); cache('Login:' . $apiAuth, json_encode($userInfo), config('apiadmin.ONLINE_TIME'));
@ -98,30 +99,38 @@ class Login extends Base {
/** /**
* 获取当前用户的允许菜单 * 获取当前用户的允许菜单
* @param int $uid
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @author zhaoxiang <zhaoxiang051405@gmail.com> * @author zhaoxiang <zhaoxiang051405@gmail.com>
*/ */
public function getAccessMenu() { public function getAccessMenu($uid = 0) {
$isSupper = Tools::isAdministrator($this->userInfo['id']); if ($uid == 0) {
$uid = $this->userInfo['id'];
}
$returnData = [];
$isSupper = Tools::isAdministrator($uid);
if ($isSupper) { if ($isSupper) {
$access = (new AdminMenu())->where('router', '<>', '')->select(); $access = (new AdminMenu())->where('router', '<>', '')->select();
$access = Tools::listToTree(Tools::buildArrFromObj($access)); $returnData = Tools::listToTree(Tools::buildArrFromObj($access));
return $this->buildSuccess($access);
} else { } else {
$groups = AdminAuthGroupAccess::get(['uid' => $this->userInfo['id']]); $groups = AdminAuthGroupAccess::get(['uid' => $uid]);
if (isset($groups) && $groups->group_id) { if (isset($groups) && $groups->group_id) {
$access = (new AdminAuthRule())->whereIn('group_id', $groups->group_id)->select(); $access = (new AdminAuthRule())->whereIn('group_id', $groups->group_id)->select();
$access = array_unique(array_column(Tools::buildArrFromObj($access), 'url')); $access = array_unique(array_column(Tools::buildArrFromObj($access), 'url'));
array_push($access, ""); array_push($access, "");
$menus = (new AdminMenu())->whereIn('url', $access)->where('show', 1)->select(); $menus = (new AdminMenu())->whereIn('url', $access)->where('show', 1)->select();
$menus = Tools::listToTree(Tools::buildArrFromObj($menus)); $returnData = Tools::listToTree(Tools::buildArrFromObj($menus));
RouterTool::buildVueRouter($menus); RouterTool::buildVueRouter($returnData);
return $this->buildSuccess($menus);
} else {
return $this->buildSuccess();
} }
} }
if ($uid == 0) {
return $this->buildSuccess($returnData);
} else {
return $returnData;
}
} }
/** /**