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

Merge branch 'tuoyun' into superGroup

Browse Source 
# Conflicts:
#	config/config.yaml
#	internal/msg_gateway/gate/logic.go
#	internal/msg_gateway/gate/ws_server.go
#	internal/push/logic/push_to_client.go
#	internal/rpc/group/group.go
#	internal/rpc/msg/send_msg.go
#	pkg/common/config/config.go
#	pkg/proto/sdk_ws/ws.pb.go
This commit is contained in:
wangchuxiao
2022-06-15 10:31:58 +08:00
parent 926de3fa94 f324bb603d
commit a0581618a4
16 changed files with 2335 additions and 2875 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
+287 -278
View File
File diff suppressed because it is too large Load Diff
pkg/proto/sdk_ws/ws.proto
+3 -2
View File
@@ -519,8 +519,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{