优化代码

app/http/middleware/ApiAuth.php

@@ -34,11 +34,11 @@ class ApiAuth {
 		} catch (TokenExpiredException $e) {
 			$this->data['msg']  = $e->getMessage();
 			$this->data['code'] = 2001;
-			return json($this->data)->code($this->data['code']);
+			return json($this->data);
 		} catch (JWTException $e) {
 			$this->data['code'] = 2000;
 			$this->data['msg']  = $e->getMessage();
-			return json($this->data)->code($this->data['code']);
+			return json($this->data);
 		}
 
 		return $next($request);

app/http/middleware/Validate.php

@@ -31,7 +31,7 @@ class Validate {
 		$scene = strtolower($controller[0]) . $request->action();
 		$validate = "app\\http\\validate\\" . ucfirst($controller[1]);
 		//仅当验证器存在时 进行校验
-		if (class_exists($validate) && (strtolower($controller[0]) == 'admin' && $request->isPost())) {
+		if (class_exists($validate) && $request->isPost()) {
 			$v = new $validate;
 			//仅当存在验证场景才校验
 			if ($v->hasScene($scene)) {

app/model/Attribute.php

@@ -8,10 +8,10 @@
 // +----------------------------------------------------------------------
 namespace app\model;
 
-use app\model\Model as Models;
-use sent\tree\Tree;
 use think\facade\Config;
 use think\facade\Db;
+use sent\tree\Tree;
+use app\model\Model as Models;
 
 /**
  * 设置模型
@@ -128,7 +128,7 @@ class Attribute extends \think\Model {
 				if ($db->CheckField($data['extra'], 'model_id')) {
 					$map[] = ['model_id', '=', $data['model_id']];
 				}
-				$row = Db::name($data['extra'])->where($map)->select()->toArray();
+				$row =  Db::name($data['extra'])->select($map)->toArray();
 				foreach ($row as $val) {
 					$list[] = ['key'=>$val['id'], 'label'=>$val['title']];
 				}
@@ -181,7 +181,7 @@ class Attribute extends \think\Model {
 				['name' => 'value', 'title' => '默认值', 'help' => '字段的默认值', 'type' => 'text'],
 				['name' => 'remark', 'title' => '字段备注', 'help' => '用于表单中的提示', 'type' => 'text'],
 				['name' => 'is_show', 'title' => '是否显示', 'help' => '是否显示在表单中', 'type' => 'select', 'option' => [
-					['key' => '1', 'label' => '始终显示'], ['key' => '2', 'label' => '新增显示'], ['key' => '3', 'label' => '编辑显示'], ['key' => '0', 'label' => '不显示'],
+						['key'=>'1', 'label' => '始终显示'], ['key'=>'2', 'label'  => '新增显示'], ['key'=>'3', 'label'  => '编辑显示'], ['key'=>'0', 'label'  => '不显示']
 					], 'value' => 1],
 				['name' => 'is_must', 'title' => '是否必填', 'help' => '用于自动验证', 'type' => 'select', 'option' => [['key'=>'0', 'label' => '否'], ['key'=>'1', 'label' => '是']]],
 			],

app/model/Member.php

@@ -74,7 +74,7 @@ class Member extends Model {
 	}
 
 	protected function getAvatarAttr($value, $data) {
-		return avatar($data['uid']);
+		return $value ? $value : request()->domain() . '/static/common/images/default_avatar.jpg';
 	}
 
 	protected function setPasswordAttr($value, $data) {
@@ -90,6 +90,10 @@ class Member extends Model {
 		return JWTAuth::builder($token); //参数为用户认证的信息，请自行添加
 	}
 
+	protected function getNicknameAttr($value, $data){
+		return $value ? $value : $data['username'];
+	}
+
 	/**
 	 * 用户登录
 	 */
@@ -191,17 +195,26 @@ class Member extends Model {
 			}];
 		}
 
-		$list = self::with(['role'])->field('uid,username,nickname,status,email,mobile,department,reg_time')->where($map)->order($order)->paginate($request->pageConfig);
+		$res = self::with(['role', 'group'])->field('uid,username,nickname,status,email,mobile,department,reg_time')->where($map)->order($order)->paginate($request->pageConfig);
-		return $list->append(['avatar', 'status_text']);
+		$list = $res->append(['avatar', 'status_text'])->each(function($item){
+			if($item['group'] === null){
+				$item['group'] = ['title' => '未定义'];
+				$item['group_title'] = '未定义';
+			}else{
+				$item['group_title'] = $item['group']['title'];
+			}
+			return $item;
+		});
+		return $list;
 	}
 
 	/**
 	 * @title: 获取用户列表
 	 */
 	public function getUserDetail($request) {
-		$uid = $request->param('uid', $request->user['uid']);
+		$uid = $request->param('uid');
 		if (!$uid) {
-			return false;
+			$uid = $request->user['uid'];
 		}
 
 		$info = $this->where('uid', $uid)->find();
@@ -255,4 +268,8 @@ class Member extends Model {
 	public function role() {
 		return $this->hasOne('RoleAccess', 'uid', 'uid');
 	}
+
+	public function group(){
+		return $this->hasOneThrough(AuthGroup::class, AuthGroupAccess::class, 'uid', 'id', 'uid', 'group_id');
+	}
 }

extend/com/Datatable.php

@@ -114,8 +114,8 @@ class Datatable {
 		} else {
 			$field_attr['length'] = "";
 		}
-		$field_attr['is_null'] = $attr['is_must'] ? 'NOT NULL' : 'NULL';
+		$field_attr['is_null'] = (isset($attr['is_must']) && $attr['is_must']) ? 'NOT NULL' : 'NULL';
-		$field_attr['default'] = $attr['value'] != '' ? 'DEFAULT "' . $attr['value'] . '"' : '';
+		$field_attr['default'] = (isset($attr['is_must']) && $attr['is_must'] !== '') ? 'DEFAULT "' . $attr['value'] . '"' : '';
 
 		$field_attr['comment'] = (isset($attr['remark']) && $attr['remark']) ? $attr['remark'] : $attr['title'];
 		$field_attr['after']   = (isset($attr['after']) && $attr['after']) ? ' AFTER `' . $attr['after'] . '`' : ' AFTER `id`';