From 4c74dc669e172267d4d2ee5c7e17a18883efb829 Mon Sep 17 00:00:00 2001 From: kevin Date: Thu, 10 Feb 2022 12:32:26 +0800 Subject: [PATCH] upgrade go-zero to v1.3.0 --- README.md | 2 +- cmd/dm/choperator/choperator.go | 2 +- cmd/dm/choperator/chproxyoperator.go | 2 +- cmd/dm/choperator/ckgroupoperator.go | 2 +- cmd/dm/cmd/sync/config/config.go | 4 +- cmd/dm/cmd/sync/dm.go | 4 +- cmd/dm/data/mongo2clickhouse.go | 2 +- cmd/dm/data/mysql2clickhouse.go | 2 +- cmd/dm/module/dmprometheus.go | 4 +- cmd/dm/module/manager.go | 2 +- cmd/dm/module/service.go | 2 +- cmd/dm/util/clickhousetypeconv.go | 2 +- cmd/dm/util/mysqltypeconv.go | 2 +- cmd/galaxy/README.md | 2 +- cmd/galaxy/galaxy.go | 4 +- cmd/galaxy/internal/clients/dmclient.go | 2 +- cmd/galaxy/internal/clients/rtuclient.go | 2 +- cmd/galaxy/internal/config/config.go | 2 +- cmd/galaxy/internal/handler/addhandler.go | 4 +- .../internal/handler/connectoraddhandler.go | 4 +- .../handler/connectordeletehandler.go | 4 +- .../internal/handler/connectorlisthandler.go | 4 +- .../internal/handler/databaselisthandler.go | 4 +- cmd/galaxy/internal/handler/dmaddhandler.go | 4 +- .../internal/handler/dmdeletehandler.go | 4 +- cmd/galaxy/internal/handler/dmlisthandler.go | 4 +- cmd/galaxy/internal/handler/dmredohandler.go | 4 +- cmd/galaxy/internal/handler/dmstophandler.go | 4 +- cmd/galaxy/internal/handler/execsqlhandler.go | 4 +- .../handler/generatecreatesqlhandler.go | 4 +- .../internal/handler/getuserinfohandler.go | 2 +- .../internal/handler/listtablehandler.go | 4 +- cmd/galaxy/internal/handler/loginhandler.go | 4 +- cmd/galaxy/internal/handler/response.go | 2 +- cmd/galaxy/internal/handler/routes.go | 2 +- cmd/galaxy/internal/handler/rtuaddhandler.go | 4 +- .../internal/handler/rtudeletehandler.go | 4 +- cmd/galaxy/internal/handler/rtulisthandler.go | 4 +- cmd/galaxy/internal/handler/rturedohandler.go | 4 +- cmd/galaxy/internal/handler/rtustophandler.go | 4 +- cmd/galaxy/internal/logic/addlogic.go | 2 +- cmd/galaxy/internal/logic/common.go | 2 +- .../internal/logic/connectoraddlogic.go | 2 +- .../internal/logic/connectordeletelogic.go | 2 +- .../internal/logic/connectorlistlogic.go | 2 +- .../internal/logic/databaselistlogic.go | 2 +- .../internal/logic/defaultconfiglogic.go | 2 +- cmd/galaxy/internal/logic/dmaddlogic.go | 2 +- cmd/galaxy/internal/logic/dmdeletelogic.go | 2 +- cmd/galaxy/internal/logic/dmlistlogic.go | 2 +- cmd/galaxy/internal/logic/dmredologic.go | 2 +- cmd/galaxy/internal/logic/dmstoplogic.go | 2 +- cmd/galaxy/internal/logic/execsqllogic.go | 2 +- .../internal/logic/generatecreatesqllogic.go | 2 +- cmd/galaxy/internal/logic/getlogic.go | 2 +- cmd/galaxy/internal/logic/getuserinfologic.go | 2 +- .../internal/logic/listdatabaseslogic.go | 2 +- cmd/galaxy/internal/logic/listtablelogic.go | 2 +- cmd/galaxy/internal/logic/loginlogic.go | 4 +- cmd/galaxy/internal/logic/rtuaddlogic.go | 2 +- cmd/galaxy/internal/logic/rtudeletelogic.go | 2 +- cmd/galaxy/internal/logic/rtulistlogic.go | 2 +- cmd/galaxy/internal/logic/rturedologic.go | 2 +- cmd/galaxy/internal/logic/rtustoplogic.go | 2 +- cmd/galaxy/wrap/wrap.go | 4 +- cmd/rtu/cmd/sync/config/config.go | 4 +- cmd/rtu/cmd/sync/rtu.go | 8 +- cmd/rtu/handle/common.go | 2 +- cmd/rtu/handle/etcdjob.go | 2 +- cmd/rtu/handle/input.go | 2 +- cmd/rtu/handle/insert.go | 2 +- cmd/rtu/handle/parse.go | 2 +- cmd/rtu/handle/rtujob.go | 2 +- cmd/rtu/handle/run.go | 2 +- cmd/rtu/handle/tablecolumn.go | 2 +- cmd/rtu/handle/utils.go | 2 +- cmd/rtu/model/canalsyncmodel.go | 2 +- cmd/rtu/model/connectormongomodel.go | 2 +- cmd/rtu/model/debeziumsyncmodel.go | 2 +- cmd/rtu/monitor/countvec_test.go | 2 +- cmd/rtu/utils/recover.go | 2 +- go.mod | 4 +- go.sum | 96 ++++++++----------- pkg/canalx/canalx.go | 2 +- pkg/ckgroup/ckconn.go | 2 +- pkg/ckgroup/ckconn_test.go | 4 +- pkg/ckgroup/ckgroup.go | 2 +- pkg/ckgroup/common.go | 2 +- pkg/ckgroup/dbtesttool/dbtool/dbtool.go | 4 +- pkg/ckgroup/dbtesttool/dbtool/insert.go | 4 +- pkg/ckgroup/dbtesttool/dbtool/update.go | 4 +- pkg/ckgroup/exec.go | 2 +- pkg/ckgroup/exportutil.go | 2 +- pkg/ckgroup/insert.go | 2 +- pkg/ckgroup/insert_test.go | 2 +- pkg/ckgroup/keepalive.go | 2 +- pkg/ckgroup/shardconn.go | 2 +- pkg/clickhousex/clickhousemodel.go | 6 +- pkg/clickhousex/clickhousex.go | 6 +- pkg/clickhousex/pool.go | 6 +- pkg/clickhousex/table.go | 2 +- pkg/cryptox/aes.go | 2 +- pkg/debeziumx/debeziumx.go | 2 +- pkg/mongodbx/clickhouse.go | 2 +- pkg/mongodbx/mongodbx.go | 2 +- pkg/mongodbx/mongomodel.go | 2 +- pkg/mongodbx/pool.go | 2 +- pkg/mysqlx/clickhouse.go | 2 +- pkg/mysqlx/mysqlmodel.go | 4 +- pkg/mysqlx/mysqlx.go | 4 +- pkg/mysqlx/pool.go | 4 +- pkg/tube/examples/streamconsumer/main.go | 4 +- pkg/tube/kfk2db.go | 2 +- pkg/tube/kfks.go | 2 +- 114 files changed, 199 insertions(+), 211 deletions(-) diff --git a/README.md b/README.md index 993b085..c5c0371 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Data syncing in golang for ClickHouse. -based on [go-zero](https://github.com/tal-tech/go-zero) +based on [go-zero](https://github.com/zeromicro/go-zero) ### ARCH diff --git a/cmd/dm/choperator/choperator.go b/cmd/dm/choperator/choperator.go index 739fc00..70214b4 100644 --- a/cmd/dm/choperator/choperator.go +++ b/cmd/dm/choperator/choperator.go @@ -1,10 +1,10 @@ package choperator import ( - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/dm/util" "github.com/zeromicro/cds/pkg/ckgroup" ckcfg "github.com/zeromicro/cds/pkg/ckgroup/config" + "github.com/zeromicro/go-zero/core/logx" ) type ChOperator interface { diff --git a/cmd/dm/choperator/chproxyoperator.go b/cmd/dm/choperator/chproxyoperator.go index f10adc0..0d963ff 100644 --- a/cmd/dm/choperator/chproxyoperator.go +++ b/cmd/dm/choperator/chproxyoperator.go @@ -4,8 +4,8 @@ import ( "database/sql" "time" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/dm/util" + "github.com/zeromicro/go-zero/core/logx" ) type ( diff --git a/cmd/dm/choperator/ckgroupoperator.go b/cmd/dm/choperator/ckgroupoperator.go index a170206..bfb82d4 100644 --- a/cmd/dm/choperator/ckgroupoperator.go +++ b/cmd/dm/choperator/ckgroupoperator.go @@ -3,9 +3,9 @@ package choperator import ( "time" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/dm/util" "github.com/zeromicro/cds/pkg/ckgroup" + "github.com/zeromicro/go-zero/core/logx" ) type ( diff --git a/cmd/dm/cmd/sync/config/config.go b/cmd/dm/cmd/sync/config/config.go index 2b3af4a..940e97f 100644 --- a/cmd/dm/cmd/sync/config/config.go +++ b/cmd/dm/cmd/sync/config/config.go @@ -1,8 +1,8 @@ package config import ( - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/prometheus" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/prometheus" ) type ( diff --git a/cmd/dm/cmd/sync/dm.go b/cmd/dm/cmd/sync/dm.go index fc04237..8a4ea07 100644 --- a/cmd/dm/cmd/sync/dm.go +++ b/cmd/dm/cmd/sync/dm.go @@ -7,11 +7,11 @@ import ( "time" _ "github.com/go-sql-driver/mysql" - "github.com/tal-tech/go-zero/core/conf" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/dm/cmd/sync/config" "github.com/zeromicro/cds/cmd/dm/module" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/conf" + "github.com/zeromicro/go-zero/core/logx" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" ) diff --git a/cmd/dm/data/mongo2clickhouse.go b/cmd/dm/data/mongo2clickhouse.go index 0ec47a1..402a664 100644 --- a/cmd/dm/data/mongo2clickhouse.go +++ b/cmd/dm/data/mongo2clickhouse.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/dm/choperator" "github.com/zeromicro/cds/cmd/dm/cmd/sync/config" "github.com/zeromicro/cds/cmd/dm/util" "github.com/zeromicro/cds/pkg/mongodbx" + "github.com/zeromicro/go-zero/core/logx" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/cmd/dm/data/mysql2clickhouse.go b/cmd/dm/data/mysql2clickhouse.go index 520e098..782fc52 100644 --- a/cmd/dm/data/mysql2clickhouse.go +++ b/cmd/dm/data/mysql2clickhouse.go @@ -9,10 +9,10 @@ import ( "strings" "time" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/dm/choperator" "github.com/zeromicro/cds/cmd/dm/cmd/sync/config" "github.com/zeromicro/cds/cmd/dm/util" + "github.com/zeromicro/go-zero/core/logx" ) type ( diff --git a/cmd/dm/module/dmprometheus.go b/cmd/dm/module/dmprometheus.go index 83b69d4..48f1171 100644 --- a/cmd/dm/module/dmprometheus.go +++ b/cmd/dm/module/dmprometheus.go @@ -2,8 +2,8 @@ package module import ( prometheus2 "github.com/prometheus/client_golang/prometheus" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/prometheus" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/prometheus" ) type DmPrometheus struct { diff --git a/cmd/dm/module/manager.go b/cmd/dm/module/manager.go index f30b877..64e05de 100644 --- a/cmd/dm/module/manager.go +++ b/cmd/dm/module/manager.go @@ -8,8 +8,8 @@ import ( "strconv" "time" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/dm/cmd/sync/config" + "github.com/zeromicro/go-zero/core/logx" "go.etcd.io/etcd/client/v3/concurrency" ) diff --git a/cmd/dm/module/service.go b/cmd/dm/module/service.go index 3c71e6a..04d66ca 100644 --- a/cmd/dm/module/service.go +++ b/cmd/dm/module/service.go @@ -6,11 +6,11 @@ import ( "errors" "regexp" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/dm/choperator" "github.com/zeromicro/cds/cmd/dm/cmd/sync/config" "github.com/zeromicro/cds/cmd/dm/data" "github.com/zeromicro/cds/pkg/mongodbx" + "github.com/zeromicro/go-zero/core/logx" "go.etcd.io/etcd/client/v3/concurrency" "gopkg.in/mgo.v2/bson" ) diff --git a/cmd/dm/util/clickhousetypeconv.go b/cmd/dm/util/clickhousetypeconv.go index 8f1b87d..b9b2abc 100644 --- a/cmd/dm/util/clickhousetypeconv.go +++ b/cmd/dm/util/clickhousetypeconv.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) func RepairData(mp map[string]interface{}, name2Type map[string]string) ([]interface{}, string, int, error) { diff --git a/cmd/dm/util/mysqltypeconv.go b/cmd/dm/util/mysqltypeconv.go index 8cf4ca6..1261ecd 100644 --- a/cmd/dm/util/mysqltypeconv.go +++ b/cmd/dm/util/mysqltypeconv.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) type ( diff --git a/cmd/galaxy/README.md b/cmd/galaxy/README.md index 2f4000f..285439d 100644 --- a/cmd/galaxy/README.md +++ b/cmd/galaxy/README.md @@ -1,6 +1,6 @@ # Galaxy控制台简介 -本模块基于[go-zero](https://github.com/tal-tech/go-zero)构建，是一个简洁的数据同步后台管理系统。 +本模块基于[go-zero](https://github.com/zeromicro/go-zero)构建，是一个简洁的数据同步后台管理系统。 简单来说，它可以很方便的在Clickhouse建表、全量同步数据和增量同步数据。 diff --git a/cmd/galaxy/galaxy.go b/cmd/galaxy/galaxy.go index 5ec1f80..93b86a5 100644 --- a/cmd/galaxy/galaxy.go +++ b/cmd/galaxy/galaxy.go @@ -4,11 +4,11 @@ import ( "flag" "fmt" - "github.com/tal-tech/go-zero/core/conf" - "github.com/tal-tech/go-zero/rest" "github.com/zeromicro/cds/cmd/galaxy/internal/config" "github.com/zeromicro/cds/cmd/galaxy/internal/handler" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" + "github.com/zeromicro/go-zero/core/conf" + "github.com/zeromicro/go-zero/rest" ) var configFile = flag.String("f", "etc/galaxy-api.yaml", "the config file") diff --git a/cmd/galaxy/internal/clients/dmclient.go b/cmd/galaxy/internal/clients/dmclient.go index b198c0f..342e02e 100644 --- a/cmd/galaxy/internal/clients/dmclient.go +++ b/cmd/galaxy/internal/clients/dmclient.go @@ -6,9 +6,9 @@ import ( "errors" "time" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/dm/cmd/sync/config" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/logx" clientv3 "go.etcd.io/etcd/client/v3" ) diff --git a/cmd/galaxy/internal/clients/rtuclient.go b/cmd/galaxy/internal/clients/rtuclient.go index e6a9a5a..25f9f26 100644 --- a/cmd/galaxy/internal/clients/rtuclient.go +++ b/cmd/galaxy/internal/clients/rtuclient.go @@ -6,9 +6,9 @@ import ( "errors" "time" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/rtu/cmd/sync/config" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/logx" clientv3 "go.etcd.io/etcd/client/v3" ) diff --git a/cmd/galaxy/internal/config/config.go b/cmd/galaxy/internal/config/config.go index 7a6f508..7572a8f 100644 --- a/cmd/galaxy/internal/config/config.go +++ b/cmd/galaxy/internal/config/config.go @@ -1,6 +1,6 @@ package config -import "github.com/tal-tech/go-zero/rest" +import "github.com/zeromicro/go-zero/rest" type Config struct { rest.RestConf diff --git a/cmd/galaxy/internal/handler/addhandler.go b/cmd/galaxy/internal/handler/addhandler.go index 3f897a2..c374dc5 100644 --- a/cmd/galaxy/internal/handler/addhandler.go +++ b/cmd/galaxy/internal/handler/addhandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func addHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/connectoraddhandler.go b/cmd/galaxy/internal/handler/connectoraddhandler.go index 23f818e..61a89a4 100644 --- a/cmd/galaxy/internal/handler/connectoraddhandler.go +++ b/cmd/galaxy/internal/handler/connectoraddhandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func connectorAddHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/connectordeletehandler.go b/cmd/galaxy/internal/handler/connectordeletehandler.go index f2fcf44..72c66ec 100644 --- a/cmd/galaxy/internal/handler/connectordeletehandler.go +++ b/cmd/galaxy/internal/handler/connectordeletehandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func connectorDeleteHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/connectorlisthandler.go b/cmd/galaxy/internal/handler/connectorlisthandler.go index e5ac0b5..6da03a5 100644 --- a/cmd/galaxy/internal/handler/connectorlisthandler.go +++ b/cmd/galaxy/internal/handler/connectorlisthandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func connectorListHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/databaselisthandler.go b/cmd/galaxy/internal/handler/databaselisthandler.go index 2dff148..933f396 100644 --- a/cmd/galaxy/internal/handler/databaselisthandler.go +++ b/cmd/galaxy/internal/handler/databaselisthandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func databaseListHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/dmaddhandler.go b/cmd/galaxy/internal/handler/dmaddhandler.go index 9cb07ed..d2013db 100644 --- a/cmd/galaxy/internal/handler/dmaddhandler.go +++ b/cmd/galaxy/internal/handler/dmaddhandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func dmAddHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/dmdeletehandler.go b/cmd/galaxy/internal/handler/dmdeletehandler.go index 1de8a9f..108f4a0 100644 --- a/cmd/galaxy/internal/handler/dmdeletehandler.go +++ b/cmd/galaxy/internal/handler/dmdeletehandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func dmDeleteHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/dmlisthandler.go b/cmd/galaxy/internal/handler/dmlisthandler.go index 0fd603e..6a19c77 100644 --- a/cmd/galaxy/internal/handler/dmlisthandler.go +++ b/cmd/galaxy/internal/handler/dmlisthandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func dmListHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/dmredohandler.go b/cmd/galaxy/internal/handler/dmredohandler.go index fdb753d..fa7161d 100644 --- a/cmd/galaxy/internal/handler/dmredohandler.go +++ b/cmd/galaxy/internal/handler/dmredohandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func dmRedoHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/dmstophandler.go b/cmd/galaxy/internal/handler/dmstophandler.go index fa087ae..4379785 100644 --- a/cmd/galaxy/internal/handler/dmstophandler.go +++ b/cmd/galaxy/internal/handler/dmstophandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func dmStopHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/execsqlhandler.go b/cmd/galaxy/internal/handler/execsqlhandler.go index dc50c49..9d60ff3 100644 --- a/cmd/galaxy/internal/handler/execsqlhandler.go +++ b/cmd/galaxy/internal/handler/execsqlhandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func execSqlHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/generatecreatesqlhandler.go b/cmd/galaxy/internal/handler/generatecreatesqlhandler.go index b97ddff..0668ae1 100644 --- a/cmd/galaxy/internal/handler/generatecreatesqlhandler.go +++ b/cmd/galaxy/internal/handler/generatecreatesqlhandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func generateCreateSqlHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/getuserinfohandler.go b/cmd/galaxy/internal/handler/getuserinfohandler.go index 831e117..b4de968 100644 --- a/cmd/galaxy/internal/handler/getuserinfohandler.go +++ b/cmd/galaxy/internal/handler/getuserinfohandler.go @@ -3,10 +3,10 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/rest/httpx" "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/rest/httpx" ) func getUserInfoHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/listtablehandler.go b/cmd/galaxy/internal/handler/listtablehandler.go index f92458b..2208919 100644 --- a/cmd/galaxy/internal/handler/listtablehandler.go +++ b/cmd/galaxy/internal/handler/listtablehandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func listTableHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/loginhandler.go b/cmd/galaxy/internal/handler/loginhandler.go index bd6e398..2628680 100644 --- a/cmd/galaxy/internal/handler/loginhandler.go +++ b/cmd/galaxy/internal/handler/loginhandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func loginHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/response.go b/cmd/galaxy/internal/handler/response.go index feb846f..b95fb28 100644 --- a/cmd/galaxy/internal/handler/response.go +++ b/cmd/galaxy/internal/handler/response.go @@ -3,7 +3,7 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/rest/httpx" + "github.com/zeromicro/go-zero/rest/httpx" ) type response struct { diff --git a/cmd/galaxy/internal/handler/routes.go b/cmd/galaxy/internal/handler/routes.go index 30888e0..2e4286d 100644 --- a/cmd/galaxy/internal/handler/routes.go +++ b/cmd/galaxy/internal/handler/routes.go @@ -4,8 +4,8 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/rest" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" + "github.com/zeromicro/go-zero/rest" ) func RegisterHandlers(engine *rest.Server, serverCtx *svc.ServiceContext) { diff --git a/cmd/galaxy/internal/handler/rtuaddhandler.go b/cmd/galaxy/internal/handler/rtuaddhandler.go index fd99176..6891e29 100644 --- a/cmd/galaxy/internal/handler/rtuaddhandler.go +++ b/cmd/galaxy/internal/handler/rtuaddhandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func rtuAddHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/rtudeletehandler.go b/cmd/galaxy/internal/handler/rtudeletehandler.go index 8142286..a3ed328 100644 --- a/cmd/galaxy/internal/handler/rtudeletehandler.go +++ b/cmd/galaxy/internal/handler/rtudeletehandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func rtuDeleteHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/rtulisthandler.go b/cmd/galaxy/internal/handler/rtulisthandler.go index c36ac28..3fb4877 100644 --- a/cmd/galaxy/internal/handler/rtulisthandler.go +++ b/cmd/galaxy/internal/handler/rtulisthandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func rtuListHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/rturedohandler.go b/cmd/galaxy/internal/handler/rturedohandler.go index 12d452e..7ee30cc 100644 --- a/cmd/galaxy/internal/handler/rturedohandler.go +++ b/cmd/galaxy/internal/handler/rturedohandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func rtuRedoHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/handler/rtustophandler.go b/cmd/galaxy/internal/handler/rtustophandler.go index f6d0938..f255698 100644 --- a/cmd/galaxy/internal/handler/rtustophandler.go +++ b/cmd/galaxy/internal/handler/rtustophandler.go @@ -3,11 +3,11 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" logic2 "github.com/zeromicro/cds/cmd/galaxy/internal/logic" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) func rtuStopHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/cmd/galaxy/internal/logic/addlogic.go b/cmd/galaxy/internal/logic/addlogic.go index 0b72f75..e9de88c 100644 --- a/cmd/galaxy/internal/logic/addlogic.go +++ b/cmd/galaxy/internal/logic/addlogic.go @@ -3,9 +3,9 @@ package logic import ( "context" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" ) type AddLogic struct { diff --git a/cmd/galaxy/internal/logic/common.go b/cmd/galaxy/internal/logic/common.go index 35607a3..c2aad19 100644 --- a/cmd/galaxy/internal/logic/common.go +++ b/cmd/galaxy/internal/logic/common.go @@ -5,12 +5,12 @@ import ( "strconv" "strings" - "github.com/tal-tech/go-zero/core/logx" config2 "github.com/zeromicro/cds/cmd/dm/cmd/sync/config" "github.com/zeromicro/cds/cmd/galaxy/internal/model" "github.com/zeromicro/cds/cmd/rtu/cmd/sync/config" "github.com/zeromicro/cds/pkg/mysqlx" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/logx" "go.mongodb.org/mongo-driver/x/mongo/driver/connstring" ) diff --git a/cmd/galaxy/internal/logic/connectoraddlogic.go b/cmd/galaxy/internal/logic/connectoraddlogic.go index a3ae688..e9e289c 100644 --- a/cmd/galaxy/internal/logic/connectoraddlogic.go +++ b/cmd/galaxy/internal/logic/connectoraddlogic.go @@ -6,10 +6,10 @@ import ( "strings" "github.com/go-sql-driver/mysql" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/model" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" "go.mongodb.org/mongo-driver/x/mongo/driver/connstring" ) diff --git a/cmd/galaxy/internal/logic/connectordeletelogic.go b/cmd/galaxy/internal/logic/connectordeletelogic.go index 6c9ddff..46eee00 100644 --- a/cmd/galaxy/internal/logic/connectordeletelogic.go +++ b/cmd/galaxy/internal/logic/connectordeletelogic.go @@ -3,9 +3,9 @@ package logic import ( "context" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" ) type ConnectorDeleteLogic struct { diff --git a/cmd/galaxy/internal/logic/connectorlistlogic.go b/cmd/galaxy/internal/logic/connectorlistlogic.go index 4e414ba..4143737 100644 --- a/cmd/galaxy/internal/logic/connectorlistlogic.go +++ b/cmd/galaxy/internal/logic/connectorlistlogic.go @@ -4,9 +4,9 @@ import ( "context" "unsafe" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" ) type ConnectorListLogic struct { diff --git a/cmd/galaxy/internal/logic/databaselistlogic.go b/cmd/galaxy/internal/logic/databaselistlogic.go index a420b9e..b6293b0 100644 --- a/cmd/galaxy/internal/logic/databaselistlogic.go +++ b/cmd/galaxy/internal/logic/databaselistlogic.go @@ -4,11 +4,11 @@ import ( "context" "strconv" - "github.com/tal-tech/go-zero/core/logx" dmConfig "github.com/zeromicro/cds/cmd/dm/cmd/sync/config" "github.com/zeromicro/cds/cmd/galaxy/internal/clients" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" ) type DatabaseListLogic struct { diff --git a/cmd/galaxy/internal/logic/defaultconfiglogic.go b/cmd/galaxy/internal/logic/defaultconfiglogic.go index df77a49..dd0547c 100644 --- a/cmd/galaxy/internal/logic/defaultconfiglogic.go +++ b/cmd/galaxy/internal/logic/defaultconfiglogic.go @@ -4,10 +4,10 @@ import ( "context" "strings" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/logx" ) type DefaultConfigLogic struct { diff --git a/cmd/galaxy/internal/logic/dmaddlogic.go b/cmd/galaxy/internal/logic/dmaddlogic.go index d8b2edc..19a8f31 100644 --- a/cmd/galaxy/internal/logic/dmaddlogic.go +++ b/cmd/galaxy/internal/logic/dmaddlogic.go @@ -8,7 +8,6 @@ import ( "strings" "github.com/go-sql-driver/mysql" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/dm/cmd/sync/config" "github.com/zeromicro/cds/cmd/galaxy/internal/clients" "github.com/zeromicro/cds/cmd/galaxy/internal/model" @@ -16,6 +15,7 @@ import ( "github.com/zeromicro/cds/cmd/galaxy/internal/types" "github.com/zeromicro/cds/pkg/mongodbx" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/logx" ) type DmAddLogic struct { diff --git a/cmd/galaxy/internal/logic/dmdeletelogic.go b/cmd/galaxy/internal/logic/dmdeletelogic.go index 03982d2..b78d246 100644 --- a/cmd/galaxy/internal/logic/dmdeletelogic.go +++ b/cmd/galaxy/internal/logic/dmdeletelogic.go @@ -4,10 +4,10 @@ import ( "context" "strconv" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/clients" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" ) type DmDeleteLogic struct { diff --git a/cmd/galaxy/internal/logic/dmlistlogic.go b/cmd/galaxy/internal/logic/dmlistlogic.go index c5936b6..e423de0 100644 --- a/cmd/galaxy/internal/logic/dmlistlogic.go +++ b/cmd/galaxy/internal/logic/dmlistlogic.go @@ -6,13 +6,13 @@ import ( "strconv" "time" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/dm/cmd/sync/config" "github.com/zeromicro/cds/cmd/galaxy/internal/clients" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" "github.com/zeromicro/cds/pkg/strx" "github.com/zeromicro/cds/pkg/timex" + "github.com/zeromicro/go-zero/core/logx" ) type DmListLogic struct { diff --git a/cmd/galaxy/internal/logic/dmredologic.go b/cmd/galaxy/internal/logic/dmredologic.go index eb951af..97be302 100644 --- a/cmd/galaxy/internal/logic/dmredologic.go +++ b/cmd/galaxy/internal/logic/dmredologic.go @@ -3,10 +3,10 @@ package logic import ( "context" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/clients" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" ) type DmRedoLogic struct { diff --git a/cmd/galaxy/internal/logic/dmstoplogic.go b/cmd/galaxy/internal/logic/dmstoplogic.go index 239144f..1be040b 100644 --- a/cmd/galaxy/internal/logic/dmstoplogic.go +++ b/cmd/galaxy/internal/logic/dmstoplogic.go @@ -4,11 +4,11 @@ import ( "context" "errors" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/dm/cmd/sync/config" "github.com/zeromicro/cds/cmd/galaxy/internal/clients" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" ) type DmStopLogic struct { diff --git a/cmd/galaxy/internal/logic/execsqllogic.go b/cmd/galaxy/internal/logic/execsqllogic.go index 9f47846..05eedc3 100644 --- a/cmd/galaxy/internal/logic/execsqllogic.go +++ b/cmd/galaxy/internal/logic/execsqllogic.go @@ -4,9 +4,9 @@ import ( "context" "strings" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/pkg/clickhousex" + "github.com/zeromicro/go-zero/core/logx" ) type ExecSqlLogic struct { diff --git a/cmd/galaxy/internal/logic/generatecreatesqllogic.go b/cmd/galaxy/internal/logic/generatecreatesqllogic.go index 0a1980f..4980679 100644 --- a/cmd/galaxy/internal/logic/generatecreatesqllogic.go +++ b/cmd/galaxy/internal/logic/generatecreatesqllogic.go @@ -4,11 +4,11 @@ import ( "context" "strings" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" "github.com/zeromicro/cds/pkg/mongodbx" "github.com/zeromicro/cds/pkg/mysqlx" + "github.com/zeromicro/go-zero/core/logx" ) type GenerateCreateSqlLogic struct { diff --git a/cmd/galaxy/internal/logic/getlogic.go b/cmd/galaxy/internal/logic/getlogic.go index 8bef4c4..de68a2b 100644 --- a/cmd/galaxy/internal/logic/getlogic.go +++ b/cmd/galaxy/internal/logic/getlogic.go @@ -3,10 +3,10 @@ package logic import ( "context" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/model" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" ) type GetLogic struct { diff --git a/cmd/galaxy/internal/logic/getuserinfologic.go b/cmd/galaxy/internal/logic/getuserinfologic.go index dca5e09..808f41c 100644 --- a/cmd/galaxy/internal/logic/getuserinfologic.go +++ b/cmd/galaxy/internal/logic/getuserinfologic.go @@ -3,10 +3,10 @@ package logic import ( "context" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/model" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" ) type GetUserInfoLogic struct { diff --git a/cmd/galaxy/internal/logic/listdatabaseslogic.go b/cmd/galaxy/internal/logic/listdatabaseslogic.go index 03c1547..0914adf 100644 --- a/cmd/galaxy/internal/logic/listdatabaseslogic.go +++ b/cmd/galaxy/internal/logic/listdatabaseslogic.go @@ -4,10 +4,10 @@ import ( "context" "sort" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" "github.com/zeromicro/cds/pkg/clickhousex" + "github.com/zeromicro/go-zero/core/logx" ) type ListDatabasesLogic struct { diff --git a/cmd/galaxy/internal/logic/listtablelogic.go b/cmd/galaxy/internal/logic/listtablelogic.go index 114cfa8..cacfa75 100644 --- a/cmd/galaxy/internal/logic/listtablelogic.go +++ b/cmd/galaxy/internal/logic/listtablelogic.go @@ -6,11 +6,11 @@ import ( "sort" "strings" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" "github.com/zeromicro/cds/pkg/mongodbx" "github.com/zeromicro/cds/pkg/mysqlx" + "github.com/zeromicro/go-zero/core/logx" ) type ListTableLogic struct { diff --git a/cmd/galaxy/internal/logic/loginlogic.go b/cmd/galaxy/internal/logic/loginlogic.go index f9828e5..68b05ea 100644 --- a/cmd/galaxy/internal/logic/loginlogic.go +++ b/cmd/galaxy/internal/logic/loginlogic.go @@ -6,10 +6,10 @@ import ( "time" "github.com/golang-jwt/jwt" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stores/sqlx" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) type LoginLogic struct { diff --git a/cmd/galaxy/internal/logic/rtuaddlogic.go b/cmd/galaxy/internal/logic/rtuaddlogic.go index 141cd9a..ad42120 100644 --- a/cmd/galaxy/internal/logic/rtuaddlogic.go +++ b/cmd/galaxy/internal/logic/rtuaddlogic.go @@ -7,13 +7,13 @@ import ( "strings" "github.com/go-sql-driver/mysql" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/dm/cmd/sync/config" "github.com/zeromicro/cds/cmd/galaxy/internal/model" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" "github.com/zeromicro/cds/pkg/mongodbx" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/logx" ) type RtuAddLogic struct { diff --git a/cmd/galaxy/internal/logic/rtudeletelogic.go b/cmd/galaxy/internal/logic/rtudeletelogic.go index c7724a4..528b46e 100644 --- a/cmd/galaxy/internal/logic/rtudeletelogic.go +++ b/cmd/galaxy/internal/logic/rtudeletelogic.go @@ -5,12 +5,12 @@ import ( "encoding/json" "strconv" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/clients" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" "github.com/zeromicro/cds/cmd/rtu/cmd/sync/config" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/logx" ) type RtuDeleteLogic struct { diff --git a/cmd/galaxy/internal/logic/rtulistlogic.go b/cmd/galaxy/internal/logic/rtulistlogic.go index 17a2ebf..8a1de15 100644 --- a/cmd/galaxy/internal/logic/rtulistlogic.go +++ b/cmd/galaxy/internal/logic/rtulistlogic.go @@ -6,13 +6,13 @@ import ( "strconv" "time" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/clients" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" "github.com/zeromicro/cds/cmd/rtu/cmd/sync/config" "github.com/zeromicro/cds/pkg/strx" "github.com/zeromicro/cds/pkg/timex" + "github.com/zeromicro/go-zero/core/logx" ) type RtuListLogic struct { diff --git a/cmd/galaxy/internal/logic/rturedologic.go b/cmd/galaxy/internal/logic/rturedologic.go index 0dd29d1..f1bb23e 100644 --- a/cmd/galaxy/internal/logic/rturedologic.go +++ b/cmd/galaxy/internal/logic/rturedologic.go @@ -5,12 +5,12 @@ import ( "encoding/json" "strconv" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/clients" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" "github.com/zeromicro/cds/cmd/rtu/cmd/sync/config" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/logx" ) type RtuRedoLogic struct { diff --git a/cmd/galaxy/internal/logic/rtustoplogic.go b/cmd/galaxy/internal/logic/rtustoplogic.go index 8f69e5d..a54b4d6 100644 --- a/cmd/galaxy/internal/logic/rtustoplogic.go +++ b/cmd/galaxy/internal/logic/rtustoplogic.go @@ -6,12 +6,12 @@ import ( "errors" "strconv" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/galaxy/internal/clients" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/cmd/galaxy/internal/types" "github.com/zeromicro/cds/cmd/rtu/cmd/sync/config" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/logx" ) type RtuStopLogic struct { diff --git a/cmd/galaxy/wrap/wrap.go b/cmd/galaxy/wrap/wrap.go index a79fe65..1303885 100644 --- a/cmd/galaxy/wrap/wrap.go +++ b/cmd/galaxy/wrap/wrap.go @@ -3,12 +3,12 @@ package wrap import ( "flag" - "github.com/tal-tech/go-zero/core/conf" - "github.com/tal-tech/go-zero/rest" "github.com/zeromicro/cds/cmd/galaxy/internal/config" "github.com/zeromicro/cds/cmd/galaxy/internal/handler" "github.com/zeromicro/cds/cmd/galaxy/internal/svc" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/conf" + "github.com/zeromicro/go-zero/rest" ) var configFile = flag.String("f", "etc/galaxy-api.yaml", "the config file") diff --git a/cmd/rtu/cmd/sync/config/config.go b/cmd/rtu/cmd/sync/config/config.go index 8f928b8..152c252 100644 --- a/cmd/rtu/cmd/sync/config/config.go +++ b/cmd/rtu/cmd/sync/config/config.go @@ -1,8 +1,8 @@ package config import ( - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/prometheus" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/prometheus" ) type subscriberConf struct { diff --git a/cmd/rtu/cmd/sync/rtu.go b/cmd/rtu/cmd/sync/rtu.go index 037cd04..00d2893 100644 --- a/cmd/rtu/cmd/sync/rtu.go +++ b/cmd/rtu/cmd/sync/rtu.go @@ -11,12 +11,12 @@ import ( "syscall" "time" - "github.com/tal-tech/go-zero/core/conf" - "github.com/tal-tech/go-zero/core/logx" - _ "github.com/tal-tech/go-zero/core/proc" - "github.com/tal-tech/go-zero/core/prometheus" "github.com/zeromicro/cds/cmd/rtu/cmd/sync/config" "github.com/zeromicro/cds/cmd/rtu/handle" + "github.com/zeromicro/go-zero/core/conf" + "github.com/zeromicro/go-zero/core/logx" + _ "github.com/zeromicro/go-zero/core/proc" + "github.com/zeromicro/go-zero/core/prometheus" ) func showVersion() { diff --git a/cmd/rtu/handle/common.go b/cmd/rtu/handle/common.go index 0153ca8..0280821 100644 --- a/cmd/rtu/handle/common.go +++ b/cmd/rtu/handle/common.go @@ -6,10 +6,10 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/rtu/cmd/sync/config" "github.com/zeromicro/cds/cmd/rtu/monitor" "github.com/zeromicro/cds/pkg/ckgroup" + "github.com/zeromicro/go-zero/core/logx" clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/atomic" ) diff --git a/cmd/rtu/handle/etcdjob.go b/cmd/rtu/handle/etcdjob.go index bc4f134..918a183 100644 --- a/cmd/rtu/handle/etcdjob.go +++ b/cmd/rtu/handle/etcdjob.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/rtu/cmd/sync/config" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/logx" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/client/v3/concurrency" ) diff --git a/cmd/rtu/handle/input.go b/cmd/rtu/handle/input.go index 05ae883..73a2229 100644 --- a/cmd/rtu/handle/input.go +++ b/cmd/rtu/handle/input.go @@ -5,9 +5,9 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/core/logx" util "github.com/zeromicro/cds/cmd/rtu/utils" "github.com/zeromicro/cds/pkg/tube" + "github.com/zeromicro/go-zero/core/logx" ) type inputEngine struct { diff --git a/cmd/rtu/handle/insert.go b/cmd/rtu/handle/insert.go index 639faef..0e2c92a 100644 --- a/cmd/rtu/handle/insert.go +++ b/cmd/rtu/handle/insert.go @@ -5,9 +5,9 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/rtu/model" util "github.com/zeromicro/cds/cmd/rtu/utils" + "github.com/zeromicro/go-zero/core/logx" ) // ErrPrimarykeyMiss 主键不存在 diff --git a/cmd/rtu/handle/parse.go b/cmd/rtu/handle/parse.go index 5b921e7..106338f 100644 --- a/cmd/rtu/handle/parse.go +++ b/cmd/rtu/handle/parse.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/rtu/model" util "github.com/zeromicro/cds/cmd/rtu/utils" + "github.com/zeromicro/go-zero/core/logx" ) var ( diff --git a/cmd/rtu/handle/rtujob.go b/cmd/rtu/handle/rtujob.go index 8a9e893..aeb11af 100644 --- a/cmd/rtu/handle/rtujob.go +++ b/cmd/rtu/handle/rtujob.go @@ -6,12 +6,12 @@ import ( "sync/atomic" "time" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/rtu/cmd/sync/config" "github.com/zeromicro/cds/cmd/rtu/model" "github.com/zeromicro/cds/cmd/rtu/monitor" "github.com/zeromicro/cds/pkg/ckgroup" groupcfg "github.com/zeromicro/cds/pkg/ckgroup/config" + "github.com/zeromicro/go-zero/core/logx" clientv3 "go.etcd.io/etcd/client/v3" ) diff --git a/cmd/rtu/handle/run.go b/cmd/rtu/handle/run.go index bf81c8c..33e1554 100644 --- a/cmd/rtu/handle/run.go +++ b/cmd/rtu/handle/run.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/rtu/cmd/sync/config" + "github.com/zeromicro/go-zero/core/logx" clientv3 "go.etcd.io/etcd/client/v3" ) diff --git a/cmd/rtu/handle/tablecolumn.go b/cmd/rtu/handle/tablecolumn.go index a4fcc9d..8736168 100644 --- a/cmd/rtu/handle/tablecolumn.go +++ b/cmd/rtu/handle/tablecolumn.go @@ -7,8 +7,8 @@ import ( "fmt" "strings" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/rtu/model" + "github.com/zeromicro/go-zero/core/logx" ) // GetClickhouseTableColumn 获取 clickhouse 列信息 diff --git a/cmd/rtu/handle/utils.go b/cmd/rtu/handle/utils.go index a121764..d130b3d 100644 --- a/cmd/rtu/handle/utils.go +++ b/cmd/rtu/handle/utils.go @@ -3,8 +3,8 @@ package handle import ( "database/sql" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/cmd/rtu/model" + "github.com/zeromicro/go-zero/core/logx" ) // QueryRows 关系型数据库多行查询 diff --git a/cmd/rtu/model/canalsyncmodel.go b/cmd/rtu/model/canalsyncmodel.go index 59c62ea..0d768dd 100644 --- a/cmd/rtu/model/canalsyncmodel.go +++ b/cmd/rtu/model/canalsyncmodel.go @@ -6,7 +6,7 @@ import ( "time" "unsafe" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) type ( diff --git a/cmd/rtu/model/connectormongomodel.go b/cmd/rtu/model/connectormongomodel.go index 0d1edbc..39b971c 100644 --- a/cmd/rtu/model/connectormongomodel.go +++ b/cmd/rtu/model/connectormongomodel.go @@ -5,7 +5,7 @@ import ( "reflect" "strconv" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) type ( diff --git a/cmd/rtu/model/debeziumsyncmodel.go b/cmd/rtu/model/debeziumsyncmodel.go index d9a4424..6e9b6be 100644 --- a/cmd/rtu/model/debeziumsyncmodel.go +++ b/cmd/rtu/model/debeziumsyncmodel.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) // GetOp 获取 opLog/binLog 的操作类型 diff --git a/cmd/rtu/monitor/countvec_test.go b/cmd/rtu/monitor/countvec_test.go index 0f10268..5468028 100644 --- a/cmd/rtu/monitor/countvec_test.go +++ b/cmd/rtu/monitor/countvec_test.go @@ -9,7 +9,7 @@ import ( "regexp" "testing" - "github.com/tal-tech/go-zero/core/prometheus" + "github.com/zeromicro/go-zero/core/prometheus" ) func TestExample(t *testing.T) { diff --git a/cmd/rtu/utils/recover.go b/cmd/rtu/utils/recover.go index 99e9df2..67bbd34 100644 --- a/cmd/rtu/utils/recover.go +++ b/cmd/rtu/utils/recover.go @@ -5,7 +5,7 @@ import ( "log" "runtime/debug" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) // Recover 捕获 panic 并发送错误 diff --git a/go.mod b/go.mod index b52efac..7a981df 100644 --- a/go.mod +++ b/go.mod @@ -13,12 +13,11 @@ require ( github.com/prometheus/client_golang v1.11.0 github.com/segmentio/kafka-go v0.4.16 github.com/stretchr/testify v1.7.0 - github.com/tal-tech/go-zero v1.2.4 go.etcd.io/etcd/client/v3 v3.5.1 go.mongodb.org/mongo-driver v1.5.3 go.uber.org/atomic v1.8.0 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac + golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 ) @@ -28,5 +27,6 @@ require ( github.com/xdg/scram v1.0.3 // indirect github.com/xdg/stringprep v1.0.3 // indirect github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect + github.com/zeromicro/go-zero v1.3.0 go.uber.org/multierr v1.7.0 // indirect ) diff --git a/go.sum b/go.sum index 5c661ba..4154b4b 100644 --- a/go.sum +++ b/go.sum @@ -50,9 +50,7 @@ github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb0 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/sarama v1.30.0/go.mod h1:zujlQQx1kzHsh4jfV1USnptCQrHAEZ2Hk8fTKCulPVs= -github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/Shopify/toxiproxy/v2 v2.1.6-0.20210914104332-15ea381dcdae/go.mod h1:/cvHQkZ1fst0EmZnA5dFtiQdWCNCFYzb+uE2vqVgvx0= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -60,9 +58,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc= -github.com/alicebob/miniredis/v2 v2.16.0/go.mod h1:gquAfGbzn92jvtrSC69+6zZnwSODVXVpYDRaGhWaL6I= +github.com/alicebob/miniredis/v2 v2.17.0/go.mod h1:gquAfGbzn92jvtrSC69+6zZnwSODVXVpYDRaGhWaL6I= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210521184019-c5ad59b459ec/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/aws/aws-sdk-go v1.38.68 h1:aOG8geU4SohNp659eKBHRBgbqSrZ6jNZlfimIuJAwL8= @@ -96,7 +93,6 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -107,14 +103,12 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/proto v1.9.1/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -124,8 +118,7 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= +github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY= @@ -147,6 +140,13 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.2 h1:ahHml/yUpnlb96Rp8HCvtYVPY8ZYpxq3g7UYchIYwbs= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= @@ -196,6 +196,8 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt v3.2.1+incompatible h1:73Z+4BJcrTC+KczS6WvTPvRGOp1WmfEP4Q1lOd9Z/+c= github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU= +github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -226,7 +228,6 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -263,8 +264,6 @@ github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= -github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= @@ -277,7 +276,6 @@ github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= @@ -326,18 +324,15 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= +github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= @@ -360,23 +355,20 @@ github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+ github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= -github.com/openzipkin/zipkin-go v0.3.0 h1:XtuXmOLIXLjiU2XduuWREDT0LOKtSgos/g7i7RYyoZQ= github.com/openzipkin/zipkin-go v0.3.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ= +github.com/openzipkin/zipkin-go v0.4.0 h1:CtfRrOVZtbDj8rt1WXjklw0kqqJQwICrCKmlfUuBUUw= +github.com/openzipkin/zipkin-go v0.4.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= -github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= @@ -385,7 +377,6 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -409,14 +400,13 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/rabbitmq/amqp091-go v1.1.0/go.mod h1:ogQDLSOACsLPsIq0NpbtiifNZi2YOz0VTJ0kHRghqbM= -github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/segmentio/kafka-go v0.4.16 h1:9dt78ehM9qzAkekA60D6A96RlqDzC3hnYYa8y5Szd+U= github.com/segmentio/kafka-go v0.4.16/go.mod h1:19+Eg7KwrNKy/PFhiIthEPkO8k+ac7/ZYXwYM9Df10w= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= @@ -434,7 +424,6 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3 github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= @@ -446,11 +435,8 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/tal-tech/go-zero v1.2.4 h1:S0Cj69rHfIbZBVgQHnblR2dGkhz5Ij3bm1lM19kkig4= -github.com/tal-tech/go-zero v1.2.4/go.mod h1:EHOQsRClBD4svg5mJl8iqkQn5bTMZx+AeHwkQpSjJXg= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/urfave/cli v1.22.5/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= @@ -473,8 +459,8 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA= -github.com/zeromicro/antlr v0.0.1/go.mod h1:nfpjEwFR6Q4xGDJMcZnCL9tEfQRgszMwu3rDz2Z+p5M= -github.com/zeromicro/ddl-parser v0.0.0-20210712021150-63520aca7348/go.mod h1:ISU/8NuPyEpl9pa17Py9TBPetMjtsiHrb9f5XGiYbo8= +github.com/zeromicro/go-zero v1.3.0 h1:Eyn36yBtR043sm4YKmxR6eS3UA/GtZDktQ+UqIJ3Lm0= +github.com/zeromicro/go-zero v1.3.0/go.mod h1:Hy4o1VFAt32lXaQMbaBhoFeZjA/rJqJ4PTGNdGsURcc= go.etcd.io/etcd/api/v3 v3.5.1 h1:v28cktvBq+7vGyJXF8G+rWJmj+1XUmMtqcLnH8hDocM= go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.1 h1:XIQcHCFSG53bJETYeRJtIxdLv2EWRGxcfzR8lSnTH4E= @@ -488,22 +474,23 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/otel v1.1.0 h1:8p0uMLcyyIx0KHNTgO8o3CW8A1aA+dJZJW6PvnMz0Wc= -go.opentelemetry.io/otel v1.1.0/go.mod h1:7cww0OW51jQ8IaZChIEdqLwgh+44+7uiTdWsAL0wQpA= -go.opentelemetry.io/otel/exporters/jaeger v1.1.0 h1:VRF+Hf3EePFO6ab7/wfPoyWzSY4z5X0tTvQtV9/Mq8Y= -go.opentelemetry.io/otel/exporters/jaeger v1.1.0/go.mod h1:D/GIBwAdrFTTqCy1iITpC9nh5rgJpIbFVgkhlz2vCXk= -go.opentelemetry.io/otel/exporters/zipkin v1.1.0 h1:NfP5auMWoVOYnAeQPY+fxNG8UMAu94heSL4rtOL8Bsg= -go.opentelemetry.io/otel/exporters/zipkin v1.1.0/go.mod h1:LZwDnf1mVGTPMq9hdRUHfFBH30SuQvZ1BJaVywpg0VI= -go.opentelemetry.io/otel/sdk v1.1.0 h1:j/1PngUJIDOddkCILQYTevrTIbWd494djgGkSsMit+U= -go.opentelemetry.io/otel/sdk v1.1.0/go.mod h1:3aQvM6uLm6C4wJpHtT8Od3vNzeZ34Pqc6bps8MywWzo= -go.opentelemetry.io/otel/trace v1.1.0 h1:N25T9qCL0+7IpOT8RrRy0WYlL7y6U0WiUJzXcVdXY/o= -go.opentelemetry.io/otel/trace v1.1.0/go.mod h1:i47XtdcBQiktu5IsrPqOHe8w+sBmnLwwHt8wiUsWGTI= +go.opentelemetry.io/otel v1.3.0 h1:APxLf0eiBwLl+SOXiJJCVYzA1OOJNyAoV8C5RNRyy7Y= +go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= +go.opentelemetry.io/otel/exporters/jaeger v1.3.0 h1:HfydzioALdtcB26H5WHc4K47iTETJCdloL7VN579/L0= +go.opentelemetry.io/otel/exporters/jaeger v1.3.0/go.mod h1:KoYHi1BtkUPncGSRtCe/eh1ijsnePhSkxwzz07vU0Fc= +go.opentelemetry.io/otel/exporters/zipkin v1.3.0 h1:uOD28dZ7yIKITTcUS6MeAGNHYy3uhP7DTkhcJM6onlQ= +go.opentelemetry.io/otel/exporters/zipkin v1.3.0/go.mod h1:LxGGfHIYbvsFnrJtBcazb0yG24xHdDGrT/H6RB9r3+8= +go.opentelemetry.io/otel/sdk v1.3.0 h1:3278edCoH89MEJ0Ky8WQXVmDQv3FX4ZJ3Pp+9fJreAI= +go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= +go.opentelemetry.io/otel/trace v1.3.0 h1:doy8Hzb1RJ+I3yFhtDmwNc7tIyw1tNMOIsyPzp1NOGY= +go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.8.0 h1:CUhrE4N1rqSE6FM9ecihEjRkLQu8cDfgDyoOs83mEY4= go.uber.org/atomic v1.8.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/automaxprocs v1.4.0 h1:CpDZl6aOlLhReez+8S3eEotD7Jx0Os++lemPlMULQP0= go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= +go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= @@ -593,8 +580,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b h1:eB48h3HiRycXNy8E0Gf5e0hv7YT6Kt14L/D73G1fuwo= -golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d h1:1n1fc535VhN8SYtD4cDUyNlfpAF2ROMM9+11equK3hs= +golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -620,7 +607,6 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -669,8 +655,8 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211106132015-ebca88c72f68 h1:Ywe/f3fNleF8I6F6qv3MeFoSZ6CTf2zBMMa/7qVML8M= -golang.org/x/sys v0.0.0-20211106132015-ebca88c72f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220111092808-5a964db01320 h1:0jf+tOCoZ3LyutmCOWpVni1chK4VfFLhRsDK7MhqGRY= +golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -685,8 +671,8 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs= -golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 h1:GZokNIeuVkl3aZHJchRrr13WCsols02MLUcz1U9is6M= +golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -737,6 +723,7 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -795,8 +782,8 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210928142010-c7af6a1a74c9 h1:XTH066D35LyHehRwlYhoK3qA+Hcgvg5xREG4kFQEW1Y= -google.golang.org/genproto v0.0.0-20210928142010-c7af6a1a74c9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220112215332-a9c7c0acf9f2 h1:z+R4M/SuyaRsj1zu3WC+nIQyfSrSIpuDcY01/R3uCtg= +google.golang.org/genproto v0.0.0-20220112215332-a9c7c0acf9f2/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -814,8 +801,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= -google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM= +google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -870,6 +857,7 @@ k8s.io/client-go v0.20.12/go.mod h1:NBJj6Evp73Xy/4v/O/RDRaH0+3JoxNfjRxkyRgrdbsA= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= diff --git a/pkg/canalx/canalx.go b/pkg/canalx/canalx.go index 14ff85d..3291a7f 100644 --- a/pkg/canalx/canalx.go +++ b/pkg/canalx/canalx.go @@ -11,7 +11,7 @@ import ( "time" "github.com/go-sql-driver/mysql" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) type ( diff --git a/pkg/ckgroup/ckconn.go b/pkg/ckgroup/ckconn.go index b84682b..a168ab0 100644 --- a/pkg/ckgroup/ckconn.go +++ b/pkg/ckgroup/ckconn.go @@ -6,7 +6,7 @@ import ( "reflect" "time" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) type CKConn interface { diff --git a/pkg/ckgroup/ckconn_test.go b/pkg/ckgroup/ckconn_test.go index f37db9f..5d86e78 100644 --- a/pkg/ckgroup/ckconn_test.go +++ b/pkg/ckgroup/ckconn_test.go @@ -9,9 +9,9 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stores/sqlx" "github.com/zeromicro/cds/pkg/ckgroup/dbtesttool/dbtool" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) const ( diff --git a/pkg/ckgroup/ckgroup.go b/pkg/ckgroup/ckgroup.go index 428b08b..b80264c 100644 --- a/pkg/ckgroup/ckgroup.go +++ b/pkg/ckgroup/ckgroup.go @@ -5,8 +5,8 @@ import ( "sort" _ "github.com/ClickHouse/clickhouse-go" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/pkg/ckgroup/config" + "github.com/zeromicro/go-zero/core/logx" ) type ( diff --git a/pkg/ckgroup/common.go b/pkg/ckgroup/common.go index 22cacac..e7cd991 100644 --- a/pkg/ckgroup/common.go +++ b/pkg/ckgroup/common.go @@ -13,7 +13,7 @@ import ( "unsafe" "github.com/dchest/siphash" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) const ( diff --git a/pkg/ckgroup/dbtesttool/dbtool/dbtool.go b/pkg/ckgroup/dbtesttool/dbtool/dbtool.go index 22b30f4..6f31e30 100644 --- a/pkg/ckgroup/dbtesttool/dbtool/dbtool.go +++ b/pkg/ckgroup/dbtesttool/dbtool/dbtool.go @@ -1,8 +1,8 @@ package dbtool import ( - "github.com/tal-tech/go-zero/core/stores/mongo" - "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/stores/mongo" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) type ( diff --git a/pkg/ckgroup/dbtesttool/dbtool/insert.go b/pkg/ckgroup/dbtesttool/dbtool/insert.go index 2de20c3..8097ce0 100644 --- a/pkg/ckgroup/dbtesttool/dbtool/insert.go +++ b/pkg/ckgroup/dbtesttool/dbtool/insert.go @@ -5,8 +5,8 @@ import ( "fmt" "sync" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) const ( diff --git a/pkg/ckgroup/dbtesttool/dbtool/update.go b/pkg/ckgroup/dbtesttool/dbtool/update.go index e01d18d..4607aa8 100644 --- a/pkg/ckgroup/dbtesttool/dbtool/update.go +++ b/pkg/ckgroup/dbtesttool/dbtool/update.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) const ( diff --git a/pkg/ckgroup/exec.go b/pkg/ckgroup/exec.go index 6a9787a..62decb6 100644 --- a/pkg/ckgroup/exec.go +++ b/pkg/ckgroup/exec.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" "golang.org/x/sync/errgroup" ) diff --git a/pkg/ckgroup/exportutil.go b/pkg/ckgroup/exportutil.go index 1a2cb83..9871257 100644 --- a/pkg/ckgroup/exportutil.go +++ b/pkg/ckgroup/exportutil.go @@ -5,7 +5,7 @@ import ( "errors" "reflect" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) // Deprecated diff --git a/pkg/ckgroup/insert.go b/pkg/ckgroup/insert.go index d176bfe..cf2cd69 100644 --- a/pkg/ckgroup/insert.go +++ b/pkg/ckgroup/insert.go @@ -9,7 +9,7 @@ import ( "sync" "github.com/dchest/siphash" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" "golang.org/x/sync/errgroup" ) diff --git a/pkg/ckgroup/insert_test.go b/pkg/ckgroup/insert_test.go index b58a4a6..4c57d24 100644 --- a/pkg/ckgroup/insert_test.go +++ b/pkg/ckgroup/insert_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/tal-tech/go-zero/core/stores/sqlx" "github.com/zeromicro/cds/pkg/ckgroup/dbtesttool/dbtool" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) func Test_dbGroup_InsertAuto(t *testing.T) { diff --git a/pkg/ckgroup/keepalive.go b/pkg/ckgroup/keepalive.go index 8061406..f721a88 100644 --- a/pkg/ckgroup/keepalive.go +++ b/pkg/ckgroup/keepalive.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) var aliveOnce = sync.Once{} diff --git a/pkg/ckgroup/shardconn.go b/pkg/ckgroup/shardconn.go index a22da6b..06aa8df 100644 --- a/pkg/ckgroup/shardconn.go +++ b/pkg/ckgroup/shardconn.go @@ -5,8 +5,8 @@ import ( "fmt" "math/rand" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/pkg/ckgroup/config" + "github.com/zeromicro/go-zero/core/logx" ) type ShardConn interface { diff --git a/pkg/clickhousex/clickhousemodel.go b/pkg/clickhousex/clickhousemodel.go index 5569e89..d43ec0a 100644 --- a/pkg/clickhousex/clickhousemodel.go +++ b/pkg/clickhousex/clickhousemodel.go @@ -9,11 +9,11 @@ import ( "strings" "time" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stores/clickhouse" - "github.com/tal-tech/go-zero/core/stores/sqlx" "github.com/zeromicro/cds/pkg/numx" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stores/clickhouse" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) type ClickHouseClusterModel struct { diff --git a/pkg/clickhousex/clickhousex.go b/pkg/clickhousex/clickhousex.go index 7e79d51..89aa820 100644 --- a/pkg/clickhousex/clickhousex.go +++ b/pkg/clickhousex/clickhousex.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stores/clickhouse" - "github.com/tal-tech/go-zero/core/stores/sqlx" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stores/clickhouse" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) type ( diff --git a/pkg/clickhousex/pool.go b/pkg/clickhousex/pool.go index 5a24385..ec749c6 100644 --- a/pkg/clickhousex/pool.go +++ b/pkg/clickhousex/pool.go @@ -4,9 +4,9 @@ import ( "database/sql" "sync" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stores/clickhouse" - "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stores/clickhouse" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) var ( diff --git a/pkg/clickhousex/table.go b/pkg/clickhousex/table.go index 319362f..fbed018 100644 --- a/pkg/clickhousex/table.go +++ b/pkg/clickhousex/table.go @@ -1,7 +1,7 @@ package clickhousex import ( - "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) type Column struct { diff --git a/pkg/cryptox/aes.go b/pkg/cryptox/aes.go index ce8b4a1..a476095 100644 --- a/pkg/cryptox/aes.go +++ b/pkg/cryptox/aes.go @@ -10,7 +10,7 @@ import ( "fmt" "io" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) func createHash(key string) string { diff --git a/pkg/debeziumx/debeziumx.go b/pkg/debeziumx/debeziumx.go index 1b3e5fe..21880f7 100644 --- a/pkg/debeziumx/debeziumx.go +++ b/pkg/debeziumx/debeziumx.go @@ -12,9 +12,9 @@ import ( "strings" "github.com/go-sql-driver/mysql" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/pkg/numx" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/logx" ) type Debeziumx struct { diff --git a/pkg/mongodbx/clickhouse.go b/pkg/mongodbx/clickhouse.go index 84695de..58c0de6 100644 --- a/pkg/mongodbx/clickhouse.go +++ b/pkg/mongodbx/clickhouse.go @@ -7,8 +7,8 @@ import ( "sort" "time" - "github.com/tal-tech/go-zero/core/logx" table2 "github.com/zeromicro/cds/pkg/table" + "github.com/zeromicro/go-zero/core/logx" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/mongodbx/mongodbx.go b/pkg/mongodbx/mongodbx.go index e1183d3..644ec71 100644 --- a/pkg/mongodbx/mongodbx.go +++ b/pkg/mongodbx/mongodbx.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/x/bsonx" diff --git a/pkg/mongodbx/mongomodel.go b/pkg/mongodbx/mongomodel.go index 75f6b1f..b7e4b7b 100644 --- a/pkg/mongodbx/mongomodel.go +++ b/pkg/mongodbx/mongomodel.go @@ -6,8 +6,8 @@ import ( "log" "reflect" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/logx" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" diff --git a/pkg/mongodbx/pool.go b/pkg/mongodbx/pool.go index 50cc494..498f026 100644 --- a/pkg/mongodbx/pool.go +++ b/pkg/mongodbx/pool.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" ) diff --git a/pkg/mysqlx/clickhouse.go b/pkg/mysqlx/clickhouse.go index cd4ad2a..a88cd5c 100644 --- a/pkg/mysqlx/clickhouse.go +++ b/pkg/mysqlx/clickhouse.go @@ -4,9 +4,9 @@ import ( "errors" "strings" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/pkg/strx" table2 "github.com/zeromicro/cds/pkg/table" + "github.com/zeromicro/go-zero/core/logx" ) func ToClickhouseTable(dsn, db, table, indexes string, withTime bool) ([]string, string, error) { diff --git a/pkg/mysqlx/mysqlmodel.go b/pkg/mysqlx/mysqlmodel.go index c15b32e..1f1b1e7 100644 --- a/pkg/mysqlx/mysqlmodel.go +++ b/pkg/mysqlx/mysqlmodel.go @@ -7,9 +7,9 @@ import ( "strconv" "strings" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stores/sqlx" "github.com/zeromicro/cds/pkg/strx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) type ( diff --git a/pkg/mysqlx/mysqlx.go b/pkg/mysqlx/mysqlx.go index 7d46a51..276b829 100644 --- a/pkg/mysqlx/mysqlx.go +++ b/pkg/mysqlx/mysqlx.go @@ -8,8 +8,8 @@ import ( "time" "github.com/go-sql-driver/mysql" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) type count struct { diff --git a/pkg/mysqlx/pool.go b/pkg/mysqlx/pool.go index 9c9bdb3..ddf501b 100644 --- a/pkg/mysqlx/pool.go +++ b/pkg/mysqlx/pool.go @@ -4,8 +4,8 @@ import ( "database/sql" "sync" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) var ( diff --git a/pkg/tube/examples/streamconsumer/main.go b/pkg/tube/examples/streamconsumer/main.go index 2f8f3f5..cfb2157 100644 --- a/pkg/tube/examples/streamconsumer/main.go +++ b/pkg/tube/examples/streamconsumer/main.go @@ -7,9 +7,9 @@ import ( "log" "time" - "github.com/tal-tech/go-zero/core/conf" - "github.com/tal-tech/go-zero/core/logx" "github.com/zeromicro/cds/pkg/tube" + "github.com/zeromicro/go-zero/core/conf" + "github.com/zeromicro/go-zero/core/logx" ) var configFile = flag.String("f", "service/hera/base/tube/examples/config.yml", "The configure file") diff --git a/pkg/tube/kfk2db.go b/pkg/tube/kfk2db.go index 543d206..0bb69a9 100644 --- a/pkg/tube/kfk2db.go +++ b/pkg/tube/kfk2db.go @@ -6,7 +6,7 @@ import ( "errors" "time" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) // Kfk2Db simple pull kafka data to clickhouse diff --git a/pkg/tube/kfks.go b/pkg/tube/kfks.go index 2cbe046..ff5ac93 100644 --- a/pkg/tube/kfks.go +++ b/pkg/tube/kfks.go @@ -9,7 +9,7 @@ import ( "time" "github.com/segmentio/kafka-go" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) type partitionMessages struct {