chenchong
/
hyperf-chat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化代码

main
gzydong 2021-08-06 23:57:49 +08:00
parent 1fe2bd0e9c
commit 85d2557fcf
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Command/InstallCommand.php
View File

@ -36,7 +36,7 @@ class InstallCommand extends HyperfCommand
$this->line('LumenIM 正在创建数据库，请耐心等待!', 'info'); $this->line('LumenIM 正在创建数据库，请耐心等待!', 'info');
$this->call('migrate'); $this->call('migrate');
if ($this->confirm('是否需要生成测试数据')) { if ($this->confirm('是否需要生成测试数据？')) {
$this->call('db:seed'); $this->call('db:seed');
} }
} }

38
app/Service/Message/SubscribeHandleService.php
View File

@ -8,12 +8,10 @@ use App\Cache\SocketRoom;
use App\Constants\TalkEventConstant; use App\Constants\TalkEventConstant;
use App\Constants\TalkModeConstant; use App\Constants\TalkModeConstant;
use App\Model\Talk\TalkRecords; use App\Model\Talk\TalkRecords;
use App\Model\Group\Group;
use App\Model\User; use App\Model\User;
use App\Model\UsersFriendApply; use App\Model\UsersFriendApply;
use App\Service\SocketClientService; use App\Service\SocketClientService;
use App\Service\UserService; use App\Service\UserService;
use Hyperf\Utils\Arr;
class SubscribeHandleService class SubscribeHandleService
{ {
@ -87,20 +85,20 @@ class SubscribeHandleService
$groupInfo = null; $groupInfo = null;
if ($talk_type == TalkModeConstant::PRIVATE_CHAT) { if ($talk_type == TalkModeConstant::PRIVATE_CHAT) {
$fds = array_merge( $fds[] = $this->clientService->findUserFds($sender_id);
$this->clientService->findUserFds($sender_id), $fds[] = $this->clientService->findUserFds($receiver_id);
$this->clientService->findUserFds($receiver_id)
);
} else if ($talk_type == TalkModeConstant::GROUP_CHAT) { } else if ($talk_type == TalkModeConstant::GROUP_CHAT) {
foreach (SocketRoom::getInstance()->getRoomMembers(strval($receiver_id)) as $uid) { foreach (SocketRoom::getInstance()->getRoomMembers(strval($receiver_id)) as $uid) {
$fds = array_merge($fds, $this->clientService->findUserFds(intval($uid))); $fds[] = $this->clientService->findUserFds(intval($uid));
} }
$groupInfo = GroupCache::getInstance()->getOrSetCache($receiver_id); $groupInfo = GroupCache::getInstance()->getOrSetCache($receiver_id);
} }
$fds = array_unique(array_merge(...$fds));
// 客户端ID去重 // 客户端ID去重
if (!$fds = array_unique($fds)) return; if (!$fds) return;
$result = TalkRecords::leftJoin('users', 'users.id', '=', 'talk_records.user_id') $result = TalkRecords::leftJoin('users', 'users.id', '=', 'talk_records.user_id')
->where('talk_records.id', $record_id) ->where('talk_records.id', $record_id)
@ -119,7 +117,6 @@ class SubscribeHandleService
if (!$result) return; if (!$result) return;
$message = di()->get(FormatMessageService::class)->handleChatRecords([$result->toArray()])[0]; $message = di()->get(FormatMessageService::class)->handleChatRecords([$result->toArray()])[0];
$notify = [ $notify = [
'sender_id' => $sender_id, 'sender_id' => $sender_id,
@ -156,14 +153,15 @@ class SubscribeHandleService
$user_id = (int)$data['data']['user_id']; $user_id = (int)$data['data']['user_id'];
$status = (int)$data['data']['status']; $status = (int)$data['data']['status'];
$fds = [];
$ids = di()->get(UserService::class)->getFriendIds($user_id); $ids = di()->get(UserService::class)->getFriendIds($user_id);
$fds = [];
foreach ($ids as $friend_id) { foreach ($ids as $friend_id) {
$fds = array_merge($fds, $this->clientService->findUserFds(intval($friend_id))); $fds[] = $this->clientService->findUserFds(intval($friend_id));
} }
$this->socketPushNotify(array_unique($fds), json_encode([ $fds = array_unique(array_merge(...$fds));
$this->socketPushNotify($fds, json_encode([
TalkEventConstant::EVENT_ONLINE_STATUS, [ TalkEventConstant::EVENT_ONLINE_STATUS, [
'user_id' => $user_id, 'user_id' => $user_id,
'status' => $status 'status' => $status
@ -182,16 +180,18 @@ class SubscribeHandleService
$fds = []; $fds = [];
if ($record->talk_type == TalkModeConstant::PRIVATE_CHAT) { if ($record->talk_type == TalkModeConstant::PRIVATE_CHAT) {
$fds = array_merge($fds, $this->clientService->findUserFds($record->user_id)); $fds[] = $this->clientService->findUserFds($record->user_id);
$fds = array_merge($fds, $this->clientService->findUserFds($record->receiver_id)); $fds[] = $this->clientService->findUserFds($record->receiver_id);
} else if ($record->talk_type == TalkModeConstant::GROUP_CHAT) { } else if ($record->talk_type == TalkModeConstant::GROUP_CHAT) {
$userIds = SocketRoom::getInstance()->getRoomMembers(strval($record->receiver_id)); foreach (SocketRoom::getInstance()->getRoomMembers(strval($record->receiver_id)) as $uid) {
foreach ($userIds as $uid) { $fds[] = $this->clientService->findUserFds((int)$uid);
$fds = array_merge($fds, $this->clientService->findUserFds((int)$uid));
} }
} }
$fds = array_unique($fds); $fds = array_unique(array_merge(...$fds));
if (!$fds) return;
$this->socketPushNotify($fds, json_encode([TalkEventConstant::EVENT_REVOKE_TALK, [ $this->socketPushNotify($fds, json_encode([TalkEventConstant::EVENT_REVOKE_TALK, [
'talk_type' => $record->talk_type, 'talk_type' => $record->talk_type,
'sender_id' => $record->user_id, 'sender_id' => $record->user_id,