From 9da4da5fd6ee78beeba50c470b32844965f6ca5a Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 28 Jun 2022 15:25:26 +0800 Subject: [PATCH 1/6] debug --- cmd/Open-IM-SDK-Core | 2 +- cmd/open_im_demo/main.go | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cmd/Open-IM-SDK-Core b/cmd/Open-IM-SDK-Core index 6fc6be9eb..588c9bb77 160000 --- a/cmd/Open-IM-SDK-Core +++ b/cmd/Open-IM-SDK-Core @@ -1 +1 @@ -Subproject commit 6fc6be9eb996aec24781a3905aeb2c9550a5a041 +Subproject commit 588c9bb77b9bd89a9261964006568b8655233cb6 diff --git a/cmd/open_im_demo/main.go b/cmd/open_im_demo/main.go index 418d578a6..71d3e114c 100644 --- a/cmd/open_im_demo/main.go +++ b/cmd/open_im_demo/main.go @@ -32,6 +32,14 @@ func main() { authRouterGroup.POST("/login", register.Login) authRouterGroup.POST("/reset_password", register.ResetPassword) } + demoRouterGroup := r.Group("/auth") + { + demoRouterGroup.POST("/code", register.SendVerificationCode) + demoRouterGroup.POST("/verify", register.Verify) + demoRouterGroup.POST("/password", register.SetPassword) + demoRouterGroup.POST("/login", register.Login) + demoRouterGroup.POST("/reset_password", register.ResetPassword) + } defaultPorts := config.Config.Demo.Port ginPort := flag.Int("port", defaultPorts[0], "get ginServerPort from cmd,default 42233 as port") flag.Parse() From 5102f8329089ac7a43ffc417a0e26830b042d68e Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 28 Jun 2022 15:25:46 +0800 Subject: [PATCH 2/6] debug --- internal/api/group/group.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/api/group/group.go b/internal/api/group/group.go index d8bf2f5aa..0ce8950db 100644 --- a/internal/api/group/group.go +++ b/internal/api/group/group.go @@ -608,6 +608,7 @@ func SetGroupInfo(c *gin.Context) { if params.NeedVerification != nil { req.GroupInfo.NeedVerification = &wrappers.Int32Value{Value: *params.NeedVerification} + log.NewInfo(req.OperationID, "NeedVerification ", req.GroupInfo.NeedVerification) } var ok bool From 722b5d0726e4cf301c1c35934ec04e860c8ff604 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 28 Jun 2022 15:47:55 +0800 Subject: [PATCH 3/6] debug --- internal/rpc/group/group.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index eec4a71b4..171e82829 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -18,6 +18,7 @@ import ( pbUser "Open_IM/pkg/proto/user" "Open_IM/pkg/utils" "context" + "github.com/golang/protobuf/ptypes/wrappers" "google.golang.org/grpc" "math/big" "net" @@ -737,11 +738,13 @@ func (s *groupServer) GetGroupsInfo(ctx context.Context, req *pbGroup.GetGroupsI } var groupInfo open_im_sdk.GroupInfo cp.GroupDBCopyOpenIM(&groupInfo, groupInfoFromMysql) + //groupInfo.NeedVerification + groupInfo.NeedVerification = &wrappers.Int32Value{Value: groupInfoFromMysql.NeedVerification} groupsInfoList = append(groupsInfoList, &groupInfo) } resp := pbGroup.GetGroupsInfoResp{GroupInfoList: groupsInfoList} - log.NewInfo(req.OperationID, "GetGroupsInfo rpc return ", resp.String()) + log.NewInfo(req.OperationID, "GetGroupsInfo rpc return ", resp.String()) return &resp, nil } From de32c46ea4f40b0f3cf7884a5c7309f3a5a4709b Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 28 Jun 2022 15:54:27 +0800 Subject: [PATCH 4/6] debug --- internal/api/group/group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/group/group.go b/internal/api/group/group.go index 0ce8950db..943e0fc96 100644 --- a/internal/api/group/group.go +++ b/internal/api/group/group.go @@ -423,8 +423,8 @@ func GetUserReqGroupApplicationList(c *gin.Context) { } log.NewInfo(req.OperationID, RpcResp) resp := api.GetGroupApplicationListResp{CommResp: api.CommResp{ErrCode: RpcResp.CommonResp.ErrCode, ErrMsg: RpcResp.CommonResp.ErrMsg}, GroupRequestList: RpcResp.GroupRequestList} - log.NewInfo(req.OperationID, "GetGroupApplicationList api return ", resp) resp.Data = jsonData.JsonDataList(resp.GroupRequestList) + log.NewInfo(req.OperationID, "GetGroupApplicationList api return ", resp) c.JSON(http.StatusOK, resp) } From 3e630a3882a0f53aec4c6cadd4873439a21e5150 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 28 Jun 2022 17:23:20 +0800 Subject: [PATCH 5/6] fix bug --- internal/api/group/group.go | 15 ++++++++++++++- pkg/base_info/group_api_struct.go | 17 ++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/internal/api/group/group.go b/internal/api/group/group.go index 943e0fc96..6f230c847 100644 --- a/internal/api/group/group.go +++ b/internal/api/group/group.go @@ -464,12 +464,25 @@ func GetGroupsInfo(c *gin.Context) { return } - resp := api.GetGroupInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, GroupInfoList: RpcResp.GroupInfoList} + resp := api.GetGroupInfoResp{CommResp: api.CommResp{ErrCode: RpcResp.ErrCode, ErrMsg: RpcResp.ErrMsg}, GroupInfoList: transferGroupInfo(RpcResp.GroupInfoList)} resp.Data = jsonData.JsonDataList(resp.GroupInfoList) log.NewInfo(req.OperationID, "GetGroupsInfo api return ", resp) c.JSON(http.StatusOK, resp) } +func transferGroupInfo(input []*open_im_sdk.GroupInfo) []*api.GroupInfoAlias { + var result []*api.GroupInfoAlias + for _, v := range input { + t := &api.GroupInfoAlias{} + utils.CopyStructFields(t, &v) + if v.NeedVerification != nil { + t.NeedVerification = v.NeedVerification.Value + } + result = append(result, t) + } + return result +} + //process application func ApplicationGroupResponse(c *gin.Context) { params := api.ApplicationGroupResponseReq{} diff --git a/pkg/base_info/group_api_struct.go b/pkg/base_info/group_api_struct.go index 20017ef57..61cb8c72a 100644 --- a/pkg/base_info/group_api_struct.go +++ b/pkg/base_info/group_api_struct.go @@ -124,9 +124,24 @@ type GetGroupInfoReq struct { } type GetGroupInfoResp struct { CommResp - GroupInfoList []*open_im_sdk.GroupInfo `json:"-"` + GroupInfoList []*GroupInfoAlias `json:"-"` Data []map[string]interface{} `json:"data"` } +type GroupInfoAlias struct { + GroupID string `protobuf:"bytes,1,opt,name=groupID" json:"groupID,omitempty"` + GroupName string `protobuf:"bytes,2,opt,name=groupName" json:"groupName,omitempty"` + Notification string `protobuf:"bytes,3,opt,name=notification" json:"notification,omitempty"` + Introduction string `protobuf:"bytes,4,opt,name=introduction" json:"introduction,omitempty"` + FaceURL string `protobuf:"bytes,5,opt,name=faceURL" json:"faceURL,omitempty"` + OwnerUserID string `protobuf:"bytes,6,opt,name=ownerUserID" json:"ownerUserID,omitempty"` + CreateTime uint32 `protobuf:"varint,7,opt,name=createTime" json:"createTime,omitempty"` + MemberCount uint32 `protobuf:"varint,8,opt,name=memberCount" json:"memberCount,omitempty"` + Ex string `protobuf:"bytes,9,opt,name=ex" json:"ex,omitempty"` + Status int32 `protobuf:"varint,10,opt,name=status" json:"status,omitempty"` + CreatorUserID string `protobuf:"bytes,11,opt,name=creatorUserID" json:"creatorUserID,omitempty"` + GroupType int32 `protobuf:"varint,12,opt,name=groupType" json:"groupType,omitempty"` + NeedVerification int32 `protobuf:"bytes,13,opt,name=needVerification" json:"needVerification,omitempty"` +} type ApplicationGroupResponseReq struct { OperationID string `json:"operationID" binding:"required"` From 92b219769d193fd36e7abe1f1bb18292ca8175cb Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 28 Jun 2022 17:26:18 +0800 Subject: [PATCH 6/6] fix bug --- internal/api/group/super_group.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/api/group/super_group.go b/internal/api/group/super_group.go index b5c123700..9291fc8e5 100644 --- a/internal/api/group/super_group.go +++ b/internal/api/group/super_group.go @@ -81,7 +81,8 @@ func GetSuperGroupsInfo(c *gin.Context) { c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) return } - resp := api.GetSuperGroupsInfoResp{GetGroupInfoResp: api.GetGroupInfoResp{CommResp: api.CommResp{ErrCode: rpcResp.CommonResp.ErrCode, ErrMsg: rpcResp.CommonResp.ErrMsg}, GroupInfoList: rpcResp.GroupInfoList}} + + resp := api.GetSuperGroupsInfoResp{GetGroupInfoResp: api.GetGroupInfoResp{CommResp: api.CommResp{ErrCode: rpcResp.CommonResp.ErrCode, ErrMsg: rpcResp.CommonResp.ErrMsg}, GroupInfoList: transferGroupInfo(rpcResp.GroupInfoList)}} resp.Data = jsonData.JsonDataList(resp.GroupInfoList) log.NewInfo(req.OperationID, "GetGroupsInfo api return ", resp) c.JSON(http.StatusOK, resp)