feat: etcd kratos client换个包

cmd/server/main.go

@@ -3,12 +3,11 @@ package main
 import (
 	"context"
 	"flag"
+	"git.ikuban.com/server/kratos-etcd/register"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"os"
 	"time"
 
-	"github.com/go-kratos/kratos/contrib/registry/etcd/v2"
-
 	"github.com/go-kratos/kratos-layout/internal/conf"
 	"github.com/go-kratos/kratos/v2"
 	"github.com/go-kratos/kratos/v2/log"
@@ -50,7 +49,7 @@ func init() {
 	}
 }
 
-func newApp(ctx context.Context, logger log.Logger, r *etcd.Registry, hs *http.Server, gs *grpc.Server) *kratos.App {
+func newApp(ctx context.Context, logger log.Logger, r *register.Registry, hs *http.Server, gs *grpc.Server) *kratos.App {
 	opts := []kratos.Option{
 		kratos.Name(name),
 		kratos.Version(version),

go.mod

@@ -8,12 +8,11 @@ replace git.ikuban.com/server/wxbot-protobuf => ../wxbot-protobuf
 
 require (
 	dario.cat/mergo v1.0.0
-	git.ikuban.com/server/kratos-nacos v0.0.3-0.20241113095538-2d6c30ea9d6d
+	git.ikuban.com/server/kratos-etcd v0.0.0-20250217034845-d561a672d211
 	git.ikuban.com/server/kratos-utils v0.0.0-20240717022026-42b469e99c59
 	git.ikuban.com/server/wxbot-protobuf v0.0.0-20240308032250-64d40217d9e5
 	git.ikuban.com/server/yaml v0.0.0-20210719032106-8dade6555fff
 	github.com/elliotchance/orderedmap/v3 v3.1.0
-	github.com/go-kratos/kratos/contrib/config/etcd/v2 v2.0.0-20250210091908-15168b5a1b7d
 	github.com/go-kratos/kratos/v2 v2.8.3
 	github.com/go-sql-driver/mysql v1.7.0
 	github.com/google/wire v0.5.0
@@ -28,6 +27,7 @@ require (
 
 require (
 	git.ikuban.com/server/json v0.0.0-20210408053838-50ac5ceda83a // indirect
+	git.ikuban.com/server/kratos-nacos v0.0.3-0.20241113095538-2d6c30ea9d6d // indirect
 	github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68 // indirect
 	github.com/alibabacloud-go/tea v1.1.17 // indirect
 	github.com/alibabacloud-go/tea-utils v1.4.4 // indirect
@@ -43,7 +43,6 @@ require (
 	github.com/felixge/httpsnoop v1.0.1 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-kratos/aegis v0.2.0 // indirect
-	github.com/go-kratos/kratos/contrib/registry/etcd/v2 v2.0.0-20250210091908-15168b5a1b7d // indirect
 	github.com/go-playground/form/v4 v4.2.0 // indirect
 	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/goccy/go-json v0.9.11 // indirect

go.sum

@@ -35,6 +35,8 @@ dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 git.ikuban.com/server/json v0.0.0-20210408053838-50ac5ceda83a h1:2OcIUm+cnO7dbUNPxoylWFkNizpeLI1RxiV4jVHSDbc=
 git.ikuban.com/server/json v0.0.0-20210408053838-50ac5ceda83a/go.mod h1:tRbbUpdE5PLoYhhkgt+XjE4RiydCsgm2r/Vjq/LtZic=
+git.ikuban.com/server/kratos-etcd v0.0.0-20250217034845-d561a672d211 h1:Z/y2ZYkScZJHiNsiAIdstg7FO501f3UZ410++8j9y5c=
+git.ikuban.com/server/kratos-etcd v0.0.0-20250217034845-d561a672d211/go.mod h1:iHeJz1kSybNBtFW9w+OtLmAUhRc4OsFRbQ4D1lcuENg=
 git.ikuban.com/server/kratos-nacos v0.0.3-0.20241113095538-2d6c30ea9d6d h1:ZiXkSOUJsncT1V6sf62qn3lvrPZKSYJ8sBgvw8ymQRA=
 git.ikuban.com/server/kratos-nacos v0.0.3-0.20241113095538-2d6c30ea9d6d/go.mod h1:71FHdiHOt51uwzC8R72EwKZmaPqsR2ua9Dg+G4+sNH8=
 git.ikuban.com/server/kratos-utils v0.0.0-20240717022026-42b469e99c59 h1:KUW+rVb3xWRarTYxt2qTAUydCanSIIWM+gpxcTP/Rtg=
@@ -124,10 +126,6 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-kratos/aegis v0.2.0 h1:dObzCDWn3XVjUkgxyBp6ZeWtx/do0DPZ7LY3yNSJLUQ=
 github.com/go-kratos/aegis v0.2.0/go.mod h1:v0R2m73WgEEYB3XYu6aE2WcMwsZkJ/Rzuf5eVccm7bI=
-github.com/go-kratos/kratos/contrib/config/etcd/v2 v2.0.0-20250210091908-15168b5a1b7d h1:ulUM+6gngK/bPOfy+yQamDdM53nHgmDM9sKvHrFj0l0=
-github.com/go-kratos/kratos/contrib/config/etcd/v2 v2.0.0-20250210091908-15168b5a1b7d/go.mod h1:Ius03JpHGpbCWkh97ozpRmy53MLUxW4IBIulWknDooo=
-github.com/go-kratos/kratos/contrib/registry/etcd/v2 v2.0.0-20250210091908-15168b5a1b7d h1:TxfdwucvmmTnYzpQ2myfjlaGF6OEvFx/8QfdUJ3bddQ=
-github.com/go-kratos/kratos/contrib/registry/etcd/v2 v2.0.0-20250210091908-15168b5a1b7d/go.mod h1:4TabMw6NAfWwHchbr5YP2rnz3KKvt7kV6lBbIB+a6p4=
 github.com/go-kratos/kratos/v2 v2.8.3 h1:kkNBq0gvdX+b8cbaN+p6Sdh95DgMhx7GimefXb4o7Ss=
 github.com/go-kratos/kratos/v2 v2.8.3/go.mod h1:+Vfe3FzF0d+BfMdajA11jT0rAyJWublRE/seZQNZVxE=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=

internal/conf/source.go

@@ -2,7 +2,7 @@ package conf
 
 import (
 	"fmt"
-	etcdConfig "github.com/go-kratos/kratos/contrib/config/etcd/v2"
+	etcdConfig "git.ikuban.com/server/kratos-etcd/config"
 	"github.com/go-kratos/kratos/v2/config"
 	"github.com/go-kratos/kratos/v2/config/file"
 	clientv3 "go.etcd.io/etcd/client/v3"

internal/server/registrar.go

@@ -2,15 +2,15 @@ package server
 
 import (
 	"fmt"
+	"git.ikuban.com/server/kratos-etcd/register"
 	"github.com/go-kratos/kratos-layout/internal/conf"
-	"github.com/go-kratos/kratos/contrib/registry/etcd/v2"
 	clientv3 "go.etcd.io/etcd/client/v3"
 	"math"
 )
 
-func NewRegistrar(c *conf.Bootstrap, client *clientv3.Client) *etcd.Registry {
+func NewRegistrar(c *conf.Bootstrap, client *clientv3.Client) *register.Registry {
 	if c.Server.Registrar.Namespace != "" {
-		return etcd.New(client, etcd.MaxRetry(math.MaxInt32), etcd.Namespace(fmt.Sprintf("/%s/naming", c.Server.Registrar.Namespace)))
+		return register.New(client, register.MaxRetry(math.MaxInt32), register.Namespace(fmt.Sprintf("/%s/naming", c.Server.Registrar.Namespace)))
 	}
 	return nil
 }