From 8aaa526699f1afecf851423190e24f905c09022e Mon Sep 17 00:00:00 2001 From: "iVampireSP.com" Date: Mon, 13 Feb 2023 17:05:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Api/HostController.php | 10 ++------ app/Http/Controllers/Web/HostController.php | 26 +++++++++++++++++---- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/Api/HostController.php b/app/Http/Controllers/Api/HostController.php index 9ed5e3c..df0af65 100644 --- a/app/Http/Controllers/Api/HostController.php +++ b/app/Http/Controllers/Api/HostController.php @@ -29,15 +29,9 @@ public function update(HostRequest $request, Host $host): JsonResponse 'status' => 'required|in:running,stopped,suspended', ]); - $user = $request->user(); + $status = $host->changeStatus($request->input('status')); - if ($user->hasBalance('0.5')) { - return $this->error('余额不足,无法开启计费项目。请确保您的余额至少为 0.5 元,您当前有 '.$user->balance.' 元。'); - } - - $host->changeStatus($request->input('status')); - - return $this->updated($host); + return $status ? $this->updated($host) : $this->failed('修改失败,请检查是否有足够的余额。'); } public function destroy(HostRequest $request, Host $host): JsonResponse diff --git a/app/Http/Controllers/Web/HostController.php b/app/Http/Controllers/Web/HostController.php index fce4604..6b85e9d 100644 --- a/app/Http/Controllers/Web/HostController.php +++ b/app/Http/Controllers/Web/HostController.php @@ -5,6 +5,8 @@ use App\Http\Controllers\Controller; use App\Models\Host; use Illuminate\Http\RedirectResponse; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Cache; use Illuminate\View\View; class HostController extends Controller @@ -17,8 +19,20 @@ class HostController extends Controller public function index(): View { $hosts = (new Host)->thisUser()->with(['user', 'module'])->paginate(20); + $times = config('settings.billing.cycle_delete_times_every_month') - Cache::get('host_delete_times:'.auth('web')->id(), 0); - return view('hosts.index', compact('hosts')); + return view('hosts.index', compact('hosts', 'times')); + } + + public function update(Request $request, Host $host): RedirectResponse + { + $request->validate([ + 'status' => 'required|in:running,stopped,suspended', + ]); + + $status = $host->changeStatus($request->input('status')); + + return $status ? back()->with('success', '修改成功。') : back()->with('error', '修改失败。'); } public function renew(Host $host): RedirectResponse @@ -48,12 +62,16 @@ public function renew(Host $host): RedirectResponse */ public function destroy(Host $host): RedirectResponse { - if ($host->status === 'unavailable') { + if ($host->isUnavailable()) { return back()->with('error', '为了安全起见,此主机只能由我们自动删除。'); } - $host->safeDelete(); + $status = $host->safeDelete(); - return redirect()->route('hosts.index')->with('success', '已添加到删除队列。'); + if ($status) { + return redirect()->route('hosts.index')->with('success', '已添加到删除队列。'); + } else { + return back()->with('error', '删除失败。'); + } } }