Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
zhaominxu
Open-IM-Server
提交
aab6ad96
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,发现更多精彩内容 >>
提交
aab6ad96
编写于
12月 31, 2021
作者:
W
wenxu12345
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor code
上级
c8d803b5
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
25 deletion
+24
-25
internal/api/group/group.go
internal/api/group/group.go
+12
-18
pkg/base_info/group_api_struct.go
pkg/base_info/group_api_struct.go
+12
-7
未找到文件。
internal/api/group/group.go
浏览文件 @
aab6ad96
...
...
@@ -91,10 +91,8 @@ func GetGroupMembersInfo(c *gin.Context) {
return
}
memberListResp
:=
api
.
GetGroupMembersInfoResp
{
CommResp
:
api
.
CommResp
{
ErrCode
:
RpcResp
.
ErrCode
,
ErrMsg
:
RpcResp
.
ErrMsg
},
Data
:
RpcResp
.
MemberList
}
if
len
(
RpcResp
.
MemberList
)
==
0
{
memberListResp
.
Data
=
[]
*
open_im_sdk
.
GroupMemberFullInfo
{}
}
memberListResp
:=
api
.
GetGroupMembersInfoResp
{
CommResp
:
api
.
CommResp
{
ErrCode
:
RpcResp
.
ErrCode
,
ErrMsg
:
RpcResp
.
ErrMsg
},
MemberList
:
RpcResp
.
MemberList
}
memberListResp
.
Data
=
jsonData
.
JsonDataList
(
RpcResp
.
MemberList
)
log
.
NewInfo
(
req
.
OperationID
,
"GetGroupMembersInfo api return "
,
memberListResp
)
c
.
JSON
(
http
.
StatusOK
,
memberListResp
)
}
...
...
@@ -128,9 +126,7 @@ func GetGroupMemberList(c *gin.Context) {
}
memberListResp
:=
api
.
GetGroupMemberListResp
{
CommResp
:
api
.
CommResp
{
ErrCode
:
RpcResp
.
ErrCode
,
ErrMsg
:
RpcResp
.
ErrMsg
},
MemberList
:
RpcResp
.
MemberList
,
NextSeq
:
RpcResp
.
NextSeq
}
if
len
(
memberListResp
.
MemberList
)
==
0
{
memberListResp
.
MemberList
=
[]
*
open_im_sdk
.
GroupMemberFullInfo
{}
}
memberListResp
.
Data
=
jsonData
.
JsonDataList
(
memberListResp
.
MemberList
)
log
.
NewInfo
(
req
.
OperationID
,
"GetGroupMemberList api return "
,
memberListResp
)
c
.
JSON
(
http
.
StatusOK
,
memberListResp
)
...
...
@@ -164,12 +160,7 @@ func GetGroupAllMemberList(c *gin.Context) {
}
memberListResp
:=
api
.
GetGroupAllMemberResp
{
CommResp
:
api
.
CommResp
{
ErrCode
:
RpcResp
.
ErrCode
,
ErrMsg
:
RpcResp
.
ErrMsg
},
MemberList
:
RpcResp
.
MemberList
}
if
len
(
memberListResp
.
MemberList
)
==
0
{
memberListResp
.
MemberList
=
[]
*
open_im_sdk
.
GroupMemberFullInfo
{}
}
memberListResp
.
Test
=
jsonData
.
JsonDataList
(
memberListResp
.
MemberList
)
memberListResp
.
Data
=
jsonData
.
JsonDataList
(
memberListResp
.
MemberList
)
log
.
NewInfo
(
req
.
OperationID
,
"GetGroupAllMember api return "
,
memberListResp
)
c
.
JSON
(
http
.
StatusOK
,
memberListResp
)
}
...
...
@@ -202,11 +193,9 @@ func GetJoinedGroupList(c *gin.Context) {
}
GroupListResp
:=
api
.
GetJoinedGroupListResp
{
CommResp
:
api
.
CommResp
{
ErrCode
:
RpcResp
.
ErrCode
,
ErrMsg
:
RpcResp
.
ErrMsg
},
GroupInfoList
:
RpcResp
.
GroupList
}
if
len
(
RpcResp
.
GroupList
)
==
0
{
GroupListResp
.
GroupInfoList
=
[]
*
open_im_sdk
.
GroupInfo
{}
}
c
.
JSON
(
http
.
StatusOK
,
GroupListResp
)
GroupListResp
.
Data
=
jsonData
.
JsonDataList
(
GroupListResp
.
GroupInfoList
)
log
.
NewInfo
(
req
.
OperationID
,
"GetJoinedGroupList api return "
,
GroupListResp
)
c
.
JSON
(
http
.
StatusOK
,
GroupListResp
)
}
func
InviteUserToGroup
(
c
*
gin
.
Context
)
{
...
...
@@ -240,8 +229,13 @@ func InviteUserToGroup(c *gin.Context) {
for
_
,
v
:=
range
RpcResp
.
Id2ResultList
{
resp
.
UserIDResultList
=
append
(
resp
.
UserIDResultList
,
api
.
UserIDResult
{
UserID
:
v
.
UserID
,
Result
:
v
.
Result
})
}
c
.
JSON
(
http
.
StatusOK
,
resp
)
if
len
(
resp
.
UserIDResultList
)
==
0
{
resp
.
UserIDResultList
=
[]
api
.
UserIDResult
{}
}
log
.
NewInfo
(
req
.
OperationID
,
"InviteUserToGroup api return "
,
resp
)
c
.
JSON
(
http
.
StatusOK
,
resp
)
}
func
CreateGroup
(
c
*
gin
.
Context
)
{
...
...
pkg/base_info/group_api_struct.go
浏览文件 @
aab6ad96
...
...
@@ -28,7 +28,8 @@ type GetGroupMembersInfoReq struct {
}
type
GetGroupMembersInfoResp
struct
{
CommResp
Data
[]
*
open_im_sdk
.
GroupMemberFullInfo
`json:"data"`
MemberList
[]
*
open_im_sdk
.
GroupMemberFullInfo
Data
[]
map
[
string
]
interface
{}
`json:"data"`
}
type
InviteUserToGroupReq
struct
{
...
...
@@ -48,7 +49,8 @@ type GetJoinedGroupListReq struct {
}
type
GetJoinedGroupListResp
struct
{
CommResp
GroupInfoList
[]
*
open_im_sdk
.
GroupInfo
`json:"data"`
GroupInfoList
[]
*
open_im_sdk
.
GroupInfo
Data
[]
map
[
string
]
interface
{}
`json:"data"`
}
type
GetGroupMemberListReq
struct
{
...
...
@@ -59,8 +61,9 @@ type GetGroupMemberListReq struct {
}
type
GetGroupMemberListResp
struct
{
CommResp
NextSeq
int32
`json:"nextSeq"`
MemberList
[]
*
open_im_sdk
.
GroupMemberFullInfo
`json:"data"`
NextSeq
int32
`json:"nextSeq"`
MemberList
[]
*
open_im_sdk
.
GroupMemberFullInfo
Data
[]
map
[
string
]
interface
{}
`json:"data"`
}
type
GetGroupAllMemberReq
struct
{
...
...
@@ -71,7 +74,7 @@ type GetGroupAllMemberResp struct {
CommResp
MemberList
[]
*
open_im_sdk
.
GroupMemberFullInfo
Test
[]
map
[
string
]
interface
{}
`json:"data"`
Data
[]
map
[
string
]
interface
{}
`json:"data"`
}
type
CreateGroupReq
struct
{
...
...
@@ -93,7 +96,8 @@ type GetGroupApplicationListReq struct {
}
type
GetGroupApplicationListResp
struct
{
CommResp
GroupRequestList
[]
*
open_im_sdk
.
GroupRequest
`json:"data"`
GroupRequestList
[]
*
open_im_sdk
.
GroupRequest
Data
[]
map
[
string
]
interface
{}
`json:"data"`
}
type
GetGroupInfoReq
struct
{
...
...
@@ -102,7 +106,8 @@ type GetGroupInfoReq struct {
}
type
GetGroupInfoResp
struct
{
CommResp
GroupInfoList
[]
*
open_im_sdk
.
GroupInfo
`json:"data"`
GroupInfoList
[]
*
open_im_sdk
.
GroupInfo
Data
[]
map
[
string
]
interface
{}
`json:"data"`
}
type
ApplicationGroupResponseReq
struct
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录