密码修改

Modules/Admin/Http/Controllers/UsersController.php

@@ -10,12 +10,15 @@ namespace Modules\Admin\Http\Controllers;
 
 use App\User;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Hash;
 use Modules\Admin\Auxiliary\View\FromAuxiliary;
 use Modules\Admin\Auxiliary\View\TableAuxiliary;
 use Modules\Admin\Enum\UserEnum;
+use Modules\Admin\Services\AdminService;
 use Modules\Admin\Services\UsersService;
 use Spatie\Permission\Models\Permission;
 use DB;
+use Illuminate\Support\Facades\Log;
 
 class UsersController extends BaseController
 {
@@ -68,7 +71,7 @@ class UsersController extends BaseController
 
         $tableObj->search('input', 'name_staffNum_mobile', '姓名、编号或手机号');
         $tableObj->column('name', '姓名')
-                 ->column('staff_num', '用户编码')
+                 ->column('staff_num', '用户名')
                  ->column('mobile', '手机号');
 
 
@@ -86,7 +89,7 @@ class UsersController extends BaseController
         $tableObj = new TableAuxiliary('', $user);
         $tableObj->column("name", "姓名")
                  ->column("mobile", "手机号")
-                 ->column("staff_num", "员工编码");
+                 ->column("staff_num", "用户名");
         $tableObj->title = '用户详情';
         return $this->tableView($tableObj);
     }
@@ -97,11 +100,41 @@ class UsersController extends BaseController
         $fromObj = new FromAuxiliary('users/list/add');
         $fromObj->input("name", "姓名")
                 ->input("mobile", "手机号")
-                ->input("staff_num", "用户编码");
+                ->input("staff_num", "用户名");
         $fromObj->title = '添加职员';
         return $this->from($fromObj);
     }
 
+    public function resetpass(Request $request)
+    {
+        if ($request->isMethod('post')) {
+            if (!$request->has(['old_password', 'password', 'confirm_password'])) {
+                return $this->error(1, '缺少必要参数');
+            }
+            $admin_password = DB::table('users')->where('id', $request->user()->id)->first();
+            if (!Hash::check(strval($request->input('old_password')), $admin_password->password)) {
+                return $this->error(1, '原始密码错误');
+            }
+            if ($request->input('password') !== $request->input('confirm_password')) {
+                return $this->error(1, '新密码和确认密码不一致');
+            }
+            $valid = validPass($request->input('password'));
+            if (is_string($valid)) {
+                return $this->error(1, $valid);
+            }
+            $password        = bcrypt($request->input('password'));
+            DB::table('users')->where('id',$request->user()->id)->update(['password'=>$password]);
+            return $this->success('', '修改成功！');
+        }
+
+        $fromObj        = new FromAuxiliary('welcome/resetpassword');
+        $fromObj->title = '重设密码';
+        $fromObj->password('old_password', '原始密码');
+        $fromObj->password('password', '新密码');
+        $fromObj->password('confirm_password', '确认密码');
+        return $this->from($fromObj);
+    }
+
     //添加用户操作
     public function addPost(Request $request)
     {
@@ -134,7 +167,7 @@ class UsersController extends BaseController
         $fromObj = new FromAuxiliary('users/list/edit', $user);
         $fromObj->input("name", "姓名")
                 ->input("mobile", "手机号")
-                ->input("staff_num", "用户编码");
+                ->input("staff_num", "用户名");
         $fromObj->title      = '修改用户信息';
         $fromObj->primaryKey = 'staff_num';
         return $this->from($fromObj);
@@ -144,7 +177,7 @@ class UsersController extends BaseController
     public function editPost(Request $request)
     {
         if (!$request->has('staff_num') || $request->input('staff_num') == 'admin' || empty($request->input('staff_num'))) {
-            return $this->error(1, '用户编码错误');
+            return $this->error(1, '用户名错误');
         }
         if (!$request->has('name') || empty($request->input('name'))) {
             return $this->error(1, '姓名不能为空');
@@ -166,7 +199,7 @@ class UsersController extends BaseController
             return $this->error(1, '缺少必要参数');
         }
         if ($request->input('staff_num') == 'admin') {
-            return $this->error(1, '员工编码错误');
+            return $this->error(1, '用户名错误');
         }
         if ($request->input('staff_num') == $request->user()['staff_num']) {
             return $this->error(1, '不能删除自己');

Modules/Admin/Routes/web.php

@@ -40,9 +40,11 @@ Route::prefix('admin')->group(function() {
     Route::post('/users/list/edit', 'UsersController@editPost');
     Route::post('/users/list/del', 'UsersController@delPost');
     Route::get('/users/list/resetpassword', 'UsersController@resetPassword');
+    Route::match(['get', 'post'], '/welcome/resetpassword', 'UsersController@resetpass');
 //    Route::get('/users/roles/change', 'UsersController@rolesChange');
     Route::match(['get', 'post'], '/users/roles/edit', 'UsersController@roles');
 });
 
 //菜单导出文件
 Route::get('/file/menu', 'MenusController@makeMenuToFile');
+Route::get('/register','LoginController@loginView');