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

pkg/base_info/group_api_struct.go

@@ -45,7 +45,7 @@ type InviteUserToGroupReq struct {
 }
 type InviteUserToGroupResp struct {
 	CommResp
-	UserIDResultList []UserIDResult `json:"data"`
+	UserIDResultList []*UserIDResult `json:"data"`
 }
 
 type GetJoinedGroupListReq struct {

pkg/base_info/user_api_struct.go

@@ -4,17 +4,17 @@ import (
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
 )
 
-type GetUserInfoReq struct {
+type GetUsersInfoReq struct {
 	OperationID string   `json:"operationID" binding:"required"`
 	UserIDList  []string `json:"userIDList" binding:"required"`
 }
-type GetUserInfoResp struct {
+type GetUsersInfoResp struct {
 	CommResp
-	UserInfoList []*open_im_sdk.UserInfo  `json:"-"`
+	UserInfoList []*open_im_sdk.PublicUserInfo
 	Data         []map[string]interface{} `json:"data"`
 }
 
-type UpdateUserInfoReq struct {
+type UpdateSelfUserInfoReq struct {
 	UserInfo
 	OperationID string `json:"operationID" binding:"required"`
 }
@@ -22,3 +22,13 @@ type UpdateUserInfoReq struct {
 type UpdateUserInfoResp struct {
 	CommResp
 }
+
+type GetSelfUserInfoReq struct {
+	OperationID string `json:"operationID" binding:"required"`
+	UserID      string `json:"userID" binding:"required"`
+}
+type GetSelfUserInfoResp struct {
+	CommResp
+	UserInfoList *open_im_sdk.UserInfo    `json:"-"`
+	Data         []map[string]interface{} `json:"data"`
+}

pkg/common/db/mysql_model/im_mysql_model/group_member_model.go

@@ -92,7 +92,7 @@ func DeleteGroupMemberByGroupIDAndUserID(groupID, userID string) error {
 	if err != nil {
 		return err
 	}
-	err = dbConn.Table("group_members").Where("group_id=? and user_id=? ", groupID, userID).Delete(&db.GroupMember{}).Error
+	err = dbConn.Table("group_members").Where("group_id=? and user_id=? ", groupID, userID).Delete(db.GroupMember{}).Error
 	if err != nil {
 		return err
 	}

pkg/common/db/mysql_model/im_mysql_model/group_request_model.go

@@ -66,7 +66,7 @@ func DelGroupRequestByGroupIDAndUserID(groupID, userID string) error {
 	if err != nil {
 		return err
 	}
-	err = dbConn.Table("group_requests").Where("group_id=? and user_id=?", groupID, userID).Delete(&db.GroupRequest{}).Error
+	err = dbConn.Table("group_requests").Where("group_id=? and user_id=?", groupID, userID).Delete(db.GroupRequest{}).Error
 	if err != nil {
 		return err
 	}