diff --git a/cmd/open_im_api/main.go b/cmd/open_im_api/main.go index 773b8be7d..528ddd876 100644 --- a/cmd/open_im_api/main.go +++ b/cmd/open_im_api/main.go @@ -31,9 +31,9 @@ func main() { friendRouterGroup := r.Group("/friend") { // friendRouterGroup.POST("/get_friends_info", friend.GetFriendsInfo) - friendRouterGroup.POST("/add_friend", friend.AddFriend) + friendRouterGroup.POST("/add_friend", friend.AddFriend) //1 friendRouterGroup.POST("/get_friend_apply_list", friend.GetFriendApplyList) - friendRouterGroup.POST("/get_self_apply_list", friend.GetSelfApplyList) + friendRouterGroup.POST("/get_self_apply_list", friend.GetSelfApplyList) //1 friendRouterGroup.POST("/get_friend_list", friend.GetFriendList) friendRouterGroup.POST("/add_blacklist", friend.AddBlacklist) friendRouterGroup.POST("/get_blacklist", friend.GetBlacklist) diff --git a/internal/api/friend/friend.go b/internal/api/friend/friend.go index 94a899c8c..dc5115ed3 100644 --- a/internal/api/friend/friend.go +++ b/internal/api/friend/friend.go @@ -118,7 +118,7 @@ func AddFriendResponse(c *gin.Context) { return } req := &rpc.AddFriendResponseReq{CommID: &rpc.CommID{}} - utils.CopyStructFields(req.CommID, ¶ms) + utils.CopyStructFields(req.CommID, ¶ms.ParamsCommFriend) var ok bool ok, req.CommID.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token")) if !ok { @@ -151,7 +151,7 @@ func DeleteFriend(c *gin.Context) { return } req := &rpc.DeleteFriendReq{CommID: &rpc.CommID{}} - utils.CopyStructFields(req.CommID, ¶ms) + utils.CopyStructFields(req.CommID, ¶ms.ParamsCommFriend) var ok bool ok, req.CommID.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token")) if !ok { @@ -183,7 +183,7 @@ func GetBlacklist(c *gin.Context) { return } req := &rpc.GetBlacklistReq{CommID: &rpc.CommID{}} - utils.CopyStructFields(req.CommID, ¶ms) + utils.CopyStructFields(req.CommID, ¶ms.ParamsCommFriend) var ok bool ok, req.CommID.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token")) if !ok { @@ -220,7 +220,7 @@ func SetFriendComment(c *gin.Context) { return } req := &rpc.SetFriendCommentReq{CommID: &rpc.CommID{}} - utils.CopyStructFields(req.CommID, ¶ms) + utils.CopyStructFields(req.CommID, ¶ms.ParamsCommFriend) req.Remark = params.Remark var ok bool ok, req.CommID.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token")) @@ -253,7 +253,7 @@ func RemoveBlacklist(c *gin.Context) { return } req := &rpc.RemoveBlacklistReq{CommID: &rpc.CommID{}} - utils.CopyStructFields(req.CommID, ¶ms) + utils.CopyStructFields(req.CommID, ¶ms.ParamsCommFriend) var ok bool ok, req.CommID.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token")) if !ok { @@ -284,7 +284,7 @@ func IsFriend(c *gin.Context) { return } req := &rpc.IsFriendReq{CommID: &rpc.CommID{}} - utils.CopyStructFields(req.CommID, ¶ms) + utils.CopyStructFields(req.CommID, ¶ms.ParamsCommFriend) var ok bool ok, req.CommID.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token")) if !ok { @@ -349,7 +349,7 @@ func GetFriendList(c *gin.Context) { return } req := &rpc.GetFriendListReq{CommID: &rpc.CommID{}} - utils.CopyStructFields(req.CommID, ¶ms) + utils.CopyStructFields(req.CommID, ¶ms.ParamsCommFriend) var ok bool ok, req.CommID.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token")) if !ok { @@ -381,7 +381,7 @@ func GetFriendApplyList(c *gin.Context) { return } req := &rpc.GetFriendApplyListReq{CommID: &rpc.CommID{}} - utils.CopyStructFields(req.CommID, ¶ms) + utils.CopyStructFields(req.CommID, ¶ms.ParamsCommFriend) var ok bool ok, req.CommID.OpUserID = token_verify.GetUserIDFromToken(c.Request.Header.Get("token")) if !ok { diff --git a/pkg/base_info/friend_api_struct.go b/pkg/base_info/friend_api_struct.go index c0a5d3673..d9e5fbe59 100644 --- a/pkg/base_info/friend_api_struct.go +++ b/pkg/base_info/friend_api_struct.go @@ -116,7 +116,8 @@ type GetFriendApplyListResp struct { } type GetSelfApplyListReq struct { - ParamsCommFriend + OperationID string `json:"operationID" binding:"required"` + FromUserID string `json:"fromUserID" binding:"required"` } type GetSelfApplyListResp struct { CommResp diff --git a/pkg/common/db/mysql_model/im_mysql_model/model_struct.go b/pkg/common/db/mysql_model/im_mysql_model/model_struct.go index ae2d9dc43..29125d813 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/model_struct.go +++ b/pkg/common/db/mysql_model/im_mysql_model/model_struct.go @@ -95,7 +95,7 @@ type GroupMember struct { JoinTime time.Time `gorm:"column:join_time"` Nickname string `gorm:"column:nickname"` FaceUrl string `gorm:"user_group_face_url"` - JoinSource time.Time `gorm:"column:join_source"` + JoinSource int32 `gorm:"column:join_source"` OperatorUserID string `gorm:"column:operator_user_id"` Ex string `gorm:"column:ex"` }