diff --git a/core/bloom/bloom.go b/core/bloom/bloom.go index 9e7c0bef..d6598be1 100644 --- a/core/bloom/bloom.go +++ b/core/bloom/bloom.go @@ -4,8 +4,8 @@ import ( "errors" "strconv" - "github.com/tal-tech/go-zero/core/hash" - "github.com/tal-tech/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/hash" + "github.com/zeromicro/go-zero/core/stores/redis" ) const ( diff --git a/core/bloom/bloom_test.go b/core/bloom/bloom_test.go index acad4d6c..35bf15c8 100644 --- a/core/bloom/bloom_test.go +++ b/core/bloom/bloom_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stores/redis/redistest" + "github.com/zeromicro/go-zero/core/stores/redis/redistest" ) func TestRedisBitSet_New_Set_Test(t *testing.T) { diff --git a/core/breaker/breaker.go b/core/breaker/breaker.go index 7cabbe2f..81dd438f 100644 --- a/core/breaker/breaker.go +++ b/core/breaker/breaker.go @@ -6,11 +6,11 @@ import ( "strings" "sync" - "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" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/mathx" + "github.com/zeromicro/go-zero/core/proc" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/timex" ) const ( diff --git a/core/breaker/breaker_test.go b/core/breaker/breaker_test.go index 59e24494..70a3480c 100644 --- a/core/breaker/breaker_test.go +++ b/core/breaker/breaker_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/stat" ) func init() { diff --git a/core/breaker/breakers_test.go b/core/breaker/breakers_test.go index 1ffa2eca..74aa5b4c 100644 --- a/core/breaker/breakers_test.go +++ b/core/breaker/breakers_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/stat" ) func init() { diff --git a/core/breaker/googlebreaker.go b/core/breaker/googlebreaker.go index 5da1471f..a8432e30 100644 --- a/core/breaker/googlebreaker.go +++ b/core/breaker/googlebreaker.go @@ -4,8 +4,8 @@ import ( "math" "time" - "github.com/tal-tech/go-zero/core/collection" - "github.com/tal-tech/go-zero/core/mathx" + "github.com/zeromicro/go-zero/core/collection" + "github.com/zeromicro/go-zero/core/mathx" ) const ( diff --git a/core/breaker/googlebreaker_test.go b/core/breaker/googlebreaker_test.go index a584f931..e525de5b 100644 --- a/core/breaker/googlebreaker_test.go +++ b/core/breaker/googlebreaker_test.go @@ -7,9 +7,9 @@ import ( "time" "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" + "github.com/zeromicro/go-zero/core/collection" + "github.com/zeromicro/go-zero/core/mathx" + "github.com/zeromicro/go-zero/core/stat" ) const ( diff --git a/core/cmdline/input_test.go b/core/cmdline/input_test.go index c93511fc..ba38f26a 100644 --- a/core/cmdline/input_test.go +++ b/core/cmdline/input_test.go @@ -8,8 +8,8 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/iox" - "github.com/tal-tech/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/iox" + "github.com/zeromicro/go-zero/core/lang" ) func TestEnterToContinue(t *testing.T) { diff --git a/core/codec/aesecb.go b/core/codec/aesecb.go index 628bf288..08a388fb 100644 --- a/core/codec/aesecb.go +++ b/core/codec/aesecb.go @@ -7,7 +7,7 @@ import ( "encoding/base64" "errors" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) // ErrPaddingSize indicates bad padding size. diff --git a/core/codec/rsa_test.go b/core/codec/rsa_test.go index 8225a7c2..407952bb 100644 --- a/core/codec/rsa_test.go +++ b/core/codec/rsa_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/fs" + "github.com/zeromicro/go-zero/core/fs" ) const ( diff --git a/core/collection/cache.go b/core/collection/cache.go index f0a8d9bc..b7c887fb 100644 --- a/core/collection/cache.go +++ b/core/collection/cache.go @@ -6,9 +6,9 @@ import ( "sync/atomic" "time" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/mathx" - "github.com/tal-tech/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/mathx" + "github.com/zeromicro/go-zero/core/syncx" ) const ( diff --git a/core/collection/rollingwindow.go b/core/collection/rollingwindow.go index bfd9027e..81894be3 100644 --- a/core/collection/rollingwindow.go +++ b/core/collection/rollingwindow.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/timex" ) type ( diff --git a/core/collection/rollingwindow_test.go b/core/collection/rollingwindow_test.go index 577da52c..201dce0e 100644 --- a/core/collection/rollingwindow_test.go +++ b/core/collection/rollingwindow_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/stringx" ) const duration = time.Millisecond * 50 diff --git a/core/collection/safemap_test.go b/core/collection/safemap_test.go index 2bb41630..46e64749 100644 --- a/core/collection/safemap_test.go +++ b/core/collection/safemap_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/stringx" ) func TestSafeMap(t *testing.T) { diff --git a/core/collection/set.go b/core/collection/set.go index 1bd6f27f..d95f9e5b 100644 --- a/core/collection/set.go +++ b/core/collection/set.go @@ -1,8 +1,8 @@ package collection import ( - "github.com/tal-tech/go-zero/core/lang" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/logx" ) const ( diff --git a/core/collection/set_test.go b/core/collection/set_test.go index 298e3284..3586e151 100644 --- a/core/collection/set_test.go +++ b/core/collection/set_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) func init() { diff --git a/core/collection/timingwheel.go b/core/collection/timingwheel.go index 07189e03..9b74e757 100644 --- a/core/collection/timingwheel.go +++ b/core/collection/timingwheel.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "github.com/tal-tech/go-zero/core/lang" - "github.com/tal-tech/go-zero/core/threading" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/threading" + "github.com/zeromicro/go-zero/core/timex" ) const drainWorkers = 8 diff --git a/core/collection/timingwheel_test.go b/core/collection/timingwheel_test.go index 6cd9aabe..93e669b2 100644 --- a/core/collection/timingwheel_test.go +++ b/core/collection/timingwheel_test.go @@ -8,10 +8,10 @@ import ( "time" "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" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/timex" ) const ( diff --git a/core/conf/config.go b/core/conf/config.go index 88d0fa5e..d39739b9 100644 --- a/core/conf/config.go +++ b/core/conf/config.go @@ -7,7 +7,7 @@ import ( "os" "path" - "github.com/tal-tech/go-zero/core/mapping" + "github.com/zeromicro/go-zero/core/mapping" ) var loaders = map[string]func([]byte, interface{}) error{ diff --git a/core/conf/config_test.go b/core/conf/config_test.go index f0767e9f..5c9bf63a 100644 --- a/core/conf/config_test.go +++ b/core/conf/config_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/fs" - "github.com/tal-tech/go-zero/core/hash" + "github.com/zeromicro/go-zero/core/fs" + "github.com/zeromicro/go-zero/core/hash" ) func TestLoadConfig_notExists(t *testing.T) { diff --git a/core/conf/properties.go b/core/conf/properties.go index b344039a..2b7c1314 100644 --- a/core/conf/properties.go +++ b/core/conf/properties.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/tal-tech/go-zero/core/iox" + "github.com/zeromicro/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 2c8fd100..8d7ba0e2 100644 --- a/core/conf/properties_test.go +++ b/core/conf/properties_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/fs" + "github.com/zeromicro/go-zero/core/fs" ) func TestProperties(t *testing.T) { diff --git a/core/contextx/unmarshaler.go b/core/contextx/unmarshaler.go index ab1e884d..51a40548 100644 --- a/core/contextx/unmarshaler.go +++ b/core/contextx/unmarshaler.go @@ -3,7 +3,7 @@ package contextx import ( "context" - "github.com/tal-tech/go-zero/core/mapping" + "github.com/zeromicro/go-zero/core/mapping" ) const contextTagKey = "ctx" diff --git a/core/discov/accountregistry.go b/core/discov/accountregistry.go index 0e102624..9c07e5e7 100644 --- a/core/discov/accountregistry.go +++ b/core/discov/accountregistry.go @@ -1,6 +1,6 @@ package discov -import "github.com/tal-tech/go-zero/core/discov/internal" +import "github.com/zeromicro/go-zero/core/discov/internal" // RegisterAccount registers the username/password to the given etcd cluster. func RegisterAccount(endpoints []string, user, pass string) { diff --git a/core/discov/accountregistry_test.go b/core/discov/accountregistry_test.go index 1b2cceae..375b6aad 100644 --- a/core/discov/accountregistry_test.go +++ b/core/discov/accountregistry_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/discov/internal" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/discov/internal" + "github.com/zeromicro/go-zero/core/stringx" ) func TestRegisterAccount(t *testing.T) { diff --git a/core/discov/clients.go b/core/discov/clients.go index 229abdcc..59619d9a 100644 --- a/core/discov/clients.go +++ b/core/discov/clients.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/tal-tech/go-zero/core/discov/internal" + "github.com/zeromicro/go-zero/core/discov/internal" ) const ( diff --git a/core/discov/clients_test.go b/core/discov/clients_test.go index 132a8824..029e1ab8 100644 --- a/core/discov/clients_test.go +++ b/core/discov/clients_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/discov/internal" + "github.com/zeromicro/go-zero/core/discov/internal" ) var mockLock sync.Mutex diff --git a/core/discov/internal/accountmanager_test.go b/core/discov/internal/accountmanager_test.go index 9d57b526..bd367ef9 100644 --- a/core/discov/internal/accountmanager_test.go +++ b/core/discov/internal/accountmanager_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/stringx" ) func TestAccount(t *testing.T) { diff --git a/core/discov/internal/registry.go b/core/discov/internal/registry.go index c7d6a02a..77949e2e 100644 --- a/core/discov/internal/registry.go +++ b/core/discov/internal/registry.go @@ -9,11 +9,11 @@ import ( "sync" "time" - "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" + "github.com/zeromicro/go-zero/core/contextx" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/threading" clientv3 "go.etcd.io/etcd/client/v3" ) diff --git a/core/discov/internal/registry_test.go b/core/discov/internal/registry_test.go index 21def4d6..8d35c703 100644 --- a/core/discov/internal/registry_test.go +++ b/core/discov/internal/registry_test.go @@ -7,10 +7,10 @@ import ( "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/lang" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/contextx" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stringx" "go.etcd.io/etcd/api/v3/mvccpb" clientv3 "go.etcd.io/etcd/client/v3" ) diff --git a/core/discov/publisher.go b/core/discov/publisher.go index 8081e350..f6ccfa21 100644 --- a/core/discov/publisher.go +++ b/core/discov/publisher.go @@ -1,12 +1,12 @@ package discov import ( - "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" + "github.com/zeromicro/go-zero/core/discov/internal" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/proc" + "github.com/zeromicro/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/threading" clientv3 "go.etcd.io/etcd/client/v3" ) diff --git a/core/discov/publisher_test.go b/core/discov/publisher_test.go index 9ce68622..fd8aaabb 100644 --- a/core/discov/publisher_test.go +++ b/core/discov/publisher_test.go @@ -8,10 +8,10 @@ import ( "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/lang" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/discov/internal" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stringx" clientv3 "go.etcd.io/etcd/client/v3" ) diff --git a/core/discov/subscriber.go b/core/discov/subscriber.go index 5eae8449..3a38a4c1 100644 --- a/core/discov/subscriber.go +++ b/core/discov/subscriber.go @@ -4,9 +4,9 @@ import ( "sync" "sync/atomic" - "github.com/tal-tech/go-zero/core/discov/internal" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/discov/internal" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/syncx" ) type ( diff --git a/core/discov/subscriber_test.go b/core/discov/subscriber_test.go index f0e71b06..6dce7cec 100644 --- a/core/discov/subscriber_test.go +++ b/core/discov/subscriber_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/discov/internal" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/discov/internal" + "github.com/zeromicro/go-zero/core/stringx" ) const ( diff --git a/core/executors/delayexecutor.go b/core/executors/delayexecutor.go index b0e9d968..24683e47 100644 --- a/core/executors/delayexecutor.go +++ b/core/executors/delayexecutor.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/core/threading" + "github.com/zeromicro/go-zero/core/threading" ) // A DelayExecutor delays a tasks on given delay interval. diff --git a/core/executors/lessexecutor.go b/core/executors/lessexecutor.go index 3584ebb7..7c9fb978 100644 --- a/core/executors/lessexecutor.go +++ b/core/executors/lessexecutor.go @@ -3,8 +3,8 @@ package executors import ( "time" - "github.com/tal-tech/go-zero/core/syncx" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/timex" ) // A LessExecutor is an executor to limit execution once within given time interval. diff --git a/core/executors/lessexecutor_test.go b/core/executors/lessexecutor_test.go index ed4e00a7..69fee971 100644 --- a/core/executors/lessexecutor_test.go +++ b/core/executors/lessexecutor_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/timex" ) func TestLessExecutor_DoOrDiscard(t *testing.T) { diff --git a/core/executors/periodicalexecutor.go b/core/executors/periodicalexecutor.go index 20488283..db0ccd82 100644 --- a/core/executors/periodicalexecutor.go +++ b/core/executors/periodicalexecutor.go @@ -6,11 +6,11 @@ import ( "sync/atomic" "time" - "github.com/tal-tech/go-zero/core/lang" - "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" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/proc" + "github.com/zeromicro/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/threading" + "github.com/zeromicro/go-zero/core/timex" ) const idleRound = 10 diff --git a/core/executors/periodicalexecutor_test.go b/core/executors/periodicalexecutor_test.go index d2ba21ae..46197003 100644 --- a/core/executors/periodicalexecutor_test.go +++ b/core/executors/periodicalexecutor_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/timex" ) const threshold = 10 diff --git a/core/filex/file_test.go b/core/filex/file_test.go index 2e2113ae..ed773d91 100644 --- a/core/filex/file_test.go +++ b/core/filex/file_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/fs" + "github.com/zeromicro/go-zero/core/fs" ) const ( diff --git a/core/filex/lookup_test.go b/core/filex/lookup_test.go index e2da536c..46afcd18 100644 --- a/core/filex/lookup_test.go +++ b/core/filex/lookup_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/fs" + "github.com/zeromicro/go-zero/core/fs" ) func TestSplitLineChunks(t *testing.T) { diff --git a/core/filex/rangereader_test.go b/core/filex/rangereader_test.go index 229ef14d..2a8563ac 100644 --- a/core/filex/rangereader_test.go +++ b/core/filex/rangereader_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/fs" + "github.com/zeromicro/go-zero/core/fs" ) func TestRangeReader(t *testing.T) { diff --git a/core/fs/temps.go b/core/fs/temps.go index c15419f4..796875bc 100644 --- a/core/fs/temps.go +++ b/core/fs/temps.go @@ -4,7 +4,7 @@ import ( "io/ioutil" "os" - "github.com/tal-tech/go-zero/core/hash" + "github.com/zeromicro/go-zero/core/hash" ) // TempFileWithText creates the temporary file with the given content, diff --git a/core/fx/parallel.go b/core/fx/parallel.go index d7146284..d5b17358 100644 --- a/core/fx/parallel.go +++ b/core/fx/parallel.go @@ -1,6 +1,6 @@ package fx -import "github.com/tal-tech/go-zero/core/threading" +import "github.com/zeromicro/go-zero/core/threading" // Parallel runs fns parallelly and waits for done. func Parallel(fns ...func()) { diff --git a/core/fx/retry.go b/core/fx/retry.go index b9d9aaff..2e1bda8c 100644 --- a/core/fx/retry.go +++ b/core/fx/retry.go @@ -1,6 +1,6 @@ package fx -import "github.com/tal-tech/go-zero/core/errorx" +import "github.com/zeromicro/go-zero/core/errorx" const defaultRetryTimes = 3 diff --git a/core/fx/stream.go b/core/fx/stream.go index 2f4056b1..4d791b52 100644 --- a/core/fx/stream.go +++ b/core/fx/stream.go @@ -4,9 +4,9 @@ import ( "sort" "sync" - "github.com/tal-tech/go-zero/core/collection" - "github.com/tal-tech/go-zero/core/lang" - "github.com/tal-tech/go-zero/core/threading" + "github.com/zeromicro/go-zero/core/collection" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/threading" ) const ( diff --git a/core/fx/stream_test.go b/core/fx/stream_test.go index 3f5bbe5b..3eecae65 100644 --- a/core/fx/stream_test.go +++ b/core/fx/stream_test.go @@ -13,7 +13,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/stringx" ) func TestBuffer(t *testing.T) { diff --git a/core/hash/consistenthash.go b/core/hash/consistenthash.go index 13f386b1..0adf3b9e 100644 --- a/core/hash/consistenthash.go +++ b/core/hash/consistenthash.go @@ -6,8 +6,8 @@ import ( "strconv" "sync" - "github.com/tal-tech/go-zero/core/lang" - "github.com/tal-tech/go-zero/core/mapping" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/mapping" ) const ( diff --git a/core/hash/consistenthash_test.go b/core/hash/consistenthash_test.go index 8d36366e..749dff06 100644 --- a/core/hash/consistenthash_test.go +++ b/core/hash/consistenthash_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/mathx" + "github.com/zeromicro/go-zero/core/mathx" ) const ( diff --git a/core/iox/read_test.go b/core/iox/read_test.go index 686bd979..4576d207 100644 --- a/core/iox/read_test.go +++ b/core/iox/read_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/fs" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/fs" + "github.com/zeromicro/go-zero/core/stringx" ) func TestReadText(t *testing.T) { diff --git a/core/limit/periodlimit.go b/core/limit/periodlimit.go index 21260c96..1dca26c0 100644 --- a/core/limit/periodlimit.go +++ b/core/limit/periodlimit.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/tal-tech/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/stores/redis" ) const ( diff --git a/core/limit/periodlimit_test.go b/core/limit/periodlimit_test.go index ba5c7fa8..0b8dfa32 100644 --- a/core/limit/periodlimit_test.go +++ b/core/limit/periodlimit_test.go @@ -5,8 +5,8 @@ import ( "github.com/alicebob/miniredis/v2" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stores/redis" - "github.com/tal-tech/go-zero/core/stores/redis/redistest" + "github.com/zeromicro/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/stores/redis/redistest" ) func TestPeriodLimit_Take(t *testing.T) { diff --git a/core/limit/tokenlimit.go b/core/limit/tokenlimit.go index 0ec92f12..a41a6090 100644 --- a/core/limit/tokenlimit.go +++ b/core/limit/tokenlimit.go @@ -7,8 +7,8 @@ import ( "sync/atomic" "time" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/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 e3b7bb35..c0bd6a38 100644 --- a/core/limit/tokenlimit_test.go +++ b/core/limit/tokenlimit_test.go @@ -6,9 +6,9 @@ import ( "github.com/alicebob/miniredis/v2" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stores/redis" - "github.com/tal-tech/go-zero/core/stores/redis/redistest" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/stores/redis/redistest" ) func init() { diff --git a/core/load/adaptiveshedder.go b/core/load/adaptiveshedder.go index c0c14481..c25743b9 100644 --- a/core/load/adaptiveshedder.go +++ b/core/load/adaptiveshedder.go @@ -7,11 +7,11 @@ import ( "sync/atomic" "time" - "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" + "github.com/zeromicro/go-zero/core/collection" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/timex" ) const ( diff --git a/core/load/adaptiveshedder_test.go b/core/load/adaptiveshedder_test.go index 212bcb6f..cb711bbe 100644 --- a/core/load/adaptiveshedder_test.go +++ b/core/load/adaptiveshedder_test.go @@ -8,11 +8,11 @@ import ( "time" "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" + "github.com/zeromicro/go-zero/core/collection" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/mathx" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/syncx" ) const ( diff --git a/core/load/sheddergroup.go b/core/load/sheddergroup.go index 12fcf6d6..c3d62402 100644 --- a/core/load/sheddergroup.go +++ b/core/load/sheddergroup.go @@ -3,7 +3,7 @@ package load import ( "io" - "github.com/tal-tech/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/syncx" ) // A ShedderGroup is a manager to manage key based shedders. diff --git a/core/load/sheddingstat.go b/core/load/sheddingstat.go index 09ec462d..7d816d55 100644 --- a/core/load/sheddingstat.go +++ b/core/load/sheddingstat.go @@ -4,8 +4,8 @@ import ( "sync/atomic" "time" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stat" ) type ( diff --git a/core/logx/durationlogger.go b/core/logx/durationlogger.go index d4a2447c..92df85fc 100644 --- a/core/logx/durationlogger.go +++ b/core/logx/durationlogger.go @@ -5,7 +5,7 @@ import ( "io" "time" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/timex" ) const durationCallerDepth = 3 diff --git a/core/logx/limitedexecutor.go b/core/logx/limitedexecutor.go index e9956657..2418b783 100644 --- a/core/logx/limitedexecutor.go +++ b/core/logx/limitedexecutor.go @@ -4,8 +4,8 @@ import ( "sync/atomic" "time" - "github.com/tal-tech/go-zero/core/syncx" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/timex" ) type limitedExecutor struct { diff --git a/core/logx/limitedexecutor_test.go b/core/logx/limitedexecutor_test.go index 80615bda..741808d3 100644 --- a/core/logx/limitedexecutor_test.go +++ b/core/logx/limitedexecutor_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/timex" ) func TestLimitedExecutor_logOrDiscard(t *testing.T) { diff --git a/core/logx/logs.go b/core/logx/logs.go index d3abc073..de3f7c5b 100644 --- a/core/logx/logs.go +++ b/core/logx/logs.go @@ -17,9 +17,9 @@ import ( "sync/atomic" "time" - "github.com/tal-tech/go-zero/core/iox" - "github.com/tal-tech/go-zero/core/sysx" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/iox" + "github.com/zeromicro/go-zero/core/sysx" + "github.com/zeromicro/go-zero/core/timex" ) const ( diff --git a/core/logx/rotatelogger.go b/core/logx/rotatelogger.go index f7a4bfe0..ef86e507 100644 --- a/core/logx/rotatelogger.go +++ b/core/logx/rotatelogger.go @@ -13,9 +13,9 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/core/fs" - "github.com/tal-tech/go-zero/core/lang" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/fs" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/timex" ) const ( diff --git a/core/logx/rotatelogger_test.go b/core/logx/rotatelogger_test.go index 15862bdc..b09d148f 100644 --- a/core/logx/rotatelogger_test.go +++ b/core/logx/rotatelogger_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/fs" + "github.com/zeromicro/go-zero/core/fs" ) func TestDailyRotateRuleMarkRotated(t *testing.T) { diff --git a/core/logx/tracelogger.go b/core/logx/tracelogger.go index 21b1628c..53c4ef47 100644 --- a/core/logx/tracelogger.go +++ b/core/logx/tracelogger.go @@ -6,7 +6,7 @@ import ( "io" "time" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/timex" "go.opentelemetry.io/otel/trace" ) diff --git a/core/mapping/jsonunmarshaler.go b/core/mapping/jsonunmarshaler.go index 7dfeb653..ce698830 100644 --- a/core/mapping/jsonunmarshaler.go +++ b/core/mapping/jsonunmarshaler.go @@ -3,7 +3,7 @@ package mapping import ( "io" - "github.com/tal-tech/go-zero/core/jsonx" + "github.com/zeromicro/go-zero/core/jsonx" ) const jsonTagKey = "json" diff --git a/core/mapping/unmarshaler.go b/core/mapping/unmarshaler.go index 4fe701b4..c2fefcea 100644 --- a/core/mapping/unmarshaler.go +++ b/core/mapping/unmarshaler.go @@ -9,9 +9,9 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/core/jsonx" - "github.com/tal-tech/go-zero/core/lang" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/jsonx" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/stringx" ) const ( diff --git a/core/mapping/unmarshaler_test.go b/core/mapping/unmarshaler_test.go index 6c261887..767dc0d7 100644 --- a/core/mapping/unmarshaler_test.go +++ b/core/mapping/unmarshaler_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/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 35a8a38a..ad336cbc 100644 --- a/core/mapping/utils.go +++ b/core/mapping/utils.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/stringx" ) const ( diff --git a/core/mathx/int_test.go b/core/mathx/int_test.go index a5e1e76f..214b8d61 100644 --- a/core/mathx/int_test.go +++ b/core/mathx/int_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/stringx" ) func TestMaxInt(t *testing.T) { diff --git a/core/metric/counter.go b/core/metric/counter.go index aecbe373..5344773c 100644 --- a/core/metric/counter.go +++ b/core/metric/counter.go @@ -2,7 +2,7 @@ package metric import ( prom "github.com/prometheus/client_golang/prometheus" - "github.com/tal-tech/go-zero/core/proc" + "github.com/zeromicro/go-zero/core/proc" ) type ( diff --git a/core/metric/gauge.go b/core/metric/gauge.go index 01fbfe80..b4452983 100644 --- a/core/metric/gauge.go +++ b/core/metric/gauge.go @@ -2,7 +2,7 @@ package metric import ( prom "github.com/prometheus/client_golang/prometheus" - "github.com/tal-tech/go-zero/core/proc" + "github.com/zeromicro/go-zero/core/proc" ) type ( diff --git a/core/metric/histogram.go b/core/metric/histogram.go index 59513db8..2053f6bb 100644 --- a/core/metric/histogram.go +++ b/core/metric/histogram.go @@ -2,7 +2,7 @@ package metric import ( prom "github.com/prometheus/client_golang/prometheus" - "github.com/tal-tech/go-zero/core/proc" + "github.com/zeromicro/go-zero/core/proc" ) type ( diff --git a/core/mr/mapreduce.go b/core/mr/mapreduce.go index a6b2464e..c12e6330 100644 --- a/core/mr/mapreduce.go +++ b/core/mr/mapreduce.go @@ -6,9 +6,9 @@ import ( "fmt" "sync" - "github.com/tal-tech/go-zero/core/errorx" - "github.com/tal-tech/go-zero/core/lang" - "github.com/tal-tech/go-zero/core/threading" + "github.com/zeromicro/go-zero/core/errorx" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/threading" ) const ( diff --git a/core/mr/mapreduce_test.go b/core/mr/mapreduce_test.go index da61b4c5..a9f6b4ff 100644 --- a/core/mr/mapreduce_test.go +++ b/core/mr/mapreduce_test.go @@ -11,8 +11,8 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stringx" - "github.com/tal-tech/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/syncx" ) var errDummy = errors.New("dummy") diff --git a/core/proc/goroutines.go b/core/proc/goroutines.go index 0f4a283b..99f356b8 100644 --- a/core/proc/goroutines.go +++ b/core/proc/goroutines.go @@ -11,7 +11,7 @@ import ( "syscall" "time" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) const ( diff --git a/core/proc/profile.go b/core/proc/profile.go index 4b4a862b..b0fd1c54 100644 --- a/core/proc/profile.go +++ b/core/proc/profile.go @@ -15,7 +15,7 @@ import ( "syscall" "time" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) // DefaultMemProfileRate is the default memory profiling rate. diff --git a/core/proc/shutdown.go b/core/proc/shutdown.go index 27285c64..11372b45 100644 --- a/core/proc/shutdown.go +++ b/core/proc/shutdown.go @@ -10,8 +10,8 @@ import ( "syscall" "time" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/threading" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/threading" ) const ( diff --git a/core/proc/signals.go b/core/proc/signals.go index 80ef4bdc..437cbcf5 100644 --- a/core/proc/signals.go +++ b/core/proc/signals.go @@ -8,7 +8,7 @@ import ( "os/signal" "syscall" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) const timeFormat = "0102150405" diff --git a/core/prof/profilecenter.go b/core/prof/profilecenter.go index 17f1b356..8b03fd21 100644 --- a/core/prof/profilecenter.go +++ b/core/prof/profilecenter.go @@ -8,8 +8,8 @@ import ( "time" "github.com/olekukonko/tablewriter" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/threading" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/threading" ) type ( diff --git a/core/prof/profiler.go b/core/prof/profiler.go index 37795dd1..5900da28 100644 --- a/core/prof/profiler.go +++ b/core/prof/profiler.go @@ -1,6 +1,6 @@ package prof -import "github.com/tal-tech/go-zero/core/utils" +import "github.com/zeromicro/go-zero/core/utils" type ( // A ProfilePoint is a profile time point. diff --git a/core/prof/profiler_test.go b/core/prof/profiler_test.go index 617abdc7..81f0dd7e 100644 --- a/core/prof/profiler_test.go +++ b/core/prof/profiler_test.go @@ -3,7 +3,7 @@ package prof import ( "testing" - "github.com/tal-tech/go-zero/core/utils" + "github.com/zeromicro/go-zero/core/utils" ) func TestProfiler(t *testing.T) { diff --git a/core/prometheus/agent.go b/core/prometheus/agent.go index 1a294c88..853abe93 100644 --- a/core/prometheus/agent.go +++ b/core/prometheus/agent.go @@ -6,9 +6,9 @@ import ( "sync" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/syncx" - "github.com/tal-tech/go-zero/core/threading" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/threading" ) var ( diff --git a/core/queue/balancedpusher.go b/core/queue/balancedpusher.go index fd29dfab..3d3d0ed1 100644 --- a/core/queue/balancedpusher.go +++ b/core/queue/balancedpusher.go @@ -4,7 +4,7 @@ import ( "errors" "sync/atomic" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) // ErrNoAvailablePusher indicates no pusher available. diff --git a/core/queue/multipusher.go b/core/queue/multipusher.go index fcff873b..e51b4286 100644 --- a/core/queue/multipusher.go +++ b/core/queue/multipusher.go @@ -1,6 +1,6 @@ package queue -import "github.com/tal-tech/go-zero/core/errorx" +import "github.com/zeromicro/go-zero/core/errorx" // A MultiPusher is a pusher that can push messages to multiple underlying pushers. type MultiPusher struct { diff --git a/core/queue/queue.go b/core/queue/queue.go index 250a8937..4f7817d2 100644 --- a/core/queue/queue.go +++ b/core/queue/queue.go @@ -6,11 +6,11 @@ import ( "sync/atomic" "time" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/rescue" - "github.com/tal-tech/go-zero/core/stat" - "github.com/tal-tech/go-zero/core/threading" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/rescue" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/threading" + "github.com/zeromicro/go-zero/core/timex" ) const queueName = "queue" diff --git a/core/queue/util_test.go b/core/queue/util_test.go index 44846848..f578c364 100644 --- a/core/queue/util_test.go +++ b/core/queue/util_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/mathx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/mathx" ) var ( diff --git a/core/rescue/recover.go b/core/rescue/recover.go index 34b9feb5..f7c7d6b9 100644 --- a/core/rescue/recover.go +++ b/core/rescue/recover.go @@ -1,6 +1,6 @@ package rescue -import "github.com/tal-tech/go-zero/core/logx" +import "github.com/zeromicro/go-zero/core/logx" // Recover is used with defer to do cleanup on panics. // Use it like: diff --git a/core/rescue/recover_test.go b/core/rescue/recover_test.go index 9ca94368..fa4cd33c 100644 --- a/core/rescue/recover_test.go +++ b/core/rescue/recover_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) func init() { diff --git a/core/search/tree_test.go b/core/search/tree_test.go index 315bef9e..3f711e76 100644 --- a/core/search/tree_test.go +++ b/core/search/tree_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/stringx" ) type mockedRoute struct { diff --git a/core/service/serviceconf.go b/core/service/serviceconf.go index 577b0663..51fcd605 100644 --- a/core/service/serviceconf.go +++ b/core/service/serviceconf.go @@ -3,11 +3,11 @@ package service import ( "log" - "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" - "github.com/tal-tech/go-zero/core/trace" + "github.com/zeromicro/go-zero/core/load" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/prometheus" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/trace" ) const ( diff --git a/core/service/serviceconf_test.go b/core/service/serviceconf_test.go index 63b4395e..5af0d06f 100644 --- a/core/service/serviceconf_test.go +++ b/core/service/serviceconf_test.go @@ -3,7 +3,7 @@ package service import ( "testing" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) func TestServiceConf(t *testing.T) { diff --git a/core/service/servicegroup.go b/core/service/servicegroup.go index 984a0eff..a71f8dd7 100644 --- a/core/service/servicegroup.go +++ b/core/service/servicegroup.go @@ -3,9 +3,9 @@ package service import ( "log" - "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/zeromicro/go-zero/core/proc" + "github.com/zeromicro/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/threading" ) type ( diff --git a/core/stat/alert.go b/core/stat/alert.go index bb4bd7c6..9696bf83 100644 --- a/core/stat/alert.go +++ b/core/stat/alert.go @@ -11,11 +11,11 @@ import ( "sync/atomic" "time" - "github.com/tal-tech/go-zero/core/executors" - "github.com/tal-tech/go-zero/core/logx" - "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/zeromicro/go-zero/core/executors" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/proc" + "github.com/zeromicro/go-zero/core/sysx" + "github.com/zeromicro/go-zero/core/timex" ) const ( diff --git a/core/stat/internal/cgroup_linux.go b/core/stat/internal/cgroup_linux.go index f7de44a0..c710561a 100644 --- a/core/stat/internal/cgroup_linux.go +++ b/core/stat/internal/cgroup_linux.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/tal-tech/go-zero/core/iox" - "github.com/tal-tech/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/iox" + "github.com/zeromicro/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 9f23a420..859a066b 100644 --- a/core/stat/internal/cpu_linux.go +++ b/core/stat/internal/cpu_linux.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/tal-tech/go-zero/core/iox" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/iox" + "github.com/zeromicro/go-zero/core/logx" ) const ( diff --git a/core/stat/metrics.go b/core/stat/metrics.go index f3c8b430..e565268a 100644 --- a/core/stat/metrics.go +++ b/core/stat/metrics.go @@ -5,9 +5,9 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/core/executors" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/executors" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/syncx" ) var ( diff --git a/core/stat/metrics_test.go b/core/stat/metrics_test.go index 4da547ed..1f11a21b 100644 --- a/core/stat/metrics_test.go +++ b/core/stat/metrics_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) func TestMetrics(t *testing.T) { diff --git a/core/stat/remotewriter.go b/core/stat/remotewriter.go index a4c5ba71..65469ea1 100644 --- a/core/stat/remotewriter.go +++ b/core/stat/remotewriter.go @@ -7,7 +7,7 @@ import ( "net/http" "time" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) const httpTimeout = time.Second * 5 diff --git a/core/stat/usage.go b/core/stat/usage.go index 251cd4da..40936604 100644 --- a/core/stat/usage.go +++ b/core/stat/usage.go @@ -5,9 +5,9 @@ import ( "sync/atomic" "time" - "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" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stat/internal" + "github.com/zeromicro/go-zero/core/threading" ) const ( diff --git a/core/stores/cache/cache.go b/core/stores/cache/cache.go index 3c5f472d..fe3fc8dd 100644 --- a/core/stores/cache/cache.go +++ b/core/stores/cache/cache.go @@ -5,9 +5,9 @@ import ( "log" "time" - "github.com/tal-tech/go-zero/core/errorx" - "github.com/tal-tech/go-zero/core/hash" - "github.com/tal-tech/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/errorx" + "github.com/zeromicro/go-zero/core/hash" + "github.com/zeromicro/go-zero/core/syncx" ) type ( diff --git a/core/stores/cache/cache_test.go b/core/stores/cache/cache_test.go index 55ad297b..12c6e281 100644 --- a/core/stores/cache/cache_test.go +++ b/core/stores/cache/cache_test.go @@ -9,11 +9,11 @@ import ( "time" "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/stores/redis/redistest" - "github.com/tal-tech/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/errorx" + "github.com/zeromicro/go-zero/core/hash" + "github.com/zeromicro/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/stores/redis/redistest" + "github.com/zeromicro/go-zero/core/syncx" ) type mockedNode struct { diff --git a/core/stores/cache/cachenode.go b/core/stores/cache/cachenode.go index 35ea205f..49904071 100644 --- a/core/stores/cache/cachenode.go +++ b/core/stores/cache/cachenode.go @@ -7,12 +7,12 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/core/jsonx" - "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" + "github.com/zeromicro/go-zero/core/jsonx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/mathx" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/syncx" ) const ( diff --git a/core/stores/cache/cachenode_test.go b/core/stores/cache/cachenode_test.go index 9fd8d232..db8cc54b 100644 --- a/core/stores/cache/cachenode_test.go +++ b/core/stores/cache/cachenode_test.go @@ -11,12 +11,12 @@ import ( "github.com/alicebob/miniredis/v2" "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" - "github.com/tal-tech/go-zero/core/stores/redis/redistest" - "github.com/tal-tech/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/mathx" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/stores/redis/redistest" + "github.com/zeromicro/go-zero/core/syncx" ) var errTestNotFound = errors.New("not found") diff --git a/core/stores/cache/cachestat.go b/core/stores/cache/cachestat.go index 67eb68f3..24eb26af 100644 --- a/core/stores/cache/cachestat.go +++ b/core/stores/cache/cachestat.go @@ -4,7 +4,7 @@ import ( "sync/atomic" "time" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) const statInterval = time.Minute diff --git a/core/stores/cache/cleaner.go b/core/stores/cache/cleaner.go index 09ac7175..ce95ecc2 100644 --- a/core/stores/cache/cleaner.go +++ b/core/stores/cache/cleaner.go @@ -4,12 +4,12 @@ import ( "fmt" "time" - "github.com/tal-tech/go-zero/core/collection" - "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" + "github.com/zeromicro/go-zero/core/collection" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/proc" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/threading" ) const ( diff --git a/core/stores/cache/config.go b/core/stores/cache/config.go index ca4cf30f..ba2bf155 100644 --- a/core/stores/cache/config.go +++ b/core/stores/cache/config.go @@ -1,6 +1,6 @@ package cache -import "github.com/tal-tech/go-zero/core/stores/redis" +import "github.com/zeromicro/go-zero/core/stores/redis" type ( // A ClusterConf is the config of a redis cluster that used as cache. diff --git a/core/stores/clickhouse/clickhouse.go b/core/stores/clickhouse/clickhouse.go index af997f9c..451e97f8 100644 --- a/core/stores/clickhouse/clickhouse.go +++ b/core/stores/clickhouse/clickhouse.go @@ -3,7 +3,7 @@ package clickhouse import ( // imports the driver, don't remove this comment, golint requires. _ "github.com/ClickHouse/clickhouse-go" - "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) const clickHouseDriverName = "clickhouse" diff --git a/core/stores/kv/config.go b/core/stores/kv/config.go index e6a3a324..eae4ed30 100644 --- a/core/stores/kv/config.go +++ b/core/stores/kv/config.go @@ -1,6 +1,6 @@ package kv -import "github.com/tal-tech/go-zero/core/stores/cache" +import "github.com/zeromicro/go-zero/core/stores/cache" // KvConf is an alias of cache.ClusterConf. type KvConf = cache.ClusterConf diff --git a/core/stores/kv/store.go b/core/stores/kv/store.go index 882dd1e0..603f14a6 100644 --- a/core/stores/kv/store.go +++ b/core/stores/kv/store.go @@ -4,10 +4,10 @@ import ( "errors" "log" - "github.com/tal-tech/go-zero/core/errorx" - "github.com/tal-tech/go-zero/core/hash" - "github.com/tal-tech/go-zero/core/stores/cache" - "github.com/tal-tech/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/errorx" + "github.com/zeromicro/go-zero/core/hash" + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/redis" ) // ErrNoRedisNode is an error that indicates no redis node. diff --git a/core/stores/kv/store_test.go b/core/stores/kv/store_test.go index ee7cd047..0a8f44d2 100644 --- a/core/stores/kv/store_test.go +++ b/core/stores/kv/store_test.go @@ -6,10 +6,10 @@ import ( "github.com/alicebob/miniredis/v2" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/hash" - "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/stringx" + "github.com/zeromicro/go-zero/core/hash" + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/stringx" ) var ( diff --git a/core/stores/mongo/bulkinserter.go b/core/stores/mongo/bulkinserter.go index 9791fc9b..6a8785d4 100644 --- a/core/stores/mongo/bulkinserter.go +++ b/core/stores/mongo/bulkinserter.go @@ -4,8 +4,8 @@ import ( "time" "github.com/globalsign/mgo" - "github.com/tal-tech/go-zero/core/executors" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/executors" + "github.com/zeromicro/go-zero/core/logx" ) const ( diff --git a/core/stores/mongo/collection.go b/core/stores/mongo/collection.go index 032289ac..2ba96a70 100644 --- a/core/stores/mongo/collection.go +++ b/core/stores/mongo/collection.go @@ -5,10 +5,10 @@ import ( "time" "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/stores/mongo/internal" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/breaker" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stores/mongo/internal" + "github.com/zeromicro/go-zero/core/timex" ) const defaultSlowThreshold = time.Millisecond * 500 diff --git a/core/stores/mongo/collection_test.go b/core/stores/mongo/collection_test.go index ddf452c3..042a8382 100644 --- a/core/stores/mongo/collection_test.go +++ b/core/stores/mongo/collection_test.go @@ -7,10 +7,10 @@ import ( "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/logx" - "github.com/tal-tech/go-zero/core/stores/mongo/internal" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/breaker" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stores/mongo/internal" + "github.com/zeromicro/go-zero/core/stringx" ) var errDummy = errors.New("dummy") diff --git a/core/stores/mongo/iter.go b/core/stores/mongo/iter.go index 544d8c1d..10909b80 100644 --- a/core/stores/mongo/iter.go +++ b/core/stores/mongo/iter.go @@ -4,7 +4,7 @@ package mongo import ( "github.com/globalsign/mgo/bson" - "github.com/tal-tech/go-zero/core/breaker" + "github.com/zeromicro/go-zero/core/breaker" ) type ( diff --git a/core/stores/mongo/iter_test.go b/core/stores/mongo/iter_test.go index 95c313d7..c96c2ef5 100644 --- a/core/stores/mongo/iter_test.go +++ b/core/stores/mongo/iter_test.go @@ -7,9 +7,9 @@ import ( "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" + "github.com/zeromicro/go-zero/core/breaker" + "github.com/zeromicro/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/syncx" ) func TestClosableIter_Close(t *testing.T) { diff --git a/core/stores/mongo/model.go b/core/stores/mongo/model.go index a13c1213..45f41cd7 100644 --- a/core/stores/mongo/model.go +++ b/core/stores/mongo/model.go @@ -5,7 +5,7 @@ import ( "time" "github.com/globalsign/mgo" - "github.com/tal-tech/go-zero/core/breaker" + "github.com/zeromicro/go-zero/core/breaker" ) // A Model is a mongo model. diff --git a/core/stores/mongo/options.go b/core/stores/mongo/options.go index 50313e85..2143282a 100644 --- a/core/stores/mongo/options.go +++ b/core/stores/mongo/options.go @@ -3,7 +3,7 @@ package mongo import ( "time" - "github.com/tal-tech/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/syncx" ) var slowThreshold = syncx.ForAtomicDuration(defaultSlowThreshold) diff --git a/core/stores/mongo/pipe.go b/core/stores/mongo/pipe.go index 98ddc930..07601f65 100644 --- a/core/stores/mongo/pipe.go +++ b/core/stores/mongo/pipe.go @@ -4,7 +4,7 @@ import ( "time" "github.com/globalsign/mgo" - "github.com/tal-tech/go-zero/core/breaker" + "github.com/zeromicro/go-zero/core/breaker" ) type ( diff --git a/core/stores/mongo/pipe_test.go b/core/stores/mongo/pipe_test.go index ec892a48..b3d56f97 100644 --- a/core/stores/mongo/pipe_test.go +++ b/core/stores/mongo/pipe_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/breaker" + "github.com/zeromicro/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 b7e4077d..eabf4e1b 100644 --- a/core/stores/mongo/query.go +++ b/core/stores/mongo/query.go @@ -4,7 +4,7 @@ import ( "time" "github.com/globalsign/mgo" - "github.com/tal-tech/go-zero/core/breaker" + "github.com/zeromicro/go-zero/core/breaker" ) type ( diff --git a/core/stores/mongo/query_test.go b/core/stores/mongo/query_test.go index 1db5909e..83a58007 100644 --- a/core/stores/mongo/query_test.go +++ b/core/stores/mongo/query_test.go @@ -5,7 +5,7 @@ import ( "github.com/globalsign/mgo" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/breaker" + "github.com/zeromicro/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 b697b68c..74a0c962 100644 --- a/core/stores/mongo/sessionmanager.go +++ b/core/stores/mongo/sessionmanager.go @@ -5,8 +5,8 @@ import ( "time" "github.com/globalsign/mgo" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/syncx" ) const ( diff --git a/core/stores/mongoc/cachedcollection.go b/core/stores/mongoc/cachedcollection.go index b8494987..49fdd203 100644 --- a/core/stores/mongoc/cachedcollection.go +++ b/core/stores/mongoc/cachedcollection.go @@ -2,9 +2,9 @@ package mongoc import ( "github.com/globalsign/mgo" - "github.com/tal-tech/go-zero/core/stores/cache" - "github.com/tal-tech/go-zero/core/stores/mongo" - "github.com/tal-tech/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/mongo" + "github.com/zeromicro/go-zero/core/syncx" ) var ( diff --git a/core/stores/mongoc/cachedcollection_test.go b/core/stores/mongoc/cachedcollection_test.go index f2363569..6f839b13 100644 --- a/core/stores/mongoc/cachedcollection_test.go +++ b/core/stores/mongoc/cachedcollection_test.go @@ -15,11 +15,11 @@ import ( "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/cache" - "github.com/tal-tech/go-zero/core/stores/mongo" - "github.com/tal-tech/go-zero/core/stores/redis" - "github.com/tal-tech/go-zero/core/stores/redis/redistest" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/mongo" + "github.com/zeromicro/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/stores/redis/redistest" ) const dummyCount = 10 diff --git a/core/stores/mongoc/cachedmodel.go b/core/stores/mongoc/cachedmodel.go index 8837139d..c366cc3c 100644 --- a/core/stores/mongoc/cachedmodel.go +++ b/core/stores/mongoc/cachedmodel.go @@ -4,9 +4,9 @@ import ( "log" "github.com/globalsign/mgo" - "github.com/tal-tech/go-zero/core/stores/cache" - "github.com/tal-tech/go-zero/core/stores/mongo" - "github.com/tal-tech/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/mongo" + "github.com/zeromicro/go-zero/core/stores/redis" ) // A Model is a mongo model that built with cache capability. diff --git a/core/stores/postgres/postgresql.go b/core/stores/postgres/postgresql.go index 3cf61b8a..48d6e3a0 100644 --- a/core/stores/postgres/postgresql.go +++ b/core/stores/postgres/postgresql.go @@ -3,7 +3,7 @@ package postgres import ( // imports the driver, don't remove this comment, golint requires. _ "github.com/lib/pq" - "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) const postgresDriverName = "postgres" diff --git a/core/stores/redis/conf_test.go b/core/stores/redis/conf_test.go index 7bdbd1f4..91bc4ebb 100644 --- a/core/stores/redis/conf_test.go +++ b/core/stores/redis/conf_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/stringx" ) func TestRedisConf(t *testing.T) { diff --git a/core/stores/redis/process.go b/core/stores/redis/process.go index 746fa3ab..479095e9 100644 --- a/core/stores/redis/process.go +++ b/core/stores/redis/process.go @@ -4,9 +4,9 @@ import ( "strings" 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" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/mapping" + "github.com/zeromicro/go-zero/core/timex" ) func checkDuration(proc func(red.Cmder) error) func(red.Cmder) error { diff --git a/core/stores/redis/redis.go b/core/stores/redis/redis.go index d6fad308..070819c0 100644 --- a/core/stores/redis/redis.go +++ b/core/stores/redis/redis.go @@ -7,9 +7,9 @@ import ( "time" red "github.com/go-redis/redis" - "github.com/tal-tech/go-zero/core/breaker" - "github.com/tal-tech/go-zero/core/mapping" - "github.com/tal-tech/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/breaker" + "github.com/zeromicro/go-zero/core/mapping" + "github.com/zeromicro/go-zero/core/syncx" ) const ( diff --git a/core/stores/redis/redis_test.go b/core/stores/redis/redis_test.go index 49aee638..eb85f419 100644 --- a/core/stores/redis/redis_test.go +++ b/core/stores/redis/redis_test.go @@ -11,7 +11,7 @@ import ( "github.com/alicebob/miniredis/v2" red "github.com/go-redis/redis" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/stringx" ) func TestRedis_Decr(t *testing.T) { diff --git a/core/stores/redis/redisblockingnode.go b/core/stores/redis/redisblockingnode.go index e6c6fa81..4594c999 100644 --- a/core/stores/redis/redisblockingnode.go +++ b/core/stores/redis/redisblockingnode.go @@ -4,7 +4,7 @@ import ( "fmt" red "github.com/go-redis/redis" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) // ClosableNode interface represents a closable redis node. diff --git a/core/stores/redis/redisclientmanager.go b/core/stores/redis/redisclientmanager.go index 5cf88c14..6ac6ac67 100644 --- a/core/stores/redis/redisclientmanager.go +++ b/core/stores/redis/redisclientmanager.go @@ -5,7 +5,7 @@ import ( "io" red "github.com/go-redis/redis" - "github.com/tal-tech/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/syncx" ) const ( diff --git a/core/stores/redis/redisclustermanager.go b/core/stores/redis/redisclustermanager.go index 19e69c43..4bf7d97f 100644 --- a/core/stores/redis/redisclustermanager.go +++ b/core/stores/redis/redisclustermanager.go @@ -5,7 +5,7 @@ import ( "io" red "github.com/go-redis/redis" - "github.com/tal-tech/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/syncx" ) var clusterManager = syncx.NewResourceManager() diff --git a/core/stores/redis/redislock.go b/core/stores/redis/redislock.go index 69077850..58711f03 100644 --- a/core/stores/redis/redislock.go +++ b/core/stores/redis/redislock.go @@ -6,8 +6,8 @@ import ( "time" red "github.com/go-redis/redis" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stringx" ) const ( diff --git a/core/stores/redis/redislock_test.go b/core/stores/redis/redislock_test.go index 2234f403..2e945f8e 100644 --- a/core/stores/redis/redislock_test.go +++ b/core/stores/redis/redislock_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/stringx" ) func TestRedisLock(t *testing.T) { diff --git a/core/stores/redis/redistest/redistest.go b/core/stores/redis/redistest/redistest.go index 09f5223f..2625e3ca 100644 --- a/core/stores/redis/redistest/redistest.go +++ b/core/stores/redis/redistest/redistest.go @@ -4,8 +4,8 @@ import ( "time" "github.com/alicebob/miniredis/v2" - "github.com/tal-tech/go-zero/core/lang" - "github.com/tal-tech/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/stores/redis" ) // CreateRedis returns a in process redis.Redis. diff --git a/core/stores/sqlc/cachedsql.go b/core/stores/sqlc/cachedsql.go index d5f1108a..3e3b3aa2 100644 --- a/core/stores/sqlc/cachedsql.go +++ b/core/stores/sqlc/cachedsql.go @@ -4,10 +4,10 @@ import ( "database/sql" "time" - "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" - "github.com/tal-tech/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/stores/sqlx" + "github.com/zeromicro/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 81a11100..3652126c 100644 --- a/core/stores/sqlc/cachedsql_test.go +++ b/core/stores/sqlc/cachedsql_test.go @@ -16,13 +16,13 @@ import ( "github.com/alicebob/miniredis/v2" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/fx" - "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/redis/redistest" - "github.com/tal-tech/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/fx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/stores/redis/redistest" + "github.com/zeromicro/go-zero/core/stores/sqlx" ) func init() { diff --git a/core/stores/sqlx/bulkinserter.go b/core/stores/sqlx/bulkinserter.go index 48c5fc71..507170f4 100644 --- a/core/stores/sqlx/bulkinserter.go +++ b/core/stores/sqlx/bulkinserter.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/tal-tech/go-zero/core/executors" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/executors" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stringx" ) const ( diff --git a/core/stores/sqlx/bulkinserter_test.go b/core/stores/sqlx/bulkinserter_test.go index 24aebb4d..7a1e1a0d 100644 --- a/core/stores/sqlx/bulkinserter_test.go +++ b/core/stores/sqlx/bulkinserter_test.go @@ -8,7 +8,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) type mockedConn struct { diff --git a/core/stores/sqlx/mysql_test.go b/core/stores/sqlx/mysql_test.go index e7027707..32d730fe 100644 --- a/core/stores/sqlx/mysql_test.go +++ b/core/stores/sqlx/mysql_test.go @@ -7,9 +7,9 @@ import ( "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" + "github.com/zeromicro/go-zero/core/breaker" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stat" ) func init() { diff --git a/core/stores/sqlx/orm.go b/core/stores/sqlx/orm.go index 933c41af..d8c51b8d 100644 --- a/core/stores/sqlx/orm.go +++ b/core/stores/sqlx/orm.go @@ -5,7 +5,7 @@ import ( "reflect" "strings" - "github.com/tal-tech/go-zero/core/mapping" + "github.com/zeromicro/go-zero/core/mapping" ) const tagName = "db" diff --git a/core/stores/sqlx/orm_test.go b/core/stores/sqlx/orm_test.go index 17bea417..2dbfa516 100644 --- a/core/stores/sqlx/orm_test.go +++ b/core/stores/sqlx/orm_test.go @@ -7,7 +7,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) func TestUnmarshalRowBool(t *testing.T) { diff --git a/core/stores/sqlx/sqlconn.go b/core/stores/sqlx/sqlconn.go index b26de8c4..9d4c529e 100644 --- a/core/stores/sqlx/sqlconn.go +++ b/core/stores/sqlx/sqlconn.go @@ -3,8 +3,8 @@ package sqlx import ( "database/sql" - "github.com/tal-tech/go-zero/core/breaker" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/breaker" + "github.com/zeromicro/go-zero/core/logx" ) // ErrNotFound is an alias of sql.ErrNoRows diff --git a/core/stores/sqlx/sqlconn_test.go b/core/stores/sqlx/sqlconn_test.go index 676aaf5f..3f2723ae 100644 --- a/core/stores/sqlx/sqlconn_test.go +++ b/core/stores/sqlx/sqlconn_test.go @@ -7,7 +7,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) const mockedDatasource = "sqlmock" diff --git a/core/stores/sqlx/sqlmanager.go b/core/stores/sqlx/sqlmanager.go index 494945a7..b2c1e169 100644 --- a/core/stores/sqlx/sqlmanager.go +++ b/core/stores/sqlx/sqlmanager.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/syncx" ) const ( diff --git a/core/stores/sqlx/stmt.go b/core/stores/sqlx/stmt.go index 87fc8c22..3cda4853 100644 --- a/core/stores/sqlx/stmt.go +++ b/core/stores/sqlx/stmt.go @@ -4,9 +4,9 @@ import ( "database/sql" "time" - "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/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/timex" ) const defaultSlowThreshold = time.Millisecond * 500 diff --git a/core/stores/sqlx/utils.go b/core/stores/sqlx/utils.go index 54408128..74faef7e 100644 --- a/core/stores/sqlx/utils.go +++ b/core/stores/sqlx/utils.go @@ -5,8 +5,8 @@ import ( "strconv" "strings" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/mapping" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/mapping" ) func desensitize(datasource string) string { diff --git a/core/stringx/strings.go b/core/stringx/strings.go index 18c8c215..384dcf5f 100644 --- a/core/stringx/strings.go +++ b/core/stringx/strings.go @@ -3,7 +3,7 @@ package stringx import ( "errors" - "github.com/tal-tech/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/lang" ) var ( diff --git a/core/stringx/trie.go b/core/stringx/trie.go index 7168c3ef..115b4c30 100644 --- a/core/stringx/trie.go +++ b/core/stringx/trie.go @@ -1,6 +1,6 @@ package stringx -import "github.com/tal-tech/go-zero/core/lang" +import "github.com/zeromicro/go-zero/core/lang" const defaultMask = '*' diff --git a/core/syncx/cond.go b/core/syncx/cond.go index e3e6368a..15dab037 100644 --- a/core/syncx/cond.go +++ b/core/syncx/cond.go @@ -3,8 +3,8 @@ package syncx import ( "time" - "github.com/tal-tech/go-zero/core/lang" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/timex" ) // A Cond is used to wait for conditions. diff --git a/core/syncx/donechan.go b/core/syncx/donechan.go index 1076460b..e444298a 100644 --- a/core/syncx/donechan.go +++ b/core/syncx/donechan.go @@ -3,7 +3,7 @@ package syncx import ( "sync" - "github.com/tal-tech/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/lang" ) // A DoneChan is used as a channel that can be closed multiple times and wait for done. diff --git a/core/syncx/immutableresource.go b/core/syncx/immutableresource.go index b607c250..facf7b26 100644 --- a/core/syncx/immutableresource.go +++ b/core/syncx/immutableresource.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/timex" ) const defaultRefreshInterval = time.Second diff --git a/core/syncx/limit.go b/core/syncx/limit.go index d36c3fc9..6dca5c86 100644 --- a/core/syncx/limit.go +++ b/core/syncx/limit.go @@ -3,7 +3,7 @@ package syncx import ( "errors" - "github.com/tal-tech/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/lang" ) // ErrLimitReturn indicates that the more than borrowed elements were returned. diff --git a/core/syncx/pool.go b/core/syncx/pool.go index 41d4a52c..d990779c 100644 --- a/core/syncx/pool.go +++ b/core/syncx/pool.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/timex" ) type ( diff --git a/core/syncx/pool_test.go b/core/syncx/pool_test.go index d59c47fd..fa4fcca7 100644 --- a/core/syncx/pool_test.go +++ b/core/syncx/pool_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/lang" ) const limit = 10 diff --git a/core/syncx/resourcemanager.go b/core/syncx/resourcemanager.go index a976cefd..84e4220c 100644 --- a/core/syncx/resourcemanager.go +++ b/core/syncx/resourcemanager.go @@ -4,7 +4,7 @@ import ( "io" "sync" - "github.com/tal-tech/go-zero/core/errorx" + "github.com/zeromicro/go-zero/core/errorx" ) // A ResourceManager is a manager that used to manage resources. diff --git a/core/syncx/spinlock_test.go b/core/syncx/spinlock_test.go index e518d02d..3f383660 100644 --- a/core/syncx/spinlock_test.go +++ b/core/syncx/spinlock_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/lang" ) func TestTryLock(t *testing.T) { diff --git a/core/sysx/host.go b/core/sysx/host.go index fd221218..a0899a8a 100644 --- a/core/sysx/host.go +++ b/core/sysx/host.go @@ -3,7 +3,7 @@ package sysx import ( "os" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/stringx" ) var hostname string diff --git a/core/threading/routines.go b/core/threading/routines.go index 4a20b364..900dcb3b 100644 --- a/core/threading/routines.go +++ b/core/threading/routines.go @@ -5,7 +5,7 @@ import ( "runtime" "strconv" - "github.com/tal-tech/go-zero/core/rescue" + "github.com/zeromicro/go-zero/core/rescue" ) // GoSafe runs the given fn using another goroutine, recovers if fn panics. diff --git a/core/threading/routines_test.go b/core/threading/routines_test.go index c3569a94..763c9ad9 100644 --- a/core/threading/routines_test.go +++ b/core/threading/routines_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/lang" ) func TestRoutineId(t *testing.T) { diff --git a/core/threading/taskrunner.go b/core/threading/taskrunner.go index 6441b386..955beeab 100644 --- a/core/threading/taskrunner.go +++ b/core/threading/taskrunner.go @@ -1,8 +1,8 @@ package threading import ( - "github.com/tal-tech/go-zero/core/lang" - "github.com/tal-tech/go-zero/core/rescue" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/rescue" ) // A TaskRunner is used to control the concurrency of goroutines. diff --git a/core/threading/workergroup_test.go b/core/threading/workergroup_test.go index 7e8a6958..48eb814d 100644 --- a/core/threading/workergroup_test.go +++ b/core/threading/workergroup_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/lang" ) func TestWorkerGroup(t *testing.T) { diff --git a/core/timex/ticker.go b/core/timex/ticker.go index cdd86d86..59b5eb9d 100644 --- a/core/timex/ticker.go +++ b/core/timex/ticker.go @@ -4,7 +4,7 @@ import ( "errors" "time" - "github.com/tal-tech/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/lang" ) type ( diff --git a/core/trace/agent.go b/core/trace/agent.go index 64d8d01d..4e1f60b6 100644 --- a/core/trace/agent.go +++ b/core/trace/agent.go @@ -4,8 +4,8 @@ import ( "fmt" "sync" - "github.com/tal-tech/go-zero/core/lang" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/logx" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/exporters/jaeger" "go.opentelemetry.io/otel/exporters/zipkin" diff --git a/core/trace/agent_test.go b/core/trace/agent_test.go index a15ad02c..018d0e3f 100644 --- a/core/trace/agent_test.go +++ b/core/trace/agent_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) func TestStartAgent(t *testing.T) { diff --git a/core/utils/times.go b/core/utils/times.go index aeec03bb..1c6ee4cc 100644 --- a/core/utils/times.go +++ b/core/utils/times.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/timex" ) // A ElapsedTimer is a timer to track the elapsed time. diff --git a/core/utils/version.go b/core/utils/version.go index ad1ded8c..67ea203f 100644 --- a/core/utils/version.go +++ b/core/utils/version.go @@ -4,8 +4,8 @@ import ( "strconv" "strings" - "github.com/tal-tech/go-zero/core/mathx" - "github.com/tal-tech/go-zero/core/stringx" + "github.com/zeromicro/go-zero/core/mathx" + "github.com/zeromicro/go-zero/core/stringx" ) var replacer = stringx.NewReplacer(map[string]string{ diff --git a/go.mod b/go.mod index 225826d8..9bb82c7c 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/tal-tech/go-zero +module github.com/zeromicro/go-zero go 1.14 diff --git a/readme-cn.md b/readme-cn.md index db30c6ff..aaea2639 100644 --- a/readme-cn.md +++ b/readme-cn.md @@ -87,7 +87,7 @@ go-zero 是一个集成了各种工程实践的包含 web 和 rpc 框架，有 在项目目录下通过如下命令安装： ```shell -GO111MODULE=on GOPROXY=https://goproxy.cn/,direct go get -u github.com/tal-tech/go-zero +GO111MODULE=on GOPROXY=https://goproxy.cn/,direct go get -u github.com/zeromicro/go-zero ``` ## 5. Quick Start @@ -104,10 +104,10 @@ GO111MODULE=on GOPROXY=https://goproxy.cn/,direct go get -u github.com/tal-tech/ ```shell # Go 1.15 及之前版本 - GO111MODULE=on GOPROXY=https://goproxy.cn/,direct go get -u github.com/tal-tech/go-zero/tools/goctl@latest + GO111MODULE=on GOPROXY=https://goproxy.cn/,direct go get -u github.com/zeromicro/go-zero/tools/goctl@latest # Go 1.16 及以后版本 - GOPROXY=https://goproxy.cn/,direct go install github.com/tal-tech/go-zero/tools/goctl@latest + GOPROXY=https://goproxy.cn/,direct go install github.com/zeromicro/go-zero/tools/goctl@latest ``` 确保 goctl 可执行 diff --git a/readme.md b/readme.md index 5701e283..e8f29643 100644 --- a/readme.md +++ b/readme.md @@ -90,7 +90,7 @@ As below, go-zero protects the system with couple layers and mechanisms: Run the following command under your project: ```shell -go get -u github.com/tal-tech/go-zero +go get -u github.com/zeromicro/go-zero ``` ## 6. Quick Start @@ -107,10 +107,10 @@ go get -u github.com/tal-tech/go-zero ```shell # for Go 1.15 and earlier - GO111MODULE=on go get -u github.com/tal-tech/go-zero/tools/goctl@latest + GO111MODULE=on go get -u github.com/zeromicro/go-zero/tools/goctl@latest # for Go 1.16 and later - go install github.com/tal-tech/go-zero/tools/goctl@latest + go install github.com/zeromicro/go-zero/tools/goctl@latest ``` make sure goctl is executable. diff --git a/rest/config.go b/rest/config.go index 972c87c1..0ac31eba 100644 --- a/rest/config.go +++ b/rest/config.go @@ -3,7 +3,7 @@ package rest import ( "time" - "github.com/tal-tech/go-zero/core/service" + "github.com/zeromicro/go-zero/core/service" ) type ( diff --git a/rest/engine.go b/rest/engine.go index 881a0a9e..8ba13378 100644 --- a/rest/engine.go +++ b/rest/engine.go @@ -8,12 +8,12 @@ import ( "time" "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/zeromicro/go-zero/core/codec" + "github.com/zeromicro/go-zero/core/load" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/rest/handler" + "github.com/zeromicro/go-zero/rest/httpx" + "github.com/zeromicro/go-zero/rest/internal" ) // use 1000m to represent 100% diff --git a/rest/engine_test.go b/rest/engine_test.go index 60526d5f..799309e6 100644 --- a/rest/engine_test.go +++ b/rest/engine_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/conf" + "github.com/zeromicro/go-zero/core/conf" ) func TestNewEngine(t *testing.T) { diff --git a/rest/handler/authhandler.go b/rest/handler/authhandler.go index cf740e5e..8dba914f 100644 --- a/rest/handler/authhandler.go +++ b/rest/handler/authhandler.go @@ -9,8 +9,8 @@ import ( "net/http/httputil" "github.com/golang-jwt/jwt" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/token" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/token" ) const ( diff --git a/rest/handler/breakerhandler.go b/rest/handler/breakerhandler.go index 47ec62af..516aba76 100644 --- a/rest/handler/breakerhandler.go +++ b/rest/handler/breakerhandler.go @@ -5,11 +5,11 @@ import ( "net/http" "strings" - "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/httpx" - "github.com/tal-tech/go-zero/rest/internal/security" + "github.com/zeromicro/go-zero/core/breaker" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/rest/httpx" + "github.com/zeromicro/go-zero/rest/internal/security" ) const breakerSeparator = "://" diff --git a/rest/handler/breakerhandler_test.go b/rest/handler/breakerhandler_test.go index d17e872c..baf54d50 100644 --- a/rest/handler/breakerhandler_test.go +++ b/rest/handler/breakerhandler_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stat" ) func init() { diff --git a/rest/handler/contentsecurityhandler.go b/rest/handler/contentsecurityhandler.go index 8eecf463..1f8dc39a 100644 --- a/rest/handler/contentsecurityhandler.go +++ b/rest/handler/contentsecurityhandler.go @@ -4,10 +4,10 @@ import ( "net/http" "time" - "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" + "github.com/zeromicro/go-zero/core/codec" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" + "github.com/zeromicro/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 4311d9ef..a8e4d1d6 100644 --- a/rest/handler/contentsecurityhandler_test.go +++ b/rest/handler/contentsecurityhandler_test.go @@ -18,8 +18,8 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/codec" - "github.com/tal-tech/go-zero/rest/httpx" + "github.com/zeromicro/go-zero/core/codec" + "github.com/zeromicro/go-zero/rest/httpx" ) const timeDiff = time.Hour * 2 * 24 diff --git a/rest/handler/cryptionhandler.go b/rest/handler/cryptionhandler.go index 002c6190..7c5f6e63 100644 --- a/rest/handler/cryptionhandler.go +++ b/rest/handler/cryptionhandler.go @@ -10,8 +10,8 @@ import ( "net" "net/http" - "github.com/tal-tech/go-zero/core/codec" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/codec" + "github.com/zeromicro/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 abc705dc..2957d193 100644 --- a/rest/handler/cryptionhandler_test.go +++ b/rest/handler/cryptionhandler_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/codec" + "github.com/zeromicro/go-zero/core/codec" ) const ( diff --git a/rest/handler/gunziphandler.go b/rest/handler/gunziphandler.go index 08e86cc6..4ecd48dd 100644 --- a/rest/handler/gunziphandler.go +++ b/rest/handler/gunziphandler.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/tal-tech/go-zero/rest/httpx" + "github.com/zeromicro/go-zero/rest/httpx" ) const gzipEncoding = "gzip" diff --git a/rest/handler/gunziphandler_test.go b/rest/handler/gunziphandler_test.go index 164d81b6..eb783a06 100644 --- a/rest/handler/gunziphandler_test.go +++ b/rest/handler/gunziphandler_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/codec" - "github.com/tal-tech/go-zero/rest/httpx" + "github.com/zeromicro/go-zero/core/codec" + "github.com/zeromicro/go-zero/rest/httpx" ) func TestGunzipHandler(t *testing.T) { diff --git a/rest/handler/loghandler.go b/rest/handler/loghandler.go index 3e336b54..0cf9b3e8 100644 --- a/rest/handler/loghandler.go +++ b/rest/handler/loghandler.go @@ -14,13 +14,13 @@ import ( "strings" "time" - "github.com/tal-tech/go-zero/core/iox" - "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/core/utils" - "github.com/tal-tech/go-zero/rest/httpx" - "github.com/tal-tech/go-zero/rest/internal" + "github.com/zeromicro/go-zero/core/iox" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/utils" + "github.com/zeromicro/go-zero/rest/httpx" + "github.com/zeromicro/go-zero/rest/internal" ) const ( diff --git a/rest/handler/loghandler_test.go b/rest/handler/loghandler_test.go index b5b75eaf..aa96d5a4 100644 --- a/rest/handler/loghandler_test.go +++ b/rest/handler/loghandler_test.go @@ -9,7 +9,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/rest/internal" + "github.com/zeromicro/go-zero/rest/internal" ) func init() { diff --git a/rest/handler/maxbyteshandler.go b/rest/handler/maxbyteshandler.go index 579bd899..9cb553ea 100644 --- a/rest/handler/maxbyteshandler.go +++ b/rest/handler/maxbyteshandler.go @@ -3,7 +3,7 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/rest/internal" + "github.com/zeromicro/go-zero/rest/internal" ) // MaxBytesHandler returns a middleware that limit reading of http request body. diff --git a/rest/handler/maxconnshandler.go b/rest/handler/maxconnshandler.go index 8aefb1bc..c062cb7c 100644 --- a/rest/handler/maxconnshandler.go +++ b/rest/handler/maxconnshandler.go @@ -3,9 +3,9 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/syncx" - "github.com/tal-tech/go-zero/rest/internal" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/syncx" + "github.com/zeromicro/go-zero/rest/internal" ) // MaxConns returns a middleware that limit the concurrent connections. diff --git a/rest/handler/maxconnshandler_test.go b/rest/handler/maxconnshandler_test.go index 921914a9..a662ad9a 100644 --- a/rest/handler/maxconnshandler_test.go +++ b/rest/handler/maxconnshandler_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/lang" ) const conns = 4 diff --git a/rest/handler/metrichandler.go b/rest/handler/metrichandler.go index 694206bf..15cc600a 100644 --- a/rest/handler/metrichandler.go +++ b/rest/handler/metrichandler.go @@ -3,8 +3,8 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/stat" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/timex" ) // MetricHandler returns a middleware that stat the metrics. diff --git a/rest/handler/metrichandler_test.go b/rest/handler/metrichandler_test.go index d6911325..6eb3bf58 100644 --- a/rest/handler/metrichandler_test.go +++ b/rest/handler/metrichandler_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/stat" ) func TestMetricHandler(t *testing.T) { diff --git a/rest/handler/prometheushandler.go b/rest/handler/prometheushandler.go index 7ca29537..a1a286a0 100644 --- a/rest/handler/prometheushandler.go +++ b/rest/handler/prometheushandler.go @@ -5,10 +5,10 @@ import ( "strconv" "time" - "github.com/tal-tech/go-zero/core/metric" - "github.com/tal-tech/go-zero/core/prometheus" - "github.com/tal-tech/go-zero/core/timex" - "github.com/tal-tech/go-zero/rest/internal/security" + "github.com/zeromicro/go-zero/core/metric" + "github.com/zeromicro/go-zero/core/prometheus" + "github.com/zeromicro/go-zero/core/timex" + "github.com/zeromicro/go-zero/rest/internal/security" ) const serverNamespace = "http_server" diff --git a/rest/handler/prometheushandler_test.go b/rest/handler/prometheushandler_test.go index a951145e..abb802e6 100644 --- a/rest/handler/prometheushandler_test.go +++ b/rest/handler/prometheushandler_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/prometheus" + "github.com/zeromicro/go-zero/core/prometheus" ) func TestPromMetricHandler_Disabled(t *testing.T) { diff --git a/rest/handler/recoverhandler.go b/rest/handler/recoverhandler.go index 8ebf1343..830cea8f 100644 --- a/rest/handler/recoverhandler.go +++ b/rest/handler/recoverhandler.go @@ -5,7 +5,7 @@ import ( "net/http" "runtime/debug" - "github.com/tal-tech/go-zero/rest/internal" + "github.com/zeromicro/go-zero/rest/internal" ) // RecoverHandler returns a middleware that recovers if panic happens. diff --git a/rest/handler/sheddinghandler.go b/rest/handler/sheddinghandler.go index a6e6bd48..ffbee34f 100644 --- a/rest/handler/sheddinghandler.go +++ b/rest/handler/sheddinghandler.go @@ -4,11 +4,11 @@ import ( "net/http" "sync" - "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/httpx" - "github.com/tal-tech/go-zero/rest/internal/security" + "github.com/zeromicro/go-zero/core/load" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/rest/httpx" + "github.com/zeromicro/go-zero/rest/internal/security" ) const serviceType = "api" diff --git a/rest/handler/sheddinghandler_test.go b/rest/handler/sheddinghandler_test.go index 1c010c88..4bf63e2b 100644 --- a/rest/handler/sheddinghandler_test.go +++ b/rest/handler/sheddinghandler_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/load" - "github.com/tal-tech/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/load" + "github.com/zeromicro/go-zero/core/stat" ) func init() { diff --git a/rest/handler/timeouthandler.go b/rest/handler/timeouthandler.go index aab564a3..cf0c7dd2 100644 --- a/rest/handler/timeouthandler.go +++ b/rest/handler/timeouthandler.go @@ -13,8 +13,8 @@ import ( "sync" "time" - "github.com/tal-tech/go-zero/rest/httpx" - "github.com/tal-tech/go-zero/rest/internal" + "github.com/zeromicro/go-zero/rest/httpx" + "github.com/zeromicro/go-zero/rest/internal" ) const ( diff --git a/rest/handler/tracinghandler.go b/rest/handler/tracinghandler.go index 8936e928..0a8cba9e 100644 --- a/rest/handler/tracinghandler.go +++ b/rest/handler/tracinghandler.go @@ -3,7 +3,7 @@ package handler import ( "net/http" - "github.com/tal-tech/go-zero/core/trace" + "github.com/zeromicro/go-zero/core/trace" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/propagation" semconv "go.opentelemetry.io/otel/semconv/v1.4.0" diff --git a/rest/handler/tracinghandler_test.go b/rest/handler/tracinghandler_test.go index f4e0fbb3..b25edaea 100644 --- a/rest/handler/tracinghandler_test.go +++ b/rest/handler/tracinghandler_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - ztrace "github.com/tal-tech/go-zero/core/trace" + ztrace "github.com/zeromicro/go-zero/core/trace" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" diff --git a/rest/httpx/requests.go b/rest/httpx/requests.go index 170e31c9..46c879bb 100644 --- a/rest/httpx/requests.go +++ b/rest/httpx/requests.go @@ -6,8 +6,8 @@ import ( "net/textproto" "strings" - "github.com/tal-tech/go-zero/core/mapping" - "github.com/tal-tech/go-zero/rest/pathvar" + "github.com/zeromicro/go-zero/core/mapping" + "github.com/zeromicro/go-zero/rest/pathvar" ) const ( diff --git a/rest/httpx/requests_test.go b/rest/httpx/requests_test.go index 7e40fb94..63976d7e 100644 --- a/rest/httpx/requests_test.go +++ b/rest/httpx/requests_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/rest/pathvar" + "github.com/zeromicro/go-zero/rest/pathvar" ) func TestParseForm(t *testing.T) { diff --git a/rest/httpx/responses.go b/rest/httpx/responses.go index ef1ebc0a..9ec67e5b 100644 --- a/rest/httpx/responses.go +++ b/rest/httpx/responses.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) var ( diff --git a/rest/httpx/responses_test.go b/rest/httpx/responses_test.go index 17d14d66..c886ae2e 100644 --- a/rest/httpx/responses_test.go +++ b/rest/httpx/responses_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) type message struct { diff --git a/rest/internal/log.go b/rest/internal/log.go index 2756f33f..6f4719f0 100644 --- a/rest/internal/log.go +++ b/rest/internal/log.go @@ -6,8 +6,8 @@ import ( "net/http" "sync" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/httpx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) // LogContext is a context key. diff --git a/rest/internal/security/contentsecurity.go b/rest/internal/security/contentsecurity.go index 4ed4237a..5e3bbb02 100644 --- a/rest/internal/security/contentsecurity.go +++ b/rest/internal/security/contentsecurity.go @@ -12,10 +12,10 @@ import ( "strings" "time" - "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" + "github.com/zeromicro/go-zero/core/codec" + "github.com/zeromicro/go-zero/core/iox" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/httpx" ) const ( diff --git a/rest/internal/security/contentsecurity_test.go b/rest/internal/security/contentsecurity_test.go index e7c879e5..7c10c2aa 100644 --- a/rest/internal/security/contentsecurity_test.go +++ b/rest/internal/security/contentsecurity_test.go @@ -16,9 +16,9 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/codec" - "github.com/tal-tech/go-zero/core/fs" - "github.com/tal-tech/go-zero/rest/httpx" + "github.com/zeromicro/go-zero/core/codec" + "github.com/zeromicro/go-zero/core/fs" + "github.com/zeromicro/go-zero/rest/httpx" ) const ( diff --git a/rest/internal/starter.go b/rest/internal/starter.go index 0c549ae7..4f87bf4f 100644 --- a/rest/internal/starter.go +++ b/rest/internal/starter.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/proc" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/proc" ) // StartOption defines the method to customize http.Server. diff --git a/rest/router/patrouter.go b/rest/router/patrouter.go index da70c789..d4af14b3 100644 --- a/rest/router/patrouter.go +++ b/rest/router/patrouter.go @@ -6,9 +6,9 @@ import ( "path" "strings" - "github.com/tal-tech/go-zero/core/search" - "github.com/tal-tech/go-zero/rest/httpx" - "github.com/tal-tech/go-zero/rest/pathvar" + "github.com/zeromicro/go-zero/core/search" + "github.com/zeromicro/go-zero/rest/httpx" + "github.com/zeromicro/go-zero/rest/pathvar" ) const ( diff --git a/rest/router/patrouter_test.go b/rest/router/patrouter_test.go index 8308bbee..1425a206 100644 --- a/rest/router/patrouter_test.go +++ b/rest/router/patrouter_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/rest/httpx" - "github.com/tal-tech/go-zero/rest/pathvar" + "github.com/zeromicro/go-zero/rest/httpx" + "github.com/zeromicro/go-zero/rest/pathvar" ) const ( diff --git a/rest/server.go b/rest/server.go index 23355ca9..391ee75c 100644 --- a/rest/server.go +++ b/rest/server.go @@ -7,11 +7,11 @@ import ( "path" "time" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/rest/handler" - "github.com/tal-tech/go-zero/rest/httpx" - "github.com/tal-tech/go-zero/rest/internal/cors" - "github.com/tal-tech/go-zero/rest/router" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/rest/handler" + "github.com/zeromicro/go-zero/rest/httpx" + "github.com/zeromicro/go-zero/rest/internal/cors" + "github.com/zeromicro/go-zero/rest/router" ) type ( diff --git a/rest/server_test.go b/rest/server_test.go index ef814553..220e4470 100644 --- a/rest/server_test.go +++ b/rest/server_test.go @@ -10,9 +10,9 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/conf" - "github.com/tal-tech/go-zero/rest/httpx" - "github.com/tal-tech/go-zero/rest/router" + "github.com/zeromicro/go-zero/core/conf" + "github.com/zeromicro/go-zero/rest/httpx" + "github.com/zeromicro/go-zero/rest/router" ) func TestNewServer(t *testing.T) { diff --git a/rest/token/tokenparser.go b/rest/token/tokenparser.go index 0500bb0f..61eee92f 100644 --- a/rest/token/tokenparser.go +++ b/rest/token/tokenparser.go @@ -8,7 +8,7 @@ import ( "github.com/golang-jwt/jwt" "github.com/golang-jwt/jwt/request" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/timex" ) const claimHistoryResetDuration = time.Hour * 24 diff --git a/rest/token/tokenparser_test.go b/rest/token/tokenparser_test.go index 31929e91..a9a1eea7 100644 --- a/rest/token/tokenparser_test.go +++ b/rest/token/tokenparser_test.go @@ -8,7 +8,7 @@ import ( "github.com/golang-jwt/jwt" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/timex" ) func TestTokenParser(t *testing.T) { diff --git a/tools/goctl/api/gogen/genhandlers.go b/tools/goctl/api/gogen/genhandlers.go index 232ed5b3..5cab27f4 100644 --- a/tools/goctl/api/gogen/genhandlers.go +++ b/tools/goctl/api/gogen/genhandlers.go @@ -21,7 +21,7 @@ const ( import ( "net/http" - {{if .After1_1_10}}"github.com/tal-tech/go-zero/rest/httpx"{{end}} + {{if .After1_1_10}}"github.com/zeromicro/go-zero/rest/httpx"{{end}} {{.ImportPackages}} ) diff --git a/tools/goctl/goctl.go b/tools/goctl/goctl.go index 3b08149d..9abba714 100644 --- a/tools/goctl/goctl.go +++ b/tools/goctl/goctl.go @@ -149,7 +149,7 @@ var commands = []cli.Command{ }, cli.StringFlag{ Name: "style", - Usage: "the file naming format, see [https://github.com/tal-tech/go-zero/tree/master/tools/goctl/config/readme.md]", + Usage: "the file naming format, see [https://github.com/zeromicro/go-zero/tree/master/tools/goctl/config/readme.md]", }, cli.StringFlag{ Name: "home", @@ -259,7 +259,7 @@ var commands = []cli.Command{ }, cli.StringFlag{ Name: "style", - Usage: "the file naming format, see [https://github.com/tal-tech/go-zero/tree/master/tools/goctl/config/readme.md]", + Usage: "the file naming format, see [https://github.com/zeromicro/go-zero/tree/master/tools/goctl/config/readme.md]", }, }, Action: plugin.PluginCommand, @@ -405,7 +405,7 @@ var commands = []cli.Command{ Flags: []cli.Flag{ cli.StringFlag{ Name: "style", - Usage: "the file naming format, see [https://github.com/tal-tech/go-zero/tree/master/tools/goctl/config/readme.md]", + Usage: "the file naming format, see [https://github.com/zeromicro/go-zero/tree/master/tools/goctl/config/readme.md]", }, cli.BoolFlag{ Name: "idea", @@ -469,7 +469,7 @@ var commands = []cli.Command{ }, cli.StringFlag{ Name: "style", - Usage: "the file naming format, see [https://github.com/tal-tech/go-zero/tree/master/tools/goctl/config/readme.md]", + Usage: "the file naming format, see [https://github.com/zeromicro/go-zero/tree/master/tools/goctl/config/readme.md]", }, cli.BoolFlag{ Name: "idea", @@ -513,7 +513,7 @@ var commands = []cli.Command{ }, cli.StringFlag{ Name: "style", - Usage: "the file naming format, see [https://github.com/tal-tech/go-zero/tree/master/tools/goctl/config/readme.md]", + Usage: "the file naming format, see [https://github.com/zeromicro/go-zero/tree/master/tools/goctl/config/readme.md]", }, cli.BoolFlag{ Name: "cache, c", @@ -563,7 +563,7 @@ var commands = []cli.Command{ }, cli.StringFlag{ Name: "style", - Usage: "the file naming format, see [https://github.com/tal-tech/go-zero/tree/master/tools/goctl/config/readme.md]", + Usage: "the file naming format, see [https://github.com/zeromicro/go-zero/tree/master/tools/goctl/config/readme.md]", }, cli.BoolFlag{ Name: "idea", @@ -615,7 +615,7 @@ var commands = []cli.Command{ }, cli.StringFlag{ Name: "style", - Usage: "the file naming format, see [https://github.com/tal-tech/go-zero/tree/master/tools/goctl/config/readme.md]", + Usage: "the file naming format, see [https://github.com/zeromicro/go-zero/tree/master/tools/goctl/config/readme.md]", }, cli.BoolFlag{ Name: "idea", @@ -655,7 +655,7 @@ var commands = []cli.Command{ }, cli.StringFlag{ Name: "style", - Usage: "the file naming format, see [https://github.com/tal-tech/go-zero/tree/master/tools/goctl/config/readme.md]", + Usage: "the file naming format, see [https://github.com/zeromicro/go-zero/tree/master/tools/goctl/config/readme.md]", }, cli.StringFlag{ Name: "home", diff --git a/tools/goctl/model/mongo/readme.md b/tools/goctl/model/mongo/readme.md index 5f607e24..1d8521d7 100644 --- a/tools/goctl/model/mongo/readme.md +++ b/tools/goctl/model/mongo/readme.md @@ -65,7 +65,7 @@ type User struct { "context" "github.com/globalsign/mgo/bson" - cachec "github.com/tal-tech/go-zero/core/stores/cache" + cachec "github.com/zeromicro/go-zero/core/stores/cache" "github.com/tal-tech/go-zero/core/stores/mongoc" ) diff --git a/tools/goctl/model/mongo/template/template.go b/tools/goctl/model/mongo/template/template.go index 936caa6c..5ab4865a 100644 --- a/tools/goctl/model/mongo/template/template.go +++ b/tools/goctl/model/mongo/template/template.go @@ -7,8 +7,8 @@ import ( "context" "github.com/globalsign/mgo/bson" - {{if .Cache}}cachec "github.com/tal-tech/go-zero/core/stores/cache" - "github.com/tal-tech/go-zero/core/stores/mongoc"{{else}}"github.com/tal-tech/go-zero/core/stores/mongo"{{end}} + {{if .Cache}}cachec "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/mongoc"{{else}}"github.com/zeromicro/go-zero/core/stores/mongo"{{end}} ) {{if .Cache}}var prefix{{.Type}}CacheKey = "cache:{{.Type}}:"{{end}} diff --git a/tools/goctl/model/sql/builderx/builder.go b/tools/goctl/model/sql/builderx/builder.go index 2c7db09b..a258997e 100644 --- a/tools/goctl/model/sql/builderx/builder.go +++ b/tools/goctl/model/sql/builderx/builder.go @@ -4,17 +4,17 @@ import ( "github.com/tal-tech/go-zero/core/stores/builder" ) -// Deprecated: Use github.com/tal-tech/go-zero/core/stores/builder.RawFieldNames instead. +// Deprecated: Use github.com/zeromicro/go-zero/core/stores/builder.RawFieldNames instead. func FieldNames(in interface{}) []string { return builder.RawFieldNames(in) } -// Deprecated: Use github.com/tal-tech/go-zero/core/stores/builder.RawFieldNames instead. +// Deprecated: Use github.com/zeromicro/go-zero/core/stores/builder.RawFieldNames instead. func RawFieldNames(in interface{}, postgresSql ...bool) []string { return builder.RawFieldNames(in, postgresSql...) } -// Deprecated: Use github.com/tal-tech/go-zero/core/stores/builderx.PostgreSqlJoin instead. +// Deprecated: Use github.com/zeromicro/go-zero/core/stores/builderx.PostgreSqlJoin instead. func PostgreSqlJoin(elems []string) string { return builder.PostgreSqlJoin(elems) } diff --git a/tools/goctl/model/sql/template/errors.go b/tools/goctl/model/sql/template/errors.go index 06fd6415..0482453a 100644 --- a/tools/goctl/model/sql/template/errors.go +++ b/tools/goctl/model/sql/template/errors.go @@ -3,7 +3,7 @@ package template // Error defines an error template var Error = `package {{.pkg}} -import "github.com/tal-tech/go-zero/core/stores/sqlx" +import "github.com/zeromicro/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 3dcf0649..8d90c1f2 100644 --- a/tools/goctl/model/sql/template/import.go +++ b/tools/goctl/model/sql/template/import.go @@ -8,11 +8,11 @@ var ( "strings" {{if .time}}"time"{{end}} - "github.com/tal-tech/go-zero/core/stores/builder" - "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" + "github.com/zeromicro/go-zero/core/stores/builder" + "github.com/zeromicro/go-zero/core/stores/cache" + "github.com/zeromicro/go-zero/core/stores/sqlc" + "github.com/zeromicro/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/stringx" ) ` // ImportsNoCache defines a import template for model in normal case @@ -22,10 +22,10 @@ var ( "strings" {{if .time}}"time"{{end}} - "github.com/tal-tech/go-zero/core/stores/builder" - "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" + "github.com/zeromicro/go-zero/core/stores/builder" + "github.com/zeromicro/go-zero/core/stores/sqlc" + "github.com/zeromicro/go-zero/core/stores/sqlx" + "github.com/zeromicro/go-zero/core/stringx" ) ` ) diff --git a/tools/goctl/rpc/README.md b/tools/goctl/rpc/README.md index 231c5359..8a006ff5 100644 --- a/tools/goctl/rpc/README.md +++ b/tools/goctl/rpc/README.md @@ -136,7 +136,7 @@ OPTIONS: --proto_path value, -I value native command of protoc, specify the directory in which to search for imports. [optional] --go_opt value native command of protoc-gen-go, specify the mapping from proto to go, eg --go_opt=proto_import=go_package_import. [optional] --dir value, -d value the target path of the code - --style value the file naming format, see [https://github.com/tal-tech/go-zero/tree/master/tools/goctl/config/readme.md] + --style value the file naming format, see [https://github.com/zeromicro/go-zero/tree/master/tools/goctl/config/readme.md] --idea whether the command execution environment is from idea plugin. [optional] ``` diff --git a/tools/goctl/rpc/generator/gencall.go b/tools/goctl/rpc/generator/gencall.go index 7a141ce0..2eb022ac 100644 --- a/tools/goctl/rpc/generator/gencall.go +++ b/tools/goctl/rpc/generator/gencall.go @@ -26,7 +26,7 @@ import ( {{.package}} - "github.com/tal-tech/go-zero/zrpc" + "github.com/zeromicro/go-zero/zrpc" "google.golang.org/grpc" ) diff --git a/tools/goctl/rpc/generator/genconfig.go b/tools/goctl/rpc/generator/genconfig.go index 35f4a06e..3d54da0b 100644 --- a/tools/goctl/rpc/generator/genconfig.go +++ b/tools/goctl/rpc/generator/genconfig.go @@ -13,7 +13,7 @@ import ( const configTemplate = `package config -import "github.com/tal-tech/go-zero/zrpc" +import "github.com/zeromicro/go-zero/zrpc" type Config struct { zrpc.RpcServerConf diff --git a/tools/goctl/rpc/generator/genlogic.go b/tools/goctl/rpc/generator/genlogic.go index 1bb22baf..29c710b5 100644 --- a/tools/goctl/rpc/generator/genlogic.go +++ b/tools/goctl/rpc/generator/genlogic.go @@ -22,7 +22,7 @@ import ( {{.imports}} - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" ) type {{.logicName}} struct { diff --git a/tools/goctl/rpc/generator/genmain.go b/tools/goctl/rpc/generator/genmain.go index f85e2f30..4983a8cf 100644 --- a/tools/goctl/rpc/generator/genmain.go +++ b/tools/goctl/rpc/generator/genmain.go @@ -21,9 +21,9 @@ import ( {{.imports}} - "github.com/tal-tech/go-zero/core/conf" - "github.com/tal-tech/go-zero/core/service" - "github.com/tal-tech/go-zero/zrpc" + "github.com/zeromicro/go-zero/core/conf" + "github.com/zeromicro/go-zero/core/service" + "github.com/zeromicro/go-zero/zrpc" "google.golang.org/grpc" "google.golang.org/grpc/reflection" ) diff --git a/tools/goctl/rpc/parser/parser_test.go b/tools/goctl/rpc/parser/parser_test.go index 7fe8bdec..b4fa19e0 100644 --- a/tools/goctl/rpc/parser/parser_test.go +++ b/tools/goctl/rpc/parser/parser_test.go @@ -65,7 +65,7 @@ func TestDefaultProtoParse_Option(t *testing.T) { p := NewDefaultProtoParser() data, err := p.Parse("./test_option.proto") assert.Nil(t, err) - assert.Equal(t, "github.com/tal-tech/go-zero", data.GoPackage) + assert.Equal(t, "github.com/zeromicro/go-zero", data.GoPackage) assert.Equal(t, "go_zero", data.PbPackage) } diff --git a/tools/goctl/rpc/parser/test_option.proto b/tools/goctl/rpc/parser/test_option.proto index 3bb48731..1740273f 100644 --- a/tools/goctl/rpc/parser/test_option.proto +++ b/tools/goctl/rpc/parser/test_option.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package stream; -option go_package = "github.com/tal-tech/go-zero"; +option go_package = "github.com/zeromicro/go-zero"; message placeholder {} diff --git a/tools/goctl/upgrade/upgrade.go b/tools/goctl/upgrade/upgrade.go index 5246388b..008da383 100644 --- a/tools/goctl/upgrade/upgrade.go +++ b/tools/goctl/upgrade/upgrade.go @@ -9,11 +9,11 @@ import ( ) // Upgrade gets the latest goctl by -// go install github.com/tal-tech/go-zero/tools/goctl@latest +// go install github.com/zeromicro/go-zero/tools/goctl@latest func Upgrade(_ *cli.Context) error { - cmd := `GO111MODULE=on GOPROXY=https://goproxy.cn/,direct go install github.com/tal-tech/go-zero/tools/goctl@latest` + cmd := `GO111MODULE=on GOPROXY=https://goproxy.cn/,direct go install github.com/zeromicro/go-zero/tools/goctl@latest` if runtime.GOOS == "windows" { - cmd = `set GOPROXY=https://goproxy.cn,direct && go install github.com/tal-tech/go-zero/tools/goctl@latest` + cmd = `set GOPROXY=https://goproxy.cn,direct && go install github.com/zeromicro/go-zero/tools/goctl@latest` } info, err := execx.Run(cmd, "") if err != nil { diff --git a/tools/goctl/util/ctx/context.go b/tools/goctl/util/ctx/context.go index aab06e5b..b2df6a48 100644 --- a/tools/goctl/util/ctx/context.go +++ b/tools/goctl/util/ctx/context.go @@ -17,7 +17,7 @@ type ProjectContext struct { // eg: go-zero、greet Name string // Path identifies which module a project belongs to, which is module value if it's a go mod project, - // or else it is the root name of the project, eg: github.com/tal-tech/go-zero、greet + // or else it is the root name of the project, eg: github.com/zeromicro/go-zero、greet Path string // Dir is the path of the project, eg: /Users/keson/goland/go/go-zero、/Users/keson/go/src/greet Dir string diff --git a/tools/goctl/vars/settings.go b/tools/goctl/vars/settings.go index 9ca36284..3ce693b5 100644 --- a/tools/goctl/vars/settings.go +++ b/tools/goctl/vars/settings.go @@ -4,7 +4,7 @@ const ( // ProjectName the const value of zero ProjectName = "zero" // ProjectOpenSourceURL the github url of go-zero - ProjectOpenSourceURL = "github.com/tal-tech/go-zero" + ProjectOpenSourceURL = "github.com/zeromicro/go-zero" // OsWindows represents os windows OsWindows = "windows" // OsMac represents os mac diff --git a/zrpc/client.go b/zrpc/client.go index 5822eb24..699486a4 100644 --- a/zrpc/client.go +++ b/zrpc/client.go @@ -4,9 +4,9 @@ import ( "log" "time" - "github.com/tal-tech/go-zero/zrpc/internal" - "github.com/tal-tech/go-zero/zrpc/internal/auth" - "github.com/tal-tech/go-zero/zrpc/internal/clientinterceptors" + "github.com/zeromicro/go-zero/zrpc/internal" + "github.com/zeromicro/go-zero/zrpc/internal/auth" + "github.com/zeromicro/go-zero/zrpc/internal/clientinterceptors" "google.golang.org/grpc" ) diff --git a/zrpc/client_test.go b/zrpc/client_test.go index 16e005e4..0506fbcd 100644 --- a/zrpc/client_test.go +++ b/zrpc/client_test.go @@ -9,9 +9,9 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/discov" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/zrpc/internal/mock" + "github.com/zeromicro/go-zero/core/discov" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/zrpc/internal/mock" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/zrpc/config.go b/zrpc/config.go index d076b436..2a9595a1 100644 --- a/zrpc/config.go +++ b/zrpc/config.go @@ -1,10 +1,10 @@ package zrpc import ( - "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" - "github.com/tal-tech/go-zero/zrpc/resolver" + "github.com/zeromicro/go-zero/core/discov" + "github.com/zeromicro/go-zero/core/service" + "github.com/zeromicro/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/zrpc/resolver" ) type ( diff --git a/zrpc/config_test.go b/zrpc/config_test.go index 67d2a4b3..02a3a10d 100644 --- a/zrpc/config_test.go +++ b/zrpc/config_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/assert" - "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" + "github.com/zeromicro/go-zero/core/discov" + "github.com/zeromicro/go-zero/core/service" + "github.com/zeromicro/go-zero/core/stores/redis" ) func TestRpcClientConf(t *testing.T) { diff --git a/zrpc/internal/auth/auth.go b/zrpc/internal/auth/auth.go index fe02e6fa..2770fcf5 100644 --- a/zrpc/internal/auth/auth.go +++ b/zrpc/internal/auth/auth.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/tal-tech/go-zero/core/collection" - "github.com/tal-tech/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/core/collection" + "github.com/zeromicro/go-zero/core/stores/redis" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" diff --git a/zrpc/internal/auth/auth_test.go b/zrpc/internal/auth/auth_test.go index 6cdf3b5a..20d6f8ef 100644 --- a/zrpc/internal/auth/auth_test.go +++ b/zrpc/internal/auth/auth_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stores/redis/redistest" + "github.com/zeromicro/go-zero/core/stores/redis/redistest" "google.golang.org/grpc/metadata" ) diff --git a/zrpc/internal/balancer/p2c/p2c.go b/zrpc/internal/balancer/p2c/p2c.go index fa2313fd..74335d38 100644 --- a/zrpc/internal/balancer/p2c/p2c.go +++ b/zrpc/internal/balancer/p2c/p2c.go @@ -9,10 +9,10 @@ import ( "sync/atomic" "time" - "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/zrpc/internal/codes" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/timex" + "github.com/zeromicro/go-zero/zrpc/internal/codes" "google.golang.org/grpc/balancer" "google.golang.org/grpc/balancer/base" "google.golang.org/grpc/resolver" diff --git a/zrpc/internal/balancer/p2c/p2c_test.go b/zrpc/internal/balancer/p2c/p2c_test.go index a6458439..e7996c65 100644 --- a/zrpc/internal/balancer/p2c/p2c_test.go +++ b/zrpc/internal/balancer/p2c/p2c_test.go @@ -9,9 +9,9 @@ import ( "testing" "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/stringx" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/mathx" + "github.com/zeromicro/go-zero/core/stringx" "google.golang.org/grpc/balancer" "google.golang.org/grpc/balancer/base" "google.golang.org/grpc/codes" diff --git a/zrpc/internal/client.go b/zrpc/internal/client.go index 5bad34a5..251f43f4 100644 --- a/zrpc/internal/client.go +++ b/zrpc/internal/client.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/tal-tech/go-zero/zrpc/internal/balancer/p2c" - "github.com/tal-tech/go-zero/zrpc/internal/clientinterceptors" - "github.com/tal-tech/go-zero/zrpc/resolver" + "github.com/zeromicro/go-zero/zrpc/internal/balancer/p2c" + "github.com/zeromicro/go-zero/zrpc/internal/clientinterceptors" + "github.com/zeromicro/go-zero/zrpc/resolver" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) diff --git a/zrpc/internal/clientinterceptors/breakerinterceptor.go b/zrpc/internal/clientinterceptors/breakerinterceptor.go index 163aa62b..05adc8e8 100644 --- a/zrpc/internal/clientinterceptors/breakerinterceptor.go +++ b/zrpc/internal/clientinterceptors/breakerinterceptor.go @@ -4,8 +4,8 @@ import ( "context" "path" - "github.com/tal-tech/go-zero/core/breaker" - "github.com/tal-tech/go-zero/zrpc/internal/codes" + "github.com/zeromicro/go-zero/core/breaker" + "github.com/zeromicro/go-zero/zrpc/internal/codes" "google.golang.org/grpc" ) diff --git a/zrpc/internal/clientinterceptors/breakerinterceptor_test.go b/zrpc/internal/clientinterceptors/breakerinterceptor_test.go index 5d0f9035..5c535011 100644 --- a/zrpc/internal/clientinterceptors/breakerinterceptor_test.go +++ b/zrpc/internal/clientinterceptors/breakerinterceptor_test.go @@ -6,9 +6,9 @@ import ( "testing" "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/zrpc/internal/codes" + "github.com/zeromicro/go-zero/core/breaker" + "github.com/zeromicro/go-zero/core/stat" + rcodes "github.com/zeromicro/go-zero/zrpc/internal/codes" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/zrpc/internal/clientinterceptors/durationinterceptor.go b/zrpc/internal/clientinterceptors/durationinterceptor.go index b268a3d0..1abf0002 100644 --- a/zrpc/internal/clientinterceptors/durationinterceptor.go +++ b/zrpc/internal/clientinterceptors/durationinterceptor.go @@ -5,9 +5,9 @@ import ( "path" "time" - "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/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/timex" "google.golang.org/grpc" ) diff --git a/zrpc/internal/clientinterceptors/prometheusinterceptor.go b/zrpc/internal/clientinterceptors/prometheusinterceptor.go index 635e7ee2..b713f09f 100644 --- a/zrpc/internal/clientinterceptors/prometheusinterceptor.go +++ b/zrpc/internal/clientinterceptors/prometheusinterceptor.go @@ -5,9 +5,9 @@ import ( "strconv" "time" - "github.com/tal-tech/go-zero/core/metric" - "github.com/tal-tech/go-zero/core/prometheus" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/metric" + "github.com/zeromicro/go-zero/core/prometheus" + "github.com/zeromicro/go-zero/core/timex" "google.golang.org/grpc" "google.golang.org/grpc/status" ) diff --git a/zrpc/internal/clientinterceptors/prometheusinterceptor_test.go b/zrpc/internal/clientinterceptors/prometheusinterceptor_test.go index 70c46026..d2564ae7 100644 --- a/zrpc/internal/clientinterceptors/prometheusinterceptor_test.go +++ b/zrpc/internal/clientinterceptors/prometheusinterceptor_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/prometheus" + "github.com/zeromicro/go-zero/core/prometheus" "google.golang.org/grpc" ) diff --git a/zrpc/internal/clientinterceptors/tracinginterceptor.go b/zrpc/internal/clientinterceptors/tracinginterceptor.go index 668a7751..b2148d43 100644 --- a/zrpc/internal/clientinterceptors/tracinginterceptor.go +++ b/zrpc/internal/clientinterceptors/tracinginterceptor.go @@ -4,7 +4,7 @@ import ( "context" "io" - ztrace "github.com/tal-tech/go-zero/core/trace" + ztrace "github.com/zeromicro/go-zero/core/trace" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/codes" "go.opentelemetry.io/otel/trace" diff --git a/zrpc/internal/clientinterceptors/tracinginterceptor_test.go b/zrpc/internal/clientinterceptors/tracinginterceptor_test.go index 35cb8757..00c3db1b 100644 --- a/zrpc/internal/clientinterceptors/tracinginterceptor_test.go +++ b/zrpc/internal/clientinterceptors/tracinginterceptor_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/trace" + "github.com/zeromicro/go-zero/core/trace" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/zrpc/internal/rpclogger.go b/zrpc/internal/rpclogger.go index 8cefd149..e7b057bb 100644 --- a/zrpc/internal/rpclogger.go +++ b/zrpc/internal/rpclogger.go @@ -3,7 +3,7 @@ package internal import ( "sync" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" "google.golang.org/grpc/grpclog" ) diff --git a/zrpc/internal/rpcpubserver.go b/zrpc/internal/rpcpubserver.go index a1773203..de720c95 100644 --- a/zrpc/internal/rpcpubserver.go +++ b/zrpc/internal/rpcpubserver.go @@ -4,8 +4,8 @@ import ( "os" "strings" - "github.com/tal-tech/go-zero/core/discov" - "github.com/tal-tech/go-zero/core/netx" + "github.com/zeromicro/go-zero/core/discov" + "github.com/zeromicro/go-zero/core/netx" ) const ( diff --git a/zrpc/internal/rpcpubserver_test.go b/zrpc/internal/rpcpubserver_test.go index 196ef156..93ce2227 100644 --- a/zrpc/internal/rpcpubserver_test.go +++ b/zrpc/internal/rpcpubserver_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/netx" + "github.com/zeromicro/go-zero/core/netx" ) func TestFigureOutListenOn(t *testing.T) { diff --git a/zrpc/internal/rpcserver.go b/zrpc/internal/rpcserver.go index cfaac30b..a05d4565 100644 --- a/zrpc/internal/rpcserver.go +++ b/zrpc/internal/rpcserver.go @@ -3,9 +3,9 @@ package internal import ( "net" - "github.com/tal-tech/go-zero/core/proc" - "github.com/tal-tech/go-zero/core/stat" - "github.com/tal-tech/go-zero/zrpc/internal/serverinterceptors" + "github.com/zeromicro/go-zero/core/proc" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/zrpc/internal/serverinterceptors" "google.golang.org/grpc" ) diff --git a/zrpc/internal/rpcserver_test.go b/zrpc/internal/rpcserver_test.go index 76e55d99..87f922db 100644 --- a/zrpc/internal/rpcserver_test.go +++ b/zrpc/internal/rpcserver_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stat" - "github.com/tal-tech/go-zero/zrpc/internal/mock" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/zrpc/internal/mock" "google.golang.org/grpc" ) diff --git a/zrpc/internal/server.go b/zrpc/internal/server.go index 9275ebba..ecdf86dd 100644 --- a/zrpc/internal/server.go +++ b/zrpc/internal/server.go @@ -1,7 +1,7 @@ package internal import ( - "github.com/tal-tech/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/stat" "google.golang.org/grpc" ) diff --git a/zrpc/internal/server_test.go b/zrpc/internal/server_test.go index edb563c7..4dcd0380 100644 --- a/zrpc/internal/server_test.go +++ b/zrpc/internal/server_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/stat" "google.golang.org/grpc" ) diff --git a/zrpc/internal/serverinterceptors/authinterceptor.go b/zrpc/internal/serverinterceptors/authinterceptor.go index 06193e99..76c99f7e 100644 --- a/zrpc/internal/serverinterceptors/authinterceptor.go +++ b/zrpc/internal/serverinterceptors/authinterceptor.go @@ -3,7 +3,7 @@ package serverinterceptors import ( "context" - "github.com/tal-tech/go-zero/zrpc/internal/auth" + "github.com/zeromicro/go-zero/zrpc/internal/auth" "google.golang.org/grpc" ) diff --git a/zrpc/internal/serverinterceptors/authinterceptor_test.go b/zrpc/internal/serverinterceptors/authinterceptor_test.go index 975e8437..261cdb11 100644 --- a/zrpc/internal/serverinterceptors/authinterceptor_test.go +++ b/zrpc/internal/serverinterceptors/authinterceptor_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/stores/redis/redistest" - "github.com/tal-tech/go-zero/zrpc/internal/auth" + "github.com/zeromicro/go-zero/core/stores/redis/redistest" + "github.com/zeromicro/go-zero/zrpc/internal/auth" "google.golang.org/grpc" "google.golang.org/grpc/metadata" ) diff --git a/zrpc/internal/serverinterceptors/breakerinterceptor.go b/zrpc/internal/serverinterceptors/breakerinterceptor.go index b1f783d9..233bdeed 100644 --- a/zrpc/internal/serverinterceptors/breakerinterceptor.go +++ b/zrpc/internal/serverinterceptors/breakerinterceptor.go @@ -3,8 +3,8 @@ package serverinterceptors import ( "context" - "github.com/tal-tech/go-zero/core/breaker" - "github.com/tal-tech/go-zero/zrpc/internal/codes" + "github.com/zeromicro/go-zero/core/breaker" + "github.com/zeromicro/go-zero/zrpc/internal/codes" "google.golang.org/grpc" ) diff --git a/zrpc/internal/serverinterceptors/crashinterceptor.go b/zrpc/internal/serverinterceptors/crashinterceptor.go index 5a27036b..391b49e3 100644 --- a/zrpc/internal/serverinterceptors/crashinterceptor.go +++ b/zrpc/internal/serverinterceptors/crashinterceptor.go @@ -4,7 +4,7 @@ import ( "context" "runtime/debug" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/zrpc/internal/serverinterceptors/crashinterceptor_test.go b/zrpc/internal/serverinterceptors/crashinterceptor_test.go index fe5916ef..b464c9b9 100644 --- a/zrpc/internal/serverinterceptors/crashinterceptor_test.go +++ b/zrpc/internal/serverinterceptors/crashinterceptor_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/logx" "google.golang.org/grpc" ) diff --git a/zrpc/internal/serverinterceptors/prometheusinterceptor.go b/zrpc/internal/serverinterceptors/prometheusinterceptor.go index 5ccd0c07..86070e38 100644 --- a/zrpc/internal/serverinterceptors/prometheusinterceptor.go +++ b/zrpc/internal/serverinterceptors/prometheusinterceptor.go @@ -5,9 +5,9 @@ import ( "strconv" "time" - "github.com/tal-tech/go-zero/core/metric" - "github.com/tal-tech/go-zero/core/prometheus" - "github.com/tal-tech/go-zero/core/timex" + "github.com/zeromicro/go-zero/core/metric" + "github.com/zeromicro/go-zero/core/prometheus" + "github.com/zeromicro/go-zero/core/timex" "google.golang.org/grpc" "google.golang.org/grpc/status" ) diff --git a/zrpc/internal/serverinterceptors/prometheusinterceptor_test.go b/zrpc/internal/serverinterceptors/prometheusinterceptor_test.go index 18b1887b..fe8d5d67 100644 --- a/zrpc/internal/serverinterceptors/prometheusinterceptor_test.go +++ b/zrpc/internal/serverinterceptors/prometheusinterceptor_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/prometheus" + "github.com/zeromicro/go-zero/core/prometheus" "google.golang.org/grpc" ) diff --git a/zrpc/internal/serverinterceptors/sheddinginterceptor.go b/zrpc/internal/serverinterceptors/sheddinginterceptor.go index c1386e6b..8f73e222 100644 --- a/zrpc/internal/serverinterceptors/sheddinginterceptor.go +++ b/zrpc/internal/serverinterceptors/sheddinginterceptor.go @@ -4,8 +4,8 @@ import ( "context" "sync" - "github.com/tal-tech/go-zero/core/load" - "github.com/tal-tech/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/load" + "github.com/zeromicro/go-zero/core/stat" "google.golang.org/grpc" ) diff --git a/zrpc/internal/serverinterceptors/sheddinginterceptor_test.go b/zrpc/internal/serverinterceptors/sheddinginterceptor_test.go index a7ceb4bf..99536166 100644 --- a/zrpc/internal/serverinterceptors/sheddinginterceptor_test.go +++ b/zrpc/internal/serverinterceptors/sheddinginterceptor_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/load" - "github.com/tal-tech/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/load" + "github.com/zeromicro/go-zero/core/stat" "google.golang.org/grpc" ) diff --git a/zrpc/internal/serverinterceptors/statinterceptor.go b/zrpc/internal/serverinterceptors/statinterceptor.go index 71952abc..a921897e 100644 --- a/zrpc/internal/serverinterceptors/statinterceptor.go +++ b/zrpc/internal/serverinterceptors/statinterceptor.go @@ -5,10 +5,10 @@ import ( "encoding/json" "time" - "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" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/syncx" + "github.com/zeromicro/go-zero/core/timex" "google.golang.org/grpc" "google.golang.org/grpc/peer" ) diff --git a/zrpc/internal/serverinterceptors/statinterceptor_test.go b/zrpc/internal/serverinterceptors/statinterceptor_test.go index fb53dfa9..dd653f52 100644 --- a/zrpc/internal/serverinterceptors/statinterceptor_test.go +++ b/zrpc/internal/serverinterceptors/statinterceptor_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/lang" - "github.com/tal-tech/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/stat" "google.golang.org/grpc" "google.golang.org/grpc/peer" ) diff --git a/zrpc/internal/serverinterceptors/tracinginterceptor.go b/zrpc/internal/serverinterceptors/tracinginterceptor.go index 6950ef56..5fb6f87b 100644 --- a/zrpc/internal/serverinterceptors/tracinginterceptor.go +++ b/zrpc/internal/serverinterceptors/tracinginterceptor.go @@ -3,7 +3,7 @@ package serverinterceptors import ( "context" - ztrace "github.com/tal-tech/go-zero/core/trace" + ztrace "github.com/zeromicro/go-zero/core/trace" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/baggage" "go.opentelemetry.io/otel/codes" diff --git a/zrpc/internal/serverinterceptors/tracinginterceptor_test.go b/zrpc/internal/serverinterceptors/tracinginterceptor_test.go index d12da1f1..a1c9676a 100644 --- a/zrpc/internal/serverinterceptors/tracinginterceptor_test.go +++ b/zrpc/internal/serverinterceptors/tracinginterceptor_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/trace" + "github.com/zeromicro/go-zero/core/trace" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" diff --git a/zrpc/proxy.go b/zrpc/proxy.go index 455b8e8a..d02f7ff4 100644 --- a/zrpc/proxy.go +++ b/zrpc/proxy.go @@ -4,9 +4,9 @@ import ( "context" "sync" - "github.com/tal-tech/go-zero/core/syncx" - "github.com/tal-tech/go-zero/zrpc/internal" - "github.com/tal-tech/go-zero/zrpc/internal/auth" + "github.com/zeromicro/go-zero/core/syncx" + "github.com/zeromicro/go-zero/zrpc/internal" + "github.com/zeromicro/go-zero/zrpc/internal/auth" "google.golang.org/grpc" ) diff --git a/zrpc/proxy_test.go b/zrpc/proxy_test.go index 51782db6..97a24fe4 100644 --- a/zrpc/proxy_test.go +++ b/zrpc/proxy_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/zrpc/internal/mock" + "github.com/zeromicro/go-zero/zrpc/internal/mock" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/zrpc/resolver/internal/directbuilder_test.go b/zrpc/resolver/internal/directbuilder_test.go index f19a1bbf..d6fb0133 100644 --- a/zrpc/resolver/internal/directbuilder_test.go +++ b/zrpc/resolver/internal/directbuilder_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/lang" - "github.com/tal-tech/go-zero/core/mathx" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/mathx" "google.golang.org/grpc/resolver" ) diff --git a/zrpc/resolver/internal/discovbuilder.go b/zrpc/resolver/internal/discovbuilder.go index 0131b55f..b3a587bb 100644 --- a/zrpc/resolver/internal/discovbuilder.go +++ b/zrpc/resolver/internal/discovbuilder.go @@ -3,8 +3,8 @@ package internal import ( "strings" - "github.com/tal-tech/go-zero/core/discov" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/discov" + "github.com/zeromicro/go-zero/core/logx" "google.golang.org/grpc/resolver" ) diff --git a/zrpc/resolver/internal/kube/eventhandler.go b/zrpc/resolver/internal/kube/eventhandler.go index ae7e6d91..d3b218a0 100644 --- a/zrpc/resolver/internal/kube/eventhandler.go +++ b/zrpc/resolver/internal/kube/eventhandler.go @@ -3,8 +3,8 @@ package kube import ( "sync" - "github.com/tal-tech/go-zero/core/lang" - "github.com/tal-tech/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/lang" + "github.com/zeromicro/go-zero/core/logx" v1 "k8s.io/api/core/v1" ) diff --git a/zrpc/resolver/internal/kubebuilder.go b/zrpc/resolver/internal/kubebuilder.go index c59c7852..427cef12 100644 --- a/zrpc/resolver/internal/kubebuilder.go +++ b/zrpc/resolver/internal/kubebuilder.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "github.com/tal-tech/go-zero/core/logx" - "github.com/tal-tech/go-zero/core/proc" - "github.com/tal-tech/go-zero/core/threading" - "github.com/tal-tech/go-zero/zrpc/resolver/internal/kube" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/proc" + "github.com/zeromicro/go-zero/core/threading" + "github.com/zeromicro/go-zero/zrpc/resolver/internal/kube" "google.golang.org/grpc/resolver" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/informers" diff --git a/zrpc/resolver/internal/subset_test.go b/zrpc/resolver/internal/subset_test.go index 2202ba72..06a6ddf2 100644 --- a/zrpc/resolver/internal/subset_test.go +++ b/zrpc/resolver/internal/subset_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/mathx" + "github.com/zeromicro/go-zero/core/mathx" ) func TestSubset(t *testing.T) { diff --git a/zrpc/resolver/register.go b/zrpc/resolver/register.go index c3713044..43a1ffd2 100644 --- a/zrpc/resolver/register.go +++ b/zrpc/resolver/register.go @@ -1,7 +1,7 @@ package resolver import ( - "github.com/tal-tech/go-zero/zrpc/resolver/internal" + "github.com/zeromicro/go-zero/zrpc/resolver/internal" ) // Register registers schemes defined zrpc. diff --git a/zrpc/resolver/target.go b/zrpc/resolver/target.go index 783a27eb..50a7c8d7 100644 --- a/zrpc/resolver/target.go +++ b/zrpc/resolver/target.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/tal-tech/go-zero/zrpc/resolver/internal" + "github.com/zeromicro/go-zero/zrpc/resolver/internal" ) // BuildDirectTarget returns a string that represents the given endpoints with direct schema. diff --git a/zrpc/server.go b/zrpc/server.go index 4c3fa244..1409e6de 100644 --- a/zrpc/server.go +++ b/zrpc/server.go @@ -4,12 +4,12 @@ import ( "log" "time" - "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/zrpc/internal" - "github.com/tal-tech/go-zero/zrpc/internal/auth" - "github.com/tal-tech/go-zero/zrpc/internal/serverinterceptors" + "github.com/zeromicro/go-zero/core/load" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/zrpc/internal" + "github.com/zeromicro/go-zero/zrpc/internal/auth" + "github.com/zeromicro/go-zero/zrpc/internal/serverinterceptors" "google.golang.org/grpc" ) diff --git a/zrpc/server_test.go b/zrpc/server_test.go index 194833cb..5dad1b99 100644 --- a/zrpc/server_test.go +++ b/zrpc/server_test.go @@ -5,13 +5,13 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/tal-tech/go-zero/core/discov" - "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/stores/redis" - "github.com/tal-tech/go-zero/zrpc/internal" - "github.com/tal-tech/go-zero/zrpc/internal/serverinterceptors" + "github.com/zeromicro/go-zero/core/discov" + "github.com/zeromicro/go-zero/core/logx" + "github.com/zeromicro/go-zero/core/service" + "github.com/zeromicro/go-zero/core/stat" + "github.com/zeromicro/go-zero/core/stores/redis" + "github.com/zeromicro/go-zero/zrpc/internal" + "github.com/zeromicro/go-zero/zrpc/internal/serverinterceptors" "google.golang.org/grpc" )