From f3d17b9d34ba5ad4b6367710963e5ba42089884c Mon Sep 17 00:00:00 2001 From: tx7do Date: Thu, 14 Nov 2024 15:25:58 +0800 Subject: [PATCH] feat: refactor go.mod. --- registry/consul/client.go | 6 +++++- registry/etcd/client.go | 6 +++++- registry/eureka/client.go | 7 +++++-- registry/kubernetes/client.go | 11 ++++++++--- registry/nacos/client.go | 6 +++++- registry/polaris/client.go | 9 ++++++--- registry/servicecomb/client.go | 6 +++++- registry/zookeeper/client.go | 6 +++++- tag.bat | 4 ++-- 9 files changed, 46 insertions(+), 15 deletions(-) diff --git a/registry/consul/client.go b/registry/consul/client.go index 692e1c5..430a250 100644 --- a/registry/consul/client.go +++ b/registry/consul/client.go @@ -1,9 +1,9 @@ package consul import ( + consulKratos "github.com/go-kratos/kratos/contrib/registry/consul/v2" "github.com/go-kratos/kratos/v2/log" - consulKratos "github.com/go-kratos/kratos/contrib/registry/consul/v2" consulClient "github.com/hashicorp/consul/api" conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1" @@ -11,6 +11,10 @@ import ( // NewRegistry 创建一个注册发现客户端 - Consul func NewRegistry(c *conf.Registry) *consulKratos.Registry { + if c == nil || c.Consul == nil { + return nil + } + cfg := consulClient.DefaultConfig() cfg.Address = c.Consul.GetAddress() cfg.Scheme = c.Consul.GetScheme() diff --git a/registry/etcd/client.go b/registry/etcd/client.go index 01ca2d6..65e7235 100644 --- a/registry/etcd/client.go +++ b/registry/etcd/client.go @@ -1,9 +1,9 @@ package etcd import ( + etcdKratos "github.com/go-kratos/kratos/contrib/registry/etcd/v2" "github.com/go-kratos/kratos/v2/log" - etcdKratos "github.com/go-kratos/kratos/contrib/registry/etcd/v2" etcdClient "go.etcd.io/etcd/client/v3" conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1" @@ -11,6 +11,10 @@ import ( // NewRegistry 创建一个注册发现客户端 - Etcd func NewRegistry(c *conf.Registry) *etcdKratos.Registry { + if c == nil || c.Etcd == nil { + return nil + } + cfg := etcdClient.Config{ Endpoints: c.Etcd.Endpoints, } diff --git a/registry/eureka/client.go b/registry/eureka/client.go index c352d26..d110a79 100644 --- a/registry/eureka/client.go +++ b/registry/eureka/client.go @@ -1,15 +1,18 @@ package eureka import ( - "github.com/go-kratos/kratos/v2/log" - eurekaKratos "github.com/go-kratos/kratos/contrib/registry/eureka/v2" + "github.com/go-kratos/kratos/v2/log" conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1" ) // NewRegistry 创建一个注册发现客户端 - Eureka func NewRegistry(c *conf.Registry) *eurekaKratos.Registry { + if c == nil || c.Eureka == nil { + return nil + } + var opts []eurekaKratos.Option opts = append(opts, eurekaKratos.WithHeartbeat(c.Eureka.HeartbeatInterval.AsDuration())) opts = append(opts, eurekaKratos.WithRefresh(c.Eureka.RefreshInterval.AsDuration())) diff --git a/registry/kubernetes/client.go b/registry/kubernetes/client.go index 42b984a..66d281a 100644 --- a/registry/kubernetes/client.go +++ b/registry/kubernetes/client.go @@ -3,9 +3,9 @@ package kubernetes import ( "path/filepath" + k8sRegistry "github.com/go-kratos/kratos/contrib/registry/kubernetes/v2" "github.com/go-kratos/kratos/v2/log" - k8sRegistry "github.com/go-kratos/kratos/contrib/registry/kubernetes/v2" k8s "k8s.io/client-go/kubernetes" k8sRest "k8s.io/client-go/rest" k8sTools "k8s.io/client-go/tools/clientcmd" @@ -15,7 +15,11 @@ import ( ) // NewRegistry 创建一个注册发现客户端 - Kubernetes -func NewRegistry(_ *conf.Registry) *k8sRegistry.Registry { +func NewRegistry(cfg *conf.Registry) *k8sRegistry.Registry { + if cfg == nil || cfg.Kubernetes == nil { + return nil + } + restConfig, err := k8sRest.InClusterConfig() if err != nil { home := k8sUtil.HomeDir() @@ -33,7 +37,8 @@ func NewRegistry(_ *conf.Registry) *k8sRegistry.Registry { return nil } - reg := k8sRegistry.NewRegistry(clientSet) + var namespace string + reg := k8sRegistry.NewRegistry(clientSet, namespace) return reg } diff --git a/registry/nacos/client.go b/registry/nacos/client.go index db53f77..45cd894 100644 --- a/registry/nacos/client.go +++ b/registry/nacos/client.go @@ -1,9 +1,9 @@ package nacos import ( + nacosKratos "github.com/go-kratos/kratos/contrib/registry/nacos/v2" "github.com/go-kratos/kratos/v2/log" - nacosKratos "github.com/go-kratos/kratos/contrib/registry/nacos/v2" nacosClients "github.com/nacos-group/nacos-sdk-go/clients" nacosConstant "github.com/nacos-group/nacos-sdk-go/common/constant" nacosVo "github.com/nacos-group/nacos-sdk-go/vo" @@ -13,6 +13,10 @@ import ( // NewRegistry 创建一个注册发现客户端 - Nacos func NewRegistry(c *conf.Registry) *nacosKratos.Registry { + if c == nil || c.Nacos == nil { + return nil + } + srvConf := []nacosConstant.ServerConfig{ *nacosConstant.NewServerConfig(c.Nacos.Address, c.Nacos.Port), } diff --git a/registry/polaris/client.go b/registry/polaris/client.go index f6aa9e5..db1c9d2 100644 --- a/registry/polaris/client.go +++ b/registry/polaris/client.go @@ -1,11 +1,10 @@ package polaris import ( + polarisKratos "github.com/go-kratos/kratos/contrib/registry/polaris/v2" "github.com/go-kratos/kratos/v2/log" - polarisKratos "github.com/go-kratos/kratos/contrib/registry/polaris/v2" - - polarisApi "github.com/polarismesh/polaris-go" + polarisApi "github.com/polarismesh/polaris-go/api" polarisModel "github.com/polarismesh/polaris-go/pkg/model" conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1" @@ -13,6 +12,10 @@ import ( // NewPolarisRegistry 创建一个注册发现客户端 - Polaris func NewPolarisRegistry(c *conf.Registry) *polarisKratos.Registry { + if c == nil || c.Polaris == nil { + return nil + } + var err error var consumer polarisApi.ConsumerAPI diff --git a/registry/servicecomb/client.go b/registry/servicecomb/client.go index 058df2a..90993e6 100644 --- a/registry/servicecomb/client.go +++ b/registry/servicecomb/client.go @@ -1,16 +1,20 @@ package servicecomb import ( + servicecombKratos "github.com/go-kratos/kratos/contrib/registry/servicecomb/v2" "github.com/go-kratos/kratos/v2/log" servicecombClient "github.com/go-chassis/sc-client" - servicecombKratos "github.com/go-kratos/kratos/contrib/registry/servicecomb/v2" conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1" ) // NewRegistry 创建一个注册发现客户端 - Servicecomb func NewRegistry(c *conf.Registry) *servicecombKratos.Registry { + if c == nil || c.Servicecomb == nil { + return nil + } + cfg := servicecombClient.Options{ Endpoints: c.Servicecomb.Endpoints, } diff --git a/registry/zookeeper/client.go b/registry/zookeeper/client.go index 1496126..3c4392a 100644 --- a/registry/zookeeper/client.go +++ b/registry/zookeeper/client.go @@ -1,9 +1,9 @@ package zookeeper import ( + zookeeperKratos "github.com/go-kratos/kratos/contrib/registry/zookeeper/v2" "github.com/go-kratos/kratos/v2/log" - zookeeperKratos "github.com/go-kratos/kratos/contrib/registry/zookeeper/v2" "github.com/go-zookeeper/zk" conf "github.com/tx7do/kratos-bootstrap/api/gen/go/conf/v1" @@ -11,6 +11,10 @@ import ( // NewRegistry 创建一个注册发现客户端 - ZooKeeper func NewRegistry(c *conf.Registry) *zookeeperKratos.Registry { + if c == nil || c.Zookeeper == nil { + return nil + } + conn, _, err := zk.Connect(c.Zookeeper.Endpoints, c.Zookeeper.Timeout.AsDuration()) if err != nil { log.Fatal(err) diff --git a/tag.bat b/tag.bat index 321ce3e..f8f0d9b 100644 --- a/tag.bat +++ b/tag.bat @@ -4,7 +4,7 @@ git tag utils/v0.1.0 --force git tag cache/redis/v0.0.5 --force git tag oss/minio/v0.0.5 --force -git tag registry/v0.0.5 --force +git tag registry/v0.0.6 --force git tag config/v0.0.5 --force git tag logger/v0.0.6 --force git tag rpc/v0.0.5 --force @@ -17,7 +17,7 @@ git tag database/influxdb/v0.0.1 --force git tag database/cassandra/v0.0.1 --force git tag database/clickhouse/v0.0.2 --force -git tag bootstrap/v0.0.7 --force +git tag bootstrap/v0.0.8 --force git tag v0.5.0