diff --git a/configcenter/configclient.go b/configcenter/configclient.go index f03a30e23..e74f5710a 100644 --- a/configcenter/configclient.go +++ b/configcenter/configclient.go @@ -17,7 +17,9 @@ package configcenter -import "github.com/apache/dubbo-go-pixiu/pkg/model" +import ( + "github.com/apache/dubbo-go-pixiu/pkg/model" +) type ( ConfigClient interface { diff --git a/configcenter/nacos_load.go b/configcenter/nacos_load.go index 41014074b..b1c26e9d4 100644 --- a/configcenter/nacos_load.go +++ b/configcenter/nacos_load.go @@ -19,13 +19,17 @@ package configcenter import ( "sync" +) +import ( "github.com/nacos-group/nacos-sdk-go/clients" "github.com/nacos-group/nacos-sdk-go/clients/config_client" "github.com/nacos-group/nacos-sdk-go/common/constant" "github.com/nacos-group/nacos-sdk-go/vo" "github.com/pkg/errors" +) +import ( "github.com/apache/dubbo-go-pixiu/pkg/logger" "github.com/apache/dubbo-go-pixiu/pkg/model" ) diff --git a/configcenter/nacos_load_test.go b/configcenter/nacos_load_test.go index 39d13c15e..84ba7a333 100644 --- a/configcenter/nacos_load_test.go +++ b/configcenter/nacos_load_test.go @@ -24,11 +24,16 @@ import ( "path" "strings" "testing" +) - "github.com/apache/dubbo-go-pixiu/pkg/logger" +import ( . "github.com/smartystreets/goconvey/convey" ) +import ( + "github.com/apache/dubbo-go-pixiu/pkg/logger" +) + // isNacosRunning checks whether the Nacos server is running. // It returns true if Nacos is running, otherwise false. func isNacosRunning(t *testing.T) bool { diff --git a/pkg/cmd/gateway.go b/pkg/cmd/gateway.go index 34b383a76..4392d29b6 100644 --- a/pkg/cmd/gateway.go +++ b/pkg/cmd/gateway.go @@ -19,7 +19,6 @@ package cmd import ( "fmt" - "github.com/apache/dubbo-go-pixiu/pkg/hotreload" "os" "runtime" "strconv" @@ -33,6 +32,7 @@ import ( "github.com/apache/dubbo-go-pixiu/pkg/common/constant" pxruntime "github.com/apache/dubbo-go-pixiu/pkg/common/runtime" "github.com/apache/dubbo-go-pixiu/pkg/config" + "github.com/apache/dubbo-go-pixiu/pkg/hotreload" "github.com/apache/dubbo-go-pixiu/pkg/logger" "github.com/apache/dubbo-go-pixiu/pkg/model" "github.com/apache/dubbo-go-pixiu/pkg/server" diff --git a/pkg/hotreload/hotreload.go b/pkg/hotreload/hotreload.go index 0cccf42c5..cd6acce5f 100644 --- a/pkg/hotreload/hotreload.go +++ b/pkg/hotreload/hotreload.go @@ -20,7 +20,9 @@ package hotreload import ( "sync" "time" +) +import ( "github.com/apache/dubbo-go-pixiu/pkg/common/constant" "github.com/apache/dubbo-go-pixiu/pkg/config" "github.com/apache/dubbo-go-pixiu/pkg/logger" diff --git a/pkg/logger/controller.go b/pkg/logger/controller.go index 28cf24532..914493611 100644 --- a/pkg/logger/controller.go +++ b/pkg/logger/controller.go @@ -20,7 +20,9 @@ package logger import ( "strings" "sync" +) +import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" ) diff --git a/pkg/model/log.go b/pkg/model/log.go index 60bb51854..16a8c74fe 100644 --- a/pkg/model/log.go +++ b/pkg/model/log.go @@ -18,11 +18,14 @@ package model import ( - "github.com/apache/dubbo-go-pixiu/pkg/logger" "go.uber.org/zap" "go.uber.org/zap/zapcore" ) +import ( + "github.com/apache/dubbo-go-pixiu/pkg/logger" +) + type Log struct { Level string `json:"level" yaml:"level"` Development bool `json:"development" yaml:"development"`