From 0a7e0cce77f8673116c8199d272d595cea5e39eb Mon Sep 17 00:00:00 2001 From: kevin Date: Sat, 8 Aug 2020 16:40:10 +0800 Subject: [PATCH] update package reference --- core/bloom/bloom.go | 4 +- core/bloom/bloom_test.go | 3 +- core/breaker/breaker.go | 8 +- core/breaker/breaker_test.go | 3 +- core/breaker/breakers_test.go | 3 +- core/breaker/googlebreaker.go | 4 +- core/breaker/googlebreaker_test.go | 7 +- core/codec/aesecb.go | 2 +- core/collection/cache.go | 6 +- core/collection/rollingwindow.go | 2 +- core/collection/rollingwindow_test.go | 3 +- core/collection/safemap_test.go | 3 +- core/collection/set.go | 4 +- core/collection/timingwheel.go | 6 +- core/collection/timingwheel_test.go | 9 +- core/conf/config.go | 2 +- core/conf/properties.go | 2 +- core/conf/properties_test.go | 3 +- core/contextx/unmarshaler.go | 2 +- core/discov/clients.go | 2 +- core/discov/clients_test.go | 3 +- core/discov/facade.go | 4 +- core/discov/internal/registry.go | 11 +- core/discov/internal/registry_test.go | 5 +- core/discov/kubernetes/discov-namespace.yaml | 4 - core/discov/kubernetes/etcd.yaml | 378 ------------------ core/discov/publisher.go | 13 +- core/discov/publisher_test.go | 5 +- core/discov/subscriber.go | 4 +- core/discov/subscriber_test.go | 3 +- core/executors/bulkexecutor.go | 4 +- core/executors/delayexecutor.go | 2 +- core/executors/lessexecutor.go | 4 +- core/executors/lessexecutor_test.go | 3 +- core/executors/periodicalexecutor.go | 8 +- core/executors/periodicalexecutor_test.go | 3 +- core/filex/file_test.go | 2 +- core/filex/lookup_test.go | 3 +- core/filex/rangereader_test.go | 3 +- core/fs/temps.go | 2 +- core/fx/fn.go | 6 +- core/fx/fn_test.go | 3 +- core/fx/parallel.go | 2 +- core/fx/retry.go | 2 +- core/hash/consistenthash.go | 4 +- core/hash/consistenthash_test.go | 3 +- core/iox/read_test.go | 5 +- core/limit/periodlimit.go | 2 +- core/limit/periodlimit_test.go | 3 +- core/limit/tokenlimit.go | 5 +- core/limit/tokenlimit_test.go | 5 +- core/load/adaptiveshedder.go | 10 +- core/load/adaptiveshedder_test.go | 11 +- core/load/sheddergroup.go | 2 +- core/load/sheddingstat.go | 4 +- core/logx/customlogger.go | 2 +- core/logx/limitedexecutor.go | 4 +- core/logx/logs.go | 8 +- core/logx/rotatelogger.go | 6 +- core/logx/tracelog.go | 2 +- core/logx/tracelog_test.go | 3 +- core/mapping/jsonunmarshaler.go | 2 +- core/mapping/unmarshaler.go | 6 +- core/mapping/unmarshaler_test.go | 3 +- core/mapping/utils.go | 2 +- core/mathx/int_test.go | 3 +- core/metric/counter.go | 3 +- core/metric/gauge.go | 3 +- core/metric/histogram.go | 3 +- core/mr/mapreduce.go | 8 +- core/mr/mapreduce_test.go | 5 +- core/proc/goroutines.go | 2 +- core/proc/profile.go | 2 +- core/proc/shutdown.go | 2 +- core/proc/signals.go | 2 +- core/prof/profilecenter.go | 5 +- core/prof/profiler.go | 2 +- core/prometheus/agent.go | 5 +- core/rescue/recover.go | 2 +- core/rescue/recover_test.go | 3 +- core/service/serviceconf.go | 8 +- core/service/servicegroup.go | 6 +- core/stat/alert.go | 10 +- core/stat/internal/cgroup_linux.go | 4 +- core/stat/internal/cpu_linux.go | 4 +- core/stat/metrics.go | 4 +- core/stat/remotewriter.go | 2 +- core/stat/usage.go | 6 +- core/stores/cache/cacheconf.go | 2 +- core/stores/cache/cacheopt.go | 2 +- core/stores/clickhouse/clickhouse.go | 3 +- core/stores/internal/cache.go | 6 +- core/stores/internal/cache_test.go | 9 +- core/stores/internal/cachenode.go | 10 +- core/stores/internal/cachenode_test.go | 9 +- core/stores/internal/cachestat.go | 2 +- core/stores/internal/cleaner.go | 14 +- core/stores/internal/config.go | 2 +- core/stores/kv/config.go | 2 +- core/stores/kv/store.go | 8 +- core/stores/kv/store_test.go | 7 +- core/stores/mongo/bulkinserter.go | 5 +- core/stores/mongo/collection.go | 7 +- core/stores/mongo/collection_test.go | 3 +- core/stores/mongo/iter.go | 3 +- core/stores/mongo/iter_test.go | 7 +- core/stores/mongo/pipe.go | 3 +- core/stores/mongo/pipe_test.go | 3 +- core/stores/mongo/query.go | 3 +- core/stores/mongo/query_test.go | 3 +- core/stores/mongo/sessionmanager.go | 5 +- core/stores/mongoc/cachedcollection.go | 7 +- core/stores/mongoc/cachedcollection_test.go | 9 +- core/stores/mongoc/cachedmodel.go | 9 +- core/stores/postgres/postgresql.go | 3 +- core/stores/redis/process.go | 7 +- core/stores/redis/redis.go | 5 +- core/stores/redis/redisblockingnode.go | 3 +- core/stores/redis/redisclientmanager.go | 3 +- core/stores/redis/redisclustermanager.go | 3 +- core/stores/redis/redislock.go | 3 +- core/stores/redis/redislock_test.go | 3 +- core/stores/sqlc/cachedsql.go | 10 +- core/stores/sqlc/cachedsql_test.go | 11 +- core/stores/sqlx/bulkinserter.go | 6 +- core/stores/sqlx/bulkinserter_test.go | 3 +- core/stores/sqlx/mysql_test.go | 7 +- core/stores/sqlx/orm.go | 2 +- core/stores/sqlx/orm_test.go | 3 +- core/stores/sqlx/sqlconn.go | 2 +- core/stores/sqlx/sqlmanager.go | 2 +- core/stores/sqlx/stmt.go | 4 +- core/stores/sqlx/utils.go | 4 +- core/stringx/strings.go | 2 +- core/stringx/trie.go | 2 +- core/syncx/cond.go | 4 +- core/syncx/donechan.go | 2 +- core/syncx/immutableresource.go | 2 +- core/syncx/limit.go | 2 +- core/syncx/pool.go | 2 +- core/syncx/pool_test.go | 3 +- core/syncx/resourcemanager.go | 2 +- core/sysx/host.go | 2 +- core/threading/routines.go | 2 +- core/threading/routines_test.go | 3 +- core/threading/taskrunner.go | 4 +- core/threading/workergroup_test.go | 3 +- core/timex/ticker.go | 2 +- core/trace/carrier_test.go | 3 +- core/trace/noop.go | 2 +- core/trace/span.go | 6 +- core/trace/span_test.go | 5 +- core/utils/times.go | 2 +- example/bloom/bloom.go | 4 +- example/breaker/main.go | 4 +- example/config/loadfromyaml/main.go | 4 +- example/etcd/demo/etcdmon.go | 8 +- example/etcd/pub/pub.go | 2 +- example/etcd/sub/sub.go | 4 +- example/filex/pread.go | 6 +- example/fx/fx_test.go | 2 +- example/fx/square.go | 2 +- example/graceful/dns/api/config/config.go | 4 +- example/graceful/dns/api/graceful.go | 12 +- .../dns/api/handler/gracefulhandler.go | 12 +- example/graceful/dns/api/handler/routes.go | 4 +- .../graceful/dns/api/svc/servicecontext.go | 2 +- .../graceful/dns/rpc/graceful/graceful.pb.go | 12 +- example/graceful/dns/rpc/gracefulrpc.go | 6 +- example/graceful/etcd/api/config/config.go | 4 +- example/graceful/etcd/api/graceful.go | 12 +- .../etcd/api/handler/gracefulhandler.go | 12 +- example/graceful/etcd/api/handler/routes.go | 4 +- .../graceful/etcd/api/svc/servicecontext.go | 2 +- .../graceful/etcd/rpc/graceful/graceful.pb.go | 12 +- example/graceful/etcd/rpc/gracefulrpc.go | 6 +- example/http/breaker/client/client.go | 4 +- example/http/breaker/server.go | 10 +- example/http/crypt/crypt.go | 2 +- example/http/demo/main.go | 8 +- example/http/post/main.go | 8 +- example/http/shedding/main.go | 8 +- example/http/signature/client/client.go | 2 +- example/http/signature/server/server.go | 8 +- example/jwt/user/user.go | 6 +- example/limit/period/periodlimit.go | 4 +- example/limit/token/tokenlimit.go | 4 +- example/load/main.go | 8 +- example/load/simulate/client/main.go | 4 +- example/load/simulate/cpu/main.go | 2 +- example/load/simulate/server/server.go | 10 +- example/logging/logging.go | 2 +- example/logging/redirector/main.go | 2 +- example/mapreduce/countfunc/countfunc.go | 2 +- example/mapreduce/finishvoid/finishvoid.go | 4 +- example/mapreduce/flatmap/flatmap.go | 2 +- example/mapreduce/goroutineleak/leak.go | 8 +- example/mapreduce/irregular/irregular.go | 2 +- example/mongo/time.go | 2 +- example/periodicalexecutor/pe.go | 2 +- example/pool/pool.go | 4 +- example/rpc/client/direct/client.go | 6 +- example/rpc/client/lb/main.go | 6 +- example/rpc/client/stream/client.go | 6 +- example/rpc/client/unary/client.go | 6 +- example/rpc/proxy/proxy.go | 8 +- example/rpc/remote/stream/greet.pb.go | 12 +- example/rpc/remote/unary/greet.pb.go | 12 +- example/rpc/server/stream/server.go | 6 +- example/rpc/server/unary/server.go | 6 +- example/signal/main.go | 4 +- example/stat/main.go | 2 +- example/timingwheel/leak/leak.go | 6 +- example/timingwheel/main.go | 2 +- example/tracing/edge/main.go | 14 +- example/tracing/portal/server.go | 8 +- example/tracing/remote/portal/portal.pb.go | 12 +- example/tracing/remote/user/user.pb.go | 12 +- example/tracing/user/server.go | 6 +- go.sum | 104 +++-- rest/config.go | 2 +- rest/etc/config.json | 13 - rest/handler/authhandler.go | 5 +- rest/handler/breakerhandler.go | 10 +- rest/handler/breakerhandler_test.go | 5 +- rest/handler/contentsecurityhandler.go | 8 +- rest/handler/contentsecurityhandler_test.go | 5 +- rest/handler/cryptionhandler.go | 4 +- rest/handler/cryptionhandler_test.go | 3 +- rest/handler/gunziphandler.go | 2 +- rest/handler/gunziphandler_test.go | 5 +- rest/handler/loghandler.go | 10 +- rest/handler/loghandler_test.go | 3 +- rest/handler/maxbyteshandler.go | 2 +- rest/handler/maxconnshandler.go | 6 +- rest/handler/maxconnshandler_test.go | 3 +- rest/handler/metrichandler.go | 4 +- rest/handler/metrichandler_test.go | 3 +- rest/handler/prommetrichandler.go | 6 +- rest/handler/recoverhandler.go | 2 +- rest/handler/sheddinghandler.go | 10 +- rest/handler/sheddinghandler_test.go | 5 +- rest/handler/tracinghandler.go | 6 +- rest/handler/tracinghandler_test.go | 3 +- rest/httpx/requests.go | 4 +- rest/httpx/responses.go | 2 +- rest/httpx/responses_test.go | 3 +- rest/internal/log.go | 2 +- rest/internal/router/patrouter.go | 6 +- rest/internal/router/patrouter_test.go | 5 +- rest/internal/security/contentsecurity.go | 8 +- rest/internal/starter.go | 2 +- rest/internal/tokenparser.go | 3 +- rest/internal/tokenparser_test.go | 3 +- rest/ngin.go | 6 +- rest/ngin_test.go | 7 +- rest/server.go | 15 +- rpcx/client.go | 7 +- rpcx/config.go | 6 +- rpcx/etc/config.json | 20 - rpcx/internal/auth/auth.go | 5 +- rpcx/internal/authinterceptor.go | 3 +- rpcx/internal/balancer/p2c/p2c.go | 9 +- rpcx/internal/balancer/p2c/p2c_test.go | 5 +- rpcx/internal/client.go | 3 +- .../clientinterceptors/breakerinterceptor.go | 5 +- .../breakerinterceptor_test.go | 7 +- .../clientinterceptors/durationinterceptor.go | 5 +- .../prommetricinterceptor.go | 5 +- .../clientinterceptors/timeoutinterceptor.go | 3 +- .../clientinterceptors/tracinginterceptor.go | 3 +- rpcx/internal/discovclient.go | 5 +- rpcx/internal/resolver/resolver.go | 3 +- rpcx/internal/resolver/subset_test.go | 3 +- rpcx/internal/rpclogger.go | 3 +- rpcx/internal/rpcpubserver.go | 2 +- rpcx/internal/rpcserver.go | 7 +- rpcx/internal/server.go | 3 +- .../serverinterceptors/crashinterceptor.go | 3 +- .../prommetricinterceptor.go | 5 +- .../serverinterceptors/sheddinginterceptor.go | 5 +- .../serverinterceptors/statinterceptor.go | 7 +- .../serverinterceptors/timeoutinterceptor.go | 3 +- .../serverinterceptors/tracinginterceptor.go | 3 +- rpcx/proxy.go | 7 +- rpcx/server.go | 14 +- tools/goctl/api/apigen/gen.go | 3 +- tools/goctl/api/dartgen/gen.go | 5 +- tools/goctl/api/dartgen/genapi.go | 4 +- tools/goctl/api/dartgen/gendata.go | 4 +- tools/goctl/api/dartgen/genvars.go | 2 +- tools/goctl/api/dartgen/util.go | 4 +- tools/goctl/api/docgen/doc.go | 8 +- tools/goctl/api/docgen/gen.go | 3 +- tools/goctl/api/format/format.go | 8 +- tools/goctl/api/gogen/gen.go | 11 +- tools/goctl/api/gogen/genconfig.go | 4 +- tools/goctl/api/gogen/genetc.go | 4 +- tools/goctl/api/gogen/genhandlers.go | 8 +- tools/goctl/api/gogen/genlogic.go | 6 +- tools/goctl/api/gogen/genmain.go | 6 +- tools/goctl/api/gogen/genroutes.go | 10 +- tools/goctl/api/gogen/genservicecontext.go | 4 +- tools/goctl/api/gogen/gentypes.go | 6 +- tools/goctl/api/gogen/util.go | 6 +- tools/goctl/api/javagen/gen.go | 7 +- tools/goctl/api/javagen/gencomponents.go | 6 +- tools/goctl/api/javagen/genpacket.go | 8 +- tools/goctl/api/javagen/util.go | 6 +- tools/goctl/api/main.go | 4 +- tools/goctl/api/parser/entity.go | 2 +- tools/goctl/api/parser/infostate.go | 2 +- tools/goctl/api/parser/parser.go | 2 +- tools/goctl/api/parser/rootstate.go | 2 +- tools/goctl/api/parser/servicestate.go | 2 +- tools/goctl/api/parser/state.go | 2 +- tools/goctl/api/parser/typeparser.go | 2 +- tools/goctl/api/parser/typestate.go | 4 +- tools/goctl/api/parser/util.go | 2 +- tools/goctl/api/parser/validator.go | 7 +- tools/goctl/api/spec/fn.go | 4 +- tools/goctl/api/tsgen/gen.go | 7 +- tools/goctl/api/tsgen/gencomponents.go | 6 +- tools/goctl/api/tsgen/genpacket.go | 6 +- tools/goctl/api/tsgen/util.go | 6 +- tools/goctl/api/util/annotation.go | 2 +- tools/goctl/api/util/types.go | 2 +- tools/goctl/api/util/util.go | 6 +- tools/goctl/api/validate/validate.go | 3 +- tools/goctl/configgen/genconfigjson.go | 2 +- tools/goctl/docker/docker.go | 3 +- tools/goctl/example/rec.proto | 30 -- tools/goctl/gen/dockerfile.go | 4 +- tools/goctl/gen/makefile.go | 2 +- tools/goctl/goctl.go | 39 +- tools/goctl/model/mongomodel/gen/genmethod.go | 2 +- .../model/mongomodel/gen/genmongomodel.go | 10 +- .../mongomodel/gen/genmongomodelbynetwork.go | 2 +- .../model/mongomodel/gen/templatemodel.go | 2 +- tools/goctl/model/mongomodel/genmongocmd.go | 5 +- .../mongomodel/utils/parsesimplegofile.go | 2 +- tools/goctl/model/sql/README.MD | 10 +- tools/goctl/model/sql/gen/convert.go | 2 +- tools/goctl/model/sql/gen/delete.go | 2 +- tools/goctl/model/sql/gen/field.go | 2 +- tools/goctl/model/sql/gen/findallbyfield.go | 2 +- tools/goctl/model/sql/gen/findallbylimit.go | 2 +- tools/goctl/model/sql/gen/findone.go | 2 +- tools/goctl/model/sql/gen/fineonebyfield.go | 2 +- tools/goctl/model/sql/gen/imports.go | 2 +- tools/goctl/model/sql/gen/insert.go | 2 +- tools/goctl/model/sql/gen/keys_test.go | 2 +- tools/goctl/model/sql/gen/model.go | 4 +- tools/goctl/model/sql/gen/new.go | 2 +- tools/goctl/model/sql/gen/tag.go | 2 +- tools/goctl/model/sql/gen/types.go | 2 +- tools/goctl/model/sql/gen/update.go | 2 +- tools/goctl/model/sql/gen/vars.go | 2 +- tools/goctl/model/sql/sqlctl.go | 2 +- tools/goctl/model/sql/template/errors.go | 2 +- tools/goctl/model/sql/template/import.go | 8 +- tools/goctl/model/sqlmodel/gen.go | 2 +- tools/goctl/model/sqlmodel/genmodel.go | 6 +- tools/goctl/model/sqlmodel/insertsql.go | 2 +- tools/goctl/model/sqlmodel/table2struct.go | 2 +- tools/goctl/model/sqlmodel/updatesql.go | 2 +- tools/goctl/update/config/config.go | 2 +- tools/goctl/update/update.go | 12 +- tools/goctl/util/file.go | 3 +- tools/goctl/util/path.go | 2 +- tools/modelctl/model/configtemplategen/gen.go | 3 +- tools/modelctl/model/modelgen/fieldmodel.go | 4 +- tools/modelctl/model/modelgen/gen.go | 3 +- tools/modelctl/model/modelgen/genmodel.go | 2 +- .../modelctl/model/modelgen/modeltemplate.go | 12 +- tools/modelctl/model/modelgen/utiltemplate.go | 6 +- tools/modelctl/modelctl.go | 7 +- 377 files changed, 881 insertions(+), 1423 deletions(-) delete mode 100644 core/discov/kubernetes/discov-namespace.yaml delete mode 100644 core/discov/kubernetes/etcd.yaml delete mode 100644 rest/etc/config.json delete mode 100644 rpcx/etc/config.json delete mode 100644 tools/goctl/example/rec.proto diff --git a/core/bloom/bloom.go b/core/bloom/bloom.go index 6e4027b2..fec8b545 100644 --- a/core/bloom/bloom.go +++ b/core/bloom/bloom.go @@ -4,8 +4,8 @@ import ( "errors" "strconv" - "zero/core/hash" - "zero/core/stores/redis" + "github.com/tal-tech/go-zero/core/hash" + "github.com/tal-tech/go-zero/core/stores/redis" ) const ( diff --git a/core/bloom/bloom_test.go b/core/bloom/bloom_test.go index 07d5a173..9e584288 100644 --- a/core/bloom/bloom_test.go +++ b/core/bloom/bloom_test.go @@ -3,10 +3,9 @@ package bloom import ( "testing" - "zero/core/stores/redis" - "github.com/alicebob/miniredis" "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/stores/redis" ) func TestRedisBitSet_New_Set_Test(t *testing.T) { diff --git a/core/breaker/breaker.go b/core/breaker/breaker.go index 5f9c8636..3ee393e4 100644 --- a/core/breaker/breaker.go +++ b/core/breaker/breaker.go @@ -7,10 +7,10 @@ import ( "sync" "time" - "zero/core/mathx" - "zero/core/proc" - "zero/core/stat" - "zero/core/stringx" + "github.com/tal-tech/go-zero/core/mathx" + "github.com/tal-tech/go-zero/core/proc" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/core/stringx" ) const ( diff --git a/core/breaker/breaker_test.go b/core/breaker/breaker_test.go index d75de200..66cc125f 100644 --- a/core/breaker/breaker_test.go +++ b/core/breaker/breaker_test.go @@ -5,9 +5,8 @@ import ( "strconv" "testing" - "zero/core/stat" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/stat" ) func init() { diff --git a/core/breaker/breakers_test.go b/core/breaker/breakers_test.go index b148e47a..3a302517 100644 --- a/core/breaker/breakers_test.go +++ b/core/breaker/breakers_test.go @@ -5,9 +5,8 @@ import ( "fmt" "testing" - "zero/core/stat" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/stat" ) func init() { diff --git a/core/breaker/googlebreaker.go b/core/breaker/googlebreaker.go index b013132e..aaae5df7 100644 --- a/core/breaker/googlebreaker.go +++ b/core/breaker/googlebreaker.go @@ -5,8 +5,8 @@ import ( "sync/atomic" "time" - "zero/core/collection" - "zero/core/mathx" + "github.com/tal-tech/go-zero/core/collection" + "github.com/tal-tech/go-zero/core/mathx" ) const ( diff --git a/core/breaker/googlebreaker_test.go b/core/breaker/googlebreaker_test.go index ba16eae0..9caaa67d 100644 --- a/core/breaker/googlebreaker_test.go +++ b/core/breaker/googlebreaker_test.go @@ -7,11 +7,10 @@ import ( "testing" "time" - "zero/core/collection" - "zero/core/mathx" - "zero/core/stat" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/collection" + "github.com/tal-tech/go-zero/core/mathx" + "github.com/tal-tech/go-zero/core/stat" ) const ( diff --git a/core/codec/aesecb.go b/core/codec/aesecb.go index 86be5cce..ecf71e07 100644 --- a/core/codec/aesecb.go +++ b/core/codec/aesecb.go @@ -7,7 +7,7 @@ import ( "encoding/base64" "errors" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/logx" ) var ErrPaddingSize = errors.New("padding size error") diff --git a/core/collection/cache.go b/core/collection/cache.go index c2eca2a6..16986445 100644 --- a/core/collection/cache.go +++ b/core/collection/cache.go @@ -6,9 +6,9 @@ import ( "sync/atomic" "time" - "zero/core/logx" - "zero/core/mathx" - "zero/core/syncx" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/mathx" + "github.com/tal-tech/go-zero/core/syncx" ) const ( diff --git a/core/collection/rollingwindow.go b/core/collection/rollingwindow.go index c34726fe..ffc633fc 100644 --- a/core/collection/rollingwindow.go +++ b/core/collection/rollingwindow.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "zero/core/timex" + "github.com/tal-tech/go-zero/core/timex" ) type ( diff --git a/core/collection/rollingwindow_test.go b/core/collection/rollingwindow_test.go index 951117c8..97675ef0 100644 --- a/core/collection/rollingwindow_test.go +++ b/core/collection/rollingwindow_test.go @@ -5,9 +5,8 @@ import ( "testing" "time" - "zero/core/stringx" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/stringx" ) const duration = time.Millisecond * 50 diff --git a/core/collection/safemap_test.go b/core/collection/safemap_test.go index afce3476..2bb41630 100644 --- a/core/collection/safemap_test.go +++ b/core/collection/safemap_test.go @@ -3,9 +3,8 @@ package collection import ( "testing" - "zero/core/stringx" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/stringx" ) func TestSafeMap(t *testing.T) { diff --git a/core/collection/set.go b/core/collection/set.go index 4a1f3ea7..732a914f 100644 --- a/core/collection/set.go +++ b/core/collection/set.go @@ -1,8 +1,8 @@ package collection import ( - "zero/core/lang" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/logx" ) const ( diff --git a/core/collection/timingwheel.go b/core/collection/timingwheel.go index 7bb97473..9fb9ebf4 100644 --- a/core/collection/timingwheel.go +++ b/core/collection/timingwheel.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "zero/core/lang" - "zero/core/threading" - "zero/core/timex" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/threading" + "github.com/tal-tech/go-zero/core/timex" ) const drainWorkers = 8 diff --git a/core/collection/timingwheel_test.go b/core/collection/timingwheel_test.go index 569f5ac8..225a11c8 100644 --- a/core/collection/timingwheel_test.go +++ b/core/collection/timingwheel_test.go @@ -7,12 +7,11 @@ import ( "testing" "time" - "zero/core/lang" - "zero/core/stringx" - "zero/core/syncx" - "zero/core/timex" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/stringx" + "github.com/tal-tech/go-zero/core/syncx" + "github.com/tal-tech/go-zero/core/timex" ) const ( diff --git a/core/conf/config.go b/core/conf/config.go index 6a316d68..e4774e0c 100644 --- a/core/conf/config.go +++ b/core/conf/config.go @@ -6,7 +6,7 @@ import ( "log" "path" - "zero/core/mapping" + "github.com/tal-tech/go-zero/core/mapping" ) var loaders = map[string]func([]byte, interface{}) error{ diff --git a/core/conf/properties.go b/core/conf/properties.go index d24f4158..1a1d3ff0 100644 --- a/core/conf/properties.go +++ b/core/conf/properties.go @@ -6,7 +6,7 @@ import ( "strings" "sync" - "zero/core/iox" + "github.com/tal-tech/go-zero/core/iox" ) // PropertyError represents a configuration error message. diff --git a/core/conf/properties_test.go b/core/conf/properties_test.go index 1d22631b..b253598a 100644 --- a/core/conf/properties_test.go +++ b/core/conf/properties_test.go @@ -4,9 +4,8 @@ import ( "os" "testing" - "zero/core/fs" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/fs" ) func TestProperties(t *testing.T) { diff --git a/core/contextx/unmarshaler.go b/core/contextx/unmarshaler.go index ed5f9f28..e8de69f7 100644 --- a/core/contextx/unmarshaler.go +++ b/core/contextx/unmarshaler.go @@ -3,7 +3,7 @@ package contextx import ( "context" - "zero/core/mapping" + "github.com/tal-tech/go-zero/core/mapping" ) const contextTagKey = "ctx" diff --git a/core/discov/clients.go b/core/discov/clients.go index 6f33b019..82242b91 100644 --- a/core/discov/clients.go +++ b/core/discov/clients.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "zero/core/discov/internal" + "github.com/tal-tech/go-zero/core/discov/internal" ) const ( diff --git a/core/discov/clients_test.go b/core/discov/clients_test.go index 008ff5bf..89eeb972 100644 --- a/core/discov/clients_test.go +++ b/core/discov/clients_test.go @@ -4,9 +4,8 @@ import ( "sync" "testing" - "zero/core/discov/internal" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/discov/internal" ) var mockLock sync.Mutex diff --git a/core/discov/facade.go b/core/discov/facade.go index e9ed9df2..2b7497a6 100644 --- a/core/discov/facade.go +++ b/core/discov/facade.go @@ -1,8 +1,8 @@ package discov import ( - "zero/core/discov/internal" - "zero/core/lang" + "github.com/tal-tech/go-zero/core/discov/internal" + "github.com/tal-tech/go-zero/core/lang" ) type ( diff --git a/core/discov/internal/registry.go b/core/discov/internal/registry.go index fdb9f249..679f998d 100644 --- a/core/discov/internal/registry.go +++ b/core/discov/internal/registry.go @@ -9,12 +9,11 @@ import ( "sync" "time" - "zero/core/contextx" - "zero/core/lang" - "zero/core/logx" - "zero/core/syncx" - "zero/core/threading" - + "github.com/tal-tech/go-zero/core/contextx" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/syncx" + "github.com/tal-tech/go-zero/core/threading" "go.etcd.io/etcd/clientv3" ) diff --git a/core/discov/internal/registry_test.go b/core/discov/internal/registry_test.go index 95526e71..413c3e68 100644 --- a/core/discov/internal/registry_test.go +++ b/core/discov/internal/registry_test.go @@ -5,11 +5,10 @@ import ( "sync" "testing" - "zero/core/contextx" - "zero/core/stringx" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/contextx" + "github.com/tal-tech/go-zero/core/stringx" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/mvcc/mvccpb" ) diff --git a/core/discov/kubernetes/discov-namespace.yaml b/core/discov/kubernetes/discov-namespace.yaml deleted file mode 100644 index 16b397bc..00000000 --- a/core/discov/kubernetes/discov-namespace.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: discov diff --git a/core/discov/kubernetes/etcd.yaml b/core/discov/kubernetes/etcd.yaml deleted file mode 100644 index dcfaef7c..00000000 --- a/core/discov/kubernetes/etcd.yaml +++ /dev/null @@ -1,378 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: etcd - namespace: discov -spec: - ports: - - name: etcd-port - port: 2379 - protocol: TCP - targetPort: 2379 - selector: - app: etcd - ---- - -apiVersion: v1 -kind: Pod -metadata: - labels: - app: etcd - etcd_node: etcd0 - name: etcd0 - namespace: discov -spec: - containers: - - command: - - /usr/local/bin/etcd - - --name - - etcd0 - - --initial-advertise-peer-urls - - http://etcd0:2380 - - --listen-peer-urls - - http://0.0.0.0:2380 - - --listen-client-urls - - http://0.0.0.0:2379 - - --advertise-client-urls - - http://etcd0:2379 - - --initial-cluster - - etcd0=http://etcd0:2380,etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380,etcd4=http://etcd4:2380 - - --initial-cluster-state - - new - image: registry-vpc.cn-hangzhou.aliyuncs.com/xapp/etcd:latest - name: etcd0 - ports: - - containerPort: 2379 - name: client - protocol: TCP - - containerPort: 2380 - name: server - protocol: TCP - imagePullSecrets: - - name: aliyun - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - etcd - topologyKey: "kubernetes.io/hostname" - restartPolicy: Always - ---- - -apiVersion: v1 -kind: Service -metadata: - labels: - etcd_node: etcd0 - name: etcd0 - namespace: discov -spec: - ports: - - name: client - port: 2379 - protocol: TCP - targetPort: 2379 - - name: server - port: 2380 - protocol: TCP - targetPort: 2380 - selector: - etcd_node: etcd0 - ---- - -apiVersion: v1 -kind: Pod -metadata: - labels: - app: etcd - etcd_node: etcd1 - name: etcd1 - namespace: discov -spec: - containers: - - command: - - /usr/local/bin/etcd - - --name - - etcd1 - - --initial-advertise-peer-urls - - http://etcd1:2380 - - --listen-peer-urls - - http://0.0.0.0:2380 - - --listen-client-urls - - http://0.0.0.0:2379 - - --advertise-client-urls - - http://etcd1:2379 - - --initial-cluster - - etcd0=http://etcd0:2380,etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380,etcd4=http://etcd4:2380 - - --initial-cluster-state - - new - image: registry-vpc.cn-hangzhou.aliyuncs.com/xapp/etcd:latest - name: etcd1 - ports: - - containerPort: 2379 - name: client - protocol: TCP - - containerPort: 2380 - name: server - protocol: TCP - imagePullSecrets: - - name: aliyun - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - etcd - topologyKey: "kubernetes.io/hostname" - restartPolicy: Always - ---- - -apiVersion: v1 -kind: Service -metadata: - labels: - etcd_node: etcd1 - name: etcd1 - namespace: discov -spec: - ports: - - name: client - port: 2379 - protocol: TCP - targetPort: 2379 - - name: server - port: 2380 - protocol: TCP - targetPort: 2380 - selector: - etcd_node: etcd1 - ---- - -apiVersion: v1 -kind: Pod -metadata: - labels: - app: etcd - etcd_node: etcd2 - name: etcd2 - namespace: discov -spec: - containers: - - command: - - /usr/local/bin/etcd - - --name - - etcd2 - - --initial-advertise-peer-urls - - http://etcd2:2380 - - --listen-peer-urls - - http://0.0.0.0:2380 - - --listen-client-urls - - http://0.0.0.0:2379 - - --advertise-client-urls - - http://etcd2:2379 - - --initial-cluster - - etcd0=http://etcd0:2380,etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380,etcd4=http://etcd4:2380 - - --initial-cluster-state - - new - image: registry-vpc.cn-hangzhou.aliyuncs.com/xapp/etcd:latest - name: etcd2 - ports: - - containerPort: 2379 - name: client - protocol: TCP - - containerPort: 2380 - name: server - protocol: TCP - imagePullSecrets: - - name: aliyun - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - etcd - topologyKey: "kubernetes.io/hostname" - restartPolicy: Always - ---- - -apiVersion: v1 -kind: Service -metadata: - labels: - etcd_node: etcd2 - name: etcd2 - namespace: discov -spec: - ports: - - name: client - port: 2379 - protocol: TCP - targetPort: 2379 - - name: server - port: 2380 - protocol: TCP - targetPort: 2380 - selector: - etcd_node: etcd2 - ---- - -apiVersion: v1 -kind: Pod -metadata: - labels: - app: etcd - etcd_node: etcd3 - name: etcd3 - namespace: discov -spec: - containers: - - command: - - /usr/local/bin/etcd - - --name - - etcd3 - - --initial-advertise-peer-urls - - http://etcd3:2380 - - --listen-peer-urls - - http://0.0.0.0:2380 - - --listen-client-urls - - http://0.0.0.0:2379 - - --advertise-client-urls - - http://etcd3:2379 - - --initial-cluster - - etcd0=http://etcd0:2380,etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380,etcd4=http://etcd4:2380 - - --initial-cluster-state - - new - image: registry-vpc.cn-hangzhou.aliyuncs.com/xapp/etcd:latest - name: etcd3 - ports: - - containerPort: 2379 - name: client - protocol: TCP - - containerPort: 2380 - name: server - protocol: TCP - imagePullSecrets: - - name: aliyun - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - etcd - topologyKey: "kubernetes.io/hostname" - restartPolicy: Always - ---- - -apiVersion: v1 -kind: Service -metadata: - labels: - etcd_node: etcd3 - name: etcd3 - namespace: discov -spec: - ports: - - name: client - port: 2379 - protocol: TCP - targetPort: 2379 - - name: server - port: 2380 - protocol: TCP - targetPort: 2380 - selector: - etcd_node: etcd3 - ---- - -apiVersion: v1 -kind: Pod -metadata: - labels: - app: etcd - etcd_node: etcd4 - name: etcd4 - namespace: discov -spec: - containers: - - command: - - /usr/local/bin/etcd - - --name - - etcd4 - - --initial-advertise-peer-urls - - http://etcd4:2380 - - --listen-peer-urls - - http://0.0.0.0:2380 - - --listen-client-urls - - http://0.0.0.0:2379 - - --advertise-client-urls - - http://etcd4:2379 - - --initial-cluster - - etcd0=http://etcd0:2380,etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380,etcd4=http://etcd4:2380 - - --initial-cluster-state - - new - image: registry-vpc.cn-hangzhou.aliyuncs.com/xapp/etcd:latest - name: etcd4 - ports: - - containerPort: 2379 - name: client - protocol: TCP - - containerPort: 2380 - name: server - protocol: TCP - imagePullSecrets: - - name: aliyun - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - etcd - topologyKey: "kubernetes.io/hostname" - restartPolicy: Always - ---- - -apiVersion: v1 -kind: Service -metadata: - labels: - etcd_node: etcd4 - name: etcd4 - namespace: discov -spec: - ports: - - name: client - port: 2379 - protocol: TCP - targetPort: 2379 - - name: server - port: 2380 - protocol: TCP - targetPort: 2380 - selector: - etcd_node: etcd4 diff --git a/core/discov/publisher.go b/core/discov/publisher.go index 955f5f9c..4b4609db 100644 --- a/core/discov/publisher.go +++ b/core/discov/publisher.go @@ -1,13 +1,12 @@ package discov import ( - "zero/core/discov/internal" - "zero/core/lang" - "zero/core/logx" - "zero/core/proc" - "zero/core/syncx" - "zero/core/threading" - + "github.com/tal-tech/go-zero/core/discov/internal" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/proc" + "github.com/tal-tech/go-zero/core/syncx" + "github.com/tal-tech/go-zero/core/threading" "go.etcd.io/etcd/clientv3" ) diff --git a/core/discov/publisher_test.go b/core/discov/publisher_test.go index 350f6154..d49a0a35 100644 --- a/core/discov/publisher_test.go +++ b/core/discov/publisher_test.go @@ -5,11 +5,10 @@ import ( "sync" "testing" - "zero/core/discov/internal" - "zero/core/logx" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/discov/internal" + "github.com/tal-tech/go-zero/core/logx" "go.etcd.io/etcd/clientv3" ) diff --git a/core/discov/subscriber.go b/core/discov/subscriber.go index 8d7c5ce1..b96c2617 100644 --- a/core/discov/subscriber.go +++ b/core/discov/subscriber.go @@ -4,8 +4,8 @@ import ( "sync" "sync/atomic" - "zero/core/discov/internal" - "zero/core/syncx" + "github.com/tal-tech/go-zero/core/discov/internal" + "github.com/tal-tech/go-zero/core/syncx" ) type ( diff --git a/core/discov/subscriber_test.go b/core/discov/subscriber_test.go index 2c2d590b..b4f16b30 100644 --- a/core/discov/subscriber_test.go +++ b/core/discov/subscriber_test.go @@ -3,9 +3,8 @@ package discov import ( "testing" - "zero/core/discov/internal" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/discov/internal" ) const ( diff --git a/core/executors/bulkexecutor.go b/core/executors/bulkexecutor.go index b7ca0232..4b7e6184 100644 --- a/core/executors/bulkexecutor.go +++ b/core/executors/bulkexecutor.go @@ -1,8 +1,6 @@ package executors -import ( - "time" -) +import "time" const defaultBulkTasks = 1000 diff --git a/core/executors/delayexecutor.go b/core/executors/delayexecutor.go index fe15f941..bddd342b 100644 --- a/core/executors/delayexecutor.go +++ b/core/executors/delayexecutor.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "zero/core/threading" + "github.com/tal-tech/go-zero/core/threading" ) type DelayExecutor struct { diff --git a/core/executors/lessexecutor.go b/core/executors/lessexecutor.go index 826786b1..c9a3d4ea 100644 --- a/core/executors/lessexecutor.go +++ b/core/executors/lessexecutor.go @@ -3,8 +3,8 @@ package executors import ( "time" - "zero/core/syncx" - "zero/core/timex" + "github.com/tal-tech/go-zero/core/syncx" + "github.com/tal-tech/go-zero/core/timex" ) type LessExecutor struct { diff --git a/core/executors/lessexecutor_test.go b/core/executors/lessexecutor_test.go index 361b07df..ed4e00a7 100644 --- a/core/executors/lessexecutor_test.go +++ b/core/executors/lessexecutor_test.go @@ -4,9 +4,8 @@ import ( "testing" "time" - "zero/core/timex" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/timex" ) func TestLessExecutor_DoOrDiscard(t *testing.T) { diff --git a/core/executors/periodicalexecutor.go b/core/executors/periodicalexecutor.go index c5c17b40..a6d8c382 100644 --- a/core/executors/periodicalexecutor.go +++ b/core/executors/periodicalexecutor.go @@ -5,10 +5,10 @@ import ( "sync" "time" - "zero/core/proc" - "zero/core/syncx" - "zero/core/threading" - "zero/core/timex" + "github.com/tal-tech/go-zero/core/proc" + "github.com/tal-tech/go-zero/core/syncx" + "github.com/tal-tech/go-zero/core/threading" + "github.com/tal-tech/go-zero/core/timex" ) const idleRound = 10 diff --git a/core/executors/periodicalexecutor_test.go b/core/executors/periodicalexecutor_test.go index 163a3540..34f5594e 100644 --- a/core/executors/periodicalexecutor_test.go +++ b/core/executors/periodicalexecutor_test.go @@ -7,9 +7,8 @@ import ( "testing" "time" - "zero/core/timex" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/timex" ) const threshold = 10 diff --git a/core/filex/file_test.go b/core/filex/file_test.go index 7906ef71..a5e508cb 100644 --- a/core/filex/file_test.go +++ b/core/filex/file_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "zero/core/fs" + "github.com/tal-tech/go-zero/core/fs" "github.com/stretchr/testify/assert" ) diff --git a/core/filex/lookup_test.go b/core/filex/lookup_test.go index 8243f042..e2da536c 100644 --- a/core/filex/lookup_test.go +++ b/core/filex/lookup_test.go @@ -4,9 +4,8 @@ import ( "os" "testing" - "zero/core/fs" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/fs" ) func TestSplitLineChunks(t *testing.T) { diff --git a/core/filex/rangereader_test.go b/core/filex/rangereader_test.go index 3d773973..229ef14d 100644 --- a/core/filex/rangereader_test.go +++ b/core/filex/rangereader_test.go @@ -5,8 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - - "zero/core/fs" + "github.com/tal-tech/go-zero/core/fs" ) func TestRangeReader(t *testing.T) { diff --git a/core/fs/temps.go b/core/fs/temps.go index 78a00e1d..c15419f4 100644 --- a/core/fs/temps.go +++ b/core/fs/temps.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - "zero/core/hash" + "github.com/tal-tech/go-zero/core/hash" ) // TempFileWithText creates the temporary file with the given content, diff --git a/core/fx/fn.go b/core/fx/fn.go index 67067984..07272715 100644 --- a/core/fx/fn.go +++ b/core/fx/fn.go @@ -4,9 +4,9 @@ import ( "sort" "sync" - "zero/core/collection" - "zero/core/lang" - "zero/core/threading" + "github.com/tal-tech/go-zero/core/collection" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/threading" ) const ( diff --git a/core/fx/fn_test.go b/core/fx/fn_test.go index aed5d01f..8ff38ec8 100644 --- a/core/fx/fn_test.go +++ b/core/fx/fn_test.go @@ -9,9 +9,8 @@ import ( "testing" "time" - "zero/core/stringx" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/stringx" ) func TestBuffer(t *testing.T) { diff --git a/core/fx/parallel.go b/core/fx/parallel.go index 89c91142..d4cefea8 100644 --- a/core/fx/parallel.go +++ b/core/fx/parallel.go @@ -1,6 +1,6 @@ package fx -import "zero/core/threading" +import "github.com/tal-tech/go-zero/core/threading" func Parallel(fns ...func()) { group := threading.NewRoutineGroup() diff --git a/core/fx/retry.go b/core/fx/retry.go index 338c2da2..4aa99767 100644 --- a/core/fx/retry.go +++ b/core/fx/retry.go @@ -1,6 +1,6 @@ package fx -import "zero/core/errorx" +import "github.com/tal-tech/go-zero/core/errorx" const defaultRetryTimes = 3 diff --git a/core/hash/consistenthash.go b/core/hash/consistenthash.go index ece56559..7a652fd0 100644 --- a/core/hash/consistenthash.go +++ b/core/hash/consistenthash.go @@ -6,8 +6,8 @@ import ( "strconv" "sync" - "zero/core/lang" - "zero/core/mapping" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/mapping" ) const ( diff --git a/core/hash/consistenthash_test.go b/core/hash/consistenthash_test.go index cc35380b..162d1704 100644 --- a/core/hash/consistenthash_test.go +++ b/core/hash/consistenthash_test.go @@ -6,8 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - - "zero/core/mathx" + "github.com/tal-tech/go-zero/core/mathx" ) const ( diff --git a/core/iox/read_test.go b/core/iox/read_test.go index 51bf78a5..686bd979 100644 --- a/core/iox/read_test.go +++ b/core/iox/read_test.go @@ -8,10 +8,9 @@ import ( "testing" "time" - "zero/core/fs" - "zero/core/stringx" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/fs" + "github.com/tal-tech/go-zero/core/stringx" ) func TestReadText(t *testing.T) { diff --git a/core/limit/periodlimit.go b/core/limit/periodlimit.go index e957b655..e4e827e7 100644 --- a/core/limit/periodlimit.go +++ b/core/limit/periodlimit.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "zero/core/stores/redis" + "github.com/tal-tech/go-zero/core/stores/redis" ) const ( diff --git a/core/limit/periodlimit_test.go b/core/limit/periodlimit_test.go index 8d16c974..ca48eecf 100644 --- a/core/limit/periodlimit_test.go +++ b/core/limit/periodlimit_test.go @@ -3,10 +3,9 @@ package limit import ( "testing" - "zero/core/stores/redis" - "github.com/alicebob/miniredis" "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/stores/redis" ) func TestPeriodLimit_Take(t *testing.T) { diff --git a/core/limit/tokenlimit.go b/core/limit/tokenlimit.go index 03b15ac9..59dc23d4 100644 --- a/core/limit/tokenlimit.go +++ b/core/limit/tokenlimit.go @@ -7,9 +7,8 @@ import ( "sync/atomic" "time" - "zero/core/logx" - "zero/core/stores/redis" - + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/stores/redis" xrate "golang.org/x/time/rate" ) diff --git a/core/limit/tokenlimit_test.go b/core/limit/tokenlimit_test.go index 084c03b3..1f60611f 100644 --- a/core/limit/tokenlimit_test.go +++ b/core/limit/tokenlimit_test.go @@ -4,11 +4,10 @@ import ( "testing" "time" - "zero/core/logx" - "zero/core/stores/redis" - "github.com/alicebob/miniredis" "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/stores/redis" ) func init() { diff --git a/core/load/adaptiveshedder.go b/core/load/adaptiveshedder.go index db45253d..30b3c3f3 100644 --- a/core/load/adaptiveshedder.go +++ b/core/load/adaptiveshedder.go @@ -7,11 +7,11 @@ import ( "sync/atomic" "time" - "zero/core/collection" - "zero/core/logx" - "zero/core/stat" - "zero/core/syncx" - "zero/core/timex" + "github.com/tal-tech/go-zero/core/collection" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/core/syncx" + "github.com/tal-tech/go-zero/core/timex" ) const ( diff --git a/core/load/adaptiveshedder_test.go b/core/load/adaptiveshedder_test.go index 449640ed..48e1343f 100644 --- a/core/load/adaptiveshedder_test.go +++ b/core/load/adaptiveshedder_test.go @@ -7,13 +7,12 @@ import ( "testing" "time" - "zero/core/collection" - "zero/core/logx" - "zero/core/mathx" - "zero/core/stat" - "zero/core/syncx" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/collection" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/mathx" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/core/syncx" ) const ( diff --git a/core/load/sheddergroup.go b/core/load/sheddergroup.go index a8b76108..6937ea55 100644 --- a/core/load/sheddergroup.go +++ b/core/load/sheddergroup.go @@ -3,7 +3,7 @@ package load import ( "io" - "zero/core/syncx" + "github.com/tal-tech/go-zero/core/syncx" ) type ShedderGroup struct { diff --git a/core/load/sheddingstat.go b/core/load/sheddingstat.go index f61e1248..7755d693 100644 --- a/core/load/sheddingstat.go +++ b/core/load/sheddingstat.go @@ -4,8 +4,8 @@ import ( "sync/atomic" "time" - "zero/core/logx" - "zero/core/stat" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/stat" ) type ( diff --git a/core/logx/customlogger.go b/core/logx/customlogger.go index ad043b53..4bb1d7d2 100644 --- a/core/logx/customlogger.go +++ b/core/logx/customlogger.go @@ -5,7 +5,7 @@ import ( "io" "time" - "zero/core/timex" + "github.com/tal-tech/go-zero/core/timex" ) const customCallerDepth = 3 diff --git a/core/logx/limitedexecutor.go b/core/logx/limitedexecutor.go index df128fb5..e9956657 100644 --- a/core/logx/limitedexecutor.go +++ b/core/logx/limitedexecutor.go @@ -4,8 +4,8 @@ import ( "sync/atomic" "time" - "zero/core/syncx" - "zero/core/timex" + "github.com/tal-tech/go-zero/core/syncx" + "github.com/tal-tech/go-zero/core/timex" ) type limitedExecutor struct { diff --git a/core/logx/logs.go b/core/logx/logs.go index 4f038a16..edb71040 100644 --- a/core/logx/logs.go +++ b/core/logx/logs.go @@ -16,10 +16,10 @@ import ( "sync" "sync/atomic" - "zero/core/iox" - "zero/core/lang" - "zero/core/sysx" - "zero/core/timex" + "github.com/tal-tech/go-zero/core/iox" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/sysx" + "github.com/tal-tech/go-zero/core/timex" ) const ( diff --git a/core/logx/rotatelogger.go b/core/logx/rotatelogger.go index ccf3f7b9..68971cfe 100644 --- a/core/logx/rotatelogger.go +++ b/core/logx/rotatelogger.go @@ -13,9 +13,9 @@ import ( "sync" "time" - "zero/core/fs" - "zero/core/lang" - "zero/core/timex" + "github.com/tal-tech/go-zero/core/fs" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/timex" ) const ( diff --git a/core/logx/tracelog.go b/core/logx/tracelog.go index 268141b7..cbd3b13a 100644 --- a/core/logx/tracelog.go +++ b/core/logx/tracelog.go @@ -5,7 +5,7 @@ import ( "fmt" "io" - "zero/core/trace/tracespec" + "github.com/tal-tech/go-zero/core/trace/tracespec" ) type tracingEntry struct { diff --git a/core/logx/tracelog_test.go b/core/logx/tracelog_test.go index ca243cf6..96223d38 100644 --- a/core/logx/tracelog_test.go +++ b/core/logx/tracelog_test.go @@ -5,9 +5,8 @@ import ( "strings" "testing" - "zero/core/trace/tracespec" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/trace/tracespec" ) const ( diff --git a/core/mapping/jsonunmarshaler.go b/core/mapping/jsonunmarshaler.go index af7ed304..bcad9993 100644 --- a/core/mapping/jsonunmarshaler.go +++ b/core/mapping/jsonunmarshaler.go @@ -3,7 +3,7 @@ package mapping import ( "io" - "zero/core/jsonx" + "github.com/tal-tech/go-zero/core/jsonx" ) const jsonTagKey = "json" diff --git a/core/mapping/unmarshaler.go b/core/mapping/unmarshaler.go index d7f2d7a8..0952f5ab 100644 --- a/core/mapping/unmarshaler.go +++ b/core/mapping/unmarshaler.go @@ -10,9 +10,9 @@ import ( "sync/atomic" "time" - "zero/core/jsonx" - "zero/core/lang" - "zero/core/stringx" + "github.com/tal-tech/go-zero/core/jsonx" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/stringx" ) const ( diff --git a/core/mapping/unmarshaler_test.go b/core/mapping/unmarshaler_test.go index 72ea2840..6ef7886f 100644 --- a/core/mapping/unmarshaler_test.go +++ b/core/mapping/unmarshaler_test.go @@ -6,9 +6,8 @@ import ( "testing" "time" - "zero/core/stringx" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/stringx" ) // because json.Number doesn't support strconv.ParseUint(...), diff --git a/core/mapping/utils.go b/core/mapping/utils.go index fb9c67e9..7d4861da 100644 --- a/core/mapping/utils.go +++ b/core/mapping/utils.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "zero/core/stringx" + "github.com/tal-tech/go-zero/core/stringx" ) const ( diff --git a/core/mathx/int_test.go b/core/mathx/int_test.go index 04593f64..e8312ae3 100644 --- a/core/mathx/int_test.go +++ b/core/mathx/int_test.go @@ -3,9 +3,8 @@ package mathx import ( "testing" - "zero/core/stringx" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/stringx" ) func TestMaxInt(t *testing.T) { diff --git a/core/metric/counter.go b/core/metric/counter.go index 33cf5b9c..f5ca05d2 100644 --- a/core/metric/counter.go +++ b/core/metric/counter.go @@ -1,9 +1,8 @@ package metric import ( - "zero/core/proc" - prom "github.com/prometheus/client_golang/prometheus" + "github.com/tal-tech/go-zero/core/proc" ) type ( diff --git a/core/metric/gauge.go b/core/metric/gauge.go index 3951a782..24834d39 100644 --- a/core/metric/gauge.go +++ b/core/metric/gauge.go @@ -1,9 +1,8 @@ package metric import ( - "zero/core/proc" - prom "github.com/prometheus/client_golang/prometheus" + "github.com/tal-tech/go-zero/core/proc" ) type ( diff --git a/core/metric/histogram.go b/core/metric/histogram.go index 5fc0b820..d85bcd1a 100644 --- a/core/metric/histogram.go +++ b/core/metric/histogram.go @@ -1,9 +1,8 @@ package metric import ( - "zero/core/proc" - prom "github.com/prometheus/client_golang/prometheus" + "github.com/tal-tech/go-zero/core/proc" ) type ( diff --git a/core/mr/mapreduce.go b/core/mr/mapreduce.go index 70dd7a6d..4d71e89a 100644 --- a/core/mr/mapreduce.go +++ b/core/mr/mapreduce.go @@ -5,10 +5,10 @@ import ( "fmt" "sync" - "zero/core/errorx" - "zero/core/lang" - "zero/core/syncx" - "zero/core/threading" + "github.com/tal-tech/go-zero/core/errorx" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/syncx" + "github.com/tal-tech/go-zero/core/threading" ) const ( diff --git a/core/mr/mapreduce_test.go b/core/mr/mapreduce_test.go index 50abd150..8cd6b1ab 100644 --- a/core/mr/mapreduce_test.go +++ b/core/mr/mapreduce_test.go @@ -9,10 +9,9 @@ import ( "testing" "time" - "zero/core/stringx" - "zero/core/syncx" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/stringx" + "github.com/tal-tech/go-zero/core/syncx" ) var errDummy = errors.New("dummy") diff --git a/core/proc/goroutines.go b/core/proc/goroutines.go index 97afe752..f35e4de7 100644 --- a/core/proc/goroutines.go +++ b/core/proc/goroutines.go @@ -10,7 +10,7 @@ import ( "syscall" "time" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/logx" ) const ( diff --git a/core/proc/profile.go b/core/proc/profile.go index 05b707b8..062fa202 100644 --- a/core/proc/profile.go +++ b/core/proc/profile.go @@ -14,7 +14,7 @@ import ( "syscall" "time" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/logx" ) // DefaultMemProfileRate is the default memory profiling rate. diff --git a/core/proc/shutdown.go b/core/proc/shutdown.go index dfad0536..d487fe63 100644 --- a/core/proc/shutdown.go +++ b/core/proc/shutdown.go @@ -9,7 +9,7 @@ import ( "syscall" "time" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/logx" ) const ( diff --git a/core/proc/signals.go b/core/proc/signals.go index 542ef052..b2ba9774 100644 --- a/core/proc/signals.go +++ b/core/proc/signals.go @@ -7,7 +7,7 @@ import ( "os/signal" "syscall" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/logx" ) const timeFormat = "0102150405" diff --git a/core/prof/profilecenter.go b/core/prof/profilecenter.go index 6de7cbd8..84c380f7 100644 --- a/core/prof/profilecenter.go +++ b/core/prof/profilecenter.go @@ -7,10 +7,9 @@ import ( "sync/atomic" "time" - "zero/core/logx" - "zero/core/threading" - "github.com/olekukonko/tablewriter" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/threading" ) type ( diff --git a/core/prof/profiler.go b/core/prof/profiler.go index e4396991..03ba57b1 100644 --- a/core/prof/profiler.go +++ b/core/prof/profiler.go @@ -1,6 +1,6 @@ package prof -import "zero/core/utils" +import "github.com/tal-tech/go-zero/core/utils" type ( ProfilePoint struct { diff --git a/core/prometheus/agent.go b/core/prometheus/agent.go index 6e9ce65d..780ca1ed 100644 --- a/core/prometheus/agent.go +++ b/core/prometheus/agent.go @@ -5,10 +5,9 @@ import ( "net/http" "sync" - "zero/core/logx" - "zero/core/threading" - "github.com/prometheus/client_golang/prometheus/promhttp" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/threading" ) var once sync.Once diff --git a/core/rescue/recover.go b/core/rescue/recover.go index 3d63a2a5..52148218 100644 --- a/core/rescue/recover.go +++ b/core/rescue/recover.go @@ -1,6 +1,6 @@ package rescue -import "zero/core/logx" +import "github.com/tal-tech/go-zero/core/logx" func Recover(cleanups ...func()) { for _, cleanup := range cleanups { diff --git a/core/rescue/recover_test.go b/core/rescue/recover_test.go index 4316501d..9ca94368 100644 --- a/core/rescue/recover_test.go +++ b/core/rescue/recover_test.go @@ -4,9 +4,8 @@ import ( "sync/atomic" "testing" - "zero/core/logx" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/logx" ) func init() { diff --git a/core/service/serviceconf.go b/core/service/serviceconf.go index b7d5416c..f45f05ad 100644 --- a/core/service/serviceconf.go +++ b/core/service/serviceconf.go @@ -3,10 +3,10 @@ package service import ( "log" - "zero/core/load" - "zero/core/logx" - "zero/core/prometheus" - "zero/core/stat" + "github.com/tal-tech/go-zero/core/load" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/prometheus" + "github.com/tal-tech/go-zero/core/stat" ) const ( diff --git a/core/service/servicegroup.go b/core/service/servicegroup.go index 11d924e3..25ee8a75 100644 --- a/core/service/servicegroup.go +++ b/core/service/servicegroup.go @@ -3,9 +3,9 @@ package service import ( "log" - "zero/core/proc" - "zero/core/syncx" - "zero/core/threading" + "github.com/tal-tech/go-zero/core/proc" + "github.com/tal-tech/go-zero/core/syncx" + "github.com/tal-tech/go-zero/core/threading" ) type ( diff --git a/core/stat/alert.go b/core/stat/alert.go index 7b890b27..c08d8f06 100644 --- a/core/stat/alert.go +++ b/core/stat/alert.go @@ -10,11 +10,11 @@ import ( "sync/atomic" "time" - "zero/core/executors" - "zero/core/proc" - "zero/core/sysx" - "zero/core/timex" - "zero/core/utils" + "github.com/tal-tech/go-zero/core/executors" + "github.com/tal-tech/go-zero/core/proc" + "github.com/tal-tech/go-zero/core/sysx" + "github.com/tal-tech/go-zero/core/timex" + "github.com/tal-tech/go-zero/core/utils" ) const ( diff --git a/core/stat/internal/cgroup_linux.go b/core/stat/internal/cgroup_linux.go index 13fb7251..a2dff6b8 100644 --- a/core/stat/internal/cgroup_linux.go +++ b/core/stat/internal/cgroup_linux.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "zero/core/iox" - "zero/core/lang" + "github.com/tal-tech/go-zero/core/iox" + "github.com/tal-tech/go-zero/core/lang" ) const cgroupDir = "/sys/fs/cgroup" diff --git a/core/stat/internal/cpu_linux.go b/core/stat/internal/cpu_linux.go index b8437bfc..fea314b7 100644 --- a/core/stat/internal/cpu_linux.go +++ b/core/stat/internal/cpu_linux.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "zero/core/iox" - "zero/core/lang" + "github.com/tal-tech/go-zero/core/iox" + "github.com/tal-tech/go-zero/core/lang" ) const ( diff --git a/core/stat/metrics.go b/core/stat/metrics.go index 176ce4e5..d848d02d 100644 --- a/core/stat/metrics.go +++ b/core/stat/metrics.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "zero/core/executors" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/executors" + "github.com/tal-tech/go-zero/core/logx" ) var ( diff --git a/core/stat/remotewriter.go b/core/stat/remotewriter.go index b6119575..66091a05 100644 --- a/core/stat/remotewriter.go +++ b/core/stat/remotewriter.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/logx" ) const httpTimeout = time.Second * 5 diff --git a/core/stat/usage.go b/core/stat/usage.go index 06b83653..7d50fbc8 100644 --- a/core/stat/usage.go +++ b/core/stat/usage.go @@ -5,9 +5,9 @@ import ( "sync/atomic" "time" - "zero/core/logx" - "zero/core/stat/internal" - "zero/core/threading" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/stat/internal" + "github.com/tal-tech/go-zero/core/threading" ) const ( diff --git a/core/stores/cache/cacheconf.go b/core/stores/cache/cacheconf.go index 7c706897..a7ff98cb 100644 --- a/core/stores/cache/cacheconf.go +++ b/core/stores/cache/cacheconf.go @@ -1,5 +1,5 @@ package cache -import "zero/core/stores/internal" +import "github.com/tal-tech/go-zero/core/stores/internal" type CacheConf = internal.ClusterConf diff --git a/core/stores/cache/cacheopt.go b/core/stores/cache/cacheopt.go index ef92a243..0e8db961 100644 --- a/core/stores/cache/cacheopt.go +++ b/core/stores/cache/cacheopt.go @@ -3,7 +3,7 @@ package cache import ( "time" - "zero/core/stores/internal" + "github.com/tal-tech/go-zero/core/stores/internal" ) type Option = internal.Option diff --git a/core/stores/clickhouse/clickhouse.go b/core/stores/clickhouse/clickhouse.go index 56d6d808..f45ae000 100644 --- a/core/stores/clickhouse/clickhouse.go +++ b/core/stores/clickhouse/clickhouse.go @@ -1,9 +1,8 @@ package clickhouse import ( - "zero/core/stores/sqlx" - _ "github.com/kshvakov/clickhouse" + "github.com/tal-tech/go-zero/core/stores/sqlx" ) const clickHouseDriverName = "clickhouse" diff --git a/core/stores/internal/cache.go b/core/stores/internal/cache.go index 5a7bcdec..fee65456 100644 --- a/core/stores/internal/cache.go +++ b/core/stores/internal/cache.go @@ -5,9 +5,9 @@ import ( "log" "time" - "zero/core/errorx" - "zero/core/hash" - "zero/core/syncx" + "github.com/tal-tech/go-zero/core/errorx" + "github.com/tal-tech/go-zero/core/hash" + "github.com/tal-tech/go-zero/core/syncx" ) type ( diff --git a/core/stores/internal/cache_test.go b/core/stores/internal/cache_test.go index e7b0a9b0..e5050f2a 100644 --- a/core/stores/internal/cache_test.go +++ b/core/stores/internal/cache_test.go @@ -8,13 +8,12 @@ import ( "testing" "time" - "zero/core/errorx" - "zero/core/hash" - "zero/core/stores/redis" - "zero/core/syncx" - "github.com/alicebob/miniredis" "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/errorx" + "github.com/tal-tech/go-zero/core/hash" + "github.com/tal-tech/go-zero/core/stores/redis" + "github.com/tal-tech/go-zero/core/syncx" ) type mockedNode struct { diff --git a/core/stores/internal/cachenode.go b/core/stores/internal/cachenode.go index e74a750f..723a20fd 100644 --- a/core/stores/internal/cachenode.go +++ b/core/stores/internal/cachenode.go @@ -8,11 +8,11 @@ import ( "sync" "time" - "zero/core/logx" - "zero/core/mathx" - "zero/core/stat" - "zero/core/stores/redis" - "zero/core/syncx" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/mathx" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/core/stores/redis" + "github.com/tal-tech/go-zero/core/syncx" ) const ( diff --git a/core/stores/internal/cachenode_test.go b/core/stores/internal/cachenode_test.go index 1a8c6405..72dd128e 100644 --- a/core/stores/internal/cachenode_test.go +++ b/core/stores/internal/cachenode_test.go @@ -7,13 +7,12 @@ import ( "testing" "time" - "zero/core/logx" - "zero/core/mathx" - "zero/core/stat" - "zero/core/stores/redis" - "github.com/alicebob/miniredis" "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/mathx" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/core/stores/redis" ) func init() { diff --git a/core/stores/internal/cachestat.go b/core/stores/internal/cachestat.go index 238ded6f..ff2b3d78 100644 --- a/core/stores/internal/cachestat.go +++ b/core/stores/internal/cachestat.go @@ -4,7 +4,7 @@ import ( "sync/atomic" "time" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/logx" ) const statInterval = time.Minute diff --git a/core/stores/internal/cleaner.go b/core/stores/internal/cleaner.go index 1dfc1fe1..3838207a 100644 --- a/core/stores/internal/cleaner.go +++ b/core/stores/internal/cleaner.go @@ -4,13 +4,13 @@ import ( "fmt" "time" - "zero/core/collection" - "zero/core/lang" - "zero/core/logx" - "zero/core/proc" - "zero/core/stat" - "zero/core/stringx" - "zero/core/threading" + "github.com/tal-tech/go-zero/core/collection" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/proc" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/core/stringx" + "github.com/tal-tech/go-zero/core/threading" ) const ( diff --git a/core/stores/internal/config.go b/core/stores/internal/config.go index 63353244..eb440c97 100644 --- a/core/stores/internal/config.go +++ b/core/stores/internal/config.go @@ -1,6 +1,6 @@ package internal -import "zero/core/stores/redis" +import "github.com/tal-tech/go-zero/core/stores/redis" type ( ClusterConf []NodeConf diff --git a/core/stores/kv/config.go b/core/stores/kv/config.go index 38361574..0fb4cc76 100644 --- a/core/stores/kv/config.go +++ b/core/stores/kv/config.go @@ -1,5 +1,5 @@ package kv -import "zero/core/stores/internal" +import "github.com/tal-tech/go-zero/core/stores/internal" type KvConf = internal.ClusterConf diff --git a/core/stores/kv/store.go b/core/stores/kv/store.go index 02967b1e..95570b96 100644 --- a/core/stores/kv/store.go +++ b/core/stores/kv/store.go @@ -4,10 +4,10 @@ import ( "errors" "log" - "zero/core/errorx" - "zero/core/hash" - "zero/core/stores/internal" - "zero/core/stores/redis" + "github.com/tal-tech/go-zero/core/errorx" + "github.com/tal-tech/go-zero/core/hash" + "github.com/tal-tech/go-zero/core/stores/internal" + "github.com/tal-tech/go-zero/core/stores/redis" ) var ErrNoRedisNode = errors.New("no redis node") diff --git a/core/stores/kv/store_test.go b/core/stores/kv/store_test.go index f16c6316..da58ae3f 100644 --- a/core/stores/kv/store_test.go +++ b/core/stores/kv/store_test.go @@ -4,12 +4,11 @@ import ( "testing" "time" - "zero/core/stores/internal" - "zero/core/stores/redis" - "zero/core/stringx" - "github.com/alicebob/miniredis" "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/stores/internal" + "github.com/tal-tech/go-zero/core/stores/redis" + "github.com/tal-tech/go-zero/core/stringx" ) var s1, _ = miniredis.Run() diff --git a/core/stores/mongo/bulkinserter.go b/core/stores/mongo/bulkinserter.go index eb4c3a03..858bb33d 100644 --- a/core/stores/mongo/bulkinserter.go +++ b/core/stores/mongo/bulkinserter.go @@ -3,10 +3,9 @@ package mongo import ( "time" - "zero/core/executors" - "zero/core/logx" - "github.com/globalsign/mgo" + "github.com/tal-tech/go-zero/core/executors" + "github.com/tal-tech/go-zero/core/logx" ) const ( diff --git a/core/stores/mongo/collection.go b/core/stores/mongo/collection.go index ba33e52a..ee56efd5 100644 --- a/core/stores/mongo/collection.go +++ b/core/stores/mongo/collection.go @@ -4,11 +4,10 @@ import ( "encoding/json" "time" - "zero/core/breaker" - "zero/core/logx" - "zero/core/timex" - "github.com/globalsign/mgo" + "github.com/tal-tech/go-zero/core/breaker" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/timex" ) const slowThreshold = time.Millisecond * 500 diff --git a/core/stores/mongo/collection_test.go b/core/stores/mongo/collection_test.go index 65ccaa08..31cb10ec 100644 --- a/core/stores/mongo/collection_test.go +++ b/core/stores/mongo/collection_test.go @@ -6,8 +6,7 @@ import ( "github.com/globalsign/mgo" "github.com/stretchr/testify/assert" - - "zero/core/stringx" + "github.com/tal-tech/go-zero/core/stringx" ) func TestKeepPromise_accept(t *testing.T) { diff --git a/core/stores/mongo/iter.go b/core/stores/mongo/iter.go index 31c38ab8..dcedf982 100644 --- a/core/stores/mongo/iter.go +++ b/core/stores/mongo/iter.go @@ -2,9 +2,8 @@ package mongo import ( - "zero/core/breaker" - "github.com/globalsign/mgo/bson" + "github.com/tal-tech/go-zero/core/breaker" ) type ( diff --git a/core/stores/mongo/iter_test.go b/core/stores/mongo/iter_test.go index 70deb867..95c313d7 100644 --- a/core/stores/mongo/iter_test.go +++ b/core/stores/mongo/iter_test.go @@ -4,13 +4,12 @@ import ( "errors" "testing" - "zero/core/breaker" - "zero/core/stringx" - "zero/core/syncx" - "github.com/globalsign/mgo" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/breaker" + "github.com/tal-tech/go-zero/core/stringx" + "github.com/tal-tech/go-zero/core/syncx" ) func TestClosableIter_Close(t *testing.T) { diff --git a/core/stores/mongo/pipe.go b/core/stores/mongo/pipe.go index c54b16ab..52bd2e2b 100644 --- a/core/stores/mongo/pipe.go +++ b/core/stores/mongo/pipe.go @@ -3,9 +3,8 @@ package mongo import ( "time" - "zero/core/breaker" - "github.com/globalsign/mgo" + "github.com/tal-tech/go-zero/core/breaker" ) type ( diff --git a/core/stores/mongo/pipe_test.go b/core/stores/mongo/pipe_test.go index 640ab8c7..ec892a48 100644 --- a/core/stores/mongo/pipe_test.go +++ b/core/stores/mongo/pipe_test.go @@ -3,9 +3,8 @@ package mongo import ( "testing" - "zero/core/breaker" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/breaker" ) func TestRejectedPipe_All(t *testing.T) { diff --git a/core/stores/mongo/query.go b/core/stores/mongo/query.go index d3e23457..101c74bc 100644 --- a/core/stores/mongo/query.go +++ b/core/stores/mongo/query.go @@ -3,9 +3,8 @@ package mongo import ( "time" - "zero/core/breaker" - "github.com/globalsign/mgo" + "github.com/tal-tech/go-zero/core/breaker" ) type ( diff --git a/core/stores/mongo/query_test.go b/core/stores/mongo/query_test.go index 9b05b258..1db5909e 100644 --- a/core/stores/mongo/query_test.go +++ b/core/stores/mongo/query_test.go @@ -3,10 +3,9 @@ package mongo import ( "testing" - "zero/core/breaker" - "github.com/globalsign/mgo" "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/breaker" ) func Test_rejectedQuery_All(t *testing.T) { diff --git a/core/stores/mongo/sessionmanager.go b/core/stores/mongo/sessionmanager.go index 819c16fc..a86c6d91 100644 --- a/core/stores/mongo/sessionmanager.go +++ b/core/stores/mongo/sessionmanager.go @@ -4,10 +4,9 @@ import ( "io" "time" - "zero/core/logx" - "zero/core/syncx" - "github.com/globalsign/mgo" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/syncx" ) const ( diff --git a/core/stores/mongoc/cachedcollection.go b/core/stores/mongoc/cachedcollection.go index e4faf77e..62ce3c25 100644 --- a/core/stores/mongoc/cachedcollection.go +++ b/core/stores/mongoc/cachedcollection.go @@ -1,11 +1,10 @@ package mongoc import ( - "zero/core/stores/internal" - "zero/core/stores/mongo" - "zero/core/syncx" - "github.com/globalsign/mgo" + "github.com/tal-tech/go-zero/core/stores/internal" + "github.com/tal-tech/go-zero/core/stores/mongo" + "github.com/tal-tech/go-zero/core/syncx" ) var ( diff --git a/core/stores/mongoc/cachedcollection_test.go b/core/stores/mongoc/cachedcollection_test.go index 11c6f682..a214d073 100644 --- a/core/stores/mongoc/cachedcollection_test.go +++ b/core/stores/mongoc/cachedcollection_test.go @@ -11,15 +11,14 @@ import ( "testing" "time" - "zero/core/stat" - "zero/core/stores/internal" - "zero/core/stores/mongo" - "zero/core/stores/redis" - "github.com/alicebob/miniredis" "github.com/globalsign/mgo" "github.com/globalsign/mgo/bson" "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/core/stores/internal" + "github.com/tal-tech/go-zero/core/stores/mongo" + "github.com/tal-tech/go-zero/core/stores/redis" ) func init() { diff --git a/core/stores/mongoc/cachedmodel.go b/core/stores/mongoc/cachedmodel.go index 8b880ea7..4e7f8264 100644 --- a/core/stores/mongoc/cachedmodel.go +++ b/core/stores/mongoc/cachedmodel.go @@ -3,12 +3,11 @@ package mongoc import ( "log" - "zero/core/stores/cache" - "zero/core/stores/internal" - "zero/core/stores/mongo" - "zero/core/stores/redis" - "github.com/globalsign/mgo" + "github.com/tal-tech/go-zero/core/stores/cache" + "github.com/tal-tech/go-zero/core/stores/internal" + "github.com/tal-tech/go-zero/core/stores/mongo" + "github.com/tal-tech/go-zero/core/stores/redis" ) type Model struct { diff --git a/core/stores/postgres/postgresql.go b/core/stores/postgres/postgresql.go index 820862b8..456471ad 100644 --- a/core/stores/postgres/postgresql.go +++ b/core/stores/postgres/postgresql.go @@ -1,9 +1,8 @@ package postgres import ( - "zero/core/stores/sqlx" - _ "github.com/lib/pq" + "github.com/tal-tech/go-zero/core/stores/sqlx" ) const postgreDriverName = "postgres" diff --git a/core/stores/redis/process.go b/core/stores/redis/process.go index 141257c9..d1081b46 100644 --- a/core/stores/redis/process.go +++ b/core/stores/redis/process.go @@ -3,11 +3,10 @@ package redis import ( "strings" - "zero/core/logx" - "zero/core/mapping" - "zero/core/timex" - red "github.com/go-redis/redis" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/mapping" + "github.com/tal-tech/go-zero/core/timex" ) func process(proc func(red.Cmder) error) func(red.Cmder) error { diff --git a/core/stores/redis/redis.go b/core/stores/redis/redis.go index 6c052794..449e5d23 100644 --- a/core/stores/redis/redis.go +++ b/core/stores/redis/redis.go @@ -6,10 +6,9 @@ import ( "strconv" "time" - "zero/core/breaker" - "zero/core/mapping" - red "github.com/go-redis/redis" + "github.com/tal-tech/go-zero/core/breaker" + "github.com/tal-tech/go-zero/core/mapping" ) const ( diff --git a/core/stores/redis/redisblockingnode.go b/core/stores/redis/redisblockingnode.go index 3f377bb4..e70f745a 100644 --- a/core/stores/redis/redisblockingnode.go +++ b/core/stores/redis/redisblockingnode.go @@ -3,9 +3,8 @@ package redis import ( "fmt" - "zero/core/logx" - red "github.com/go-redis/redis" + "github.com/tal-tech/go-zero/core/logx" ) type ClosableNode interface { diff --git a/core/stores/redis/redisclientmanager.go b/core/stores/redis/redisclientmanager.go index 7a0cff37..f0caf931 100644 --- a/core/stores/redis/redisclientmanager.go +++ b/core/stores/redis/redisclientmanager.go @@ -3,9 +3,8 @@ package redis import ( "io" - "zero/core/syncx" - red "github.com/go-redis/redis" + "github.com/tal-tech/go-zero/core/syncx" ) const ( diff --git a/core/stores/redis/redisclustermanager.go b/core/stores/redis/redisclustermanager.go index f11f1ab7..ec52eb54 100644 --- a/core/stores/redis/redisclustermanager.go +++ b/core/stores/redis/redisclustermanager.go @@ -3,9 +3,8 @@ package redis import ( "io" - "zero/core/syncx" - red "github.com/go-redis/redis" + "github.com/tal-tech/go-zero/core/syncx" ) var clusterManager = syncx.NewResourceManager() diff --git a/core/stores/redis/redislock.go b/core/stores/redis/redislock.go index 3d2c718e..17db7055 100644 --- a/core/stores/redis/redislock.go +++ b/core/stores/redis/redislock.go @@ -6,9 +6,8 @@ import ( "sync/atomic" "time" - "zero/core/logx" - red "github.com/go-redis/redis" + "github.com/tal-tech/go-zero/core/logx" ) const ( diff --git a/core/stores/redis/redislock_test.go b/core/stores/redis/redislock_test.go index fd36d588..588cf25a 100644 --- a/core/stores/redis/redislock_test.go +++ b/core/stores/redis/redislock_test.go @@ -3,9 +3,8 @@ package redis import ( "testing" - "zero/core/stringx" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/stringx" ) func TestRedisLock(t *testing.T) { diff --git a/core/stores/sqlc/cachedsql.go b/core/stores/sqlc/cachedsql.go index da647d7d..70efdd21 100644 --- a/core/stores/sqlc/cachedsql.go +++ b/core/stores/sqlc/cachedsql.go @@ -4,11 +4,11 @@ import ( "database/sql" "time" - "zero/core/stores/cache" - "zero/core/stores/internal" - "zero/core/stores/redis" - "zero/core/stores/sqlx" - "zero/core/syncx" + "github.com/tal-tech/go-zero/core/stores/cache" + "github.com/tal-tech/go-zero/core/stores/internal" + "github.com/tal-tech/go-zero/core/stores/redis" + "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/tal-tech/go-zero/core/syncx" ) // see doc/sql-cache.md diff --git a/core/stores/sqlc/cachedsql_test.go b/core/stores/sqlc/cachedsql_test.go index 2665d90d..e825d6c9 100644 --- a/core/stores/sqlc/cachedsql_test.go +++ b/core/stores/sqlc/cachedsql_test.go @@ -14,14 +14,13 @@ import ( "testing" "time" - "zero/core/logx" - "zero/core/stat" - "zero/core/stores/cache" - "zero/core/stores/redis" - "zero/core/stores/sqlx" - "github.com/alicebob/miniredis" "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/core/stores/cache" + "github.com/tal-tech/go-zero/core/stores/redis" + "github.com/tal-tech/go-zero/core/stores/sqlx" ) func init() { diff --git a/core/stores/sqlx/bulkinserter.go b/core/stores/sqlx/bulkinserter.go index 88ece15e..2f183b22 100644 --- a/core/stores/sqlx/bulkinserter.go +++ b/core/stores/sqlx/bulkinserter.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "zero/core/executors" - "zero/core/logx" - "zero/core/stringx" + "github.com/tal-tech/go-zero/core/executors" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/stringx" ) const ( diff --git a/core/stores/sqlx/bulkinserter_test.go b/core/stores/sqlx/bulkinserter_test.go index f0c2c287..bdfd21fe 100644 --- a/core/stores/sqlx/bulkinserter_test.go +++ b/core/stores/sqlx/bulkinserter_test.go @@ -5,10 +5,9 @@ import ( "strconv" "testing" - "zero/core/logx" - "github.com/DATA-DOG/go-sqlmock" "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/logx" ) type mockedConn struct { diff --git a/core/stores/sqlx/mysql_test.go b/core/stores/sqlx/mysql_test.go index 5efe98c0..e6170411 100644 --- a/core/stores/sqlx/mysql_test.go +++ b/core/stores/sqlx/mysql_test.go @@ -3,12 +3,11 @@ package sqlx import ( "testing" - "zero/core/breaker" - "zero/core/logx" - "zero/core/stat" - "github.com/go-sql-driver/mysql" "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/breaker" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/stat" ) func init() { diff --git a/core/stores/sqlx/orm.go b/core/stores/sqlx/orm.go index 83a3a4bd..d8a3127c 100644 --- a/core/stores/sqlx/orm.go +++ b/core/stores/sqlx/orm.go @@ -5,7 +5,7 @@ import ( "reflect" "strings" - "zero/core/mapping" + "github.com/tal-tech/go-zero/core/mapping" ) const tagName = "db" diff --git a/core/stores/sqlx/orm_test.go b/core/stores/sqlx/orm_test.go index e35b729c..d11b4b5c 100644 --- a/core/stores/sqlx/orm_test.go +++ b/core/stores/sqlx/orm_test.go @@ -4,10 +4,9 @@ import ( "database/sql" "testing" - "zero/core/logx" - "github.com/DATA-DOG/go-sqlmock" "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/logx" ) func TestUnmarshalRowBool(t *testing.T) { diff --git a/core/stores/sqlx/sqlconn.go b/core/stores/sqlx/sqlconn.go index 26b256cd..4c0acbd3 100644 --- a/core/stores/sqlx/sqlconn.go +++ b/core/stores/sqlx/sqlconn.go @@ -3,7 +3,7 @@ package sqlx import ( "database/sql" - "zero/core/breaker" + "github.com/tal-tech/go-zero/core/breaker" ) var ErrNotFound = sql.ErrNoRows diff --git a/core/stores/sqlx/sqlmanager.go b/core/stores/sqlx/sqlmanager.go index fa18e0f8..494945a7 100644 --- a/core/stores/sqlx/sqlmanager.go +++ b/core/stores/sqlx/sqlmanager.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "zero/core/syncx" + "github.com/tal-tech/go-zero/core/syncx" ) const ( diff --git a/core/stores/sqlx/stmt.go b/core/stores/sqlx/stmt.go index ed3dc530..0734c33b 100644 --- a/core/stores/sqlx/stmt.go +++ b/core/stores/sqlx/stmt.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "zero/core/logx" - "zero/core/timex" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/timex" ) const slowThreshold = time.Millisecond * 500 diff --git a/core/stores/sqlx/utils.go b/core/stores/sqlx/utils.go index 8ec78539..5652e25f 100644 --- a/core/stores/sqlx/utils.go +++ b/core/stores/sqlx/utils.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "zero/core/logx" - "zero/core/mapping" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/mapping" ) func desensitize(datasource string) string { diff --git a/core/stringx/strings.go b/core/stringx/strings.go index 154eb38f..11a6c732 100644 --- a/core/stringx/strings.go +++ b/core/stringx/strings.go @@ -3,7 +3,7 @@ package stringx import ( "errors" - "zero/core/lang" + "github.com/tal-tech/go-zero/core/lang" ) var ( diff --git a/core/stringx/trie.go b/core/stringx/trie.go index ddc2872e..3c0abee8 100644 --- a/core/stringx/trie.go +++ b/core/stringx/trie.go @@ -1,6 +1,6 @@ package stringx -import "zero/core/lang" +import "github.com/tal-tech/go-zero/core/lang" type ( Trie interface { diff --git a/core/syncx/cond.go b/core/syncx/cond.go index 890e6f84..5497beb7 100644 --- a/core/syncx/cond.go +++ b/core/syncx/cond.go @@ -3,8 +3,8 @@ package syncx import ( "time" - "zero/core/lang" - "zero/core/timex" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/timex" ) type Cond struct { diff --git a/core/syncx/donechan.go b/core/syncx/donechan.go index d49fccea..6cb60b6f 100644 --- a/core/syncx/donechan.go +++ b/core/syncx/donechan.go @@ -3,7 +3,7 @@ package syncx import ( "sync" - "zero/core/lang" + "github.com/tal-tech/go-zero/core/lang" ) type DoneChan struct { diff --git a/core/syncx/immutableresource.go b/core/syncx/immutableresource.go index f3475cee..1f9a076a 100644 --- a/core/syncx/immutableresource.go +++ b/core/syncx/immutableresource.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "zero/core/timex" + "github.com/tal-tech/go-zero/core/timex" ) const defaultRefreshInterval = time.Second diff --git a/core/syncx/limit.go b/core/syncx/limit.go index 4a99126b..04fa3aaa 100644 --- a/core/syncx/limit.go +++ b/core/syncx/limit.go @@ -3,7 +3,7 @@ package syncx import ( "errors" - "zero/core/lang" + "github.com/tal-tech/go-zero/core/lang" ) var ErrReturn = errors.New("discarding limited token, resource pool is full, someone returned multiple times") diff --git a/core/syncx/pool.go b/core/syncx/pool.go index c1414e09..93444026 100644 --- a/core/syncx/pool.go +++ b/core/syncx/pool.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "zero/core/timex" + "github.com/tal-tech/go-zero/core/timex" ) type ( diff --git a/core/syncx/pool_test.go b/core/syncx/pool_test.go index cd9fdc63..34a5d9ac 100644 --- a/core/syncx/pool_test.go +++ b/core/syncx/pool_test.go @@ -6,9 +6,8 @@ import ( "testing" "time" - "zero/core/lang" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/lang" ) const limit = 10 diff --git a/core/syncx/resourcemanager.go b/core/syncx/resourcemanager.go index 22b49504..358bd994 100644 --- a/core/syncx/resourcemanager.go +++ b/core/syncx/resourcemanager.go @@ -4,7 +4,7 @@ import ( "io" "sync" - "zero/core/errorx" + "github.com/tal-tech/go-zero/core/errorx" ) type ResourceManager struct { diff --git a/core/sysx/host.go b/core/sysx/host.go index cc46902a..dccddf9f 100644 --- a/core/sysx/host.go +++ b/core/sysx/host.go @@ -3,7 +3,7 @@ package sysx import ( "os" - "zero/core/lang" + "github.com/tal-tech/go-zero/core/lang" ) var hostname string diff --git a/core/threading/routines.go b/core/threading/routines.go index e41a5204..21bfcf77 100644 --- a/core/threading/routines.go +++ b/core/threading/routines.go @@ -5,7 +5,7 @@ import ( "runtime" "strconv" - "zero/core/rescue" + "github.com/tal-tech/go-zero/core/rescue" ) func GoSafe(fn func()) { diff --git a/core/threading/routines_test.go b/core/threading/routines_test.go index 55f76a2e..c3569a94 100644 --- a/core/threading/routines_test.go +++ b/core/threading/routines_test.go @@ -5,9 +5,8 @@ import ( "log" "testing" - "zero/core/lang" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/lang" ) func TestRoutineId(t *testing.T) { diff --git a/core/threading/taskrunner.go b/core/threading/taskrunner.go index e119db22..ba0c7b34 100644 --- a/core/threading/taskrunner.go +++ b/core/threading/taskrunner.go @@ -1,8 +1,8 @@ package threading import ( - "zero/core/lang" - "zero/core/rescue" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/rescue" ) type TaskRunner struct { diff --git a/core/threading/workergroup_test.go b/core/threading/workergroup_test.go index a2e978ec..7e8a6958 100644 --- a/core/threading/workergroup_test.go +++ b/core/threading/workergroup_test.go @@ -6,9 +6,8 @@ import ( "sync" "testing" - "zero/core/lang" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/lang" ) func TestWorkerGroup(t *testing.T) { diff --git a/core/timex/ticker.go b/core/timex/ticker.go index 2b7458e4..1d86d9dc 100644 --- a/core/timex/ticker.go +++ b/core/timex/ticker.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "zero/core/lang" + "github.com/tal-tech/go-zero/core/lang" ) type ( diff --git a/core/trace/carrier_test.go b/core/trace/carrier_test.go index ce7a29ab..4d9f0326 100644 --- a/core/trace/carrier_test.go +++ b/core/trace/carrier_test.go @@ -5,9 +5,8 @@ import ( "net/http/httptest" "testing" - "zero/core/stringx" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/stringx" ) func TestHttpCarrier(t *testing.T) { diff --git a/core/trace/noop.go b/core/trace/noop.go index fd048e3b..5df47fc3 100644 --- a/core/trace/noop.go +++ b/core/trace/noop.go @@ -3,7 +3,7 @@ package trace import ( "context" - "zero/core/trace/tracespec" + "github.com/tal-tech/go-zero/core/trace/tracespec" ) var emptyNoopSpan = noopSpan{} diff --git a/core/trace/span.go b/core/trace/span.go index 83bfc0b4..014ac29e 100644 --- a/core/trace/span.go +++ b/core/trace/span.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "zero/core/stringx" - "zero/core/timex" - "zero/core/trace/tracespec" + "github.com/tal-tech/go-zero/core/stringx" + "github.com/tal-tech/go-zero/core/timex" + "github.com/tal-tech/go-zero/core/trace/tracespec" ) const ( diff --git a/core/trace/span_test.go b/core/trace/span_test.go index f86de421..ab0fa14d 100644 --- a/core/trace/span_test.go +++ b/core/trace/span_test.go @@ -4,10 +4,9 @@ import ( "context" "testing" - "zero/core/stringx" - "zero/core/trace/tracespec" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/stringx" + "github.com/tal-tech/go-zero/core/trace/tracespec" "google.golang.org/grpc/metadata" ) diff --git a/core/utils/times.go b/core/utils/times.go index b799f511..8d03e266 100644 --- a/core/utils/times.go +++ b/core/utils/times.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "zero/core/timex" + "github.com/tal-tech/go-zero/core/timex" ) type ElapsedTimer struct { diff --git a/example/bloom/bloom.go b/example/bloom/bloom.go index b76288f0..cd812f47 100644 --- a/example/bloom/bloom.go +++ b/example/bloom/bloom.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "zero/core/bloom" - "zero/core/stores/redis" + "github.com/tal-tech/go-zero/core/bloom" + "github.com/tal-tech/go-zero/core/stores/redis" ) func main() { diff --git a/example/breaker/main.go b/example/breaker/main.go index 178b3da4..692f5c42 100644 --- a/example/breaker/main.go +++ b/example/breaker/main.go @@ -8,8 +8,8 @@ import ( "sync/atomic" "time" - "zero/core/breaker" - "zero/core/lang" + "github.com/tal-tech/go-zero/core/breaker" + "github.com/tal-tech/go-zero/core/lang" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/example/config/loadfromyaml/main.go b/example/config/loadfromyaml/main.go index c61b43e9..7713dd86 100644 --- a/example/config/loadfromyaml/main.go +++ b/example/config/loadfromyaml/main.go @@ -3,8 +3,8 @@ package main import ( "time" - "zero/core/conf" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/conf" + "github.com/tal-tech/go-zero/core/logx" ) type TimeHolder struct { diff --git a/example/etcd/demo/etcdmon.go b/example/etcd/demo/etcdmon.go index b623ab84..0bfe9279 100644 --- a/example/etcd/demo/etcdmon.go +++ b/example/etcd/demo/etcdmon.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "zero/core/discov" - "zero/core/logx" - "zero/core/proc" - "zero/core/syncx" + "github.com/tal-tech/go-zero/core/discov" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/proc" + "github.com/tal-tech/go-zero/core/syncx" "go.etcd.io/etcd/clientv3" ) diff --git a/example/etcd/pub/pub.go b/example/etcd/pub/pub.go index 870e4b9e..45025792 100644 --- a/example/etcd/pub/pub.go +++ b/example/etcd/pub/pub.go @@ -6,7 +6,7 @@ import ( "log" "time" - "zero/core/discov" + "github.com/tal-tech/go-zero/core/discov" ) var value = flag.String("v", "value", "the value") diff --git a/example/etcd/sub/sub.go b/example/etcd/sub/sub.go index c6cd03c2..559737ca 100644 --- a/example/etcd/sub/sub.go +++ b/example/etcd/sub/sub.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "zero/core/discov" - "zero/core/lang" + "github.com/tal-tech/go-zero/core/discov" + "github.com/tal-tech/go-zero/core/lang" ) func main() { diff --git a/example/filex/pread.go b/example/filex/pread.go index 1377a8d0..65e8f2b5 100644 --- a/example/filex/pread.go +++ b/example/filex/pread.go @@ -12,9 +12,9 @@ import ( "strings" "time" - "zero/core/filex" - "zero/core/fx" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/filex" + "github.com/tal-tech/go-zero/core/fx" + "github.com/tal-tech/go-zero/core/logx" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/example/fx/fx_test.go b/example/fx/fx_test.go index 62a115db..125e1e5e 100644 --- a/example/fx/fx_test.go +++ b/example/fx/fx_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "zero/core/fx" + "github.com/tal-tech/go-zero/core/fx" ) func BenchmarkFx(b *testing.B) { diff --git a/example/fx/square.go b/example/fx/square.go index 640371e8..20fa9b61 100644 --- a/example/fx/square.go +++ b/example/fx/square.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "zero/core/fx" + "github.com/tal-tech/go-zero/core/fx" ) func main() { diff --git a/example/graceful/dns/api/config/config.go b/example/graceful/dns/api/config/config.go index 4ba55209..3b0ef53a 100644 --- a/example/graceful/dns/api/config/config.go +++ b/example/graceful/dns/api/config/config.go @@ -1,8 +1,8 @@ package config import ( - "zero/rest" - "zero/rpcx" + "github.com/tal-tech/go-zero/rest" + "github.com/tal-tech/go-zero/rpcx" ) type Config struct { diff --git a/example/graceful/dns/api/graceful.go b/example/graceful/dns/api/graceful.go index 16ed7e70..19601ccb 100644 --- a/example/graceful/dns/api/graceful.go +++ b/example/graceful/dns/api/graceful.go @@ -3,12 +3,12 @@ package main import ( "flag" - "zero/core/conf" - "zero/example/graceful/dns/api/config" - "zero/example/graceful/dns/api/handler" - "zero/example/graceful/dns/api/svc" - "zero/rest" - "zero/rpcx" + "github.com/tal-tech/go-zero/core/conf" + "github.com/tal-tech/go-zero/example/graceful/dns/api/config" + "github.com/tal-tech/go-zero/example/graceful/dns/api/handler" + "github.com/tal-tech/go-zero/example/graceful/dns/api/svc" + "github.com/tal-tech/go-zero/rest" + "github.com/tal-tech/go-zero/rpcx" ) var configFile = flag.String("f", "etc/graceful-api.json", "the config file") diff --git a/example/graceful/dns/api/handler/gracefulhandler.go b/example/graceful/dns/api/handler/gracefulhandler.go index ac846ad8..9953e2b9 100644 --- a/example/graceful/dns/api/handler/gracefulhandler.go +++ b/example/graceful/dns/api/handler/gracefulhandler.go @@ -7,12 +7,12 @@ import ( "os" "time" - "zero/core/executors" - "zero/core/logx" - "zero/example/graceful/dns/api/svc" - "zero/example/graceful/dns/api/types" - "zero/example/graceful/dns/rpc/graceful" - "zero/rest/httpx" + "github.com/tal-tech/go-zero/core/executors" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/example/graceful/dns/api/svc" + "github.com/tal-tech/go-zero/example/graceful/dns/api/types" + "github.com/tal-tech/go-zero/example/graceful/dns/rpc/graceful" + "github.com/tal-tech/go-zero/rest/httpx" ) func gracefulHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/example/graceful/dns/api/handler/routes.go b/example/graceful/dns/api/handler/routes.go index 56bda696..67db4faf 100644 --- a/example/graceful/dns/api/handler/routes.go +++ b/example/graceful/dns/api/handler/routes.go @@ -4,8 +4,8 @@ package handler import ( "net/http" - "zero/example/graceful/dns/api/svc" - "zero/rest" + "github.com/tal-tech/go-zero/example/graceful/dns/api/svc" + "github.com/tal-tech/go-zero/rest" ) func RegisterHandlers(engine *rest.Server, ctx *svc.ServiceContext) { diff --git a/example/graceful/dns/api/svc/servicecontext.go b/example/graceful/dns/api/svc/servicecontext.go index 6efedfd0..7bd478e0 100644 --- a/example/graceful/dns/api/svc/servicecontext.go +++ b/example/graceful/dns/api/svc/servicecontext.go @@ -1,6 +1,6 @@ package svc -import "zero/rpcx" +import "github.com/tal-tech/go-zero/rpcx" type ServiceContext struct { Client *rpcx.RpcClient diff --git a/example/graceful/dns/rpc/graceful/graceful.pb.go b/example/graceful/dns/rpc/graceful/graceful.pb.go index 611ecb0b..3d19d3d0 100644 --- a/example/graceful/dns/rpc/graceful/graceful.pb.go +++ b/example/graceful/dns/rpc/graceful/graceful.pb.go @@ -14,13 +14,13 @@ It has these top-level messages: */ package graceful -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" - import ( - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" + "fmt" + "math" + + "github.com/golang/protobuf/proto" + "golang.org/x/net/context" + "google.golang.org/grpc" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/example/graceful/dns/rpc/gracefulrpc.go b/example/graceful/dns/rpc/gracefulrpc.go index d1515127..2da12fe8 100644 --- a/example/graceful/dns/rpc/gracefulrpc.go +++ b/example/graceful/dns/rpc/gracefulrpc.go @@ -7,9 +7,9 @@ import ( "os" "time" - "zero/core/conf" - "zero/example/graceful/dns/rpc/graceful" - "zero/rpcx" + "github.com/tal-tech/go-zero/core/conf" + "github.com/tal-tech/go-zero/example/graceful/dns/rpc/graceful" + "github.com/tal-tech/go-zero/rpcx" "google.golang.org/grpc" ) diff --git a/example/graceful/etcd/api/config/config.go b/example/graceful/etcd/api/config/config.go index 4ba55209..3b0ef53a 100644 --- a/example/graceful/etcd/api/config/config.go +++ b/example/graceful/etcd/api/config/config.go @@ -1,8 +1,8 @@ package config import ( - "zero/rest" - "zero/rpcx" + "github.com/tal-tech/go-zero/rest" + "github.com/tal-tech/go-zero/rpcx" ) type Config struct { diff --git a/example/graceful/etcd/api/graceful.go b/example/graceful/etcd/api/graceful.go index 23775072..3fdfd344 100644 --- a/example/graceful/etcd/api/graceful.go +++ b/example/graceful/etcd/api/graceful.go @@ -3,12 +3,12 @@ package main import ( "flag" - "zero/core/conf" - "zero/example/graceful/etcd/api/config" - "zero/example/graceful/etcd/api/handler" - "zero/example/graceful/etcd/api/svc" - "zero/rest" - "zero/rpcx" + "github.com/tal-tech/go-zero/core/conf" + "github.com/tal-tech/go-zero/example/graceful/etcd/api/config" + "github.com/tal-tech/go-zero/example/graceful/etcd/api/handler" + "github.com/tal-tech/go-zero/example/graceful/etcd/api/svc" + "github.com/tal-tech/go-zero/rest" + "github.com/tal-tech/go-zero/rpcx" ) var configFile = flag.String("f", "etc/graceful-api.json", "the config file") diff --git a/example/graceful/etcd/api/handler/gracefulhandler.go b/example/graceful/etcd/api/handler/gracefulhandler.go index 6d0a6c08..ec766410 100644 --- a/example/graceful/etcd/api/handler/gracefulhandler.go +++ b/example/graceful/etcd/api/handler/gracefulhandler.go @@ -7,12 +7,12 @@ import ( "os" "time" - "zero/core/executors" - "zero/core/logx" - "zero/example/graceful/etcd/api/svc" - "zero/example/graceful/etcd/api/types" - "zero/example/graceful/etcd/rpc/graceful" - "zero/rest/httpx" + "github.com/tal-tech/go-zero/core/executors" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/example/graceful/etcd/api/svc" + "github.com/tal-tech/go-zero/example/graceful/etcd/api/types" + "github.com/tal-tech/go-zero/example/graceful/etcd/rpc/graceful" + "github.com/tal-tech/go-zero/rest/httpx" ) func gracefulHandler(ctx *svc.ServiceContext) http.HandlerFunc { diff --git a/example/graceful/etcd/api/handler/routes.go b/example/graceful/etcd/api/handler/routes.go index a82ffad8..6471488c 100644 --- a/example/graceful/etcd/api/handler/routes.go +++ b/example/graceful/etcd/api/handler/routes.go @@ -4,8 +4,8 @@ package handler import ( "net/http" - "zero/example/graceful/etcd/api/svc" - "zero/rest" + "github.com/tal-tech/go-zero/example/graceful/etcd/api/svc" + "github.com/tal-tech/go-zero/rest" ) func RegisterHandlers(engine *rest.Server, ctx *svc.ServiceContext) { diff --git a/example/graceful/etcd/api/svc/servicecontext.go b/example/graceful/etcd/api/svc/servicecontext.go index 6efedfd0..7bd478e0 100644 --- a/example/graceful/etcd/api/svc/servicecontext.go +++ b/example/graceful/etcd/api/svc/servicecontext.go @@ -1,6 +1,6 @@ package svc -import "zero/rpcx" +import "github.com/tal-tech/go-zero/rpcx" type ServiceContext struct { Client *rpcx.RpcClient diff --git a/example/graceful/etcd/rpc/graceful/graceful.pb.go b/example/graceful/etcd/rpc/graceful/graceful.pb.go index 611ecb0b..3d19d3d0 100644 --- a/example/graceful/etcd/rpc/graceful/graceful.pb.go +++ b/example/graceful/etcd/rpc/graceful/graceful.pb.go @@ -14,13 +14,13 @@ It has these top-level messages: */ package graceful -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" - import ( - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" + "fmt" + "math" + + "github.com/golang/protobuf/proto" + "golang.org/x/net/context" + "google.golang.org/grpc" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/example/graceful/etcd/rpc/gracefulrpc.go b/example/graceful/etcd/rpc/gracefulrpc.go index 330809cf..e9e51373 100644 --- a/example/graceful/etcd/rpc/gracefulrpc.go +++ b/example/graceful/etcd/rpc/gracefulrpc.go @@ -7,9 +7,9 @@ import ( "os" "time" - "zero/core/conf" - "zero/example/graceful/etcd/rpc/graceful" - "zero/rpcx" + "github.com/tal-tech/go-zero/core/conf" + "github.com/tal-tech/go-zero/example/graceful/etcd/rpc/graceful" + "github.com/tal-tech/go-zero/rpcx" "google.golang.org/grpc" ) diff --git a/example/http/breaker/client/client.go b/example/http/breaker/client/client.go index 75c70703..1e77911e 100644 --- a/example/http/breaker/client/client.go +++ b/example/http/breaker/client/client.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "zero/core/lang" - "zero/core/threading" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/threading" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/example/http/breaker/server.go b/example/http/breaker/server.go index 43e782f6..4e5fc65a 100644 --- a/example/http/breaker/server.go +++ b/example/http/breaker/server.go @@ -5,11 +5,11 @@ import ( "runtime" "time" - "zero/core/logx" - "zero/core/service" - "zero/core/stat" - "zero/core/syncx" - "zero/rest" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/service" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/core/syncx" + "github.com/tal-tech/go-zero/rest" ) func main() { diff --git a/example/http/crypt/crypt.go b/example/http/crypt/crypt.go index 6bb47f5b..b806ef66 100644 --- a/example/http/crypt/crypt.go +++ b/example/http/crypt/crypt.go @@ -4,7 +4,7 @@ import ( "fmt" "log" - "zero/core/codec" + "github.com/tal-tech/go-zero/core/codec" ) const ( diff --git a/example/http/demo/main.go b/example/http/demo/main.go index 93300bb0..47b05806 100644 --- a/example/http/demo/main.go +++ b/example/http/demo/main.go @@ -4,10 +4,10 @@ import ( "flag" "net/http" - "zero/core/logx" - "zero/core/service" - "zero/rest" - "zero/rest/httpx" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/service" + "github.com/tal-tech/go-zero/rest" + "github.com/tal-tech/go-zero/rest/httpx" ) var ( diff --git a/example/http/post/main.go b/example/http/post/main.go index 2e807061..81b30c25 100644 --- a/example/http/post/main.go +++ b/example/http/post/main.go @@ -5,10 +5,10 @@ import ( "fmt" "net/http" - "zero/core/logx" - "zero/core/service" - "zero/rest" - "zero/rest/httpx" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/service" + "github.com/tal-tech/go-zero/rest" + "github.com/tal-tech/go-zero/rest/httpx" ) var ( diff --git a/example/http/shedding/main.go b/example/http/shedding/main.go index efd2fa67..f80f16cb 100644 --- a/example/http/shedding/main.go +++ b/example/http/shedding/main.go @@ -6,10 +6,10 @@ import ( "net/http" "time" - "zero/core/logx" - "zero/core/service" - "zero/rest" - "zero/rest/httpx" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/service" + "github.com/tal-tech/go-zero/rest" + "github.com/tal-tech/go-zero/rest/httpx" ) var ( diff --git a/example/http/signature/client/client.go b/example/http/signature/client/client.go index 11c84c2e..8a75d909 100644 --- a/example/http/signature/client/client.go +++ b/example/http/signature/client/client.go @@ -15,7 +15,7 @@ import ( "strings" "time" - "zero/core/codec" + "github.com/tal-tech/go-zero/core/codec" ) const pubKey = `-----BEGIN PUBLIC KEY----- diff --git a/example/http/signature/server/server.go b/example/http/signature/server/server.go index 358cddcf..a46faca8 100644 --- a/example/http/signature/server/server.go +++ b/example/http/signature/server/server.go @@ -5,10 +5,10 @@ import ( "io" "net/http" - "zero/core/logx" - "zero/core/service" - "zero/rest" - "zero/rest/httpx" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/service" + "github.com/tal-tech/go-zero/rest" + "github.com/tal-tech/go-zero/rest/httpx" ) var keyPem = flag.String("prikey", "private.pem", "the private key file") diff --git a/example/jwt/user/user.go b/example/jwt/user/user.go index 737d10f9..759533c2 100644 --- a/example/jwt/user/user.go +++ b/example/jwt/user/user.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "zero/core/conf" - "zero/rest" - "zero/rest/httpx" + "github.com/tal-tech/go-zero/core/conf" + "github.com/tal-tech/go-zero/rest" + "github.com/tal-tech/go-zero/rest/httpx" "github.com/dgrijalva/jwt-go" "github.com/dgrijalva/jwt-go/request" diff --git a/example/limit/period/periodlimit.go b/example/limit/period/periodlimit.go index 69a2af7f..ec44cd1f 100644 --- a/example/limit/period/periodlimit.go +++ b/example/limit/period/periodlimit.go @@ -10,8 +10,8 @@ import ( "sync/atomic" "time" - "zero/core/limit" - "zero/core/stores/redis" + "github.com/tal-tech/go-zero/core/limit" + "github.com/tal-tech/go-zero/core/stores/redis" ) const seconds = 5 diff --git a/example/limit/token/tokenlimit.go b/example/limit/token/tokenlimit.go index a1059fdd..9136d2fa 100644 --- a/example/limit/token/tokenlimit.go +++ b/example/limit/token/tokenlimit.go @@ -8,8 +8,8 @@ import ( "sync/atomic" "time" - "zero/core/limit" - "zero/core/stores/redis" + "github.com/tal-tech/go-zero/core/limit" + "github.com/tal-tech/go-zero/core/stores/redis" ) const ( diff --git a/example/load/main.go b/example/load/main.go index 445f5ffd..a5577c87 100644 --- a/example/load/main.go +++ b/example/load/main.go @@ -11,10 +11,10 @@ import ( "sync/atomic" "time" - "zero/core/collection" - "zero/core/executors" - "zero/core/lang" - "zero/core/syncx" + "github.com/tal-tech/go-zero/core/collection" + "github.com/tal-tech/go-zero/core/executors" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/syncx" "gopkg.in/cheggaaa/pb.v1" ) diff --git a/example/load/simulate/client/main.go b/example/load/simulate/client/main.go index 025e5c6e..da98c97a 100644 --- a/example/load/simulate/client/main.go +++ b/example/load/simulate/client/main.go @@ -10,8 +10,8 @@ import ( "sync/atomic" "time" - "zero/core/fx" - "zero/core/lang" + "github.com/tal-tech/go-zero/core/fx" + "github.com/tal-tech/go-zero/core/lang" ) var ( diff --git a/example/load/simulate/cpu/main.go b/example/load/simulate/cpu/main.go index f2a7f4f3..8cc3ddd4 100644 --- a/example/load/simulate/cpu/main.go +++ b/example/load/simulate/cpu/main.go @@ -1,6 +1,6 @@ package main -import _ "zero/core/stat" +import _ "github.com/tal-tech/go-zero/core/stat" func main() { select {} diff --git a/example/load/simulate/server/server.go b/example/load/simulate/server/server.go index f7318c25..78b123f2 100644 --- a/example/load/simulate/server/server.go +++ b/example/load/simulate/server/server.go @@ -6,11 +6,11 @@ import ( "runtime" "time" - "zero/core/fx" - "zero/core/logx" - "zero/core/service" - "zero/core/stat" - "zero/rest" + "github.com/tal-tech/go-zero/core/fx" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/service" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/rest" ) const duration = time.Millisecond diff --git a/example/logging/logging.go b/example/logging/logging.go index 380d7275..dd0949ea 100644 --- a/example/logging/logging.go +++ b/example/logging/logging.go @@ -3,7 +3,7 @@ package main import ( "time" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/logx" ) func foo() { diff --git a/example/logging/redirector/main.go b/example/logging/redirector/main.go index 57074011..1121e1b8 100644 --- a/example/logging/redirector/main.go +++ b/example/logging/redirector/main.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/logx" ) func main() { diff --git a/example/mapreduce/countfunc/countfunc.go b/example/mapreduce/countfunc/countfunc.go index 0fea993b..3dd5b6ad 100644 --- a/example/mapreduce/countfunc/countfunc.go +++ b/example/mapreduce/countfunc/countfunc.go @@ -14,7 +14,7 @@ import ( "sync/atomic" "time" - "zero/core/mr" + "github.com/tal-tech/go-zero/core/mr" "github.com/google/gops/agent" ) diff --git a/example/mapreduce/finishvoid/finishvoid.go b/example/mapreduce/finishvoid/finishvoid.go index b1a3e960..3c220055 100644 --- a/example/mapreduce/finishvoid/finishvoid.go +++ b/example/mapreduce/finishvoid/finishvoid.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "zero/core/mr" - "zero/core/timex" + "github.com/tal-tech/go-zero/core/mr" + "github.com/tal-tech/go-zero/core/timex" ) func main() { diff --git a/example/mapreduce/flatmap/flatmap.go b/example/mapreduce/flatmap/flatmap.go index 087e33f5..48499d5d 100644 --- a/example/mapreduce/flatmap/flatmap.go +++ b/example/mapreduce/flatmap/flatmap.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "zero/core/mr" + "github.com/tal-tech/go-zero/core/mr" ) var ( diff --git a/example/mapreduce/goroutineleak/leak.go b/example/mapreduce/goroutineleak/leak.go index a4d9d2f2..49fc2c0b 100644 --- a/example/mapreduce/goroutineleak/leak.go +++ b/example/mapreduce/goroutineleak/leak.go @@ -8,10 +8,10 @@ import ( "runtime/pprof" "time" - "zero/core/lang" - "zero/core/logx" - "zero/core/mr" - "zero/core/proc" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/mr" + "github.com/tal-tech/go-zero/core/proc" ) func dumpGoroutines() { diff --git a/example/mapreduce/irregular/irregular.go b/example/mapreduce/irregular/irregular.go index 026c0e1d..075b8ab6 100644 --- a/example/mapreduce/irregular/irregular.go +++ b/example/mapreduce/irregular/irregular.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "zero/core/mr" + "github.com/tal-tech/go-zero/core/mr" ) func main() { diff --git a/example/mongo/time.go b/example/mongo/time.go index 84390886..c977341d 100644 --- a/example/mongo/time.go +++ b/example/mongo/time.go @@ -5,7 +5,7 @@ import ( "log" "time" - "zero/core/stores/mongo" + "github.com/tal-tech/go-zero/core/stores/mongo" "github.com/globalsign/mgo" "github.com/globalsign/mgo/bson" diff --git a/example/periodicalexecutor/pe.go b/example/periodicalexecutor/pe.go index b4146cdb..3be333c8 100644 --- a/example/periodicalexecutor/pe.go +++ b/example/periodicalexecutor/pe.go @@ -3,7 +3,7 @@ package main import ( "time" - "zero/core/executors" + "github.com/tal-tech/go-zero/core/executors" ) func main() { diff --git a/example/pool/pool.go b/example/pool/pool.go index 85b76823..004ad4df 100644 --- a/example/pool/pool.go +++ b/example/pool/pool.go @@ -8,8 +8,8 @@ import ( "sync/atomic" "time" - "zero/core/lang" - "zero/core/syncx" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/syncx" ) func main() { diff --git a/example/rpc/client/direct/client.go b/example/rpc/client/direct/client.go index 843a5cd1..1c9ab951 100644 --- a/example/rpc/client/direct/client.go +++ b/example/rpc/client/direct/client.go @@ -6,9 +6,9 @@ import ( "fmt" "time" - "zero/core/discov" - "zero/example/rpc/remote/unary" - "zero/rpcx" + "github.com/tal-tech/go-zero/core/discov" + "github.com/tal-tech/go-zero/example/rpc/remote/unary" + "github.com/tal-tech/go-zero/rpcx" ) const timeFormat = "15:04:05" diff --git a/example/rpc/client/lb/main.go b/example/rpc/client/lb/main.go index e4bb6afc..943c3906 100644 --- a/example/rpc/client/lb/main.go +++ b/example/rpc/client/lb/main.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "zero/core/discov" - "zero/example/rpc/remote/unary" - "zero/rpcx" + "github.com/tal-tech/go-zero/core/discov" + "github.com/tal-tech/go-zero/example/rpc/remote/unary" + "github.com/tal-tech/go-zero/rpcx" ) func main() { diff --git a/example/rpc/client/stream/client.go b/example/rpc/client/stream/client.go index 273ee092..a116bcf2 100644 --- a/example/rpc/client/stream/client.go +++ b/example/rpc/client/stream/client.go @@ -6,9 +6,9 @@ import ( "fmt" "log" - "zero/core/discov" - "zero/example/rpc/remote/stream" - "zero/rpcx" + "github.com/tal-tech/go-zero/core/discov" + "github.com/tal-tech/go-zero/example/rpc/remote/stream" + "github.com/tal-tech/go-zero/rpcx" ) const name = "kevin" diff --git a/example/rpc/client/unary/client.go b/example/rpc/client/unary/client.go index dda272fe..019921d2 100644 --- a/example/rpc/client/unary/client.go +++ b/example/rpc/client/unary/client.go @@ -6,9 +6,9 @@ import ( "fmt" "time" - "zero/core/conf" - "zero/example/rpc/remote/unary" - "zero/rpcx" + "github.com/tal-tech/go-zero/core/conf" + "github.com/tal-tech/go-zero/example/rpc/remote/unary" + "github.com/tal-tech/go-zero/rpcx" ) var configFile = flag.String("f", "config.json", "the config file") diff --git a/example/rpc/proxy/proxy.go b/example/rpc/proxy/proxy.go index e95c2d18..a7532d78 100644 --- a/example/rpc/proxy/proxy.go +++ b/example/rpc/proxy/proxy.go @@ -4,10 +4,10 @@ import ( "context" "flag" - "zero/core/logx" - "zero/core/service" - "zero/example/rpc/remote/unary" - "zero/rpcx" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/service" + "github.com/tal-tech/go-zero/example/rpc/remote/unary" + "github.com/tal-tech/go-zero/rpcx" "google.golang.org/grpc" ) diff --git a/example/rpc/remote/stream/greet.pb.go b/example/rpc/remote/stream/greet.pb.go index 9df9855d..f1cf242c 100644 --- a/example/rpc/remote/stream/greet.pb.go +++ b/example/rpc/remote/stream/greet.pb.go @@ -14,13 +14,13 @@ It has these top-level messages: */ package stream -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" - import ( - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" + "fmt" + "math" + + "github.com/golang/protobuf/proto" + "golang.org/x/net/context" + "google.golang.org/grpc" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/example/rpc/remote/unary/greet.pb.go b/example/rpc/remote/unary/greet.pb.go index 76376af8..7c2b3829 100644 --- a/example/rpc/remote/unary/greet.pb.go +++ b/example/rpc/remote/unary/greet.pb.go @@ -14,13 +14,13 @@ It has these top-level messages: */ package unary -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" - import ( - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" + "fmt" + "math" + + "github.com/golang/protobuf/proto" + "golang.org/x/net/context" + "google.golang.org/grpc" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/example/rpc/server/stream/server.go b/example/rpc/server/stream/server.go index 1c49c891..1447cdbc 100644 --- a/example/rpc/server/stream/server.go +++ b/example/rpc/server/stream/server.go @@ -4,9 +4,9 @@ import ( "fmt" "io" - "zero/core/conf" - "zero/example/rpc/remote/stream" - "zero/rpcx" + "github.com/tal-tech/go-zero/core/conf" + "github.com/tal-tech/go-zero/example/rpc/remote/stream" + "github.com/tal-tech/go-zero/rpcx" "google.golang.org/grpc" ) diff --git a/example/rpc/server/unary/server.go b/example/rpc/server/unary/server.go index 145658e3..3802ff86 100644 --- a/example/rpc/server/unary/server.go +++ b/example/rpc/server/unary/server.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "zero/core/conf" - "zero/example/rpc/remote/unary" - "zero/rpcx" + "github.com/tal-tech/go-zero/core/conf" + "github.com/tal-tech/go-zero/example/rpc/remote/unary" + "github.com/tal-tech/go-zero/rpcx" "google.golang.org/grpc" ) diff --git a/example/signal/main.go b/example/signal/main.go index 473c81b9..2b4518f0 100644 --- a/example/signal/main.go +++ b/example/signal/main.go @@ -9,8 +9,8 @@ import ( "syscall" "time" - "zero/core/cmdline" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/cmdline" + "github.com/tal-tech/go-zero/core/logx" ) const ( diff --git a/example/stat/main.go b/example/stat/main.go index 07fa3297..8eb449b5 100644 --- a/example/stat/main.go +++ b/example/stat/main.go @@ -5,7 +5,7 @@ import ( "runtime" "time" - "zero/core/stat" + "github.com/tal-tech/go-zero/core/stat" ) func main() { diff --git a/example/timingwheel/leak/leak.go b/example/timingwheel/leak/leak.go index 5c6b8c92..7fcd6ccf 100644 --- a/example/timingwheel/leak/leak.go +++ b/example/timingwheel/leak/leak.go @@ -8,9 +8,9 @@ import ( "strconv" "time" - "zero/core/cmdline" - "zero/core/collection" - "zero/core/proc" + "github.com/tal-tech/go-zero/core/cmdline" + "github.com/tal-tech/go-zero/core/collection" + "github.com/tal-tech/go-zero/core/proc" ) const numItems = 1000000 diff --git a/example/timingwheel/main.go b/example/timingwheel/main.go index 79814a83..a800b784 100644 --- a/example/timingwheel/main.go +++ b/example/timingwheel/main.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "time" - "zero/core/collection" + "github.com/tal-tech/go-zero/core/collection" ) const interval = time.Minute diff --git a/example/tracing/edge/main.go b/example/tracing/edge/main.go index 38a05903..ce43a02a 100644 --- a/example/tracing/edge/main.go +++ b/example/tracing/edge/main.go @@ -4,13 +4,13 @@ import ( "flag" "net/http" - "zero/core/conf" - "zero/core/logx" - "zero/core/service" - "zero/example/tracing/remote/portal" - "zero/rest" - "zero/rest/httpx" - "zero/rpcx" + "github.com/tal-tech/go-zero/core/conf" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/service" + "github.com/tal-tech/go-zero/example/tracing/remote/portal" + "github.com/tal-tech/go-zero/rest" + "github.com/tal-tech/go-zero/rest/httpx" + "github.com/tal-tech/go-zero/rpcx" ) var ( diff --git a/example/tracing/portal/server.go b/example/tracing/portal/server.go index 950e38c3..24cd359d 100644 --- a/example/tracing/portal/server.go +++ b/example/tracing/portal/server.go @@ -4,10 +4,10 @@ import ( "context" "flag" - "zero/core/conf" - "zero/example/tracing/remote/portal" - "zero/example/tracing/remote/user" - "zero/rpcx" + "github.com/tal-tech/go-zero/core/conf" + "github.com/tal-tech/go-zero/example/tracing/remote/portal" + "github.com/tal-tech/go-zero/example/tracing/remote/user" + "github.com/tal-tech/go-zero/rpcx" "google.golang.org/grpc" ) diff --git a/example/tracing/remote/portal/portal.pb.go b/example/tracing/remote/portal/portal.pb.go index 4dd7ba4d..4578e6fb 100644 --- a/example/tracing/remote/portal/portal.pb.go +++ b/example/tracing/remote/portal/portal.pb.go @@ -14,13 +14,13 @@ It has these top-level messages: */ package portal -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" - import ( - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" + "fmt" + "math" + + "github.com/golang/protobuf/proto" + "golang.org/x/net/context" + "google.golang.org/grpc" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/example/tracing/remote/user/user.pb.go b/example/tracing/remote/user/user.pb.go index 40965651..7ee24a57 100644 --- a/example/tracing/remote/user/user.pb.go +++ b/example/tracing/remote/user/user.pb.go @@ -14,13 +14,13 @@ It has these top-level messages: */ package user -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" - import ( - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" + "fmt" + "math" + + "github.com/golang/protobuf/proto" + "golang.org/x/net/context" + "google.golang.org/grpc" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/example/tracing/user/server.go b/example/tracing/user/server.go index f231cab1..05505697 100644 --- a/example/tracing/user/server.go +++ b/example/tracing/user/server.go @@ -8,9 +8,9 @@ import ( "sync" "time" - "zero/core/conf" - "zero/example/tracing/remote/user" - "zero/rpcx" + "github.com/tal-tech/go-zero/core/conf" + "github.com/tal-tech/go-zero/example/tracing/remote/user" + "github.com/tal-tech/go-zero/rpcx" "google.golang.org/grpc" ) diff --git a/go.sum b/go.sum index 3ddb3527..2fc6e4e9 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,8 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DATA-DOG/go-sqlmock v1.4.1 h1:ThlnYciV1iM/V0OSF/dtkqWb6xo5qITT1TJBG1MRDJM= github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/DataDog/zstd v1.4.0/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= -github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/StackExchange/wmi v0.0.0-20170410192909-ea383cf3ba6e/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= @@ -16,12 +14,11 @@ github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGn github.com/alicebob/miniredis v2.5.0+incompatible h1:yBHoLpsyjupjz3NL3MhKMVkR41j82Yjf3KFv7ApYzUI= github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk= github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod h1:V8iCPQYkqmusNa815XgQio277wI47sdRh1dUOLdyC6Q= -github.com/beanstalkd/go-beanstalk v0.1.0 h1:IiNwYbAoVBDs5xEOmleGoX+DRD3Moz99EpATbl8672w= -github.com/beanstalkd/go-beanstalk v0.1.0/go.mod h1:/G8YTyChOtpOArwLTQPY1CHB+i212+av35bkPXXj56Y= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bkaradzic/go-lz4 v1.0.0 h1:RXc4wYsyz985CkXXeX04y4VnZFGG8Rd43pRaHsOXAKk= github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4= github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk= @@ -31,20 +28,19 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 h1:F1EaeKL/ta07PY/k9Os/UFtwERei2/XzGemhpGnBKNg= github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80= -github.com/coreos/bbolt v1.3.1-coreos.6 h1:uTXKg9gY70s9jMAKdfljFQcuh4e/BXOM+V+d00KFj3A= -github.com/coreos/bbolt v1.3.1-coreos.6/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.18+incompatible h1:Zz1aXgDrFFi1nadh58tA9ktt06cmPTwNNP3dXwIq1lE= -github.com/coreos/etcd v3.3.18+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr7kxeODyLWsRMC+OD03aFUH+mW6r2d+MWa5Y= +github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/coreos/go-semver v0.2.0 h1:3Jm3tLmsgAYcjC+4Up7hJrFBPr+n7rAqYeSw/SZazuY= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 h1:3jFq2xL4ZajGK4aZY8jz+DAF0FHjI51BXjjSwCzS1Dk= -github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf h1:CAKfRE2YtTUIjjh1bkBtyYFaUT/WmOqsJjgtihT0vMI= -github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/coreos/go-systemd/v22 v22.0.0 h1:XJIw/+VlJ+87J+doOxznsAWIdmWuViOVhkQamW5YV28= +github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= 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= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -52,10 +48,13 @@ github.com/dchest/siphash v1.2.1 h1:4cLinnzVJDKxTCl9B01807Yiy+W7ZzVHj/KIroQRvT4= github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4= github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -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/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4 h1:qk/FSDDxo05wdJH28W+p5yivv7LuLYLRXPPD8KQCtZs= +github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +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= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/frankban/quicktest v1.7.2 h1:2QxQoC1TS09S7fhCPsrvqYdvP1H5M1P1ih5ABm3BTYk= @@ -77,11 +76,14 @@ github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gG github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -91,6 +93,7 @@ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= @@ -100,9 +103,6 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.2-0.20190904063534-ff6b7dc882cf h1:gFVkHXmVAhEbxZVDln5V9GKrLaluNoFHDbrZwAWZgws= -github.com/golang/snappy v0.0.2-0.20190904063534-ff6b7dc882cf/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= @@ -119,21 +119,26 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/gops v0.3.7 h1:KtVAagOM0FIq+02DiQrKBTnLhYpWBMowaufcj+W1Exw= github.com/google/gops v0.3.7/go.mod h1:bj0cwMmX1X4XIJFTjR99R5sCxNssNJ8HebFNvoQlmgY= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4 h1:z53tR0945TRRQO/fLEVPI6SMv7ZflF0TEaTAoU7tOzg= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.14.3 h1:OCJlWkOUoTnl0neNGlf4fUm3TmbEtguw7vR+nGtnDjY= github.com/grpc-ecosystem/grpc-gateway v1.14.3/go.mod h1:6CwZWGDSPRJidgKAtJVvND6soZe6fT7iteq8wDPdhb0= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= @@ -144,6 +149,7 @@ github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uia github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/keybase/go-ps v0.0.0-20161005175911-668c8856d999 h1:2d+FLQbz4xRTi36DO1qYNUwfORax9XcQ0jhbO81Vago= github.com/keybase/go-ps v0.0.0-20161005175911-668c8856d999/go.mod h1:hY+WOq6m2FpbvyrI93sMaypsttvaIL5nhVR92dTMUcQ= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -163,14 +169,17 @@ github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU= github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8= github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= 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-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= @@ -184,6 +193,7 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8= github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -218,12 +228,11 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/segmentio/kafka-go v0.3.5 h1:2JVT1inno7LxEASWj+HflHh5sWGfM0gkRiLAxkXhGG4= -github.com/segmentio/kafka-go v0.3.5/go.mod h1:OT5KXBPbaJJTcvokhWR2KFmm0niEx3mnccTwjmLvSi4= github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 h1:udFKJ0aHUL60LboW/A+DfgoHVedieIzIXE8uylPue0U= github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= @@ -236,6 +245,9 @@ github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= +github.com/spf13/pflag v1.0.1 h1:aCvUg6QPl3ibpQUxyLkrEkCHtPqYJL4x9AuhqVqFis4= +github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= 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/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -244,16 +256,12 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/tal-tech/go-zero v0.0.0-20200808055339-621d33ecbe47 h1:bvqE92Cv5fNDUO8WcQgwcDYjqa0pQpBjdKy9reHt890= +github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6 h1:lYIiVDtZnyTWlNwiAxLj0bbpTcx1BWCFhXjfsvmPdNc= github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA= github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= -github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= -github.com/xdg/stringprep v1.0.1-0.20180714160509-73f8eece6fdc h1:vIp1tjhVogU0yBy7w96P027ewvNPeH6gzuNcoc+NReU= -github.com/xdg/stringprep v1.0.1-0.20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6 h1:YdYsPAZ2pC6Tow/nPZOPQ96O3hm/ToAkGsPLzedXERk= @@ -261,27 +269,29 @@ github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6Ut github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb h1:ZkM6LRnq40pR1Ox0hTHlnpkcOTuFIDQpZ1IN8rKKhX0= github.com/yuin/gopher-lua v0.0.0-20191220021717-ab39c6098bdb/go.mod h1:gqRgreBUhTSL0GeU64rtZ3Uq3wtjOa/TB2YfrtkCbVQ= -go.etcd.io/etcd v3.3.17+incompatible h1:g8iRku1SID8QAW8cDlV0L/PkZlw63LSiYEHYHoE6j/s= -go.etcd.io/etcd v3.3.17+incompatible/go.mod h1:yaeTdrJi5lOmYerz05bd8+V7KubZs8YSFZfzsF9A6aI= -go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY= -go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg= +go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +go.etcd.io/etcd v0.0.0-20200402134248-51bdeb39e698 h1:jWtjCJX1qxhHISBMLRztWwR+EXkI7MJAF2HjHAE/x/I= +go.etcd.io/etcd v0.0.0-20200402134248-51bdeb39e698/go.mod h1:YoUyTScD3Vcv2RBm3eGVOq7i1ULiz3OuXoQFWOirmAM= +go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/automaxprocs v1.3.0 h1:II28aZoGdaglS5vVNnspf28lnZpXScxtIozx1lAjdb0= go.uber.org/automaxprocs v1.3.0/go.mod h1:9CWT6lKIep8U41DDaPiH6eFscnTyjfTANNQNx6LrIcA= -go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.4.0 h1:f3WCSC2KzAcBXGATIxAB1E2XuCpNU255wNKZ505qi3E= -go.uber.org/multierr v1.4.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= +go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= -go.uber.org/zap v1.12.0 h1:dySoUQPFBGj6xwjmBzageVL8jGi8uxc6bEmJQjA06bw= -go.uber.org/zap v1.12.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +go.uber.org/zap v1.14.1 h1:nYDKopTbvAPq/NrUVZwT15y2lpROBiLLyoRTbXOYWOo= +go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190506204251-e1dfcc566284/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191002192127-34f69633bfdc/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= @@ -294,13 +304,16 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= @@ -313,8 +326,10 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20171017063910-8dbc5d05d6ed/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 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= @@ -324,6 +339,7 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -333,10 +349,13 @@ golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fq golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/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= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= @@ -355,14 +374,23 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f h1:ohwtWcCwB/fZUxh/vjazHorYmBnua3NmY3CAjwC7mEA= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= 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= @@ -381,13 +409,16 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk= gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -408,5 +439,6 @@ rsc.io/quote/v3 v3.1.0 h1:9JKUTTIUgS6kzR9mK1YuGKv6Nl+DijDNIc0ghT58FaY= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0 h1:7uVkIFmeBqHfdjD+gZwtXXI+RODJ2Wc4O7MPEh/QiW4= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/rest/config.go b/rest/config.go index c45d5ea4..5d8a1b51 100644 --- a/rest/config.go +++ b/rest/config.go @@ -3,7 +3,7 @@ package rest import ( "time" - "zero/core/service" + "github.com/tal-tech/go-zero/core/service" ) type ( diff --git a/rest/etc/config.json b/rest/etc/config.json deleted file mode 100644 index 1b684709..00000000 --- a/rest/etc/config.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "Name": "nging", - "Log": { - "Access": "logs/access.log", - "Error": "logs/error.log", - "Stat": "logs/stat.log" - }, - "Host": "127.0.0.1", - "Port": 1111, - "Timeout": 1000, - "Verbose": 0, - "Develop": 1 -} diff --git a/rest/handler/authhandler.go b/rest/handler/authhandler.go index 4a1e0b6b..253dc503 100644 --- a/rest/handler/authhandler.go +++ b/rest/handler/authhandler.go @@ -6,10 +6,9 @@ import ( "net/http" "net/http/httputil" - "zero/core/logx" - "zero/rest/internal" - "github.com/dgrijalva/jwt-go" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/rest/internal" ) const ( diff --git a/rest/handler/breakerhandler.go b/rest/handler/breakerhandler.go index 79f1a673..6e10a56d 100644 --- a/rest/handler/breakerhandler.go +++ b/rest/handler/breakerhandler.go @@ -5,11 +5,11 @@ import ( "net/http" "strings" - "zero/core/breaker" - "zero/core/logx" - "zero/core/stat" - "zero/rest/internal" - "zero/rest/internal/security" + "github.com/tal-tech/go-zero/core/breaker" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/rest/internal" + "github.com/tal-tech/go-zero/rest/internal/security" ) const breakerSeparator = "://" diff --git a/rest/handler/breakerhandler_test.go b/rest/handler/breakerhandler_test.go index 31e2323c..d17e872c 100644 --- a/rest/handler/breakerhandler_test.go +++ b/rest/handler/breakerhandler_test.go @@ -6,10 +6,9 @@ import ( "net/http/httptest" "testing" - "zero/core/logx" - "zero/core/stat" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/stat" ) func init() { diff --git a/rest/handler/contentsecurityhandler.go b/rest/handler/contentsecurityhandler.go index 0051ae8f..32705ff2 100644 --- a/rest/handler/contentsecurityhandler.go +++ b/rest/handler/contentsecurityhandler.go @@ -4,10 +4,10 @@ import ( "net/http" "time" - "zero/core/codec" - "zero/core/logx" - "zero/rest/httpx" - "zero/rest/internal/security" + "github.com/tal-tech/go-zero/core/codec" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/rest/httpx" + "github.com/tal-tech/go-zero/rest/internal/security" ) const contentSecurity = "X-Content-Security" diff --git a/rest/handler/contentsecurityhandler_test.go b/rest/handler/contentsecurityhandler_test.go index 01bf071b..4bd0ea73 100644 --- a/rest/handler/contentsecurityhandler_test.go +++ b/rest/handler/contentsecurityhandler_test.go @@ -17,10 +17,9 @@ import ( "testing" "time" - "zero/core/codec" - "zero/rest/httpx" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/codec" + "github.com/tal-tech/go-zero/rest/httpx" ) const timeDiff = time.Hour * 2 * 24 diff --git a/rest/handler/cryptionhandler.go b/rest/handler/cryptionhandler.go index 3a256ad9..f5d4e48d 100644 --- a/rest/handler/cryptionhandler.go +++ b/rest/handler/cryptionhandler.go @@ -7,8 +7,8 @@ import ( "io/ioutil" "net/http" - "zero/core/codec" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/codec" + "github.com/tal-tech/go-zero/core/logx" ) const maxBytes = 1 << 20 // 1 MiB diff --git a/rest/handler/cryptionhandler_test.go b/rest/handler/cryptionhandler_test.go index fcb8fff8..0be4697e 100644 --- a/rest/handler/cryptionhandler_test.go +++ b/rest/handler/cryptionhandler_test.go @@ -9,9 +9,8 @@ import ( "net/http/httptest" "testing" - "zero/core/codec" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/codec" ) const ( diff --git a/rest/handler/gunziphandler.go b/rest/handler/gunziphandler.go index f9bef9a5..c7340dbe 100644 --- a/rest/handler/gunziphandler.go +++ b/rest/handler/gunziphandler.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "zero/rest/httpx" + "github.com/tal-tech/go-zero/rest/httpx" ) const gzipEncoding = "gzip" diff --git a/rest/handler/gunziphandler_test.go b/rest/handler/gunziphandler_test.go index fd9b8096..164d81b6 100644 --- a/rest/handler/gunziphandler_test.go +++ b/rest/handler/gunziphandler_test.go @@ -9,10 +9,9 @@ import ( "sync" "testing" - "zero/core/codec" - "zero/rest/httpx" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/codec" + "github.com/tal-tech/go-zero/rest/httpx" ) func TestGunzipHandler(t *testing.T) { diff --git a/rest/handler/loghandler.go b/rest/handler/loghandler.go index e87bd16e..577c1c56 100644 --- a/rest/handler/loghandler.go +++ b/rest/handler/loghandler.go @@ -9,11 +9,11 @@ import ( "net/http/httputil" "time" - "zero/core/iox" - "zero/core/logx" - "zero/core/timex" - "zero/core/utils" - "zero/rest/internal" + "github.com/tal-tech/go-zero/core/iox" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/timex" + "github.com/tal-tech/go-zero/core/utils" + "github.com/tal-tech/go-zero/rest/internal" ) const slowThreshold = time.Millisecond * 500 diff --git a/rest/handler/loghandler_test.go b/rest/handler/loghandler_test.go index d4569036..4cc3dd42 100644 --- a/rest/handler/loghandler_test.go +++ b/rest/handler/loghandler_test.go @@ -8,9 +8,8 @@ import ( "testing" "time" - "zero/rest/internal" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/rest/internal" ) func init() { diff --git a/rest/handler/maxbyteshandler.go b/rest/handler/maxbyteshandler.go index 80a7d831..c6e83250 100644 --- a/rest/handler/maxbyteshandler.go +++ b/rest/handler/maxbyteshandler.go @@ -3,7 +3,7 @@ package handler import ( "net/http" - "zero/rest/internal" + "github.com/tal-tech/go-zero/rest/internal" ) func MaxBytesHandler(n int64) func(http.Handler) http.Handler { diff --git a/rest/handler/maxconnshandler.go b/rest/handler/maxconnshandler.go index e8f15792..d4a51233 100644 --- a/rest/handler/maxconnshandler.go +++ b/rest/handler/maxconnshandler.go @@ -3,9 +3,9 @@ package handler import ( "net/http" - "zero/core/logx" - "zero/core/syncx" - "zero/rest/internal" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/syncx" + "github.com/tal-tech/go-zero/rest/internal" ) func MaxConns(n int) func(http.Handler) http.Handler { diff --git a/rest/handler/maxconnshandler_test.go b/rest/handler/maxconnshandler_test.go index 40a331c3..921914a9 100644 --- a/rest/handler/maxconnshandler_test.go +++ b/rest/handler/maxconnshandler_test.go @@ -8,9 +8,8 @@ import ( "sync" "testing" - "zero/core/lang" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/lang" ) const conns = 4 diff --git a/rest/handler/metrichandler.go b/rest/handler/metrichandler.go index ab4e4995..e738b754 100644 --- a/rest/handler/metrichandler.go +++ b/rest/handler/metrichandler.go @@ -3,8 +3,8 @@ package handler import ( "net/http" - "zero/core/stat" - "zero/core/timex" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/core/timex" ) func MetricHandler(metrics *stat.Metrics) func(http.Handler) http.Handler { diff --git a/rest/handler/metrichandler_test.go b/rest/handler/metrichandler_test.go index 3e8db856..d6911325 100644 --- a/rest/handler/metrichandler_test.go +++ b/rest/handler/metrichandler_test.go @@ -5,9 +5,8 @@ import ( "net/http/httptest" "testing" - "zero/core/stat" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/stat" ) func TestMetricHandler(t *testing.T) { diff --git a/rest/handler/prommetrichandler.go b/rest/handler/prommetrichandler.go index e0da0b35..5a4d9f8f 100644 --- a/rest/handler/prommetrichandler.go +++ b/rest/handler/prommetrichandler.go @@ -5,9 +5,9 @@ import ( "strconv" "time" - "zero/core/metric" - "zero/core/timex" - "zero/rest/internal/security" + "github.com/tal-tech/go-zero/core/metric" + "github.com/tal-tech/go-zero/core/timex" + "github.com/tal-tech/go-zero/rest/internal/security" ) const serverNamespace = "http_server" diff --git a/rest/handler/recoverhandler.go b/rest/handler/recoverhandler.go index 967e260a..dfcb9282 100644 --- a/rest/handler/recoverhandler.go +++ b/rest/handler/recoverhandler.go @@ -5,7 +5,7 @@ import ( "net/http" "runtime/debug" - "zero/rest/internal" + "github.com/tal-tech/go-zero/rest/internal" ) func RecoverHandler(next http.Handler) http.Handler { diff --git a/rest/handler/sheddinghandler.go b/rest/handler/sheddinghandler.go index ab1ae12f..fa70f797 100644 --- a/rest/handler/sheddinghandler.go +++ b/rest/handler/sheddinghandler.go @@ -4,11 +4,11 @@ import ( "net/http" "sync" - "zero/core/load" - "zero/core/logx" - "zero/core/stat" - "zero/rest/internal" - "zero/rest/internal/security" + "github.com/tal-tech/go-zero/core/load" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/rest/internal" + "github.com/tal-tech/go-zero/rest/internal/security" ) const serviceType = "api" diff --git a/rest/handler/sheddinghandler_test.go b/rest/handler/sheddinghandler_test.go index 415e4540..7383068e 100644 --- a/rest/handler/sheddinghandler_test.go +++ b/rest/handler/sheddinghandler_test.go @@ -7,10 +7,9 @@ import ( "net/http/httptest" "testing" - "zero/core/load" - "zero/core/stat" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/load" + "github.com/tal-tech/go-zero/core/stat" ) func init() { diff --git a/rest/handler/tracinghandler.go b/rest/handler/tracinghandler.go index ed45ac17..ef7ef819 100644 --- a/rest/handler/tracinghandler.go +++ b/rest/handler/tracinghandler.go @@ -3,9 +3,9 @@ package handler import ( "net/http" - "zero/core/logx" - "zero/core/sysx" - "zero/core/trace" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/sysx" + "github.com/tal-tech/go-zero/core/trace" ) func TracingHandler(next http.Handler) http.Handler { diff --git a/rest/handler/tracinghandler_test.go b/rest/handler/tracinghandler_test.go index 9b389179..2422ba95 100644 --- a/rest/handler/tracinghandler_test.go +++ b/rest/handler/tracinghandler_test.go @@ -5,9 +5,8 @@ import ( "net/http/httptest" "testing" - "zero/core/trace/tracespec" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/trace/tracespec" ) func TestTracingHandler(t *testing.T) { diff --git a/rest/httpx/requests.go b/rest/httpx/requests.go index 8b1b6cfc..e62f6842 100644 --- a/rest/httpx/requests.go +++ b/rest/httpx/requests.go @@ -5,8 +5,8 @@ import ( "net/http" "strings" - "zero/core/mapping" - "zero/rest/internal/context" + "github.com/tal-tech/go-zero/core/mapping" + "github.com/tal-tech/go-zero/rest/internal/context" ) const ( diff --git a/rest/httpx/responses.go b/rest/httpx/responses.go index c57f76df..134c9466 100644 --- a/rest/httpx/responses.go +++ b/rest/httpx/responses.go @@ -4,7 +4,7 @@ import ( "encoding/json" "net/http" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/logx" ) func Error(w http.ResponseWriter, err error) { diff --git a/rest/httpx/responses_test.go b/rest/httpx/responses_test.go index e2b3cc6f..7c19406c 100644 --- a/rest/httpx/responses_test.go +++ b/rest/httpx/responses_test.go @@ -5,9 +5,8 @@ import ( "strings" "testing" - "zero/core/logx" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/logx" ) type message struct { diff --git a/rest/internal/log.go b/rest/internal/log.go index 80d308a8..78013835 100644 --- a/rest/internal/log.go +++ b/rest/internal/log.go @@ -6,7 +6,7 @@ import ( "net/http" "sync" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/logx" ) const LogContext = "request_logs" diff --git a/rest/internal/router/patrouter.go b/rest/internal/router/patrouter.go index 4db67273..c54e9651 100644 --- a/rest/internal/router/patrouter.go +++ b/rest/internal/router/patrouter.go @@ -6,9 +6,9 @@ import ( "path" "strings" - "zero/core/search" - "zero/rest/httpx" - "zero/rest/internal/context" + "github.com/tal-tech/go-zero/core/search" + "github.com/tal-tech/go-zero/rest/httpx" + "github.com/tal-tech/go-zero/rest/internal/context" ) const ( diff --git a/rest/internal/router/patrouter_test.go b/rest/internal/router/patrouter_test.go index 3bc716aa..d71edeca 100644 --- a/rest/internal/router/patrouter_test.go +++ b/rest/internal/router/patrouter_test.go @@ -9,10 +9,9 @@ import ( "strings" "testing" - "zero/rest/httpx" - "zero/rest/internal/context" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/rest/httpx" + "github.com/tal-tech/go-zero/rest/internal/context" ) const ( diff --git a/rest/internal/security/contentsecurity.go b/rest/internal/security/contentsecurity.go index bc3b9747..6dceedd9 100644 --- a/rest/internal/security/contentsecurity.go +++ b/rest/internal/security/contentsecurity.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "zero/core/codec" - "zero/core/iox" - "zero/core/logx" - "zero/rest/httpx" + "github.com/tal-tech/go-zero/core/codec" + "github.com/tal-tech/go-zero/core/iox" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/rest/httpx" ) const ( diff --git a/rest/internal/starter.go b/rest/internal/starter.go index e0c6df65..1fcff7f3 100644 --- a/rest/internal/starter.go +++ b/rest/internal/starter.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - "zero/core/proc" + "github.com/tal-tech/go-zero/core/proc" ) func StartHttp(host string, port int, handler http.Handler) error { diff --git a/rest/internal/tokenparser.go b/rest/internal/tokenparser.go index 17f5f024..d2eb9436 100644 --- a/rest/internal/tokenparser.go +++ b/rest/internal/tokenparser.go @@ -6,10 +6,9 @@ import ( "sync/atomic" "time" - "zero/core/timex" - "github.com/dgrijalva/jwt-go" "github.com/dgrijalva/jwt-go/request" + "github.com/tal-tech/go-zero/core/timex" ) const claimHistoryResetDuration = time.Hour * 24 diff --git a/rest/internal/tokenparser_test.go b/rest/internal/tokenparser_test.go index 4cb7a406..d486adcc 100644 --- a/rest/internal/tokenparser_test.go +++ b/rest/internal/tokenparser_test.go @@ -8,8 +8,7 @@ import ( "github.com/dgrijalva/jwt-go" "github.com/stretchr/testify/assert" - - "zero/core/timex" + "github.com/tal-tech/go-zero/core/timex" ) func TestTokenParser(t *testing.T) { diff --git a/rest/ngin.go b/rest/ngin.go index 1f37e718..64d6f6e4 100644 --- a/rest/ngin.go +++ b/rest/ngin.go @@ -4,9 +4,9 @@ import ( "log" "net/http" - "zero/core/logx" - "zero/rest/handler" - "zero/rest/httpx" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/rest/handler" + "github.com/tal-tech/go-zero/rest/httpx" ) type ( diff --git a/rest/ngin_test.go b/rest/ngin_test.go index 27663288..a4591197 100644 --- a/rest/ngin_test.go +++ b/rest/ngin_test.go @@ -7,15 +7,14 @@ import ( "net/http/httptest" "testing" - "zero/rest/httpx" - router2 "zero/rest/internal/router" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/rest/httpx" + "github.com/tal-tech/go-zero/rest/internal/router" ) func TestWithMiddleware(t *testing.T) { m := make(map[string]string) - router := router2.NewPatRouter() + router := router.NewPatRouter() handler := func(w http.ResponseWriter, r *http.Request) { var v struct { Nickname string `form:"nickname"` diff --git a/rest/server.go b/rest/server.go index 48c6e283..005f3692 100644 --- a/rest/server.go +++ b/rest/server.go @@ -6,15 +6,14 @@ import ( "net/http" "time" - "zero/core/codec" - "zero/core/load" - "zero/core/stat" - "zero/rest/handler" - "zero/rest/httpx" - "zero/rest/internal" - "zero/rest/internal/router" - "github.com/justinas/alice" + "github.com/tal-tech/go-zero/core/codec" + "github.com/tal-tech/go-zero/core/load" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/rest/handler" + "github.com/tal-tech/go-zero/rest/httpx" + "github.com/tal-tech/go-zero/rest/internal" + "github.com/tal-tech/go-zero/rest/internal/router" ) // use 1000m to represent 100% diff --git a/rpcx/client.go b/rpcx/client.go index 552b6183..cb523951 100644 --- a/rpcx/client.go +++ b/rpcx/client.go @@ -4,10 +4,9 @@ import ( "log" "time" - "zero/core/discov" - "zero/rpcx/internal" - "zero/rpcx/internal/auth" - + "github.com/tal-tech/go-zero/core/discov" + "github.com/tal-tech/go-zero/rpcx/internal" + "github.com/tal-tech/go-zero/rpcx/internal/auth" "google.golang.org/grpc" ) diff --git a/rpcx/config.go b/rpcx/config.go index 46b91c03..d0b208e3 100644 --- a/rpcx/config.go +++ b/rpcx/config.go @@ -1,9 +1,9 @@ package rpcx import ( - "zero/core/discov" - "zero/core/service" - "zero/core/stores/redis" + "github.com/tal-tech/go-zero/core/discov" + "github.com/tal-tech/go-zero/core/service" + "github.com/tal-tech/go-zero/core/stores/redis" ) type ( diff --git a/rpcx/etc/config.json b/rpcx/etc/config.json deleted file mode 100644 index c4707aef..00000000 --- a/rpcx/etc/config.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "Log": { - "Access": "logs/access.log", - "Error": "logs/error.log", - "Stat": "logs/stat.log" - }, - "MetricsUrl": "http://localhost:2222/add", - "ListenOn": "localhost:3456", - "Etcd": { - "Hosts": [ - "localhost:2379" - ], - "Key": "rpcx" - }, - "Redis": { - "Host": "localhost:6379", - "Type": "node", - "Key": "apps" - } -} diff --git a/rpcx/internal/auth/auth.go b/rpcx/internal/auth/auth.go index 44060a53..e699120a 100644 --- a/rpcx/internal/auth/auth.go +++ b/rpcx/internal/auth/auth.go @@ -4,9 +4,8 @@ import ( "context" "time" - "zero/core/collection" - "zero/core/stores/redis" - + "github.com/tal-tech/go-zero/core/collection" + "github.com/tal-tech/go-zero/core/stores/redis" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" diff --git a/rpcx/internal/authinterceptor.go b/rpcx/internal/authinterceptor.go index be79fbff..d59e0158 100644 --- a/rpcx/internal/authinterceptor.go +++ b/rpcx/internal/authinterceptor.go @@ -3,8 +3,7 @@ package internal import ( "context" - "zero/rpcx/internal/auth" - + "github.com/tal-tech/go-zero/rpcx/internal/auth" "google.golang.org/grpc" ) diff --git a/rpcx/internal/balancer/p2c/p2c.go b/rpcx/internal/balancer/p2c/p2c.go index 1bea4742..07fb3e81 100644 --- a/rpcx/internal/balancer/p2c/p2c.go +++ b/rpcx/internal/balancer/p2c/p2c.go @@ -10,11 +10,10 @@ import ( "sync/atomic" "time" - "zero/core/logx" - "zero/core/syncx" - "zero/core/timex" - "zero/rpcx/internal/codes" - + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/syncx" + "github.com/tal-tech/go-zero/core/timex" + "github.com/tal-tech/go-zero/rpcx/internal/codes" "google.golang.org/grpc/balancer" "google.golang.org/grpc/balancer/base" "google.golang.org/grpc/resolver" diff --git a/rpcx/internal/balancer/p2c/p2c_test.go b/rpcx/internal/balancer/p2c/p2c_test.go index b3a1528d..2ca1e6c6 100644 --- a/rpcx/internal/balancer/p2c/p2c_test.go +++ b/rpcx/internal/balancer/p2c/p2c_test.go @@ -6,10 +6,9 @@ import ( "strconv" "testing" - "zero/core/logx" - "zero/core/mathx" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/mathx" "google.golang.org/grpc/balancer" "google.golang.org/grpc/codes" "google.golang.org/grpc/resolver" diff --git a/rpcx/internal/client.go b/rpcx/internal/client.go index 84e55ec8..9576f261 100644 --- a/rpcx/internal/client.go +++ b/rpcx/internal/client.go @@ -5,8 +5,7 @@ import ( "fmt" "time" - "zero/rpcx/internal/clientinterceptors" - + "github.com/tal-tech/go-zero/rpcx/internal/clientinterceptors" "google.golang.org/grpc" ) diff --git a/rpcx/internal/clientinterceptors/breakerinterceptor.go b/rpcx/internal/clientinterceptors/breakerinterceptor.go index cb86d929..014e888a 100644 --- a/rpcx/internal/clientinterceptors/breakerinterceptor.go +++ b/rpcx/internal/clientinterceptors/breakerinterceptor.go @@ -4,9 +4,8 @@ import ( "context" "path" - "zero/core/breaker" - "zero/rpcx/internal/codes" - + "github.com/tal-tech/go-zero/core/breaker" + "github.com/tal-tech/go-zero/rpcx/internal/codes" "google.golang.org/grpc" ) diff --git a/rpcx/internal/clientinterceptors/breakerinterceptor_test.go b/rpcx/internal/clientinterceptors/breakerinterceptor_test.go index 6982836a..8f58650a 100644 --- a/rpcx/internal/clientinterceptors/breakerinterceptor_test.go +++ b/rpcx/internal/clientinterceptors/breakerinterceptor_test.go @@ -3,11 +3,10 @@ package clientinterceptors import ( "testing" - "zero/core/breaker" - "zero/core/stat" - rcodes "zero/rpcx/internal/codes" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/breaker" + "github.com/tal-tech/go-zero/core/stat" + rcodes "github.com/tal-tech/go-zero/rpcx/internal/codes" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/rpcx/internal/clientinterceptors/durationinterceptor.go b/rpcx/internal/clientinterceptors/durationinterceptor.go index 4062ca57..12ed96bc 100644 --- a/rpcx/internal/clientinterceptors/durationinterceptor.go +++ b/rpcx/internal/clientinterceptors/durationinterceptor.go @@ -5,9 +5,8 @@ import ( "path" "time" - "zero/core/logx" - "zero/core/timex" - + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/timex" "google.golang.org/grpc" ) diff --git a/rpcx/internal/clientinterceptors/prommetricinterceptor.go b/rpcx/internal/clientinterceptors/prommetricinterceptor.go index 43a2c160..efa333b3 100644 --- a/rpcx/internal/clientinterceptors/prommetricinterceptor.go +++ b/rpcx/internal/clientinterceptors/prommetricinterceptor.go @@ -5,9 +5,8 @@ import ( "strconv" "time" - "zero/core/metric" - "zero/core/timex" - + "github.com/tal-tech/go-zero/core/metric" + "github.com/tal-tech/go-zero/core/timex" "google.golang.org/grpc" "google.golang.org/grpc/status" ) diff --git a/rpcx/internal/clientinterceptors/timeoutinterceptor.go b/rpcx/internal/clientinterceptors/timeoutinterceptor.go index 27ff6dc6..2a79de49 100644 --- a/rpcx/internal/clientinterceptors/timeoutinterceptor.go +++ b/rpcx/internal/clientinterceptors/timeoutinterceptor.go @@ -4,8 +4,7 @@ import ( "context" "time" - "zero/core/contextx" - + "github.com/tal-tech/go-zero/core/contextx" "google.golang.org/grpc" ) diff --git a/rpcx/internal/clientinterceptors/tracinginterceptor.go b/rpcx/internal/clientinterceptors/tracinginterceptor.go index 1d41d15a..d05a23a0 100644 --- a/rpcx/internal/clientinterceptors/tracinginterceptor.go +++ b/rpcx/internal/clientinterceptors/tracinginterceptor.go @@ -3,8 +3,7 @@ package clientinterceptors import ( "context" - "zero/core/trace" - + "github.com/tal-tech/go-zero/core/trace" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/rpcx/internal/discovclient.go b/rpcx/internal/discovclient.go index b45ffce4..8281ad76 100644 --- a/rpcx/internal/discovclient.go +++ b/rpcx/internal/discovclient.go @@ -4,9 +4,8 @@ import ( "fmt" "strings" - "zero/rpcx/internal/balancer/p2c" - "zero/rpcx/internal/resolver" - + "github.com/tal-tech/go-zero/rpcx/internal/balancer/p2c" + "github.com/tal-tech/go-zero/rpcx/internal/resolver" "google.golang.org/grpc" ) diff --git a/rpcx/internal/resolver/resolver.go b/rpcx/internal/resolver/resolver.go index 7c2d0b4a..bc9a1445 100644 --- a/rpcx/internal/resolver/resolver.go +++ b/rpcx/internal/resolver/resolver.go @@ -4,8 +4,7 @@ import ( "fmt" "strings" - "zero/core/discov" - + "github.com/tal-tech/go-zero/core/discov" "google.golang.org/grpc/resolver" ) diff --git a/rpcx/internal/resolver/subset_test.go b/rpcx/internal/resolver/subset_test.go index 50807e8e..16ca0a67 100644 --- a/rpcx/internal/resolver/subset_test.go +++ b/rpcx/internal/resolver/subset_test.go @@ -4,9 +4,8 @@ import ( "strconv" "testing" - "zero/core/mathx" - "github.com/stretchr/testify/assert" + "github.com/tal-tech/go-zero/core/mathx" ) func TestSubset(t *testing.T) { diff --git a/rpcx/internal/rpclogger.go b/rpcx/internal/rpclogger.go index f82e2dab..2870ff7c 100644 --- a/rpcx/internal/rpclogger.go +++ b/rpcx/internal/rpclogger.go @@ -3,8 +3,7 @@ package internal import ( "sync" - "zero/core/logx" - + "github.com/tal-tech/go-zero/core/logx" "google.golang.org/grpc/grpclog" ) diff --git a/rpcx/internal/rpcpubserver.go b/rpcx/internal/rpcpubserver.go index 61f827aa..93490aa4 100644 --- a/rpcx/internal/rpcpubserver.go +++ b/rpcx/internal/rpcpubserver.go @@ -1,6 +1,6 @@ package internal -import "zero/core/discov" +import "github.com/tal-tech/go-zero/core/discov" func NewRpcPubServer(etcdEndpoints []string, etcdKey, listenOn string, opts ...ServerOption) (Server, error) { registerEtcd := func() error { diff --git a/rpcx/internal/rpcserver.go b/rpcx/internal/rpcserver.go index 370beb0c..179f787d 100644 --- a/rpcx/internal/rpcserver.go +++ b/rpcx/internal/rpcserver.go @@ -3,10 +3,9 @@ package internal import ( "net" - "zero/core/proc" - "zero/core/stat" - "zero/rpcx/internal/serverinterceptors" - + "github.com/tal-tech/go-zero/core/proc" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/rpcx/internal/serverinterceptors" "google.golang.org/grpc" ) diff --git a/rpcx/internal/server.go b/rpcx/internal/server.go index 47b59bc0..98aea89c 100644 --- a/rpcx/internal/server.go +++ b/rpcx/internal/server.go @@ -1,8 +1,7 @@ package internal import ( - "zero/core/stat" - + "github.com/tal-tech/go-zero/core/stat" "google.golang.org/grpc" ) diff --git a/rpcx/internal/serverinterceptors/crashinterceptor.go b/rpcx/internal/serverinterceptors/crashinterceptor.go index 9ec567ed..8fe32d37 100644 --- a/rpcx/internal/serverinterceptors/crashinterceptor.go +++ b/rpcx/internal/serverinterceptors/crashinterceptor.go @@ -4,8 +4,7 @@ import ( "context" "runtime/debug" - "zero/core/logx" - + "github.com/tal-tech/go-zero/core/logx" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/rpcx/internal/serverinterceptors/prommetricinterceptor.go b/rpcx/internal/serverinterceptors/prommetricinterceptor.go index e3c535a5..7fe38f01 100644 --- a/rpcx/internal/serverinterceptors/prommetricinterceptor.go +++ b/rpcx/internal/serverinterceptors/prommetricinterceptor.go @@ -5,9 +5,8 @@ import ( "strconv" "time" - "zero/core/metric" - "zero/core/timex" - + "github.com/tal-tech/go-zero/core/metric" + "github.com/tal-tech/go-zero/core/timex" "google.golang.org/grpc" "google.golang.org/grpc/status" ) diff --git a/rpcx/internal/serverinterceptors/sheddinginterceptor.go b/rpcx/internal/serverinterceptors/sheddinginterceptor.go index a2c266e4..a76f1e73 100644 --- a/rpcx/internal/serverinterceptors/sheddinginterceptor.go +++ b/rpcx/internal/serverinterceptors/sheddinginterceptor.go @@ -4,9 +4,8 @@ import ( "context" "sync" - "zero/core/load" - "zero/core/stat" - + "github.com/tal-tech/go-zero/core/load" + "github.com/tal-tech/go-zero/core/stat" "google.golang.org/grpc" ) diff --git a/rpcx/internal/serverinterceptors/statinterceptor.go b/rpcx/internal/serverinterceptors/statinterceptor.go index b2a5c83b..e0900099 100644 --- a/rpcx/internal/serverinterceptors/statinterceptor.go +++ b/rpcx/internal/serverinterceptors/statinterceptor.go @@ -5,10 +5,9 @@ import ( "encoding/json" "time" - "zero/core/logx" - "zero/core/stat" - "zero/core/timex" - + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/core/timex" "google.golang.org/grpc" "google.golang.org/grpc/peer" ) diff --git a/rpcx/internal/serverinterceptors/timeoutinterceptor.go b/rpcx/internal/serverinterceptors/timeoutinterceptor.go index 26029264..26990456 100644 --- a/rpcx/internal/serverinterceptors/timeoutinterceptor.go +++ b/rpcx/internal/serverinterceptors/timeoutinterceptor.go @@ -4,8 +4,7 @@ import ( "context" "time" - "zero/core/contextx" - + "github.com/tal-tech/go-zero/core/contextx" "google.golang.org/grpc" ) diff --git a/rpcx/internal/serverinterceptors/tracinginterceptor.go b/rpcx/internal/serverinterceptors/tracinginterceptor.go index 595d3dcd..50023e5c 100644 --- a/rpcx/internal/serverinterceptors/tracinginterceptor.go +++ b/rpcx/internal/serverinterceptors/tracinginterceptor.go @@ -3,8 +3,7 @@ package serverinterceptors import ( "context" - "zero/core/trace" - + "github.com/tal-tech/go-zero/core/trace" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/rpcx/proxy.go b/rpcx/proxy.go index 07e51c13..e4c90d0a 100644 --- a/rpcx/proxy.go +++ b/rpcx/proxy.go @@ -4,10 +4,9 @@ import ( "context" "sync" - "zero/core/syncx" - "zero/rpcx/internal" - "zero/rpcx/internal/auth" - + "github.com/tal-tech/go-zero/core/syncx" + "github.com/tal-tech/go-zero/rpcx/internal" + "github.com/tal-tech/go-zero/rpcx/internal/auth" "google.golang.org/grpc" ) diff --git a/rpcx/server.go b/rpcx/server.go index eb87b1ee..76dc086f 100644 --- a/rpcx/server.go +++ b/rpcx/server.go @@ -6,13 +6,13 @@ import ( "strings" "time" - "zero/core/load" - "zero/core/logx" - "zero/core/netx" - "zero/core/stat" - "zero/rpcx/internal" - "zero/rpcx/internal/auth" - "zero/rpcx/internal/serverinterceptors" + "github.com/tal-tech/go-zero/core/load" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/netx" + "github.com/tal-tech/go-zero/core/stat" + "github.com/tal-tech/go-zero/rpcx/internal" + "github.com/tal-tech/go-zero/rpcx/internal/auth" + "github.com/tal-tech/go-zero/rpcx/internal/serverinterceptors" ) const envPodIp = "POD_IP" diff --git a/tools/goctl/api/apigen/gen.go b/tools/goctl/api/apigen/gen.go index b3a5cce8..5e8883df 100644 --- a/tools/goctl/api/apigen/gen.go +++ b/tools/goctl/api/apigen/gen.go @@ -7,9 +7,8 @@ import ( "strings" "text/template" - "zero/tools/goctl/util" - "github.com/logrusorgru/aurora" + "github.com/tal-tech/go-zero/tools/goctl/util" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/dartgen/gen.go b/tools/goctl/api/dartgen/gen.go index 3ce37a89..68a48124 100644 --- a/tools/goctl/api/dartgen/gen.go +++ b/tools/goctl/api/dartgen/gen.go @@ -4,9 +4,8 @@ import ( "errors" "strings" - "zero/core/lang" - "zero/tools/goctl/api/parser" - + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/tools/goctl/api/parser" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/dartgen/genapi.go b/tools/goctl/api/dartgen/genapi.go index 8c1d5573..067d609f 100644 --- a/tools/goctl/api/dartgen/genapi.go +++ b/tools/goctl/api/dartgen/genapi.go @@ -4,8 +4,8 @@ import ( "os" "text/template" - "zero/core/logx" - "zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" ) const apiTemplate = `import 'api.dart'; diff --git a/tools/goctl/api/dartgen/gendata.go b/tools/goctl/api/dartgen/gendata.go index 738576f4..511e6e5c 100644 --- a/tools/goctl/api/dartgen/gendata.go +++ b/tools/goctl/api/dartgen/gendata.go @@ -4,8 +4,8 @@ import ( "os" "text/template" - "zero/core/logx" - "zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" ) const dataTemplate = `// --{{with .Info}}{{.Title}}{{end}}-- diff --git a/tools/goctl/api/dartgen/genvars.go b/tools/goctl/api/dartgen/genvars.go index 974701f2..a720ec47 100644 --- a/tools/goctl/api/dartgen/genvars.go +++ b/tools/goctl/api/dartgen/genvars.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/logx" ) func genVars(dir string) error { diff --git a/tools/goctl/api/dartgen/util.go b/tools/goctl/api/dartgen/util.go index 720dd3d7..be98c2fe 100644 --- a/tools/goctl/api/dartgen/util.go +++ b/tools/goctl/api/dartgen/util.go @@ -6,8 +6,8 @@ import ( "reflect" "strings" - "zero/tools/goctl/api/spec" - "zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/util" ) func lowCamelCase(s string) string { diff --git a/tools/goctl/api/docgen/doc.go b/tools/goctl/api/docgen/doc.go index 31ed2fb7..26493dd3 100644 --- a/tools/goctl/api/docgen/doc.go +++ b/tools/goctl/api/docgen/doc.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" - "zero/core/stringx" - "zero/tools/goctl/api/gogen" - "zero/tools/goctl/api/spec" - "zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/core/stringx" + "github.com/tal-tech/go-zero/tools/goctl/api/gogen" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/util" ) const ( diff --git a/tools/goctl/api/docgen/gen.go b/tools/goctl/api/docgen/gen.go index 4e83962e..a5a5af52 100644 --- a/tools/goctl/api/docgen/gen.go +++ b/tools/goctl/api/docgen/gen.go @@ -7,8 +7,7 @@ import ( "path/filepath" "strings" - "zero/tools/goctl/api/parser" - + "github.com/tal-tech/go-zero/tools/goctl/api/parser" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/format/format.go b/tools/goctl/api/format/format.go index 17e2bdd0..4b14c3d7 100644 --- a/tools/goctl/api/format/format.go +++ b/tools/goctl/api/format/format.go @@ -11,11 +11,9 @@ import ( "strconv" "strings" - "zero/tools/goctl/api/util" - - "zero/core/errorx" - "zero/tools/goctl/api/parser" - + "github.com/tal-tech/go-zero/core/errorx" + "github.com/tal-tech/go-zero/tools/goctl/api/parser" + "github.com/tal-tech/go-zero/tools/goctl/api/util" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/gogen/gen.go b/tools/goctl/api/gogen/gen.go index ef92ca86..0468585c 100644 --- a/tools/goctl/api/gogen/gen.go +++ b/tools/goctl/api/gogen/gen.go @@ -12,13 +12,12 @@ import ( "sync" "time" - "zero/core/lang" - apiformat "zero/tools/goctl/api/format" - "zero/tools/goctl/api/parser" - apiutil "zero/tools/goctl/api/util" - "zero/tools/goctl/util" - "github.com/logrusorgru/aurora" + "github.com/tal-tech/go-zero/core/lang" + apiformat "github.com/tal-tech/go-zero/tools/goctl/api/format" + "github.com/tal-tech/go-zero/tools/goctl/api/parser" + apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/util" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/gogen/genconfig.go b/tools/goctl/api/gogen/genconfig.go index 26307e33..a83605b0 100644 --- a/tools/goctl/api/gogen/genconfig.go +++ b/tools/goctl/api/gogen/genconfig.go @@ -5,8 +5,8 @@ import ( "fmt" "text/template" - "zero/tools/goctl/api/util" - "zero/tools/goctl/vars" + "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/vars" ) const ( diff --git a/tools/goctl/api/gogen/genetc.go b/tools/goctl/api/gogen/genetc.go index d514b553..7e6907f0 100644 --- a/tools/goctl/api/gogen/genetc.go +++ b/tools/goctl/api/gogen/genetc.go @@ -6,8 +6,8 @@ import ( "strconv" "text/template" - "zero/tools/goctl/api/spec" - "zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/util" ) const ( diff --git a/tools/goctl/api/gogen/genhandlers.go b/tools/goctl/api/gogen/genhandlers.go index 0f881909..56d5ed11 100644 --- a/tools/goctl/api/gogen/genhandlers.go +++ b/tools/goctl/api/gogen/genhandlers.go @@ -8,10 +8,10 @@ import ( "strings" "text/template" - "zero/tools/goctl/api/spec" - apiutil "zero/tools/goctl/api/util" - "zero/tools/goctl/util" - "zero/tools/goctl/vars" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/util" + "github.com/tal-tech/go-zero/tools/goctl/vars" ) const ( diff --git a/tools/goctl/api/gogen/genlogic.go b/tools/goctl/api/gogen/genlogic.go index 31e0fd95..257fc37c 100644 --- a/tools/goctl/api/gogen/genlogic.go +++ b/tools/goctl/api/gogen/genlogic.go @@ -7,9 +7,9 @@ import ( "strings" "text/template" - "zero/tools/goctl/api/spec" - "zero/tools/goctl/api/util" - "zero/tools/goctl/vars" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/vars" ) const logicTemplate = `package logic diff --git a/tools/goctl/api/gogen/genmain.go b/tools/goctl/api/gogen/genmain.go index bf7668e7..311af99d 100644 --- a/tools/goctl/api/gogen/genmain.go +++ b/tools/goctl/api/gogen/genmain.go @@ -8,9 +8,9 @@ import ( "strings" "text/template" - "zero/tools/goctl/api/spec" - "zero/tools/goctl/api/util" - "zero/tools/goctl/vars" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/vars" ) const mainTemplate = `package main diff --git a/tools/goctl/api/gogen/genroutes.go b/tools/goctl/api/gogen/genroutes.go index 3c412e02..9296729f 100644 --- a/tools/goctl/api/gogen/genroutes.go +++ b/tools/goctl/api/gogen/genroutes.go @@ -8,11 +8,11 @@ import ( "strings" "text/template" - "zero/core/collection" - "zero/tools/goctl/api/spec" - apiutil "zero/tools/goctl/api/util" - "zero/tools/goctl/util" - "zero/tools/goctl/vars" + "github.com/tal-tech/go-zero/core/collection" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/util" + "github.com/tal-tech/go-zero/tools/goctl/vars" ) const ( diff --git a/tools/goctl/api/gogen/genservicecontext.go b/tools/goctl/api/gogen/genservicecontext.go index 979a7927..b890c020 100644 --- a/tools/goctl/api/gogen/genservicecontext.go +++ b/tools/goctl/api/gogen/genservicecontext.go @@ -6,8 +6,8 @@ import ( "path" "text/template" - "zero/tools/goctl/api/spec" - "zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/util" ) const ( diff --git a/tools/goctl/api/gogen/gentypes.go b/tools/goctl/api/gogen/gentypes.go index c8e2aab7..3dc94d0c 100644 --- a/tools/goctl/api/gogen/gentypes.go +++ b/tools/goctl/api/gogen/gentypes.go @@ -9,9 +9,9 @@ import ( "strings" "text/template" - "zero/tools/goctl/api/spec" - apiutil "zero/tools/goctl/api/util" - "zero/tools/goctl/util" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/util" ) const ( diff --git a/tools/goctl/api/gogen/util.go b/tools/goctl/api/gogen/util.go index 1064ce66..392b583e 100644 --- a/tools/goctl/api/gogen/util.go +++ b/tools/goctl/api/gogen/util.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "zero/core/collection" - "zero/tools/goctl/api/spec" - "zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/core/collection" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/util" ) func getParentPackage(dir string) (string, error) { diff --git a/tools/goctl/api/javagen/gen.go b/tools/goctl/api/javagen/gen.go index 34a6bf79..086e7dce 100644 --- a/tools/goctl/api/javagen/gen.go +++ b/tools/goctl/api/javagen/gen.go @@ -5,11 +5,10 @@ import ( "fmt" "strings" - "zero/core/lang" - "zero/tools/goctl/api/parser" - "zero/tools/goctl/util" - "github.com/logrusorgru/aurora" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/tools/goctl/api/parser" + "github.com/tal-tech/go-zero/tools/goctl/util" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/javagen/gencomponents.go b/tools/goctl/api/javagen/gencomponents.go index 5f116225..79a646d3 100644 --- a/tools/goctl/api/javagen/gencomponents.go +++ b/tools/goctl/api/javagen/gencomponents.go @@ -7,9 +7,9 @@ import ( "strings" "text/template" - "zero/tools/goctl/api/spec" - apiutil "zero/tools/goctl/api/util" - "zero/tools/goctl/util" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/util" ) const ( diff --git a/tools/goctl/api/javagen/genpacket.go b/tools/goctl/api/javagen/genpacket.go index dbf7d6cf..83497bc2 100644 --- a/tools/goctl/api/javagen/genpacket.go +++ b/tools/goctl/api/javagen/genpacket.go @@ -9,10 +9,10 @@ import ( "strings" "text/template" - "zero/core/stringx" - "zero/tools/goctl/api/spec" - apiutil "zero/tools/goctl/api/util" - "zero/tools/goctl/util" + "github.com/tal-tech/go-zero/core/stringx" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/util" ) const packetTemplate = `package com.xhb.logic.http.packet.{{.packet}}; diff --git a/tools/goctl/api/javagen/util.go b/tools/goctl/api/javagen/util.go index d51a39a1..f203422d 100644 --- a/tools/goctl/api/javagen/util.go +++ b/tools/goctl/api/javagen/util.go @@ -8,9 +8,9 @@ import ( "strings" "text/template" - "zero/tools/goctl/api/spec" - apiutil "zero/tools/goctl/api/util" - "zero/tools/goctl/util" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/util" ) const getSetTemplate = ` diff --git a/tools/goctl/api/main.go b/tools/goctl/api/main.go index 5f0e4c25..758d23ca 100644 --- a/tools/goctl/api/main.go +++ b/tools/goctl/api/main.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "zero/core/lang" - "zero/tools/goctl/api/parser" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/tools/goctl/api/parser" ) func main() { diff --git a/tools/goctl/api/parser/entity.go b/tools/goctl/api/parser/entity.go index af535203..b905bc9b 100644 --- a/tools/goctl/api/parser/entity.go +++ b/tools/goctl/api/parser/entity.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" ) type ( diff --git a/tools/goctl/api/parser/infostate.go b/tools/goctl/api/parser/infostate.go index 5d461476..6432fd83 100644 --- a/tools/goctl/api/parser/infostate.go +++ b/tools/goctl/api/parser/infostate.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" ) const ( diff --git a/tools/goctl/api/parser/parser.go b/tools/goctl/api/parser/parser.go index 79cbb301..04a4f527 100644 --- a/tools/goctl/api/parser/parser.go +++ b/tools/goctl/api/parser/parser.go @@ -7,7 +7,7 @@ import ( "io" "io/ioutil" - "zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" ) type Parser struct { diff --git a/tools/goctl/api/parser/rootstate.go b/tools/goctl/api/parser/rootstate.go index 715e00b6..297eabf7 100644 --- a/tools/goctl/api/parser/rootstate.go +++ b/tools/goctl/api/parser/rootstate.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" ) type rootState struct { diff --git a/tools/goctl/api/parser/servicestate.go b/tools/goctl/api/parser/servicestate.go index cbbe792a..03caecb2 100644 --- a/tools/goctl/api/parser/servicestate.go +++ b/tools/goctl/api/parser/servicestate.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" ) type serviceState struct { diff --git a/tools/goctl/api/parser/state.go b/tools/goctl/api/parser/state.go index b167696f..9af51320 100644 --- a/tools/goctl/api/parser/state.go +++ b/tools/goctl/api/parser/state.go @@ -1,6 +1,6 @@ package parser -import "zero/tools/goctl/api/spec" +import "github.com/tal-tech/go-zero/tools/goctl/api/spec" type state interface { process(api *spec.ApiSpec) (state, error) diff --git a/tools/goctl/api/parser/typeparser.go b/tools/goctl/api/parser/typeparser.go index 804d9c4c..8fadc775 100644 --- a/tools/goctl/api/parser/typeparser.go +++ b/tools/goctl/api/parser/typeparser.go @@ -9,7 +9,7 @@ import ( "sort" "strings" - "zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" ) var ( diff --git a/tools/goctl/api/parser/typestate.go b/tools/goctl/api/parser/typestate.go index 8ea015ee..25115e30 100644 --- a/tools/goctl/api/parser/typestate.go +++ b/tools/goctl/api/parser/typestate.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "zero/tools/goctl/api/spec" - "zero/tools/goctl/util" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/util" ) type typeState struct { diff --git a/tools/goctl/api/parser/util.go b/tools/goctl/api/parser/util.go index d70ac60f..8313f35c 100644 --- a/tools/goctl/api/parser/util.go +++ b/tools/goctl/api/parser/util.go @@ -6,7 +6,7 @@ import ( "regexp" "strings" - "zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" ) const ( diff --git a/tools/goctl/api/parser/validator.go b/tools/goctl/api/parser/validator.go index 0bf6b491..af51c3b9 100644 --- a/tools/goctl/api/parser/validator.go +++ b/tools/goctl/api/parser/validator.go @@ -4,9 +4,10 @@ import ( "errors" "fmt" "strings" - "zero/core/stringx" - "zero/tools/goctl/api/spec" - "zero/tools/goctl/api/util" + + "github.com/tal-tech/go-zero/core/stringx" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/util" ) func (p *Parser) validate(api *spec.ApiSpec) (err error) { diff --git a/tools/goctl/api/spec/fn.go b/tools/goctl/api/spec/fn.go index 5dfa32ad..45127b67 100644 --- a/tools/goctl/api/spec/fn.go +++ b/tools/goctl/api/spec/fn.go @@ -5,8 +5,8 @@ import ( "regexp" "strings" - "zero/core/stringx" - "zero/tools/goctl/util" + "github.com/tal-tech/go-zero/core/stringx" + "github.com/tal-tech/go-zero/tools/goctl/util" ) const ( diff --git a/tools/goctl/api/tsgen/gen.go b/tools/goctl/api/tsgen/gen.go index a52464c8..e21b085b 100644 --- a/tools/goctl/api/tsgen/gen.go +++ b/tools/goctl/api/tsgen/gen.go @@ -4,11 +4,10 @@ import ( "errors" "fmt" - "zero/core/lang" - "zero/tools/goctl/api/parser" - "zero/tools/goctl/util" - "github.com/logrusorgru/aurora" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/tools/goctl/api/parser" + "github.com/tal-tech/go-zero/tools/goctl/util" "github.com/urfave/cli" ) diff --git a/tools/goctl/api/tsgen/gencomponents.go b/tools/goctl/api/tsgen/gencomponents.go index 554ac662..8a5d1d7a 100644 --- a/tools/goctl/api/tsgen/gencomponents.go +++ b/tools/goctl/api/tsgen/gencomponents.go @@ -6,9 +6,9 @@ import ( "strings" "text/template" - "zero/tools/goctl/api/spec" - apiutil "zero/tools/goctl/api/util" - "zero/tools/goctl/util" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/util" ) const ( diff --git a/tools/goctl/api/tsgen/genpacket.go b/tools/goctl/api/tsgen/genpacket.go index de916970..2f7e9cd8 100644 --- a/tools/goctl/api/tsgen/genpacket.go +++ b/tools/goctl/api/tsgen/genpacket.go @@ -7,9 +7,9 @@ import ( "strings" "text/template" - "zero/tools/goctl/api/spec" - apiutil "zero/tools/goctl/api/util" - "zero/tools/goctl/util" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/util" ) const ( diff --git a/tools/goctl/api/tsgen/util.go b/tools/goctl/api/tsgen/util.go index d106d816..5174d4bc 100644 --- a/tools/goctl/api/tsgen/util.go +++ b/tools/goctl/api/tsgen/util.go @@ -5,9 +5,9 @@ import ( "io" "strings" - "zero/tools/goctl/api/spec" - apiutil "zero/tools/goctl/api/util" - "zero/tools/goctl/util" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + apiutil "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/util" ) func writeProperty(writer io.Writer, member spec.Member, indent int, prefixForType func(string) string) error { diff --git a/tools/goctl/api/util/annotation.go b/tools/goctl/api/util/annotation.go index 8e5bc911..e4dc0073 100644 --- a/tools/goctl/api/util/annotation.go +++ b/tools/goctl/api/util/annotation.go @@ -1,6 +1,6 @@ package util -import "zero/tools/goctl/api/spec" +import "github.com/tal-tech/go-zero/tools/goctl/api/spec" func GetAnnotationValue(annos []spec.Annotation, key, field string) (string, bool) { for _, anno := range annos { diff --git a/tools/goctl/api/util/types.go b/tools/goctl/api/util/types.go index ab46d7f3..2dacfab6 100644 --- a/tools/goctl/api/util/types.go +++ b/tools/goctl/api/util/types.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" ) func DecomposeType(t string) (result []string, err error) { diff --git a/tools/goctl/api/util/util.go b/tools/goctl/api/util/util.go index ec067097..c4ec3256 100644 --- a/tools/goctl/api/util/util.go +++ b/tools/goctl/api/util/util.go @@ -7,10 +7,10 @@ import ( "os" "path" "strings" - "zero/tools/goctl/api/spec" - "zero/core/lang" - "zero/tools/goctl/util" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/util" ) func MaybeCreateFile(dir, subdir, file string) (fp *os.File, created bool, err error) { diff --git a/tools/goctl/api/validate/validate.go b/tools/goctl/api/validate/validate.go index e74aad16..4b06c515 100644 --- a/tools/goctl/api/validate/validate.go +++ b/tools/goctl/api/validate/validate.go @@ -4,9 +4,8 @@ import ( "errors" "fmt" - "zero/tools/goctl/api/parser" - "github.com/logrusorgru/aurora" + "github.com/tal-tech/go-zero/tools/goctl/api/parser" "github.com/urfave/cli" ) diff --git a/tools/goctl/configgen/genconfigjson.go b/tools/goctl/configgen/genconfigjson.go index d4d61f2b..538c2d6d 100644 --- a/tools/goctl/configgen/genconfigjson.go +++ b/tools/goctl/configgen/genconfigjson.go @@ -10,8 +10,8 @@ import ( "text/template" "github.com/logrusorgru/aurora" + "github.com/tal-tech/go-zero/tools/goctl/vars" "github.com/urfave/cli" - "zero/tools/goctl/vars" ) const configTemplate = `package main diff --git a/tools/goctl/docker/docker.go b/tools/goctl/docker/docker.go index 27fe8be2..f0815367 100644 --- a/tools/goctl/docker/docker.go +++ b/tools/goctl/docker/docker.go @@ -3,8 +3,7 @@ package docker import ( "errors" - "zero/tools/goctl/gen" - + "github.com/tal-tech/go-zero/tools/goctl/gen" "github.com/urfave/cli" ) diff --git a/tools/goctl/example/rec.proto b/tools/goctl/example/rec.proto deleted file mode 100644 index 9abcae67..00000000 --- a/tools/goctl/example/rec.proto +++ /dev/null @@ -1,30 +0,0 @@ -syntax = "proto3"; - -package recommendservice; - -message RecArticle { - int64 id = 1; -} - -message RecommendRequest { - // the id of the request user. - int64 uid = 1; - // how many top ranked article for this user. - int32 topk = 2; - // current hour - int32 hour = 3; - // current minute - int32 minute = 4; - // the article list. - repeated RecArticle articles = 5; -} - -message RecommendResponse { - repeated int64 articles = 1; -} - -service RecommendService { - // the method to get the topk performers for this user. - rpc recommend1(RecommendRequest) returns (RecommendResponse); - rpc recommend2(RecommendRequest) returns (RecommendResponse); -} diff --git a/tools/goctl/gen/dockerfile.go b/tools/goctl/gen/dockerfile.go index 2c3f9631..a8616381 100644 --- a/tools/goctl/gen/dockerfile.go +++ b/tools/goctl/gen/dockerfile.go @@ -4,8 +4,8 @@ import ( "strings" "text/template" - "zero/tools/goctl/util" - "zero/tools/goctl/vars" + "github.com/tal-tech/go-zero/tools/goctl/util" + "github.com/tal-tech/go-zero/tools/goctl/vars" ) func GenerateDockerfile(goFile string, args ...string) error { diff --git a/tools/goctl/gen/makefile.go b/tools/goctl/gen/makefile.go index c2709ffa..9bc014f9 100644 --- a/tools/goctl/gen/makefile.go +++ b/tools/goctl/gen/makefile.go @@ -4,7 +4,7 @@ import ( "strings" "text/template" - "zero/tools/goctl/util" + "github.com/tal-tech/go-zero/tools/goctl/util" ) func GenerateMakefile(goFile, namespace string) error { diff --git a/tools/goctl/goctl.go b/tools/goctl/goctl.go index 3374933d..82d13ff3 100644 --- a/tools/goctl/goctl.go +++ b/tools/goctl/goctl.go @@ -11,27 +11,26 @@ import ( "path/filepath" "time" - "zero/core/conf" - "zero/core/hash" - "zero/core/lang" - "zero/core/logx" - "zero/core/mr" - "zero/core/stringx" - "zero/tools/goctl/api/apigen" - "zero/tools/goctl/api/dartgen" - "zero/tools/goctl/api/docgen" - "zero/tools/goctl/api/format" - "zero/tools/goctl/api/gogen" - "zero/tools/goctl/api/javagen" - "zero/tools/goctl/api/tsgen" - "zero/tools/goctl/api/validate" - "zero/tools/goctl/configgen" - "zero/tools/goctl/docker" - "zero/tools/goctl/feature" - "zero/tools/goctl/model/mongomodel" - "zero/tools/goctl/util" - "github.com/logrusorgru/aurora" + "github.com/tal-tech/go-zero/core/conf" + "github.com/tal-tech/go-zero/core/hash" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/core/mr" + "github.com/tal-tech/go-zero/core/stringx" + "github.com/tal-tech/go-zero/tools/goctl/api/apigen" + "github.com/tal-tech/go-zero/tools/goctl/api/dartgen" + "github.com/tal-tech/go-zero/tools/goctl/api/docgen" + "github.com/tal-tech/go-zero/tools/goctl/api/format" + "github.com/tal-tech/go-zero/tools/goctl/api/gogen" + "github.com/tal-tech/go-zero/tools/goctl/api/javagen" + "github.com/tal-tech/go-zero/tools/goctl/api/tsgen" + "github.com/tal-tech/go-zero/tools/goctl/api/validate" + "github.com/tal-tech/go-zero/tools/goctl/configgen" + "github.com/tal-tech/go-zero/tools/goctl/docker" + "github.com/tal-tech/go-zero/tools/goctl/feature" + "github.com/tal-tech/go-zero/tools/goctl/model/mongomodel" + "github.com/tal-tech/go-zero/tools/goctl/util" "github.com/urfave/cli" ) diff --git a/tools/goctl/model/mongomodel/gen/genmethod.go b/tools/goctl/model/mongomodel/gen/genmethod.go index f66e85ff..219bc7ce 100644 --- a/tools/goctl/model/mongomodel/gen/genmethod.go +++ b/tools/goctl/model/mongomodel/gen/genmethod.go @@ -3,7 +3,7 @@ package gen import ( "strings" - "zero/tools/goctl/model/mongomodel/utils" + "github.com/tal-tech/go-zero/tools/goctl/model/mongomodel/utils" ) func genMethodTemplate(funcDesc FunctionDesc, needCache bool) (template string) { diff --git a/tools/goctl/model/mongomodel/gen/genmongomodel.go b/tools/goctl/model/mongomodel/gen/genmongomodel.go index a59b502b..e7de5f37 100644 --- a/tools/goctl/model/mongomodel/gen/genmongomodel.go +++ b/tools/goctl/model/mongomodel/gen/genmongomodel.go @@ -5,9 +5,9 @@ import ( "strings" "text/template" - "zero/tools/goctl/api/spec" - "zero/tools/goctl/api/util" - "zero/tools/goctl/model/mongomodel/utils" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/util" + "github.com/tal-tech/go-zero/tools/goctl/model/mongomodel/utils" ) const ( @@ -149,8 +149,8 @@ func getImports(imports []string, needCache bool) string { importStr := strings.Join(imports, "\n\t") importStr += "\"errors\"\n\t" importStr += "\"time\"\n\t" - importStr += "\n\t\"zero/core/stores/cache\"\n\t" - importStr += "\"zero/core/stores/mongoc\"\n\t" + importStr += "\n\t\"github.com/tal-tech/go-zero/core/stores/cache\"\n\t" + importStr += "\"github.com/tal-tech/go-zero/core/stores/mongoc\"\n\t" importStr += "\n\t\"github.com/globalsign/mgo/bson\"" return importStr } diff --git a/tools/goctl/model/mongomodel/gen/genmongomodelbynetwork.go b/tools/goctl/model/mongomodel/gen/genmongomodelbynetwork.go index db773cc9..af64fb5c 100644 --- a/tools/goctl/model/mongomodel/gen/genmongomodelbynetwork.go +++ b/tools/goctl/model/mongomodel/gen/genmongomodelbynetwork.go @@ -7,7 +7,7 @@ import ( "strings" "text/template" - "zero/tools/goctl/model/mongomodel/utils" + "github.com/tal-tech/go-zero/tools/goctl/model/mongomodel/utils" ) func GenMongoModelByNetwork(input string, needCache bool) (string, error) { diff --git a/tools/goctl/model/mongomodel/gen/templatemodel.go b/tools/goctl/model/mongomodel/gen/templatemodel.go index 01ac8e07..3b597baa 100644 --- a/tools/goctl/model/mongomodel/gen/templatemodel.go +++ b/tools/goctl/model/mongomodel/gen/templatemodel.go @@ -2,7 +2,7 @@ package gen const ( quotationMark = "`" - //templates that do not use caching + // templates that do not use caching noCacheTemplate = `package model import ( diff --git a/tools/goctl/model/mongomodel/genmongocmd.go b/tools/goctl/model/mongomodel/genmongocmd.go index 42cd6cc3..2d15eeec 100644 --- a/tools/goctl/model/mongomodel/genmongocmd.go +++ b/tools/goctl/model/mongomodel/genmongocmd.go @@ -4,10 +4,9 @@ import ( "errors" "fmt" - "zero/core/lang" - "zero/tools/goctl/model/mongomodel/gen" - "github.com/logrusorgru/aurora" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/tools/goctl/model/mongomodel/gen" "github.com/urfave/cli" ) diff --git a/tools/goctl/model/mongomodel/utils/parsesimplegofile.go b/tools/goctl/model/mongomodel/utils/parsesimplegofile.go index 7741d56a..8b1a73d8 100644 --- a/tools/goctl/model/mongomodel/utils/parsesimplegofile.go +++ b/tools/goctl/model/mongomodel/utils/parsesimplegofile.go @@ -8,7 +8,7 @@ import ( "io/ioutil" "strings" - "zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" ) const ( diff --git a/tools/goctl/model/sql/README.MD b/tools/goctl/model/sql/README.MD index f3312301..3045638b 100644 --- a/tools/goctl/model/sql/README.MD +++ b/tools/goctl/model/sql/README.MD @@ -45,9 +45,9 @@ imports代码生成对应model中包的引入管理，仅使用于晓黑板项 "strings" "time" - "zero/core/stores/sqlc" - "zero/core/stores/sqlx" - "zero/core/stringx" + "github.com/tal-tech/go-zero/core/stores/sqlc" + "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/tal-tech/go-zero/core/stringx" "xiao/service/shared/builderx" ) ``` @@ -60,8 +60,8 @@ imports代码生成对应model中包的引入管理，仅使用于晓黑板项 "strings" "time" - "zero/core/stores/sqlx" - "zero/core/stringx" + "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/tal-tech/go-zero/core/stringx" "xiao/service/shared/builderx" ) ``` diff --git a/tools/goctl/model/sql/gen/convert.go b/tools/goctl/model/sql/gen/convert.go index 0fb44fec..239656ab 100644 --- a/tools/goctl/model/sql/gen/convert.go +++ b/tools/goctl/model/sql/gen/convert.go @@ -6,7 +6,7 @@ import ( "sort" "strings" - "zero/tools/goctl/model/sql/util" + "github.com/tal-tech/go-zero/tools/goctl/model/sql/util" ) func TableConvert(outerTable OuterTable) (*InnerTable, error) { diff --git a/tools/goctl/model/sql/gen/delete.go b/tools/goctl/model/sql/gen/delete.go index cb1fb412..23343936 100644 --- a/tools/goctl/model/sql/gen/delete.go +++ b/tools/goctl/model/sql/gen/delete.go @@ -5,7 +5,7 @@ import ( "strings" "text/template" - sqltemplate "zero/tools/goctl/model/sql/template" + sqltemplate "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" ) func genDelete(table *InnerTable) (string, error) { diff --git a/tools/goctl/model/sql/gen/field.go b/tools/goctl/model/sql/gen/field.go index ceadbe1f..fe8413c5 100644 --- a/tools/goctl/model/sql/gen/field.go +++ b/tools/goctl/model/sql/gen/field.go @@ -5,7 +5,7 @@ import ( "strings" "text/template" - sqltemplate "zero/tools/goctl/model/sql/template" + sqltemplate "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" ) func genFields(fields []*InnerField) (string, error) { diff --git a/tools/goctl/model/sql/gen/findallbyfield.go b/tools/goctl/model/sql/gen/findallbyfield.go index 3c6fc935..9e1c6be2 100644 --- a/tools/goctl/model/sql/gen/findallbyfield.go +++ b/tools/goctl/model/sql/gen/findallbyfield.go @@ -5,7 +5,7 @@ import ( "strings" "text/template" - sqltemplate "zero/tools/goctl/model/sql/template" + sqltemplate "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" ) func genFindAllByField(table *InnerTable) (string, error) { diff --git a/tools/goctl/model/sql/gen/findallbylimit.go b/tools/goctl/model/sql/gen/findallbylimit.go index 8da9ed5a..de7e5dbf 100644 --- a/tools/goctl/model/sql/gen/findallbylimit.go +++ b/tools/goctl/model/sql/gen/findallbylimit.go @@ -5,7 +5,7 @@ import ( "strings" "text/template" - sqltemplate "zero/tools/goctl/model/sql/template" + sqltemplate "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" ) func genFindLimitByField(table *InnerTable) (string, error) { diff --git a/tools/goctl/model/sql/gen/findone.go b/tools/goctl/model/sql/gen/findone.go index d6133925..080928b7 100644 --- a/tools/goctl/model/sql/gen/findone.go +++ b/tools/goctl/model/sql/gen/findone.go @@ -4,7 +4,7 @@ import ( "bytes" "text/template" - sqltemplate "zero/tools/goctl/model/sql/template" + sqltemplate "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" ) func genFindOne(table *InnerTable) (string, error) { diff --git a/tools/goctl/model/sql/gen/fineonebyfield.go b/tools/goctl/model/sql/gen/fineonebyfield.go index 4ea047c1..2fbc4f37 100644 --- a/tools/goctl/model/sql/gen/fineonebyfield.go +++ b/tools/goctl/model/sql/gen/fineonebyfield.go @@ -5,7 +5,7 @@ import ( "strings" "text/template" - sqltemplate "zero/tools/goctl/model/sql/template" + sqltemplate "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" ) func genFineOneByField(table *InnerTable) (string, error) { diff --git a/tools/goctl/model/sql/gen/imports.go b/tools/goctl/model/sql/gen/imports.go index f23ee536..dcf4f0dd 100644 --- a/tools/goctl/model/sql/gen/imports.go +++ b/tools/goctl/model/sql/gen/imports.go @@ -4,7 +4,7 @@ import ( "bytes" "text/template" - sqltemplate "zero/tools/goctl/model/sql/template" + sqltemplate "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" ) func genImports(table *InnerTable) (string, error) { diff --git a/tools/goctl/model/sql/gen/insert.go b/tools/goctl/model/sql/gen/insert.go index 620ad92d..d246c81f 100644 --- a/tools/goctl/model/sql/gen/insert.go +++ b/tools/goctl/model/sql/gen/insert.go @@ -5,7 +5,7 @@ import ( "strings" "text/template" - sqltemplate "zero/tools/goctl/model/sql/template" + sqltemplate "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" ) func genInsert(table *InnerTable) (string, error) { diff --git a/tools/goctl/model/sql/gen/keys_test.go b/tools/goctl/model/sql/gen/keys_test.go index 5685542f..1018f21a 100644 --- a/tools/goctl/model/sql/gen/keys_test.go +++ b/tools/goctl/model/sql/gen/keys_test.go @@ -4,7 +4,7 @@ import ( "log" "testing" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/logx" ) func TestKeys(t *testing.T) { diff --git a/tools/goctl/model/sql/gen/model.go b/tools/goctl/model/sql/gen/model.go index f79f0979..1dcbe9b9 100644 --- a/tools/goctl/model/sql/gen/model.go +++ b/tools/goctl/model/sql/gen/model.go @@ -6,8 +6,8 @@ import ( "strings" "text/template" - "zero/core/logx" - sqltemplate "zero/tools/goctl/model/sql/template" + "github.com/tal-tech/go-zero/core/logx" + sqltemplate "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" ) func GenModel(table *InnerTable) (string, error) { diff --git a/tools/goctl/model/sql/gen/new.go b/tools/goctl/model/sql/gen/new.go index ccfebaca..47047b89 100644 --- a/tools/goctl/model/sql/gen/new.go +++ b/tools/goctl/model/sql/gen/new.go @@ -4,7 +4,7 @@ import ( "bytes" "text/template" - sqltemplate "zero/tools/goctl/model/sql/template" + sqltemplate "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" ) func genNew(table *InnerTable) (string, error) { diff --git a/tools/goctl/model/sql/gen/tag.go b/tools/goctl/model/sql/gen/tag.go index b299c89e..6c5edf73 100644 --- a/tools/goctl/model/sql/gen/tag.go +++ b/tools/goctl/model/sql/gen/tag.go @@ -4,7 +4,7 @@ import ( "bytes" "text/template" - sqltemplate "zero/tools/goctl/model/sql/template" + sqltemplate "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" ) func genTag(in string) (string, error) { diff --git a/tools/goctl/model/sql/gen/types.go b/tools/goctl/model/sql/gen/types.go index 998c9929..9856f853 100644 --- a/tools/goctl/model/sql/gen/types.go +++ b/tools/goctl/model/sql/gen/types.go @@ -4,7 +4,7 @@ import ( "bytes" "text/template" - sqltemplate "zero/tools/goctl/model/sql/template" + sqltemplate "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" ) func genTypes(table *InnerTable) (string, error) { diff --git a/tools/goctl/model/sql/gen/update.go b/tools/goctl/model/sql/gen/update.go index 5d9f60fc..27d6de6f 100644 --- a/tools/goctl/model/sql/gen/update.go +++ b/tools/goctl/model/sql/gen/update.go @@ -5,7 +5,7 @@ import ( "strings" "text/template" - sqltemplate "zero/tools/goctl/model/sql/template" + sqltemplate "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" ) func genUpdate(table *InnerTable) (string, error) { diff --git a/tools/goctl/model/sql/gen/vars.go b/tools/goctl/model/sql/gen/vars.go index 86413c77..f5ed6aea 100644 --- a/tools/goctl/model/sql/gen/vars.go +++ b/tools/goctl/model/sql/gen/vars.go @@ -5,7 +5,7 @@ import ( "strings" "text/template" - sqltemplate "zero/tools/goctl/model/sql/template" + sqltemplate "github.com/tal-tech/go-zero/tools/goctl/model/sql/template" ) func genVars(table *InnerTable) (string, error) { diff --git a/tools/goctl/model/sql/sqlctl.go b/tools/goctl/model/sql/sqlctl.go index ad009fed..56459388 100644 --- a/tools/goctl/model/sql/sqlctl.go +++ b/tools/goctl/model/sql/sqlctl.go @@ -3,7 +3,7 @@ package sqlgen import ( "errors" - "zero/tools/goctl/model/sql/gen" + "github.com/tal-tech/go-zero/tools/goctl/model/sql/gen" ) var ( diff --git a/tools/goctl/model/sql/template/errors.go b/tools/goctl/model/sql/template/errors.go index b1d05a9f..4df82d95 100644 --- a/tools/goctl/model/sql/template/errors.go +++ b/tools/goctl/model/sql/template/errors.go @@ -2,7 +2,7 @@ package sqltemplate var Error = `package model -import "zero/core/stores/sqlx" +import "github.com/tal-tech/go-zero/core/stores/sqlx" var ( ErrNotFound = sqlx.ErrNotFound diff --git a/tools/goctl/model/sql/template/import.go b/tools/goctl/model/sql/template/import.go index ea09d5f6..dd2c1555 100644 --- a/tools/goctl/model/sql/template/import.go +++ b/tools/goctl/model/sql/template/import.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "zero/core/stores/cache" - "zero/core/stores/sqlc" - "zero/core/stores/sqlx" - "zero/core/stringx" + "github.com/tal-tech/go-zero/core/stores/cache" + "github.com/tal-tech/go-zero/core/stores/sqlc" + "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/tal-tech/go-zero/core/stringx" ) ` diff --git a/tools/goctl/model/sqlmodel/gen.go b/tools/goctl/model/sqlmodel/gen.go index bb1b6639..8beb9094 100644 --- a/tools/goctl/model/sqlmodel/gen.go +++ b/tools/goctl/model/sqlmodel/gen.go @@ -3,7 +3,7 @@ package sqlmodel import ( "go/format" - "zero/core/logx" + "github.com/tal-tech/go-zero/core/logx" ) type ( diff --git a/tools/goctl/model/sqlmodel/genmodel.go b/tools/goctl/model/sqlmodel/genmodel.go index 8209689c..77eea68b 100644 --- a/tools/goctl/model/sqlmodel/genmodel.go +++ b/tools/goctl/model/sqlmodel/genmodel.go @@ -9,9 +9,9 @@ import ( "strings" "text/template" - "zero/core/stringx" - "zero/tools/goctl/api/spec" - "zero/tools/goctl/util" + "github.com/tal-tech/go-zero/core/stringx" + "github.com/tal-tech/go-zero/tools/goctl/api/spec" + "github.com/tal-tech/go-zero/tools/goctl/util" ) var ( diff --git a/tools/goctl/model/sqlmodel/insertsql.go b/tools/goctl/model/sqlmodel/insertsql.go index b5b9b00f..4fcd266e 100644 --- a/tools/goctl/model/sqlmodel/insertsql.go +++ b/tools/goctl/model/sqlmodel/insertsql.go @@ -6,7 +6,7 @@ import ( "strings" "text/template" - "zero/core/stringx" + "github.com/tal-tech/go-zero/core/stringx" ) var insertTemplate = ` diff --git a/tools/goctl/model/sqlmodel/table2struct.go b/tools/goctl/model/sqlmodel/table2struct.go index 40c4a986..89321960 100644 --- a/tools/goctl/model/sqlmodel/table2struct.go +++ b/tools/goctl/model/sqlmodel/table2struct.go @@ -7,7 +7,7 @@ import ( "strings" "text/template" - util2 "zero/tools/modelctl/util" + util2 "github.com/tal-tech/go-zero/tools/modelctl/util" ) var ( diff --git a/tools/goctl/model/sqlmodel/updatesql.go b/tools/goctl/model/sqlmodel/updatesql.go index 3a0bad61..e26a5f44 100644 --- a/tools/goctl/model/sqlmodel/updatesql.go +++ b/tools/goctl/model/sqlmodel/updatesql.go @@ -6,7 +6,7 @@ import ( "strings" "text/template" - "zero/core/stringx" + "github.com/tal-tech/go-zero/core/stringx" ) var updateTemplate = ` diff --git a/tools/goctl/update/config/config.go b/tools/goctl/update/config/config.go index 71410292..5da7c3de 100644 --- a/tools/goctl/update/config/config.go +++ b/tools/goctl/update/config/config.go @@ -1,6 +1,6 @@ package config -import "zero/core/logx" +import "github.com/tal-tech/go-zero/core/logx" type Config struct { logx.LogConf diff --git a/tools/goctl/update/update.go b/tools/goctl/update/update.go index 525f8a42..480f8ab4 100644 --- a/tools/goctl/update/update.go +++ b/tools/goctl/update/update.go @@ -6,12 +6,12 @@ import ( "net/http" "path" - "zero/core/conf" - "zero/core/hash" - "zero/core/lang" - "zero/core/logx" - "zero/tools/goctl/update/config" - "zero/tools/goctl/util" + "github.com/tal-tech/go-zero/core/conf" + "github.com/tal-tech/go-zero/core/hash" + "github.com/tal-tech/go-zero/core/lang" + "github.com/tal-tech/go-zero/core/logx" + "github.com/tal-tech/go-zero/tools/goctl/update/config" + "github.com/tal-tech/go-zero/tools/goctl/util" ) const ( diff --git a/tools/goctl/util/file.go b/tools/goctl/util/file.go index e1f5b55d..5fdee0c9 100644 --- a/tools/goctl/util/file.go +++ b/tools/goctl/util/file.go @@ -13,8 +13,7 @@ import ( "time" "github.com/logrusorgru/aurora" - - "zero/core/logx" + "github.com/tal-tech/go-zero/core/logx" ) func CreateIfNotExist(file string) (*os.File, error) { diff --git a/tools/goctl/util/path.go b/tools/goctl/util/path.go index 96640ef6..f5739a86 100644 --- a/tools/goctl/util/path.go +++ b/tools/goctl/util/path.go @@ -7,7 +7,7 @@ import ( "path/filepath" "strings" - "zero/tools/goctl/vars" + "github.com/tal-tech/go-zero/tools/goctl/vars" ) func MkdirIfNotExist(dir string) error { diff --git a/tools/modelctl/model/configtemplategen/gen.go b/tools/modelctl/model/configtemplategen/gen.go index 7efe0d65..c40332ea 100644 --- a/tools/modelctl/model/configtemplategen/gen.go +++ b/tools/modelctl/model/configtemplategen/gen.go @@ -4,8 +4,7 @@ import ( "fmt" "os" - "zero/tools/modelctl/model" - + "github.com/tal-tech/go-zero/tools/modelctl/model" "github.com/urfave/cli" ) diff --git a/tools/modelctl/model/modelgen/fieldmodel.go b/tools/modelctl/model/modelgen/fieldmodel.go index fadb1e15..16887dbe 100644 --- a/tools/modelctl/model/modelgen/fieldmodel.go +++ b/tools/modelctl/model/modelgen/fieldmodel.go @@ -1,8 +1,6 @@ package modelgen -import ( - "zero/core/stores/sqlx" -) +import "github.com/tal-tech/go-zero/core/stores/sqlx" type ( FieldModel struct { diff --git a/tools/modelctl/model/modelgen/gen.go b/tools/modelctl/model/modelgen/gen.go index 70fd9e72..8601bc8d 100644 --- a/tools/modelctl/model/modelgen/gen.go +++ b/tools/modelctl/model/modelgen/gen.go @@ -5,8 +5,7 @@ import ( "fmt" "strings" - "zero/core/lang" - + "github.com/tal-tech/go-zero/core/lang" "github.com/urfave/cli" ) diff --git a/tools/modelctl/model/modelgen/genmodel.go b/tools/modelctl/model/modelgen/genmodel.go index e1c263c4..5abe2fb4 100644 --- a/tools/modelctl/model/modelgen/genmodel.go +++ b/tools/modelctl/model/modelgen/genmodel.go @@ -10,7 +10,7 @@ import ( "strings" "text/template" - "zero/tools/modelctl/model" + "github.com/tal-tech/go-zero/tools/modelctl/model" ) var ( diff --git a/tools/modelctl/model/modelgen/modeltemplate.go b/tools/modelctl/model/modelgen/modeltemplate.go index 86ad64df..3e19e97e 100644 --- a/tools/modelctl/model/modelgen/modeltemplate.go +++ b/tools/modelctl/model/modelgen/modeltemplate.go @@ -7,8 +7,8 @@ import ( "strings" "text/template" - "zero/tools/modelctl/model" - "zero/tools/modelctl/util" + "github.com/tal-tech/go-zero/tools/modelctl/model" + "github.com/tal-tech/go-zero/tools/modelctl/util" ) type ( @@ -59,10 +59,10 @@ import ( "strings" "time" - "zero/core/stores/redis" - "zero/core/stores/sqlx" - "zero/service/shared/builderx" - "zero/service/shared/cache" + "github.com/tal-tech/go-zero/core/stores/redis" + "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/tal-tech/go-zero/service/shared/builderx" + "github.com/tal-tech/go-zero/service/shared/cache" ) var ( diff --git a/tools/modelctl/model/modelgen/utiltemplate.go b/tools/modelctl/model/modelgen/utiltemplate.go index 9b67e9a0..159b122d 100644 --- a/tools/modelctl/model/modelgen/utiltemplate.go +++ b/tools/modelctl/model/modelgen/utiltemplate.go @@ -6,9 +6,9 @@ const ( import ( "errors" - {{if .WithCache}}"zero/core/stores/redis" - "zero/core/stores/sqlc" - "zero/core/stores/sqlx"{{end}} + {{if .WithCache}}"github.com/tal-tech/go-zero/core/stores/redis" + "github.com/tal-tech/go-zero/core/stores/sqlc" + "github.com/tal-tech/go-zero/core/stores/sqlx"{{end}} ) {{if .WithCache}} type CachedModel struct { diff --git a/tools/modelctl/modelctl.go b/tools/modelctl/modelctl.go index 532f6f73..71d0bc1d 100644 --- a/tools/modelctl/modelctl.go +++ b/tools/modelctl/modelctl.go @@ -4,10 +4,9 @@ import ( "fmt" "os" - "zero/core/logx" - "zero/tools/modelctl/model/configtemplategen" - "zero/tools/modelctl/model/modelgen" - + "github.com/tal-tech/go-zero/core/logx" + configgen "github.com/tal-tech/go-zero/tools/modelctl/model/configtemplategen" + "github.com/tal-tech/go-zero/tools/modelctl/model/modelgen" "github.com/urfave/cli" )