Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
zhaominxu
Open-IM-Server
提交
aae68749
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,发现更多精彩内容 >>
提交
aae68749
编写于
11月 15, 2021
作者:
programor_guo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
null pointer fix
上级
6dacf233
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
4 deletion
+14
-4
internal/api/friend/add_friend.go
internal/api/friend/add_friend.go
+5
-1
internal/api/manage/management_user.go
internal/api/manage/management_user.go
+5
-1
internal/rpc/user/management_user.go
internal/rpc/user/management_user.go
+4
-2
未找到文件。
internal/api/friend/add_friend.go
浏览文件 @
aae68749
...
...
@@ -48,8 +48,12 @@ func ImportFriend(c *gin.Context) {
c
.
JSON
(
http
.
StatusInternalServerError
,
gin
.
H
{
"errCode"
:
500
,
"errMsg"
:
"cImportFriend failed "
+
err
.
Error
()})
return
}
failedUidList
:=
make
([]
string
,
0
)
for
_
,
v
:=
range
RpcResp
.
FailedUidList
{
failedUidList
=
append
(
failedUidList
,
v
)
}
log
.
NewDebug
(
req
.
OperationID
,
"rpc importFriend success"
,
RpcResp
.
CommonResp
.
ErrorMsg
,
RpcResp
.
CommonResp
.
ErrorCode
,
RpcResp
.
FailedUidList
)
c
.
JSON
(
http
.
StatusOK
,
gin
.
H
{
"errCode"
:
RpcResp
.
CommonResp
.
ErrorCode
,
"errMsg"
:
RpcResp
.
CommonResp
.
ErrorMsg
,
"failedUidList"
:
RpcResp
.
F
ailedUidList
})
c
.
JSON
(
http
.
StatusOK
,
gin
.
H
{
"errCode"
:
RpcResp
.
CommonResp
.
ErrorCode
,
"errMsg"
:
RpcResp
.
CommonResp
.
ErrorMsg
,
"failedUidList"
:
f
ailedUidList
})
}
func
AddFriend
(
c
*
gin
.
Context
)
{
...
...
internal/api/manage/management_user.go
浏览文件 @
aae68749
...
...
@@ -43,10 +43,14 @@ func DeleteUser(c *gin.Context) {
}
RpcResp
,
err
:=
client
.
DeleteUsers
(
context
.
Background
(),
req
)
if
err
!=
nil
{
log
.
NewError
(
req
.
OperationID
,
"call delete users rpc server failed"
,
err
.
Error
())
c
.
JSON
(
http
.
StatusInternalServerError
,
gin
.
H
{
"errCode"
:
500
,
"errMsg"
:
"call delete users rpc server failed"
})
return
}
failedUidList
:=
make
([]
string
,
0
)
for
_
,
v
:=
range
RpcResp
.
FailedUidList
{
failedUidList
=
append
(
failedUidList
,
v
)
}
log
.
InfoByKv
(
"call delete user rpc server is success"
,
params
.
OperationID
,
"resp args"
,
RpcResp
.
String
())
resp
:=
gin
.
H
{
"errCode"
:
RpcResp
.
CommonResp
.
ErrorCode
,
"errMsg"
:
RpcResp
.
CommonResp
.
ErrorMsg
,
"failedUidList"
:
RpcResp
.
FailedUidList
}
c
.
JSON
(
http
.
StatusOK
,
resp
)
...
...
internal/rpc/user/management_user.go
浏览文件 @
aae68749
...
...
@@ -18,6 +18,7 @@ import (
func
(
s
*
userServer
)
DeleteUsers
(
_
context
.
Context
,
req
*
pbUser
.
DeleteUsersReq
)
(
*
pbUser
.
DeleteUsersResp
,
error
)
{
log
.
InfoByKv
(
"rpc DeleteUsers arrived server"
,
req
.
OperationID
,
"args"
,
req
.
String
())
var
resp
pbUser
.
DeleteUsersResp
var
common
pbUser
.
CommonResp
c
,
err
:=
utils
.
ParseToken
(
req
.
Token
)
if
err
!=
nil
{
log
.
ErrorByKv
(
"parse token failed"
,
req
.
OperationID
,
"err"
,
err
.
Error
())
...
...
@@ -30,11 +31,12 @@ func (s *userServer) DeleteUsers(_ context.Context, req *pbUser.DeleteUsersReq)
for
_
,
uid
:=
range
req
.
DeleteUidList
{
err
=
im_mysql_model
.
UserDelete
(
uid
)
if
err
!=
nil
{
resp
.
CommonResp
.
ErrorCode
=
201
resp
.
CommonResp
.
ErrorMsg
=
"some uid deleted failed"
common
.
ErrorCode
=
201
common
.
ErrorMsg
=
"some uid deleted failed"
resp
.
FailedUidList
=
append
(
resp
.
FailedUidList
,
uid
)
}
}
resp
.
CommonResp
=
&
common
return
&
resp
,
nil
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录