blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-24 02:16:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3dev' of github.com:OpenIMSDK/Open-IM-Server into v3dev

Browse Source
This commit is contained in:
wangchuxiao 2023-07-06 11:14:28 +08:00
commit a3e3dc03c9
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/api/friend.go
View File

@ -48,7 +48,9 @@ func (o *FriendApi) AddBlack(c *gin.Context) {
} }
func (o *FriendApi) GetPaginationBlacks(c *gin.Context) { func (o *FriendApi) GetPaginationBlacks(c *gin.Context) {
a2r.Call(friend.FriendClient.GetPaginationBlacks, o.Client, c) a2r.Call(friend.FriendClient.GetPaginationBlacks, o.Client, c, func(resp *friend.GetPaginationBlacksResp) {
a2r.List(&resp.Blacks)
})
} }
func (o *FriendApi) RemoveBlack(c *gin.Context) { func (o *FriendApi) RemoveBlack(c *gin.Context) {

10
pkg/a2r/api2rpc.go
View File

@ -11,10 +11,17 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
) )
func List[T any](val *[]T) {
if val != nil && *val == nil {
*val = []T{}
}
}
func Call[A, B, C any]( func Call[A, B, C any](
rpc func(client C, ctx context.Context, req *A, options ...grpc.CallOption) (*B, error), rpc func(client C, ctx context.Context, req *A, options ...grpc.CallOption) (*B, error),
client C, client C,
c *gin.Context, c *gin.Context,
after ...func(resp *B),
) { ) {
var req A var req A
if err := c.BindJSON(&req); err != nil { if err := c.BindJSON(&req); err != nil {
@ -31,5 +38,8 @@ func Call[A, B, C any](
apiresp.GinError(c, err) // RPC调用失败 apiresp.GinError(c, err) // RPC调用失败
return return
} }
for _, fn := range after {
fn(data)
}
apiresp.GinSuccess(c, data) // 成功 apiresp.GinSuccess(c, data) // 成功
} }