blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-05-01 23:32:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wenxu12345 2022-01-19 16:11:18 +08:00
commit 14841a44ad
4 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/api/auth/auth.go
View File

@ -78,7 +78,6 @@ func UserToken(c *gin.Context) {
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()})
return return
} }
resp := api.UserTokenResp{CommResp: api.CommResp{ErrCode: reply.CommonResp.ErrCode, ErrMsg: reply.CommonResp.ErrMsg}, resp := api.UserTokenResp{CommResp: api.CommResp{ErrCode: reply.CommonResp.ErrCode, ErrMsg: reply.CommonResp.ErrMsg},
UserToken: api.UserTokenInfo{UserID: req.FromUserID, Token: reply.Token, ExpiredTime: reply.ExpiredTime}} UserToken: api.UserTokenInfo{UserID: req.FromUserID, Token: reply.Token, ExpiredTime: reply.ExpiredTime}}
log.NewInfo(req.OperationID, "UserRegister return ", resp) log.NewInfo(req.OperationID, "UserRegister return ", resp)

1
internal/rpc/msg/friend_notification.go
View File

@ -101,6 +101,7 @@ func FriendApplicationRejectedNotification(req *pbFriend.AddFriendResponseReq) {
} }
func FriendAddedNotification(operationID, opUserID, fromUserID, toUserID string) { func FriendAddedNotification(operationID, opUserID, fromUserID, toUserID string) {
return
friendAddedTips := open_im_sdk.FriendAddedTips{Friend: &open_im_sdk.FriendInfo{}, OpUser: &open_im_sdk.PublicUserInfo{}} friendAddedTips := open_im_sdk.FriendAddedTips{Friend: &open_im_sdk.FriendInfo{}, OpUser: &open_im_sdk.PublicUserInfo{}}
user, err := imdb.GetUserByUserID(opUserID) user, err := imdb.GetUserByUserID(opUserID)
if err != nil { if err != nil {

4
pkg/common/db/model_struct.go
View File

@ -116,8 +116,8 @@ type GroupRequest struct {
UserID string `gorm:"column:user_id;primary_key;size:64"` UserID string `gorm:"column:user_id;primary_key;size:64"`
GroupID string `gorm:"column:group_id;primary_key;size:64"` GroupID string `gorm:"column:group_id;primary_key;size:64"`
HandleResult int32 `gorm:"column:handle_result"` HandleResult int32 `gorm:"column:handle_result"`
ReqMsg string `gorm:"column:req_msg;size:255"` ReqMsg string `gorm:"column:req_msg;size:1024"`
HandledMsg string `gorm:"column:handle_msg;size:255"` HandledMsg string `gorm:"column:handle_msg;size:1024"`
ReqTime time.Time `gorm:"column:req_time"` ReqTime time.Time `gorm:"column:req_time"`
HandleUserID string `gorm:"column:handle_user_id;size:64"` HandleUserID string `gorm:"column:handle_user_id;size:64"`
HandledTime time.Time `gorm:"column:handle_time"` HandledTime time.Time `gorm:"column:handle_time"`

71
pkg/common/db/mysql.go
View File

@ -52,7 +52,6 @@ func initMysqlDB() {
} }
log.NewInfo("open db ok ", dsn) log.NewInfo("open db ok ", dsn)
db.AutoMigrate(&Friend{}, db.AutoMigrate(&Friend{},
&FriendRequest{}, &FriendRequest{},
&Group{}, &Group{},
@ -60,41 +59,43 @@ func initMysqlDB() {
&GroupRequest{}, &GroupRequest{},
&User{}, &User{},
&Black{}) &Black{})
db.Set("gorm:table_options", "CHARSET=utf8")
if !db.HasTable(&Friend{}) { //
log.NewInfo("CreateTable Friend") //if !db.HasTable(&Friend{}) {
db.CreateTable(&Friend{}) // log.NewInfo("CreateTable Friend")
} // db.CreateTable(&Friend{})
//}
if !db.HasTable(&FriendRequest{}) { //
log.NewInfo("CreateTable FriendRequest") //if !db.HasTable(&FriendRequest{}) {
db.CreateTable(&FriendRequest{}) // log.NewInfo("CreateTable FriendRequest")
} // db.CreateTable(&FriendRequest{})
//}
if !db.HasTable(&Group{}) { //
log.NewInfo("CreateTable Group") //if !db.HasTable(&Group{}) {
db.CreateTable(&Group{}) // log.NewInfo("CreateTable Group")
} // db.CreateTable(&Group{})
//}
if !db.HasTable(&GroupMember{}) { //
log.NewInfo("CreateTable GroupMember") //if !db.HasTable(&GroupMember{}) {
db.CreateTable(&GroupMember{}) // log.NewInfo("CreateTable GroupMember")
} // db.CreateTable(&GroupMember{})
//}
if !db.HasTable(&GroupRequest{}) { //
log.NewInfo("CreateTable GroupRequest") //if !db.HasTable(&GroupRequest{}) {
db.CreateTable(&GroupRequest{}) // log.NewInfo("CreateTable GroupRequest")
} // db.CreateTable(&GroupRequest{})
//}
if !db.HasTable(&User{}) { //
log.NewInfo("CreateTable User") //if !db.HasTable(&User{}) {
db.CreateTable(&User{}) // log.NewInfo("CreateTable User")
} // db.CreateTable(&User{})
//}
if !db.HasTable(&Black{}) { //
log.NewInfo("CreateTable Black") //if !db.HasTable(&Black{}) {
db.CreateTable(&Black{}) // log.NewInfo("CreateTable Black")
} // db.CreateTable(&Black{})
//}
return return