优化更新

This commit is contained in:
2026-02-10 09:06:29 +08:00
parent 7dac7f0995
commit 64c086431a
2 changed files with 10 additions and 10 deletions
+2 -2
View File
@@ -21,7 +21,7 @@ class AuthCheckMiddleware
public function handle(Request $request, Closure $next, ?string $guard = 'api', ?string $permission = null): Response public function handle(Request $request, Closure $next, ?string $guard = 'api', ?string $permission = null): Response
{ {
// 检查是否已认证 // 检查是否已认证
if (!Auth::guard($guard)->check()) { if (!auth($guard)->check()) {
return response()->json([ return response()->json([
'code' => 401, 'code' => 401,
'message' => '未登录或token已过期', 'message' => '未登录或token已过期',
@@ -30,7 +30,7 @@ public function handle(Request $request, Closure $next, ?string $guard = 'api',
} }
// 获取当前用户 // 获取当前用户
$user = Auth::guard($guard)->user(); $user = auth($guard)->user();
// 检查用户状态 // 检查用户状态
if (isset($user->status) && $user->status !== 1) { if (isset($user->status) && $user->status !== 1) {
+8 -8
View File
@@ -43,10 +43,10 @@ public function login(array $credentials): array
]); ]);
// 生成token // 生成token
$token = Auth::guard('admin')->login($user); $token = auth('admin')->login($user);
// 生成refresh token // 生成refresh token
$refreshToken = Auth::guard('admin')->refresh(); $refreshToken = auth('admin')->refresh();
// 获取用户菜单 // 获取用户菜单
$menu = $this->getUserMenu($user); $menu = $this->getUserMenu($user);
@@ -68,7 +68,7 @@ public function login(array $credentials): array
*/ */
public function logout(): void public function logout(): void
{ {
Auth::guard('admin')->logout(); auth('admin')->logout();
} }
/** /**
@@ -76,11 +76,11 @@ public function logout(): void
*/ */
public function refresh(): array public function refresh(): array
{ {
$newToken = Auth::guard('admin')->refresh(); $newToken = auth('admin')->refresh();
$user = Auth::guard('admin')->user(); $user = auth('admin')->user();
// 生成新的refresh token // 生成新的refresh token
$newRefreshToken = Auth::guard('admin')->refresh(); $newRefreshToken = auth('admin')->refresh();
// 获取用户菜单 // 获取用户菜单
$menu = $this->getUserMenu($user); $menu = $this->getUserMenu($user);
@@ -102,7 +102,7 @@ public function refresh(): array
*/ */
public function me(): array public function me(): array
{ {
$user = Auth::guard('admin')->user(); $user = auth('admin')->user();
return $this->getUserInfo($user); return $this->getUserInfo($user);
} }
@@ -132,7 +132,7 @@ public function resetPassword(array $data): void
*/ */
public function changePassword(array $data): void public function changePassword(array $data): void
{ {
$user = Auth::guard('admin')->user(); $user = auth('admin')->user();
if (!Hash::check($data['old_password'], $user->password)) { if (!Hash::check($data['old_password'], $user->password)) {
throw ValidationException::withMessages([ throw ValidationException::withMessages([