diff --git a/application/admin/controller/Auth.php b/application/admin/controller/Auth.php index d27a624c0..3e6f2bc80 100644 --- a/application/admin/controller/Auth.php +++ b/application/admin/controller/Auth.php @@ -15,8 +15,8 @@ namespace app\admin\controller; -use app\admin\service\NodeService; use library\Controller; +use library\service\AuthService; use think\Db; /** @@ -36,11 +36,6 @@ class Auth extends Controller * 系统权限管理 * @auth true * @menu true - * @throws \think\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\ModelNotFoundException - * @throws \think\exception\DbException - * @throws \think\exception\PDOException */ public function index() { @@ -58,34 +53,29 @@ class Auth extends Controller */ public function apply() { - $this->title = '权限配置节点'; - $auth = $this->request->post('id', '0'); - switch (strtolower($this->request->post('action'))) { - case 'get': // 获取权限配置 - $checks = Db::name('SystemAuthNode')->where(['auth' => $auth])->column('node'); - return $this->success('获取权限节点成功！', NodeService::getAuthTree($checks)); - case 'save': // 保存权限配置 - list($post, $data) = [$this->request->post(), []]; - foreach (isset($post['nodes']) ? $post['nodes'] : [] as $node) { - $data[] = ['auth' => $auth, 'node' => $node]; - } - Db::name('SystemAuthNode')->where(['auth' => $auth])->delete(); - Db::name('SystemAuthNode')->insertAll($data); - NodeService::applyUserAuth(); - return $this->success('权限授权更新成功！'); - default: - return $this->_form($this->table, 'apply'); + $map = ['auth' => input('id', '0')]; + $action = strtolower(input('action', '')); + if ($action === 'get') { + $checkeds = Db::name('SystemAuthNode')->where($map)->column('node'); + $this->success('获取权限节点成功！', AuthService::instance()->getTree($checkeds)); + } elseif ($action === 'save') { + list($post, $data) = [$this->request->post(), []]; + foreach (isset($post['nodes']) ? $post['nodes'] : [] as $node) { + $data[] = ['auth' => $map['auth'], 'node' => $node]; + } + Db::name('SystemAuthNode')->where($map)->delete(); + Db::name('SystemAuthNode')->insertAll($data); + AuthService::instance()->apply(true); + $this->success('权限授权更新成功！', 'javascript:history.back()'); + } else { + $this->title = '权限配置节点'; + $this->_form($this->table, 'apply'); } } /** * 添加系统权限 * @auth true - * @throws \think\Exception - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\ModelNotFoundException - * @throws \think\exception\DbException - * @throws \think\exception\PDOException */ public function add() { @@ -115,7 +105,7 @@ class Auth extends Controller public function refresh() { try { - NodeService::applyUserAuth(true); + AuthService::instance()->apply(true); $this->success('刷新系统授权成功！'); } catch (\think\exception\HttpResponseException $exception) { throw $exception; @@ -151,8 +141,6 @@ class Auth extends Controller /** * 删除系统权限 * @auth true - * @throws \think\Exception - * @throws \think\exception\PDOException */ public function remove() { diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php index 24d6c2bfe..733152d56 100644 --- a/application/admin/controller/Index.php +++ b/application/admin/controller/Index.php @@ -15,8 +15,9 @@ namespace app\admin\controller; -use app\admin\service\NodeService; use library\Controller; +use library\service\AuthService; +use library\service\MenuService; use library\tools\Data; use think\Console; use think\Db; @@ -40,9 +41,9 @@ class Index extends Controller public function index() { $this->title = '系统管理后台'; - NodeService::applyUserAuth(true); - $this->menus = NodeService::getMenuNodeTree(); - if (empty($this->menus) && !NodeService::islogin()) { + $auth = AuthService::instance()->apply(true); + $this->menus = MenuService::instance()->getTree(); + if (empty($this->menus) && !$auth->isLogin()) { $this->redirect('@admin/login'); } else { $this->fetch(); @@ -61,6 +62,7 @@ class Index extends Controller /** * 修改密码 + * @login true * @param integer $id * @throws \think\Exception * @throws \think\db\exception\DataNotFoundException @@ -71,10 +73,10 @@ class Index extends Controller public function pass($id) { $this->applyCsrfToken(); - if (intval($id) !== intval(session('admin_user.id'))) { + if (intval($id) !== intval(session('user.id'))) { $this->error('只能修改当前用户的密码！'); } - if (!NodeService::islogin()) { + if (!AuthService::instance()->isLogin()) { $this->error('需要登录才能操作哦！'); } if ($this->request->isGet()) { @@ -100,8 +102,6 @@ class Index extends Controller if (md5($data['oldpassword']) !== $user['password']) { $this->error('旧密码验证失败，请重新输入！'); } - $result = NodeService::checkpwd($data['password']); - if (empty($result['code'])) $this->error($result['msg']); if (Data::save('SystemUser', ['id' => $user['id'], 'password' => md5($data['password'])])) { $this->success('密码修改成功，下次请使用新密码登录！', ''); } else { @@ -112,20 +112,18 @@ class Index extends Controller /** * 修改用户资料 + * @login true * @param integer $id 会员ID - * @throws \think\Exception * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\ModelNotFoundException - * @throws \think\exception\DbException - * @throws \think\exception\PDOException */ public function info($id = 0) { - if (!NodeService::islogin()) { + if (!AuthService::instance()->isLogin()) { $this->error('需要登录才能操作哦！'); } $this->applyCsrfToken(); - if (intval($id) === intval(session('admin_user.id'))) { + if (intval($id) === intval(session('user.id'))) { $this->_form('SystemUser', 'admin@user/form', 'id', [], ['id' => $id]); } else { $this->error('只能修改登录用户的资料！'); @@ -138,9 +136,6 @@ class Index extends Controller */ public function clearRuntime() { - if (!NodeService::islogin()) { - $this->error('需要登录才能操作哦！'); - } try { Console::call('clear'); Console::call('xclean:session'); @@ -158,9 +153,6 @@ class Index extends Controller */ public function buildOptimize() { - if (!NodeService::islogin()) { - $this->error('需要登录才能操作哦！'); - } try { Console::call('optimize:route'); Console::call('optimize:schema'); diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php index 76ebf256c..5893b54eb 100644 --- a/application/admin/controller/Login.php +++ b/application/admin/controller/Login.php @@ -15,9 +15,10 @@ namespace app\admin\controller; -use app\admin\service\CaptchaService; -use app\admin\service\NodeService; use library\Controller; +use library\service\AuthService; +use library\service\CaptchaService; +use library\service\SystemService; use think\Db; use think\facade\Request; @@ -40,29 +41,28 @@ class Login extends Controller public function index() { if (Request::isGet()) { - if (NodeService::islogin()) { + if (AuthService::instance()->isLogin()) { $this->redirect('@admin'); } else { $this->title = '系统登录'; - $this->domain = Request::host(true); - if (!($this->loginskey = session('loginskey'))) session('loginskey', $this->loginskey = uniqid()); - $this->devmode = in_array($this->domain, ['127.0.0.1', 'localhost']) || is_numeric(stripos($this->domain, 'thinkadmin.top')); - $this->captcha = new CaptchaService(); + if (!($this->loginskey = session('loginskey'))) { + session('loginskey', $this->loginskey = uniqid()); + } + $this->devmode = SystemService::instance()->checkRunMode('dev'); + $this->captcha = CaptchaService::instance()->getAttrs(); $this->fetch(); } } else { - $data = $this->_input([ - 'username' => input('username'), 'password' => input('password'), - ], [ - 'username' => 'require|min:4', 'password' => 'require|min:4', - ], [ - 'username.require' => '登录账号不能为空！', + $data = $this->_vali([ + 'username.require' => '登录账号不能为空!', + 'username.min:4' => '登录账号长度不能少于4位有效字符！', 'password.require' => '登录密码不能为空！', - 'username.min' => '登录账号长度不能少于4位有效字符！', - 'password.min' => '登录密码长度不能少于4位有效字符！', + 'password.min:4' => '登录密码长度不能少于4位有效字符！', + 'verify.require' => '图形验证码不能为空！', + 'uniqid.require' => '图形验证标识不能为空！' ]); - if (!CaptchaService::check(input('verify'), input('uniqid'))) { - $this->error('图形验证码验证失败，请重新输入！'); + if (!CaptchaService::instance()->check($data['verify'], $data['uniqid'])) { + $this->error('图形验证码验证失败，请重新输入!'); } // 用户信息验证 $map = ['is_deleted' => '0', 'username' => $data['username']]; @@ -75,9 +75,9 @@ class Login extends Controller Db::name('SystemUser')->where(['id' => $user['id']])->update([ 'login_at' => Db::raw('now()'), 'login_ip' => Request::ip(), 'login_num' => Db::raw('login_num+1'), ]); + session('user', $user); session('loginskey', null); - session('admin_user', $user); - NodeService::applyUserAuth(true); + AuthService::instance()->apply(true); sysoplog('系统管理', '用户登录系统成功'); $this->success('登录成功', url('@admin')); } @@ -88,8 +88,8 @@ class Login extends Controller */ public function out() { - \think\facade\Session::clear(); - \think\facade\Session::destroy(); + $this->app->session->clear(); + $this->app->session->destroy(); $this->success('退出登录成功！', url('@admin/login')); } diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php index 1ff8abb92..f02372eb3 100644 --- a/application/admin/controller/Menu.php +++ b/application/admin/controller/Menu.php @@ -15,8 +15,8 @@ namespace app\admin\controller; -use app\admin\service\NodeService; use library\Controller; +use library\service\MenuService; use library\tools\Data; use think\Db; @@ -58,7 +58,7 @@ class Menu extends Controller { foreach ($data as &$vo) { if ($vo['url'] !== '#') { - $vo['url'] = url($vo['url']) . (empty($vo['params']) ? '' : "?{$vo['params']}"); + $vo['url'] = trim(url($vo['url']) . (empty($vo['params']) ? '' : "?{$vo['params']}"), '/\\'); } $vo['ids'] = join(',', Data::getArrSubIds($data, $vo['id'])); } @@ -119,7 +119,7 @@ class Menu extends Controller $vo['pid'] = $this->request->get('pid', '0'); } // 读取系统功能节点 - $this->nodes = NodeService::getMenuNodeList(); + $this->nodes = MenuService::instance()->getList(); } } diff --git a/application/admin/controller/Queue.php b/application/admin/controller/Queue.php index c6fe7af5a..cb5662d73 100644 --- a/application/admin/controller/Queue.php +++ b/application/admin/controller/Queue.php @@ -44,7 +44,7 @@ class Queue extends Controller */ public function index() { - if (session('admin_user.username') === 'admin') try { + if (session('user.username') === 'admin') try { $this->cmd = 'php ' . env('root_path') . 'think xtask:start'; $this->message = Console::call('xtask:state')->fetch(); } catch (\Exception $exception) { @@ -68,7 +68,7 @@ class Queue extends Controller } /** - * (WIN)创建任务监听进程 + * WIN开始监听任务 * @auth true */ public function processStart() @@ -83,7 +83,7 @@ class Queue extends Controller } /** - * (WIN)停止任务监听进程 + * WIN停止监听任务 * @auth true */ public function processStop() diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index e79818e58..d4ea991df 100644 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -15,7 +15,6 @@ namespace app\admin\controller; -use app\admin\service\NodeService; use library\Controller; use library\tools\Data; use think\Db; @@ -98,8 +97,6 @@ class User extends Controller if ($post['password'] !== $post['repassword']) { $this->error('两次输入的密码不一致！'); } - $result = NodeService::checkpwd($post['password']); - if (empty($result['code'])) $this->error($result['msg']); if (Data::save($this->table, ['id' => $post['id'], 'password' => md5($post['password'])], 'id')) { $this->success('密码修改成功，下次请使用新密码登录！', ''); } else { @@ -118,8 +115,6 @@ class User extends Controller public function _form_filter(&$data) { if ($this->request->isPost()) { - // 刷新系统授权 - NodeService::applyUserAuth(); // 用户权限处理 $data['authorize'] = (isset($data['authorize']) && is_array($data['authorize'])) ? join(',', $data['authorize']) : ''; // 用户账号重复检查 diff --git a/application/admin/controller/api/Plugs.php b/application/admin/controller/api/Plugs.php index ac9d067dc..b645eb869 100644 --- a/application/admin/controller/api/Plugs.php +++ b/application/admin/controller/api/Plugs.php @@ -15,7 +15,6 @@ namespace app\admin\controller\api; -use app\admin\service\NodeService; use library\Controller; use library\File; @@ -57,15 +56,13 @@ class Plugs extends Controller /** * 后台通用文件上传 + * @login true * @return \think\response\Json * @throws \think\Exception * @throws \think\exception\PDOException */ public function upload() { - if (!NodeService::islogin()) { - $this->error('访问授权失败，请重新登录授权再试！'); - } if (!($file = $this->getUploadFile()) || empty($file)) { return json(['uploaded' => false, 'error' => ['message' => '文件上传异常，文件可能过大或未上传']]); } diff --git a/application/admin/queue/Queue.php b/application/admin/queue/Queue.php deleted file mode 100644 index 22725008d..000000000 --- a/application/admin/queue/Queue.php +++ /dev/null @@ -1,79 +0,0 @@ -jobid > 0) { - if ($queue = Db::name('SystemQueue')->where(['id' => $this->jobid])->find()) { - $queue['time'] = time() + $wait; - $queue['title'] .= " - 来自任务{$this->jobid} 重发任务"; - unset($queue['id'], $queue['create_at'], $queue['desc']); - return Db::name('SystemQueue')->insert($queue) !== false; - } - } - return false; - } - - /** - * 执行异步任务 - * @param Input $input 输入对象 - * @param Output $output 输出对象 - * @param array $data 任务参数 - * @return mixed - */ - abstract function execute(Input $input, Output $output, array $data = []); -} \ No newline at end of file diff --git a/application/admin/service/NodeService.php b/application/admin/service/NodeService.php deleted file mode 100644 index 42d22dbff..000000000 --- a/application/admin/service/NodeService.php +++ /dev/null @@ -1,343 +0,0 @@ -= 6) { - return ['code' => 0, 'msg' => '密码必须大于6字符！']; - } - if (!preg_match("/^(?![\d]+$)(?![a-zA-Z]+$)(?![^\da-zA-Z]+$).{6,32}$/", $password)) { - return ['code' => 0, 'msg' => '密码必需包含大小写字母、数字、符号任意两者组合！']; - } else { - return ['code' => 1, 'msg' => '密码复杂度通过验证！']; - } - } - - /** - * 获取可选菜单节点 - * @return array - * @throws \ReflectionException - */ - public static function getMenuNodeList() - { - static $nodes = []; - if (count($nodes) > 0) return $nodes; - foreach (self::getMethodList() as $node => $method) if ($method['menu']) { - $nodes[] = ['node' => $node, 'title' => $method['title']]; - } - return $nodes; - } - - /** - * 获取系统菜单树数据 - * @return array - * @throws \ReflectionException - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\ModelNotFoundException - * @throws \think\exception\DbException - */ - public static function getMenuNodeTree() - { - $list = Db::name('SystemMenu')->where(['status' => '1'])->order('sort desc,id asc')->select(); - return self::buildMenuData(Data::arr2tree($list), self::getMethodList()); - } - - /** - * 后台主菜单权限过滤 - * @param array $menus 当前菜单列表 - * @param array $nodes 系统权限节点 - * @return array - * @throws \ReflectionException - */ - private static function buildMenuData($menus, $nodes) - { - foreach ($menus as $key => &$menu) { - if (!empty($menu['sub'])) $menu['sub'] = self::buildMenuData($menu['sub'], $nodes); - if (!empty($menu['sub'])) $menu['url'] = '#'; - elseif (preg_match('/^https?\:/i', $menu['url'])) continue; - elseif ($menu['url'] === '#') unset($menus[$key]); - else { - $node = join('/', array_slice(explode('/', preg_replace('/[\W]/', '/', $menu['url'])), 0, 3)); - $menu['url'] = url($menu['url']) . (empty($menu['params']) ? '' : "?{$menu['params']}"); - if (!self::checkAuth($node)) unset($menus[$key]); - } - } - return $menus; - } - - /** - * 获取授权节点列表 - * @return array - * @throws \ReflectionException - */ - public static function getAuthList() - { - static $nodes = []; - if (count($nodes) > 0) return $nodes; - $nodes = Cache::tag('system')->get('NodeAuthList', []); - if (count($nodes) > 0) return $nodes; - foreach (self::getMethodList() as $key => $node) { - if ($node['auth']) $nodes[$key] = $node['title']; - } - Cache::tag('system')->set('NodeAuthList', $nodes); - return $nodes; - } - - /** - * 强制验证访问权限 - * --- 需要加载控制器解析注释 - * @param null|string $node - * @return boolean - * @throws \ReflectionException - */ - public static function forceAuth($node = null) - { - if (session('admin_user.username') === 'admin') return true; - $real = is_null($node) ? self::current() : self::full($node); - list($module, $controller, $action) = explode('/', $real); - if (class_exists($class = App::parseClass($module, 'controller', $controller))) { - $reflection = new \ReflectionClass($class); - if ($reflection->hasMethod($action)) { - $comment = preg_replace("/\s/", '', $reflection->getMethod($action)->getDocComment()); - if (stripos($comment, '@authtrue') === false) return true; - return in_array($real, (array)session('admin_user.nodes')); - } - } - return true; - } - - /** - * 检查指定节点授权 - * --- 需要读取缓存或扫描所有节点 - * @param null|string $node - * @return boolean - * @throws \ReflectionException - */ - public static function checkAuth($node = null) - { - if (session('admin_user.username') === 'admin') return true; - $real = is_null($node) ? self::current() : self::full($node); - if (isset(self::getAuthList()[$real])) { - return in_array($real, (array)session('admin_user.nodes')); - } else { - return true; - } - } - - /** - * 获取授权节点列表 - * @param array $checkeds - * @return array - * @throws \ReflectionException - */ - public static function getAuthTree($checkeds = []) - { - static $nodes = []; - if (count($nodes) > 0) return $nodes; - foreach (self::getAuthList() as $node => $title) { - $pnode = substr($node, 0, strripos($node, '/')); - $nodes[$node] = ['node' => $node, 'title' => $title, 'pnode' => $pnode, 'checked' => in_array($node, $checkeds)]; - } - foreach (self::getClassList() as $node => $title) foreach (array_keys($nodes) as $key) { - if (stripos($key, "{$node}/") !== false) { - $pnode = substr($node, 0, strripos($node, '/')); - $nodes[$node] = ['node' => $node, 'title' => $title, 'pnode' => $pnode, 'checked' => in_array($node, $checkeds)]; - $nodes[$pnode] = ['node' => $pnode, 'title' => ucfirst($pnode), 'checked' => in_array($pnode, $checkeds)]; - } - } - return $nodes = Data::arr2tree($nodes, 'node', 'pnode', '_sub_'); - } - - /** - * 初始化用户权限 - * @param boolean $force 是否重置系统权限 - * @throws \think\db\exception\DataNotFoundException - * @throws \think\db\exception\ModelNotFoundException - * @throws \think\exception\DbException - */ - public static function applyUserAuth($force = false) - { - if ($force) { - Cache::tag('system')->rm('NodeAuthList'); - Cache::tag('system')->rm('NodeClassData'); - Cache::tag('system')->rm('NodeMethodData'); - } - if (($uid = session('admin_user.id'))) { - session('admin_user', Db::name('SystemUser')->where(['id' => $uid])->find()); - } - if (($aids = session('admin_user.authorize'))) { - $where = [['status', 'eq', '1'], ['id', 'in', explode(',', $aids)]]; - $subsql = Db::name('SystemAuth')->field('id')->where($where)->buildSql(); - session('admin_user.nodes', array_unique(Db::name('SystemAuthNode')->whereRaw("auth in {$subsql}")->column('node'))); - } else { - session('admin_user.nodes', []); - } - } - - /** - * 获取控制器节点列表 - * @return array - * @throws \ReflectionException - */ - public static function getClassList() - { - static $nodes = []; - if (count($nodes) > 0) return $nodes; - $nodes = Cache::tag('system')->get('NodeClassData', []); - if (count($nodes) > 0) return $nodes; - self::eachController(function (\ReflectionClass $reflection, $prenode) use (&$nodes) { - list($node, $comment) = [trim($prenode, ' / '), $reflection->getDocComment()]; - $nodes[$node] = preg_replace('/^\/\*\*\*(.*?)\*.*?$/', '$1', preg_replace("/\s/", '', $comment)); - if (stripos($nodes[$node], '@') !== false) $nodes[$node] = ''; - }); - Cache::tag('system')->set('NodeClassData', $nodes); - return $nodes; - } - - /** - * 获取方法节点列表 - * @return array - * @throws \ReflectionException - */ - public static function getMethodList() - { - static $nodes = []; - if (count($nodes) > 0) return $nodes; - $nodes = Cache::tag('system')->get('NodeMethodData', []); - if (count($nodes) > 0) return $nodes; - self::eachController(function (\ReflectionClass $reflection, $prenode) use (&$nodes) { - foreach ($reflection->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) { - $action = strtolower($method->getName()); - list($node, $comment) = ["{$prenode}{$action}", preg_replace("/\s/", '', $method->getDocComment())]; - $nodes[$node] = [ - 'auth' => stripos($comment, '@authtrue') !== false, - 'menu' => stripos($comment, '@menutrue') !== false, - 'title' => preg_replace('/^\/\*\*\*(.*?)\*.*?$/', '$1', $comment), - ]; - if (stripos($nodes[$node]['title'], '@') !== false) $nodes[$node]['title'] = ''; - } - }); - Cache::tag('system')->set('NodeMethodData', $nodes); - return $nodes; - } - - /** - * 控制器扫描回调 - * @param callable $callable - * @throws \ReflectionException - */ - public static function eachController($callable) - { - foreach (self::scanPath(env('app_path') . "*/controller/") as $file) { - if (!preg_match("|/(\w+)/controller/(.+)\.php$|", $file, $matches)) continue; - list($module, $controller) = [$matches[1], strtr($matches[2], '/', '.')]; - if (class_exists($class = substr(strtr(env('app_namespace') . $matches[0], '/', '\\'), 0, -4))) { - call_user_func($callable, new \ReflectionClass($class), Node::parseString("{$module}/{$controller}/")); - } - } - } - - /** - * 驼峰转下划线规则 - * @param string $node 节点名称 - * @return string - */ - public static function parseString($node) - { - if (count($nodes = explode('/', $node)) > 1) { - $dots = []; - foreach (explode('.', $nodes[1]) as $dot) { - $dots[] = trim(preg_replace("/[A-Z]/", "_\\0", $dot), "_"); - } - $nodes[1] = join('.', $dots); - } - return strtolower(join('/', $nodes)); - } - - /** - * 获取所有PHP文件列表 - * @param string $dirname 扫描目录 - * @param array $data 额外数据 - * @param string $ext 有文件后缀 - * @return array - */ - private static function scanPath($dirname, $data = [], $ext = 'php') - { - foreach (glob("{$dirname}*") as $file) { - if (is_dir($file)) { - $data = array_merge($data, self::scanPath("{$file}/")); - } elseif (is_file($file) && pathinfo($file, 4) === $ext) { - $data[] = str_replace('\\', '/', $file); - } - } - return $data; - } - -} diff --git a/application/admin/service/OplogService.php b/application/admin/service/OplogService.php deleted file mode 100644 index 7d71fc8fb..000000000 --- a/application/admin/service/OplogService.php +++ /dev/null @@ -1,54 +0,0 @@ -insert([ - 'node' => Node::current(), 'action' => $action, 'content' => $content, - 'geoip' => PHP_SAPI === 'cli' ? '127.0.0.1' : Request::ip(), - 'username' => PHP_SAPI === 'cli' ? 'cli' : (string)session('admin_user.username'), - ]); - } - - /** - * 清理系统日志 - * @return boolean - * @throws \think\Exception - * @throws \think\exception\PDOException - */ - public static function clear() - { - return Db::name('SystemLog')->where('1=1')->delete() !== false; - } -} diff --git a/application/admin/sys.php b/application/admin/sys.php index d542c0267..cfdfedc6b 100644 --- a/application/admin/sys.php +++ b/application/admin/sys.php @@ -13,11 +13,10 @@ // | github 代码仓库：https://github.com/zoujingli/ThinkAdmin // +---------------------------------------------------------------------- -use app\admin\service\CaptchaService; -use app\admin\service\NodeService; -use app\admin\service\OplogService; use library\File; -use think\Console; +use library\service\AuthService; +use library\service\CaptchaService; +use library\service\SystemService; use think\Db; use think\facade\Middleware; use think\facade\Route; @@ -32,7 +31,7 @@ if (!function_exists('auth')) { */ function auth($node) { - return NodeService::checkAuth($node); + return AuthService::instance()->check($node); } } @@ -40,18 +39,17 @@ if (!function_exists('sysdata')) { /** * JSON 数据读取与存储 * @param string $name 数据名称 - * @param array|null $value 数据内容 + * @param mixed $value 数据内容 * @return mixed - * @throws \think\Exception - * @throws \think\exception\PDOException + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\ModelNotFoundException */ - function sysdata($name, array $value = null) + function sysdata($name, $value = null) { if (is_null($value)) { - $data = json_decode(Db::name('SystemData')->where(['name' => $name])->value('value'), true); - return empty($data) ? [] : $data; + return SystemService::instance()->getData($name); } else { - return data_save('SystemData', ['name' => $name, 'value' => json_encode($value, JSON_UNESCAPED_UNICODE)], 'name'); + return SystemService::instance()->setData($name, $value); } } } @@ -65,7 +63,7 @@ if (!function_exists('sysoplog')) { */ function sysoplog($action, $content) { - return OplogService::write($action, $content); + return SystemService::instance()->setOplog($action, $content); } } @@ -140,28 +138,18 @@ if (!function_exists('base64_image')) { // 访问权限检查中间键 Middleware::add(function (Request $request, \Closure $next) { - if (NodeService::forceAuth()) { + if (AuthService::instance()->check()) { return $next($request); - } elseif (NodeService::islogin()) { + } elseif (AuthService::instance()->isLogin()) { return json(['code' => 0, 'msg' => '抱歉，没有访问该操作的权限！']); } else { return json(['code' => 0, 'msg' => '抱歉，需要登录获取访问权限！', 'url' => url('@admin/login')]); } }); -// 注册系统服务指令 -Console::addDefaultCommands([ - 'app\admin\queue\task\Stop', - 'app\admin\queue\task\Work', - 'app\admin\queue\task\Start', - 'app\admin\queue\task\State', - 'app\admin\queue\task\Query', - 'app\admin\queue\task\Listen', -]); - // ThinkAdmin 图形验证码 Route::get('/think/admin/captcha', function () { - $image = new CaptchaService(); + $image = CaptchaService::instance(); return json(['code' => '1', 'info' => '生成验证码', 'data' => [ 'uniqid' => $image->getUniqid(), 'image' => $image->getData() ]]); diff --git a/application/admin/view/index/index.html b/application/admin/view/index/index.html index 3a29620cd..177cacc3c 100644 --- a/application/admin/view/index/index.html +++ b/application/admin/view/index/index.html @@ -45,11 +45,11 @@