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

cmd/api/main.go

@@ -57,7 +57,7 @@ func run(port int) error {
 	if err != nil {
 		return err
 	}
-	if client.CreateRpcRootNodes(config.GetServiceNames()); err != nil {
+	if err := client.CreateRpcRootNodes(config.GetServiceNames()); err != nil {
 		return err
 	}
 	fmt.Println("api init discov client success")

internal/api/friend.go

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

pkg/a2r/api2rpc.go

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

pkg/apiresp/format.go

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

pkg/apiresp/resp.go

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

pkg/common/mw/rpc_client_interceptor.go

@@ -16,7 +16,7 @@ import (
 )
 
 func GrpcClient() grpc.DialOption {
-	return grpc.WithUnaryInterceptor(RpcClientInterceptor)
+	return grpc.WithChainUnaryInterceptor(RpcClientInterceptor)
 }
 
 func RpcClientInterceptor(ctx context.Context, method string, req, resp interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) (err error) {

pkg/common/mw/rpc_server_interceptor.go

@@ -153,5 +153,5 @@ func RpcServerInterceptor(ctx context.Context, req interface{}, info *grpc.Unary
 }
 
 func GrpcServer() grpc.ServerOption {
-	return grpc.UnaryInterceptor(RpcServerInterceptor)
+	return grpc.ChainUnaryInterceptor(RpcServerInterceptor)
 }

pkg/utils/utils_v2.go

@@ -529,3 +529,15 @@ func Batch[T any, V any](fn func(T) V, ts []T) []V {
 	}
 	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{}
+	}
+}