chore: reorg imports (#2745)

* chore: reorg imports

* chore: format code

core/trace/agent.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"sync"
 
+	"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/otlp/otlptrace/otlptracegrpc"
@@ -12,9 +14,6 @@ import (
 	"go.opentelemetry.io/otel/sdk/resource"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
-
-	"github.com/zeromicro/go-zero/core/lang"
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 const (

core/trace/agent_test.go

@@ -4,7 +4,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-
 	"github.com/zeromicro/go-zero/core/logx"
 )
 

tools/goctl/api/spec/example_test.go

@@ -2,6 +2,7 @@ package spec_test
 
 import (
 	"fmt"
+
 	"github.com/zeromicro/go-zero/tools/goctl/api/spec"
 )
 

tools/goctl/api/tsgen/util_test.go

@@ -1,9 +1,10 @@
 package tsgen
 
 import (
+	"testing"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/zeromicro/go-zero/tools/goctl/api/spec"
-	"testing"
 )
 
 func TestGenTsType(t *testing.T) {

tools/goctl/example/rpc/hello/internal/server/greet/greetserver.go

@@ -6,7 +6,7 @@ package server
 import (
 	"context"
 
-	"github.com/zeromicro/go-zero/tools/goctl/example/rpc/hello/internal/logic/greet"
+	greetlogic "github.com/zeromicro/go-zero/tools/goctl/example/rpc/hello/internal/logic/greet"
 	"github.com/zeromicro/go-zero/tools/goctl/example/rpc/hello/internal/svc"
 	"github.com/zeromicro/go-zero/tools/goctl/example/rpc/hello/pb/hello"
 )

tools/goctl/example/rpc/hello/pb/hello/hello.pb.go

@@ -7,10 +7,11 @@
 package hello
 
 import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
 
 const (

tools/goctl/example/rpc/hello/pb/hello/hello_grpc.pb.go

@@ -8,6 +8,7 @@ package hello
 
 import (
 	context "context"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"

tools/goctl/example/rpc/hi/internal/server/event/eventserver.go

@@ -6,7 +6,7 @@ package server
 import (
 	"context"
 
-	"github.com/zeromicro/go-zero/tools/goctl/example/rpc/hi/internal/logic/event"
+	eventlogic "github.com/zeromicro/go-zero/tools/goctl/example/rpc/hi/internal/logic/event"
 	"github.com/zeromicro/go-zero/tools/goctl/example/rpc/hi/internal/svc"
 	"github.com/zeromicro/go-zero/tools/goctl/example/rpc/hi/pb/hi"
 )

tools/goctl/example/rpc/hi/internal/server/greet/greetserver.go

@@ -6,7 +6,7 @@ package server
 import (
 	"context"
 
-	"github.com/zeromicro/go-zero/tools/goctl/example/rpc/hi/internal/logic/greet"
+	greetlogic "github.com/zeromicro/go-zero/tools/goctl/example/rpc/hi/internal/logic/greet"
 	"github.com/zeromicro/go-zero/tools/goctl/example/rpc/hi/internal/svc"
 	"github.com/zeromicro/go-zero/tools/goctl/example/rpc/hi/pb/hi"
 )

tools/goctl/example/rpc/hi/pb/hi/hi.pb.go

@@ -7,10 +7,11 @@
 package hi
 
 import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 )
 
 const (

tools/goctl/example/rpc/hi/pb/hi/hi_grpc.pb.go

@@ -8,6 +8,7 @@ package hi
 
 import (
 	context "context"
+
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"