IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-09 11:35:59 +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-17 11:42:57 +08:00
parent cf968c0b4c 26341a5187
commit 7445f96e66
40 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/api/a2r/api2rpc.go
-42
View File
@@ -1,42 +0,0 @@
package a2r
import (
"context"
"github.com/OpenIMSDK/Open-IM-Server/internal/apiresp"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
"github.com/gin-gonic/gin"
"google.golang.org/grpc"
)
func Call[A, B, C any](
rpc func(client C, ctx context.Context, req *A, options ...grpc.CallOption) (*B, error),
client func() (C, error),
c *gin.Context,
) {
var req A
if err := c.BindJSON(&req); err != nil {
log.ZWarn(c, "gin bind json error", err, "req", req)
apiresp.GinError(c, errs.ErrArgs.WithDetail(err.Error()).Wrap()) // 参数错误
return
}
if check, ok := any(&req).(interface{ Check() error }); ok {
if err := check.Check(); err != nil {
log.ZWarn(c, "custom check error", err, "req", req)
apiresp.GinError(c, errs.ErrArgs.Wrap(err.Error())) // 参数校验失败
return
}
}
cli, err := client()
if err != nil {
log.ZError(c, "get conn error", err, "req", req)
apiresp.GinError(c, errs.ErrInternalServer.Wrap(err.Error())) // 获取RPC连接失败
return
}
data, err := rpc(cli, c, &req)
if err != nil {
apiresp.GinError(c, err) // RPC调用失败
return
}
apiresp.GinSuccess(c, data) // 成功
}
internal/api/auth.go
+1 -1
View File
@@ -3,7 +3,7 @@ package api
import (
"context"
"github.com/OpenIMSDK/Open-IM-Server/internal/api/a2r"
"github.com/OpenIMSDK/Open-IM-Server/pkg/a2r"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
auth "github.com/OpenIMSDK/Open-IM-Server/pkg/proto/auth"
internal/api/conversation.go
+1 -1
View File
@@ -3,7 +3,7 @@ package api
import (
"context"
"github.com/OpenIMSDK/Open-IM-Server/internal/api/a2r"
"github.com/OpenIMSDK/Open-IM-Server/pkg/a2r"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/conversation"
internal/api/friend.go
+1 -1
View File
@@ -3,7 +3,7 @@ package api
import (
"context"
"github.com/OpenIMSDK/Open-IM-Server/internal/api/a2r"
"github.com/OpenIMSDK/Open-IM-Server/pkg/a2r"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/friend"
internal/api/group.go
+1 -1
View File
@@ -3,7 +3,7 @@ package api
import (
"context"
"github.com/OpenIMSDK/Open-IM-Server/internal/api/a2r"
"github.com/OpenIMSDK/Open-IM-Server/pkg/a2r"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
"github.com/OpenIMSDK/Open-IM-Server/pkg/proto/group"
internal/api/msg.go
+2 -2
View File
@@ -3,8 +3,8 @@ package api
import (
"context"
"errors"
"github.com/OpenIMSDK/Open-IM-Server/internal/api/a2r"
"github.com/OpenIMSDK/Open-IM-Server/internal/apiresp"
"github.com/OpenIMSDK/Open-IM-Server/pkg/a2r"
"github.com/OpenIMSDK/Open-IM-Server/pkg/apiresp"
"github.com/OpenIMSDK/Open-IM-Server/pkg/apistruct"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/constant"
internal/api/third.go
+1 -1
View File
@@ -2,7 +2,7 @@ package api
import (
"context"
"github.com/OpenIMSDK/Open-IM-Server/internal/api/a2r"
"github.com/OpenIMSDK/Open-IM-Server/pkg/a2r"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"
"github.com/OpenIMSDK/Open-IM-Server/pkg/errs"
internal/api/user.go
+1 -1
View File
@@ -2,7 +2,7 @@ package api
import (
"context"
"github.com/OpenIMSDK/Open-IM-Server/internal/api/a2r"
"github.com/OpenIMSDK/Open-IM-Server/pkg/a2r"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/config"
"github.com/OpenIMSDK/Open-IM-Server/pkg/common/log"
"github.com/OpenIMSDK/Open-IM-Server/pkg/discoveryregistry"