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

Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release

Browse Source 
# Conflicts:
#	pkg/proto/sdk_ws/ws.pb.go
This commit is contained in:
Gordon
2022-09-05 21:00:18 +08:00
parent 6c8b115479 82a8f18e88
commit bde0adfbd0
73 changed files with 5834 additions and 8295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/proto/sdk_ws/ws.pb.go
+315 -376
View File
File diff suppressed because it is too large Load Diff
pkg/proto/sdk_ws/ws.proto
+3 -9
View File
@@ -72,15 +72,9 @@ message UserInfo{
uint32 birth = 6;
string email = 7;
string ex = 8;
string createIp = 9;
uint32 createTime = 10;
string LastLoginIp =11;
uint32 LastLoginTime = 12;
int32 LoginTimes = 13;
int32 LoginLimit = 14;
int32 appMangerLevel = 15;
int32 globalRecvMsgOpt = 16;
string invitationCode = 17;
uint32 createTime = 9;
int32 appMangerLevel = 10;
int32 globalRecvMsgOpt = 11;
}
message FriendInfo{