From 1d528383ed9a34fc65652d1e5608c1672d8a00b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Fri, 8 Mar 2024 19:31:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=20Admin=20?= =?UTF-8?q?=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Auth.php | 79 ++++++++-------- app/admin/controller/Config.php | 2 +- app/admin/controller/Index.php | 1 - app/admin/controller/Menu.php | 1 - app/admin/controller/User.php | 22 ++--- app/admin/lang/en-us.php | 5 + app/admin/view/auth/form.html | 156 ++++++++++++++++++++++++++++---- app/admin/view/auth/index.html | 12 +-- app/admin/view/main.html | 2 +- app/admin/view/table.html | 2 +- app/admin/view/user/form.html | 10 +- app/admin/view/user/index.html | 2 +- 12 files changed, 205 insertions(+), 89 deletions(-) diff --git a/app/admin/controller/Auth.php b/app/admin/controller/Auth.php index c7310c065..fb4d0eae6 100644 --- a/app/admin/controller/Auth.php +++ b/app/admin/controller/Auth.php @@ -47,24 +47,6 @@ class Auth extends Controller }); } - /** - * 添加系统权限 - * @auth true - */ - public function add() - { - SystemAuth::mForm('form'); - } - - /** - * 编辑系统权限 - * @auth true - */ - public function edit() - { - SystemAuth::mForm('form'); - } - /** * 修改权限状态 * @auth true @@ -86,17 +68,36 @@ class Auth extends Controller SystemAuth::mDelete(); } + /** - * 权限配置节点 + * 添加系统权限 * @auth true - * @throws \ReflectionException */ - public function apply() + public function add() { - $map = $this->_vali(['auth.require#id' => '权限ID不能为空！']); - if (input('action') === 'get') { + SystemAuth::mForm('form'); + } + + /** + * 编辑系统权限 + * @auth true + */ + public function edit() + { + SystemAuth::mForm('form'); + } + + /** + * 表单后置数据处理 + * @param array $data + */ + protected function _form_filter(array $data) + { + if ($this->request->isGet()) { + $this->title = empty($data['title']) ? "添加访问授权" : "编辑【{$data['title']}】授权"; + } elseif ($this->request->post('action') === 'json') { if ($this->app->isDebug()) AdminService::clear(); - $ztree = AdminService::getTree(SystemNode::mk()->where($map)->column('node')); + $ztree = AdminService::getTree(empty($data['id']) ? [] : SystemNode::mk()->where(['auth' => $data['id']])->column('node')); usort($ztree, static function ($a, $b) { if (explode('-', $a['node'])[0] !== explode('-', $b['node'])[0]) { if (stripos($a['node'], 'plugin-') === 0) return 1; @@ -106,28 +107,26 @@ class Auth extends Controller [$ps, $cs] = [Plugin::get(), (array)$this->app->config->get('app.app_names', [])]; foreach ($ztree as &$n) $n['title'] = lang($cs[$n['node']] ?? (($ps[$n['node']] ?? [])['name'] ?? $n['title'])); $this->success('获取权限节点成功！', $ztree); - } elseif (input('action') === 'save') { - [$post, $data] = [$this->request->post(), []]; - foreach ($post['nodes'] ?? [] as $node) { - $data[] = ['auth' => $map['auth'], 'node' => $node]; - } - SystemNode::mk()->where($map)->delete(); - SystemNode::mk()->insertAll($data); - sysoplog('系统权限管理', "配置系统权限[{$map['auth']}]授权成功"); - $this->success('访问权限修改成功！', 'javascript:history.back()'); - } else { - SystemAuth::mForm('apply'); + } elseif (empty($data['nodes'])) { + $this->error('未配置功能节点！'); } } /** - * 表单后置数据处理 - * @param array $data + * 节点更新处理 + * @param boolean $state + * @param array $post + * @return void */ - protected function _apply_form_filter(array $data) + protected function _form_result(bool $state, array $post) { - if ($this->request->isGet()) { - $this->title = "编辑【{$data['title']}】授权"; + if ($state && $this->request->post('action') === 'save') { + [$map, $data] = [['auth' => $post['id']], []]; + foreach ($post['nodes'] ?? [] as $node) $data[] = $map + ['node' => $node]; + SystemNode::mk()->where($map)->delete(); + count($data) > 0 && SystemNode::mk()->insertAll($data); + sysoplog('系统权限管理', "配置系统权限[{$map['auth']}]授权成功"); + $this->success('权限修改成功！', 'javascript:history.back()'); } } } diff --git a/app/admin/controller/Config.php b/app/admin/controller/Config.php index f2bb67135..3eea6fb67 100644 --- a/app/admin/controller/Config.php +++ b/app/admin/controller/Config.php @@ -63,7 +63,7 @@ class Config extends Controller $this->thinkadmin = ModuleService::getLibrarys('zoujingli/think-library'); if (AdminService::isSuper() && $this->app->session->get('user.password') === md5('admin')) { $url = url('admin/index/pass', ['id' => AdminService::getUserId()]); - $this->showErrorMessage = "超级管理员账号的密码未修改，建议立即修改密码！"; + $this->showErrorMessage = lang("超级管理员账号的密码未修改，建议立即修改密码！", [$url]); } uasort($this->plugins, static function ($a, $b) { if ($a['space'] === $b['space']) return 0; diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index 89cad078e..8e4a26b04 100644 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -30,7 +30,6 @@ class Index extends Controller { /** * 显示后台首页 - * @throws \ReflectionException * @throws \think\admin\Exception * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\DbException diff --git a/app/admin/controller/Menu.php b/app/admin/controller/Menu.php index 4e2ac5f6a..68a3063bd 100644 --- a/app/admin/controller/Menu.php +++ b/app/admin/controller/Menu.php @@ -94,7 +94,6 @@ class Menu extends Controller /** * 表单数据处理 * @param array $vo - * @throws \ReflectionException */ protected function _form_filter(array &$vo) { diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php index 1ed059ee2..189b2a4bc 100644 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -116,30 +116,30 @@ class User extends Controller protected function _form_filter(array &$data) { if ($this->request->isPost()) { - // 账号权限绑定处理 + // 检查资料是否完整 + empty($data['username']) && $this->error('登录账号不能为空！'); + if ($data['username'] !== AdminService::getSuperName()) { + empty($data['authorize']) && $this->error('未配置权限！'); + } + // 处理上传的权限格式 $data['authorize'] = arr2str($data['authorize'] ?? []); - if (isset($data['id']) && $data['id'] > 0) { - unset($data['username']); - } else { + if (empty($data['id'])) { // 检查账号是否重复 - if (empty($data['username'])) { - $this->error('登录账号不能为空！'); - } $map = ['username' => $data['username'], 'is_deleted' => 0]; if (SystemUser::mk()->where($map)->count() > 0) { $this->error("账号已经存在，请使用其它账号！"); } // 新添加的用户密码与账号相同 $data['password'] = md5($data['username']); + } else { + unset($data['username']); } } else { // 权限绑定处理 $data['authorize'] = str2arr($data['authorize'] ?? ''); - // 用户身份数据 + $this->auths = SystemAuth::items(); $this->bases = SystemBase::items('身份权限'); - // 用户权限管理 - $this->superName = AdminService::getSuperName(); - $this->authorizes = SystemAuth::items(); + $this->super = AdminService::getSuperName(); } } diff --git a/app/admin/lang/en-us.php b/app/admin/lang/en-us.php index 3183728dd..f98d1369c 100644 --- a/app/admin/lang/en-us.php +++ b/app/admin/lang/en-us.php @@ -36,12 +36,16 @@ $extra['点击可复制【服务启动指令】'] = "Click to copy the 'Service $extra['待处理 %s 个任务，处理中 %s 个任务，已完成 %s 个任务，已失败 %s 个任务。'] = 'There are %s tasks to be processed, %s tasks in progress, %s tasks completed, and %s tasks failed.'; $extra['确定要切换到生产模式运行吗？'] = 'Are you sure you want to switch to Production mode?'; $extra['确定要切换到开发模式运行吗？'] = 'Are you sure you want to switch to Development mode?'; +$extra["超级管理员账号的密码未修改，建议立即修改密码！"] = "The super administrator password has not been changed. Suggest changing password."; $extra['等待处理'] = 'Pending'; $extra['正在处理'] = 'Processing'; $extra['处理完成'] = 'Completed'; $extra['处理失败'] = 'Failed'; +$extra['条件搜索'] = 'Search'; +$extra['批量删除'] = 'Batch Delete'; + $extra['上传进度 %s'] = 'Upload progress %s'; $extra['文件上传出错！'] = 'File upload error.'; $extra['文件上传失败！'] = 'File upload failed.'; @@ -61,6 +65,7 @@ return array_merge($extra, [ '配色方案' => 'Color scheme', '立即登录' => 'Login', '退出登录' => 'Logout', + '系统提示：' => 'System Notify: ', '清空日志缓存成功！' => 'Successfully cleared the log cache.', '获取任务进度成功！' => 'Successfully obtained task progress.', '网站缓存加速成功！' => 'Website cache acceleration successful.', diff --git a/app/admin/view/auth/form.html b/app/admin/view/auth/form.html index 23cd2e2b7..b1961ba06 100644 --- a/app/admin/view/auth/form.html +++ b/app/admin/view/auth/form.html @@ -1,25 +1,143 @@ -
+{extend name='main'} -
+{block name="button"} + + +{/block} - +{block name="content"} +
+ +
+ + +
+ {:lang('功能节点')}Auth Nodes +
    +
    +
    + {notempty name='vo.id'}{/notempty} +
    + + +
    +
    + +
    +{/block} - +{block name="script"} + +{/block} -
    +{block name="style"} + +{/block} \ No newline at end of file diff --git a/app/admin/view/auth/index.html b/app/admin/view/auth/index.html index 35230fa4a..ee0995c89 100644 --- a/app/admin/view/auth/index.html +++ b/app/admin/view/auth/index.html @@ -2,7 +2,7 @@ {block name="button"} - + @@ -37,7 +37,7 @@ // 数据状态切换操作 layui.form.on('switch(StatusSwitchRoleTable)', function (obj) { - var data = {id: obj.value, status: obj.elem.checked > 0 ? 1 : 0}; + let data = {id: obj.value, status: obj.elem.checked > 0 ? 1 : 0}; $.form.load("{:url('state')}", data, 'post', function (ret) { if (ret.code < 1) $.msg.error(ret.info, 3, function () { $('#RoleTable').trigger('reload'); @@ -66,15 +66,11 @@ {/block} \ No newline at end of file diff --git a/app/admin/view/main.html b/app/admin/view/main.html index bc3b8a62d..a698dd75e 100644 --- a/app/admin/view/main.html +++ b/app/admin/view/main.html @@ -13,7 +13,7 @@
    {notempty name='showErrorMessage'}
    - 系统提示：{$showErrorMessage|raw} + {:lang('系统提示：')}{$showErrorMessage|raw}
    {/notempty} {block name='content'}{/block} diff --git a/app/admin/view/table.html b/app/admin/view/table.html index 83fdb3566..fef73feec 100644 --- a/app/admin/view/table.html +++ b/app/admin/view/table.html @@ -13,7 +13,7 @@
    {notempty name='showErrorMessage'}
    - 系统提示：{$showErrorMessage|raw} + {:lang('系统提示：')}{$showErrorMessage|raw}
    {/notempty} {block name='content'}{/block} diff --git a/app/admin/view/user/form.html b/app/admin/view/user/form.html index 556b5a6ff..d7eadce3b 100644 --- a/app/admin/view/user/form.html +++ b/app/admin/view/user/form.html @@ -13,7 +13,7 @@
    {/if} - {if !empty($authorizes)} + {if !empty($auths)}
    访问权限Role Permission
    - {if isset($vo.username) and $vo.username eq $superName} + {if isset($vo.username) and $vo.username eq $super} 超级用户拥所有访问权限，不需要配置权限。 - {else}{foreach $authorizes as $authorize} + {else}{foreach $auths as $authorize}