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

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

Browse Source
This commit is contained in:
wangchuxiao
2023-03-03 18:44:27 +08:00
parent 3a23153e48 ebd1de919d
commit ebe689324b
4 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/api/a2r/api2rpc.go
+5 -10
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,30 +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())) // 参数校验失败
apiresp.GinError(c, constant.ErrInternalServer.Wrap(err.Error())) // 获取RPC连接失败
return
}
data, err := rpc(cli, c, &req)
if err != nil {
resp = apiresp.Error(err) // 参数校验失败
apiresp.GinError(c, err) // RPC调用失败
return
}
resp = apiresp.Success(data) // 成功
apiresp.GinSuccess(c, data) // 成功
}
internal/api/auth.go
+12 -8
View File
@@ -19,22 +19,26 @@ type Auth struct {
zk *openKeeper.ZkClient
}
func (a *Auth) getGroupClient() (auth.AuthClient, error) {
conn, err := a.zk.GetConn(config.Config.RpcRegisterName.OpenImGroupName)
func (o *Auth) client() (auth.AuthClient, error) {
conn, err := o.zk.GetConn(config.Config.RpcRegisterName.OpenImGroupName, nil)
if err != nil {
return nil, err
}
return auth.NewAuthClient(conn), nil
}
func (a *Auth) UserToken(c *gin.Context) {
a2r.Call(auth.AuthClient.UserToken, a.getGroupClient, c)
func (o *Auth) UserRegister(c *gin.Context) {
a2r.Call(auth.AuthClient.UserRegister, o.client, c)
}
func (a *Auth) ParseToken(c *gin.Context) {
a2r.Call(auth.AuthClient.ParseToken, a.getGroupClient, c)
func (o *Auth) UserToken(c *gin.Context) {
a2r.Call(auth.AuthClient.UserToken, o.client, c)
}
func (a *Auth) ForceLogout(c *gin.Context) {
a2r.Call(auth.AuthClient.ForceLogout, a.getGroupClient, c)
func (o *Auth) ParseToken(c *gin.Context) {
a2r.Call(auth.AuthClient.ParseToken, o.client, c)
}
func (o *Auth) ForceLogout(c *gin.Context) {
a2r.Call(auth.AuthClient.ForceLogout, o.client, c)
}