diff --git a/client/client.go b/client/client.go index 09a65c5..8b498d4 100644 --- a/client/client.go +++ b/client/client.go @@ -61,33 +61,17 @@ func GetClient(s interface{}) (*RpcClient, error) { mutex.Lock() xClient, ok = mClient.Load(key) if !ok { - log.Println(11111111111111111, basePath, servicePath) - if basePath == "erp" { - //d, err := consulClient.NewConsulDiscovery(basePath, servicePath, config.RpcConfig.RegistryServer, nil) - d, err := client.NewPeer2PeerDiscovery("tcp@127.0.0.1:8082", "") - if err != nil { - return nil, errors.New("系统异常") - } - option := client.DefaultOption - option.Retries = 3 - option.GenBreaker = func() client.Breaker { - return client.NewConsecCircuitBreaker(2, 30*time.Second) - } - xClient = client.NewXClient(servicePath, client.Failover, client.RoundRobin, d, option) - mClient.Store(key, xClient) - } else { - d, err := consulClient.NewConsulDiscovery(basePath, servicePath, config.RpcConfig.RegistryServer, nil) - if err != nil { - return nil, errors.New("系统异常") - } - option := client.DefaultOption - option.Retries = 3 - option.GenBreaker = func() client.Breaker { - return client.NewConsecCircuitBreaker(2, 30*time.Second) - } - xClient = client.NewXClient(servicePath, client.Failover, client.RoundRobin, d, option) - mClient.Store(key, xClient) + d, err := consulClient.NewConsulDiscovery(basePath, servicePath, config.RpcConfig.RegistryServer, nil) + if err != nil { + return nil, errors.New("系统异常") } + option := client.DefaultOption + option.Retries = 3 + option.GenBreaker = func() client.Breaker { + return client.NewConsecCircuitBreaker(2, 30*time.Second) + } + xClient = client.NewXClient(servicePath, client.Failover, client.RoundRobin, d, option) + mClient.Store(key, xClient) } mutex.Unlock() }