add user verification

app/Http/Controllers/Admin/UserController.php

@@ -29,6 +29,7 @@ class UserController extends CommonController
     public function edit($user_id)
     {
         $data = User::find($user_id);
+        $data->pswd = decrypt($data->pswd);
 
         $user_job = Job::where('display', '=', '1')->orderby('role', 'asc')->get();
 
@@ -37,32 +38,15 @@ class UserController extends CommonController
     }
 
 //    更新用户信息
-    public function update($user_id)
+    public function update($user_id,Requests\UserRequest $request)
     {
 
-        $input = Input::except('_token', '_method','thumb','pswd');
+        $input = $request->except('_token', '_method');
 
-        $pswd = Input::get('pswd');
-
-        $thumb = Input::get('thumb');
-
-        $validator = Validator::make($input, [
-            'name' => 'required',
-            'surname' => 'required'
-        ], [
-            'name.required' => '登录名不能为空！',
-            'surname.required' => '姓名不能为空！'
-        ]);
-
-        if ($validator->fails()) return back()->withErrors($validator);
-
-        $job_role = Job::find(Input::get('role_id'));
+        $job_role = Job::find($input['role_id']);
         $input['role'] = $job_role->role;
         $input['job_name'] = $job_role->display_name;
-
-        if($pswd!='')$input['pswd'] =  Crypt::encrypt($pswd);
-
-        if($thumb!='')$input['thumb'] =  $thumb;
+        $input['pswd'] =  Crypt::encrypt($input['pswd']);
 
         if (!User::find($user_id)->update($input)) return back()->withErrors('用户信息更新失败，请稍后重试!');
 
@@ -85,33 +69,21 @@ class UserController extends CommonController
 
     }
 
-    public function store()
+    public function store(Requests\UserRequest $request)
     {
-        $input = Input::except('_token');
+        $input = $request->except('_token');
 
         $input['display'] = '1';
 
-        $dep = Department::find($input['department_id']);
-
-        $input['department'] = $dep->department_name;
-
-        $validator = Validator::make($input, [
-            'name' => 'required',
-            'pswd' => 'required',
-            'surname' => 'required'
-        ], [
-            'name.required' => '登录名不能为空！',
-            'pswd.required' => '密码不能为空！',
-            'surname.required' => '姓名不能为空！'
-        ]);
-
-        $job_role = Job::find($input['role_id']);
-
-        $input['role'] = $job_role->role;
-
-        $input['job_name'] = $job_role->display_name;
+        !$input['department_id']?$input['department'] =' ':$input['department'] = Department::find($input['department_id'])->department_name;
 
-        if ($validator->fails()) return back()->withErrors($validator);
+        if(!$input['role_id']){
+            $input['role'] = ' ';
+            $input['job_name'] =' ';
+        }else{
+        $input['role'] = Job::find($input['role_id'])->role;
+        $input['job_name'] = Job::find($input['role_id'])->display_name;
+        }
 
         $input['pswd'] = Crypt::encrypt($input['pswd']);
 

app/Http/Requests/UserRequest.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Http\Requests;
+
+use App\Http\Requests\Request;
+
+class UserRequest extends Request
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name'=>'required',
+            'pswd'=>'required',
+            'surname'=>'required',
+        ];
+    }
+
+    public function messages()
+    {
+        return[
+            'name.required'=>'登录名为空',
+            'pswd.required'=>'密码为空',
+            'surname.required'=>'姓名为空',
+        ];
+    }
+
+
+}

resources/views/admin/errors.blade.php

@@ -3,11 +3,11 @@
         {{--<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>--}}
         @if(is_object($errors))
             @foreach($errors->all() as $error)
-                <strong style="color: #950000">{{ $error }}</strong>
+                <strong>{{ $error }}</strong><br>
             @endforeach
         @elseif(is_array($errors))
             @foreach($errors as $error)
-                <strong style="color: red">{{ $error }}</strong>
+                <strong>{{ $error }}</strong><br>
             @endforeach
         @else
             <strong>{{ $errors }}!</strong>

resources/views/admin/user/add_user.blade.php

@@ -30,23 +30,22 @@
                 </div>
             </div>
             <div class="box-body">
+                @include('admin.errors', ['errors' => $errors])
                 <form action="{{ url("/user") }}" method="post">
                     {{csrf_field()}}
-                    @include('admin.errors', ['errors' => $errors])
-
                     <table id="example2" class="table table-bordered table-hover dataTable" role="grid" aria-describedby="example2_info">
                         <tbody>
                         <tr>
                             <td>登陆名</td>
-                            <td><input name="name" class="form-control" value="" ></td>
+                            <td><input name="name" class="form-control" placeholder="必填项"></td>
                         </tr>
                         <tr>
                             <td>密码</td>
-                            <td><input type="password" name="pswd" class="form-control"  value="" ></td>
+                            <td><input type="password" name="pswd" class="form-control" placeholder="必填项" ></td>
                         </tr>
                         <tr>
                             <td>姓名</td>
-                            <td><input name="surname" class="form-control" value=""  ></td>
+                            <td><input name="surname" class="form-control"  placeholder="必填项" ></td>
                         </tr>
                         <tr>
                             <td>头像</td>

resources/views/admin/user/edit.blade.php

@@ -44,16 +44,16 @@
                             <td><input name="name" class="form-control" value="{{ $data->name }}"></td>
                         </tr>
                         <tr>
-                            <td>新密码</td>
-                            <td><input name="pswd" type="password" class="form-control" value=""></td>
+                            <td>密码</td>
+                            <td><input name="pswd" type="password" class="form-control" value="{{ $data->pswd }}"></td>
                         </tr>
                         <tr>
                             <td>职位</td>
                             <td>
                                 <select class="form-control" name="role_id">
-                                    @foreach($user_job as $value)
-                                        <option value="{{$value->id}}" @if($data->role == $value->role) selected @endif>{{$value->display_name}}</option>
-                                    @endforeach
+                                        @foreach($user_job as $value)
+                                            <option value="{{$value->id}}" @if($data->role == $value->role) selected @endif>{{$value->display_name}}</option>
+                                        @endforeach
                                 </select>
                             </td>
                         </tr>
@@ -64,7 +64,7 @@
                         <tr>
                             <td>头像</td>
                             <td>
-                                <input hidden name="thumb" class="form-control">
+                                <input readonly name="thumb" value="{{ $data->thumb }}" class="form-control">
                                 <input id="file_upload" name="file_upload" type="file" multiple="true">
                                 <script src="{{ asset('uploadify/jquery.uploadify.min.js') }}" type="text/javascript"></script>
                                 {{--<link rel="stylesheet" type="text/css" href="{{ asset('uploadify/uploadify.css') }}">--}}