更新用户模块

app/common.php

@@ -20,7 +20,8 @@ function is_login() {
 }
 
 function is_administrator() {
-	return true;
+	$user = Session::get('userInfo');
+	return (int) $user['uid'] === (int) env('rootuid') ? true : false;
 }
 
 function form($field = [], $data = []) {

app/controller/Base.php

@@ -70,6 +70,7 @@ class Base {
 			$config = Config::getConfigList($this->request);
 			Cache::set('system_config_data', $config);
 		}
+		config($config, 'config');
 		View::assign('config', $config);
 		// 控制器初始化
 		$this->initialize();

app/controller/admin/Base.php

@@ -42,9 +42,9 @@ class Base extends BaseC {
 
 			// 是否是超级管理员
 			define('IS_ROOT', is_administrator());
-			if (!IS_ROOT && \think\Config::get('admin_allow_ip')) {
+			if (!IS_ROOT && \think\facade\Config::get('config.admin_allow_ip')) {
 				// 检查IP地址访问
-				if (!in_array(get_client_ip(), explode(',', \think\Config::get('admin_allow_ip')))) {
+				if (!in_array(get_client_ip(), explode(',', \think\facade\Config::get('config.admin_allow_ip')))) {
 					$this->error('403:禁止访问');
 				}
 			}

app/controller/admin/User.php

@@ -82,12 +82,20 @@ class User extends Base {
 	 * @title 删除用户
 	 * @author colin <colin@tensent.cn>
 	 */
-	public function del($id) {
-		$uid = array('IN', is_array($id) ? implode(',', $id) : $id);
+	public function del() {
+		$uid = $this->request->param('id');
+
+		if ($this->request->rootUid == $uid) {
+			return $this->error('超级用户无法删除！');
+		}
+
 		//获取用户信息
-		$find = $this->getUserinfo($uid);
-		model('Member')->where(array('uid' => $uid))->delete();
-		return $this->success('删除用户成功！');
+		$result = Member::where('uid', $uid)->delete();
+		if (false !== $result) {
+			return $this->success('删除用户成功！');
+		}else{
+			return $this->error('删除失败！');
+		}
 	}
 
 	/**

app/http/middleware/Admin.php

@@ -16,7 +16,8 @@ use think\facade\Session;
 class Admin {
 
 	public function handle($request, \Closure $next) {
-		$user = Session::get('user');
+		$request->rootUid = env('rootuid');
+		$request->user = Session::get('userInfo');
 		$request->url = str_replace(".", "/", strtolower($request->controller())) . '/' . $request->action();
 
 		$request->pageConfig = array(