mirror of
https://github.com/openimsdk/open-im-server.git
synced 2025-04-06 04:15:46 +08:00
Refactor code
This commit is contained in:
parent
ab5faec68c
commit
c8d803b559
@ -168,23 +168,6 @@ func GetGroupAllMemberList(c *gin.Context) {
|
||||
memberListResp.MemberList = []*open_im_sdk.GroupMemberFullInfo{}
|
||||
}
|
||||
|
||||
//jsm := &jsonpb.Marshaler{
|
||||
// OrigName: true,
|
||||
// EnumsAsInts: false,
|
||||
// EmitDefaults: true,
|
||||
//}
|
||||
//
|
||||
//if len(memberListResp.MemberList) > 0 {
|
||||
// for _, v := range memberListResp.MemberList {
|
||||
// s, err := jsm.MarshalToString(v)
|
||||
// log.NewDebug(req.OperationID, "MarshalToString ", s, err)
|
||||
// m := ProtoToMap(memberListResp.MemberList[0], false)
|
||||
// log.NewDebug(req.OperationID, "mmm ", m)
|
||||
// memberListResp.Test = append(memberListResp.Test, m)
|
||||
// }
|
||||
//
|
||||
//}
|
||||
|
||||
memberListResp.Test = jsonData.JsonDataList(memberListResp.MemberList)
|
||||
|
||||
log.NewInfo(req.OperationID, "GetGroupAllMember api return ", memberListResp)
|
||||
|
@ -4,11 +4,21 @@ import (
|
||||
"encoding/json"
|
||||
"github.com/golang/protobuf/jsonpb"
|
||||
"github.com/golang/protobuf/proto"
|
||||
"reflect"
|
||||
)
|
||||
|
||||
func JsonDataList(resp ...interface{}) []map[string]interface{} {
|
||||
func JsonDataList(resp interface{}) []map[string]interface{} {
|
||||
var list []proto.Message
|
||||
if reflect.TypeOf(resp).Kind() == reflect.Slice {
|
||||
s := reflect.ValueOf(resp)
|
||||
for i := 0; i < s.Len(); i++ {
|
||||
ele := s.Index(i)
|
||||
list = append(list, ele.Interface().(proto.Message))
|
||||
}
|
||||
}
|
||||
|
||||
result := make([]map[string]interface{}, 0)
|
||||
for _, v := range resp[0].([]proto.Message) {
|
||||
for _, v := range list {
|
||||
m := ProtoToMap(v, false)
|
||||
result = append(result, m)
|
||||
}
|
||||
|
@ -70,7 +70,8 @@ type GetGroupAllMemberReq struct {
|
||||
type GetGroupAllMemberResp struct {
|
||||
CommResp
|
||||
MemberList []*open_im_sdk.GroupMemberFullInfo
|
||||
Test []map[string]interface{} `json:"data"`
|
||||
|
||||
Test []map[string]interface{} `json:"data"`
|
||||
}
|
||||
|
||||
type CreateGroupReq struct {
|
||||
|
Loading…
x
Reference in New Issue
Block a user