This commit is contained in:
2020-02-17 23:43:41 +08:00
parent 259d232d89
commit 5fb45fc57c
73 changed files with 711 additions and 357 deletions

View File

@@ -7,9 +7,10 @@
// | Author: molong <molong@tensent.cn> <http://www.tensent.cn>
// +----------------------------------------------------------------------
namespace app\admin\controller;
use app\common\controller\Admin;
namespace app\controller\admin;
use app\controller\Admin;
use app\model\Member;
/**
* @title 用户管理
*/
@@ -19,29 +20,25 @@ class User extends Admin {
* @title 用户列表
* @author 麦当苗儿 <zuojiazi@vip.qq.com>
*/
public function index() {
public function index(Member $member) {
$param = $this->request->param();
$map['status'] = array('egt', 0);
$map[] = ['status', '>=', 0];
if (isset($param['nickname']) && $param['nickname']) {
$map['nickname'] = array('like', '%' . $param['nickname'] . '%');
}
}
if (isset($param['username']) && $param['username']) {
$map['username'] = array('like', '%' . (string) $param['nickname'] . '%');
}
$order = "uid desc";
$list = model('Member')->where($map)->order($order)
$list = $member->where($map)->order($order)
->paginate(15, false, array(
'param' => $param
'param' => $param,
));
$data = array(
'list' => $list,
'page' => $list->render(),
'param' => $param
);
$this->assign($data);
$this->setMeta('用户信息');
$this->data['list'] = $list;
$this->data['page'] = $list->render();
return $this->fetch();
}
@@ -90,7 +87,7 @@ class User extends Admin {
$info = $this->getUserinfo();
$data = array(
'info' => $info,
'info' => $info,
'keyList' => $model->editfield,
);
$this->assign($data);
@@ -111,14 +108,13 @@ class User extends Admin {
return $this->success('删除用户成功!');
}
/**
* @title 用户授权
* @author colin <colin@tensent.cn>
*/
public function auth() {
$access = model('AuthGroupAccess');
$group = model('AuthGroup');
$group = model('AuthGroup');
if ($this->request->isPost()) {
$uid = input('uid', '', 'trim,intval');
$access->where(array('uid' => $uid))->delete();
@@ -127,7 +123,7 @@ class User extends Admin {
$group_id = input($key, '', 'trim,intval');
if ($group_id) {
$add = array(
'uid' => $uid,
'uid' => $uid,
'group_id' => $group_id,
);
$access->save($add);
@@ -135,8 +131,8 @@ class User extends Admin {
}
return $this->success("设置成功!");
} else {
$uid = input('id', '', 'trim,intval');
$row = $group::select();
$uid = input('id', '', 'trim,intval');
$row = $group::select();
$auth = $access::where(array('uid' => $uid))->select();
$auth_list = array();
@@ -147,9 +143,9 @@ class User extends Admin {
$list[$value['module']][] = $value;
}
$data = array(
'uid' => $uid,
'uid' => $uid,
'auth_list' => $auth_list,
'list' => $list,
'list' => $list,
);
$this->assign($data);
$this->setMeta("用户分组");
@@ -166,9 +162,9 @@ class User extends Admin {
*/
private function getUserinfo($uid = null, $pass = null, $errormsg = null) {
$user = model('Member');
$uid = $uid ? $uid : input('id');
$uid = $uid ? $uid : input('id');
//如果无UID则修改当前用户
$uid = $uid ? $uid : session('user_auth.uid');
$uid = $uid ? $uid : session('user_auth.uid');
$map['uid'] = $uid;
if ($pass != null) {
unset($map);
@@ -199,13 +195,13 @@ class User extends Admin {
//密码验证
$User = new UserApi();
$uid = $User->login(UID, $password, 4);
$uid = $User->login(UID, $password, 4);
if ($uid == -2) {
return $this->error('密码不正确');
}
$Member = model('Member');
$data = $Member->create(array('nickname' => $nickname));
$data = $Member->create(array('nickname' => $nickname));
if (!$data) {
return $this->error($Member->getError());
}
@@ -213,7 +209,7 @@ class User extends Admin {
$res = $Member->where(array('uid' => $uid))->save($data);
if ($res) {
$user = session('user_auth');
$user = session('user_auth');
$user['username'] = $data['nickname'];
session('user_auth', $user);
session('user_auth_sign', data_auth_sign($user));