gx

liyuhang
app/Http/Controllers/Bside/ComController.php
app/Http/Controllers/Bside/ProjectGroupController.php
app/Http/Controllers/Bside/ProjectRoleController.php
app/Http/Controllers/Bside/UserController.php
app/Http/Logic/Bside/ProjectGroupLogic.php
app/Http/Logic/Bside/UserLogic.php
app/Http/Requests/Bside/ProjectGroupRequest.php
app/Http/Requests/Bside/ProjectRoleRequest.php
app/Http/Requests/Bside/UserRequest.php
app/Models/User.php
--- a/app/Http/Controllers/Bside/ComController.php
查看文件 @1476740
+++ b/app/Http/Controllers/Bside/ComController.php
查看文件 @1476740
@@ -37,7 +37,7 @@ class ComController extends BaseController
         ];
         $validate = Validator::make($this->param, $rules, $message);
         if($validate->errors()->first()){
-            return $this->response($validate->errors()->first(),Code::USER_ERROR,$this->param);
+            return $this->response($validate->errors()->first(),Code::USER_ERROR);
         }
         $userModel = new UserModel();
         Cache::add('1345951a03fd1916a53c48c16b2fdecb','23423423423423');
@@ -109,7 +109,7 @@ class ComController extends BaseController
         ];
         $validate = Validator::make($this->param, $rules, $message);
         if($validate->fails()){
-            return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
+            return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE);
         }
         $userModel = new UserModel();
         $this->param['id'] = $this->uid;
--- a/app/Http/Controllers/Bside/ProjectGroupController.php
查看文件 @1476740
+++ b/app/Http/Controllers/Bside/ProjectGroupController.php
查看文件 @1476740
@@ -2,7 +2,6 @@
 namespace App\Http\Controllers\Bside;
-use App\Enums\Common\Code;
 use App\Http\Logic\Bside\ProjectGroupLogic;
 use App\Http\Requests\Bside\ProjectGroupRequest;
@@ -31,6 +30,7 @@ class ProjectGroupController extends BaseController
      * @method
      */
     public function add(ProjectGroupRequest $request){
+        $request->validated();
         $this->response('success');
     }
--- a/app/Http/Controllers/Bside/ProjectRoleController.php
查看文件 @1476740
+++ b/app/Http/Controllers/Bside/ProjectRoleController.php
查看文件 @1476740
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Bside;
 use App\Enums\Common\Code;
+use App\Http\Requests\Bside\ProjectRoleRequest;
 use App\Models\ProjectMenu as ProjectMenuModel;
 use App\Models\ProjectRole as ProjectRoleModel;
 use App\Models\User as UserModel;
@@ -56,23 +57,8 @@ class ProjectRoleController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function add(){
-        //TODO::获取当前用户的所在项目组
-        //参数验证
-        $rules = [
-            'name'=>'required|max:11',
-            'role_menu'=>'required|string',
-        ];
-        //验证的提示信息
-        $message = [
-            'name.required'=>'名称必须填写',
-            'name.max'   =>  '号码不大于11字符.',
-            'role_menu.required'=>'密码必须填写',
-        ];
-        $validate = Validator::make($this->param, $rules, $message);
-        if($validate->fails()){
-            return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
-        }
+    public function add(ProjectRoleRequest $request){
+        $request->validated();
         $this->param['project_id'] = $this->user['project_id'];
         //获取当前项目下的角色超级管理员
         $projectRoleModel = new ProjectRoleModel();
@@ -94,24 +80,12 @@ class ProjectRoleController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function edit(){
-        //TODO::根据当前登录用户返回
-        //参数验证
-        $rules = [
-            'id'=>'required',
-            'name'=>'required|max:11',
-            'role_menu'=>'required',
-        ];
-        //验证的提示信息
-        $message = [
-            'id.required'=>'主键必须填写',
-            'name.required'=>'名称必须填写',
-            'role_menu.required'=>'菜单权限列表填写',
-        ];
-        $validate = Validator::make($this->param, $rules, $message);
-        if($validate->fails()){
-            return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE);
-        }
+    public function edit(ProjectRoleRequest $request){
+        $request->validate([
+            'id'=>['required']
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
         $projectRoleModel = new ProjectRoleModel();
         //TODO::查询当前名称是否重复
         $info = $projectRoleModel->where('id','<>',$this->param['id'])
@@ -132,21 +106,14 @@ class ProjectRoleController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function status(){
-        //参数验证
-        $rules = [
-            'id'=>'required',
-            'status'=>'required',
-        ];
-        //验证的提示信息
-        $message = [
-            'id.required'=>'主键必须填写',
-            'status.required'=>'状态必须填写',
-        ];
-        $validate = Validator::make($this->param, $rules, $message);
-        if($validate->fails()){
-            return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
-        }
+    public function status(ProjectRoleRequest $request){
+        $request->validate([
+            'id'=>['required'],
+            'status'=>['required'],
+        ],[
+            'id.required' => 'ID不能为空',
+            'status.required' => 'status不能为空'
+        ]);
         $projectRoleModel = new ProjectRoleModel();
         $rs = $projectRoleModel->edit(['status'=>$this->param['status']],['id'=>$this->param['id']]);
         if($rs === false){
@@ -161,19 +128,12 @@ class ProjectRoleController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function del(){
-        //参数验证
-        $rules = [
-            'id'=>'required',
-        ];
-        //验证的提示信息
-        $message = [
-            'id.required'=>'主键必须填写',
-        ];
-        $validate = Validator::make($this->param, $rules, $message);
-        if($validate->fails()){
-            return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
-        }
+    public function del(ProjectRoleRequest $request){
+        $request->validate([
+            'id'=>['required']
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
         $projectRoleModel = new ProjectRoleModel();
         //查询当前角色下是否有用户
         $userModel = new UserModel();
@@ -185,6 +145,6 @@ class ProjectRoleController extends BaseController
         if($rs === false){
             $this->response('error',Code::USER_ERROR);
         }
-        $this->response('success',Code::SUCCESS);
+        $this->response('success');
     }
 }
--- a/app/Http/Controllers/Bside/UserController.php
查看文件 @1476740
+++ b/app/Http/Controllers/Bside/UserController.php
查看文件 @1476740
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Bside;
 use App\Enums\Common\Code;
+use App\Http\Requests\Bside\UserRequest;
 use App\Models\User as UserModel;
 use Illuminate\Support\Facades\Validator;
@@ -31,29 +32,8 @@ class UserController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function add(){
-        $rules = [
-            'mobile'=>'required|string|max:11',
-            'password'=>'required|string|min:5',
-            'name'=>'required|max:20',
-            'role_id'=>'required'
-        ];
-        //验证的提示信息
-        $message = [
-            'mobile.required'=>'号码必须填写',
-            'mobile.string'=>'号码中含有非法文字',
-            'mobile.max'   =>  '号码不大于11字符.',
-            'password.required'=>'密码必须填写',
-            'password.string'=>'密码中含有非法文字',
-            'password.min'   =>  '密码不小于5字符.',
-            'name.required'=>'名称必须填写',
-            'name.min'   =>  '名称不小于5字符.',
-            'role_id.required'=>'角色必须填写',
-        ];
-        $validate = Validator::make($this->param, $rules, $message);
-        if($validate->fails()){
-                return $this->response($validate->errors()->first(),Code::USER_LOGIN_ERROE);
-        }
+    public function add(UserRequest $request){
+        $request->validated();
         $userModel = new UserModel();
         $this->param['project_id'] = $this->user['project_id'];
         $rs = $userModel->adds($this->param);
@@ -69,29 +49,12 @@ class UserController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function edit(){
-        $rules = [
-            'id'=>'required',
-            'mobile'=>'required|string|max:11',
-            'password'=>'required|string|min:5',
-            'name'=>'required|max:20',
-        ];
-        //验证的提示信息
-        $message = [
-            'id.required'=>'主键不能为空',
-            'mobile.required'=>'号码必须填写',
-            'mobile.string'=>'号码中含有非法文字',
-            'mobile.max'   =>  '号码不大于11字符.',
-            'password.required'=>'密码必须填写',
-            'password.string'=>'密码中含有非法文字',
-            'password.min'   =>  '密码不小于5字符.',
-            'name.required'=>'名称必须填写',
-            'name.min'   =>  '名称不小于5字符.',
-        ];
-        $validate = Validator::make($this->param, $rules, $message);
-        if($validate->fails()){
-            return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
-        }
+    public function edit(UserRequest $request){
+        $request->validate([
+            'id'=>['required']
+        ],[
+            'id.required' => 'ID不能为空'
+        ]);
         $userModel = new UserModel();
         //TODO::查询当前手机号码是否重复
         $info = $userModel->where('id','<>',$this->param['id'])
@@ -112,27 +75,20 @@ class UserController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function status(){
-        //参数验证
-        $rules = [
-            'id'=>'required',
-            'status'=>'required',
-        ];
-        //验证的提示信息
-        $message = [
-            'id.required'=>'主键必须填写',
-            'status.required'=>'状态必须填写',
-        ];
-        $validate = Validator::make($this->param, $rules, $message);
-        if($validate->fails()){
-            return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
-        }
+    public function status(UserRequest $request){
+        $request->validate([
+            'id'=>['required'],
+            'status'=>['required'],
+        ],[
+            'id.required' => 'ID不能为空',
+            'status.required' => 'status不能为空'
+        ]);
         $userLogic = new UserModel();
         $rs = $userLogic->edit($this->param,['id'=>$this->param['id']]);
         if($rs === false){
             $this->response('error',Code::USER_ERROR);
         }
-        $this->response($this->param['status'] == 0 ? '启用成功' : '禁用成功',Code::SUCCESS);
+        $this->response($this->param['status'] == 0 ? '启用成功' : '禁用成功');
     }
     /**
      * @name :删除管理员
@@ -140,18 +96,12 @@ class UserController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function del(){
-        $rules = [
-            'id'=>'required',
-        ];
-        //验证的提示信息
-        $message = [
-            'id.required'=>'主键不能为空',
-        ];
-        $validate = Validator::make($this->param, $rules, $message);
-        if($validate->fails()){
-            return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
-        }
+    public function del(UserRequest $request){
+        $request->validate([
+            'id'=>['required'],
+        ],[
+            'id.required' => 'ID不能为空',
+        ]);
         $userModel = new UserModel();
         $rs = $userModel->del($this->param);
         if($rs === false){
--- a/app/Http/Logic/Bside/ProjectGroupLogic.php 已删除 100644 → 0
查看文件 @1234e8c
+++ b/app/Http/Logic/Bside/ProjectGroupLogic.php 已删除 100644 → 0
查看文件 @1234e8c
-<?php
-
-namespace App\Http\Logic\Bside;
-
-use App\Models\ProjectGroup;
-
-class ProjectGroupLogic extends BaseLogic
-{
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->model = new ProjectGroup();
-    }
-}
--- a/app/Http/Logic/Bside/UserLogic.php 已删除 100644 → 0
查看文件 @1234e8c
+++ b/app/Http/Logic/Bside/UserLogic.php 已删除 100644 → 0
查看文件 @1234e8c
-<?php
-
-namespace App\Http\Logic\Bside;
-
-use App\Models\User;
-
-class UserLogic extends BaseLogic
-{
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->model = new User();
-    }
-
-}
--- a/app/Http/Requests/Bside/ProjectGroupRequest.php
查看文件 @1476740
+++ b/app/Http/Requests/Bside/ProjectGroupRequest.php
查看文件 @1476740
@@ -16,22 +16,18 @@ class ProjectGroupRequest extends FormRequest
         return true;
     }
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
     public function rules()
     {
         return [
-            'name'=>['required'],
+            'name' => 'required|max:255',
         ];
     }
     public function messages()
     {
         return [
-            'name.required' => '请输入描述名称',
+            'name.required' => '请输入文章标题',
+//            'body.required' => '请输入文章内容',
         ];
     }
 }
--- a/app/Http/Requests/Bside/ProjectRoleRequest.php 0 → 100644
查看文件 @1476740
+++ b/app/Http/Requests/Bside/ProjectRoleRequest.php 0 → 100644
查看文件 @1476740
+<?php
+
+namespace App\Http\Requests\Bside;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ProjectRoleRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        return [
+            'name'=>'required|max:11',
+            'role_menu'=>'required|string',
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'name.required'=>'名称必须填写',
+            'name.max'   =>  '名称不大于11字符.',
+            'role_menu.required'=>'角色列表必须填写',
+        ];
+    }
+}
--- a/app/Http/Requests/Bside/UserRequest.php
查看文件 @1476740
+++ b/app/Http/Requests/Bside/UserRequest.php
查看文件 @1476740
@@ -24,7 +24,25 @@ class UserRequest extends FormRequest
     public function rules()
     {
         return [
-            'mobile'=>['required'],
+            'mobile'=>'required|string|max:11',
+            'password'=>'required|string|min:5',
+            'name'=>'required|max:20',
+            'role_id'=>'required'
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'mobile.required'=>'号码必须填写',
+            'mobile.string'=>'号码中含有非法文字',
+            'mobile.max'   =>  '号码不大于11字符.',
+            'password.required'=>'密码必须填写',
+            'password.string'=>'密码中含有非法文字',
+            'password.min'   =>  '密码不小于5字符.',
+            'name.required'=>'名称必须填写',
+            'name.min'   =>  '名称不小于5字符.',
+            'role_id.required'=>'角色必须填写',
         ];
     }
 }
--- a/app/Models/User.php
查看文件 @1476740
+++ b/app/Models/User.php
查看文件 @1476740
@@ -119,11 +119,11 @@ class User extends Base
     public function edits($param){
         //查看密码是否修改
         $info = $this->read(['id'=>$param['id']]);
+        $param['password'] = base64_encode(md5($param['password']));
         if($param['password'] == $info['password']){
             unset($param['password']);
         }
         //密码加密
-        $param['password'] = base64_encode(md5($param['password']));
         $rs = $this->edit($param,['id'=>$param['id']]);
         if($rs === false){
             return false;