diff --git a/app/Http/Routes/V2/AdminRoute.php b/app/Http/Routes/V2/AdminRoute.php index d17e850..fbfd513 100644 --- a/app/Http/Routes/V2/AdminRoute.php +++ b/app/Http/Routes/V2/AdminRoute.php @@ -16,9 +16,7 @@ use App\Http\Controllers\V2\Admin\KnowledgeController; use App\Http\Controllers\V2\Admin\PaymentController; use App\Http\Controllers\V2\Admin\SystemController; use App\Http\Controllers\V2\Admin\ThemeController; -use App\Http\Controllers\V2\Admin\UpdateController; use Illuminate\Contracts\Routing\Registrar; -use Illuminate\Support\Facades\Route; class AdminRoute { @@ -197,12 +195,12 @@ class AdminRoute }); // Update - $router->group([ - 'prefix' => 'update' - ], function ($router) { - $router->get('/check', [UpdateController::class, 'checkUpdate']); - $router->post('/execute', [UpdateController::class, 'executeUpdate']); - }); + // $router->group([ + // 'prefix' => 'update' + // ], function ($router) { + // $router->get('/check', [UpdateController::class, 'checkUpdate']); + // $router->post('/execute', [UpdateController::class, 'executeUpdate']); + // }); // Theme $router->group([ diff --git a/app/Services/AuthService.php b/app/Services/AuthService.php index f82fdf9..299f610 100644 --- a/app/Services/AuthService.php +++ b/app/Services/AuthService.php @@ -58,7 +58,9 @@ class AuthService $accessToken = PersonalAccessToken::findToken($token); - return $accessToken?->tokenable; + $tokenable = $accessToken?->tokenable; + + return $tokenable instanceof User ? $tokenable : null; } /** diff --git a/app/Services/UserService.php b/app/Services/UserService.php index a085630..dd7e0c6 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -14,20 +14,20 @@ class UserService { private function calcResetDayByMonthFirstDay(): int { - $today = date('d'); - $lastDay = date('d', strtotime('last day of +0 months')); + $today = (int) date('d'); + $lastDay = (int) date('d', strtotime('last day of +0 months')); return $lastDay - $today; } private function calcResetDayByExpireDay(int $expiredAt) { - $day = date('d', $expiredAt); - $today = date('d'); - $lastDay = date('d', strtotime('last day of +0 months')); - if ((int) $day >= (int) $today && (int) $day >= (int) $lastDay) { + $day = (int) date('d', $expiredAt); + $today = (int) date('d'); + $lastDay = (int) date('d', strtotime('last day of +0 months')); + if ($day >= $today && $day >= $lastDay) { return $lastDay - $today; } - if ((int) $day >= (int) $today) { + if ($day >= $today) { return $day - $today; }