From dca7ff97187a7a85feab9b1e0be86e52dfacbf60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= Date: Sat, 18 Sep 2021 18:59:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5admin=E4=B8=8Elibrary?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Auth.php | 15 +---- app/admin/controller/Base.php | 10 +-- app/admin/controller/Index.php | 2 +- app/admin/controller/Login.php | 2 +- app/admin/controller/Menu.php | 10 +-- app/admin/controller/Oplog.php | 9 +-- app/admin/controller/Queue.php | 6 +- app/admin/controller/User.php | 16 ++--- app/admin/controller/api/Queue.php | 7 ++- app/admin/controller/api/Runtime.php | 9 +-- app/admin/controller/api/Upload.php | 5 +- app/admin/model/SystemAuth.php | 73 ---------------------- app/admin/model/SystemBase.php | 77 ----------------------- app/admin/model/SystemConfig.php | 15 ----- app/admin/model/SystemMenu.php | 49 --------------- app/admin/model/SystemNode.php | 43 ------------- app/admin/model/SystemOplog.php | 37 ----------- app/admin/model/SystemQueue.php | 72 ---------------------- app/admin/model/SystemUser.php | 92 ---------------------------- app/data/controller/user/Balance.php | 2 +- 20 files changed, 31 insertions(+), 520 deletions(-) delete mode 100644 app/admin/model/SystemAuth.php delete mode 100644 app/admin/model/SystemBase.php delete mode 100644 app/admin/model/SystemConfig.php delete mode 100644 app/admin/model/SystemMenu.php delete mode 100644 app/admin/model/SystemNode.php delete mode 100644 app/admin/model/SystemOplog.php delete mode 100644 app/admin/model/SystemQueue.php delete mode 100644 app/admin/model/SystemUser.php diff --git a/app/admin/controller/Auth.php b/app/admin/controller/Auth.php index 0ce910b39..df10c6e49 100644 --- a/app/admin/controller/Auth.php +++ b/app/admin/controller/Auth.php @@ -16,10 +16,10 @@ namespace app\admin\controller; -use app\admin\model\SystemAuth; -use app\admin\model\SystemNode; use think\admin\Controller; use think\admin\helper\QueryHelper; +use think\admin\model\SystemAuth; +use think\admin\model\SystemNode; use think\admin\service\AdminService; /** @@ -49,9 +49,6 @@ class Auth extends Controller /** * 添加系统权限 * @auth true - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function add() { @@ -61,9 +58,6 @@ class Auth extends Controller /** * 编辑系统权限 * @auth true - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function edit() { @@ -73,7 +67,6 @@ class Auth extends Controller /** * 修改权限状态 * @auth true - * @throws \think\db\exception\DbException */ public function state() { @@ -86,7 +79,6 @@ class Auth extends Controller /** * 删除系统权限 * @auth true - * @throws \think\db\exception\DbException */ public function remove() { @@ -97,9 +89,6 @@ class Auth extends Controller * 权限配置节点 * @auth true * @throws \ReflectionException - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function apply() { diff --git a/app/admin/controller/Base.php b/app/admin/controller/Base.php index 3248fa931..3d277afdb 100644 --- a/app/admin/controller/Base.php +++ b/app/admin/controller/Base.php @@ -16,9 +16,9 @@ namespace app\admin\controller; -use app\admin\model\SystemBase; use think\admin\Controller; use think\admin\helper\QueryHelper; +use think\admin\model\SystemBase; /** * 数据字典管理 @@ -50,9 +50,6 @@ class Base extends Controller /** * 添加数据字典 * @auth true - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function add() { @@ -62,9 +59,6 @@ class Base extends Controller /** * 编辑数据字典 * @auth true - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function edit() { @@ -96,7 +90,6 @@ class Base extends Controller /** * 修改数据状态 * @auth true - * @throws \think\db\exception\DbException */ public function state() { @@ -106,7 +99,6 @@ class Base extends Controller /** * 删除数据记录 * @auth true - * @throws \think\db\exception\DbException */ public function remove() { diff --git a/app/admin/controller/Index.php b/app/admin/controller/Index.php index a24389b7d..94b3eea97 100644 --- a/app/admin/controller/Index.php +++ b/app/admin/controller/Index.php @@ -16,8 +16,8 @@ namespace app\admin\controller; -use app\admin\model\SystemUser; use think\admin\Controller; +use think\admin\model\SystemUser; use think\admin\service\AdminService; use think\admin\service\MenuService; diff --git a/app/admin/controller/Login.php b/app/admin/controller/Login.php index 84fb84877..9b607a16e 100644 --- a/app/admin/controller/Login.php +++ b/app/admin/controller/Login.php @@ -16,9 +16,9 @@ namespace app\admin\controller; -use app\admin\model\SystemUser; use think\admin\Controller; use think\admin\extend\CodeExtend; +use think\admin\model\SystemUser; use think\admin\service\AdminService; use think\admin\service\CaptchaService; use think\admin\service\SystemService; diff --git a/app/admin/controller/Menu.php b/app/admin/controller/Menu.php index 1356868ed..41d19fcc8 100644 --- a/app/admin/controller/Menu.php +++ b/app/admin/controller/Menu.php @@ -16,9 +16,9 @@ namespace app\admin\controller; -use app\admin\model\SystemMenu; use think\admin\Controller; use think\admin\extend\DataExtend; +use think\admin\model\SystemMenu; use think\admin\service\AdminService; use think\admin\service\MenuService; use think\admin\service\NodeService; @@ -75,9 +75,6 @@ class Menu extends Controller /** * 添加系统菜单 * @auth true - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function add() { @@ -88,9 +85,6 @@ class Menu extends Controller /** * 编辑系统菜单 * @auth true - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function edit() { @@ -134,7 +128,6 @@ class Menu extends Controller /** * 修改菜单状态 * @auth true - * @throws \think\db\exception\DbException */ public function state() { @@ -148,7 +141,6 @@ class Menu extends Controller /** * 删除系统菜单 * @auth true - * @throws \think\db\exception\DbException */ public function remove() { diff --git a/app/admin/controller/Oplog.php b/app/admin/controller/Oplog.php index dd73f06a6..225d73cbb 100644 --- a/app/admin/controller/Oplog.php +++ b/app/admin/controller/Oplog.php @@ -16,9 +16,11 @@ namespace app\admin\controller; -use app\admin\model\SystemOplog; +use Exception; +use Ip2Region; use think\admin\Controller; use think\admin\helper\QueryHelper; +use think\admin\model\SystemOplog; use think\exception\HttpResponseException; /** @@ -56,7 +58,7 @@ class Oplog extends Controller */ protected function _index_page_filter(array &$data) { - $region = new \Ip2Region(); + $region = new Ip2Region(); foreach ($data as &$vo) { $isp = $region->btreeSearch($vo['geoip']); $vo['geoisp'] = str_replace(['内网IP', '0', '|'], '', $isp['region'] ?? '') ?: '-'; @@ -75,7 +77,7 @@ class Oplog extends Controller $this->success('日志清理成功！'); } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { $this->error("日志清理失败，{$exception->getMessage()}"); } } @@ -83,7 +85,6 @@ class Oplog extends Controller /** * 删除系统日志 * @auth true - * @throws \think\db\exception\DbException */ public function remove() { diff --git a/app/admin/controller/Queue.php b/app/admin/controller/Queue.php index 4085c9540..ac3e187dd 100644 --- a/app/admin/controller/Queue.php +++ b/app/admin/controller/Queue.php @@ -16,9 +16,10 @@ namespace app\admin\controller; -use app\admin\model\SystemQueue; +use Exception; use think\admin\Controller; use think\admin\helper\QueryHelper; +use think\admin\model\SystemQueue; use think\admin\service\AdminService; use think\admin\service\ProcessService; use think\admin\service\QueueService; @@ -80,7 +81,7 @@ class Queue extends Controller $this->success('任务重置成功！', $queue->code); } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { $this->error($exception->getMessage()); } } @@ -97,7 +98,6 @@ class Queue extends Controller /** * 删除系统任务 * @auth true - * @throws \think\db\exception\DbException */ public function remove() { diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php index a67498f84..56638d319 100644 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -16,11 +16,11 @@ namespace app\admin\controller; -use app\admin\model\SystemAuth; -use app\admin\model\SystemBase; -use app\admin\model\SystemUser; use think\admin\Controller; use think\admin\helper\QueryHelper; +use think\admin\model\SystemAuth; +use think\admin\model\SystemBase; +use think\admin\model\SystemUser; use think\admin\service\AdminService; use think\model\Relation; @@ -70,9 +70,6 @@ class User extends Controller /** * 添加系统用户 * @auth true - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function add() { @@ -82,9 +79,6 @@ class User extends Controller /** * 编辑系统用户 * @auth true - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\DbException - * @throws \think\db\exception\ModelNotFoundException */ public function edit() { @@ -103,7 +97,7 @@ class User extends Controller $this->_applyFormToken(); if ($this->request->isGet()) { $this->verify = false; - $this->_form(SystemUser::class, 'pass'); + SystemUser::mForm('pass'); } else { $data = $this->_vali([ 'id.require' => '用户ID不能为空！', @@ -161,7 +155,6 @@ class User extends Controller /** * 修改用户状态 * @auth true - * @throws \think\db\exception\DbException */ public function state() { @@ -175,7 +168,6 @@ class User extends Controller /** * 删除系统用户 * @auth true - * @throws \think\db\exception\DbException */ public function remove() { diff --git a/app/admin/controller/api/Queue.php b/app/admin/controller/api/Queue.php index 22444db16..6f3c2241f 100644 --- a/app/admin/controller/api/Queue.php +++ b/app/admin/controller/api/Queue.php @@ -16,6 +16,7 @@ namespace app\admin\controller\api; +use Exception; use think\admin\Controller; use think\admin\service\AdminService; use think\admin\service\QueueService; @@ -61,7 +62,7 @@ class Queue extends Controller } } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { $this->error($exception->getMessage()); } } @@ -84,7 +85,7 @@ class Queue extends Controller } } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { $this->error($exception->getMessage()); } } @@ -102,7 +103,7 @@ class Queue extends Controller } else { echo '' . $message . ''; } - } catch (\Exception $exception) { + } catch (Exception $exception) { echo '' . $exception->getMessage() . ''; } else { echo '只有超级管理员才能操作！'; diff --git a/app/admin/controller/api/Runtime.php b/app/admin/controller/api/Runtime.php index 1f1252018..83baa7230 100644 --- a/app/admin/controller/api/Runtime.php +++ b/app/admin/controller/api/Runtime.php @@ -16,8 +16,9 @@ namespace app\admin\controller\api; -use app\admin\model\SystemConfig; +use Exception; use think\admin\Controller; +use think\admin\model\SystemConfig; use think\admin\service\AdminService; use think\admin\service\SystemService; use think\exception\HttpResponseException; @@ -43,7 +44,7 @@ class Runtime extends Controller $this->success('网站缓存加速成功！', 'javascript:location.reload()'); } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { $this->error($exception->getMessage()); } else { $this->error('只有超级管理员才能操作！'); @@ -63,7 +64,7 @@ class Runtime extends Controller $this->success('清空缓存日志成功！', 'javascript:location.reload()'); } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { $this->error($exception->getMessage()); } else { $this->error('只有超级管理员才能操作！'); @@ -111,7 +112,7 @@ class Runtime extends Controller $this->success('清理系统配置成功！', 'javascript:location.reload()'); } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { $this->error($exception->getMessage()); } else { $this->error('只有超级管理员才能操作！'); diff --git a/app/admin/controller/api/Upload.php b/app/admin/controller/api/Upload.php index 71414988f..4ec8ec647 100644 --- a/app/admin/controller/api/Upload.php +++ b/app/admin/controller/api/Upload.php @@ -16,6 +16,7 @@ namespace app\admin\controller\api; +use Exception; use think\admin\Controller; use think\admin\Storage; use think\admin\storage\AliossStorage; @@ -152,7 +153,7 @@ class Upload extends Controller } } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { $this->error($exception->getMessage()); } } @@ -198,7 +199,7 @@ class Upload extends Controller } } catch (HttpResponseException $exception) { throw $exception; - } catch (\Exception $exception) { + } catch (Exception $exception) { $this->error(lang($exception->getMessage())); } } diff --git a/app/admin/model/SystemAuth.php b/app/admin/model/SystemAuth.php deleted file mode 100644 index 6d90f6dbd..000000000 --- a/app/admin/model/SystemAuth.php +++ /dev/null @@ -1,73 +0,0 @@ -where(['status' => 1])->order('sort desc,id desc')->select()->toArray(); - } - - /** - * 删除权限事件 - * @param string $ids - */ - public function onAdminDelete(string $ids) - { - if (count($aids = str2arr($ids ?? '')) > 0) { - SystemNode::mk()->whereIn('auth', $aids)->delete(); - } - sysoplog($this->oplogType, "删除{$this->oplogName}[{$ids}]及授权配置"); - } - - /** - * 格式化创建时间 - * @param string $value - * @return string - */ - public function getCreateAtAttr(string $value): string - { - return format_datetime($value); - } -} \ No newline at end of file diff --git a/app/admin/model/SystemBase.php b/app/admin/model/SystemBase.php deleted file mode 100644 index 5ac7ed210..000000000 --- a/app/admin/model/SystemBase.php +++ /dev/null @@ -1,77 +0,0 @@ - $type, 'status' => 1, 'deleted' => 0]; - $bases = $this->where($map)->order('sort desc,id asc')->column('code,name,content', 'code'); - if (count($data) > 0) foreach ($data as &$vo) $vo[$bind] = $bases[$vo[$field]] ?? []; - return $bases; - } - - /** - * 获取所有数据类型 - * @param boolean $simple - * @return array - */ - public function types(bool $simple = false): array - { - $types = $this->where(['deleted' => 0])->distinct(true)->column('type'); - if (empty($types) && empty($simple)) $types = ['身份权限']; - return $types; - } - - /** - * 格式化创建时间 - * @param string $value - * @return string - */ - public function getCreateAtAttr(string $value): string - { - return format_datetime($value); - } -} \ No newline at end of file diff --git a/app/admin/model/SystemConfig.php b/app/admin/model/SystemConfig.php deleted file mode 100644 index 62356347b..000000000 --- a/app/admin/model/SystemConfig.php +++ /dev/null @@ -1,15 +0,0 @@ - 0 ? format_datetime($value) : ''; - } - - /** - * 执行结束时间处理 - * @param mixed $value - * @param array $data - * @return string - */ - public function getOuterTimeAttr($value, array $data): string - { - if ($value > 0 && $value > $data['enter_time']) { - return sprintf(" %.4f 秒", $data['outer_time'] - $data['enter_time']); - } else { - return ' - '; - } - } - - /** - * 格式化创建时间 - * @param string $value - * @return string - */ - public function getCreateAtAttr(string $value): string - { - return format_datetime($value); - } -} \ No newline at end of file diff --git a/app/admin/model/SystemUser.php b/app/admin/model/SystemUser.php deleted file mode 100644 index bbcbb3612..000000000 --- a/app/admin/model/SystemUser.php +++ /dev/null @@ -1,92 +0,0 @@ -where($map)->order('sort desc,id desc'); - if (count($data) > 0) { - $users = $query->whereIn('id', array_unique(array_column($data, $field)))->column($fields, 'id'); - foreach ($data as &$vo) $vo[$target] = $users[$vo[$field]] ?? []; - return $users; - } else { - return $query->column($fields, 'id'); - } - } - - /** - * 关联身份权限 - * @return HasOne - */ - public function userinfo(): HasOne - { - return $this->hasOne(SystemBase::class, 'code', 'usertype')->where([ - 'type' => '身份权限', 'status' => 1, 'deleted' => 0, - ]); - } - - /** - * 格式化登录时间 - * @param string $value - * @return string - */ - public function getLoginAtAttr(string $value): string - { - return format_datetime($value); - } - - /** - * 格式化创建时间 - * @param string $value - * @return string - */ - public function getCreateAtAttr(string $value): string - { - return format_datetime($value); - } -} \ No newline at end of file diff --git a/app/data/controller/user/Balance.php b/app/data/controller/user/Balance.php index 169b371e7..2e155f7cf 100644 --- a/app/data/controller/user/Balance.php +++ b/app/data/controller/user/Balance.php @@ -2,7 +2,7 @@ namespace app\data\controller\user; -use app\admin\model\SystemUser; +use think\admin\model\SystemUser; use app\data\model\DataUser; use app\data\model\DataUserBalance; use app\data\service\UserAdminService;