diff --git a/app/admin/controller/Admin.php b/app/admin/controller/Admin.php index 3d7e2f9..e45cb5e 100644 --- a/app/admin/controller/Admin.php +++ b/app/admin/controller/Admin.php @@ -25,13 +25,11 @@ class Admin extends AdminController public function index() { if(Request::isAjax()){ - $data = Request::only(['id','username','mobile','email','auth_group_id']); + $data = Request::only(['id','username','mobile','email']); $map = array_filter($data); $admins = Db::name('admin') - ->alias('a') - ->join('auth_group u','a.auth_group_id = u.id') - ->field('a.id as aid,username,mobile,email,auth_group_id,title,last_login_ip,a.status as astatus,last_login_time') - ->where('a.delete_time',0) + ->field('id,username,mobile,email,last_login_ip,status,last_login_time') + ->where('delete_time',0) ->where($map) ->select(); @@ -39,7 +37,7 @@ class Admin extends AdminController if($count){ $res = ['code'=>0,'msg'=>'','count'=>$count]; foreach($admins as $k => $v){ - $data = ['id'=>$v['aid'],'loginname'=>$v['username'],'telphone'=>$v['mobile'],'email'=>$v['email'],'role'=>$v['title'],'ip'=>$v['last_login_ip'],'check'=>$v['astatus'],'logintime'=>date("Y-m-d",$v['last_login_time'])]; + $data = ['id'=>$v['id'],'loginname'=>$v['username'],'telphone'=>$v['mobile'],'email'=>$v['email'],'ip'=>$v['last_login_ip'],'check'=>$v['status'],'logintime'=>date("Y-m-d",$v['last_login_time'])]; $res['data'][] = $data; } } else { @@ -47,8 +45,6 @@ class Admin extends AdminController } return json($res); } - $authGroup = Db::name('auth_group')->field('id,title')->select(); - View::assign('authGroup',$authGroup); return View::fetch(); } @@ -81,17 +77,18 @@ class Admin extends AdminController $data['create_time'] = time(); $salt = substr(md5($data['create_time']),-6); $data['password'] = substr_replace(md5($data['password']),$salt,0,6); - $adminId = Db::name('admin')->insertGetId($data); - Db::name('auth_group_access')->insert(['uid'=>$adminId,'group_id'=>$data['auth_group_id']]); - if($adminId){ + //$adminId = Db::name('admin')->insertGetId($data); + $admin = Db::name('admin')->save($data); + //Db::name('auth_group_access')->insert(['uid'=>$adminId,'group_id'=>$data['auth_group_id']]); + if($admin){ $res = ['code'=>0,'msg'=>'添加成功']; }else{ $res = ['code'=>-1,'msg'=>'添加失败']; } return json($res); } - $auth_group = Db::name('auth_group')->select(); - View::assign(['auth_group'=>$auth_group]); + //$auth_group = Db::name('auth_group')->select(); + //View::assign(['auth_group'=>$auth_group]); return View::fetch(); } @@ -111,7 +108,7 @@ class Admin extends AdminController } $data['update_time'] = time(); $result = $admin->update($data); - Db::name('auth_group_access')->where('uid',$data['id'])->update(['group_id'=>$data['auth_group_id']]); + //Db::name('auth_group_access')->where('uid',$data['id'])->update(['group_id'=>$data['auth_group_id']]); if($result){ $res = ['code'=>0,'msg'=>'编辑成功']; }else{ @@ -119,8 +116,8 @@ class Admin extends AdminController } return json($res); } - $auth_group = Db::name('auth_group')->select(); - View::assign(['admin'=>$admin,'auth_group'=>$auth_group]); + //$auth_group = Db::name('auth_group')->select();,'auth_group'=>$auth_group + View::assign(['admin'=>$admin]); return View::fetch(); } diff --git a/app/admin/controller/AuthAccess.php b/app/admin/controller/AuthAccess.php new file mode 100644 index 0000000..194ea9c --- /dev/null +++ b/app/admin/controller/AuthAccess.php @@ -0,0 +1,146 @@ +alias('c') + ->join('admin a','c.uid = a.id') + ->join('auth_group g','c.group_id = g.id') + ->field('c.id as id,username,title,c.status as status') + ->where(['c.status'=>1,'c.delete_time'=>0]) + ->where($map) + ->select(); + $count = $groups->count(); + $res = []; + if($count){ + $res = ['code'=>0,'msg'=>'','count'=>$count]; + foreach($groups as $k => $v){ + $data = ['id'=>$v['id'],'username'=>$v['username'],'title'=>$v['title'],'check'=>$v['status']]; + $res['data'][] = $data; + } + } else { + $res = ['code'=>-1,'msg'=>'没有查询结果!']; + } + return json($res); + } + $admins = Db::name('admin')->field('id,username')->select(); + + View::assign('admins',$admins); + return View::fetch(); + } + + //角色添加 + public function add() + { + if(Request::isAjax()){ + $data = Request::only(['uid','group_id']); + //检测重复权限 + $groups = Db::name('auth_group_access')->where('uid',$data['uid'])->column('group_id'); + if(in_array($data['group_id'],$groups)){ + $res = ['code'=>-1,'msg'=>'不能重复添加已存在权限']; + } else { + $result = AuthGroupAccess::create($data); + if($result) { + $res = ['code'=>0,'msg'=>'添加权限成功']; + } else { + $res = ['code'=>-1,'msg'=>'添加权限失败']; + } + } + return json($res); + } + + $admins = Db::name('admin')->field('id,username')->select(); + $auth_groups = Db::name('auth_group')->field('id,title')->select(); + View::assign(['admins'=>$admins,'auth_groups'=>$auth_groups]); + + return View::fetch(); + } + + //管理员权限编辑 + public function edit($id) + { + if(Request::isAjax()){ + $data = Request::only(['id','uid','group_id']); + //检测重复权限 + $groups = Db::name('auth_group_access')->where('uid',$data['uid'])->column('group_id'); + if(in_array($data['group_id'],$groups)){ + $res = ['code'=>-1,'msg'=>'不能重复添加已存在权限']; + } else { + $result = AuthGroupAccess::where('id',$data['id'])->update(['uid'=>$data['uid'],'group_id'=>$data['group_id']]); + if($result){ + $res = ['code'=>0,'msg'=>'编辑成功']; + } else { + $res = ['code'=>-1,'msg'=>'编辑失败']; + } + } + return json($res); + } + + $access = Db::name('auth_group_access')->group('uid')->find($id); + $admins = Db::name('admin')->field('id,username')->select(); + $auth_groups = Db::name('auth_group')->field('id,title')->select(); + + View::assign(['admins'=>$admins,'auth_groups'=>$auth_groups,'access'=>$access]); + return View::fetch(); + } + + //角色删除 + public function delete($id) + { + if(Request::isAjax()){ + $access = AuthGroupAccess::find($id); + $result = $access->delete(); + + if($result){ + $res = ['code'=>0,'msg'=>'删除成功']; + }else{ + $res = ['code'=>-1,'msg'=>'删除失败']; + } + return json($res); + } + } + + //角色审核 + public function check() + { + $data = Request::only(['id','status']); + + //获取状态 + $result = AuthGroupAccess::update($data); + if($result){ + if($data['status'] == 1){ + return json(['code'=>0,'msg'=>'开启权限','icon'=>6]); + } else { + return json(['code'=>0,'msg'=>'禁用权限','icon'=>5]); + } + + }else { + return json(['code'=>-1,'msg'=>'权限执行出错']); + } + + } + + +} diff --git a/app/admin/controller/Forum.php b/app/admin/controller/Forum.php index 2a6bf15..2535e56 100644 --- a/app/admin/controller/Forum.php +++ b/app/admin/controller/Forum.php @@ -147,7 +147,7 @@ class Forum extends AdminController $res['count']= count($list); $res['data'] = []; foreach($list as $k=>$v){ - $res['data'][] = ['sort'=>$v['sort'],'id' => $v['id'],'tags'=>$v['catename'],'ename'=>$v['ename'],'desc'=>$v['desc']]; + $res['data'][] = ['sort'=>$v['sort'],'id' => $v['id'],'tags'=>$v['catename'],'ename'=>$v['ename'],'is_hot'=>$v['is_hot'],'desc'=>$v['desc']]; } } return json($res); @@ -294,6 +294,25 @@ class Forum extends AdminController return json(['code'=>-1,'msg'=>'审核出错']); } } + + //帖子分类开启热点 + //评论审核 + public function tagshot() + { + $data = Request::only(['id','is_hot']); + $cate = Db::name('cate')->save($data); + if($cate){ + if($data['is_hot'] == 1){ + return json(['code'=>0,'msg'=>'设置热点成功','icon'=>6]); + } else { + return json(['code'=>0,'msg'=>'取消热点显示','icon'=>5]); + } + }else{ + $res = ['code'=>-1,'msg'=>'热点设置失败']; + } + return json($res); + } + //array_filter过滤函数 public function filtr($arr){ if($arr === '' || $arr === null){ diff --git a/app/admin/controller/Set.php b/app/admin/controller/Set.php index 37c736b..4f0ccf5 100644 --- a/app/admin/controller/Set.php +++ b/app/admin/controller/Set.php @@ -16,13 +16,19 @@ class Set extends AdminController { parent::initialize(); + } + //网站设置显示 + public function index() + { + $mailserver = MailServer::find(1); + $sysInfo = Db::name('system')->find(1); + $syscy = $this->check($sysInfo['base_url']); + + View::assign(['sysInfo'=>$sysInfo,'syscy'=>$syscy,'mailserver'=>$mailserver]); + return View::fetch('set/system/website'); } - /** - * 显示资源列表 - * - * @return \think\Response - */ + //网站设置 public function website() { if(Request::isAjax()){ @@ -37,16 +43,12 @@ class Set extends AdminController return json(['code'=>-1,'msg'=>'更新失败']); } } - $sysInfo = Db::name('system')->find(1); - $syscy = $this->check($sysInfo['base_url']); - View::assign(['sysInfo'=>$sysInfo,'syscy'=>$syscy]); - return View::fetch('set/system/website'); } //综合设置 public function server() { - return $this->email(); + return View::fetch('set/system/server'); } /**邮箱设置 @@ -57,7 +59,7 @@ class Set extends AdminController $mailserver = MailServer::find(1); //邮箱配置 if(Request::isAjax()){ - $data = Request::param(); + $data = Request::only(['host','port','mail','nickname','password']); $res = $mailserver->save($data); if($res){ return json(['code'=>0,'msg'=>'更新成功']); @@ -65,9 +67,6 @@ class Set extends AdminController return json(['code'=>-1,'msg'=>'更新失败']); } } - - View::assign('mailserver',$mailserver); - return View::fetch('set/system/server'); } /** diff --git a/app/admin/model/AuthGroupAccess.php b/app/admin/model/AuthGroupAccess.php new file mode 100644 index 0000000..39c3c94 --- /dev/null +++ b/app/admin/model/AuthGroupAccess.php @@ -0,0 +1,17 @@ + -