diff --git a/application/traits/Auth.php b/application/traits/Auth.php index 525cc17..fa406c1 100644 --- a/application/traits/Auth.php +++ b/application/traits/Auth.php @@ -11,6 +11,8 @@ use app\behavior\LoginRecord; trait Auth { + protected $loginUserKey = 'user'; + public function authLogin(Request $request) { $err = $this->validateLogin($request); @@ -27,7 +29,7 @@ trait Auth $this->error('登录失败'); } if (password_verify($request->param('password'), $user->password)) { - Session::set('user', $user); + Session::set($this->loginUserKey, $user); # 记住登录 $this->LoginRemember($user, $request); # 登录记录 @@ -46,7 +48,7 @@ trait Auth public function rememberLogin() { // 如果记住登录 - if (!Session::get('user') && Cookie::get('remember_token') && $this->checkRememberToken()) { + if (!Session::get($this->loginUserKey) && Cookie::get('remember_token') && $this->checkRememberToken()) { return true; } @@ -59,11 +61,18 @@ trait Auth */ public function authLogout() { - $user = Session::get('user'); - $user->remember_token = null; - $user->save(); - Cookie::delete('remember_token'); - Session::delete('user'); + $user = Session::get($this->loginUserKey); + $this->deleteToken($user); + Session::delete($this->loginUserKey); + } + + protected function deleteToken($user) + { + if ($user->remember_token) { + $user->remember_token = null; + $user->save(); + Cookie::delete('remember_token'); + } } /** * 验证 diff --git a/composer.lock b/composer.lock index 665f59d..0d023ae 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "topthink/framework", - "version": "v5.1.29", + "version": "v5.1.30", "source": { "type": "git", "url": "https://github.com/top-think/framework.git", - "reference": "f1d8ee3a91e8f504507edb5dcc49c50c47b4500f" + "reference": "4fefa5ed2f9dc8a15fcf7bb271d0d918fb48dacc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/framework/zipball/f1d8ee3a91e8f504507edb5dcc49c50c47b4500f", - "reference": "f1d8ee3a91e8f504507edb5dcc49c50c47b4500f", + "url": "https://api.github.com/repos/top-think/framework/zipball/4fefa5ed2f9dc8a15fcf7bb271d0d918fb48dacc", + "reference": "4fefa5ed2f9dc8a15fcf7bb271d0d918fb48dacc", "shasum": "", "mirrors": [ { @@ -61,7 +61,7 @@ "orm", "thinkphp" ], - "time": "2018-11-11T01:17:33+00:00" + "time": "2018-11-30T07:46:23+00:00" }, { "name": "topthink/think-captcha", @@ -206,12 +206,12 @@ "source": { "type": "git", "url": "https://github.com/yanwenwu/thinkphp-permission.git", - "reference": "670caf6a98a476e769fb24002aeb5feb5f2a6e69" + "reference": "c9341e22c73e30c963a3aebc6da842af7ebc3f26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yanwenwu/thinkphp-permission/zipball/670caf6a98a476e769fb24002aeb5feb5f2a6e69", - "reference": "670caf6a98a476e769fb24002aeb5feb5f2a6e69", + "url": "https://api.github.com/repos/yanwenwu/thinkphp-permission/zipball/c9341e22c73e30c963a3aebc6da842af7ebc3f26", + "reference": "c9341e22c73e30c963a3aebc6da842af7ebc3f26", "shasum": "", "mirrors": [ { @@ -243,7 +243,7 @@ } ], "description": "rbac", - "time": "2018-10-10T13:12:58+00:00" + "time": "2018-11-30T02:01:37+00:00" } ], "packages-dev": [], diff --git a/database/seeds/Permissions.php b/database/seeds/Permissions.php index 444bd9b..a5b6a37 100644 --- a/database/seeds/Permissions.php +++ b/database/seeds/Permissions.php @@ -24,6 +24,8 @@ class Permissions extends Seeder 'controller' => '', 'action' => '', 'is_show' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ], [ @@ -35,6 +37,8 @@ class Permissions extends Seeder 'controller' => 'user', 'action' => 'index', 'is_show' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ], [ @@ -46,6 +50,8 @@ class Permissions extends Seeder 'controller' => 'role', 'action' => 'index', 'is_show' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ], [ @@ -57,6 +63,8 @@ class Permissions extends Seeder 'controller' => 'permission', 'action' => 'index', 'is_show' => 1, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ], [ @@ -68,6 +76,8 @@ class Permissions extends Seeder 'controller' => 'user', 'action' => 'create', 'is_show' => 2, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ], [ @@ -79,6 +89,8 @@ class Permissions extends Seeder 'controller' => 'user', 'action' => 'edit', 'is_show' => 2, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ], [ @@ -90,6 +102,8 @@ class Permissions extends Seeder 'controller' => 'user', 'action' => 'delete', 'is_show' => 2, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ], [ @@ -101,6 +115,8 @@ class Permissions extends Seeder 'controller' => 'role', 'action' => 'create', 'is_show' => 2, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ], [ @@ -112,6 +128,8 @@ class Permissions extends Seeder 'controller' => 'role', 'action' => 'edit', 'is_show' => 2, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ], [ @@ -123,6 +141,8 @@ class Permissions extends Seeder 'controller' => 'role', 'action' => 'delete', 'is_show' => 2, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ], [ @@ -134,6 +154,8 @@ class Permissions extends Seeder 'controller' => 'role', 'action' => 'getPermissionsOfRole', 'is_show' => 2, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ], [ @@ -145,6 +167,8 @@ class Permissions extends Seeder 'controller' => 'role', 'action' => 'givePermissions', 'is_show' => 2, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ], [ @@ -156,6 +180,8 @@ class Permissions extends Seeder 'controller' => 'user', 'action' => 'giveRoles', 'is_show' => 2, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ], [ @@ -167,6 +193,8 @@ class Permissions extends Seeder 'controller' => 'permission', 'action' => 'create', 'is_show' => 2, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ], [ @@ -178,6 +206,8 @@ class Permissions extends Seeder 'controller' => 'permission', 'action' => 'edit', 'is_show' => 2, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ], [ @@ -189,6 +219,8 @@ class Permissions extends Seeder 'controller' => 'permission', 'action' => 'delete', 'is_show' => 2, + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ], ]; diff --git a/database/seeds/Roles.php b/database/seeds/Roles.php index 741eb3e..784bc74 100644 --- a/database/seeds/Roles.php +++ b/database/seeds/Roles.php @@ -17,6 +17,8 @@ class Roles extends Seeder $data = [ 'name' => '超级管理员', + 'created_at' => date('Y-m-d H:i:s'), + 'updated_at' => date('Y-m-d H:i:s'), ]; $this->table(config('permissions.table.role'))->insert($data)->save(); diff --git a/database/seeds/Users.php b/database/seeds/Users.php index a7ee624..5eb9335 100644 --- a/database/seeds/Users.php +++ b/database/seeds/Users.php @@ -18,6 +18,8 @@ class Users extends Seeder 'name' => 'admin', 'email' => 'admin@gmail.com', 'password' => password_hash('admin', PASSWORD_DEFAULT), + 'created_at' => date('Y-m-d H:i:s'), + 'login_at' => date('Y-m-d H:i:s'), ]; $this->table('users')->insert([$data])->save();