From 19ffde31961cfc63efc1160846eca333961ec769 Mon Sep 17 00:00:00 2001 From: OpenIM Bot <124379614+kubbot@users.noreply.github.com> Date: Sat, 27 Jan 2024 00:49:37 +0800 Subject: [PATCH] cicd: bump League Patch (#1825) --- internal/rpc/user/user.go | 1 - pkg/common/config/version | 2 +- pkg/common/discoveryregister/direct/directResolver.go | 5 +++-- pkg/common/discoveryregister/direct/directconn.go | 4 +++- pkg/common/discoveryregister/discoveryregister.go | 3 ++- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index 981e0ccc4..0be5f97f4 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -61,7 +61,6 @@ type userServer struct { RegisterCenter registry.SvcDiscoveryRegistry } - func Start(client registry.SvcDiscoveryRegistry, server *grpc.Server) error { rdb, err := cache.NewRedis() if err != nil { diff --git a/pkg/common/config/version b/pkg/common/config/version index 4d0729e54..d5c0c9914 100644 --- a/pkg/common/config/version +++ b/pkg/common/config/version @@ -1 +1 @@ -v3.5.0 \ No newline at end of file +3.5.1 diff --git a/pkg/common/discoveryregister/direct/directResolver.go b/pkg/common/discoveryregister/direct/directResolver.go index 285f55112..d5482ab62 100644 --- a/pkg/common/discoveryregister/direct/directResolver.go +++ b/pkg/common/discoveryregister/direct/directResolver.go @@ -2,10 +2,11 @@ package direct import ( "context" - "github.com/OpenIMSDK/tools/log" - "google.golang.org/grpc/resolver" "math/rand" "strings" + + "github.com/OpenIMSDK/tools/log" + "google.golang.org/grpc/resolver" ) const ( diff --git a/pkg/common/discoveryregister/direct/directconn.go b/pkg/common/discoveryregister/direct/directconn.go index 3eaa6fa19..6589e3aba 100644 --- a/pkg/common/discoveryregister/direct/directconn.go +++ b/pkg/common/discoveryregister/direct/directconn.go @@ -4,10 +4,12 @@ import ( "context" "errors" "fmt" + "github.com/OpenIMSDK/tools/errs" - config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" + + config2 "github.com/openimsdk/open-im-server/v3/pkg/common/config" ) type ServiceAddresses map[string][]int diff --git a/pkg/common/discoveryregister/discoveryregister.go b/pkg/common/discoveryregister/discoveryregister.go index 76c8fb267..23a9e3245 100644 --- a/pkg/common/discoveryregister/discoveryregister.go +++ b/pkg/common/discoveryregister/discoveryregister.go @@ -16,9 +16,10 @@ package discoveryregister import ( "errors" - "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/direct" "os" + "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/direct" + "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/kubernetes" "github.com/openimsdk/open-im-server/v3/pkg/common/discoveryregister/zookeeper"