Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan
2023-04-01 23:09:13 +08:00
parent 8af540f9b2
commit 81fdcce40f
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/Tasks/PushTask.php
View File

@@ -112,7 +112,7 @@ class PushTask extends AbstractTask
*/
public static function push(array $lists, $retryOffline = true, $key = null, $delay = 1)
{
if (!is_array($lists) || empty($lists)) {
if (empty($lists)) {
return;
}
if (!Base::isTwoArray($lists)) {
@@ -178,14 +178,7 @@ class PushTask extends AbstractTask
Task::deliver($task);
} else {
try {
$encrypt = Base::json2array(Cache::get("User::encrypt:" . $fid));
if ($encrypt['type'] == 'pgp') {
$msg = [
'type' => 'encrypt',
'encrypted' => Doo::pgpEncryptApi($msg, $encrypt['key']),
];
}
$swoole->push($fid, Base::array2json($msg));
$swoole->push($fid, self::pushMsgFormat($fid, $msg));
if ($tmpMsgId > 0) {
WebSocketTmpMsg::whereId($tmpMsgId)->update(['send' => 1]);
}
@@ -201,4 +194,22 @@ class PushTask extends AbstractTask
}
}
}
/**
* 格式化推送消息
* @param $fid
* @param $msg
* @return string
*/
private static function pushMsgFormat($fid, $msg)
{
$encrypt = Base::json2array(Cache::get("User::encrypt:" . $fid));
if ($encrypt['type'] == 'pgp') {
$msg = [
'type' => 'encrypt',
'encrypted' => Doo::pgpEncryptApi($msg, $encrypt['key']),
];
}
return Base::array2json($msg);
}
}