gx

@@ -7,6 +7,7 @@ use App\Models\Project as ProjectModel;
 use App\Models\ProjectMenu as ProjectMenuModel;
 use App\Models\ProjectRole as ProjectRoleModel;
 use App\Models\User as UserModel;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
@@ -22,25 +23,18 @@ class ComController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function login(){
-        $rules = [
-            'mobile'=>'required|string|max:12',
-            'password'=>'required|string',
-        ];
-        //验证的提示信息
-        $message = [
+    public function login(Request $request){
+        $request->validate([
+            'mobile'=>['required,string,max:12'],
+            'password'=>['required,string'],
+        ],[
             'mobile.required'=>'标题必须填写',
             'mobile.string'=>'标题中含有非法文字',
             'password.required'=>'内容必须填写',
             'password.string'=>'内容中含有非法文字',
             'mobile.max'   =>  'account不大于12字符.',
-        ];
-        $validate = Validator::make($this->param, $rules, $message);
-        if($validate->errors()->first()){
-            return $this->response($validate->errors()->first(),Code::USER_ERROR);
-        }
+        ]);
         $userModel = new UserModel();
-        Cache::add('1345951a03fd1916a53c48c16b2fdecb','23423423423423');
         $res = $userModel->login($this->param);
         if($res === false){
             $this->response('当前用户不存在或者被禁用,登录失败',Code::USER_ERROR,[]);
@@ -94,23 +88,17 @@ class ComController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function edit_info(){
-        $rules = [
-            'password'=>'required|string|min:5',
-            'name'=>'required|max:20',
-        ];
-        //验证的提示信息
-        $message = [
+    public function edit_info(Request $request){
+        $request->validate([
+            'password'=>['required,string,min:5'],
+            'name'=>['required,max:20'],
+        ],[
             '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);
-        }
+        ]);
         $userModel = new UserModel();
         $this->param['id'] = $this->uid;
         $rs = $userModel->edits($this->param);

@@ -7,6 +7,7 @@ use App\Http\Requests\Bside\ProjectRoleRequest;
 use App\Models\ProjectMenu as ProjectMenuModel;
 use App\Models\ProjectRole as ProjectRoleModel;
 use App\Models\User as UserModel;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
 
 class ProjectRoleController extends BaseController
@@ -106,7 +107,7 @@ class ProjectRoleController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function status(ProjectRoleRequest $request){
+    public function status(Request $request){
         $request->validate([
             'id'=>['required'],
             'status'=>['required'],
@@ -128,7 +129,7 @@ class ProjectRoleController extends BaseController
      * @author :liyuhang
      * @method
      */
-    public function del(ProjectRoleRequest $request){
+    public function del(Request $request){
         $request->validate([
             'id'=>['required']
         ],[