From b6380a17ce42f2612666ba0e1cf231458448a41b Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 18 Jan 2022 18:39:27 +0800 Subject: [PATCH 1/7] ws send msg modify --- internal/api/auth/auth.go | 1 - pkg/base_info/group_api_struct.go | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 76effddf2..85d427fb8 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -78,7 +78,6 @@ func UserToken(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) return } - 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}} log.NewInfo(req.OperationID, "UserRegister return ", resp) diff --git a/pkg/base_info/group_api_struct.go b/pkg/base_info/group_api_struct.go index 01ba3da84..f5f4e7018 100644 --- a/pkg/base_info/group_api_struct.go +++ b/pkg/base_info/group_api_struct.go @@ -48,6 +48,10 @@ type InviteUserToGroupResp struct { UserIDResultList []*UserIDResult `json:"data"` } +//type GetJoinedGroupListReq struct { +// OperationID string `json:"operationID" binding:"required"` +// FromUserID string `json:"fromUserID" binding:"required"` +//} type GetJoinedGroupListReq struct { OperationID string `json:"operationID" binding:"required"` FromUserID string `json:"fromUserID" binding:"required"` From 757b296fd0a0b084a89c6e7db06cae2e92c2c23f Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 19 Jan 2022 11:47:40 +0800 Subject: [PATCH 2/7] model length add --- pkg/common/db/model_struct.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/common/db/model_struct.go b/pkg/common/db/model_struct.go index 7cb768cd4..8dd0ab3a2 100644 --- a/pkg/common/db/model_struct.go +++ b/pkg/common/db/model_struct.go @@ -116,8 +116,8 @@ type GroupRequest struct { UserID string `gorm:"column:user_id;primary_key;size:64"` GroupID string `gorm:"column:group_id;primary_key;size:64"` HandleResult int32 `gorm:"column:handle_result"` - ReqMsg string `gorm:"column:req_msg;size:255"` - HandledMsg string `gorm:"column:handle_msg;size:255"` + ReqMsg string `gorm:"column:req_msg;size:1024"` + HandledMsg string `gorm:"column:handle_msg;size:1024"` ReqTime time.Time `gorm:"column:req_time"` HandleUserID string `gorm:"column:handle_user_id;size:64"` HandledTime time.Time `gorm:"column:handle_time"` From de5243927654e1e67d22121e581e965ce66ce8db Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 19 Jan 2022 11:49:01 +0800 Subject: [PATCH 3/7] model length add --- pkg/base_info/group_api_struct.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkg/base_info/group_api_struct.go b/pkg/base_info/group_api_struct.go index f5f4e7018..01ba3da84 100644 --- a/pkg/base_info/group_api_struct.go +++ b/pkg/base_info/group_api_struct.go @@ -48,10 +48,6 @@ type InviteUserToGroupResp struct { UserIDResultList []*UserIDResult `json:"data"` } -//type GetJoinedGroupListReq struct { -// OperationID string `json:"operationID" binding:"required"` -// FromUserID string `json:"fromUserID" binding:"required"` -//} type GetJoinedGroupListReq struct { OperationID string `json:"operationID" binding:"required"` FromUserID string `json:"fromUserID" binding:"required"` From 1a0f626a809f493ff2547346438b1dfa19678558 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 19 Jan 2022 12:31:28 +0800 Subject: [PATCH 4/7] model length add --- pkg/common/db/mysql.go | 70 +++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/pkg/common/db/mysql.go b/pkg/common/db/mysql.go index 3a26ca88f..d87a8ec61 100644 --- a/pkg/common/db/mysql.go +++ b/pkg/common/db/mysql.go @@ -60,41 +60,41 @@ func initMysqlDB() { &GroupRequest{}, &User{}, &Black{}) - - if !db.HasTable(&Friend{}) { - log.NewInfo("CreateTable Friend") - db.CreateTable(&Friend{}) - } - - if !db.HasTable(&FriendRequest{}) { - log.NewInfo("CreateTable FriendRequest") - db.CreateTable(&FriendRequest{}) - } - - if !db.HasTable(&Group{}) { - log.NewInfo("CreateTable Group") - db.CreateTable(&Group{}) - } - - if !db.HasTable(&GroupMember{}) { - log.NewInfo("CreateTable GroupMember") - db.CreateTable(&GroupMember{}) - } - - if !db.HasTable(&GroupRequest{}) { - log.NewInfo("CreateTable GroupRequest") - db.CreateTable(&GroupRequest{}) - } - - if !db.HasTable(&User{}) { - log.NewInfo("CreateTable User") - db.CreateTable(&User{}) - } - - if !db.HasTable(&Black{}) { - log.NewInfo("CreateTable Black") - db.CreateTable(&Black{}) - } + // + //if !db.HasTable(&Friend{}) { + // log.NewInfo("CreateTable Friend") + // db.CreateTable(&Friend{}) + //} + // + //if !db.HasTable(&FriendRequest{}) { + // log.NewInfo("CreateTable FriendRequest") + // db.CreateTable(&FriendRequest{}) + //} + // + //if !db.HasTable(&Group{}) { + // log.NewInfo("CreateTable Group") + // db.CreateTable(&Group{}) + //} + // + //if !db.HasTable(&GroupMember{}) { + // log.NewInfo("CreateTable GroupMember") + // db.CreateTable(&GroupMember{}) + //} + // + //if !db.HasTable(&GroupRequest{}) { + // log.NewInfo("CreateTable GroupRequest") + // db.CreateTable(&GroupRequest{}) + //} + // + //if !db.HasTable(&User{}) { + // log.NewInfo("CreateTable User") + // db.CreateTable(&User{}) + //} + // + //if !db.HasTable(&Black{}) { + // log.NewInfo("CreateTable Black") + // db.CreateTable(&Black{}) + //} return From ca0f095d6b0a4f4069e0a32f2f2dbafd365812d6 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 19 Jan 2022 14:00:25 +0800 Subject: [PATCH 5/7] db charset set utf-8 --- pkg/common/db/mysql.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/mysql.go b/pkg/common/db/mysql.go index d87a8ec61..24f1eb20a 100644 --- a/pkg/common/db/mysql.go +++ b/pkg/common/db/mysql.go @@ -52,7 +52,7 @@ func initMysqlDB() { } log.NewInfo("open db ok ", dsn) - + db.Set("gorm:table_options", "CHARSET=utf8") db.AutoMigrate(&Friend{}, &FriendRequest{}, &Group{}, From 544e60eb6d48c9f2fcd58109ac98136e609ce6c6 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 19 Jan 2022 14:45:23 +0800 Subject: [PATCH 6/7] nil modify --- internal/rpc/msg/friend_notification.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/rpc/msg/friend_notification.go b/internal/rpc/msg/friend_notification.go index e44bc0ff0..b0377c854 100644 --- a/internal/rpc/msg/friend_notification.go +++ b/internal/rpc/msg/friend_notification.go @@ -101,6 +101,7 @@ func FriendApplicationRejectedNotification(req *pbFriend.AddFriendResponseReq) { } func FriendAddedNotification(operationID, opUserID, fromUserID, toUserID string) { + return friendAddedTips := open_im_sdk.FriendAddedTips{Friend: &open_im_sdk.FriendInfo{}, OpUser: &open_im_sdk.PublicUserInfo{}} user, err := imdb.GetUserByUserID(opUserID) if err != nil { From d2b411ecbb6917b26407e584f3813ccb32e89356 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 19 Jan 2022 14:50:36 +0800 Subject: [PATCH 7/7] nil modify --- pkg/common/db/mysql.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/common/db/mysql.go b/pkg/common/db/mysql.go index 24f1eb20a..9731a1716 100644 --- a/pkg/common/db/mysql.go +++ b/pkg/common/db/mysql.go @@ -52,7 +52,6 @@ func initMysqlDB() { } log.NewInfo("open db ok ", dsn) - db.Set("gorm:table_options", "CHARSET=utf8") db.AutoMigrate(&Friend{}, &FriendRequest{}, &Group{}, @@ -60,6 +59,8 @@ func initMysqlDB() { &GroupRequest{}, &User{}, &Black{}) + db.Set("gorm:table_options", "CHARSET=utf8") + // //if !db.HasTable(&Friend{}) { // log.NewInfo("CreateTable Friend")