From 59729277bb8f48387c30ae18bc0d4ef13ff727d1 Mon Sep 17 00:00:00 2001 From: "iVampireSP.com" Date: Fri, 18 Nov 2022 18:50:28 +0800 Subject: [PATCH] update --- app/Http/Controllers/Admin/HostController.php | 34 +++--- .../Controllers/Admin/ModuleController.php | 23 ++-- .../Controllers/Admin/ReplyController.php | 17 +-- .../Controllers/Admin/WorkOrderController.php | 17 +-- app/View/Components/BasicCard.php | 34 ++++++ resources/views/admin/commands.blade.php | 100 ++++++++++++++++++ resources/views/admin/hosts/index.blade.php | 55 ++++++++++ resources/views/admin/modules/index.blade.php | 42 ++++++++ resources/views/admin/users/edit.blade.php | 17 ++- .../views/balances/transactions.blade.php | 5 - .../views/components/basic-card.blade.php | 10 ++ resources/views/layouts/admin.blade.php | 9 +- resources/views/layouts/app.blade.php | 5 +- routes/admin.php | 2 + 14 files changed, 314 insertions(+), 56 deletions(-) create mode 100644 app/View/Components/BasicCard.php create mode 100644 resources/views/admin/commands.blade.php create mode 100644 resources/views/admin/hosts/index.blade.php create mode 100644 resources/views/admin/modules/index.blade.php create mode 100644 resources/views/components/basic-card.blade.php diff --git a/app/Http/Controllers/Admin/HostController.php b/app/Http/Controllers/Admin/HostController.php index 0179282..85be8e7 100644 --- a/app/Http/Controllers/Admin/HostController.php +++ b/app/Http/Controllers/Admin/HostController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; +use App\Models\Host; use Illuminate\Http\Request; class HostController extends Controller @@ -12,13 +13,11 @@ class HostController extends Controller * * @return \Illuminate\Http\Response */ - public function index() + public function index(Host $host) { - // + $hosts = $host->paginate(100); - // $price = 0.01; - // // 一个月多少个 5 分钟 - // $month = 60 * 24 * 30 / 5; + return view('admin.hosts.index', compact('hosts')); } /** @@ -34,8 +33,7 @@ public function create() /** * Store a newly created resource in storage. * - * @param \Illuminate\Http\Request $request - * + * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response */ public function store(Request $request) @@ -46,11 +44,10 @@ public function store(Request $request) /** * Display the specified resource. * - * @param int $id - * + * @param \App\Models\Host $host * @return \Illuminate\Http\Response */ - public function show($id) + public function show(Host $host) { // } @@ -58,11 +55,10 @@ public function show($id) /** * Show the form for editing the specified resource. * - * @param int $id - * + * @param \App\Models\Host $host * @return \Illuminate\Http\Response */ - public function edit($id) + public function edit(Host $host) { // } @@ -70,12 +66,11 @@ public function edit($id) /** * Update the specified resource in storage. * - * @param \Illuminate\Http\Request $request - * @param int $id - * + * @param \Illuminate\Http\Request $request + * @param \App\Models\Host $host * @return \Illuminate\Http\Response */ - public function update(Request $request, $id) + public function update(Request $request, Host $host) { // } @@ -83,11 +78,10 @@ public function update(Request $request, $id) /** * Remove the specified resource from storage. * - * @param int $id - * + * @param \App\Models\Host $host * @return \Illuminate\Http\Response */ - public function destroy($id) + public function destroy(Host $host) { // } diff --git a/app/Http/Controllers/Admin/ModuleController.php b/app/Http/Controllers/Admin/ModuleController.php index 78477bf..617df32 100644 --- a/app/Http/Controllers/Admin/ModuleController.php +++ b/app/Http/Controllers/Admin/ModuleController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; +use App\Models\Module; use Illuminate\Http\Request; class ModuleController extends Controller @@ -12,9 +13,11 @@ class ModuleController extends Controller * * @return \Illuminate\Http\Response */ - public function index() + public function index(Module $module) { - // + $modules = $module->paginate(100); + + return view('admin.modules.index', compact('modules')); } /** @@ -41,10 +44,10 @@ public function store(Request $request) /** * Display the specified resource. * - * @param int $id + * @param \App\Models\Module $module * @return \Illuminate\Http\Response */ - public function show($id) + public function show(Module $module) { // } @@ -52,10 +55,10 @@ public function show($id) /** * Show the form for editing the specified resource. * - * @param int $id + * @param \App\Models\Module $module * @return \Illuminate\Http\Response */ - public function edit($id) + public function edit(Module $module) { // } @@ -64,10 +67,10 @@ public function edit($id) * Update the specified resource in storage. * * @param \Illuminate\Http\Request $request - * @param int $id + * @param \App\Models\Module $module * @return \Illuminate\Http\Response */ - public function update(Request $request, $id) + public function update(Request $request, Module $module) { // } @@ -75,10 +78,10 @@ public function update(Request $request, $id) /** * Remove the specified resource from storage. * - * @param int $id + * @param \App\Models\Module $module * @return \Illuminate\Http\Response */ - public function destroy($id) + public function destroy(Module $module) { // } diff --git a/app/Http/Controllers/Admin/ReplyController.php b/app/Http/Controllers/Admin/ReplyController.php index 147941f..e625b0b 100644 --- a/app/Http/Controllers/Admin/ReplyController.php +++ b/app/Http/Controllers/Admin/ReplyController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; +use App\Models\WorkOrder\Reply; use Illuminate\Http\Request; class ReplyController extends Controller @@ -41,10 +42,10 @@ public function store(Request $request) /** * Display the specified resource. * - * @param int $id + * @param \App\Models\WorkOrder\Reply $reply * @return \Illuminate\Http\Response */ - public function show($id) + public function show(Reply $reply) { // } @@ -52,10 +53,10 @@ public function show($id) /** * Show the form for editing the specified resource. * - * @param int $id + * @param \App\Models\WorkOrder\Reply $reply * @return \Illuminate\Http\Response */ - public function edit($id) + public function edit(Reply $reply) { // } @@ -64,10 +65,10 @@ public function edit($id) * Update the specified resource in storage. * * @param \Illuminate\Http\Request $request - * @param int $id + * @param \App\Models\WorkOrder\Reply $reply * @return \Illuminate\Http\Response */ - public function update(Request $request, $id) + public function update(Request $request, Reply $reply) { // } @@ -75,10 +76,10 @@ public function update(Request $request, $id) /** * Remove the specified resource from storage. * - * @param int $id + * @param \App\Models\WorkOrder\Reply $reply * @return \Illuminate\Http\Response */ - public function destroy($id) + public function destroy(Reply $reply) { // } diff --git a/app/Http/Controllers/Admin/WorkOrderController.php b/app/Http/Controllers/Admin/WorkOrderController.php index 879a8dc..a48680e 100644 --- a/app/Http/Controllers/Admin/WorkOrderController.php +++ b/app/Http/Controllers/Admin/WorkOrderController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; +use App\Models\WorkOrder\WorkOrder; use Illuminate\Http\Request; class WorkOrderController extends Controller @@ -41,10 +42,10 @@ public function store(Request $request) /** * Display the specified resource. * - * @param int $id + * @param \App\Models\WorkOrder\WorkOrder $workOrder * @return \Illuminate\Http\Response */ - public function show($id) + public function show(WorkOrder $workOrder) { // } @@ -52,10 +53,10 @@ public function show($id) /** * Show the form for editing the specified resource. * - * @param int $id + * @param \App\Models\WorkOrder\WorkOrder $workOrder * @return \Illuminate\Http\Response */ - public function edit($id) + public function edit(WorkOrder $workOrder) { // } @@ -64,10 +65,10 @@ public function edit($id) * Update the specified resource in storage. * * @param \Illuminate\Http\Request $request - * @param int $id + * @param \App\Models\WorkOrder\WorkOrder $workOrder * @return \Illuminate\Http\Response */ - public function update(Request $request, $id) + public function update(Request $request, WorkOrder $workOrder) { // } @@ -75,10 +76,10 @@ public function update(Request $request, $id) /** * Remove the specified resource from storage. * - * @param int $id + * @param \App\Models\WorkOrder\WorkOrder $workOrder * @return \Illuminate\Http\Response */ - public function destroy($id) + public function destroy(WorkOrder $workOrder) { // } diff --git a/app/View/Components/BasicCard.php b/app/View/Components/BasicCard.php new file mode 100644 index 0000000..1a1e267 --- /dev/null +++ b/app/View/Components/BasicCard.php @@ -0,0 +1,34 @@ +title = $title; + } + + /** + * Get the view / contents that represent the component. + * + * @return \Illuminate\Contracts\View\View|\Closure|string + */ + public function render() + { + return view('components.basic-card', [ + 'title' => $this->title, + ]); + } +} diff --git a/resources/views/admin/commands.blade.php b/resources/views/admin/commands.blade.php new file mode 100644 index 0000000..49efddf --- /dev/null +++ b/resources/views/admin/commands.blade.php @@ -0,0 +1,100 @@ +@extends('layouts.admin') + +@section('title', '命令速查表') + +@section('content') +

命令速查表

+ +
系统维护
+ + 启动全部 + supervistorctl start all +
+ 启动 Web 节点 + supervistorctl start lae-web + 或者 + art octane:start +
+ 启动 队列 + supervistorctl start lae-queue +
+ 启动 计划任务 + supervistorctl start lae-schedule + + + + 停止全部 + supervistorctl stop all +
+ 停止 Web 节点 + supervistorctl stop lae-web + 或者 + art octane:stop +
+ 停止 队列 + supervistorctl stop lae-queue +
+ 停止 计划任务 + supervistorctl stop lae-schedule + + + + 重启全部 + supervistorctl restart all +
+ 重启 Web 节点 + supervistorctl restart lae-web + 或者 + art octane:restart + *重载art octane:reload +
+ 重启 队列 + supervistorctl restart lae-queue +
+ 重启 计划任务 + supervistorctl restart lae-schedule + + + + 启动维护模式 + art down +
+ 关闭维护模式 + art up + + + + + +

*如果是大更新，需要启动维护模式。

+ 首先，拉取最新代码 + sudo -u www git pull +
+ 然后，安装依赖 + composer install --no-dev +
+ 接着，升级数据库（只需要在一台节点上执行） + art migrate +
+ 最后，清除缓存 + art optimize +
+ + 如果是非 Web 节点，需要重启全部或者对应服务，比如 队列，计划任务 + supervisorctl restart all + +
+ 如果是 Web 节点，需要简单重启即可 + supervisorctl restart lae-web + + + + + + +
用户相关
+ + + + +@endsection diff --git a/resources/views/admin/hosts/index.blade.php b/resources/views/admin/hosts/index.blade.php new file mode 100644 index 0000000..4f2460c --- /dev/null +++ b/resources/views/admin/hosts/index.blade.php @@ -0,0 +1,55 @@ +@extends('layouts.admin') + +@section('title', '主机') + +@section('content') + +
+ + + + + + + + + + + + @foreach ($hosts as $host) + + + + + + + + + + @endforeach + +
ID模块名称创建时间更新时间操作
+ + {{ $host->id }} + + + {{ $host->module_id }} + + {{ $host->name }} + + {{ $host->created_at }} + + {{ $host->updated_at }} + + 编辑 +
+
+ + {{-- 分页 --}} + {{ $hosts->links() }} + + + + + +@endsection diff --git a/resources/views/admin/modules/index.blade.php b/resources/views/admin/modules/index.blade.php new file mode 100644 index 0000000..3add77b --- /dev/null +++ b/resources/views/admin/modules/index.blade.php @@ -0,0 +1,42 @@ +@extends('layouts.admin') + +@section('title', '模块') + +@section('content') + +
+ + + + + + + + + @foreach ($modules as $module) + + + + + + @endforeach + +
ID名称操作
+ + {{ $module->id }} + + + {{ $module->name }} + + 编辑 +
+
+ + {{-- 分页 --}} + {{ $modules->links() }} + + + + + +@endsection diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php index 55a377e..0d500de 100644 --- a/resources/views/admin/users/edit.blade.php +++ b/resources/views/admin/users/edit.blade.php @@ -6,6 +6,10 @@

{{ $user->name }}

切换到 {{ $user->name }} + @if ($user->banned_at) +

已被封禁，原因: {{ $user->banned_reason }}

+ @endif +

余额: {{ $user->balance }} 元, {{ $drops }} Drops

@@ -21,6 +25,7 @@ + @@ -31,7 +36,12 @@ @foreach($hosts as $host) - + +
ID模块 名称 价格 / 5 分钟 操作
{{ $host->id }} + {{ $host->id }} + + {{ $host->module_id }} + {{ $host->name }} {{ $host->price }} Drops @@ -53,6 +63,7 @@ + @@ -61,6 +72,8 @@ @foreach($workOrders as $workOrder) +
ID模块 标题 状态 操作
{{ $workOrder->id }}{{ $workOrder->module_id }} + {{ $workOrder->title }} @@ -161,6 +174,4 @@ - - @endsection diff --git a/resources/views/balances/transactions.blade.php b/resources/views/balances/transactions.blade.php index 5e30e73..bb28816 100644 --- a/resources/views/balances/transactions.blade.php +++ b/resources/views/balances/transactions.blade.php @@ -74,9 +74,4 @@ {{ $transactions->links() }} - - - - - @endsection diff --git a/resources/views/components/basic-card.blade.php b/resources/views/components/basic-card.blade.php new file mode 100644 index 0000000..5c7bca0 --- /dev/null +++ b/resources/views/components/basic-card.blade.php @@ -0,0 +1,10 @@ +
+
+
+ {{ $title }} +
+
+ {{ $slot }} +
+
+
diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php index 3ea019a..040183d 100644 --- a/resources/views/layouts/admin.blade.php +++ b/resources/views/layouts/admin.blade.php @@ -46,6 +46,9 @@
  • 工单
    • +
  • + 命令速查表 +
    • @@ -60,7 +63,8 @@ @else @if (Auth::guard('web')->check())
  • - 切换到 {{ Auth::guard('web')->user()->name }} + 切换到 {{ Auth::guard('web')->user()->name }}
    • @endif
  • @@ -97,6 +101,9 @@ class="d-none"> @yield('content') + + + diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 8b2b47f..c9edb5a 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -58,7 +58,7 @@
    • @endif - + @guest
  • {{ __('Login') }} @@ -99,6 +99,9 @@ class="d-none"> @yield('content') + + + diff --git a/routes/admin.php b/routes/admin.php index d0669ba..5d54c00 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -26,4 +26,6 @@ Route::resource('hosts', HostController::class); Route::resource('work-orders', WorkOrderController::class); Route::resource('work-orders.replies', ReplyController::class); + + Route::view('commands', 'admin.commands')->name('commands'); });