diff --git a/app/Observers/AbstractObserver.php b/app/Observers/AbstractObserver.php new file mode 100644 index 000000000..2d60b4ab6 --- /dev/null +++ b/app/Observers/AbstractObserver.php @@ -0,0 +1,19 @@ +bound('swoole')) { + Task::deliver($task); + } + } +} diff --git a/app/Observers/WebSocketDialogMsgObserver.php b/app/Observers/WebSocketDialogMsgObserver.php index 8d5725d8a..7d220ff24 100644 --- a/app/Observers/WebSocketDialogMsgObserver.php +++ b/app/Observers/WebSocketDialogMsgObserver.php @@ -4,9 +4,8 @@ namespace App\Observers; use App\Models\WebSocketDialogMsg; use App\Tasks\ZincSearchSyncTask; -use Hhxsv5\LaravelS\Swoole\Task\Task; -class WebSocketDialogMsgObserver +class WebSocketDialogMsgObserver extends AbstractObserver { /** * Handle the WebSocketDialogMsg "created" event. @@ -16,7 +15,7 @@ class WebSocketDialogMsgObserver */ public function created(WebSocketDialogMsg $webSocketDialogMsg) { - Task::deliver(new ZincSearchSyncTask('sync', $webSocketDialogMsg->toArray())); + self::taskDeliver(new ZincSearchSyncTask('sync', $webSocketDialogMsg->toArray())); } /** @@ -27,7 +26,7 @@ class WebSocketDialogMsgObserver */ public function updated(WebSocketDialogMsg $webSocketDialogMsg) { - Task::deliver(new ZincSearchSyncTask('sync', $webSocketDialogMsg->toArray())); + self::taskDeliver(new ZincSearchSyncTask('sync', $webSocketDialogMsg->toArray())); } /** @@ -38,7 +37,7 @@ class WebSocketDialogMsgObserver */ public function deleted(WebSocketDialogMsg $webSocketDialogMsg) { - Task::deliver(new ZincSearchSyncTask('delete', $webSocketDialogMsg->toArray())); + self::taskDeliver(new ZincSearchSyncTask('delete', $webSocketDialogMsg->toArray())); } /** diff --git a/app/Observers/WebSocketDialogUserObserver.php b/app/Observers/WebSocketDialogUserObserver.php index 1ebd7f354..6aab42287 100644 --- a/app/Observers/WebSocketDialogUserObserver.php +++ b/app/Observers/WebSocketDialogUserObserver.php @@ -6,9 +6,8 @@ use App\Models\Deleted; use App\Models\WebSocketDialogUser; use App\Tasks\ZincSearchSyncTask; use Carbon\Carbon; -use Hhxsv5\LaravelS\Swoole\Task\Task; -class WebSocketDialogUserObserver +class WebSocketDialogUserObserver extends AbstractObserver { /** * Handle the WebSocketDialogUser "created" event. @@ -31,7 +30,7 @@ class WebSocketDialogUserObserver } } Deleted::forget('dialog', $webSocketDialogUser->dialog_id, $webSocketDialogUser->userid); - Task::deliver(new ZincSearchSyncTask('userSync', $webSocketDialogUser->toArray())); + self::taskDeliver(new ZincSearchSyncTask('userSync', $webSocketDialogUser->toArray())); } /** @@ -42,7 +41,7 @@ class WebSocketDialogUserObserver */ public function updated(WebSocketDialogUser $webSocketDialogUser) { - Task::deliver(new ZincSearchSyncTask('userSync', $webSocketDialogUser->toArray())); + self::taskDeliver(new ZincSearchSyncTask('userSync', $webSocketDialogUser->toArray())); } /** @@ -54,7 +53,7 @@ class WebSocketDialogUserObserver public function deleted(WebSocketDialogUser $webSocketDialogUser) { Deleted::record('dialog', $webSocketDialogUser->dialog_id, $webSocketDialogUser->userid); - Task::deliver(new ZincSearchSyncTask('deleteUser', $webSocketDialogUser->toArray())); + self::taskDeliver(new ZincSearchSyncTask('deleteUser', $webSocketDialogUser->toArray())); } /**