commie/im
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
commie
2026-04-13 20:00:32 +08:00
parent 9393185f25
commit 24273db8dd
15 changed files with 992 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
support/OpenImSdk/Api/Auth.php
+5 -10
View File
@@ -20,7 +20,7 @@ class Auth
'userID' => $userID,
'secret' => Config::getSecret()
];
return Utils::send(Url::$getAdminToken, $data, '获取管理员token错误');
return Utils::send(Url::$getAdminToken, $data);
}
/**
@@ -34,7 +34,7 @@ class Auth
{
// 获取管理员token
$platformID = Utils::getPlatformId( $platformID );
return Utils::send(Url::$getUserToken, ['userID' => $userID, 'platformID' => $platformID], '获取用户token错误');
return Utils::send(Url::$getUserToken, ['userID' => $userID, 'platformID' => $platformID]);
}
/**
@@ -45,13 +45,10 @@ class Auth
*/
public function forceLogout(string $userID, string $platformID = 'android'): array|bool
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
// 清除本地缓存的用户token
Utils::clearToken($userID);
$platformID = Utils::getPlatformId( $platformID );
return Utils::send(Url::$forceLogout, ['userID' => $userID, 'platformID' => $platformID], '强制登出错误', $adminToken);
return Utils::send(Url::$forceLogout, ['userID' => $userID, 'platformID' => $platformID]);
}
/**
@@ -61,7 +58,7 @@ class Auth
*/
public function parseToken(string $token): array
{
return Utils::send(Url::$parseToken, [], '解析当前用户token错误', $token);
return Utils::send(Url::$parseToken, []);
}
@@ -72,8 +69,6 @@ class Auth
*/
public function userToken(string $userID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$userToken, ['userID' => $userID], '用户登录错误', $adminToken);
return Utils::send(Url::$userToken, ['userID' => $userID]);
}
}
support/OpenImSdk/Api/Conversation.php
+3 -9
View File
@@ -16,8 +16,6 @@ class Conversation
*/
public function getOwnerConversation(string $userID, int $pageNumber = 1, int $showNumber = 20): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'userID' => $userID,
'pagination' => [
@@ -25,7 +23,7 @@ class Conversation
'showNumber' => $showNumber
]
];
return Utils::send(Url::$getOwnerConversation, $data, '获取当前用户分页会话列表失败', $adminToken);
return Utils::send(Url::$getOwnerConversation, $data);
}
/**
@@ -35,8 +33,6 @@ class Conversation
*/
public function getSortedConversationList(string $userID,$conversationIDs='',int $page=1,int $pagesize=10): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$getSortedConversationList, [
'userID' => $userID,
'conversationIDs' => $conversationIDs,
@@ -44,7 +40,7 @@ class Conversation
'pageNumber' => $page,
'showNumber' => $pagesize
]
], '获取排序的会话列表失败', $adminToken);
]);
}
/**
@@ -63,8 +59,6 @@ class Conversation
*/
public function setConversations(string $conversationID, array $userIDs, int $recvMsgOpt = 0, bool $isPinned = false, bool $isPrivateChat = false, int $groupAtType = 0, string $ex = '', bool $isMsgDestruct = false, int $msgDestructTime = 0, int $burnDuration = 0): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'conversationID' => $conversationID,
'userIDs' => $userIDs,
@@ -79,6 +73,6 @@ class Conversation
'burnDuration' => $burnDuration
]
];
return Utils::send(Url::$setConversations, $data, '为多个用户设置相同会话ID的字段失败', $adminToken);
return Utils::send(Url::$setConversations, $data);
}
}
support/OpenImSdk/Api/Friend.php
+16 -40
View File
@@ -15,10 +15,8 @@ class Friend
*/
public function addBlack(string $ownerUserID, string $blackUserID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = ['ownerUserID' => $ownerUserID, 'blackUserID' => $blackUserID];
return Utils::send(Url::$addBlack, $data, '添加黑名单错误', $adminToken);
return Utils::send(Url::$addBlack, $data);
}
/**
@@ -30,12 +28,12 @@ class Friend
*/
public function addFriend(string $fromUserID, string $toUserID, string $reqMsg): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = ['fromUserID' => $fromUserID, 'toUserID' => $toUserID, 'reqMsg' => $reqMsg];
return Utils::send(Url::$addFriend, $data, '添加好友错误', $adminToken);
return Utils::send(Url::$addFriend, $data);
}
/**
* 同意/拒绝好友请求
* @param string $ownerUserID 处理者ID
@@ -46,15 +44,13 @@ class Friend
*/
public function addFriendResponse(string $ownerUserID, string $friendUserID, string $handleMsg, int $handleResult): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'ownerUserID' => $ownerUserID,
'friendUserID' => $friendUserID,
'handleMsg' => $handleMsg,
'handleResult' => $handleResult
];
return Utils::send(Url::$addFriendResponse, $data, '同意/拒绝好友请求错误', $adminToken);
return Utils::send(Url::$addFriendResponse, $data);
}
/**
@@ -65,10 +61,8 @@ class Friend
*/
public function deleteFriend(string $ownerUserID, string $friendUserID): array|bool
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = ['ownerUserID' => $ownerUserID, 'friendUserID' => $friendUserID];
return Utils::send(Url::$deleteFriend, $data, '删除好友错误', $adminToken);
return Utils::send(Url::$deleteFriend, $data);
}
/**
@@ -78,9 +72,7 @@ class Friend
*/
public function getBlackList(string $userID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$getBlackList, ['userID' => $userID], '获取黑名单列表错误', $adminToken);
return Utils::send(Url::$getBlackList, ['userID' => $userID]);
}
/**
@@ -90,9 +82,7 @@ class Friend
*/
public function getFriendApplyList(string $userID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$getFriendApplyList, ['userID' => $userID], '获取好友申请列表错误', $adminToken);
return Utils::send(Url::$getFriendApplyList, ['userID' => $userID]);
}
/**
@@ -102,15 +92,13 @@ class Friend
*/
public function getFriendList(string $userID,$page=1,$pagesize=1000): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$getFriendList, [
'userID' => $userID,
"pagination" => [
"pageNumber" => $page,
"showNumber" => $pagesize
]
], '获取用户的好友列表错误', $adminToken);
]);
}
/**
@@ -120,9 +108,7 @@ class Friend
*/
public function getSelfFriendApplyList(string $userID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$getSelfFriendApplyList, ['userID' => $userID], '获取自己的好友申请列表错误', $adminToken);
return Utils::send(Url::$getSelfFriendApplyList, ['userID' => $userID]);
}
/**
@@ -131,12 +117,10 @@ class Friend
* @param array $friendUserIDs 好友ID列表
* @return array
*/
public function importFriend(string $ownerUserID, array $friendUserIDs = []): array
public function importFriend(string $ownerUserID, array $friendUserIDs = []): array|bool
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = ['ownerUserID' => $ownerUserID, 'friendUserIDs' => $friendUserIDs];
return Utils::send(Url::$importFriend, $data, '批量导入好友错误', $adminToken);
return Utils::send(Url::$importFriend, $data);
}
/**
@@ -147,10 +131,8 @@ class Friend
*/
public function isFriend(string $userID1, string $userID2): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = ['userID1' => $userID1, 'userID2' => $userID2];
return Utils::send(Url::$isFriend, $data, '检查用户之间是否为好友错误', $adminToken);
return Utils::send(Url::$isFriend, $data);
}
/**
@@ -161,10 +143,8 @@ class Friend
*/
public function removeBlack(string $ownerUserID, string $blackUserID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = ['ownerUserID' => $ownerUserID, 'blackUserID' => $blackUserID];
return Utils::send(Url::$removeBlack, $data, '把用户移除黑名单错误', $adminToken);
return Utils::send(Url::$removeBlack, $data);
}
/**
@@ -176,10 +156,8 @@ class Friend
*/
public function setFriendRemark(string $fromUserID, string $toUserID, string $remark): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = ['fromUserID' => $fromUserID, 'toUserID' => $toUserID, 'remark' => $remark];
return Utils::send(Url::$setFriendRemark, $data, '设置好友备注错误', $adminToken);
return Utils::send(Url::$setFriendRemark, $data);
}
/**
@@ -193,8 +171,6 @@ class Friend
*/
public function updateFriends(string $ownerUserID, string $friendUserID, string $remark = '', bool $isPinned = false, string $ex = ''): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'ownerUserID' => $ownerUserID,
'friendUserID' => $friendUserID
@@ -213,6 +189,6 @@ class Friend
$data['ex'] = $ex;
}
return Utils::send(Url::$updateFriends, $data, '更新好友信息失败', $adminToken);
return Utils::send(Url::$updateFriends, $data);
}
}
support/OpenImSdk/Api/Group.php
+28 -67
View File
@@ -31,8 +31,6 @@ class Group
string $groupID = '', string $faceURL = '', string $introduction = '', string $notification = '',
string $ex = '', int $groupType = 2, int $needVerification = 0, int $lookMemberInfo = 0, int $applyMemberFriend = 0): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'ownerUserID' => $ownerUserID,
'memberUserIDs' => $memberUserIDs,
@@ -50,25 +48,26 @@ class Group
'applyMemberFriend' => $applyMemberFriend
]
];
return Utils::send(Url::$createGroup, $data, '创建群组失败', $adminToken);
return Utils::send(Url::$createGroup, $data);
}
/**
* 申请加入群组
* @param string $token 用户token
* @param string $inviterUserID 用户ID
* @param string $groupID 群组ID
* @param string $reqMsg 申请消息
* @param int $joinSource 加入来源
* @return array
*/
public function joinGroup(string $token, string $groupID, string $reqMsg = '', int $joinSource = 0): array
public function joinGroup(string $inviterUserID, string $groupID, string $reqMsg = '', int $joinSource = 0): array
{
$data = [
'inviterUserID' => $inviterUserID,
'groupID' => $groupID,
'reqMsg' => $reqMsg,
'reqMessage' => $reqMsg,
'joinSource' => $joinSource
];
return Utils::send(Url::$joinGroup, $data, '申请加入群组失败', $token);
return Utils::send(Url::$joinGroup, $data);
}
/**
@@ -79,7 +78,7 @@ class Group
*/
public function quitGroup(string $token, string $groupID): array
{
return Utils::send(Url::$quitGroup, ['groupID' => $groupID], '退出群组失败', $token);
return Utils::send(Url::$quitGroup, ['groupID' => $groupID]);
}
/**
@@ -89,9 +88,7 @@ class Group
*/
public function getGroupsInfo(array $groupIDs): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$getGroupsInfo, ['groupIDs' => $groupIDs], '获取群组信息失败', $adminToken);
return Utils::send(Url::$getGroupsInfo, ['groupIDs' => $groupIDs]);
}
/**
@@ -113,7 +110,7 @@ class Group
'showNumber' => $pagesize
]
];
return Utils::send(Url::$getGroupMemberList, $data, '获取群成员列表失败');
return Utils::send(Url::$getGroupMemberList, $data);
}
/**
@@ -124,34 +121,28 @@ class Group
*/
public function getGroupMembersInfo(string $groupID, array $userIDs): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'groupID' => $groupID,
'userIDs' => $userIDs
];
return Utils::send(Url::$getGroupMembersInfo, $data, '获取指定群成员信息失败', $adminToken);
return Utils::send(Url::$getGroupMembersInfo, $data);
}
/**
* 将用户拉入群组
* @param string $groupID 群组ID
* @param string $inviterUserID 邀请者ID
* @param array $invitedUserIDList 被邀请的用户ID列表
* @param string $reason 邀请原因
* @return array
*/
public function inviteUserToGroup(string $groupID, string $inviterUserID, array $invitedUserIDList, string $reason = ''): array
public function inviteUserToGroup(string $groupID, array $invitedUserIDList, string $reason = ''): array|bool
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'groupID' => $groupID,
'inviterUserID' => $inviterUserID,
'invitedUserIDList' => $invitedUserIDList,
'invitedUserIDs' => $invitedUserIDList,
'reason' => $reason,
];
return Utils::send(Url::$inviteUserToGroup, $data, '将用户拉入群组失败', $adminToken);
return Utils::send(Url::$inviteUserToGroup, $data);
}
/**
@@ -164,15 +155,13 @@ class Group
*/
public function kickGroupMember(string $groupID, string $kickUserID, array $kickedUserIDs, string $reason = ''): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'groupID' => $groupID,
'kickUserID' => $kickUserID,
'kickedUserIDs' => $kickedUserIDs,
'reason' => $reason
];
return Utils::send(Url::$kickGroupMember, $data, '踢出群成员失败', $adminToken);
return Utils::send(Url::$kickGroupMember, $data);
}
/**
@@ -184,14 +173,12 @@ class Group
*/
public function transferGroupOwner(string $groupID, string $oldOwnerUserID, string $newOwnerUserID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'groupID' => $groupID,
'oldOwnerUserID' => $oldOwnerUserID,
'newOwnerUserID' => $newOwnerUserID
];
return Utils::send(Url::$transferGroupOwner, $data, '转让群主失败', $adminToken);
return Utils::send(Url::$transferGroupOwner, $data);
}
/**
@@ -201,9 +188,7 @@ class Group
*/
public function getJoinedGroupList(string $userID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$getJoinedGroupList, ['userID' => $userID], '获取用户加入的群组列表失败', $adminToken);
return Utils::send(Url::$getJoinedGroupList, ['userID' => $userID]);
}
/**
@@ -213,9 +198,7 @@ class Group
*/
public function dismissGroup(string $groupID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$dismissGroup, ['groupID' => $groupID], '解散群组失败', $adminToken);
return Utils::send(Url::$dismissGroup, ['groupID' => $groupID]);
}
/**
@@ -227,14 +210,12 @@ class Group
*/
public function setGroupMemberNickname(string $groupID, string $userID, string $nickname): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'groupID' => $groupID,
'userID' => $userID,
'nickname' => $nickname
];
return Utils::send(Url::$setGroupMemberNickname, $data, '设置群成员昵称失败', $adminToken);
return Utils::send(Url::$setGroupMemberNickname, $data);
}
/**
@@ -246,13 +227,11 @@ class Group
*/
public function setGroupMemberInfo(string $groupID, string $userID, array $data): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = array_merge([
'groupID' => $groupID,
'userID' => $userID
], $data);
return Utils::send(Url::$setGroupMemberInfo, $data, '设置群成员信息失败', $adminToken);
return Utils::send(Url::$setGroupMemberInfo, $data);
}
/**
@@ -262,9 +241,7 @@ class Group
*/
public function getGroupMemberUserIDs(string $groupID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$getGroupMemberUserIDs, ['groupID' => $groupID], '获取群成员用户ID列表失败', $adminToken);
return Utils::send(Url::$getGroupMemberUserIDs, ['groupID' => $groupID]);
}
/**
@@ -276,8 +253,6 @@ class Group
*/
public function getGroupAllMemberList(string $groupID, int $offset = 0, int $count = 100): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'groupID' => $groupID,
'pagination' => [
@@ -285,7 +260,7 @@ class Group
'showNumber' => $count
]
];
return Utils::send(Url::$getGroupAllMemberList, $data, '获取群成员列表失败', $adminToken);
return Utils::send(Url::$getGroupAllMemberList, $data);
}
/**
@@ -295,9 +270,7 @@ class Group
*/
public function getUserReqGroupApplicationList(string $userID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$getUserReqGroupApplicationList, ['userID' => $userID], '获取用户加群申请列表失败', $adminToken);
return Utils::send(Url::$getUserReqGroupApplicationList, ['userID' => $userID]);
}
/**
@@ -308,13 +281,11 @@ class Group
*/
public function getGroupApplicationListByUserID(string $groupID, array $userIDs): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'groupID' => $groupID,
'userIDs' => $userIDs
];
return Utils::send(Url::$getGroupUsersReqApplicationList, $data, '获取指定用户对指定群组的加群请求失败', $adminToken);
return Utils::send(Url::$getGroupUsersReqApplicationList, $data);
}
/**
@@ -328,8 +299,6 @@ class Group
*/
public function groupApplicationResponse(string $groupID, string $fromUserID, string $handledUserID, int $handleResult, string $handleMsg = ''): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'groupID' => $groupID,
'fromUserID' => $fromUserID,
@@ -337,7 +306,7 @@ class Group
'handleResult' => $handleResult,
'handleMsg' => $handleMsg
];
return Utils::send(Url::$groupApplicationResponse, $data, '处理群组申请失败', $adminToken);
return Utils::send(Url::$groupApplicationResponse, $data);
}
/**
@@ -347,9 +316,7 @@ class Group
*/
public function muteGroup(string $groupID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$muteGroup, ['groupID' => $groupID], '禁言群组失败', $adminToken);
return Utils::send(Url::$muteGroup, ['groupID' => $groupID]);
}
/**
@@ -359,9 +326,7 @@ class Group
*/
public function cancelMuteGroup(string $groupID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$cancelMuteGroup, ['groupID' => $groupID], '取消禁言群组失败', $adminToken);
return Utils::send(Url::$cancelMuteGroup, ['groupID' => $groupID]);
}
/**
@@ -373,10 +338,8 @@ class Group
*/
public function muteGroupMember(string $groupID, string $userID, int $mutedSeconds = 0): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = ['groupID' => $groupID, 'userID' => $userID, 'mutedSeconds' => $mutedSeconds];
return Utils::send(Url::$muteGroupMember, $data, '禁言群成员失败', $adminToken);
return Utils::send(Url::$muteGroupMember, $data);
}
/**
@@ -387,9 +350,7 @@ class Group
*/
public function cancelMuteGroupMember(string $groupID, string $userID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = ['groupID' => $groupID, 'userID' => $userID];
return Utils::send(Url::$cancelMuteGroupMember, $data, '取消禁言群成员失败', $adminToken);
return Utils::send(Url::$cancelMuteGroupMember, $data);
}
}
support/OpenImSdk/Api/Message.php
+9 -25
View File
@@ -68,8 +68,6 @@ class Message
*/
public function sendMsg(string $sendID, string $recvID = '', string $groupID = '', string $senderNickname = '', string $senderFaceURL = '', int $senderPlatformID = 1, array $content = [], int $contentType = 101, int $sessionType = 1, bool $isOnlineOnly = false, bool $notOfflinePush = false, int $sendTime = 0, array $offlinePushInfo = [], string $ex = ''): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'sendID' => $sendID,
'senderNickname' => $senderNickname,
@@ -106,7 +104,7 @@ class Message
$data['offlinePushInfo'] = $offlinePushInfo;
}
return Utils::send(Url::$sendMsg, $data, '发送消息失败', $adminToken);
return Utils::send(Url::$sendMsg, $data);
}
/**
@@ -121,8 +119,6 @@ class Message
*/
public function batchSendMsg(string $sendID, string $senderNickname, string $senderFaceURL, int $sessionType, int $contentType, string $content): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'senderPlatformID' => 0,
'sendID' => $sendID,
@@ -132,7 +128,7 @@ class Message
'contentType' => $contentType,
'content' => ['text' => $content]
];
return Utils::send(Url::$batchSendMsg, $data, '批量发送消息失败', $adminToken);
return Utils::send(Url::$batchSendMsg, $data);
}
/**
@@ -142,9 +138,7 @@ class Message
*/
public function clearMsg(string $userID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$clearMsg, ['userID' => $userID], '清空用户消息失败', $adminToken);
return Utils::send(Url::$clearMsg, ['userID' => $userID]);
}
/**
@@ -156,14 +150,12 @@ class Message
*/
public function delMsg(string $userID, string $conversationID, array $seqs): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'userID' => $userID,
'conversationID' => $conversationID,
'seqs' => $seqs
];
return Utils::send(Url::$delMsg, $data, '删除消息失败', $adminToken);
return Utils::send(Url::$delMsg, $data);
}
/**
@@ -175,14 +167,12 @@ class Message
*/
public function revokeMessage(string $conversationID, string $seq, string $userID): array|bool
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'conversationID' => $conversationID,
'seq' => intval($seq),
'userID' => $userID
];
return Utils::send(Url::$revokeMessage, $data, '撤回消息失败', $adminToken);
return Utils::send(Url::$revokeMessage, $data);
}
/**
@@ -233,7 +223,7 @@ class Message
'reliabilityLevel' => 1,
];
//log_alert($data);
return Utils::send(Url::$sendBusinessNotification, $data, '发送业务通知失败');
return Utils::send(Url::$sendBusinessNotification, $data);
}
/**
@@ -243,9 +233,7 @@ class Message
*/
public function getAllConversations(string $userID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$getAllConversations, ['userID' => $userID], '获取用户所有会话失败', $adminToken);
return Utils::send(Url::$getAllConversations, ['userID' => $userID]);
}
/**
@@ -256,13 +244,11 @@ class Message
*/
public function getConversation(string $userID, string $conversationID): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'userID' => $userID,
'conversationID' => $conversationID
];
return Utils::send(Url::$getConversation, $data, '获取会话失败', $adminToken);
return Utils::send(Url::$getConversation, $data);
}
/**
@@ -273,12 +259,10 @@ class Message
*/
public function getConversations(string $userID, array $conversationIDs): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'userID' => $userID,
'conversationIDs' => $conversationIDs
];
return Utils::send(Url::$getConversations, $data, '获取会话列表失败', $adminToken);
return Utils::send(Url::$getConversations, $data);
}
}
support/OpenImSdk/Api/User.php
+29 -59
View File
@@ -15,15 +15,13 @@ class User
*/
public function getUsers(int $pagination = 1, int $showNumber = 20): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'pagination' => [
'pageNumber' => $pagination,
'showNumber' => $showNumber
]
];
return Utils::send(Url::$getUsers, $data, '获取用户列表错误', $adminToken);
return Utils::send(Url::$getUsers, $data);
}
/**
@@ -33,9 +31,7 @@ class User
*/
public function getUsersOnlineStatus(array $userIDList): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$getUsersOnlineStatus, ['userIDList' => $userIDList], '获取用户在线状态错误', $adminToken);
return Utils::send(Url::$getUsersOnlineStatus, ['userIDList' => $userIDList]);
}
/**
@@ -45,9 +41,7 @@ class User
*/
public function getUsersOnlineTokenDetail(array $userIDList): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$getUsersOnlineTokenDetail, ['userIDList' => $userIDList], '获取用户在线token详情错误', $adminToken);
return Utils::send(Url::$getUsersOnlineTokenDetail, ['userIDList' => $userIDList]);
}
/**
@@ -56,22 +50,17 @@ class User
*/
public function getSubscribeUsersStatus(): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$getSubscribeUsersStatus, [], '获取订阅用户状态错误', $adminToken);
return Utils::send(Url::$getSubscribeUsersStatus, []);
}
/**
* 订阅用户状态
* @param string $token 管理员token
* @param array $userIDList 用户ID列表
* @return array
*/
public function subscribeUsersStatus(array $userIDList): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$subscribeUsersStatus, ['userIDList' => $userIDList], '订阅用户状态错误', $adminToken);
return Utils::send(Url::$subscribeUsersStatus, ['userIDList' => $userIDList]);
}
/**
@@ -81,9 +70,7 @@ class User
*/
public function setGlobalMsgRecvOpt(int $globalRecvMsgOpt): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$setGlobalMsgRecvOpt, ['globalRecvMsgOpt' => $globalRecvMsgOpt], '设置全局免打扰错误', $adminToken);
return Utils::send(Url::$setGlobalMsgRecvOpt, ['globalRecvMsgOpt' => $globalRecvMsgOpt]);
}
/**
@@ -94,13 +81,11 @@ class User
*/
public function updateUserInfo(string $userID, array $data): array|bool
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = array_merge(['userID' => $userID], $data);
$data = [
'userInfo' => $data
];
return Utils::send(Url::$updateUserInfo, $data, '修改用户信息错误', $adminToken);
return Utils::send(Url::$updateUserInfo, $data);
}
/**
@@ -119,7 +104,7 @@ class User
'showNumber' => $showNumber
]
];
return Utils::send(Url::$searchNotificationAccount, $data, '搜索通知账号错误');
return Utils::send(Url::$searchNotificationAccount, $data);
}
/**
@@ -127,11 +112,7 @@ class User
* @param string $userID 用户ID
* @param string $nickname 昵称
* @param string $faceURL 头像
* @param int $gender 性别
* @param string $phoneNumber 手机号
* @param string $birth 生日
* @param string $email 邮箱
* @param string $ex 扩展字段
* @param \support\OpenImSdk\Enum\appMangerLevel $appMangerLevel 应用管理等级
* @return array
*/
public function addNotificationAccount(string $userID, string $nickname = '', string $faceURL = '', \support\OpenImSdk\Enum\appMangerLevel $appMangerLevel = \support\OpenImSdk\Enum\appMangerLevel::Notify): array
@@ -142,7 +123,7 @@ class User
'faceURL' => $faceURL,
'appMangerLevel' => $appMangerLevel->value,
];
return Utils::send(Url::$addNotificationAccount, $data, '添加通知账号错误');
return Utils::send(Url::$addNotificationAccount, $data);
}
/**
@@ -150,11 +131,6 @@ class User
* @param string $userID 用户ID
* @param string $nickname 昵称
* @param string $faceURL 头像
* @param int $gender 性别
* @param string $phoneNumber 手机号
* @param string $birth 生日
* @param string $email 邮箱
* @param string $ex 扩展字段
* @return array
*/
public function updateNotificationAccount(string $userID, string $nickname = '', string $faceURL = ''): array
@@ -165,7 +141,7 @@ class User
'nickname' => $nickname,
'faceURL' => $faceURL
];
return Utils::send(Url::$updateNotificationAccount, $data, '更新通知账号错误');
return Utils::send(Url::$updateNotificationAccount, $data);
}
/**
@@ -175,9 +151,7 @@ class User
*/
public function accountCheck(array $checkUserIDList): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$accountCheck, ['checkUserIDList' => $checkUserIDList], '检查列表账户注册状态错误', $adminToken);
return Utils::send(Url::$accountCheck, ['checkUserIDList' => $checkUserIDList]);
}
/**
@@ -186,9 +160,7 @@ class User
*/
public function getAllUsersUid($page=1,$limit=100): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$getAllUsersUid, ['pagination'=>['pageNumber'=>$page,"showNumber"=>$limit]], '获取所有用户uid列表错误', $adminToken);
return Utils::send(Url::$getAllUsersUid, ['pagination'=>['pageNumber'=>$page,"showNumber"=>$limit]]);
}
/**
@@ -198,9 +170,7 @@ class User
*/
public function getSelfUserInfo(string $userID): array
{
// 获取管理员token
$userToken = Utils::getUserToken($userID);
return Utils::send(Url::$getSelfUserInfo, ['userID' => $userID], '获取自己的信息错误', $userToken);
return Utils::send(Url::$getSelfUserInfo, ['userID' => $userID]);
}
/**
@@ -210,9 +180,7 @@ class User
*/
public function getUsersInfo(array $userIDList): array
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
return Utils::send(Url::$getUsersInfo, ['userIDList' => $userIDList], '获取用户信息错误', $adminToken);
return Utils::send(Url::$getUsersInfo, ['userIDList' => $userIDList]);
}
//Header
@@ -233,19 +201,21 @@ class User
* @param string $faceURL 头像地址
* @return array
*/
public function userRegister(string $userID, string $nickname = '', string $faceURL = ''): array|bool
public function userRegister(string|array $userID, string $nickname = '', string $faceURL = ''): array|bool
{
// 获取管理员token
$adminToken = Utils::getAdminToken();
$data = [
'users' => [
[
'userID' => $userID,
'nickname' => $nickname,
'faceURL' => $faceURL
if(is_array($userID)){
$data['users'] = $userID;
}else{
$data = [
'users' => [
[
'userID' => $userID,
'nickname' => $nickname,
'faceURL' => $faceURL
]
]
]
];
return Utils::send(Url::$userRegister, $data, '注册IM错误', $adminToken);
];
}
return Utils::send(Url::$userRegister, $data);
}
}
support/OpenImSdk/Core/Utils.php
+10 -9
View File
@@ -80,23 +80,24 @@ class Utils
* 发送API请求
* @param string $path API路径
* @param array $data 请求数据
* @param string $errMsg 错误信息
* @param string $token 认证令牌
* @return array 响应数据
*/
public static function send(string $path, array $data, string $errMsg='', string $token = ''): array|bool
public static function send(string $path, array $data): array|bool
{
if($path != Url::$getAdminToken){
$token = $token ? $token : Utils::getAdminToken();
$token = Utils::getAdminToken();
}
$url = Url::buildUrl($path);
//cp($url);
//cp($data);
$res = self::request($url, $data, $token);
//cp($res);
$res = json_decode($res, true);
if($res['errCode'] !==0 ){
cp('=============================调试信息=====================================');
cp($url);
cp(json_encode($data));
cp($res);
cp('=============================end=====================================');
throw new \Exception($res['errMsg'],$res['errCode']);
//throw new \Exception($res['errDlt'],$res['errCode']);
}
@@ -132,7 +133,7 @@ class Utils
$result = self::send(Url::$getAdminToken, [
'userID' => $userID,
'secret' => Config::getSecret()
], '获取管理员Token失败');
]);
$token = $result['token'];
// 使用API返回的过期时间
$expireTimeSeconds = $result['expireTimeSeconds'] ?? null;
@@ -167,7 +168,7 @@ class Utils
$result = self::send(Url::$getUserToken, [
'userID' => $userID,
'platformID' => self::getPlatformId($platformID)
], '获取用户Token失败', $adminToken);
]);
$token = $result['token'];