up

README.md

@@ -8,13 +8,13 @@ Etcd封装基础包， 包含服务注册和客户端(之后有时间重新封
 ### 服务注册和发现
 ```go
 ## 注册
-etcd, err := register.NewEtcd(&conf.Etcd{
+etcd, err := register.NewRegister(&conf.Etcd{
 	Host: "127.0.0.1:20000",
 })
 
 ## 发现
 // 创建一个连接池
-p, err := discver.NewEtcd(&discver.RegistryConfig{
+p, err := discver.NewDiscver(&discver.RegistryConfig{
     Conf: &conf.Etcd{
     Host: "127.0.0.1:20000",
     },
@@ -30,4 +30,11 @@ if err != nil {
 }
 // 获取服务
 insecure, err := get.GrpcInsecure(context.Background(), "serverName")
+
+
+//初始化一个注册发现对象
+rd := NewEtcd(&conf.Etcd{
+    Host: "127.0.0.1:20000",
+})
+
 ```

discver/dial.go

@@ -14,7 +14,7 @@ type RegistryConfig struct {
 	Conf        *conf.Etcd
 }
 
-func NewEtcd(c *RegistryConfig) *RegistryConfig {
+func NewDiscver(c *RegistryConfig) *RegistryConfig {
 	if c.MaxOpen == 0 {
 		c.MaxOpen = 10
 	}
@@ -41,7 +41,3 @@ func (dis *RegistryConfig) Pool() (*pool.GenericPool, error) {
 	}
 	return genericPool, err
 }
-
-//func (p *pool.GenericPool) getServer() {
-//
-//}

discver/discver.go

@@ -4,7 +4,6 @@ import (
 	"git.gz.internal.jumaiyx.cn/jm/jmproto/conf"
 	cli "git.gz.internal.jumaiyx.cn/pkg/go-etcd/client"
 	"github.com/go-kratos/kratos/contrib/registry/etcd/v2"
-	"github.com/go-kratos/kratos/v2/config"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"sync"
 	"time"
@@ -20,16 +19,15 @@ type Registry struct {
 }
 
 // NewConfDial config file dial
-func NewConfRegistry(c config.Config) (*Registry, error) {
-	var bc cli.Data
-	if err := c.Scan(&bc); err != nil {
-		return nil, err
-	}
-	//e := bc.Etcd.(conf.Etcd)
-	return getRegistry(&bc.Etcd)
-}
+//func NewConfRegistry(c config.Config) (*Registry, error) {
+//	var bc cli.Data
+//	if err := c.Scan(&bc); err != nil {
+//		return nil, err
+//	}
+//	return getRegistry(&bc.Etcd)
+//}
 
-// NewDail parameters dial
+// NewRegistry parameters dial
 func NewRegistry(bc *conf.Etcd) (*Registry, error) {
 	return getRegistry(bc)
 }

etcd.go

@@ -2,6 +2,9 @@ package go_etcd
 
 import (
 	"errors"
+	"git.gz.internal.jumaiyx.cn/jm/jmproto/conf"
+	"git.gz.internal.jumaiyx.cn/pkg/go-etcd/discver"
+	"github.com/go-kratos/kratos/v2/log"
 )
 
 var (
@@ -14,3 +17,11 @@ const (
 	EtcdPass    = "etcd.password"
 	EtcdTimeout = "etcd.timeout"
 )
+
+func NewEtcd(bc *conf.Etcd) (*discver.Registry, error) {
+	registry, err := discver.NewRegistry(bc)
+	if err != nil {
+		log.Errorf("etcd dial failed:%v", err)
+	}
+	return registry, err
+}

register/register.go

@@ -10,7 +10,7 @@ import (
 
 var mu sync.Mutex
 
-func NewEtcd(bc *conf.Etcd) (*etcd.Registry, error) {
+func NewRegister(bc *conf.Etcd) (*etcd.Registry, error) {
 	registry, err := discver.NewRegistry(bc)
 	if err != nil {
 		log.Error(err)