新建更新管理员时密码问题

Author: big-pang

app/Http/Controllers/Admin/PermissionController.php

@@ -15,11 +15,11 @@
 class PermissionController extends Controller
 {
     protected $fields = [
-        'name' => '',
-        'label' => '',
+        'name'        => '',
+        'label'       => '',
         'description' => '',
-        'cid' => 0,
-        'icon' => '',
+        'cid'         => 0,
+        'icon'        => '',
     ];
 
 
@@ -63,12 +63,14 @@ public function index(Request $request, $cid = 0)
                     ->orderBy($columns[$order[0]['column']]['data'], $order[0]['dir'])
                     ->get();
             }
+
             return response()->json($data);
         }
         $datas['cid'] = $cid;
         if ($cid > 0) {
             $datas['data'] = Permission::find($cid);
         }
+
         return view('admin.permission.index', $datas);
     }
 
@@ -84,6 +86,7 @@ public function create(int $cid)
             $data[$field] = old($field, $default);
         }
         $data['cid'] = $cid;
+
         return view('admin.permission.create', $data);
     }
 
@@ -97,11 +100,12 @@ public function store(PermissionCreateRequest $request)
     {
         $permission = new Permission();
         foreach (array_keys($this->fields) as $field) {
-            $permission->$field = $request->get($field,$this->fields[$field]);
+            $permission->$field = $request->get($field, $this->fields[$field]);
         }
         $permission->save();
         Event::fire(new permChangeEvent());
         event(new \App\Events\userActionEvent('\App\Models\Admin\Permission', $permission->id, 1, '添加了权限:' . $permission->name . '(' . $permission->label . ')'));
+
         return redirect('/admin/permission/' . $permission->cid)->withSuccess('添加成功！');
     }
 
@@ -130,6 +134,7 @@ public function edit($id)
         foreach (array_keys($this->fields) as $field) {
             $data[$field] = old($field, $permission->$field);
         }
+
         //dd($data);
         return view('admin.permission.edit', $data);
     }
@@ -145,11 +150,12 @@ public function update(PermissionUpdateRequest $request, $id)
     {
         $permission = Permission::find((int)$id);
         foreach (array_keys($this->fields) as $field) {
-            $permission->$field = $request->get($field,$this->fields[$field]);
+            $permission->$field = $request->get($field, $this->fields[$field]);
         }
         $permission->save();
         Event::fire(new permChangeEvent());
         event(new \App\Events\userActionEvent('\App\Models\Admin\Permission', $permission->id, 3, '修改了权限:' . $permission->name . '(' . $permission->label . ')'));
+
         return redirect('admin/permission/' . $permission->cid)->withSuccess('修改成功！');
     }
 
@@ -168,7 +174,7 @@ public function destroy($id)
                 ->withErrors("请先将该权限的子权限删除后再做删除操作!");
         }
         $tag = Permission::find((int)$id);
-        foreach ($tag->roles as $v){
+        foreach ($tag->roles as $v) {
             $tag->roles()->detach($v->id);
         }
         if ($tag) {
@@ -179,6 +185,7 @@ public function destroy($id)
         }
         Event::fire(new permChangeEvent());
         event(new \App\Events\userActionEvent('\App\Models\Admin\Permission', $tag->id, 2, '删除了权限:' . $tag->name . '(' . $tag->label . ')'));
+
         return redirect()->back()
             ->withSuccess("删除成功");
     }

app/Http/Controllers/Admin/UserController.php

@@ -12,7 +12,7 @@
 class UserController extends Controller
 {
     protected $fields = [
-        'name' => '',
+        'name'  => '',
         'email' => '',
         'roles' => [],
     ];
@@ -52,8 +52,10 @@ public function index(Request $request)
                     ->orderBy($columns[$order[0]['column']]['data'], $order[0]['dir'])
                     ->get();
             }
+
             return response()->json($data);
         }
+
         return view('admin.user.index');
     }
 
@@ -69,6 +71,7 @@ public function create()
             $data[$field] = old($field, $default);
         }
         $data['rolesAll'] = Role::all()->toArray();
+
         return view('admin.user.create', $data);
     }
 
@@ -84,12 +87,14 @@ public function store(Requests\AdminUserCreateRequest $request)
         foreach (array_keys($this->fields) as $field) {
             $user->$field = $request->get($field);
         }
+        $user->password = bcrypt($request->get('password'));
         unset($user->roles);
         $user->save();
         if (is_array($request->get('roles'))) {
             $user->giveRoleTo($request->get('roles'));
         }
         event(new \App\Events\userActionEvent('\App\Models\Admin\AdminUser', $user->id, 1, '添加了用户' . $user->name));
+
         return redirect('/admin/user')->withSuccess('添加成功！');
     }
 
@@ -127,6 +132,7 @@ public function edit($id)
         $data['rolesAll'] = Role::all()->toArray();
         $data['id'] = (int)$id;
         event(new \App\Events\userActionEvent('\App\Models\Admin\AdminUser', $user->id, 3, '编辑了用户' . $user->name));
+
         return view('admin.user.edit', $data);
     }
 
@@ -144,6 +150,11 @@ public function update(Requests\AdminUserUpdateRequest $request, $id)
             $user->$field = $request->get($field);
         }
         unset($user->roles);
+        if ($request->get('password') != '') {
+            $user->password = bcrypt($request->get('password'));
+
+        }
+
         $user->save();
         $user->giveRoleTo($request->get('roles', []));