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

modified 完善细节

Browse Source
This commit is contained in:
zhaoxiang 2020-05-14 16:45:01 +08:00
parent 3d0cd21a76
commit 7d30a9f11c
4 changed files with 48 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
application/admin/controller/Auth.php
View File

@ -98,29 +98,13 @@ class Auth extends Base {
* @author zhaoxiang <zhaoxiang051405@gmail.com> * @author zhaoxiang <zhaoxiang051405@gmail.com>
*/ */
public function add() { public function add() {
$rules = []; $res = AdminAuthGroup::create([
$postData = $this->request->post(); 'name' => $this->request->post('name', ''),
if ($postData['rules']) { 'description' => $this->request->post('description', '')
$rules = $postData['rules']; ]);
$rules = array_filter($rules);
}
unset($postData['rules']);
$res = AdminAuthGroup::create($postData);
if ($res === false) { if ($res === false) {
return $this->buildFailed(ReturnCode::DB_SAVE_ERROR); return $this->buildFailed(ReturnCode::DB_SAVE_ERROR);
} }
if ($rules) {
$insertData = [];
foreach ($rules as $value) {
if ($value) {
$insertData[] = [
'group_id' => $res->id,
'url' => $value
];
}
}
(new AdminAuthRule())->saveAll($insertData);
}
return $this->buildSuccess(); return $this->buildSuccess();
} }
@ -154,12 +138,10 @@ class Auth extends Base {
* @author zhaoxiang <zhaoxiang051405@gmail.com> * @author zhaoxiang <zhaoxiang051405@gmail.com>
*/ */
public function edit() { public function edit() {
$postData = $this->request->post(); $res = AdminAuthGroup::update([
if ($postData['rules']) { 'name' => $this->request->post('name', ''),
$this->editRule(); 'description' => $this->request->post('description', '')
} ]);
unset($postData['rules']);
$res = AdminAuthGroup::update($postData);
if ($res === false) { if ($res === false) {
return $this->buildFailed(ReturnCode::DB_SAVE_ERROR); return $this->buildFailed(ReturnCode::DB_SAVE_ERROR);
} }
@ -262,30 +244,33 @@ class Auth extends Base {
* @throws \think\exception\DbException * @throws \think\exception\DbException
* @author zhaoxiang <zhaoxiang051405@gmail.com> * @author zhaoxiang <zhaoxiang051405@gmail.com>
*/ */
private function editRule() { public function editRule() {
$postData = $this->request->post(); $id = $this->request->post('id', 0);
$needAdd = []; $rules = $this->request->post('rules', []);
$has = (new AdminAuthRule())->where(['group_id' => $postData['id']])->select(); if ($rules) {
$has = Tools::buildArrFromObj($has); $needAdd = [];
$hasRule = array_column($has, 'url'); $has = (new AdminAuthRule())->where(['group_id' => $id])->select();
$needDel = array_flip($hasRule); $has = Tools::buildArrFromObj($has);
foreach ($postData['rules'] as $key => $value) { $hasRule = array_column($has, 'url');
if (!empty($value)) { $needDel = array_flip($hasRule);
if (!in_array($value, $hasRule)) { foreach ($rules as $key => $value) {
$data['url'] = $value; if (!empty($value)) {
$data['group_id'] = $postData['id']; if (!in_array($value, $hasRule)) {
$needAdd[] = $data; $data['url'] = $value;
} else { $data['group_id'] = $id;
unset($needDel[$value]); $needAdd[] = $data;
} else {
unset($needDel[$value]);
}
} }
} }
} if (count($needAdd)) {
if (count($needAdd)) { (new AdminAuthRule())->saveAll($needAdd);
(new AdminAuthRule())->saveAll($needAdd); }
} if (count($needDel)) {
if (count($needDel)) { $urlArr = array_keys($needDel);
$urlArr = array_keys($needDel); (new AdminAuthRule())->whereIn('url', $urlArr)->where('group_id', $id)->delete();
(new AdminAuthRule())->whereIn('url', $urlArr)->where('group_id', $postData['id'])->delete(); }
} }
} }
} }

2
composer.json
View File

@ -17,7 +17,7 @@
} }
], ],
"require": { "require": {
"php": ">=5.6.0", "php": ">=7.0",
"topthink/framework": "5.1.*", "topthink/framework": "5.1.*",
"topthink/think-migration": "^2.0", "topthink/think-migration": "^2.0",
"guzzlehttp/guzzle": "^6.5" "guzzlehttp/guzzle": "^6.5"

10
database/migrations/20190513155519_ini_admin_menu.php
View File

@ -700,6 +700,16 @@ class IniAdminMenu extends Migrator {
'hide' => 0, 'hide' => 0,
'icon' => '', 'icon' => '',
'level' => 0 'level' => 0
], [
'id' => 71,
'name' => '编辑权限细节',
'fid' => 15,
'url' => 'admin/Auth/editRule',
'auth' => 0,
'sort' => 0,
'hide' => 0,
'icon' => '',
'level' => 0
] ]
]; ];

4
route/route.php
View File

@ -118,6 +118,10 @@ Route::group('admin', function() {
'admin/Auth/delMember', 'admin/Auth/delMember',
['method' => 'get'] ['method' => 'get']
], ],
'editRule' => [
'admin/Auth/editRule',
['method' => 'post']
],
'edit' => [ 'edit' => [
'admin/Auth/edit', 'admin/Auth/edit',
['method' => 'post'] ['method' => 'post']