api nil slice map

This commit is contained in:
withchao 2023-07-06 15:09:41 +08:00
parent ff22ea7108
commit f6756008b0
5 changed files with 21 additions and 13 deletions

View File

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

View File

@ -11,17 +11,10 @@ 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 {
@ -38,8 +31,5 @@ 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) // 成功
} }

5
pkg/apiresp/format.go Normal file
View File

@ -0,0 +1,5 @@
package apiresp
type ApiFormat interface {
ApiFormat()
}

View File

@ -34,6 +34,9 @@ func isAllFieldsPrivate(v any) bool {
} }
func ApiSuccess(data any) *ApiResponse { func ApiSuccess(data any) *ApiResponse {
if format, ok := data.(ApiFormat); ok {
format.ApiFormat()
}
if isAllFieldsPrivate(data) { if isAllFieldsPrivate(data) {
return &ApiResponse{} return &ApiResponse{}
} }

View File

@ -529,3 +529,15 @@ func Batch[T any, V any](fn func(T) V, ts []T) []V {
} }
return res return res
} }
func InitSlice[T any](val *[]T) {
if val != nil && *val == nil {
*val = []T{}
}
}
func InitMap[K comparable, V any](val *map[K]V) {
if val != nil && *val == nil {
*val = map[K]V{}
}
}