IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-07 02:26:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/superGroup' into superGroup

Browse Source 
# Conflicts:
#	pkg/proto/sdk_ws/ws.pb.go
This commit is contained in:
Gordon
2022-06-15 11:08:52 +08:00
parent cfcccd0240 68365aa3b7
commit ccc69ac2d0
16 changed files with 2338 additions and 2888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/proto/rtc/rtc.pb.go
+1895 -2504
View File
File diff suppressed because it is too large Load Diff
pkg/proto/rtc/rtc.proto
+3 -2
View File
@@ -122,8 +122,9 @@ message InvitationInfo {
string roomID = 5;
int32 timeout = 6;
string mediaType = 7;
int32 platformID = 8;
int32 sessionType = 9;
int32 platformID = 8;
int32 sessionType = 9;
int32 initiateTime = 10;
}
pkg/proto/sdk_ws/ws.pb.go
+290 -291
View File
File diff suppressed because it is too large Load Diff
pkg/proto/sdk_ws/ws.proto
+3 -2
View File
@@ -520,8 +520,9 @@ message InvitationInfo {
string roomID = 5;
int32 timeout = 6;
string mediaType = 7;
int32 platformID = 8;
int32 sessionType = 9;
int32 platformID = 8;
int32 sessionType = 9;
int32 initiateTime = 10;
}
message ParticipantMetaData{