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

cmd/open_im_api/main.go

@@ -51,20 +51,20 @@ func main() {
 	//group related routing group
 	groupRouterGroup := r.Group("/group")
 	{
-		groupRouterGroup.POST("/create_group", group.CreateGroup)                            //1
-		groupRouterGroup.POST("/set_group_info", group.SetGroupInfo)                         //1
-		groupRouterGroup.POST("join_group", group.JoinGroup)                                 //1
-		groupRouterGroup.POST("/quit_group", group.QuitGroup)                                //1
-		groupRouterGroup.POST("/group_application_response", group.ApplicationGroupResponse) //1
-		groupRouterGroup.POST("/transfer_group", group.TransferGroupOwner)                   //1
-		groupRouterGroup.POST("/get_group_applicationList", group.GetGroupApplicationList)   //1
-		groupRouterGroup.POST("/get_groups_info", group.GetGroupsInfo)                       //1
-		groupRouterGroup.POST("/kick_group", group.KickGroupMember)                          //1
-		groupRouterGroup.POST("/get_group_member_list", group.GetGroupMemberList)            //no use
-		groupRouterGroup.POST("/get_group_all_member_list", group.GetGroupAllMemberList)     //1
-		groupRouterGroup.POST("/get_group_members_info", group.GetGroupMembersInfo)          //1
-		groupRouterGroup.POST("/invite_user_to_group", group.InviteUserToGroup)              //1
-		groupRouterGroup.POST("/get_joined_group_list", group.GetJoinedGroupList)            //1
+		groupRouterGroup.POST("/create_group", group.CreateGroup)                                   //1
+		groupRouterGroup.POST("/set_group_info", group.SetGroupInfo)                                //1
+		groupRouterGroup.POST("join_group", group.JoinGroup)                                        //1
+		groupRouterGroup.POST("/quit_group", group.QuitGroup)                                       //1
+		groupRouterGroup.POST("/group_application_response", group.ApplicationGroupResponse)        //1
+		groupRouterGroup.POST("/transfer_group", group.TransferGroupOwner)                          //1
+		groupRouterGroup.POST("/get_recv_group_applicationList", group.GetRecvGroupApplicationList) //1
+		groupRouterGroup.POST("/get_groups_info", group.GetGroupsInfo)                              //1
+		groupRouterGroup.POST("/kick_group", group.KickGroupMember)                                 //1
+		groupRouterGroup.POST("/get_group_member_list", group.GetGroupMemberList)                   //no use
+		groupRouterGroup.POST("/get_group_all_member_list", group.GetGroupAllMemberList)            //1
+		groupRouterGroup.POST("/get_group_members_info", group.GetGroupMembersInfo)                 //1
+		groupRouterGroup.POST("/invite_user_to_group", group.InviteUserToGroup)                     //1
+		groupRouterGroup.POST("/get_joined_group_list", group.GetJoinedGroupList)                   //1
 	}
 	//certificate
 	authRouterGroup := r.Group("/auth")

internal/api/group/group.go

@@ -281,7 +281,7 @@ func CreateGroup(c *gin.Context) {
 }
 
 //  群主或管理员收到的
-func GetGroupApplicationList(c *gin.Context) {
+func GetRecvGroupApplicationList(c *gin.Context) {
 	params := api.GetGroupApplicationListReq{}
 	if err := c.BindJSON(&params); err != nil {
 		log.NewError("0", "BindJSON failed ", err.Error())

internal/api/manage/management_chat.go

@@ -60,10 +60,10 @@ func newUserSendMsgReq(params *ManagementSendMsgReq) *pbChat.SendMsgReq {
 			MsgFrom:          constant.SysMsgType,
 			ContentType:      params.ContentType,
 			Content:          []byte(newContent),
-			ForceList:        params.ForceList,
-			CreateTime:       utils.GetCurrentTimestampByMill(),
-			Options:          options,
-			OfflinePushInfo:  params.OfflinePushInfo,
+			//	ForceList:        params.ForceList,
+			CreateTime:      utils.GetCurrentTimestampByMill(),
+			Options:         options,
+			OfflinePushInfo: params.OfflinePushInfo,
 		},
 	}
 	return &pbData

pkg/proto/sdk_ws/ws.proto

@@ -77,7 +77,7 @@ message BlackInfo{
 message GroupRequest{
   PublicUserInfo userInfo = 1;
   GroupInfo groupInfo = 2;
-  string handleResult = 3;
+  int32 handleResult = 3;
   string reqMsg = 4;
   string  handleMsg = 5;
   uint32 reqTime = 6;