msb-public
/
Open-IM-Server
mirror of https://github.com/OpenIMSDK/Open-IM-Server
2
0
Code Issues Projects Releases Wiki Activity

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

Browse Source
pull/141/head
wenxu12345 3 years ago
parent 7f7664eb4f 6bc69d5a75
commit 6f411e96ed
9 changed files with 425 additions and 444 deletions

1
cmd/open_im_api/main.go
Unescape View File

@ -19,6 +19,7 @@ import (
) )
func main() { func main() {
gin.SetMode(gin.ReleaseMode)
r := gin.Default() r := gin.Default()
r.Use(utils.CorsHandler()) r.Use(utils.CorsHandler())
// user routing group, which handles user registration and login services // user routing group, which handles user registration and login services

2
cmd/open_im_timer_task/main.go
Unescape View File

@ -40,7 +40,7 @@ func main() {
// } // }
//} //}
for { for {
uidList, err := im_mysql_model.SelectAllUID() uidList, err := im_mysql_model.SelectAllUserID()
if err != nil { if err != nil {
//log.NewError("999999", err.Error()) //log.NewError("999999", err.Error())
} else { } else {

2
internal/api/user/user.go
Unescape View File

@ -45,7 +45,7 @@ func GetUsersInfo(c *gin.Context) {
var publicUserInfoList []*open_im_sdk.PublicUserInfo var publicUserInfoList []*open_im_sdk.PublicUserInfo
for _, v := range RpcResp.UserInfoList { for _, v := range RpcResp.UserInfoList {
publicUserInfoList = append(publicUserInfoList, publicUserInfoList = append(publicUserInfoList,
&open_im_sdk.PublicUserInfo{UserID: v.UserID, Nickname: v.Nickname, FaceUrl: v.FaceUrl, Gender: v.Gender, AppMangerLevel: v.AppMangerLevel}) &open_im_sdk.PublicUserInfo{UserID: v.UserID, Nickname: v.Nickname, FaceURL: v.FaceURL, Gender: v.Gender, AppMangerLevel: v.AppMangerLevel})
} }
resp := api.GetUsersInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}, UserInfoList: publicUserInfoList} resp := api.GetUsersInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}, UserInfoList: publicUserInfoList}

2
internal/msg_gateway/gate/ws_server.go
Unescape View File

@ -128,7 +128,7 @@ func (ws *WServer) MultiTerminalLoginChecker(uid string, platformID int32, newCo
} }
delete(ws.wsConnToUser, oldConn) delete(ws.wsConnToUser, oldConn)
if err != nil { if err != nil {
log.NewError("", "conn close err", err.Error()) log.NewError("", "conn close err", err.Error(), uid, platformID)
} }
} }

2
internal/rpc/group/group.go
Unescape View File

@ -579,7 +579,7 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf
if group.Introduction != req.GroupInfo.Introduction && req.GroupInfo.Introduction != "" { if group.Introduction != req.GroupInfo.Introduction && req.GroupInfo.Introduction != "" {
changedType = changedType | (1 << 2) changedType = changedType | (1 << 2)
} }
if group.FaceUrl != req.GroupInfo.FaceUrl && req.GroupInfo.FaceUrl != "" { if group.FaceUrl != req.GroupInfo.FaceURL && req.GroupInfo.FaceURL != "" {
changedType = changedType | (1 << 3) changedType = changedType | (1 << 3)
} }
//only administrators can set group information //only administrators can set group information

8
pkg/common/constant/constant.go
Unescape View File

@ -78,13 +78,13 @@ const (
ExpiredToken = 3 ExpiredToken = 3
//MultiTerminalLogin //MultiTerminalLogin
//全端登录，但是同端互斥 //Full-end login, but the same end is mutually exclusive
AllLoginButSameTermKick = 1 AllLoginButSameTermKick = 1
//所有端中只能有一端能够登录 //Only one of the endpoints can log in
SingleTerminalLogin = 2 SingleTerminalLogin = 2
//web端可以同时在线，其他端只能有一端登录 //The web side can be online at the same time, and the other side can only log in at one end
WebAndOther = 3 WebAndOther = 3
//Pc端互斥，移动端互斥，但是web端可以同时在线 //The PC side is mutually exclusive, and the mobile side is mutually exclusive, but the web side can be online at the same time
PcMobileAndWeb = 4 PcMobileAndWeb = 4
OnlineStatus = "online" OnlineStatus = "online"

19
pkg/common/db/mysql_model/im_mysql_msg_model/receive_model.go
Unescape View File

@ -1,19 +0,0 @@
/*
** description("").
** copyright('tuoyun,www.tuoyun.net').
** author("fg,Gordon@tuoyun.net").
** time(2021/3/4 11:18).
*/
package im_mysql_msg_model
import (
"time"
)
// Receive Inbox table structure
type Receive struct {
UserId string `gorm:"primary_key"` // 收件箱主键ID
Seq int64 `gorm:"primary_key"` // 收件箱主键ID
MsgId string
CreateTime *time.Time
}

587
pkg/proto/sdk_ws/ws.pb.go
View File

File diff suppressed because it is too large Load Diff

246
pkg/proto/sdk_ws/ws.proto
Unescape View File

@ -6,96 +6,96 @@ package open_im_sdk;//The package name to which the proto file belongs
message GroupInfo{ message GroupInfo{
string GroupID = 1; string groupID = 1;
string GroupName = 2; string groupName = 2;
string Notification = 3; string notification = 3;
string Introduction = 4; string introduction = 4;
string FaceUrl = 5; string faceURL = 5;
string OwnerUserID = 6; string ownerUserID = 6;
uint32 CreateTime = 7; uint32 createTime = 7;
uint32 MemberCount = 8; uint32 memberCount = 8;
string Ex = 9; string ex = 9;
int32 Status = 10; int32 status = 10;
string CreatorUserID = 11; string creatorUserID = 11;
int32 GroupType = 12; int32 groupType = 12;
} }
message GroupMemberFullInfo { message GroupMemberFullInfo {
string GroupID = 1 ; string groupID = 1 ;
string UserID = 2 ; string userID = 2 ;
int32 roleLevel = 3; int32 roleLevel = 3;
int64 JoinTime = 4; int64 joinTime = 4;
string Nickname = 5; string nickname = 5;
string FaceUrl = 6; string faceURL = 6;
int32 AppMangerLevel = 7; //if >0 int32 appMangerLevel = 7; //if >0
int32 JoinSource = 8; int32 joinSource = 8;
string OperatorUserID = 9; string operatorUserID = 9;
string Ex = 10; string ex = 10;
} }
message PublicUserInfo{ message PublicUserInfo{
string UserID = 1; string userID = 1;
string Nickname = 2; string nickname = 2;
string FaceUrl = 3; string faceURL = 3;
int32 Gender = 4; int32 gender = 4;
int32 AppMangerLevel = 5; //if >0 int32 appMangerLevel = 5; //if >0
} }
message UserInfo{ message UserInfo{
string UserID = 1; string userID = 1;
string Nickname = 2; string nickname = 2;
string FaceUrl = 3; string faceURL = 3;
int32 Gender = 4; int32 gender = 4;
string PhoneNumber = 5; string phoneNumber = 5;
uint32 Birth = 6; uint32 birth = 6;
string Email = 7; string email = 7;
string Ex = 8; string ex = 8;
uint32 CreateTime = 9; uint32 createTime = 9;
int32 AppMangerLevel = 10; int32 appMangerLevel = 10;
} }
message FriendInfo{ message FriendInfo{
string OwnerUserID = 1; string ownerUserID = 1;
string Remark = 2; string remark = 2;
uint32 CreateTime = 3; uint32 createTime = 3;
UserInfo FriendUser = 4; UserInfo friendUser = 4;
int32 AddSource = 5; int32 addSource = 5;
string OperatorUserID = 6; string operatorUserID = 6;
string Ex = 7; string ex = 7;
} }
message BlackInfo{ message BlackInfo{
string OwnerUserID = 1; string ownerUserID = 1;
uint32 CreateTime = 2; uint32 createTime = 2;
PublicUserInfo BlackUserInfo = 3; PublicUserInfo blackUserInfo = 3;
int32 AddSource = 4; int32 addSource = 4;
string OperatorUserID = 5; string operatorUserID = 5;
string Ex = 6; string ex = 6;
} }
message GroupRequest{ message GroupRequest{
string UserID = 1; string userID = 1;
string GroupID = 2; string groupID = 2;
string HandleResult = 3; string handleResult = 3;
string ReqMsg = 4; string reqMsg = 4;
string HandleMsg = 5; string handleMsg = 5;
uint32 ReqTime = 6; uint32 reqTime = 6;
string HandleUserID = 7; string handleUserID = 7;
uint32 HandleTime = 8; uint32 handleTime = 8;
string Ex = 9; string ex = 9;
} }
message FriendRequest{ message FriendRequest{
string FromUserID = 1; string fromUserID = 1;
string ToUserID = 2; string toUserID = 2;
int32 HandleResult = 3; int32 handleResult = 3;
string ReqMsg = 4; string reqMsg = 4;
uint32 CreateTime = 5; uint32 createTime = 5;
string HandlerUserID = 6; string handlerUserID = 6;
string HandleMsg = 7; string handleMsg = 7;
uint32 HandleTime = 8; uint32 handleTime = 8;
string Ex = 9; string ex = 9;
} }
///////////////////////////////////base end///////////////////////////////////// ///////////////////////////////////base end/////////////////////////////////////
@ -169,8 +169,8 @@ message GatherFormat{
message UserSendMsgResp { message UserSendMsgResp {
string ServerMsgID = 1; string serverMsgID = 1;
string ClientMsgID = 2; string clientMsgID = 2;
int64 sendTime = 3; int64 sendTime = 3;
} }
@ -191,14 +191,14 @@ message MsgData {
int64 seq = 14; int64 seq = 14;
int64 sendTime = 15; int64 sendTime = 15;
int64 createTime = 16; int64 createTime = 16;
map<string, bool> Options = 17; map<string, bool> options = 17;
OfflinePushInfo offlinePushInfo = 18; OfflinePushInfo offlinePushInfo = 18;
} }
message OfflinePushInfo{ message OfflinePushInfo{
string Title = 1; string title = 1;
string Desc = 2; string desc = 2;
string Ex = 3; string ex = 3;
string iOSPushSound = 4; string iOSPushSound = 4;
bool iOSBadgeCount = 5; bool iOSBadgeCount = 5;
} }
@ -212,71 +212,71 @@ message OfflinePushInfo{
message TipsComm{ message TipsComm{
bytes Detail = 1; bytes detail = 1;
string DefaultTips = 2; string defaultTips = 2;
} }
//////////////////////group///////////////////// //////////////////////group/////////////////////
//Actively join the group //Actively join the group
message MemberEnterTips{ message MemberEnterTips{
GroupInfo Group = 1; GroupInfo group = 1;
GroupMemberFullInfo EntrantUser = 2; GroupMemberFullInfo entrantUser = 2;
int64 OperationTime = 3; int64 operationTime = 3;
} }
//Actively leave the group //Actively leave the group
message MemberLeaveTips{ message MemberLeaveTips{
GroupInfo Group = 1; GroupInfo group = 1;
GroupMemberFullInfo LeaverUser = 2; GroupMemberFullInfo leaverUser = 2;
int64 OperationTime = 3; int64 operationTime = 3;
} }
message MemberInvitedTips{ message MemberInvitedTips{
GroupInfo Group = 1; GroupInfo group = 1;
GroupMemberFullInfo OpUser = 2; GroupMemberFullInfo opUser = 2;
repeated GroupMemberFullInfo InvitedUserList = 3; repeated GroupMemberFullInfo invitedUserList = 3;
int64 OperationTime = 4; int64 operationTime = 4;
} }
message MemberKickedTips{ message MemberKickedTips{
GroupInfo Group = 1; GroupInfo group = 1;
GroupMemberFullInfo OpUser = 2; GroupMemberFullInfo opUser = 2;
repeated GroupMemberFullInfo KickedUserList = 3; repeated GroupMemberFullInfo kickedUserList = 3;
int64 OperationTime = 4; int64 operationTime = 4;
} }
message MemberInfoChangedTips{ message MemberInfoChangedTips{
int32 ChangeType = 1; ///bitwise operators 0001:member info changed; 0010:mute ; int32 changeType = 1; ///bitwise operators 0001:member info changed; 0010:mute ;
GroupMemberFullInfo OpUser = 2; //who do this GroupMemberFullInfo opUser = 2; //who do this
GroupMemberFullInfo FinalInfo = 3; // GroupMemberFullInfo finalInfo = 3; //
int64 MuteTime = 4; int64 muteTime = 4;
GroupInfo Group = 5; GroupInfo group = 5;
} }
message GroupCreatedTips{ message GroupCreatedTips{
GroupInfo Group = 1; GroupInfo group = 1;
GroupMemberFullInfo Creator = 2; GroupMemberFullInfo creator = 2;
repeated GroupMemberFullInfo MemberList = 3; repeated GroupMemberFullInfo memberList = 3;
int64 OperationTime = 4; int64 operationTime = 4;
} }
message GroupInfoChangedTips{ message GroupInfoChangedTips{
int32 ChangedType = 1; //bitwise operators: 0001:groupName; 0010:Notification 0100:Introduction; 1000:FaceUrl int32 changedType = 1; //bitwise operators: 0001:groupName; 0010:Notification 0100:Introduction; 1000:FaceUrl
GroupInfo Group = 2; GroupInfo group = 2;
GroupMemberFullInfo OpUser = 3; GroupMemberFullInfo opUser = 3;
} }
message JoinGroupApplicationTips{ message JoinGroupApplicationTips{
GroupInfo Group = 1; GroupInfo group = 1;
PublicUserInfo Applicant = 2; PublicUserInfo applicant = 2;
string Reason = 3; string reason = 3;
} }
message ApplicationProcessedTips{ message ApplicationProcessedTips{
GroupInfo Group = 1; GroupInfo group = 1;
GroupMemberFullInfo OpUser = 2; GroupMemberFullInfo opUser = 2;
int32 Result = 3; int32 result = 3;
string Reason = 4; string reason = 4;
} }
//////////////////////friend///////////////////// //////////////////////friend/////////////////////
@ -288,53 +288,53 @@ message ApplicationProcessedTips{
//} //}
message FriendApplication{ message FriendApplication{
int64 AddTime = 1; int64 addTime = 1;
string AddSource = 2; string addSource = 2;
string AddWording = 3; string addWording = 3;
} }
message FromToUserID{ message FromToUserID{
string FromUserID = 1; string fromUserID = 1;
string ToUserID = 2; string toUserID = 2;
} }
//FromUserID apply to add ToUserID //FromUserID apply to add ToUserID
message FriendApplicationAddedTips{ message FriendApplicationAddedTips{
FromToUserID FromToUserID = 1; FromToUserID fromToUserID = 1;
} }
//FromUserID accept or reject ToUserID //FromUserID accept or reject ToUserID
message FriendApplicationProcessedTips{ message FriendApplicationProcessedTips{
FromToUserID FromToUserID = 1; FromToUserID fromToUserID = 1;
} }
// FromUserID Added a friend ToUserID // FromUserID Added a friend ToUserID
message FriendAddedTips{ message FriendAddedTips{
FriendInfo Friend = 1; FriendInfo friend = 1;
int64 OperationTime = 2; int64 operationTime = 2;
PublicUserInfo OpUser = 3; //who do this PublicUserInfo opUser = 3; //who do this
} }
// FromUserID deleted a friend ToUserID // FromUserID deleted a friend ToUserID
message FriendDeletedTips{ message FriendDeletedTips{
FromToUserID FromToUserID = 1; FromToUserID fromToUserID = 1;
} }
message BlackAddedTips{ message BlackAddedTips{
FromToUserID FromToUserID = 1; FromToUserID fromToUserID = 1;
} }
message BlackDeletedTips{ message BlackDeletedTips{
FromToUserID FromToUserID = 1; FromToUserID fromToUserID = 1;
} }
message FriendInfoChangedTips{ message FriendInfoChangedTips{
FromToUserID FromToUserID = 1; FromToUserID fromToUserID = 1;
} }
//////////////////////user///////////////////// //////////////////////user/////////////////////
message SelfInfoUpdatedTips{ message SelfInfoUpdatedTips{
string UserID = 1; string userID = 1;
} }

Write Preview
Loading…
Cancel
Save