diff --git a/app/admin/common.php b/app/admin/common.php index 939a580..302a878 100644 --- a/app/admin/common.php +++ b/app/admin/common.php @@ -216,6 +216,9 @@ function add_log($type, $param_id = '', $param = []) case 'delete': $title = '删除'; break; + case 'check': + $title = '审核'; + break; default: $title = '未知'; break; @@ -226,23 +229,21 @@ function add_log($type, $param_id = '', $param = []) $session_admin = get_config('app.session_admin'); $login_admin = \think\facade\Session::get($session_admin); } - - $content = $login_admin['nickname'] . '在' . date('Y-m-d H:i:s') . '执行了' . $title . '操作'; $data = []; $data['uid'] = $login_admin['id']; $data['nickname'] = $login_admin['nickname']; $data['type'] = $type; - $data['title'] = $title; - $data['content'] = $content; $data['param_id'] = $param_id; $data['param'] = json_encode($param); $data['module'] = \think\facade\App::initialize()->http->getName(); - $data['controller'] = app('request')->controller(); + $data['controller'] = strtolower(app('request')->controller()); $data['function'] = app('request')->action(); + $parameter = $data['module'] . '/' .$data['controller'] . '/' . $data['function']; + $data['rule_menu'] = $parameter; + $data['title'] = \think\facade\Db::name('admin_rule')->where(array('src' => $parameter))->value('title') ?? $title; + $content = $login_admin['nickname'] . '在' . date('Y-m-d H:i:s') . '执行了' . $data['title'] . '操作'; + $data['content'] = $content; $data['ip'] = app('request')->ip(); $data['create_time'] = time(); - $parameter = $data['controller'] . '/' . $data['function']; - $data['rule_menu'] = $parameter; - $data['admin_menu'] = \think\facade\Db::name('admin_rule')->where(array('title' => $parameter))->value('title') ?? $title; \think\facade\Db::name('admin_log')->strict(false)->field(true)->insert($data); } diff --git a/app/admin/controller/Admin.php b/app/admin/controller/Admin.php index 312ee46..cae7de0 100644 --- a/app/admin/controller/Admin.php +++ b/app/admin/controller/Admin.php @@ -15,28 +15,27 @@ class Admin extends BaseController { public function index() { - return view(); - } - - //管理员列表 - public function get_list() - { - $param = get_params(); - $where = array(); - if (!empty($param['keywords'])) { - $where[] = ['id|username|nickname|desc|mobile', 'like', '%' . $param['keywords'] . '%']; + if (request()->isAjax()) { + $param = get_params(); + $where = array(); + if (!empty($param['keywords'])) { + $where[] = ['id|username|nickname|desc|mobile', 'like', '%' . $param['keywords'] . '%']; + } + $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $admin = AdminList::where($where) + ->order('create_time asc') + ->paginate($rows, false, ['query' => $param]) + ->each(function ($item, $key) { + $groupId = Db::name('AdminGroupAccess')->where(['uid' => $item->id])->column('group_id'); + $groupName = Db::name('AdminGroup')->where('id', 'in', $groupId)->column('title'); + $item->groupName = implode(',', $groupName); + $item->last_login_time = empty($item->last_login_time) ? '-' : date('Y-m-d H:i', $item->last_login_time); + }); + return table_assign(1, '', $admin); } - $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; - $admin = AdminList::where($where) - ->order('create_time asc') - ->paginate($rows, false, ['query' => $param]) - ->each(function ($item, $key) { - $groupId = Db::name('AdminGroupAccess')->where(['uid' => $item->id])->column('group_id'); - $groupName = Db::name('AdminGroup')->where('id', 'in', $groupId)->column('title'); - $item->groupName = implode(',', $groupName); - $item->last_login_time = empty($item->last_login_time) ? '-' : date('Y-m-d H:i', $item->last_login_time); - }); - return table_assign(1, '', $admin); + else{ + return view(); + } } //添加 @@ -219,45 +218,45 @@ class Admin extends BaseController } } + //管理员操作日志 public function log() { - return view(); - } - - //系统操作列表 - public function get_log_list() - { - $param = get_params(); - $where = array(); - if (!empty($param['keywords'])) { - $where[] = ['nickname|admin_menu|param_id', 'like', '%' . $param['keywords'] . '%']; - } - if (!empty($param['title_cate'])) { - $where['title'] = $param['title_cate']; - } - if (!empty($param['admin_menu'])) { - $where['admin_menu'] = $param['admin_menu']; - } - $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; - $content = DB::name('admin_log') - ->field("id,uid,nickname,title,content,admin_menu,ip,param_id,param,FROM_UNIXTIME(create_time,'%Y-%m-%d %H:%i:%s') create_time") - ->order('create_time desc') - ->where($where) - ->paginate($rows, false, ['query' => $param]); - $content->toArray(); - foreach ($content as $k => $v) { - $data = $v; - $param_array = json_decode($v['param'], true); - $param_value = ''; - foreach ($param_array as $key => $value) { - if (is_array($value)) { - $value = implode(',', $value); - } - $param_value .= $key . ':' . $value . '  |  '; + if (request()->isAjax()) { + $param = get_params(); + $where = array(); + if (!empty($param['keywords'])) { + $where[] = ['nickname|admin_menu|param_id', 'like', '%' . $param['keywords'] . '%']; } - $data['param'] = $param_value; - $content->offsetSet($k, $data); + if (!empty($param['title_cate'])) { + $where['title'] = $param['title_cate']; + } + if (!empty($param['admin_menu'])) { + $where['admin_menu'] = $param['admin_menu']; + } + $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $content = DB::name('admin_log') + ->field("id,uid,nickname,title,content,admin_menu,ip,param_id,param,FROM_UNIXTIME(create_time,'%Y-%m-%d %H:%i:%s') create_time") + ->order('create_time desc') + ->where($where) + ->paginate($rows, false, ['query' => $param]); + $content->toArray(); + foreach ($content as $k => $v) { + $data = $v; + $param_array = json_decode($v['param'], true); + $param_value = ''; + foreach ($param_array as $key => $value) { + if (is_array($value)) { + $value = implode(',', $value); + } + $param_value .= $key . ':' . $value . '  |  '; + } + $data['param'] = $param_value; + $content->offsetSet($k, $data); + } + return table_assign(1, '', $content); } - return table_assign(1, '', $content); + else{ + return view(); + } } } diff --git a/app/admin/controller/Article.php b/app/admin/controller/Article.php index 7dfb66c..dfaf2c3 100644 --- a/app/admin/controller/Article.php +++ b/app/admin/controller/Article.php @@ -17,14 +17,13 @@ class Article extends BaseController { public function cate() { - return view(); - } - - //文章分类列表 - public function cate_list() - { - $cate = Db::name('ArticleCate')->order('create_time asc')->select(); - return to_assign(0, '', $cate); + if (request()->isAjax()) { + $cate = Db::name('ArticleCate')->order('create_time asc')->select(); + return to_assign(0, '', $cate); + } + else{ + return view(); + } } //文章分类添加 @@ -94,29 +93,28 @@ class Article extends BaseController public function index() { - return view(); - } - - //文章列表 - public function get_list() - { - $param = get_params(); - $where = array(); - if (!empty($param['keywords'])) { - $where[] = ['a.id|a.title|a.keywords|a.desc|a.content|w.title', 'like', '%' . $param['keywords'] . '%']; + if (request()->isAjax()) { + $param = get_params(); + $where = array(); + if (!empty($param['keywords'])) { + $where[] = ['a.id|a.title|a.keywords|a.desc|a.content|w.title', 'like', '%' . $param['keywords'] . '%']; + } + if (!empty($param['article_cate_id'])) { + $where[] = ['a.article_cate_id', '=', $param['article_cate_id']]; + } + $where[] = ['a.status', '>=', 0]; + $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $content = ArticleList::where($where) + ->field('*,w.id as cate_id,a.id as id,w.title as cate_title,a.title as title') + ->alias('a') + ->join('article_cate w', 'a.article_cate_id = w.id') + ->order('a.create_time desc') + ->paginate($rows, false, ['query' => $param]); + return table_assign(1, '', $content); } - if (!empty($param['article_cate_id'])) { - $where[] = ['a.article_cate_id', '=', $param['article_cate_id']]; - } - $where[] = ['a.status', '>=', 0]; - $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; - $content = ArticleList::where($where) - ->field('*,w.id as cate_id,a.id as id,w.title as cate_title,a.title as title') - ->alias('a') - ->join('article_cate w', 'a.article_cate_id = w.id') - ->order('a.create_time desc') - ->paginate($rows, false, ['query' => $param]); - return table_assign(1, '', $content); + else{ + return view(); + } } //文章添加&&编辑 diff --git a/app/admin/controller/Conf.php b/app/admin/controller/Conf.php index 4403db8..c1a4bab 100644 --- a/app/admin/controller/Conf.php +++ b/app/admin/controller/Conf.php @@ -13,19 +13,19 @@ class Conf extends BaseController { public function index() { - return view(); - } - - public function get_list() - { - $param = get_params(); - $where = array(); - $where[] = ['status', '>=', 0]; - $rows = empty($param['limit']) ? get_config(app.page_size) : $param['limit']; - $content = Db::name('config') - ->where($where) - ->paginate($rows, false, ['query' => $param]); - return table_assign(1, '', $content); + if (request()->isAjax()) { + $param = get_params(); + $where = array(); + $where[] = ['status', '>=', 0]; + $rows = empty($param['limit']) ? get_config(app.page_size) : $param['limit']; + $content = Db::name('config') + ->where($where) + ->paginate($rows, false, ['query' => $param]); + return table_assign(1, '', $content); + } + else{ + return view(); + } } //添加 diff --git a/app/admin/controller/Keywords.php b/app/admin/controller/Keywords.php index 70b092f..775c5fb 100644 --- a/app/admin/controller/Keywords.php +++ b/app/admin/controller/Keywords.php @@ -13,23 +13,23 @@ class Keywords extends BaseController { public function index() { - return view(); - } - - public function get_list() - { - $param = get_params(); - $where = array(); - if (!empty($param['keywords'])) { - $where[] = ['title','like', '%' . $param['keywords'] . '%']; + if (request()->isAjax()) { + $param = get_params(); + $where = array(); + if (!empty($param['keywords'])) { + $where[] = ['title','like', '%' . $param['keywords'] . '%']; + } + $where[] = ['status', '>=', 0]; + $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $content = Db::name('Keywords') + ->order('create_time desc') + ->where($where) + ->paginate($rows, false, ['query' => $param]); + return table_assign(1, '', $content); } - $where[] = ['status', '>=', 0]; - $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; - $content = Db::name('Keywords') - ->order('create_time desc') - ->where($where) - ->paginate($rows, false, ['query' => $param]); - return table_assign(1, '', $content); + else{ + return view(); + } } //添加 diff --git a/app/admin/controller/Menu.php b/app/admin/controller/Menu.php index 6976132..54204c5 100644 --- a/app/admin/controller/Menu.php +++ b/app/admin/controller/Menu.php @@ -14,16 +14,13 @@ class Menu extends BaseController { public function index() { - - return view(); - } - - //菜单列表 - - public function get_list() - { - $menu = Db::name('AdminMenu')->order('sort asc')->select(); - return to_assign(0, '', $menu); + if (request()->isAjax()) { + $menu = Db::name('AdminMenu')->order('sort asc')->select(); + return to_assign(0, '', $menu); + } + else{ + return view(); + } } //添加菜单页面 diff --git a/app/admin/controller/Nav.php b/app/admin/controller/Nav.php index 6facb2e..9e1c351 100644 --- a/app/admin/controller/Nav.php +++ b/app/admin/controller/Nav.php @@ -16,27 +16,24 @@ class Nav extends BaseController { public function index() { - return view(); - } - - //列表 - - public function get_list() - { - $param = get_params(); - $where = array(); - if (!empty($param['keywords'])) { - $where[] = ['id|name|title|desc', 'like', '%' . $param['keywords'] . '%']; + if (request()->isAjax()) { + $param = get_params(); + $where = array(); + if (!empty($param['keywords'])) { + $where[] = ['id|name|title|desc', 'like', '%' . $param['keywords'] . '%']; + } + $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $nav = NavList::where($where) + ->order('create_time asc') + ->paginate($rows, false, ['query' => $param]); + return table_assign(1, '', $nav); } - $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; - $nav = NavList::where($where) - ->order('create_time asc') - ->paginate($rows, false, ['query' => $param]); - return table_assign(1, '', $nav); + else{ + return view(); + } } //添加 - public function add() { $id = empty(get_params('id')) ? 0 : get_params('id'); @@ -49,7 +46,6 @@ class Nav extends BaseController } //提交添加 - public function post_submit() { if (request()->isAjax()) { @@ -86,7 +82,6 @@ class Nav extends BaseController } //删除 - public function delete() { $id = get_params('id'); @@ -107,28 +102,26 @@ class Nav extends BaseController } //管理导航 - public function nav_info() { - return view('', [ - 'nav_id' => get_params('id'), - ]); - } + $param = get_params(); + if (request()->isAjax()) { + $id = $param['id']; + $navInfoList = Db::name('NavInfo') + ->where(['nav_id' => $id]) + ->order('sort asc') + ->select(); + return to_assign(0, '', $navInfoList); + } + else{ + return view('', [ + 'nav_id' => $param['id'], + ]); + } - //导航列表 - - public function nav_info_list() - { - $id = get_params('id'); - $navInfoList = Db::name('NavInfo') - ->where(['nav_id' => $id]) - ->order('sort asc') - ->select(); - return to_assign(0, '', $navInfoList); } //添加导航 - public function nav_info_add() { $id = empty(get_params('id')) ? 0 : get_params('id'); @@ -145,7 +138,6 @@ class Nav extends BaseController } //保存添加 - public function nav_info_submit() { if (request()->isAjax()) { @@ -179,7 +171,6 @@ class Nav extends BaseController } //删除 - public function nav_info_delete() { $id = get_params('id'); diff --git a/app/admin/controller/Role.php b/app/admin/controller/Role.php index 9ab9ba2..7aeda89 100644 --- a/app/admin/controller/Role.php +++ b/app/admin/controller/Role.php @@ -14,22 +14,21 @@ class Role extends BaseController { public function index() { - return view(); - } - - //管理员列表 - public function get_list() - { - $param = get_params(); - $where = array(); - if (!empty($param['keywords'])) { - $where[] = ['id|title|desc','like', '%' . $param['keywords'] . '%']; + if (request()->isAjax()) { + $param = get_params(); + $where = array(); + if (!empty($param['keywords'])) { + $where[] = ['id|title|desc','like', '%' . $param['keywords'] . '%']; + } + $rows = empty($param['limit']) ? get_config(app.page_size) : $param['limit']; + $group = AdminGroup::where($where) + ->order('create_time asc') + ->paginate($rows, false, ['query' => $param]); + return table_assign(1, '', $group); } - $rows = empty($param['limit']) ? get_config(app.page_size) : $param['limit']; - $group = AdminGroup::where($where) - ->order('create_time asc') - ->paginate($rows, false, ['query' => $param]); - return table_assign(1, '', $group); + else{ + return view(); + } } //添加&编辑 diff --git a/app/admin/controller/Rule.php b/app/admin/controller/Rule.php index 78f7646..fbbad36 100644 --- a/app/admin/controller/Rule.php +++ b/app/admin/controller/Rule.php @@ -13,14 +13,13 @@ class Rule extends BaseController { public function index() { - return view(); - } - - //节点列表 - public function get_list() - { - $menu = Db::name('adminRule')->order('create_time asc')->select(); - return to_assign(0, '', $menu); + if (request()->isAjax()) { + $rule = Db::name('adminRule')->order('create_time asc')->select(); + return to_assign(0, '', $rule); + } + else{ + return view(); + } } //添加 diff --git a/app/admin/controller/Search.php b/app/admin/controller/Search.php index e084335..5781cd7 100644 --- a/app/admin/controller/Search.php +++ b/app/admin/controller/Search.php @@ -11,22 +11,22 @@ class Search extends BaseController { public function index() { - return view(); - } - - public function get_list() - { - $param = get_params(); - $where = array(); - if (!empty($param['keywords'])) { - $where[] = ['title','like', '%' . $param['keywords'] . '%']; + if (request()->isAjax()) { + $param = get_params(); + $where = array(); + if (!empty($param['keywords'])) { + $where[] = ['title','like', '%' . $param['keywords'] . '%']; + } + $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $content = Db::name('SearchKeywords') + ->order('id desc') + ->where($where) + ->paginate($rows, false, ['query' => $param]); + return table_assign(1, '', $content); } - $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; - $content = Db::name('SearchKeywords') - ->order('id desc') - ->where($where) - ->paginate($rows, false, ['query' => $param]); - return table_assign(1, '', $content); + else{ + return view(); + } } //删除 diff --git a/app/admin/controller/Sitemap.php b/app/admin/controller/Sitemap.php index a3d7ca8..4999384 100644 --- a/app/admin/controller/Sitemap.php +++ b/app/admin/controller/Sitemap.php @@ -16,23 +16,22 @@ class Sitemap extends BaseController { public function index() { - return view(); - } - - //列表 - public function get_list() - { - $param = get_params(); - $where = array(); - if (!empty($param['keywords'])) { - $where[] = ['id|name', 'like', '%' . $param['keywords'] . '%']; + if (request()->isAjax()) { + $param = get_params(); + $where = array(); + if (!empty($param['keywords'])) { + $where[] = ['id|name', 'like', '%' . $param['keywords'] . '%']; + } + $where[] = ['status','=',1]; + $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $SitemapCate = SitemapCate::where($where) + ->order('sort desc, id desc') + ->paginate($rows, false, ['query' => $param]); + return table_assign(1, '', $SitemapCate); } - $where[] = ['status','=',1]; - $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; - $SitemapCate = SitemapCate::where($where) - ->order('sort desc, id desc') - ->paginate($rows, false, ['query' => $param]); - return table_assign(1, '', $SitemapCate); + else{ + return view(); + } } //添加 @@ -105,24 +104,23 @@ class Sitemap extends BaseController //管理网站地图 public function sitemap_info() - { - return view('', [ - 'sitemap_cate_id' => get_params('id'), - ]); - } - - //网站地图列表 - public function sitemap_info_list() { $param = get_params(); - $where = array(); - $where[] = ['sitemap_cate_id','=',$param['id']]; - $where[] = ['status','>=',0]; - $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; - $sitemap = SitemapInfo::where($where) - ->order('sort desc, id desc') - ->paginate($rows, false, ['query' => $param]); - return table_assign(1, '', $sitemap); + if (request()->isAjax()) { + $where = array(); + $where[] = ['sitemap_cate_id','=',$param['id']]; + $where[] = ['status','>=',0]; + $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $sitemap = SitemapInfo::where($where) + ->order('sort desc, id desc') + ->paginate($rows, false, ['query' => $param]); + return table_assign(1, '', $sitemap); + } + else{ + return view('', [ + 'sitemap_cate_id' => $param['id'], + ]); + } } //添加网站地图 diff --git a/app/admin/controller/Slide.php b/app/admin/controller/Slide.php index 0892e42..40a847e 100644 --- a/app/admin/controller/Slide.php +++ b/app/admin/controller/Slide.php @@ -15,22 +15,21 @@ class Slide extends BaseController { public function index() { - return view(); - } - - //列表 - public function get_list() - { - $param = get_params(); - $where = array(); - if (!empty($param['keywords'])) { - $where[] = ['id|name|title|desc', 'like', '%' . $param['keywords'] . '%']; + if (request()->isAjax()) { + $param = get_params(); + $where = array(); + if (!empty($param['keywords'])) { + $where[] = ['id|name|title|desc', 'like', '%' . $param['keywords'] . '%']; + } + $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $slide = SlideList::where($where) + ->order('create_time asc') + ->paginate($rows, false, ['query' => $param]); + return table_assign(1, '', $slide); } - $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; - $slide = SlideList::where($where) - ->order('create_time asc') - ->paginate($rows, false, ['query' => $param]); - return table_assign(1, '', $slide); + else{ + return view(); + } } //添加 @@ -101,9 +100,24 @@ class Slide extends BaseController //管理幻灯片 public function slide_info() { - return view('', [ - 'slide_id' => get_params('id'), - ]); + $param = get_params(); + if (request()->isAjax()) { + $where = array(); + $where[] = ['s.slide_id','=',$param['id']]; + $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $slideInfoList = SlideInfo::where($where) + ->alias('s') + ->join('file f', 's.img=f.id', 'LEFT') + ->field('s.*,f.filepath') + ->order('s.sort desc, s.id desc') + ->paginate($rows, false, ['query' => $param]); + return table_assign(1, '', $slideInfoList); + } + else{ + return view('', [ + 'slide_id' => $param['id'], + ]); + } } //幻灯片列表 diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php index c6e58c6..884e12d 100644 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -12,42 +12,41 @@ class User extends BaseController { public function index() { - return view(); - } - - //列表 - public function get_list() - { - $param = get_params(); - $where = array(); - if (!empty($param['keywords'])) { - $where[] = ['nickname|truename|mobile|province|city','like', '%' . $param['keywords'] . '%']; - } - - //按时间检索 - $start_time = isset($param['start_time']) ? strtotime(urldecode($param['start_time'])) : 0; - $end_time = isset($param['end_time']) ? strtotime(urldecode($param['end_time'])) : 0; - - if ($start_time > 0 && $end_time > 0) { - if ($start_time === $end_time) { - $where['register_time'] = array('eq', $start_time); - } else { - $where['register_time'] = array(array('egt', $start_time), array('elt', $end_time), 'and'); + if (request()->isAjax()) { + $param = get_params(); + $where = array(); + if (!empty($param['keywords'])) { + $where[] = ['nickname|truename|mobile|province|city','like', '%' . $param['keywords'] . '%']; } - } elseif ($start_time > 0 && $end_time == 0) { - $where['register_time'] = array('egt', $start_time); - } elseif ($start_time == 0 && $end_time > 0) { - $where['register_time'] = array('elt', $end_time); + + //按时间检索 + $start_time = isset($param['start_time']) ? strtotime(urldecode($param['start_time'])) : 0; + $end_time = isset($param['end_time']) ? strtotime(urldecode($param['end_time'])) : 0; + + if ($start_time > 0 && $end_time > 0) { + if ($start_time === $end_time) { + $where['register_time'] = array('eq', $start_time); + } else { + $where['register_time'] = array(array('egt', $start_time), array('elt', $end_time), 'and'); + } + } elseif ($start_time > 0 && $end_time == 0) { + $where['register_time'] = array('egt', $start_time); + } elseif ($start_time == 0 && $end_time > 0) { + $where['register_time'] = array('elt', $end_time); + } + + $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $content = UserList::where($where) + ->order('id desc') + ->paginate($rows, false, ['query' => $param]) + ->each(function ($item, $key) { + $item->register_time = empty($item->register_time) ? '-' : date('Y-m-d H:i', $item->register_time); + }); + return table_assign(1, '', $content); } - - $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; - $content = UserList::where($where) - ->order('id desc') - ->paginate($rows, false, ['query' => $param]) - ->each(function ($item, $key) { - $item->register_time = empty($item->register_time) ? '-' : date('Y-m-d H:i', $item->register_time); - }); - return table_assign(1, '', $content); + else{ + return view(); + } } //编辑 @@ -101,38 +100,38 @@ class User extends BaseController public function log() { - return view(); - } - //平台用户日志列表 - public function get_log_list() - { - $param = get_params(); - $where = array(); - if (!empty($param['keywords'])) { - $where[] = ['nickname|title','like', '%' . $param['keywords'] . '%']; - } - $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; - $content = DB::name('user_log') - ->field("id,uid,nickname,title,content,ip,param,FROM_UNIXTIME(create_time,'%Y-%m-%d %H:%i:%s') create_time") - ->order('create_time desc') - ->where($where) - ->paginate($rows, false, ['query' => $param]); - - $content->toArray(); - foreach ($content as $k => $v) { - $data = $v; - $param_array = json_decode($v['param'], true); - $param_value = ''; - foreach ($param_array as $key => $value) { - if (is_array($value)) { - $value = array_to_string($value); - } - $param_value .= $key . ':' . $value . '  |  '; + if (request()->isAjax()) { + $param = get_params(); + $where = array(); + if (!empty($param['keywords'])) { + $where[] = ['nickname|title','like', '%' . $param['keywords'] . '%']; } - $data['param'] = $param_value; - $content->offsetSet($k, $data); + $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $content = DB::name('user_log') + ->field("id,uid,nickname,title,content,ip,param,FROM_UNIXTIME(create_time,'%Y-%m-%d %H:%i:%s') create_time") + ->order('create_time desc') + ->where($where) + ->paginate($rows, false, ['query' => $param]); + + $content->toArray(); + foreach ($content as $k => $v) { + $data = $v; + $param_array = json_decode($v['param'], true); + $param_value = ''; + foreach ($param_array as $key => $value) { + if (is_array($value)) { + $value = array_to_string($value); + } + $param_value .= $key . ':' . $value . '  |  '; + } + $data['param'] = $param_value; + $content->offsetSet($k, $data); + } + return table_assign(1, '', $content); } - return table_assign(1, '', $content); + else{ + return view(); + } } } diff --git a/app/admin/middleware/Auth.php b/app/admin/middleware/Auth.php index 1c87c16..123b72b 100644 --- a/app/admin/middleware/Auth.php +++ b/app/admin/middleware/Auth.php @@ -16,11 +16,15 @@ class Auth $pathInfo = str_replace('.' . $request->ext(), '', $request->pathInfo()); $action = explode('/', $pathInfo)[0]; // var_dump($pathInfo); + if($pathInfo == '' || $action == '' ){ + redirect('/admin/index')->send(); + exit; + } //验证用户登录 if ($action !== 'login') { $session_admin = get_config('app.session_admin'); if (!Session::has($session_admin)) { - return $request->isAjax() ? to_assign(404, '请先登录') : redirect((string) url('/admin/login/index')); + return $request->isAjax() ? to_assign(404, '请先登录') : redirect('/admin/index')->send(); } // 验证用户访问权限 diff --git a/app/admin/model/AdminLog.php b/app/admin/model/AdminLog.php index f6cb22b..5453661 100644 --- a/app/admin/model/AdminLog.php +++ b/app/admin/model/AdminLog.php @@ -6,78 +6,6 @@ use think\Model; class AdminLog extends Model { - - /** - * 读取日志标题 - * @return array - */ - public function get_title($type) - { - $type_array = [ - 'Conf/conf_submit' => '配置信息', - 'Menu/post_submit' => '菜单', - 'Menu/delete' => '菜单', - 'Rule/post_submit' => '节点', - 'Rule/delete' => '节点', - 'Role/post_submit' => '角色', - 'Role/delete' => '角色', - 'Admin/post_submit' => '管理员', - 'Admin/view' => '管理员', - 'Admin/delete' => '管理员', - 'Nav/post_submit' => '导航组', - 'Nav/delete' => '导航组', - 'Nav/nav_info_submit' => '导航', - 'Nav/nav_info_delete' => '导航', - 'Sitemap/post_submit' => '网站地图分类', - 'Sitemap/delete' => '网站地图分类', - 'Sitemap/sitemap_info' => '网站地图', - 'Sitemap/sitemap_info_submit' => '网站地图', - 'Sitemap/sitemap_info_delete' => '网站地图', - 'Slide/post_submit' => '轮播组', - 'Slide/delete' => '轮播组', - 'Slide/slide_info_submit' => '轮播图', - 'Slide/slide_info_delete' => '轮播图', - 'Keywords/post_submit' => 'SEO关键字', - 'Keywords/delete' => 'SEO关键字', - 'Search/delete' => '搜索关键字', - 'User/post_submit' => '用户', - 'User/view' => '用户', - 'User/delete' => '用户', - 'Article/cate_post_submit' => '文章分类', - 'Article/cate_delete' => '文章分类', - 'Article/post_submit' => '文章', - 'Article/delete' => '文章', - 'Api/upload' => '附件', - 'Login/login_submit' => '系统', - 'Consultation/post_submit' => '咨询', - 'Consultation/delete' => '咨询', - 'Dynamic/post_submit' => '动态', - 'Dynamic/delete' => '动态', - ]; - if (!empty($type_array[$type])) { - return $type_array[$type]; - } else { - return '未知'; - } - } - /** - * 读取日志模块 - * @return array - */ - public function get_controller($controller, $fun) - { - $controller_array = ['Admin' => '系统用户', 'Article' => '文章', 'Conf' => '配置信息', 'Index' => '系统1', 'Keywords' => '关键字', 'Login' => '系统', 'Menu' => '菜单', 'Nav' => '导航分类', 'Role' => '角色', 'Rule' => '节点', 'Search' => '搜索词', 'Sitemap' => '网站地图', 'Slide' => '广告', 'User' => '用户', 'Api' => '']; - if (!empty($controller_array[$controller])) { - if ($fun == 'cate_post_submit') { - return '文章分类'; - } else { - return $controller_array[$controller]; - } - } else { - return ''; - } - } - public function get_log_list($param = []) { $where = array(); @@ -93,7 +21,7 @@ class AdminLog extends Model $where['status'] = 1; $rows = empty($param['limit']) ? get_config('app.pages') : $param['limit']; $content = \think\facade\Db::name('admin_log') - ->field("id,uid,nickname,type,title,module,controller,function,param,create_time") + ->field("id,uid,nickname,type,title,module,controller,function,param,content,create_time") ->order('create_time desc') ->where($where) ->paginate($rows, false, ['query' => $param]); @@ -104,12 +32,12 @@ class AdminLog extends Model $param_array = json_decode($v['param'], true); $name = ''; if (!empty($param_array['name'])) { - $name = $param_array['name']; + $name = '：'. $param_array['name']; } if (!empty($param_array['title'])) { - $name = $param_array['title']; + $name = '：'. $param_array['title']; } - $data['content'] = $v['nickname'] . $v['title'] . '了' . $this->get_title($v['controller'] . '/' . $v['function']) . $name; + $data['content'] = $v['content'] . $name; $data['times'] = time_trans($v['create_time']); $content->offsetSet($k, $data); } diff --git a/app/admin/view/admin/index.html b/app/admin/view/admin/index.html index 4fc628f..01c1595 100644 --- a/app/admin/view/admin/index.html +++ b/app/admin/view/admin/index.html @@ -42,7 +42,7 @@ elem: '#test', title: '管理员列表', toolbar: '#toolbarDemo', - url: '/admin/admin/get_list', //数据接口 + url: '/admin/admin/index', //数据接口 page: true, //开启分页 limit: 20, cols: [ diff --git a/app/admin/view/admin/log.html b/app/admin/view/admin/log.html index d0f4782..0ece41b 100644 --- a/app/admin/view/admin/log.html +++ b/app/admin/view/admin/log.html @@ -34,7 +34,7 @@ elem: '#test', title: '操作日志列表', toolbar: '#toolbarDemo', - url: '/admin/admin/get_log_list', //数据接口 + url: '/admin/admin/log', //数据接口 page: true, //开启分页 limit: 20, cols: [ diff --git a/app/admin/view/article/add.html b/app/admin/view/article/add.html index 70f789e..f0c2c8a 100644 --- a/app/admin/view/article/add.html +++ b/app/admin/view/article/add.html @@ -4,14 +4,14 @@
- - + - + @@ -155,6 +155,6 @@ {include file="common/layui" base='base' extend="['tagpicker']" use="['upload','form','tagpicker']" callback="init" /} -{include file="common/ueditor" id="container" name="content" width="776px" height="100%" toolbar="[]" /} +{include file="common/ueditor" id="container" name="content" width="776" height="500" toolbar="[]" /} {/block} \ No newline at end of file diff --git a/app/admin/view/article/cate.html b/app/admin/view/article/cate.html index 99aef50..8d944c8 100644 --- a/app/admin/view/article/cate.html +++ b/app/admin/view/article/cate.html @@ -35,7 +35,7 @@ id:tableId ,elem: '#'+tableId ,idField:'id' - ,url:'/admin/article/cate_list' + ,url:'/admin/article/cate' ,cellMinWidth: 100 ,treeId:'id'//树形id字段名称 ,treeUpId:'pid'//树形父id字段名称 diff --git a/app/admin/view/article/edit.html b/app/admin/view/article/edit.html index 442331e..e4c06e7 100644 --- a/app/admin/view/article/edit.html +++ b/app/admin/view/article/edit.html @@ -5,14 +5,14 @@
标题 *文章标题 *
分类* - {volist name=":set_recursion(get_article_cate())" id="v"} @@ -77,9 +77,9 @@
内容内容* -
- - + - + @@ -161,6 +161,6 @@ {include file="common/layui" base='base' extend="['tagpicker']" use="['upload','form','tagpicker']" callback="init" /} -{include file="common/ueditor" id="container" name="content" width="776px" height="100%" toolbar="[]" /} +{include file="common/ueditor" id="container" name="content" width="776" height="500" toolbar="[]" /} {/block} \ No newline at end of file diff --git a/app/admin/view/article/index.html b/app/admin/view/article/index.html index 3b51d2a..850c733 100644 --- a/app/admin/view/article/index.html +++ b/app/admin/view/article/index.html @@ -46,7 +46,7 @@ elem: '#test', title: '文章分类列表', toolbar: '#toolbarDemo', - url: '/admin/article/get_list', //数据接口 + url: '/admin/article/index', //数据接口 page: true, //开启分页 limit: 20, cols: [ diff --git a/app/admin/view/conf/index.html b/app/admin/view/conf/index.html index 77d6387..070e512 100644 --- a/app/admin/view/conf/index.html +++ b/app/admin/view/conf/index.html @@ -27,7 +27,7 @@ elem: '#test', title: '配置列表', toolbar: '#toolbarDemo', - url: '/admin/conf/get_list', + url: '/admin/conf/index', page: true, //开启分页 limit: 20, cols: [ diff --git a/app/admin/view/conf/web.html b/app/admin/view/conf/web.html index dcd2cdd..b6b9876 100644 --- a/app/admin/view/conf/web.html +++ b/app/admin/view/conf/web.html @@ -46,10 +46,15 @@ - + + diff --git a/app/admin/view/keywords/index.html b/app/admin/view/keywords/index.html index 884783d..597887e 100644 --- a/app/admin/view/keywords/index.html +++ b/app/admin/view/keywords/index.html @@ -32,7 +32,7 @@ elem: '#test', title: '关键字列表', toolbar: '#toolbarDemo', - url: '/admin/keywords/get_list', + url: '/admin/keywords/index', page: true, //开启分页 limit: 20, cols: [ diff --git a/app/admin/view/menu/index.html b/app/admin/view/menu/index.html index c78192f..833a527 100644 --- a/app/admin/view/menu/index.html +++ b/app/admin/view/menu/index.html @@ -33,7 +33,7 @@ id: tableId , elem: '#' + tableId , idField: 'id' - , url: '/admin/menu/get_list' + , url: '/admin/menu/index' , cellMinWidth: 100 , treeId: 'id'//树形id字段名称 , treeUpId: 'pid'//树形父id字段名称 diff --git a/app/admin/view/nav/index.html b/app/admin/view/nav/index.html index 4613745..1132bf1 100644 --- a/app/admin/view/nav/index.html +++ b/app/admin/view/nav/index.html @@ -36,7 +36,7 @@ var tableIns = table.render({ elem: '#test', toolbar: '#toolbarDemo', - url: '/admin/nav/get_list', //数据接口 + url: '/admin/nav/index', //数据接口 page: true, //开启分页 limit: 20, cols: [ diff --git a/app/admin/view/nav/nav_info.html b/app/admin/view/nav/nav_info.html index 7291acd..e3cd51b 100644 --- a/app/admin/view/nav/nav_info.html +++ b/app/admin/view/nav/nav_info.html @@ -46,7 +46,7 @@ id: tableId, elem: '#' + tableId, idField: 'id', - url: '/admin/nav/nav_info_list', //数据接口 + url: '/admin/nav/nav_info', //数据接口 where: { id:nid }, diff --git a/app/admin/view/role/add.html b/app/admin/view/role/add.html index 23e38e5..dc7bcc6 100644 --- a/app/admin/view/role/add.html +++ b/app/admin/view/role/add.html @@ -8,7 +8,7 @@ - - - @@ -30,7 +30,7 @@ -
标题 * 文章标题 *
分类* - {volist name=":set_recursion(get_article_cate())" id="v"} @@ -27,7 +27,7 @@ 属性 - @@ -81,9 +81,9 @@
内容内容* -
SEO关键词* + 公安备案号 + +
SEO描述* diff --git a/app/admin/view/keywords/add.html b/app/admin/view/keywords/add.html index 7a38ffd..591e120 100644 --- a/app/admin/view/keywords/add.html +++ b/app/admin/view/keywords/add.html @@ -8,7 +8,7 @@ - - 状态* diff --git a/app/admin/view/role/index.html b/app/admin/view/role/index.html index dc12db6..03568a2 100644 --- a/app/admin/view/role/index.html +++ b/app/admin/view/role/index.html @@ -40,7 +40,7 @@ var tableIns = table.render({ elem: '#test' , toolbar: '#toolbarDemo' - , url: '/admin/role/get_list' //数据接口 + , url: '/admin/role/index' //数据接口 , page: true //开启分页 , limit: 20 , cols: [[ //表头 diff --git a/app/admin/view/rule/index.html b/app/admin/view/rule/index.html index 35ea12f..490a390 100644 --- a/app/admin/view/rule/index.html +++ b/app/admin/view/rule/index.html @@ -34,7 +34,7 @@ id: tableId , elem: '#' + tableId , idField: 'id' - , url: '/admin/rule/get_list' + , url: '/admin/rule/index' , cellMinWidth: 100 , treeId: 'id'//树形id字段名称 , treeUpId: 'pid'//树形父id字段名称 diff --git a/app/admin/view/search/index.html b/app/admin/view/search/index.html index 7adc938..2756e68 100644 --- a/app/admin/view/search/index.html +++ b/app/admin/view/search/index.html @@ -24,7 +24,7 @@ elem: '#test', title: '关键字搜索列表', toolbar: '#toolbarDemo', - url: '/admin/search/get_list', + url: '/admin/search/index', page: true, //开启分页 limit: 20, cols: [ diff --git a/app/admin/view/sitemap/add.html b/app/admin/view/sitemap/add.html index af8ca18..2554df1 100644 --- a/app/admin/view/sitemap/add.html +++ b/app/admin/view/sitemap/add.html @@ -8,7 +8,7 @@ - 排序 diff --git a/app/admin/view/sitemap/index.html b/app/admin/view/sitemap/index.html index a2d093b..bfd6ee7 100644 --- a/app/admin/view/sitemap/index.html +++ b/app/admin/view/sitemap/index.html @@ -36,7 +36,7 @@ elem: '#test', title: '网站地图列表', toolbar: '#toolbarDemo', - url: '/admin/sitemap/get_list', //数据接口 + url: '/admin/sitemap/index', //数据接口 page: true, //开启分页 limit: 20, cols: [ diff --git a/app/admin/view/sitemap/sitemap_info.html b/app/admin/view/sitemap/sitemap_info.html index 6ead928..9815ecb 100644 --- a/app/admin/view/sitemap/sitemap_info.html +++ b/app/admin/view/sitemap/sitemap_info.html @@ -35,7 +35,7 @@ elem: '#test', title: '网站地图列表', toolbar: '#toolbarDemo', - url: '/admin/sitemap/sitemap_info_list', //数据接口 + url: '/admin/sitemap/sitemap_info', //数据接口 where: { id: sitemap_cate_id }, diff --git a/app/admin/view/sitemap/sitemap_info_add.html b/app/admin/view/sitemap/sitemap_info_add.html index c2cabab..0613b68 100644 --- a/app/admin/view/sitemap/sitemap_info_add.html +++ b/app/admin/view/sitemap/sitemap_info_add.html @@ -33,7 +33,7 @@
PC端图片* + PC端图片
@@ -46,7 +46,7 @@
移动端图片* + 移动端图片
diff --git a/app/admin/view/slide/add.html b/app/admin/view/slide/add.html index 000dc11..5828a78 100644 --- a/app/admin/view/slide/add.html +++ b/app/admin/view/slide/add.html @@ -8,11 +8,11 @@
- 标识
备注* + 备注