From 770778c78c96e6fa00e5a46b3eb6559d9100750f Mon Sep 17 00:00:00 2001
From: "iVampireSP.com" <im@ivampiresp.com>
Date: Wed, 28 Dec 2022 21:17:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Console/Commands/BanUser.php              |  2 +-
 app/Console/Commands/SuspendUserAllHosts.php  |  4 +--
 app/Console/Kernel.php                        | 36 +++++++++----------
 app/Http/Controllers/Api/HostController.php   |  2 +-
 .../Controllers/Modules/HostController.php    |  2 +-
 ...orkOrder.php => AutoCloseWorkOrderJob.php} |  2 +-
 ...lance.php => CheckAndChargeBalanceJob.php} |  2 +-
 ...e.php => CheckHostIfExistsOnModuleJob.php} |  4 +--
 .../{ClearTasks.php => ClearTasksJob.php}     |  2 +-
 .../{DeleteHost.php => DeleteHostJob.php}     |  6 ++--
 app/Jobs/{HostCost.php => HostCostJob.php}    |  4 +--
 .../{FetchModule.php => FetchModuleJob.php}   |  2 +-
 app/Jobs/Module/{Host.php => HostJob.php}     |  2 +-
 .../Module/{PushHost.php => PushHostJob.php}  |  2 +-
 ...PushWorkOrder.php => PushWorkOrderJob.php} |  2 +-
 ...Earnings.php => SendModuleEarningsJob.php} |  2 +-
 app/Models/Host.php                           |  4 +--
 17 files changed, 40 insertions(+), 40 deletions(-)
 rename app/Jobs/{AutoCloseWorkOrder.php => AutoCloseWorkOrderJob.php} (92%)
 rename app/Jobs/{CheckAndChargeBalance.php => CheckAndChargeBalanceJob.php} (97%)
 rename app/Jobs/{CheckHostIfExistsOnModule.php => CheckHostIfExistsOnModuleJob.php} (90%)
 rename app/Jobs/{ClearTasks.php => ClearTasksJob.php} (94%)
 rename app/Jobs/{DeleteHost.php => DeleteHostJob.php} (86%)
 rename app/Jobs/{HostCost.php => HostCostJob.php} (88%)
 rename app/Jobs/Module/{FetchModule.php => FetchModuleJob.php} (98%)
 rename app/Jobs/Module/{Host.php => HostJob.php} (97%)
 rename app/Jobs/Module/{PushHost.php => PushHostJob.php} (97%)
 rename app/Jobs/Module/{PushWorkOrder.php => PushWorkOrderJob.php} (97%)
 rename app/Jobs/{SendModuleEarnings.php => SendModuleEarningsJob.php} (93%)

diff --git a/app/Console/Commands/BanUser.php b/app/Console/Commands/BanUser.php
index e9207f0..e74ae9c 100644
--- a/app/Console/Commands/BanUser.php
+++ b/app/Console/Commands/BanUser.php
@@ -48,7 +48,7 @@ public function handle()
 
         $this->info('封禁: ' . $user->name);
 
-        $this->confirm('确定要继续吗？如果继续，将会暂停所有的 Host，并且吊销所有 Token。');
+        $this->confirm('确定要继续吗？如果继续，将会暂停所有的主机，并且吊销所有 Token。');
 
         $user->banned_at = now();
         $user->banned_reason = $reason;
diff --git a/app/Console/Commands/SuspendUserAllHosts.php b/app/Console/Commands/SuspendUserAllHosts.php
index dcc46c8..2659caa 100644
--- a/app/Console/Commands/SuspendUserAllHosts.php
+++ b/app/Console/Commands/SuspendUserAllHosts.php
@@ -19,7 +19,7 @@ class SuspendUserAllHosts extends Command
      *
      * @var string
      */
-    protected $description = '暂停用户的所有 Host';
+    protected $description = '暂停用户的所有主机。';
 
     /**
      * Create a new command instance.
@@ -47,6 +47,6 @@ public function handle()
             'suspended_at' => now()
         ]);
 
-        $this->info('暂停用户的所有 Host 成功。');
+        $this->info('暂停用户的所有主机成功。');
     }
 }
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 36e9d18..2560cc7 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -2,15 +2,15 @@
 
 namespace App\Console;
 
-use App\Jobs\AutoCloseWorkOrder;
-use App\Jobs\CheckAndChargeBalance;
-use App\Jobs\CheckHostIfExistsOnModule;
-use App\Jobs\ClearTasks;
-use App\Jobs\DeleteHost;
-use App\Jobs\HostCost;
-use App\Jobs\Module\FetchModule;
-use App\Jobs\Module\PushWorkOrder;
-use App\Jobs\SendModuleEarnings;
+use App\Jobs\AutoCloseWorkOrderJob;
+use App\Jobs\CheckAndChargeBalanceJob;
+use App\Jobs\CheckHostIfExistsOnModuleJob;
+use App\Jobs\ClearTasksJob;
+use App\Jobs\DeleteHostJob;
+use App\Jobs\HostCostJob;
+use App\Jobs\Module\FetchModuleJob;
+use App\Jobs\Module\PushWorkOrderJob;
+use App\Jobs\SendModuleEarningsJob;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -29,30 +29,30 @@ protected function schedule(Schedule $schedule)
         $schedule->command('sanctum:prune-expired --hours=24')->daily();
 
         // 扣费
-        $schedule->job(new HostCost(now()->minute))->everyMinute()->withoutOverlapping()->onOneServer();
+        $schedule->job(new HostCostJob(now()->minute))->everyMinute()->withoutOverlapping()->onOneServer();
 
         // 获取模块暴露的信息（服务器等）
-        $schedule->job(new FetchModule())->withoutOverlapping()->everyMinute();
+        $schedule->job(new FetchModuleJob())->withoutOverlapping()->everyMinute();
 
         // 推送工单
-        $schedule->job(new PushWorkOrder())->everyMinute()->onOneServer();
+        $schedule->job(new PushWorkOrderJob())->everyMinute()->onOneServer();
         // 自动关闭工单
-        $schedule->job(new AutoCloseWorkOrder())->everyMinute()->onOneServer();
+        $schedule->job(new AutoCloseWorkOrderJob())->everyMinute()->onOneServer();
 
         // 清理任务
-        $schedule->job(new ClearTasks())->weekly();
+        $schedule->job(new ClearTasksJob())->weekly();
 
         // 删除暂停或部署时间超过 3 天以上的主机
-        $schedule->job(new DeleteHost())->hourly();
+        $schedule->job(new DeleteHostJob())->hourly();
 
         // 检查主机是否存在于模块
-        $schedule->job(new CheckHostIfExistsOnModule())->everyThirtyMinutes()->withoutOverlapping()->onOneServer();
+        $schedule->job(new CheckHostIfExistsOnModuleJob())->everyThirtyMinutes()->withoutOverlapping()->onOneServer();
 
         // 检查未充值的订单，并充值
-        $schedule->job(new CheckAndChargeBalance())->everyFiveMinutes()->onOneServer()->withoutOverlapping();
+        $schedule->job(new CheckAndChargeBalanceJob())->everyFiveMinutes()->onOneServer()->withoutOverlapping();
 
         // 发送模块收益
-        $schedule->job(new SendModuleEarnings())->dailyAt('20:00');
+        $schedule->job(new SendModuleEarningsJob())->dailyAt('20:00');
 
     }
 
diff --git a/app/Http/Controllers/Api/HostController.php b/app/Http/Controllers/Api/HostController.php
index e26e98c..a956d2e 100644
--- a/app/Http/Controllers/Api/HostController.php
+++ b/app/Http/Controllers/Api/HostController.php
@@ -60,7 +60,7 @@ public function destroy(HostRequest $request, Host $host): JsonResponse
             $host->cost();
         }
 
-        dispatch(new \App\Jobs\Module\Host($host, 'delete'));
+        dispatch(new \App\Jobs\Module\HostJob($host, 'delete'));
 
         return $this->deleted($host);
     }
diff --git a/app/Http/Controllers/Modules/HostController.php b/app/Http/Controllers/Modules/HostController.php
index d90b6e6..f3b6735 100644
--- a/app/Http/Controllers/Modules/HostController.php
+++ b/app/Http/Controllers/Modules/HostController.php
@@ -128,7 +128,7 @@ public function update(Request $request, Host $host): JsonResponse
      */
     public function destroy($host): JsonResponse
     {
-        // if host not instance of Host
+        // if host not instance of HostJob
         if (!$host instanceof Host) {
             $host = Host::findOrFail($host);
         }
diff --git a/app/Jobs/AutoCloseWorkOrder.php b/app/Jobs/AutoCloseWorkOrderJob.php
similarity index 92%
rename from app/Jobs/AutoCloseWorkOrder.php
rename to app/Jobs/AutoCloseWorkOrderJob.php
index d0bdd62..8da2c7b 100644
--- a/app/Jobs/AutoCloseWorkOrder.php
+++ b/app/Jobs/AutoCloseWorkOrderJob.php
@@ -4,7 +4,7 @@
 
 use App\Models\WorkOrder\WorkOrder;
 
-class AutoCloseWorkOrder extends Job
+class AutoCloseWorkOrderJob extends Job
 {
     /**
      * Create a new job instance.
diff --git a/app/Jobs/CheckAndChargeBalance.php b/app/Jobs/CheckAndChargeBalanceJob.php
similarity index 97%
rename from app/Jobs/CheckAndChargeBalance.php
rename to app/Jobs/CheckAndChargeBalanceJob.php
index a5a39c4..5977ec7 100644
--- a/app/Jobs/CheckAndChargeBalance.php
+++ b/app/Jobs/CheckAndChargeBalanceJob.php
@@ -8,7 +8,7 @@
 use Illuminate\Support\Facades\Log;
 use Yansongda\LaravelPay\Facades\Pay;
 
-class CheckAndChargeBalance extends Job
+class CheckAndChargeBalanceJob extends Job
 {
     /**
      * Create a new job instance.
diff --git a/app/Jobs/CheckHostIfExistsOnModule.php b/app/Jobs/CheckHostIfExistsOnModuleJob.php
similarity index 90%
rename from app/Jobs/CheckHostIfExistsOnModule.php
rename to app/Jobs/CheckHostIfExistsOnModuleJob.php
index 11c82a9..be4b20f 100644
--- a/app/Jobs/CheckHostIfExistsOnModule.php
+++ b/app/Jobs/CheckHostIfExistsOnModuleJob.php
@@ -10,7 +10,7 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Log;
 
-class CheckHostIfExistsOnModule implements ShouldQueue
+class CheckHostIfExistsOnModuleJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
@@ -44,7 +44,7 @@ public function handle(): void
 
                 if ($response->status() === 404) {
                     Log::warning($host->module->name . ' ' . $host->name . ' ' . $host->id . ' 不存在，删除。');
-                    dispatch(new Module\Host($host, 'delete'));
+                    dispatch(new Module\HostJob($host, 'delete'));
                 }
             }
         });
diff --git a/app/Jobs/ClearTasks.php b/app/Jobs/ClearTasksJob.php
similarity index 94%
rename from app/Jobs/ClearTasks.php
rename to app/Jobs/ClearTasksJob.php
index e0aca07..0be1fb5 100644
--- a/app/Jobs/ClearTasks.php
+++ b/app/Jobs/ClearTasksJob.php
@@ -10,7 +10,7 @@
 
 // use Illuminate\Contracts\Queue\ShouldBeUnique;
 
-class ClearTasks implements ShouldQueue
+class ClearTasksJob implements ShouldQueue
 {
     use InteractsWithQueue, Queueable, SerializesModels;
 
diff --git a/app/Jobs/DeleteHost.php b/app/Jobs/DeleteHostJob.php
similarity index 86%
rename from app/Jobs/DeleteHost.php
rename to app/Jobs/DeleteHostJob.php
index 5b85e89..4376dfa 100644
--- a/app/Jobs/DeleteHost.php
+++ b/app/Jobs/DeleteHostJob.php
@@ -10,7 +10,7 @@
 
 // use Illuminate\Contracts\Queue\ShouldBeUnique;
 
-class DeleteHost implements ShouldQueue
+class DeleteHostJob implements ShouldQueue
 {
     use InteractsWithQueue, Queueable, SerializesModels;
 
@@ -34,14 +34,14 @@ public function handle(): void
         // 查找暂停时间超过 3 天的 host
         Host::where('status', 'suspended')->where('suspended_at', '<', now()->subDays(3))->chunk(100, function ($hosts) {
             foreach ($hosts as $host) {
-                dispatch(new Module\Host($host, 'delete'));
+                dispatch(new Module\HostJob($host, 'delete'));
             }
         });
 
         // 查找部署时间超过3天以上的 host
         Host::where('status', 'pending')->where('created_at', '<', now()->subDays(3))->chunk(100, function ($hosts) {
             foreach ($hosts as $host) {
-                dispatch(new Module\Host($host, 'delete'));
+                dispatch(new Module\HostJob($host, 'delete'));
             }
         });
     }
diff --git a/app/Jobs/HostCost.php b/app/Jobs/HostCostJob.php
similarity index 88%
rename from app/Jobs/HostCost.php
rename to app/Jobs/HostCostJob.php
index 28180e8..a487eb6 100644
--- a/app/Jobs/HostCost.php
+++ b/app/Jobs/HostCostJob.php
@@ -9,7 +9,7 @@
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class HostCost implements ShouldQueue
+class HostCostJob implements ShouldQueue
 {
     use InteractsWithQueue, Queueable, SerializesModels, Lock;
 
@@ -47,7 +47,7 @@ public function handle(): void
             }
         });
 
-        // Host::whereIn('status', ['running', 'stopped'])->with('user')->chunk(1000, function ($hosts) {
+        // HostJob::whereIn('status', ['running', 'stopped'])->with('user')->chunk(1000, function ($hosts) {
         //     foreach ($hosts as $host) {
         //         $host->cost();
         //     }
diff --git a/app/Jobs/Module/FetchModule.php b/app/Jobs/Module/FetchModuleJob.php
similarity index 98%
rename from app/Jobs/Module/FetchModule.php
rename to app/Jobs/Module/FetchModuleJob.php
index a67c861..682efb1 100644
--- a/app/Jobs/Module/FetchModule.php
+++ b/app/Jobs/Module/FetchModuleJob.php
@@ -12,7 +12,7 @@
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 
-class FetchModule implements ShouldQueue
+class FetchModuleJob implements ShouldQueue
 {
     use InteractsWithQueue, Queueable, SerializesModels;
 
diff --git a/app/Jobs/Module/Host.php b/app/Jobs/Module/HostJob.php
similarity index 97%
rename from app/Jobs/Module/Host.php
rename to app/Jobs/Module/HostJob.php
index e95e1e7..643972b 100644
--- a/app/Jobs/Module/Host.php
+++ b/app/Jobs/Module/HostJob.php
@@ -10,7 +10,7 @@
 
 // use Illuminate\Contracts\Queue\ShouldBeUnique;
 
-class Host implements ShouldQueue
+class HostJob implements ShouldQueue
 {
     use InteractsWithQueue, Queueable, SerializesModels;
 
diff --git a/app/Jobs/Module/PushHost.php b/app/Jobs/Module/PushHostJob.php
similarity index 97%
rename from app/Jobs/Module/PushHost.php
rename to app/Jobs/Module/PushHostJob.php
index 588e03f..a55a0b8 100644
--- a/app/Jobs/Module/PushHost.php
+++ b/app/Jobs/Module/PushHostJob.php
@@ -10,7 +10,7 @@
 
 // use Illuminate\Contracts\Queue\ShouldBeUnique;
 
-class PushHost implements ShouldQueue
+class PushHostJob implements ShouldQueue
 {
     use InteractsWithQueue, Queueable, SerializesModels;
 
diff --git a/app/Jobs/Module/PushWorkOrder.php b/app/Jobs/Module/PushWorkOrderJob.php
similarity index 97%
rename from app/Jobs/Module/PushWorkOrder.php
rename to app/Jobs/Module/PushWorkOrderJob.php
index e530509..4c72519 100644
--- a/app/Jobs/Module/PushWorkOrder.php
+++ b/app/Jobs/Module/PushWorkOrderJob.php
@@ -12,7 +12,7 @@
 
 // use Illuminate\Contracts\Queue\ShouldBeUnique;
 
-class PushWorkOrder implements ShouldQueue
+class PushWorkOrderJob implements ShouldQueue
 {
     use InteractsWithQueue, Queueable, SerializesModels;
 
diff --git a/app/Jobs/SendModuleEarnings.php b/app/Jobs/SendModuleEarningsJob.php
similarity index 93%
rename from app/Jobs/SendModuleEarnings.php
rename to app/Jobs/SendModuleEarningsJob.php
index 9849658..6125eeb 100644
--- a/app/Jobs/SendModuleEarnings.php
+++ b/app/Jobs/SendModuleEarningsJob.php
@@ -5,7 +5,7 @@
 use App\Models\Module;
 use App\Notifications\ModuleEarnings;
 
-class SendModuleEarnings extends Job
+class SendModuleEarningsJob extends Job
 {
     /**
      * Create a new job instance.
diff --git a/app/Models/Host.php b/app/Models/Host.php
index 49928d1..4a6ab55 100644
--- a/app/Models/Host.php
+++ b/app/Models/Host.php
@@ -137,7 +137,7 @@ protected static function boot()
 
         // when Updated
         static::updated(function ($model) {
-            dispatch(new \App\Jobs\Module\Host($model, 'patch'));
+            dispatch(new \App\Jobs\Module\HostJob($model, 'patch'));
 
             Cache::forget('user_hosts_' . $model->user_id);
             Cache::forget('user_tasks_' . $model->user_id);
@@ -213,7 +213,7 @@ public function safeDelete(): bool
             }
         }
 
-        dispatch(new \App\Jobs\Module\Host($this, 'delete'));
+        dispatch(new \App\Jobs\Module\HostJob($this, 'delete'));
         return true;
     }