Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
zhaominxu
Open-IM-Server
提交
0fce4c61
O
Open-IM-Server
项目概览
zhaominxu
/
Open-IM-Server
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Open-IM-Server
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0fce4c61
编写于
12月 30, 2021
作者:
W
wenxu12345
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor code
上级
e964ff0b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
63 addition
and
51 deletion
+63
-51
internal/api/group/group.go
internal/api/group/group.go
+22
-49
internal/utils/utils.go
internal/utils/utils.go
+39
-0
pkg/base_info/group_api_struct.go
pkg/base_info/group_api_struct.go
+2
-2
未找到文件。
internal/api/group/group.go
浏览文件 @
0fce4c61
...
...
@@ -10,12 +10,13 @@ import (
open_im_sdk
"Open_IM/pkg/proto/sdk_ws"
"Open_IM/pkg/utils"
"context"
"encoding/json"
"github.com/gin-gonic/gin"
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
"net/http"
"strings"
jsonData
"Open_IM/internal/utils"
)
func
KickGroupMember
(
c
*
gin
.
Context
)
{
...
...
@@ -167,56 +168,28 @@ 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
(
memberListResp
.
MemberList
)
//
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
)
c
.
JSON
(
http
.
StatusOK
,
memberListResp
)
}
func
JsonData
(
resp
interface
{})
[]
map
[
string
]
interface
{}
{
var
result
[]
map
[
string
]
interface
{}
for
_
,
v
:=
range
resp
.
([]
proto
.
Message
)
{
m
:=
ProtoToMap
(
v
.
(
proto
.
Message
),
false
)
result
=
append
(
result
,
m
)
}
return
result
}
func
ProtoToMap
(
pb
proto
.
Message
,
idFix
bool
)
map
[
string
]
interface
{}
{
marshaler
:=
jsonpb
.
Marshaler
{
OrigName
:
true
,
EnumsAsInts
:
false
,
EmitDefaults
:
true
,
}
s
,
_
:=
marshaler
.
MarshalToString
(
pb
)
out
:=
make
(
map
[
string
]
interface
{})
json
.
Unmarshal
([]
byte
(
s
),
&
out
)
if
idFix
{
if
_
,
ok
:=
out
[
"id"
];
ok
{
out
[
"_id"
]
=
out
[
"id"
]
delete
(
out
,
"id"
)
}
}
return
out
}
func
GetJoinedGroupList
(
c
*
gin
.
Context
)
{
params
:=
api
.
GetJoinedGroupListReq
{}
if
err
:=
c
.
BindJSON
(
&
params
);
err
!=
nil
{
...
...
internal/utils/utils.go
0 → 100644
浏览文件 @
0fce4c61
package
utils
import
(
"encoding/json"
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
)
func
JsonDataList
(
resp
interface
{})
[]
map
[
string
]
interface
{}
{
result
:=
make
([]
map
[
string
]
interface
{},
0
)
for
_
,
v
:=
range
resp
.
([]
proto
.
Message
)
{
m
:=
ProtoToMap
(
v
.
(
proto
.
Message
),
false
)
result
=
append
(
result
,
m
)
}
return
result
}
func
JsonDataOne
(
pb
proto
.
Message
)
map
[
string
]
interface
{}
{
return
ProtoToMap
(
pb
,
false
)
}
func
ProtoToMap
(
pb
proto
.
Message
,
idFix
bool
)
map
[
string
]
interface
{}
{
marshaler
:=
jsonpb
.
Marshaler
{
OrigName
:
true
,
EnumsAsInts
:
false
,
EmitDefaults
:
true
,
}
s
,
_
:=
marshaler
.
MarshalToString
(
pb
)
out
:=
make
(
map
[
string
]
interface
{})
json
.
Unmarshal
([]
byte
(
s
),
&
out
)
if
idFix
{
if
_
,
ok
:=
out
[
"id"
];
ok
{
out
[
"_id"
]
=
out
[
"id"
]
delete
(
out
,
"id"
)
}
}
return
out
}
pkg/base_info/group_api_struct.go
浏览文件 @
0fce4c61
...
...
@@ -69,8 +69,8 @@ type GetGroupAllMemberReq struct {
}
type
GetGroupAllMemberResp
struct
{
CommResp
MemberList
[]
*
open_im_sdk
.
GroupMemberFullInfo
`json:"data"`
Test
[]
map
[
string
]
interface
{}
`json:"data2
"`
MemberList
[]
*
open_im_sdk
.
GroupMemberFullInfo
Test
[]
map
[
string
]
interface
{}
`json:"data
"`
}
type
CreateGroupReq
struct
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录