diff --git a/internal/api/route.go b/internal/api/route.go index a949acb75..67bd75f73 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -2,8 +2,6 @@ package api import ( "context" - "time" - "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/common/mw" @@ -18,7 +16,7 @@ import ( ) func NewGinRouter(discov discoveryregistry.SvcDiscoveryRegistry, rdb redis.UniversalClient) *gin.Engine { - discov.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithTimeout(time.Second*3)) // 默认RPC中间件 + discov.AddOption(mw.GrpcClient(), grpc.WithTransportCredentials(insecure.NewCredentials())) // 默认RPC中间件 gin.SetMode(gin.ReleaseMode) //f, _ := os.Create("../logs/api.log") //gin.DefaultWriter = io.MultiWriter(f) diff --git a/pkg/rpcclient/user.go b/pkg/rpcclient/user.go index 76fea81dd..dabc2bdf4 100644 --- a/pkg/rpcclient/user.go +++ b/pkg/rpcclient/user.go @@ -3,6 +3,7 @@ package rpcclient import ( "context" "strings" + "time" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/config" "github.com/OpenIMSDK/Open-IM-Server/pkg/common/tokenverify" @@ -21,7 +22,8 @@ type User struct { } func NewUser(discov discoveryregistry.SvcDiscoveryRegistry) *User { - conn, err := discov.GetConn(context.Background(), config.Config.RpcRegisterName.OpenImUserName) + ctx, _ := context.WithTimeout(context.Background(), time.Second*3) + conn, err := discov.GetConn(ctx, config.Config.RpcRegisterName.OpenImUserName) if err != nil { panic(err) }