diff --git a/app/Models/WebSocket.php b/app/Models/WebSocket.php index 268fa1f0..8885e66c 100644 --- a/app/Models/WebSocket.php +++ b/app/Models/WebSocket.php @@ -4,8 +4,10 @@ namespace App\Models; /** - * App\Models\WebSocket + * Class WebSocket * + * @package App\Models + * @property int $id * @property string $key * @property string|null $fd * @property int|null $userid @@ -16,6 +18,7 @@ namespace App\Models; * @method static \Illuminate\Database\Eloquent\Builder|WebSocket query() * @method static \Illuminate\Database\Eloquent\Builder|WebSocket whereCreatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|WebSocket whereFd($value) + * @method static \Illuminate\Database\Eloquent\Builder|WebSocket whereId($value) * @method static \Illuminate\Database\Eloquent\Builder|WebSocket whereKey($value) * @method static \Illuminate\Database\Eloquent\Builder|WebSocket whereUpdatedAt($value) * @method static \Illuminate\Database\Eloquent\Builder|WebSocket whereUserid($value) diff --git a/app/Services/WebSocketService.php b/app/Services/WebSocketService.php index abc3c2f0..330f87a0 100644 --- a/app/Services/WebSocketService.php +++ b/app/Services/WebSocketService.php @@ -151,9 +151,8 @@ class WebSocketService implements WebSocketHandlerInterface */ public function onClose(Server $server, $fd, $reactorId) { + Task::deliver(new LineTask($this->getUserid($fd), false)); // 通知离线 $this->deleteUser($fd); - // 通知离线 - Task::deliver(new LineTask($this->getUserid($fd), false)); } /** ****************************************************************************** */ diff --git a/resources/assets/js/components/UserAvatar.vue b/resources/assets/js/components/UserAvatar.vue index dba73d21..ad05a9e8 100755 --- a/resources/assets/js/components/UserAvatar.vue +++ b/resources/assets/js/components/UserAvatar.vue @@ -78,7 +78,7 @@ }, userOnline(data) { - if (this.user && data[this.user.userid]) { + if (this.user && typeof data[this.user.userid] !== "undefined") { this.$set(this.user, 'online', data[this.user.userid]); } } diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue index 699da62f..a60d9501 100644 --- a/resources/assets/js/pages/manage/messenger.vue +++ b/resources/assets/js/pages/manage/messenger.vue @@ -37,6 +37,10 @@