IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-21 01:09:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

api to rpc

Browse Source
This commit is contained in:
withchao
2023-02-27 14:44:14 +08:00
parent 03ccd0131a
commit 0411a5045b
9 changed files with 173 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/a2r/api2rpc.go
+28
View File
@@ -0,0 +1,28 @@
package a2r
import (
"context"
"github.com/gin-gonic/gin"
"google.golang.org/grpc"
)
// Call TEST
func Call[A, B, C, D, E any](
apiReq *A,
apiResp *B,
rpc func(client E, ctx context.Context, req C, options ...grpc.CallOption) (D, error),
client func() (E, error),
c *gin.Context,
before func(apiReq *A, rpcReq *C, bind func() error) error,
after func(rpcResp *D, apiResp *B, bind func() error) error,
) {
}
func Call1[C, D, E any](
rpc func(client E, ctx context.Context, req C, options ...grpc.CallOption) (D, error),
client func() (E, error),
c *gin.Context,
) {
}
internal/api/group/group1.go
+8 -11
View File
@@ -1,14 +1,19 @@
package group
import (
"OpenIM/internal/api2rpc"
"OpenIM/internal/a2r"
"OpenIM/pkg/apistruct"
"OpenIM/pkg/common/config"
"OpenIM/pkg/proto/group"
"context"
"github.com/OpenIMSDK/openKeeper"
"github.com/gin-gonic/gin"
)
func _() {
context.Background()
}
type Group struct {
zk *openKeeper.ZkClient
}
@@ -22,17 +27,9 @@ func (g *Group) getGroupClient() (group.GroupClient, error) {
}
func (g *Group) KickGroupMember(c *gin.Context) {
api2rpc.New(&apistruct.KickGroupMemberReq{}, &apistruct.KickGroupMemberResp{}, group.GroupClient.KickGroupMember).Call(c, g.getGroupClient)
a2r.Call(&apistruct.KickGroupMemberReq{}, &apistruct.KickGroupMemberResp{}, group.GroupClient.KickGroupMember, g.getGroupClient, c, nil, nil)
}
func (g *Group) GetGroupMembersInfo(c *gin.Context) {
api2rpc.New(&apistruct.GetGroupMembersInfoReq{}, &apistruct.GetGroupMembersInfoResp{}, group.GroupClient.GetGroupMembersInfo).Call(c, g.getGroupClient)
a2r.Call1(group.GroupClient.GetGroupMembersInfo, g.getGroupClient, c)
}
//func GetGroupMembersInfo(c *gin.Context) {
// api2rpc.New(&apistruct.GetGroupMembersInfoReq{}, &apistruct.GetGroupMembersInfoResp{}, group.GroupClient.GetGroupMembersInfo).Call(c, g.getGroupClient)
//}
//func New[A, B, C, D any, E any](apiReq *A, apiResp *B, rpc func(client E, ctx context.Context, req *C, options ...grpc.CallOption) (*D, error)) {
//
//}
internal/api/route.go
+1
View File
@@ -82,6 +82,7 @@ func NewGinRouter() *gin.Engine {
c.Next()
})
{
groupRouterGroup.POST("/create_group", group.NewCreateGroup) //1
groupRouterGroup.POST("/set_group_info", group.NewSetGroupInfo) //1
groupRouterGroup.POST("/join_group", group.JoinGroup) //1
internal/api2rpc/new1.go
+49
View File
@@ -0,0 +1,49 @@
package api2rpc
import (
"context"
"github.com/gin-gonic/gin"
"google.golang.org/grpc"
)
type FUNC[E, C, D any] func(client E, ctx context.Context, req *C, options ...grpc.CallOption) (*D, error)
// Call1 TEST
func Call1[A, B, C, D, E any](
apiReq *A,
apiResp *B,
rpc FUNC[E, C, D],
//client func() (E, error),
c *gin.Context,
before func(apiReq *A, rpcReq *C, bind func() error) error,
after func(rpcResp *D, apiResp *B, bind func() error) error,
) {
}
func Call2[C, D, E any](
rpc func(client E, ctx context.Context, req *C, options ...grpc.CallOption) (*D, error),
client func() (E, error),
c *gin.Context,
) {
}
func Call3[C, D, E any](
rpc func(client E, ctx context.Context, req *C, options ...grpc.CallOption) (*D, error),
//client func() (E, error),
c *gin.Context,
) {
}
func Call4[C, D, E any](
rpc func(client E, ctx context.Context, req *C, options ...grpc.CallOption) (*D, error),
c *gin.Context,
) {
}
func Call10[A, B, C, D, E any](apiReq A, apiResp B, client func() (E, error), call func(client E, rpcReq C) (D, error)) {
}
internal/api2rpc/rpc1.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
type rpcFunc[E, C, D any] func(client E, ctx context.Context, req *C, options ...grpc.CallOption) (*D, error)
func New[A, B, C, D any, E any](apiReq *A, apiResp *B, rpc func(client E, ctx context.Context, req *C, options ...grpc.CallOption) (*D, error)) RpcCall[A, B, C, D, E] {
func New[A, B, C, D, E any](apiReq *A, apiResp *B, rpc func(client E, ctx context.Context, req *C, options ...grpc.CallOption) (*D, error)) RpcCall[A, B, C, D, E] {
return &rpcCall[A, B, C, D, E]{
apiReq: apiReq,
apiResp: apiResp,