From 4bfb7c16c808ccdcf94c3017b579d8243832161b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Sat, 28 Aug 2021 15:25:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Base.php | 4 ++-- app/admin/controller/Index.php | 2 +- app/admin/controller/Menu.php | 2 +- app/admin/controller/User.php | 10 +++++----- app/admin/model/SystemBase.php | 2 +- app/admin/model/SystemQueue.php | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/admin/controller/Base.php b/app/admin/controller/Base.php index 697a1ff04..1b384daa4 100644 --- a/app/admin/controller/Base.php +++ b/app/admin/controller/Base.php @@ -45,7 +45,7 @@ class Base extends Controller { $this->_query(SystemBase::class)->layTable(function () { $this->title = '数据字典管理'; - $this->types = (new SystemBase)->types(); + $this->types = SystemBase::mk()->types(); $this->type = input('get.type') ?: ($this->types[0] ?? '-'); }, function (QueryHelper $query) { $query->where(['deleted' => 0])->equal('type'); @@ -84,7 +84,7 @@ class Base extends Controller protected function _form_filter(array &$data) { if ($this->request->isGet()) { - $this->types = (new SystemBase)->types(); + $this->types = SystemBase::mk()->types(); $this->types[] = '--- 新增类型 ---'; $this->type = input('get.type') ?: ($this->types[0] ?? '-'); } else { diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index d3c7b6fb1..a24389b7d 100644 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -107,7 +107,7 @@ class Index extends Controller 'oldpassword.require' => '旧的密码不能为空！', 'password.confirm:repassword' => '两次输入的密码不一致！', ]); - $user = (new SystemUser)->find($id); + $user = SystemUser::mk()->find($id); if (empty($user)) $this->error('用户不存在！'); if (md5($data['oldpassword']) !== $user['password']) { $this->error('旧密码验证失败，请重新输入！'); diff --git a/app/admin/controller/Menu.php b/app/admin/controller/Menu.php index d486eca77..6016deea9 100644 --- a/app/admin/controller/Menu.php +++ b/app/admin/controller/Menu.php @@ -121,7 +121,7 @@ class Menu extends Controller } } /* 列出可选上级菜单 */ - $menus = (new SystemMenu)->order('sort desc,id asc')->column('id,pid,icon,url,node,title,params', 'id'); + $menus = SystemMenu::mk()->order('sort desc,id asc')->column('id,pid,icon,url,node,title,params', 'id'); $this->menus = DataExtend::arr2table(array_merge($menus, [['id' => '0', 'pid' => '-1', 'url' => '#', 'title' => '顶部菜单']])); if (isset($vo['id'])) foreach ($this->menus as $menu) if ($menu['id'] === $vo['id']) $vo = $menu; foreach ($this->menus as $key => $menu) if ($menu['spt'] >= 3 || $menu['url'] !== '#') unset($this->menus[$key]); diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php index bf3135262..6fbf539be 100644 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -57,7 +57,7 @@ class User extends Controller $this->type = input('type', 'index'); $this->_query(SystemUser::class)->layTable(function () { $this->title = '系统用户管理'; - $this->bases = (new SystemBase)->items('身份权限'); + $this->bases = SystemBase::mk()->items('身份权限'); }, function (QueryHelper $query) { // 加载对应数据列表 if ($this->type === 'index') { @@ -77,7 +77,7 @@ class User extends Controller */ protected function _page_filter(array &$data) { - (new SystemBase)->items('身份权限', $data, 'usertype', 'userinfo'); + SystemBase::mk()->items('身份权限', $data, 'usertype', 'userinfo'); } /** @@ -124,7 +124,7 @@ class User extends Controller 'repassword.require' => '重复密码不能为空！', 'repassword.confirm:password' => '两次输入的密码不一致！', ]); - $user = (new SystemUser)->find($data['id']); + $user = SystemUser::mk()->find($data['id']); if (!empty($user) && $user->save(['password' => md5($data['password'])])) { sysoplog('系统用户管理', "修改用户[{$data['id']}]密码成功"); $this->success('密码修改成功，请使用新密码登录！', ''); @@ -154,7 +154,7 @@ class User extends Controller $this->error('登录账号不能为空！'); } $map = ['username' => $data['username'], 'is_deleted' => 0]; - if ((new SystemUser)->where($map)->count() > 0) { + if (SystemUser::mk()->where($map)->count() > 0) { $this->error("账号已经存在，请使用其它账号！"); } // 新添加的用户密码与账号相同 @@ -162,7 +162,7 @@ class User extends Controller } } else { // 用户身份数据 - $this->bases = (new SystemBase)->items('身份权限'); + $this->bases = SystemBase::mk()->items('身份权限'); // 权限绑定处理 $data['authorize'] = str2arr($data['authorize'] ?? ''); // 用户权限管理 diff --git a/app/admin/model/SystemBase.php b/app/admin/model/SystemBase.php index a658cf250..a44634691 100644 --- a/app/admin/model/SystemBase.php +++ b/app/admin/model/SystemBase.php @@ -16,7 +16,7 @@ namespace app\admin\model; -use think\Model; +use think\admin\Model; /** * 数据字典数据模型 diff --git a/app/admin/model/SystemQueue.php b/app/admin/model/SystemQueue.php index 16a0e0954..73a4d4811 100644 --- a/app/admin/model/SystemQueue.php +++ b/app/admin/model/SystemQueue.php @@ -16,7 +16,7 @@ namespace app\admin\model; -use think\Model; +use think\admin\Model; /** * 系统任务数据模型