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

api to rpc

Browse Source
This commit is contained in:
withchao 2023-03-03 18:42:33 +08:00
parent 5e845c8fb6
commit 4deedb6856
4 changed files with 26 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
internal/api/a2r/api2rpc.go
View File

@ -6,7 +6,6 @@ import (
"context"
"github.com/gin-gonic/gin"
"google.golang.org/grpc"
"net/http"
)
func Call[A, B, C any](
@ -14,69 +13,26 @@ func Call[A, B, C any](
client func() (C, error),
c *gin.Context,
) {
var resp *apiresp.ApiResponse
defer func() {
c.JSON(http.StatusOK, resp)
}()
var req A
if err := c.BindJSON(&req); err != nil {
resp = apiresp.Error(constant.ErrArgs.Wrap(err.Error())) // 参数错误
apiresp.GinError(c, constant.ErrArgs.Wrap(err.Error())) // 参数错误
return
}
if check, ok := any(&req).(interface{ Check() error }); ok {
if err := check.Check(); err != nil {
resp = apiresp.Error(constant.ErrArgs.Wrap(err.Error())) // 参数校验失败
apiresp.GinError(c, constant.ErrArgs.Wrap(err.Error())) // 参数校验失败
return
}
}
cli, err := client()
if err != nil {
resp = apiresp.Error(constant.ErrInternalServer.Wrap(err.Error())) // 获取RPC连接失败
apiresp.GinError(c, constant.ErrInternalServer.Wrap(err.Error())) // 获取RPC连接失败
return
}
data, err := rpc(cli, c, &req)
if err != nil {
resp = apiresp.Error(err) // RPC调用失败
apiresp.GinError(c, err) // RPC调用失败
return
}
resp = apiresp.Success(data) // 成功
}
func CallAny[A, B, C, D any](
rpc func(client C, ctx context.Context, req *A, options ...grpc.CallOption) (*B, error),
client func() (C, error),
c *gin.Context,
apiReq *D,
cp func(apiReq *D, rpcReq *A) error,
) {
var resp *apiresp.ApiResponse
defer func() {
c.JSON(http.StatusOK, resp)
}()
if err := c.BindJSON(apiReq); err != nil {
resp = apiresp.Error(constant.ErrArgs.Wrap(err.Error())) // 参数错误
return
}
var req A
if err := cp(apiReq, &req); err != nil {
resp = apiresp.Error(constant.ErrArgs.Wrap(err.Error())) // 参数错误
return
}
if check, ok := any(&req).(interface{ Check() error }); ok {
if err := check.Check(); err != nil {
resp = apiresp.Error(constant.ErrArgs.Wrap(err.Error())) // 参数校验失败
return
}
}
cli, err := client()
if err != nil {
resp = apiresp.Error(constant.ErrInternalServer.Wrap(err.Error())) // 获取RPC连接失败
return
}
data, err := rpc(cli, c, &req)
if err != nil {
resp = apiresp.Error(err) // RPC调用失败
return
}
resp = apiresp.Success(data) // 成功
apiresp.GinSuccess(c, data) // 成功
}

2
internal/api/auth.go
View File

@ -20,7 +20,7 @@ type Auth struct {
}
func (o *Auth) client() (auth.AuthClient, error) {
conn, err := o.zk.GetConn(config.Config.RpcRegisterName.OpenImGroupName)
conn, err := o.zk.GetConn(config.Config.RpcRegisterName.OpenImGroupName, nil)
if err != nil {
return nil, err
}

18
internal/apiresp/gin.go Normal file
View File

@ -0,0 +1,18 @@
package apiresp
import (
"github.com/gin-gonic/gin"
"net/http"
)
func GinError(c *gin.Context, err error) {
if err == nil {
GinSuccess(c, nil)
return
}
c.JSON(http.StatusOK, apiError(err))
}
func GinSuccess(c *gin.Context, data any) {
c.JSON(http.StatusOK, apiSuccess(data))
}

4
internal/apiresp/resp.go
View File

@ -7,12 +7,12 @@ type ApiResponse struct {
Data any `json:"data"`
}
func Success(data any) *ApiResponse {
func apiSuccess(data any) *ApiResponse {
return &ApiResponse{
Data: data,
}
}
func Error(err error) *ApiResponse {
func apiError(err error) *ApiResponse {
return &ApiResponse{ErrCode: 10000, ErrMsg: err.Error()}
}