From 96961d2a55540bfd40cfb153517ec208c6f99a7e Mon Sep 17 00:00:00 2001
From: "iVampireSP.com" <im@ivampiresp.com>
Date: Fri, 13 Jan 2023 22:11:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=20=E6=9B=B4=E4=BC=98?=
 =?UTF-8?q?=E9=9B=85=E7=9A=84=E7=9B=AE=E5=BD=95=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Console/Kernel.php                         | 18 +++++++++---------
 app/Jobs/{ => Host}/DeleteHostJob.php          |  6 +++---
 app/Jobs/{ => Host}/HostCostJob.php            |  2 +-
 app/Jobs/{Module => Host}/HostJob.php          |  2 +-
 app/Jobs/{Module => Host}/PushHostJob.php      |  2 +-
 .../{ => Module}/SendModuleEarningsJob.php     |  5 +++--
 .../{ => User}/CheckAndChargeBalanceJob.php    |  6 ++++--
 app/Jobs/{ => User}/ClearTasksJob.php          |  2 +-
 .../{ => User}/RollbackUserTempGroupJob.php    |  2 +-
 .../SendUserNotificationsJob.php}              | 14 +++++++-------
 app/Jobs/{ => User}/SetBirthdayGroupJob.php    |  4 ++--
 .../{ => WorkOrder}/AutoCloseWorkOrderJob.php  |  3 ++-
 .../{Module => WorkOrder}/PushWorkOrderJob.php |  3 +--
 app/Jobs/{Module => }/WorkOrder/Reply.php      |  2 +-
 app/Jobs/{Module => }/WorkOrder/WorkOrder.php  |  2 +-
 .../{ => Channels}/WeComChannel.php            |  2 +-
 .../{ => Channels}/WebChannel.php              |  9 +++------
 .../{ => Modules}/ModuleEarnings.php           |  2 +-
 .../{ => User}/TodayIsUserBirthday.php         |  2 +-
 app/Notifications/{ => User}/UserCharged.php   |  3 ++-
 .../{ => WorkOrder}/WorkOrder.php              |  4 +++-
 21 files changed, 49 insertions(+), 46 deletions(-)
 rename app/Jobs/{ => Host}/DeleteHostJob.php (88%)
 rename app/Jobs/{ => Host}/HostCostJob.php (98%)
 rename app/Jobs/{Module => Host}/HostJob.php (98%)
 rename app/Jobs/{Module => Host}/PushHostJob.php (98%)
 rename app/Jobs/{ => Module}/SendModuleEarningsJob.php (85%)
 rename app/Jobs/{ => User}/CheckAndChargeBalanceJob.php (91%)
 rename app/Jobs/{ => User}/ClearTasksJob.php (96%)
 rename app/Jobs/{ => User}/RollbackUserTempGroupJob.php (97%)
 rename app/Jobs/{SendCommonNotificationsJob.php => User/SendUserNotificationsJob.php} (78%)
 rename app/Jobs/{ => User}/SetBirthdayGroupJob.php (94%)
 rename app/Jobs/{ => WorkOrder}/AutoCloseWorkOrderJob.php (90%)
 rename app/Jobs/{Module => WorkOrder}/PushWorkOrderJob.php (97%)
 rename app/Jobs/{Module => }/WorkOrder/Reply.php (97%)
 rename app/Jobs/{Module => }/WorkOrder/WorkOrder.php (97%)
 rename app/Notifications/{ => Channels}/WeComChannel.php (96%)
 rename app/Notifications/{ => Channels}/WebChannel.php (74%)
 rename app/Notifications/{ => Modules}/ModuleEarnings.php (98%)
 rename app/Notifications/{ => User}/TodayIsUserBirthday.php (98%)
 rename app/Notifications/{ => User}/UserCharged.php (93%)
 rename app/Notifications/{ => WorkOrder}/WorkOrder.php (95%)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 34ed25d..4eea082 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -2,17 +2,17 @@
 
 namespace App\Console;
 
-use App\Jobs\AutoCloseWorkOrderJob;
-use App\Jobs\CheckAndChargeBalanceJob;
-use App\Jobs\ClearTasksJob;
-use App\Jobs\DeleteHostJob;
+use App\Jobs\Host\DeleteHostJob;
+use App\Jobs\Host\HostCostJob;
 use App\Jobs\Host\ScanAllHostsJob;
-use App\Jobs\HostCostJob;
 use App\Jobs\Module\FetchModuleJob;
-use App\Jobs\Module\PushWorkOrderJob;
-use App\Jobs\RollbackUserTempGroupJob;
-use App\Jobs\SendModuleEarningsJob;
-use App\Jobs\SetBirthdayGroupJob;
+use App\Jobs\Module\SendModuleEarningsJob;
+use App\Jobs\User\CheckAndChargeBalanceJob;
+use App\Jobs\User\ClearTasksJob;
+use App\Jobs\User\RollbackUserTempGroupJob;
+use App\Jobs\User\SetBirthdayGroupJob;
+use App\Jobs\WorkOrder\AutoCloseWorkOrderJob;
+use App\Jobs\WorkOrder\PushWorkOrderJob;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
diff --git a/app/Jobs/DeleteHostJob.php b/app/Jobs/Host/DeleteHostJob.php
similarity index 88%
rename from app/Jobs/DeleteHostJob.php
rename to app/Jobs/Host/DeleteHostJob.php
index 525ed5f..9c38742 100644
--- a/app/Jobs/DeleteHostJob.php
+++ b/app/Jobs/Host/DeleteHostJob.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Jobs;
+namespace App\Jobs\Host;
 
 use App\Models\Host;
 use Illuminate\Bus\Queueable;
@@ -34,14 +34,14 @@ public function handle(): void
         // 查找暂停时间超过 3 天的 host
         (new Host)->where('status', 'suspended')->where('suspended_at', '<', now()->subDays(3))->chunk(100, function ($hosts) {
             foreach ($hosts as $host) {
-                dispatch(new Module\HostJob($host, 'delete'));
+                dispatch(new HostJob($host, 'delete'));
             }
         });
 
         // 查找部署时间超过3天以上的 host
         (new Host)->where('status', 'pending')->where('created_at', '<', now()->subDays(3))->chunk(100, function ($hosts) {
             foreach ($hosts as $host) {
-                dispatch(new Module\HostJob($host, 'delete'));
+                dispatch(new HostJob($host, 'delete'));
             }
         });
     }
diff --git a/app/Jobs/HostCostJob.php b/app/Jobs/Host/HostCostJob.php
similarity index 98%
rename from app/Jobs/HostCostJob.php
rename to app/Jobs/Host/HostCostJob.php
index 0506309..5ba92b2 100644
--- a/app/Jobs/HostCostJob.php
+++ b/app/Jobs/Host/HostCostJob.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Jobs;
+namespace App\Jobs\Host;
 
 use App\Helpers\Lock;
 use App\Models\Host;
diff --git a/app/Jobs/Module/HostJob.php b/app/Jobs/Host/HostJob.php
similarity index 98%
rename from app/Jobs/Module/HostJob.php
rename to app/Jobs/Host/HostJob.php
index 87f26d2..4aa51e0 100644
--- a/app/Jobs/Module/HostJob.php
+++ b/app/Jobs/Host/HostJob.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Jobs\Module;
+namespace App\Jobs\Host;
 
 use App\Models\Host as HostModel;
 use Illuminate\Bus\Queueable;
diff --git a/app/Jobs/Module/PushHostJob.php b/app/Jobs/Host/PushHostJob.php
similarity index 98%
rename from app/Jobs/Module/PushHostJob.php
rename to app/Jobs/Host/PushHostJob.php
index 557383d..c9c8e2e 100644
--- a/app/Jobs/Module/PushHostJob.php
+++ b/app/Jobs/Host/PushHostJob.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Jobs\Module;
+namespace App\Jobs\Host;
 
 use App\Models\Host;
 use Illuminate\Bus\Queueable;
diff --git a/app/Jobs/SendModuleEarningsJob.php b/app/Jobs/Module/SendModuleEarningsJob.php
similarity index 85%
rename from app/Jobs/SendModuleEarningsJob.php
rename to app/Jobs/Module/SendModuleEarningsJob.php
index 49c3292..7fcc442 100644
--- a/app/Jobs/SendModuleEarningsJob.php
+++ b/app/Jobs/Module/SendModuleEarningsJob.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Jobs;
+namespace App\Jobs\Module;
 
+use App\Jobs\Job;
 use App\Models\Module;
-use App\Notifications\ModuleEarnings;
+use App\Notifications\Modules\ModuleEarnings;
 
 class SendModuleEarningsJob extends Job
 {
diff --git a/app/Jobs/CheckAndChargeBalanceJob.php b/app/Jobs/User/CheckAndChargeBalanceJob.php
similarity index 91%
rename from app/Jobs/CheckAndChargeBalanceJob.php
rename to app/Jobs/User/CheckAndChargeBalanceJob.php
index b231b25..d289d8f 100644
--- a/app/Jobs/CheckAndChargeBalanceJob.php
+++ b/app/Jobs/User/CheckAndChargeBalanceJob.php
@@ -1,15 +1,17 @@
 <?php
 
-namespace App\Jobs;
+namespace App\Jobs\User;
 
+use App\Jobs\Job;
 use App\Models\Balance;
 use App\Models\Transaction;
+use Illuminate\Contracts\Queue\ShouldQueue;
 use Yansongda\LaravelPay\Facades\Pay;
 use Yansongda\Pay\Exception\ContainerException;
 use Yansongda\Pay\Exception\InvalidParamsException;
 use Yansongda\Pay\Exception\ServiceNotFoundException;
 
-class CheckAndChargeBalanceJob extends Job
+class CheckAndChargeBalanceJob extends Job implements ShouldQueue
 {
     /**
      * Create a new job instance.
diff --git a/app/Jobs/ClearTasksJob.php b/app/Jobs/User/ClearTasksJob.php
similarity index 96%
rename from app/Jobs/ClearTasksJob.php
rename to app/Jobs/User/ClearTasksJob.php
index 1cd8d8c..a59fff5 100644
--- a/app/Jobs/ClearTasksJob.php
+++ b/app/Jobs/User/ClearTasksJob.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Jobs;
+namespace App\Jobs\User;
 
 use App\Models\Task;
 use Illuminate\Bus\Queueable;
diff --git a/app/Jobs/RollbackUserTempGroupJob.php b/app/Jobs/User/RollbackUserTempGroupJob.php
similarity index 97%
rename from app/Jobs/RollbackUserTempGroupJob.php
rename to app/Jobs/User/RollbackUserTempGroupJob.php
index ea0a066..fe6f9d1 100644
--- a/app/Jobs/RollbackUserTempGroupJob.php
+++ b/app/Jobs/User/RollbackUserTempGroupJob.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Jobs;
+namespace App\Jobs\User;
 
 use App\Models\User;
 use Illuminate\Bus\Queueable;
diff --git a/app/Jobs/SendCommonNotificationsJob.php b/app/Jobs/User/SendUserNotificationsJob.php
similarity index 78%
rename from app/Jobs/SendCommonNotificationsJob.php
rename to app/Jobs/User/SendUserNotificationsJob.php
index 0a30928..f2a4940 100644
--- a/app/Jobs/SendCommonNotificationsJob.php
+++ b/app/Jobs/User/SendUserNotificationsJob.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Jobs;
+namespace App\Jobs\User;
 
 use App\Http\Controllers\Admin\NotificationController;
 use App\Models\User;
-use App\Notifications\Common;
+use App\Notifications\User\UserNotification;
 use GeneaLabs\LaravelModelCaching\CachedBuilder;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -12,24 +12,26 @@
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 
-class SendCommonNotificationsJob implements ShouldQueue
+class SendUserNotificationsJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     protected array $requests;
     protected User|CachedBuilder $users;
     protected string $title, $content;
+    protected bool $send_mail;
 
     /**
      * Create a new job instance.
      *
      * @return void
      */
-    public function __construct(array $requests, $title, $content)
+    public function __construct(array $requests, $title, $content, $send_mail = false)
     {
         $this->requests = $requests;
         $this->title = $title;
         $this->content = $content;
+        $this->send_mail = $send_mail;
     }
 
     /**
@@ -39,8 +41,6 @@ public function __construct(array $requests, $title, $content)
      */
     public function handle(): void
     {
-        //
-
         $notificationController = new NotificationController();
 
         $users = $notificationController->query($this->requests);
@@ -48,7 +48,7 @@ public function handle(): void
         // chunk
         $users->chunk(100, function ($users) {
             foreach ($users as $user) {
-                $user->notify(new Common($this->title, $this->content));
+                $user->notify(new UserNotification($this->title, $this->content, $this->send_mail));
             }
         });
     }
diff --git a/app/Jobs/SetBirthdayGroupJob.php b/app/Jobs/User/SetBirthdayGroupJob.php
similarity index 94%
rename from app/Jobs/SetBirthdayGroupJob.php
rename to app/Jobs/User/SetBirthdayGroupJob.php
index 9eee50d..c7a5715 100644
--- a/app/Jobs/SetBirthdayGroupJob.php
+++ b/app/Jobs/User/SetBirthdayGroupJob.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Jobs;
+namespace App\Jobs\User;
 
 use App\Models\User;
 use App\Models\UserGroup;
-use App\Notifications\TodayIsUserBirthday;
+use App\Notifications\User\TodayIsUserBirthday;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
diff --git a/app/Jobs/AutoCloseWorkOrderJob.php b/app/Jobs/WorkOrder/AutoCloseWorkOrderJob.php
similarity index 90%
rename from app/Jobs/AutoCloseWorkOrderJob.php
rename to app/Jobs/WorkOrder/AutoCloseWorkOrderJob.php
index d57dc93..4f5804b 100644
--- a/app/Jobs/AutoCloseWorkOrderJob.php
+++ b/app/Jobs/WorkOrder/AutoCloseWorkOrderJob.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Jobs;
+namespace App\Jobs\WorkOrder;
 
+use App\Jobs\Job;
 use App\Models\WorkOrder\WorkOrder;
 
 class AutoCloseWorkOrderJob extends Job
diff --git a/app/Jobs/Module/PushWorkOrderJob.php b/app/Jobs/WorkOrder/PushWorkOrderJob.php
similarity index 97%
rename from app/Jobs/Module/PushWorkOrderJob.php
rename to app/Jobs/WorkOrder/PushWorkOrderJob.php
index e26e790..c49fff3 100644
--- a/app/Jobs/Module/PushWorkOrderJob.php
+++ b/app/Jobs/WorkOrder/PushWorkOrderJob.php
@@ -1,8 +1,7 @@
 <?php
 
-namespace App\Jobs\Module;
+namespace App\Jobs\WorkOrder;
 
-use App\Jobs\Module\WorkOrder\Reply;
 use App\Models\WorkOrder\WorkOrder;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Jobs/Module/WorkOrder/Reply.php b/app/Jobs/WorkOrder/Reply.php
similarity index 97%
rename from app/Jobs/Module/WorkOrder/Reply.php
rename to app/Jobs/WorkOrder/Reply.php
index dc83161..51f1fe6 100644
--- a/app/Jobs/Module/WorkOrder/Reply.php
+++ b/app/Jobs/WorkOrder/Reply.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Jobs\Module\WorkOrder;
+namespace App\Jobs\WorkOrder;
 
 use App\Models\WorkOrder\Reply as WorkOrderReply;
 use Illuminate\Bus\Queueable;
diff --git a/app/Jobs/Module/WorkOrder/WorkOrder.php b/app/Jobs/WorkOrder/WorkOrder.php
similarity index 97%
rename from app/Jobs/Module/WorkOrder/WorkOrder.php
rename to app/Jobs/WorkOrder/WorkOrder.php
index fed570f..550769c 100644
--- a/app/Jobs/Module/WorkOrder/WorkOrder.php
+++ b/app/Jobs/WorkOrder/WorkOrder.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Jobs\Module\WorkOrder;
+namespace App\Jobs\WorkOrder;
 
 use App\Models\WorkOrder\WorkOrder as WorkOrderModel;
 use Illuminate\Bus\Queueable;
diff --git a/app/Notifications/WeComChannel.php b/app/Notifications/Channels/WeComChannel.php
similarity index 96%
rename from app/Notifications/WeComChannel.php
rename to app/Notifications/Channels/WeComChannel.php
index 2b827b1..fc780e0 100644
--- a/app/Notifications/WeComChannel.php
+++ b/app/Notifications/Channels/WeComChannel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Notifications;
+namespace App\Notifications\Channels;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Notification;
diff --git a/app/Notifications/WebChannel.php b/app/Notifications/Channels/WebChannel.php
similarity index 74%
rename from app/Notifications/WebChannel.php
rename to app/Notifications/Channels/WebChannel.php
index e796b9f..bea5079 100644
--- a/app/Notifications/WebChannel.php
+++ b/app/Notifications/Channels/WebChannel.php
@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Notifications;
+namespace App\Notifications\Channels;
 
+use App\Console\Commands\Cluster\Log;
 use App\Events\Users;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
@@ -31,10 +32,6 @@ public function send(mixed $notifiable, Notification $notification): void
 
         $user = User::find($user_id);
 
-        if (!in_array($data['type'] ?? '', ['info', 'success', 'warning', 'error'])) {
-            $data['type'] = 'info';
-        }
-
-        broadcast(new Users($user, $data['type'], $data));
+        broadcast(new Users($user, $data['event'], $data));
     }
 }
diff --git a/app/Notifications/ModuleEarnings.php b/app/Notifications/Modules/ModuleEarnings.php
similarity index 98%
rename from app/Notifications/ModuleEarnings.php
rename to app/Notifications/Modules/ModuleEarnings.php
index 289a699..1927cef 100644
--- a/app/Notifications/ModuleEarnings.php
+++ b/app/Notifications/Modules/ModuleEarnings.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Notifications;
+namespace App\Notifications\Modules;
 
 use App\Models\Module;
 use Illuminate\Bus\Queueable;
diff --git a/app/Notifications/TodayIsUserBirthday.php b/app/Notifications/User/TodayIsUserBirthday.php
similarity index 98%
rename from app/Notifications/TodayIsUserBirthday.php
rename to app/Notifications/User/TodayIsUserBirthday.php
index 5f7474c..b2cf5ea 100644
--- a/app/Notifications/TodayIsUserBirthday.php
+++ b/app/Notifications/User/TodayIsUserBirthday.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Notifications;
+namespace App\Notifications\User;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/app/Notifications/UserCharged.php b/app/Notifications/User/UserCharged.php
similarity index 93%
rename from app/Notifications/UserCharged.php
rename to app/Notifications/User/UserCharged.php
index e4ead46..0d4d037 100644
--- a/app/Notifications/UserCharged.php
+++ b/app/Notifications/User/UserCharged.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Notifications;
+namespace App\Notifications\User;
 
 use App\Models\Balance;
+use App\Notifications\Channels\WeComChannel;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Notification;
diff --git a/app/Notifications/WorkOrder.php b/app/Notifications/WorkOrder/WorkOrder.php
similarity index 95%
rename from app/Notifications/WorkOrder.php
rename to app/Notifications/WorkOrder/WorkOrder.php
index 0edbe63..f9c4207 100644
--- a/app/Notifications/WorkOrder.php
+++ b/app/Notifications/WorkOrder/WorkOrder.php
@@ -1,8 +1,10 @@
 <?php
 
-namespace App\Notifications;
+namespace App\Notifications\WorkOrder;
 
 use App\Models\WorkOrder\WorkOrder as WorkOrderModel;
+use App\Notifications\Channels\WebChannel;
+use App\Notifications\Channels\WeComChannel;
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Messages\MailMessage;
 use Illuminate\Notifications\Notification;