From ddd079f4fc02b4bc67091c7213b572d11e5b94ee Mon Sep 17 00:00:00 2001 From: xiaomlove Date: Sun, 4 May 2025 02:20:18 +0700 Subject: [PATCH] add queue monitor menu --- .docker/php/entrypoint.sh | 2 +- app/Providers/Filament/AppPanelProvider.php | 13 +++++++++++++ resources/lang/en/admin.php | 1 + resources/lang/en/nexus.php | 4 ++++ resources/lang/zh_CN/admin.php | 1 + resources/lang/zh_TW/admin.php | 1 + resources/lang/zh_TW/nexus.php | 4 ++++ 7 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.docker/php/entrypoint.sh b/.docker/php/entrypoint.sh index 664b66b5..a18c23ef 100644 --- a/.docker/php/entrypoint.sh +++ b/.docker/php/entrypoint.sh @@ -72,7 +72,7 @@ elif [ "$SERVICE_NAME" = "queue" ]; then while true; do if [ -f "$ENV_FILE" ] && [ -d "$VENDOR_DIR" ]; then echo_success "[Queue] Run queue:work at $(date '+%Y-%m-%d %H:%M:%S')"; - php artisan queue:work --verbose --tries=3; + php artisan queue:horizon; else echo_info "[Queue] .env or vendor not exists,wait 5 seconds ..."; sleep 5; diff --git a/app/Providers/Filament/AppPanelProvider.php b/app/Providers/Filament/AppPanelProvider.php index 7e7b3032..fcf2d6ee 100644 --- a/app/Providers/Filament/AppPanelProvider.php +++ b/app/Providers/Filament/AppPanelProvider.php @@ -2,11 +2,13 @@ namespace App\Providers\Filament; +use App\Models\User; use Filament\Http\Middleware\Authenticate; use Filament\Http\Middleware\AuthenticateSession; use Filament\Http\Middleware\DisableBladeIconComponents; use Filament\Http\Middleware\DispatchServingFilamentEvent; use Filament\Navigation\NavigationGroup; +use Filament\Navigation\NavigationItem; use Filament\Pages; use Filament\Panel; use Filament\PanelProvider; @@ -18,6 +20,7 @@ use Illuminate\Cookie\Middleware\EncryptCookies; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken; use Illuminate\Routing\Middleware\SubstituteBindings; use Illuminate\Session\Middleware\StartSession; +use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Route; use Illuminate\View\Middleware\ShareErrorsFromSession; use Filament\Tables\Enums\FiltersLayout; @@ -75,6 +78,16 @@ class AppPanelProvider extends PanelProvider ->authMiddleware([ \App\Http\Middleware\Filament::class, ]) + ->navigationItems([ + NavigationItem::make('Horizon') + ->label(nexus_trans('admin.sidebar.queue_monitor')) + ->icon('heroicon-o-presentation-chart-line') + ->group('System') + ->sort(99) + ->url('/horizon') + ->openUrlInNewTab() + ->hidden(fn() => Auth::user()->class < User::CLASS_SYSOP) + ]) ; } diff --git a/resources/lang/en/admin.php b/resources/lang/en/admin.php index 442e2c52..b3c66d0a 100644 --- a/resources/lang/en/admin.php +++ b/resources/lang/en/admin.php @@ -44,6 +44,7 @@ return [ 'oauth_refresh_token' => 'Refresh tokens', 'token' => 'Access tokens', 'oauth_provider' => 'Authorization provider', + 'queue_monitor' => 'Queue monitor', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/en/nexus.php b/resources/lang/en/nexus.php index 22f359cc..aa8f0575 100644 --- a/resources/lang/en/nexus.php +++ b/resources/lang/en/nexus.php @@ -17,4 +17,8 @@ return [ 'sum' => 'Sum', 'do_not_repeat' => 'Please do not repeat the operation!', 'no_permission' => 'No permission!', + 'sort' => 'sort field', + 'order' => 'sort', + 'asc' => 'ascending order', + 'desc' => 'descending order', ]; diff --git a/resources/lang/zh_CN/admin.php b/resources/lang/zh_CN/admin.php index e6c3c474..a8e0a9b2 100644 --- a/resources/lang/zh_CN/admin.php +++ b/resources/lang/zh_CN/admin.php @@ -42,6 +42,7 @@ return [ 'oauth_refresh_token' => '刷新令牌', 'token' => '访问令牌', 'oauth_provider' => '身份验证', + 'queue_monitor' => '队列监控', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/zh_TW/admin.php b/resources/lang/zh_TW/admin.php index 210d4814..7916e738 100644 --- a/resources/lang/zh_TW/admin.php +++ b/resources/lang/zh_TW/admin.php @@ -44,6 +44,7 @@ return [ 'oauth_refresh_token' => '刷新令牌', 'token' => '訪問令牌', 'oauth_provider' => '身份驗證', + 'queue_monitor' => '隊列監控', ], 'resources' => [ 'agent_allow' => [ diff --git a/resources/lang/zh_TW/nexus.php b/resources/lang/zh_TW/nexus.php index fe0f7821..e7020b8f 100644 --- a/resources/lang/zh_TW/nexus.php +++ b/resources/lang/zh_TW/nexus.php @@ -17,4 +17,8 @@ return [ 'sum' => '累計', 'do_not_repeat' => '請不要重復操作!', 'no_permission' => '無權限!', + 'sort' => '排序字段', + 'order' => '排序', + 'asc' => '正序', + 'desc' => '倒序', ];