From 13132efc6c8a69c518f330b59058671632e7d9cf Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 7 Mar 2023 18:02:57 +0800 Subject: [PATCH] Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode # Conflicts: # cmd/cmdutils/main.go --- go.mod | 2 +- pkg/discoveryregistry/discovery_register.go | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 78ed767d7..ea1f058f2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module OpenIM -go 1.16 +go 1.18 require ( firebase.google.com/go v3.13.0+incompatible diff --git a/pkg/discoveryregistry/discovery_register.go b/pkg/discoveryregistry/discovery_register.go index dd5e40f77..45d2ff2ea 100644 --- a/pkg/discoveryregistry/discovery_register.go +++ b/pkg/discoveryregistry/discovery_register.go @@ -13,8 +13,3 @@ type SvcDiscoveryRegistry interface { RegisterConf2Registry(key string, conf []byte) error GetConfFromRegistry(key string) ([]byte, error) } - -func GetConns(serviceName string) { - GetConns(serviceName string, opts ...grpc.DialOption) ([]*grpc.ClientConn, error) - -} \ No newline at end of file