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

Merge branch 'main' into tuoyun

Browse Source 
# Conflicts:
#	script/sdk_svr_start.sh
This commit is contained in:
Gordon
2022-04-28 21:12:14 +08:00
parent 6b98c3fed5 766b6e9fef
commit bf154eb8c3
5 changed files with 60 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/grpc-etcdv3/getcdv3/register.go
+4 -2
View File
@@ -1,14 +1,16 @@
package getcdv3
import (
"Open_IM/pkg/common/log"
"context"
"fmt"
"go.etcd.io/etcd/clientv3"
"net"
"strconv"
"strings"
"time"
clientv3 "go.etcd.io/etcd/client/v3"
"Open_IM/pkg/common/log"
)
type RegEtcd struct {
pkg/grpc-etcdv3/getcdv3/resolver.go
+6 -6
View File
@@ -3,15 +3,15 @@ package getcdv3
import (
"context"
"fmt"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/mvcc/mvccpb"
//"google.golang.org/genproto/googleapis/ads/googleads/v1/services"
"google.golang.org/grpc"
"google.golang.org/grpc/balancer/roundrobin"
"google.golang.org/grpc/resolver"
"strings"
"sync"
"time"
"go.etcd.io/etcd/api/v3/mvccpb"
clientv3 "go.etcd.io/etcd/client/v3"
"google.golang.org/grpc"
"google.golang.org/grpc/balancer/roundrobin"
"google.golang.org/grpc/resolver"
)
type Resolver struct {